summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--svx/inc/dragmt3d.hxx6
-rw-r--r--svx/inc/galbrws2.hxx20
-rw-r--r--svx/inc/galobj.hxx30
-rw-r--r--svx/inc/sjctrl.hxx78
-rw-r--r--svx/inc/svdibrow.hxx38
-rw-r--r--svx/inc/svx/SmartTagCtl.hxx4
-rw-r--r--svx/inc/svx/SmartTagItem.hxx10
-rw-r--r--svx/inc/svx/SpellDialogChildWindow.hxx2
-rw-r--r--svx/inc/svx/algitem.hxx96
-rw-r--r--svx/inc/svx/bmpmask.hxx18
-rw-r--r--svx/inc/svx/charmap.hxx16
-rw-r--r--svx/inc/svx/checklbx.hxx24
-rw-r--r--svx/inc/svx/chrtitem.hxx86
-rw-r--r--svx/inc/svx/clipboardctl.hxx8
-rw-r--r--svx/inc/svx/clipfmtitem.hxx18
-rw-r--r--svx/inc/svx/colrctrl.hxx18
-rw-r--r--svx/inc/svx/connctrl.hxx2
-rw-r--r--svx/inc/svx/contdlg.hxx18
-rw-r--r--svx/inc/svx/ctredlin.hxx122
-rw-r--r--svx/inc/svx/cube3d.hxx14
-rw-r--r--svx/inc/svx/databaseregistrationui.hxx2
-rwxr-xr-xsvx/inc/svx/dbtoolsclient.hxx2
-rw-r--r--svx/inc/svx/deflt3d.hxx84
-rw-r--r--svx/inc/svx/dlgctrl.hxx82
-rw-r--r--svx/inc/svx/drawitem.hxx36
-rw-r--r--svx/inc/svx/e3ditem.hxx14
-rw-r--r--svx/inc/svx/e3dundo.hxx8
-rw-r--r--svx/inc/svx/extrud3d.hxx4
-rw-r--r--svx/inc/svx/extrusioncolorcontrol.hxx4
-rw-r--r--svx/inc/svx/f3dchild.hxx2
-rw-r--r--svx/inc/svx/fillctrl.hxx10
-rw-r--r--svx/inc/svx/flagsdef.hxx12
-rw-r--r--svx/inc/svx/float3d.hxx22
-rw-r--r--svx/inc/svx/fmmodel.hxx12
-rw-r--r--svx/inc/svx/fmview.hxx10
-rw-r--r--svx/inc/svx/fntctl.hxx4
-rw-r--r--svx/inc/svx/fntctrl.hxx10
-rw-r--r--svx/inc/svx/fntszctl.hxx4
-rw-r--r--svx/inc/svx/fontwork.hxx18
-rw-r--r--svx/inc/svx/fontworkgallery.hxx4
-rw-r--r--svx/inc/svx/formatpaintbrushctrl.hxx6
-rw-r--r--svx/inc/svx/frmsel.hxx4
-rw-r--r--svx/inc/svx/galbrws.hxx10
-rw-r--r--svx/inc/svx/galctrl.hxx12
-rw-r--r--svx/inc/svx/gallery.hxx60
-rw-r--r--svx/inc/svx/gallery1.hxx58
-rw-r--r--svx/inc/svx/galmisc.hxx38
-rw-r--r--svx/inc/svx/galtheme.hxx98
-rw-r--r--svx/inc/svx/grafctrl.hxx28
-rw-r--r--svx/inc/svx/graphctl.hxx20
-rw-r--r--svx/inc/svx/grfcrop.hxx16
-rw-r--r--svx/inc/svx/gridctrl.hxx6
-rw-r--r--svx/inc/svx/hdft.hxx22
-rw-r--r--svx/inc/svx/hlnkitem.hxx22
-rw-r--r--svx/inc/svx/hyperdlg.hxx2
-rw-r--r--svx/inc/svx/hyprlink.hxx2
-rw-r--r--svx/inc/svx/imapdlg.hxx12
-rw-r--r--svx/inc/svx/insctrl.hxx8
-rw-r--r--svx/inc/svx/ipolypolygoneditorcontroller.hxx8
-rw-r--r--svx/inc/svx/itemwin.hxx26
-rw-r--r--svx/inc/svx/langbox.hxx40
-rw-r--r--svx/inc/svx/lathe3d.hxx6
-rw-r--r--svx/inc/svx/layctrl.hxx12
-rw-r--r--svx/inc/svx/lboxctrl.hxx10
-rw-r--r--svx/inc/svx/linectrl.hxx34
-rw-r--r--svx/inc/svx/modctrl.hxx8
-rw-r--r--svx/inc/svx/msdffdef.hxx184
-rw-r--r--svx/inc/svx/numfmtsh.hxx78
-rw-r--r--svx/inc/svx/numinf.hxx14
-rw-r--r--svx/inc/svx/numvset.hxx26
-rw-r--r--svx/inc/svx/obj3d.hxx52
-rw-r--r--svx/inc/svx/ofaitem.hxx2
-rw-r--r--svx/inc/svx/optgenrl.hxx32
-rw-r--r--svx/inc/svx/optgrid.hxx70
-rw-r--r--svx/inc/svx/pagectrl.hxx40
-rw-r--r--svx/inc/svx/pageitem.hxx30
-rw-r--r--svx/inc/svx/paraprev.hxx22
-rw-r--r--svx/inc/svx/passwd.hxx4
-rw-r--r--svx/inc/svx/pfiledlg.hxx4
-rw-r--r--svx/inc/svx/polygn3d.hxx16
-rw-r--r--svx/inc/svx/postattr.hxx12
-rw-r--r--svx/inc/svx/pszctrl.hxx6
-rw-r--r--svx/inc/svx/relfld.hxx24
-rw-r--r--svx/inc/svx/rotmodit.hxx14
-rw-r--r--svx/inc/svx/rubydialog.hxx10
-rw-r--r--svx/inc/svx/ruler.hxx62
-rw-r--r--svx/inc/svx/rulritem.hxx76
-rw-r--r--svx/inc/svx/scene3d.hxx32
-rw-r--r--svx/inc/svx/sdangitm.hxx6
-rw-r--r--svx/inc/svx/sdasitm.hxx8
-rw-r--r--svx/inc/svx/sdgcoitm.hxx6
-rw-r--r--svx/inc/svx/sdgcpitm.hxx6
-rw-r--r--svx/inc/svx/sdggaitm.hxx8
-rw-r--r--svx/inc/svx/sdginitm.hxx4
-rw-r--r--svx/inc/svx/sdgluitm.hxx4
-rw-r--r--svx/inc/svx/sdgmoitm.hxx8
-rw-r--r--svx/inc/svx/sdgtritm.hxx4
-rw-r--r--svx/inc/svx/sdmetitm.hxx10
-rw-r--r--svx/inc/svx/sdooitm.hxx8
-rw-r--r--svx/inc/svx/sdprcitm.hxx12
-rw-r--r--svx/inc/svx/sdshitm.hxx2
-rw-r--r--svx/inc/svx/sdshtitm.hxx2
-rw-r--r--svx/inc/svx/sdtaaitm.hxx8
-rw-r--r--svx/inc/svx/sdtaditm.hxx12
-rw-r--r--svx/inc/svx/sdtagitm.hxx4
-rw-r--r--svx/inc/svx/sdtaiitm.hxx4
-rw-r--r--svx/inc/svx/sdtaitm.hxx24
-rw-r--r--svx/inc/svx/sdtakitm.hxx28
-rw-r--r--svx/inc/svx/sdtayitm.hxx4
-rw-r--r--svx/inc/svx/sdtcfitm.hxx2
-rw-r--r--svx/inc/svx/sdtfchim.hxx6
-rw-r--r--svx/inc/svx/sdtfsitm.hxx16
-rw-r--r--svx/inc/svx/sdynitm.hxx8
-rw-r--r--svx/inc/svx/selctrl.hxx8
-rw-r--r--svx/inc/svx/simptabl.hxx26
-rw-r--r--svx/inc/svx/sphere3d.hxx4
-rw-r--r--svx/inc/svx/srchdlg.hxx50
-rw-r--r--svx/inc/svx/subtoolboxcontrol.hxx2
-rw-r--r--svx/inc/svx/svdcrtv.hxx84
-rw-r--r--svx/inc/svx/svddef.hxx22
-rw-r--r--svx/inc/svx/svddrag.hxx86
-rw-r--r--svx/inc/svx/svddrgv.hxx132
-rw-r--r--svx/inc/svx/svdedtv.hxx138
-rw-r--r--svx/inc/svx/svdedxv.hxx72
-rw-r--r--svx/inc/svx/svdetc.hxx108
-rw-r--r--svx/inc/svx/svdglev.hxx34
-rw-r--r--svx/inc/svx/svdglob.hxx2
-rw-r--r--svx/inc/svx/svdglue.hxx76
-rw-r--r--svx/inc/svx/svdhdl.hxx78
-rw-r--r--svx/inc/svx/svdhlpln.hxx18
-rw-r--r--svx/inc/svx/svditer.hxx18
-rw-r--r--svx/inc/svx/svdlayer.hxx36
-rw-r--r--svx/inc/svx/svdmodel.hxx262
-rw-r--r--svx/inc/svx/svdmrkv.hxx228
-rw-r--r--svx/inc/svx/svdoashp.hxx32
-rw-r--r--svx/inc/svx/svdoattr.hxx4
-rw-r--r--svx/inc/svx/svdobj.hxx244
-rw-r--r--svx/inc/svx/svdocapt.hxx16
-rw-r--r--svx/inc/svx/svdocirc.hxx18
-rw-r--r--svx/inc/svx/svdoedge.hxx102
-rw-r--r--svx/inc/svx/svdograf.hxx12
-rw-r--r--svx/inc/svx/svdogrp.hxx16
-rw-r--r--svx/inc/svx/svdomeas.hxx28
-rw-r--r--svx/inc/svx/svdoole2.hxx18
-rw-r--r--svx/inc/svx/svdopath.hxx14
-rw-r--r--svx/inc/svx/svdorect.hxx20
-rw-r--r--svx/inc/svx/svdotable.hxx26
-rw-r--r--svx/inc/svx/svdotext.hxx128
-rw-r--r--svx/inc/svx/svdouno.hxx10
-rw-r--r--svx/inc/svx/svdoutl.hxx4
-rw-r--r--svx/inc/svx/svdpage.hxx106
-rw-r--r--svx/inc/svx/svdpagv.hxx18
-rw-r--r--svx/inc/svx/svdpntv.hxx136
-rw-r--r--svx/inc/svx/svdpoev.hxx12
-rw-r--r--svx/inc/svx/svdsnpv.hxx104
-rw-r--r--svx/inc/svx/svdtext.hxx2
-rw-r--r--svx/inc/svx/svdundo.hxx78
-rw-r--r--svx/inc/svx/svdview.hxx90
-rw-r--r--svx/inc/svx/svdxcgv.hxx56
-rw-r--r--svx/inc/svx/svimbase.hxx96
-rw-r--r--svx/inc/svx/svx3ditems.hxx66
-rw-r--r--svx/inc/svx/svxdlg.hxx74
-rw-r--r--svx/inc/svx/svxgrahicitem.hxx2
-rw-r--r--svx/inc/svx/swframeexample.hxx6
-rw-r--r--svx/inc/svx/sxcaitm.hxx6
-rw-r--r--svx/inc/svx/sxcecitm.hxx14
-rw-r--r--svx/inc/svx/sxcikitm.hxx12
-rw-r--r--svx/inc/svx/sxcllitm.hxx2
-rw-r--r--svx/inc/svx/sxctitm.hxx8
-rw-r--r--svx/inc/svx/sxekitm.hxx12
-rw-r--r--svx/inc/svx/sxfiitm.hxx10
-rw-r--r--svx/inc/svx/sxlayitm.hxx2
-rw-r--r--svx/inc/svx/sxmkitm.hxx12
-rw-r--r--svx/inc/svx/sxmtpitm.hxx24
-rw-r--r--svx/inc/svx/sxmuitm.hxx12
-rw-r--r--svx/inc/svx/sxsiitm.hxx8
-rw-r--r--svx/inc/svx/tabarea.hxx2
-rw-r--r--svx/inc/svx/tabline.hxx2
-rw-r--r--svx/inc/svx/tbcontrl.hxx58
-rw-r--r--svx/inc/svx/tbxalign.hxx2
-rw-r--r--svx/inc/svx/tbxcolorupdate.hxx14
-rw-r--r--svx/inc/svx/tbxctl.hxx6
-rw-r--r--svx/inc/svx/tbxcustomshapes.hxx6
-rw-r--r--svx/inc/svx/tbxdraw.hxx8
-rw-r--r--svx/inc/svx/txencbox.hxx22
-rw-r--r--svx/inc/svx/unoprov.hxx14
-rw-r--r--svx/inc/svx/unoshape.hxx2
-rw-r--r--svx/inc/svx/unoshtxt.hxx2
-rw-r--r--svx/inc/svx/verttexttbxctrl.hxx8
-rw-r--r--svx/inc/svx/view3d.hxx34
-rw-r--r--svx/inc/svx/viewlayoutitem.hxx10
-rw-r--r--svx/inc/svx/viewpt3d.hxx6
-rw-r--r--svx/inc/svx/xbitmap.hxx22
-rw-r--r--svx/inc/svx/xbtmpit.hxx14
-rw-r--r--svx/inc/svx/xcolit.hxx14
-rw-r--r--svx/inc/svx/xdash.hxx34
-rw-r--r--svx/inc/svx/xfillit0.hxx8
-rw-r--r--svx/inc/svx/xflasit.hxx4
-rw-r--r--svx/inc/svx/xflbckit.hxx4
-rw-r--r--svx/inc/svx/xflbmpit.hxx4
-rw-r--r--svx/inc/svx/xflbmsli.hxx4
-rw-r--r--svx/inc/svx/xflbmsxy.hxx8
-rw-r--r--svx/inc/svx/xflbmtit.hxx4
-rw-r--r--svx/inc/svx/xflboxy.hxx8
-rw-r--r--svx/inc/svx/xflbstit.hxx4
-rw-r--r--svx/inc/svx/xflbtoxy.hxx8
-rw-r--r--svx/inc/svx/xflclit.hxx8
-rw-r--r--svx/inc/svx/xflftrit.hxx20
-rw-r--r--svx/inc/svx/xflgrit.hxx16
-rw-r--r--svx/inc/svx/xflhtit.hxx16
-rw-r--r--svx/inc/svx/xfltrit.hxx4
-rw-r--r--svx/inc/svx/xftadit.hxx8
-rw-r--r--svx/inc/svx/xftdiit.hxx2
-rw-r--r--svx/inc/svx/xftmrit.hxx4
-rw-r--r--svx/inc/svx/xftouit.hxx4
-rw-r--r--svx/inc/svx/xftsfit.hxx8
-rw-r--r--svx/inc/svx/xftshcit.hxx4
-rw-r--r--svx/inc/svx/xftshit.hxx8
-rw-r--r--svx/inc/svx/xftshtit.hxx4
-rw-r--r--svx/inc/svx/xftshxy.hxx4
-rw-r--r--svx/inc/svx/xftstit.hxx2
-rw-r--r--svx/inc/svx/xgrad.hxx42
-rw-r--r--svx/inc/svx/xgrscit.hxx4
-rw-r--r--svx/inc/svx/xit.hxx22
-rw-r--r--svx/inc/svx/xlineit0.hxx8
-rw-r--r--svx/inc/svx/xlinjoit.hxx10
-rw-r--r--svx/inc/svx/xlnasit.hxx4
-rw-r--r--svx/inc/svx/xlnclit.hxx8
-rw-r--r--svx/inc/svx/xlndsit.hxx16
-rw-r--r--svx/inc/svx/xlnedcit.hxx8
-rw-r--r--svx/inc/svx/xlnedit.hxx10
-rw-r--r--svx/inc/svx/xlnedwit.hxx6
-rw-r--r--svx/inc/svx/xlnstcit.hxx8
-rw-r--r--svx/inc/svx/xlnstit.hxx10
-rw-r--r--svx/inc/svx/xlnstwit.hxx6
-rw-r--r--svx/inc/svx/xlntrit.hxx4
-rw-r--r--svx/inc/svx/xlnwtit.hxx6
-rw-r--r--svx/inc/svx/xmlgrhlp.hxx10
-rw-r--r--svx/inc/svx/xmlsecctrl.hxx4
-rw-r--r--svx/inc/svx/xoutbmp.hxx20
-rw-r--r--svx/inc/svx/xpoly.hxx80
-rw-r--r--svx/inc/svx/xsflclit.hxx6
-rw-r--r--svx/inc/svx/xtable.hxx210
-rw-r--r--svx/inc/svx/xtextit0.hxx12
-rw-r--r--svx/inc/svx/zoom_def.hxx6
-rw-r--r--svx/inc/svx/zoomctrl.hxx10
-rw-r--r--svx/inc/svx/zoomitem.hxx18
-rw-r--r--svx/inc/svx/zoomsliderctrl.hxx12
-rw-r--r--svx/inc/svx/zoomslideritem.hxx18
-rw-r--r--svx/inc/tbunosearchcontrollers.hxx4
-rw-r--r--svx/inc/xpolyimp.hxx26
-rw-r--r--svx/source/accessibility/AccessibleEmptyEditSource.cxx56
-rw-r--r--svx/source/accessibility/AccessibleFrameSelector.cxx4
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx6
-rw-r--r--svx/source/accessibility/charmapacc.cxx20
-rw-r--r--svx/source/customshapes/EnhancedCustomShapeFontWork.cxx10
-rw-r--r--svx/source/customshapes/tbxcustomshapes.cxx6
-rw-r--r--svx/source/dialog/SpellDialogChildWindow.cxx4
-rw-r--r--svx/source/dialog/_bmpmask.cxx98
-rw-r--r--svx/source/dialog/_contdlg.cxx144
-rw-r--r--svx/source/dialog/charmap.cxx42
-rw-r--r--svx/source/dialog/checklbx.cxx40
-rw-r--r--svx/source/dialog/connctrl.cxx38
-rw-r--r--svx/source/dialog/contimp.hxx28
-rw-r--r--svx/source/dialog/contwnd.cxx20
-rw-r--r--svx/source/dialog/contwnd.hxx18
-rw-r--r--svx/source/dialog/ctredlin.cxx208
-rw-r--r--svx/source/dialog/databaseregistrationui.cxx4
-rw-r--r--svx/source/dialog/dlgctrl.cxx198
-rw-r--r--svx/source/dialog/docrecovery.cxx48
-rw-r--r--svx/source/dialog/fntctrl.cxx80
-rw-r--r--svx/source/dialog/fontwork.cxx80
-rw-r--r--svx/source/dialog/framelink.cxx8
-rw-r--r--svx/source/dialog/frmsel.cxx20
-rw-r--r--svx/source/dialog/graphctl.cxx56
-rw-r--r--svx/source/dialog/grfflt.cxx48
-rw-r--r--svx/source/dialog/hdft.cxx114
-rw-r--r--svx/source/dialog/hyperdlg.cxx6
-rw-r--r--svx/source/dialog/hyprdlg.hxx16
-rw-r--r--svx/source/dialog/hyprlink.cxx128
-rw-r--r--svx/source/dialog/imapdlg.cxx90
-rw-r--r--svx/source/dialog/imapimp.hxx2
-rw-r--r--svx/source/dialog/imapwnd.cxx120
-rw-r--r--svx/source/dialog/imapwnd.hxx26
-rw-r--r--svx/source/dialog/langbox.cxx106
-rw-r--r--svx/source/dialog/measctrl.cxx6
-rw-r--r--svx/source/dialog/optgrid.cxx36
-rw-r--r--svx/source/dialog/pagectrl.cxx38
-rw-r--r--svx/source/dialog/paraprev.cxx6
-rw-r--r--svx/source/dialog/passwd.cxx8
-rw-r--r--svx/source/dialog/relfld.cxx30
-rw-r--r--svx/source/dialog/rlrcitem.cxx4
-rw-r--r--svx/source/dialog/rlrcitem.hxx4
-rw-r--r--svx/source/dialog/rubydialog.cxx44
-rw-r--r--svx/source/dialog/rulritem.cxx98
-rw-r--r--svx/source/dialog/sendreportw32.cxx8
-rw-r--r--svx/source/dialog/simptabl.cxx72
-rw-r--r--svx/source/dialog/srchctrl.cxx6
-rw-r--r--svx/source/dialog/srchctrl.hxx4
-rw-r--r--svx/source/dialog/srchdlg.cxx270
-rw-r--r--svx/source/dialog/svxbmpnumvalueset.cxx38
-rw-r--r--svx/source/dialog/svxgrahicitem.cxx2
-rw-r--r--svx/source/dialog/svxruler.cxx374
-rw-r--r--svx/source/dialog/swframeexample.cxx48
-rw-r--r--svx/source/dialog/swframeposstrings.cxx2
-rw-r--r--svx/source/dialog/txencbox.cxx54
-rw-r--r--svx/source/engine3d/cube3d.cxx8
-rw-r--r--svx/source/engine3d/dragmt3d.cxx14
-rw-r--r--svx/source/engine3d/e3dundo.cxx10
-rw-r--r--svx/source/engine3d/float3d.cxx546
-rw-r--r--svx/source/engine3d/lathe3d.cxx8
-rw-r--r--svx/source/engine3d/obj3d.cxx56
-rw-r--r--svx/source/engine3d/objfac3d.cxx4
-rw-r--r--svx/source/engine3d/polygn3d.cxx14
-rw-r--r--svx/source/engine3d/sphere3d.cxx4
-rw-r--r--svx/source/engine3d/svx3ditems.cxx66
-rw-r--r--svx/source/engine3d/view3d.cxx160
-rw-r--r--svx/source/engine3d/view3d1.cxx10
-rw-r--r--svx/source/fmcomp/dbaexchange.cxx4
-rw-r--r--svx/source/fmcomp/fmgridcl.cxx8
-rw-r--r--svx/source/fmcomp/gridcell.cxx26
-rw-r--r--svx/source/fmcomp/gridctrl.cxx16
-rw-r--r--svx/source/form/datanavi.cxx112
-rw-r--r--svx/source/form/fmmodel.cxx8
-rw-r--r--svx/source/form/fmobjfac.cxx4
-rw-r--r--svx/source/form/fmshimp.cxx14
-rw-r--r--svx/source/form/fmtextcontroldialogs.cxx2
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx2
-rw-r--r--svx/source/form/fmundo.cxx10
-rw-r--r--svx/source/form/fmview.cxx16
-rw-r--r--svx/source/form/fmvwimp.cxx32
-rw-r--r--svx/source/form/formtoolbars.cxx6
-rw-r--r--svx/source/form/navigatortree.cxx14
-rw-r--r--svx/source/form/stringlistresource.cxx2
-rw-r--r--svx/source/form/tbxform.cxx40
-rw-r--r--svx/source/gallery2/codec.cxx38
-rw-r--r--svx/source/gallery2/codec.hxx2
-rw-r--r--svx/source/gallery2/galbrws.cxx24
-rw-r--r--svx/source/gallery2/galbrws1.cxx60
-rw-r--r--svx/source/gallery2/galbrws1.hxx10
-rw-r--r--svx/source/gallery2/galbrws2.cxx164
-rw-r--r--svx/source/gallery2/galctrl.cxx26
-rw-r--r--svx/source/gallery2/galexpl.cxx112
-rw-r--r--svx/source/gallery2/gallery1.cxx94
-rw-r--r--svx/source/gallery2/galmisc.cxx62
-rw-r--r--svx/source/gallery2/galobj.cxx66
-rw-r--r--svx/source/gallery2/galtheme.cxx196
-rw-r--r--svx/source/gengal/gengal.cxx6
-rw-r--r--svx/source/inc/GraphCtlAccessibleContext.hxx2
-rw-r--r--svx/source/inc/charmapacc.hxx4
-rw-r--r--svx/source/inc/datanavi.hxx16
-rw-r--r--svx/source/inc/docrecovery.hxx4
-rw-r--r--svx/source/inc/fmgroup.hxx12
-rw-r--r--svx/source/inc/fmslotinvalidator.hxx2
-rw-r--r--svx/source/inc/fmtextcontroldialogs.hxx2
-rw-r--r--svx/source/inc/fmvwimp.hxx6
-rw-r--r--svx/source/inc/formtoolbars.hxx8
-rw-r--r--svx/source/inc/frmselimpl.hxx2
-rw-r--r--svx/source/inc/stringlistresource.hxx2
-rw-r--r--svx/source/inc/svdoimp.hxx6
-rw-r--r--svx/source/inc/tabwin.hxx2
-rw-r--r--svx/source/inc/tbxform.hxx26
-rw-r--r--svx/source/items/SmartTagItem.cxx10
-rw-r--r--svx/source/items/algitem.cxx88
-rw-r--r--svx/source/items/chrtitem.cxx88
-rw-r--r--svx/source/items/clipfmtitem.cxx34
-rw-r--r--svx/source/items/customshapeitem.cxx6
-rw-r--r--svx/source/items/e3ditem.cxx14
-rw-r--r--svx/source/items/grfitem.cxx18
-rw-r--r--svx/source/items/numfmtsh.cxx12
-rw-r--r--svx/source/items/ofaitem.cxx8
-rw-r--r--svx/source/items/pageitem.cxx26
-rw-r--r--svx/source/items/rotmodit.cxx20
-rw-r--r--svx/source/items/viewlayoutitem.cxx10
-rw-r--r--svx/source/items/zoomslideritem.cxx18
-rw-r--r--svx/source/mnuctrls/SmartTagCtl.cxx20
-rw-r--r--svx/source/mnuctrls/clipboardctl.cxx20
-rw-r--r--svx/source/mnuctrls/fntctl.cxx4
-rw-r--r--svx/source/mnuctrls/fntszctl.cxx8
-rw-r--r--svx/source/sdr/contact/viewcontactofgraphic.cxx2
-rw-r--r--svx/source/smarttags/SmartTagMgr.cxx4
-rw-r--r--svx/source/stbctrls/insctrl.cxx12
-rw-r--r--svx/source/stbctrls/modctrl.cxx10
-rw-r--r--svx/source/stbctrls/pszctrl.cxx72
-rw-r--r--svx/source/stbctrls/selctrl.cxx10
-rw-r--r--svx/source/stbctrls/xmlsecctrl.cxx14
-rw-r--r--svx/source/stbctrls/zoomctrl.cxx26
-rw-r--r--svx/source/stbctrls/zoomsliderctrl.cxx52
-rw-r--r--svx/source/svdraw/ActionDescriptionProvider.cxx2
-rw-r--r--svx/source/svdraw/impgrfll.cxx16
-rw-r--r--svx/source/svdraw/sdrpagewindow.cxx4
-rw-r--r--svx/source/svdraw/svdattr.cxx346
-rw-r--r--svx/source/svdraw/svdcrtv.cxx112
-rw-r--r--svx/source/svdraw/svddrgv.cxx210
-rw-r--r--svx/source/svdraw/svdedtv.cxx286
-rw-r--r--svx/source/svdraw/svdedtv1.cxx354
-rw-r--r--svx/source/svdraw/svdedtv2.cxx290
-rw-r--r--svx/source/svdraw/svdedxv.cxx278
-rw-r--r--svx/source/svdraw/svdetc.cxx140
-rw-r--r--svx/source/svdraw/svdfmtf.cxx52
-rw-r--r--svx/source/svdraw/svdglev.cxx136
-rw-r--r--svx/source/svdraw/svdglue.cxx94
-rw-r--r--svx/source/svdraw/svdhdl.cxx174
-rw-r--r--svx/source/svdraw/svdhlpln.cxx32
-rw-r--r--svx/source/svdraw/svdibrow.cxx350
-rw-r--r--svx/source/svdraw/svditer.cxx22
-rw-r--r--svx/source/svdraw/svdlayer.cxx58
-rw-r--r--svx/source/svdraw/svdmodel.cxx292
-rw-r--r--svx/source/svdraw/svdmrkv.cxx376
-rw-r--r--svx/source/svdraw/svdmrkv1.cxx238
-rw-r--r--svx/source/svdraw/svdoashp.cxx116
-rw-r--r--svx/source/svdraw/svdoattr.cxx6
-rw-r--r--svx/source/svdraw/svdobj.cxx390
-rw-r--r--svx/source/svdraw/svdocapt.cxx92
-rw-r--r--svx/source/svdraw/svdocirc.cxx60
-rw-r--r--svx/source/svdraw/svdoedge.cxx484
-rw-r--r--svx/source/svdraw/svdograf.cxx94
-rw-r--r--svx/source/svdraw/svdogrp.cxx184
-rw-r--r--svx/source/svdraw/svdomeas.cxx180
-rw-r--r--svx/source/svdraw/svdoole2.cxx88
-rw-r--r--svx/source/svdraw/svdopath.cxx454
-rw-r--r--svx/source/svdraw/svdorect.cxx58
-rw-r--r--svx/source/svdraw/svdotext.cxx308
-rw-r--r--svx/source/svdraw/svdotextpathdecomposition.cxx2
-rw-r--r--svx/source/svdraw/svdotxat.cxx62
-rw-r--r--svx/source/svdraw/svdotxed.cxx50
-rw-r--r--svx/source/svdraw/svdotxfl.cxx10
-rw-r--r--svx/source/svdraw/svdotxln.cxx36
-rw-r--r--svx/source/svdraw/svdotxtr.cxx44
-rw-r--r--svx/source/svdraw/svdouno.cxx42
-rw-r--r--svx/source/svdraw/svdoutl.cxx14
-rw-r--r--svx/source/svdraw/svdoutlinercache.cxx4
-rw-r--r--svx/source/svdraw/svdovirt.cxx28
-rw-r--r--svx/source/svdraw/svdpage.cxx186
-rw-r--r--svx/source/svdraw/svdpagv.cxx78
-rw-r--r--svx/source/svdraw/svdpntv.cxx144
-rw-r--r--svx/source/svdraw/svdpoev.cxx48
-rw-r--r--svx/source/svdraw/svdsnpv.cxx82
-rw-r--r--svx/source/svdraw/svdtext.cxx20
-rw-r--r--svx/source/svdraw/svdtrans.cxx208
-rw-r--r--svx/source/svdraw/svdundo.cxx188
-rw-r--r--svx/source/svdraw/svdview.cxx318
-rw-r--r--svx/source/svdraw/svdxcgv.cxx130
-rw-r--r--svx/source/table/cell.cxx8
-rw-r--r--svx/source/table/celleditsource.cxx14
-rw-r--r--svx/source/table/celleditsource.hxx2
-rw-r--r--svx/source/table/svdotable.cxx110
-rw-r--r--svx/source/table/tablecontroller.cxx72
-rw-r--r--svx/source/table/tablelayouter.cxx4
-rw-r--r--svx/source/table/tablertfimporter.cxx20
-rw-r--r--svx/source/table/tableundo.hxx6
-rw-r--r--svx/source/tbxctrls/colorwindow.hxx8
-rw-r--r--svx/source/tbxctrls/colrctrl.cxx50
-rw-r--r--svx/source/tbxctrls/extrusioncontrols.cxx26
-rw-r--r--svx/source/tbxctrls/fillctrl.cxx62
-rw-r--r--svx/source/tbxctrls/fontworkgallery.cxx14
-rw-r--r--svx/source/tbxctrls/formatpaintbrushctrl.cxx8
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx70
-rw-r--r--svx/source/tbxctrls/itemwin.cxx52
-rw-r--r--svx/source/tbxctrls/layctrl.cxx76
-rw-r--r--svx/source/tbxctrls/lboxctrl.cxx40
-rw-r--r--svx/source/tbxctrls/linectrl.cxx70
-rw-r--r--svx/source/tbxctrls/subtoolboxcontrol.cxx2
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx314
-rw-r--r--svx/source/tbxctrls/tbunocontroller.cxx10
-rw-r--r--svx/source/tbxctrls/tbunosearchcontrollers.cxx22
-rw-r--r--svx/source/tbxctrls/tbxalign.cxx2
-rw-r--r--svx/source/tbxctrls/tbxcolorupdate.cxx8
-rw-r--r--svx/source/tbxctrls/tbxdrctl.cxx10
-rw-r--r--svx/source/tbxctrls/verttexttbxctrl.cxx18
-rw-r--r--svx/source/toolbars/extrusionbar.cxx24
-rw-r--r--svx/source/toolbars/fontworkbar.cxx14
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx26
-rw-r--r--svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx12
-rw-r--r--svx/source/unodialogs/textconversiondlgs/resid.cxx2
-rw-r--r--svx/source/unodialogs/textconversiondlgs/resid.hxx2
-rw-r--r--svx/source/unodraw/UnoGraphicExporter.cxx42
-rw-r--r--svx/source/unodraw/UnoNameItemTable.cxx8
-rw-r--r--svx/source/unodraw/UnoNameItemTable.hxx6
-rw-r--r--svx/source/unodraw/gluepts.cxx36
-rw-r--r--svx/source/unodraw/unomtabl.cxx10
-rw-r--r--svx/source/unodraw/unopool.cxx22
-rw-r--r--svx/source/unodraw/unoprov.cxx40
-rw-r--r--svx/source/unodraw/unoshap2.cxx10
-rw-r--r--svx/source/unodraw/unoshap4.cxx4
-rw-r--r--svx/source/unodraw/unoshape.cxx30
-rw-r--r--svx/source/unodraw/unoshtxt.cxx68
-rw-r--r--svx/source/xml/xmlgrhlp.cxx24
-rw-r--r--svx/source/xml/xmlxtimp.cxx34
-rw-r--r--svx/source/xoutdev/_xoutbmp.cxx76
-rw-r--r--svx/source/xoutdev/_xpoly.cxx240
-rw-r--r--svx/source/xoutdev/xattr.cxx480
-rw-r--r--svx/source/xoutdev/xattr2.cxx104
-rw-r--r--svx/source/xoutdev/xattrbmp.cxx104
-rw-r--r--svx/source/xoutdev/xexch.cxx12
-rw-r--r--svx/source/xoutdev/xtabbtmp.cxx46
-rw-r--r--svx/source/xoutdev/xtabcolr.cxx46
-rw-r--r--svx/source/xoutdev/xtabdash.cxx44
-rw-r--r--svx/source/xoutdev/xtabgrdt.cxx44
-rw-r--r--svx/source/xoutdev/xtabhtch.cxx44
-rw-r--r--svx/source/xoutdev/xtable.cxx98
-rw-r--r--svx/source/xoutdev/xtablend.cxx44
502 files changed, 11769 insertions, 11769 deletions
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index 635a78a29f70..a8560dbbb366 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -87,7 +87,7 @@ public:
SdrDragView &rView,
const SdrMarkList& rMark,
E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
- BOOL bFull = FALSE);
+ sal_Bool bFull = sal_False);
virtual void TakeSdrDragComment(String& rStr) const;
virtual bool BeginSdrDrag();
@@ -118,7 +118,7 @@ public:
SdrDragView &rView,
const SdrMarkList& rMark,
E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
- BOOL bFull = FALSE);
+ sal_Bool bFull = sal_False);
virtual void MoveSdrDrag(const Point& rPnt);
virtual Pointer GetSdrDragPointer() const;
@@ -143,7 +143,7 @@ public:
const SdrMarkList& rMark,
SdrHdlKind eDrgHdl = HDL_MOVE,
E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ,
- BOOL bFull = FALSE);
+ sal_Bool bFull = sal_False);
virtual void MoveSdrDrag(const Point& rPnt);
virtual Pointer GetSdrDragPointer() const;
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index d1038641c841..8e5ca04c6173 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -117,18 +117,18 @@ private:
FixedLine maSeparator;
FixedText maInfoBar;
Point maDragStartPos;
- ULONG mnCurActionPos;
+ sal_uIntPtr mnCurActionPos;
GalleryBrowserMode meMode;
GalleryBrowserMode meLastMode;
- BOOL mbCurActionIsLinkage;
+ sal_Bool mbCurActionIsLinkage;
void InitSettings();
- void ImplUpdateViews( USHORT nSelectionId );
+ void ImplUpdateViews( sal_uInt16 nSelectionId );
void ImplUpdateInfoBar();
- ULONG ImplGetSelectedItemId( const Point* pSelPosPixel, Point& rSelPos );
- void ImplSelectItemId( ULONG nItemId );
- void ImplExecute( USHORT nId );
+ sal_uIntPtr ImplGetSelectedItemId( const Point* pSelPosPixel, Point& rSelPos );
+ void ImplSelectItemId( sal_uIntPtr nItemId );
+ void ImplExecute( sal_uInt16 nId );
// Control
virtual void Resize();
@@ -148,7 +148,7 @@ private:
public:
- static String GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, ULONG nItemTextFlags );
+ static String GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, sal_uIntPtr nItemTextFlags );
public:
@@ -167,15 +167,15 @@ public:
INetURLObject GetURL() const;
String GetFilterName() const;
Graphic GetGraphic() const;
- BOOL GetVCDrawModel( FmFormModel& rModel ) const;
- BOOL IsLinkage() const;
+ sal_Bool GetVCDrawModel( FmFormModel& rModel ) const;
+ sal_Bool IsLinkage() const;
sal_Int8 AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& rEvt );
sal_Int8 ExecuteDrop( DropTargetHelper& rTarget, const ExecuteDropEvent& rEvt );
void StartDrag( Window* pWindow, const Point* pDragPoint = NULL );
void TogglePreview( Window* pWindow, const Point* pPreviewPoint = NULL );
void ShowContextMenu( Window* pWindow, const Point* pContextPoint = NULL );
- BOOL KeyInput( const KeyEvent& rEvt, Window* pWindow );
+ sal_Bool KeyInput( const KeyEvent& rEvt, Window* pWindow );
};
#endif
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index 6996cc18692e..2f558c8679ce 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -83,13 +83,13 @@ protected:
INetURLObject aURL;
String aUserName;
String aTitle;
- BOOL bIsValid;
- BOOL bIsThumbBmp;
+ sal_Bool bIsValid;
+ sal_Bool bIsThumbBmp;
virtual void WriteData( SvStream& rOut, const String& rDestDir ) const;
- virtual void ReadData( SvStream& rIn, UINT16& rReadVersion );
+ virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
- BOOL CreateThumb( const Graphic& rGraphic );
+ sal_Bool CreateThumb( const Graphic& rGraphic );
public:
@@ -97,13 +97,13 @@ public:
virtual ~SgaObject() {};
virtual SgaObjKind GetObjKind() const = 0;
- virtual UINT16 GetVersion() const = 0;
+ virtual sal_uInt16 GetVersion() const = 0;
virtual Bitmap GetThumbBmp() const { return aThumbBmp; }
const GDIMetaFile& GetThumbMtf() const { return aThumbMtf; }
const INetURLObject& GetURL() const { return aURL; }
- BOOL IsValid() const { return bIsValid; }
- BOOL IsThumbBitmap() const { return bIsThumbBmp; }
+ sal_Bool IsValid() const { return bIsValid; }
+ sal_Bool IsThumbBitmap() const { return bIsThumbBmp; }
const String GetTitle() const;
void SetTitle( const String& rTitle );
@@ -123,9 +123,9 @@ private:
GalSoundType eSoundType;
virtual void WriteData( SvStream& rOut, const String& rDestDir ) const;
- virtual void ReadData( SvStream& rIn, UINT16& rReadVersion );
+ virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
- virtual UINT16 GetVersion() const { return 6; }
+ virtual sal_uInt16 GetVersion() const { return 6; }
public:
@@ -150,12 +150,12 @@ class SgaObjectSvDraw : public SgaObject
private:
- BOOL CreateThumb( const FmFormModel& rModel );
+ sal_Bool CreateThumb( const FmFormModel& rModel );
virtual void WriteData( SvStream& rOut, const String& rDestDir ) const;
- virtual void ReadData( SvStream& rIn, UINT16& rReadVersion );
+ virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
- virtual UINT16 GetVersion() const { return 5; }
+ virtual sal_uInt16 GetVersion() const { return 5; }
public:
@@ -168,7 +168,7 @@ public:
public:
- static BOOL DrawCentered( OutputDevice* pOut, const FmFormModel& rModel );
+ static sal_Bool DrawCentered( OutputDevice* pOut, const FmFormModel& rModel );
};
// ----------------
@@ -182,9 +182,9 @@ private:
void Init( const Graphic& rGraphic, const INetURLObject& rURL );
virtual void WriteData( SvStream& rOut, const String& rDestDir ) const;
- virtual void ReadData( SvStream& rIn, UINT16& rReadVersion );
+ virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion );
- virtual UINT16 GetVersion() const { return 5; }
+ virtual sal_uInt16 GetVersion() const { return 5; }
public:
diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx
index 16de32f733dc..c0d49c6d0895 100644
--- a/svx/inc/sjctrl.hxx
+++ b/svx/inc/sjctrl.hxx
@@ -140,10 +140,10 @@ class ImpSjJScriptCheckboxObject : public SjJScriptCheckboxObject, ImpSjJScriptC
virtual String getValue() const;
virtual String getType() const;
- virtual BOOL getChecked() const;
- virtual void setChecked( BOOL bCheck );
- virtual BOOL getDefaultChecked() const;
- virtual void setDefaultChecked( BOOL bCheck );
+ virtual sal_Bool getChecked() const;
+ virtual void setChecked( sal_Bool bCheck );
+ virtual sal_Bool getDefaultChecked() const;
+ virtual void setDefaultChecked( sal_Bool bCheck );
// getValue() wird in der Basisklasse definiert
virtual void setValue( const String & aStrg );
@@ -170,8 +170,8 @@ class ImpSjJScriptRadioArray: public SjJSbxArrayObject
{
VCRadioManager* pMgr;
public:
- INT32 ImpSjJScriptRadioArray::getLength() const;
- SjJSbxObject* ImpSjJScriptRadioArray::getElement( INT32 nIndex ) const;
+ sal_Int32 ImpSjJScriptRadioArray::getLength() const;
+ SjJSbxObject* ImpSjJScriptRadioArray::getElement( sal_Int32 nIndex ) const;
SjJSbxObject* ImpSjJScriptRadioArray::getElement_String( const String & aName ) const;
// Konstruktor
@@ -192,15 +192,15 @@ class ImpSjJScriptRadioObject : public SjJScriptRadioObject, ImpSjJScriptControl
virtual String getType() const;
// Properties von SjJScriptCheckboxObject
- virtual BOOL getChecked() const;
- virtual void setChecked( BOOL bCheck );
- virtual BOOL getDefaultChecked() const;
- virtual void setDefaultChecked( BOOL bCheck );
+ virtual sal_Bool getChecked() const;
+ virtual void setChecked( sal_Bool bCheck );
+ virtual sal_Bool getDefaultChecked() const;
+ virtual void setDefaultChecked( sal_Bool bCheck );
// getValue() wird in der Basisklasse definiert
virtual void setValue( const String & aStrg );
// yyy Raus zum inkompatiblen
- //virtual INT32 getLength();
+ //virtual sal_Int32 getLength();
// Methoden des Objektes
virtual void click();
@@ -230,9 +230,9 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
virtual String getValue() const;
virtual String getType() const;
- virtual INT32 getLength();
- virtual INT32 getSelectedIndex() const;
- virtual void setSelectedIndex( INT32 nNo );
+ virtual sal_Int32 getLength();
+ virtual sal_Int32 getSelectedIndex() const;
+ virtual void setSelectedIndex( sal_Int32 nNo );
// liefert eine Array von Option-Objekten
//yyy Raus zum inkompatiblen
@@ -262,9 +262,9 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
void onFocus();
// SjJSbxArrayObject-Methoden
- virtual INT32 getLength() const;
+ virtual sal_Int32 getLength() const;
// Zugriff "uber den Index
- virtual SjJSbxObject * getElement( INT32 nIndex ) const;
+ virtual SjJSbxObject * getElement( sal_Int32 nIndex ) const;
// Zugriff "uber den Namen
// native Java-Methoden k"onnen (noch) nicht "uberladen werden
//virtual SjJSbxObject * getElement_String( const String & aName ) const;
@@ -273,19 +273,19 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
ImpSjJScriptSelectObject( VCControl* _pControl, SjJSbxObject * p );
// zum Setzen von Eintr"agen am Objket (zum Aufruf von Java aus) 15.1.1997
- virtual void setOption( INT32 nIndex, const String & aOptionText,
+ virtual void setOption( sal_Int32 nIndex, const String & aOptionText,
const String & aOptionValue,
- BOOL bDefaultSelected, BOOL bSelected );
+ sal_Bool bDefaultSelected, sal_Bool bSelected );
// Schnittstelle fuer die Properties der Option-Objekte
- virtual BOOL getOptionDefaultSelected( INT32 nIndex ) const;
- virtual void setOptionDefaultSelected( BOOL bSelected, INT32 nIndex );
- virtual BOOL getOptionSelected( INT32 nIndex ) const;
- virtual void setOptionSelected( BOOL bSelected, INT32 nIndex );
- virtual String getOptionText( INT32 nIndex ) const;
- virtual void setOptionText( const String & sText, INT32 nIndex );
- virtual void setOptionValue( const String & sText, INT32 nIndex );
- virtual String getOptionValue( INT32 nIndex ) const;
+ virtual sal_Bool getOptionDefaultSelected( sal_Int32 nIndex ) const;
+ virtual void setOptionDefaultSelected( sal_Bool bSelected, sal_Int32 nIndex );
+ virtual sal_Bool getOptionSelected( sal_Int32 nIndex ) const;
+ virtual void setOptionSelected( sal_Bool bSelected, sal_Int32 nIndex );
+ virtual String getOptionText( sal_Int32 nIndex ) const;
+ virtual void setOptionText( const String & sText, sal_Int32 nIndex );
+ virtual void setOptionValue( const String & sText, sal_Int32 nIndex );
+ virtual String getOptionValue( sal_Int32 nIndex ) const;
};
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -294,21 +294,21 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr
class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptControlBase
{
- USHORT nListBoxIndex;
+ sal_uInt16 nListBoxIndex;
public:
// Methoden von Java --> C++ (f"ur Properties)
//--------------------------------------------
- virtual BOOL getdefaultSelected() const;
- virtual void setdefaultSelected( BOOL bSelected );
- virtual INT32 getIndex() const;
- virtual BOOL getSelected() const;
- virtual void setSelected( BOOL bSelected );
+ virtual sal_Bool getdefaultSelected() const;
+ virtual void setdefaultSelected( sal_Bool bSelected );
+ virtual sal_Int32 getIndex() const;
+ virtual sal_Bool getSelected() const;
+ virtual void setSelected( sal_Bool bSelected );
//yyy Zum Vollupdate raus:
/*
- virtual INT32 getSelectedIndex() const;
- virtual void setSelectedIndex( INT32 nNo );
+ virtual sal_Int32 getSelectedIndex() const;
+ virtual void setSelectedIndex( sal_Int32 nNo );
*/
@@ -331,7 +331,7 @@ class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptContr
// keine !
// Konstruktor
- ImpSjJScriptOptionObject( VCControl* _pControl, SjJSbxObject * p, USHORT _nListBoxIndex );
+ ImpSjJScriptOptionObject( VCControl* _pControl, SjJSbxObject * p, sal_uInt16 _nListBoxIndex );
};
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -343,9 +343,9 @@ class SjJSbxFormsArray: public SfxJSArray
public:
// SjJSbxArrayObject-Methoden
- virtual INT32 getLength() const;
+ virtual sal_Int32 getLength() const;
// Zugriff "uber den Index
- virtual SjJSbxObject * getElement( INT32 nIndex ) const;
+ virtual SjJSbxObject * getElement( sal_Int32 nIndex ) const;
// Zugriff "uber den Namen
// native Java-Methoden k"onnen (noch) nicht "uberladen werden
virtual SjJSbxObject * getElement_String( const String & aName ) const;
@@ -593,8 +593,8 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject
virtual void setTarget( const String & sValue );
// SjJSbxArrayObject-Methoden
- INT32 getLength() const;
- SjJSbxObject* getElement( INT32 nIndex ) const;
+ sal_Int32 getLength() const;
+ SjJSbxObject* getElement( sal_Int32 nIndex ) const;
SjJSbxObject* getElement_String( const String & aName ) const;
// liefert ein Array-Objekt mit Elementen vom Typ JScriptAbstractControlsObject
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index be3a9ba22cef..7c844e80c71c 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -47,26 +47,26 @@ friend class ImpItemEdit;
Link aSetDirtyHdl;
ImpItemListRow* pAktChangeEntry;
long nLastWhichOfs;
- USHORT nLastWhich;
- USHORT nLastWhichOben;
- USHORT nLastWhichUnten;
- FASTBOOL bWhichesButNames;
- FASTBOOL bDontHideIneffectiveItems;
- FASTBOOL bDontSortItems;
- FASTBOOL bShowWhichIds;
- FASTBOOL bShowRealValues;
+ sal_uInt16 nLastWhich;
+ sal_uInt16 nLastWhichOben;
+ sal_uInt16 nLastWhichUnten;
+ int bWhichesButNames;
+ int bDontHideIneffectiveItems;
+ int bDontSortItems;
+ int bShowWhichIds;
+ int bShowRealValues;
private:
#if _SOLAR__PRIVATE
void ImpCtor();
- void ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEntryNum);
- ImpItemListRow* ImpGetEntry(ULONG nPos) const { return (ImpItemListRow*)aList.GetObject(nPos); }
+ void ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntPtr nEntryNum);
+ ImpItemListRow* ImpGetEntry(sal_uIntPtr nPos) const { return (ImpItemListRow*)aList.GetObject(nPos); }
void ImpSaveWhich();
void ImpRestoreWhich();
#endif // __PRIVATE
protected:
virtual long GetRowCount() const;
- virtual BOOL SeekRow(long nRow);
- virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId) const;
+ virtual sal_Bool SeekRow(long nRow);
+ virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const;
virtual void DoubleClick(const BrowserMouseEvent&);
virtual void KeyInput(const KeyEvent& rEvt);
virtual void Select();
@@ -78,10 +78,10 @@ public:
virtual ~_SdrItemBrowserControl();
void Clear();
void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL);
- ULONG GetCurrentPos() const;
- USHORT GetCurrentWhich() const;
- virtual FASTBOOL BegChangeEntry(ULONG nPos);
- virtual FASTBOOL EndChangeEntry();
+ sal_uIntPtr GetCurrentPos() const;
+ sal_uInt16 GetCurrentWhich() const;
+ virtual int BegChangeEntry(sal_uIntPtr nPos);
+ virtual int EndChangeEntry();
virtual void BrkChangeEntry();
/** GetCellText returns the text at the given position
@@ -92,7 +92,7 @@ public:
@return
the text out of the cell
*/
- virtual String GetCellText(long _nRow, USHORT _nColId) const;
+ virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const;
const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; }
XubString GetNewEntryValue() const { return pEditControl->GetText(); }
@@ -114,7 +114,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(int /*bOn*/) {}
const _SdrItemBrowserControl& GetBrowserControl() const { return aBrowse; }
_SdrItemBrowserControl& GetBrowserControl() { return aBrowse; }
};
@@ -124,7 +124,7 @@ class SdrView;
class SdrItemBrowser: public _SdrItemBrowserWindow {
Timer aIdleTimer;
SdrView* pView;
- FASTBOOL bDirty;
+ int bDirty;
private:
static Window* ImpGetViewWin(SdrView& rView);
DECL_LINK(IdleHdl,Timer*);
diff --git a/svx/inc/svx/SmartTagCtl.hxx b/svx/inc/svx/SmartTagCtl.hxx
index 9498f03d6978..87c6d69ebaaf 100644
--- a/svx/inc/svx/SmartTagCtl.hxx
+++ b/svx/inc/svx/SmartTagCtl.hxx
@@ -72,11 +72,11 @@ private:
void FillMenu();
DECL_LINK( MenuSelect, PopupMenu * );
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
public:
- SvxSmartTagsControl( USHORT nId, Menu&, SfxBindings& );
+ SvxSmartTagsControl( sal_uInt16 nId, Menu&, SfxBindings& );
~SvxSmartTagsControl();
virtual PopupMenu* GetPopup() const;
diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx
index ed69a25787dd..666160b3a745 100644
--- a/svx/inc/svx/SmartTagItem.hxx
+++ b/svx/inc/svx/SmartTagItem.hxx
@@ -63,7 +63,7 @@ class SVX_DLLPUBLIC SvxSmartTagItem : public SfxPoolItem
public:
TYPEINFO();
- SvxSmartTagItem( const USHORT nId,
+ SvxSmartTagItem( const sal_uInt16 nId,
const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence,
const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& rActionIndicesSequence,
const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > >& rStringKeyMaps,
@@ -76,10 +76,10 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
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 SfxPoolItem* Create(SvStream &, sal_uInt16) const; // leer
+ virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; // leer
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 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; }
diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/svx/inc/svx/SpellDialogChildWindow.hxx
index 3702b643e17e..016def2576dc 100644
--- a/svx/inc/svx/SpellDialogChildWindow.hxx
+++ b/svx/inc/svx/SpellDialogChildWindow.hxx
@@ -58,7 +58,7 @@ class SVX_DLLPUBLIC SpellDialogChildWindow
public:
SpellDialogChildWindow (
Window*pParent,
- USHORT nId,
+ sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo);
virtual ~SpellDialogChildWindow ();
diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx
index d12e646da9b2..6d4f92571dc0 100644
--- a/svx/inc/svx/algitem.hxx
+++ b/svx/inc/svx/algitem.hxx
@@ -46,24 +46,24 @@ class SVX_DLLPUBLIC SvxHorJustifyItem: public SfxEnumItem
public:
TYPEINFO();
- SvxHorJustifyItem( const USHORT nId );
+ SvxHorJustifyItem( const sal_uInt16 nId );
SvxHorJustifyItem(
const SvxCellHorJustify eJustify /*= SVX_HOR_JUSTIFY_STANDARD*/,
- const USHORT nId );
+ const sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual USHORT GetValueCount() const;
- virtual String GetValueText( USHORT nVal ) const;
+ virtual sal_uInt16 GetValueCount() const;
+ virtual String GetValueText( sal_uInt16 nVal ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const;
inline SvxHorJustifyItem& operator=(const SvxHorJustifyItem& rHorJustify)
{
@@ -81,24 +81,24 @@ class SVX_DLLPUBLIC SvxVerJustifyItem: public SfxEnumItem
public:
TYPEINFO();
- SvxVerJustifyItem( const USHORT nId );
+ SvxVerJustifyItem( const sal_uInt16 nId );
SvxVerJustifyItem(
const SvxCellVerJustify eJustify /*= SVX_VER_JUSTIFY_STANDARD*/,
- const USHORT nId );
+ const sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual USHORT GetValueCount() const;
- virtual String GetValueText( USHORT nVal ) const;
+ virtual sal_uInt16 GetValueCount() const;
+ virtual String GetValueText( sal_uInt16 nVal ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const;
inline SvxVerJustifyItem& operator=(const SvxVerJustifyItem& rVerJustify)
{
@@ -117,24 +117,24 @@ public:
SvxOrientationItem(
const SvxCellOrientation eOrientation /*= SVX_ORIENTATION_STANDARD*/,
- const USHORT nId );
+ const sal_uInt16 nId );
SvxOrientationItem(
- INT32 nRotation, BOOL bStacked,
- const USHORT nId );
+ sal_Int32 nRotation, sal_Bool bStacked,
+ const sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual USHORT GetValueCount() const;
- virtual String GetValueText( USHORT nVal ) const;
+ virtual sal_uInt16 GetValueCount() const;
+ virtual String GetValueText( sal_uInt16 nVal ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const;
inline SvxOrientationItem& operator=(const SvxOrientationItem& rOrientation)
{
@@ -142,28 +142,28 @@ public:
return *this;
}
- /** Returns TRUE, if the item represents STACKED state. */
- BOOL IsStacked() const;
+ /** Returns sal_True, if the item represents STACKED state. */
+ sal_Bool IsStacked() const;
/** Returns the rotation this item represents (returns nStdAngle for STANDARD and STACKED state). */
- INT32 GetRotation( INT32 nStdAngle = 0 ) const;
+ sal_Int32 GetRotation( sal_Int32 nStdAngle = 0 ) const;
/** Fills this item according to passed item values. */
- void SetFromRotation( INT32 nRotation, BOOL bStacked );
+ void SetFromRotation( sal_Int32 nRotation, sal_Bool bStacked );
};
//------------------------------------------------------------------------
class SVX_DLLPUBLIC SvxMarginItem: public SfxPoolItem
{
- INT16 nLeftMargin;
- INT16 nTopMargin;
- INT16 nRightMargin;
- INT16 nBottomMargin;
+ sal_Int16 nLeftMargin;
+ sal_Int16 nTopMargin;
+ sal_Int16 nRightMargin;
+ sal_Int16 nBottomMargin;
public:
TYPEINFO();
- SvxMarginItem( const USHORT nId );
- SvxMarginItem( INT16 nLeft, INT16 nTop /*= 0*/,
- INT16 nRight /*= 0*/, INT16 nBottom /*= 0*/,
- const USHORT nId );
+ SvxMarginItem( const sal_uInt16 nId );
+ SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop /*= 0*/,
+ sal_Int16 nRight /*= 0*/, sal_Int16 nBottom /*= 0*/,
+ const sal_uInt16 nId );
SvxMarginItem( const SvxMarginItem& );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -173,20 +173,20 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- 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 );
-
- INT16 GetLeftMargin() const {return nLeftMargin; }
- BOOL SetLeftMargin(INT16 nLeft);
- INT16 GetTopMargin() const {return nTopMargin; }
- BOOL SetTopMargin(INT16 nTop);
- INT16 GetRightMargin() const {return nRightMargin; }
- BOOL SetRightMargin(INT16 nRight);
- INT16 GetBottomMargin() const {return nBottomMargin; }
- BOOL SetBottomMargin(INT16 nBottom);
+ virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const;
+ virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const;
+
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+
+ sal_Int16 GetLeftMargin() const {return nLeftMargin; }
+ sal_Bool SetLeftMargin(sal_Int16 nLeft);
+ sal_Int16 GetTopMargin() const {return nTopMargin; }
+ sal_Bool SetTopMargin(sal_Int16 nTop);
+ sal_Int16 GetRightMargin() const {return nRightMargin; }
+ sal_Bool SetRightMargin(sal_Int16 nRight);
+ sal_Int16 GetBottomMargin() const {return nBottomMargin; }
+ sal_Bool SetBottomMargin(sal_Int16 nBottom);
inline SvxMarginItem& operator=(const SvxMarginItem& rMargin)
{
diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx
index 1387b17267c2..39ae551db3dd 100644
--- a/svx/inc/svx/bmpmask.hxx
+++ b/svx/inc/svx/bmpmask.hxx
@@ -50,11 +50,11 @@ private:
SvxBmpMask &rBmpMask;
protected:
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
public:
- SvxBmpMaskSelectItem( USHORT nId, SvxBmpMask& rMask,
+ SvxBmpMaskSelectItem( sal_uInt16 nId, SvxBmpMask& rMask,
SfxBindings& rBindings );
};
@@ -68,7 +68,7 @@ class SVX_DLLPUBLIC SvxBmpMaskChildWindow : public SfxChildWindow
{
public:
SvxBmpMaskChildWindow( Window*,
- USHORT, SfxBindings*,
+ sal_uInt16, SfxBindings*,
SfxChildWinInfo* );
SFX_DECL_CHILDWINDOW(SvxBmpMaskChildWindow);
@@ -129,12 +129,12 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow
Image maImgPipette;
Image maImgPipetteH;
- virtual BOOL Close();
+ virtual sal_Bool Close();
#ifdef BMPMASK_PRIVATE
- USHORT InitColorArrays( Color* pSrcCols, Color* pDstCols,
- ULONG* pTols );
+ sal_uInt16 InitColorArrays( Color* pSrcCols, Color* pDstCols,
+ sal_uIntPtr* pTols );
Bitmap ImpMask( const Bitmap& rBitmap );
BitmapEx ImpMask( const BitmapEx& rBitmapEx );
@@ -163,14 +163,14 @@ public:
void SetColor( const Color& rColor );
void PipetteClicked();
- BOOL NeedsColorTable() const;
+ sal_Bool NeedsColorTable() const;
void SetColorTable( const XColorTable* pColorTable );
- void SetExecState( BOOL bEnable );
+ void SetExecState( sal_Bool bEnable );
Graphic Mask( const Graphic& rGraphic );
- BOOL IsEyedropping() const;
+ sal_Bool IsEyedropping() const;
void onSelect( MaskSet* pSet );
diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx
index 5111462f6fc3..88662b3b4cdd 100644
--- a/svx/inc/svx/charmap.hxx
+++ b/svx/inc/svx/charmap.hxx
@@ -58,7 +58,7 @@ public:
void SetFont( const Font& rFont );
- void SelectCharacter( sal_uInt32 cNew, BOOL bFocus = FALSE );
+ void SelectCharacter( sal_uInt32 cNew, sal_Bool bFocus = sal_False );
sal_UCS4 GetSelectCharacter() const;
Link GetDoubleClickHdl() const { return aDoubleClkHdl; }
@@ -76,12 +76,12 @@ public:
int FirstInView( void) const;
int LastInView( void) const;
int PixelToMapIndex( const Point&) const;
- void SelectIndex( int index, BOOL bFocus = FALSE );
+ void SelectIndex( int index, sal_Bool bFocus = sal_False );
void DeSelect();
- inline sal_Bool IsSelected(USHORT _nPos) const { return _nPos == nSelectedIndex; }
- inline USHORT GetSelectIndexId() const { return sal::static_int_cast<USHORT>(nSelectedIndex); }
- USHORT GetRowPos(USHORT _nPos) const;
- USHORT GetColumnPos(USHORT _nPos) const;
+ inline sal_Bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; }
+ inline sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); }
+ sal_uInt16 GetRowPos(sal_uInt16 _nPos) const;
+ sal_uInt16 GetColumnPos(sal_uInt16 _nPos) const;
void ImplFireAccessibleEvent( short nEventId,
const ::com::sun::star::uno::Any& rOldValue,
@@ -119,7 +119,7 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccessible;
long nX;
long nY;
- BOOL bDrag;
+ sal_Bool bDrag;
sal_Int32 nSelectedIndex;
@@ -130,7 +130,7 @@ private:
private:
void DrawChars_Impl( int n1, int n2);
- void InitSettings( BOOL bForeground, BOOL bBackground);
+ void InitSettings( sal_Bool bForeground, sal_Bool bBackground);
// abstraction layers are: Unicode<->MapIndex<->Pixel
Point MapIndexToPixel( int) const;
DECL_LINK( VscrollHdl, ScrollBar* );
diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx
index b72b134e48d8..073284d02617 100644
--- a/svx/inc/svx/checklbx.hxx
+++ b/svx/inc/svx/checklbx.hxx
@@ -54,8 +54,8 @@ private:
using SvTreeListBox::InsertEntry;
// Avoid ambiguity with new InsertEntry:
virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent,
- BOOL bChildsOnDemand,
- ULONG nPos, void* pUserData,
+ sal_Bool bChildsOnDemand,
+ sal_uIntPtr nPos, void* pUserData,
SvLBoxButtonKind eButtonKind );
public:
@@ -67,23 +67,23 @@ public:
~SvxCheckListBox();
void InsertEntry ( const String& rStr,
- USHORT nPos = LISTBOX_APPEND,
+ sal_uInt16 nPos = LISTBOX_APPEND,
void* pUserData = NULL,
SvLBoxButtonKind eButtonKind =
SvLBoxButtonKind_enabledCheckbox );
- void RemoveEntry ( USHORT nPos );
+ void RemoveEntry ( sal_uInt16 nPos );
- void SelectEntryPos ( USHORT nPos, BOOL bSelect = TRUE );
- USHORT GetSelectEntryPos () const;
+ void SelectEntryPos ( sal_uInt16 nPos, sal_Bool bSelect = sal_True );
+ sal_uInt16 GetSelectEntryPos () const;
- String GetText ( USHORT nPos ) const;
- USHORT GetCheckedEntryCount() const;
- void CheckEntryPos ( USHORT nPos, BOOL bCheck = TRUE );
- BOOL IsChecked ( USHORT nPos ) const;
+ String GetText ( sal_uInt16 nPos ) const;
+ sal_uInt16 GetCheckedEntryCount() const;
+ void CheckEntryPos ( sal_uInt16 nPos, sal_Bool bCheck = sal_True );
+ sal_Bool IsChecked ( sal_uInt16 nPos ) const;
void ToggleCheckButton ( SvLBoxEntry* pEntry );
- void* SetEntryData ( USHORT nPos, void* pNewData );
- void* GetEntryData ( USHORT nPos ) const;
+ void* SetEntryData ( sal_uInt16 nPos, void* pNewData );
+ void* GetEntryData ( sal_uInt16 nPos ) const;
virtual void MouseButtonDown ( const MouseEvent& rMEvt );
virtual void KeyInput ( const KeyEvent& rKEvt );
diff --git a/svx/inc/svx/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx
index 1cb9c2068f01..bc68bf1df705 100644
--- a/svx/inc/svx/chrtitem.hxx
+++ b/svx/inc/svx/chrtitem.hxx
@@ -192,13 +192,13 @@ class SVX_DLLPUBLIC SvxChartStyleItem : public SfxEnumItem
public:
TYPEINFO();
SvxChartStyleItem(SvxChartStyle eStyle /*= CHSTYLE_2D_LINE*/,
- USHORT nId );
- SvxChartStyleItem(SvStream& rIn, USHORT nId );
+ sal_uInt16 nId );
+ SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId );
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
- USHORT GetValueCount() const { return CHSTYLE_COUNT; }
+ sal_uInt16 GetValueCount() const { return CHSTYLE_COUNT; }
SvxChartStyle GetValue() const
{ return (SvxChartStyle)SfxEnumItem::GetValue(); }
};
@@ -210,16 +210,16 @@ class SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem
public:
TYPEINFO();
SvxChartRegressItem(SvxChartRegress eRegress /*= CHREGRESS_LINEAR*/,
- USHORT nId );
- SvxChartRegressItem(SvStream& rIn, USHORT nId );
+ sal_uInt16 nId );
+ SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId );
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
- USHORT GetValueCount() const { return CHREGRESS_COUNT; }
+ sal_uInt16 GetValueCount() const { return CHREGRESS_COUNT; }
SvxChartRegress GetValue() const
{ return (SvxChartRegress)SfxEnumItem::GetValue(); }
- USHORT GetVersion (USHORT nFileFormatVersion) const;
+ sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const;
};
//------------------------------------------------------------------
@@ -229,14 +229,14 @@ class SVX_DLLPUBLIC SvxChartDataDescrItem : public SfxEnumItem
public:
TYPEINFO();
SvxChartDataDescrItem(SvxChartDataDescr eDataDescr /*= CHDESCR_NONE*/,
- USHORT nId );
+ sal_uInt16 nId );
SvxChartDataDescrItem(SvStream& rIn,
- USHORT nId );
+ sal_uInt16 nId );
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
- USHORT GetValueCount() const { return CHDESCR_COUNT; }
+ sal_uInt16 GetValueCount() const { return CHDESCR_COUNT; }
SvxChartDataDescr GetValue() const
{ return (SvxChartDataDescr)SfxEnumItem::GetValue(); }
};
@@ -248,14 +248,14 @@ class SVX_DLLPUBLIC SvxChartLegendPosItem : public SfxEnumItem
public:
TYPEINFO();
SvxChartLegendPosItem(SvxChartLegendPos eLegendPos /*= CHLEGEND_NONE*/,
- USHORT nId );
+ sal_uInt16 nId );
SvxChartLegendPosItem(SvStream& rIn,
- USHORT nId );
+ sal_uInt16 nId );
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
- USHORT GetValueCount() const { return CHLEGEND_COUNT; }
+ sal_uInt16 GetValueCount() const { return CHLEGEND_COUNT; }
SvxChartLegendPos GetValue() const
{ return (SvxChartLegendPos)SfxEnumItem::GetValue(); }
};
@@ -267,17 +267,17 @@ class SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem
public:
TYPEINFO();
SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= CHTXTORDER_SIDEBYSIDE*/,
- USHORT nId );
+ sal_uInt16 nId );
SvxChartTextOrderItem(SvStream& rIn,
- USHORT nId );
+ sal_uInt16 nId );
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- USHORT GetValueCount() const { return CHTXTORDER_COUNT; }
+ sal_uInt16 GetValueCount() const { return CHTXTORDER_COUNT; }
SvxChartTextOrder GetValue() const
{ return (SvxChartTextOrder)SfxEnumItem::GetValue(); }
};
@@ -289,14 +289,14 @@ class SVX_DLLPUBLIC SvxChartTextOrientItem : public SfxEnumItem
public:
TYPEINFO();
SvxChartTextOrientItem(SvxChartTextOrient /*eOrient = CHTXTORIENT_STANDARD*/,
- USHORT nId );
+ sal_uInt16 nId );
SvxChartTextOrientItem(SvStream& rIn,
- USHORT nId );
+ sal_uInt16 nId );
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
- USHORT GetValueCount() const { return CHTXTORDER_COUNT; }
+ sal_uInt16 GetValueCount() const { return CHTXTORDER_COUNT; }
SvxChartTextOrient GetValue() const
{ return (SvxChartTextOrient)SfxEnumItem::GetValue(); }
};
@@ -308,18 +308,18 @@ class SVX_DLLPUBLIC SvxChartKindErrorItem : public SfxEnumItem
public:
TYPEINFO();
SvxChartKindErrorItem(SvxChartKindError /*eOrient = CHERROR_NONE*/,
- USHORT nId );
+ sal_uInt16 nId );
SvxChartKindErrorItem(SvStream& rIn,
- USHORT nId );
+ sal_uInt16 nId );
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
- USHORT GetValueCount() const { return CHERROR_COUNT; }
+ sal_uInt16 GetValueCount() const { return CHERROR_COUNT; }
SvxChartKindError GetValue() const
{ return (SvxChartKindError)SfxEnumItem::GetValue(); }
- USHORT GetVersion (USHORT nFileFormatVersion) const;
+ sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const;
};
//------------------------------------------------------------------
@@ -329,18 +329,18 @@ class SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem
public:
TYPEINFO();
SvxChartIndicateItem(SvxChartIndicate eOrient /*= CHINDICATE_NONE*/,
- USHORT nId );
+ sal_uInt16 nId );
SvxChartIndicateItem(SvStream& rIn,
- USHORT nId );
+ sal_uInt16 nId );
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
- USHORT GetValueCount() const { return CHINDICATE_COUNT; }
+ sal_uInt16 GetValueCount() const { return CHINDICATE_COUNT; }
SvxChartIndicate GetValue() const
{ return (SvxChartIndicate)SfxEnumItem::GetValue(); }
- USHORT GetVersion (USHORT nFileFormatVersion) const;
+ sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const;
};
//------------------------------------------------------------------
@@ -351,13 +351,13 @@ class SVX_DLLPUBLIC SvxDoubleItem : public SfxPoolItem
public:
TYPEINFO();
- SvxDoubleItem(double fValue /*= 0.0*/, USHORT nId );
- SvxDoubleItem(SvStream& rIn, USHORT nId );
+ SvxDoubleItem(double fValue /*= 0.0*/, sal_uInt16 nId );
+ SvxDoubleItem(SvStream& rIn, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
@@ -369,8 +369,8 @@ public:
virtual int operator == (const SfxPoolItem&) const;
virtual SfxPoolItem* Clone(SfxItemPool *pPool = NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVersion) const;
- virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVersion) const;
+ virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
virtual double GetMin() const;
virtual double GetMax() const;
diff --git a/svx/inc/svx/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx
index 22480ab1e728..bcfafe6c93f7 100644
--- a/svx/inc/svx/clipboardctl.hxx
+++ b/svx/inc/svx/clipboardctl.hxx
@@ -43,20 +43,20 @@ class SVX_DLLPUBLIC SvxClipBoardControl : public SfxToolBoxControl
{
SfxPoolItem* pClipboardFmtItem;
PopupMenu* pPopup;
- USHORT nItemId;
- BOOL bDisabled;
+ sal_uInt16 nItemId;
+ sal_Bool bDisabled;
void DelPopup();
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxClipBoardControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxClipBoardControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxClipBoardControl();
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
- virtual void StateChanged( USHORT nSID,
+ virtual void StateChanged( sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState );
};
diff --git a/svx/inc/svx/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx
index 74687d56d38b..79a430892e89 100644
--- a/svx/inc/svx/clipfmtitem.hxx
+++ b/svx/inc/svx/clipfmtitem.hxx
@@ -46,20 +46,20 @@ protected:
public:
TYPEINFO();
- SvxClipboardFmtItem( USHORT nId = 0 );
+ SvxClipboardFmtItem( sal_uInt16 nId = 0 );
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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
- void AddClipbrdFormat( ULONG nId, USHORT nPos = USHRT_MAX );
- void AddClipbrdFormat( ULONG nId, const String& rName,
- USHORT nPos = USHRT_MAX );
- USHORT Count() const;
+ void AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos = USHRT_MAX );
+ void AddClipbrdFormat( sal_uIntPtr nId, const String& rName,
+ sal_uInt16 nPos = USHRT_MAX );
+ sal_uInt16 Count() const;
- ULONG GetClipbrdFormatId( USHORT nPos ) const;
- const String& GetClipbrdFormatName( USHORT nPos ) const;
+ sal_uIntPtr GetClipbrdFormatId( sal_uInt16 nPos ) const;
+ const String& GetClipbrdFormatName( sal_uInt16 nPos ) const;
};
diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx
index e6908d98c152..c13d01c8a768 100644
--- a/svx/inc/svx/colrctrl.hxx
+++ b/svx/inc/svx/colrctrl.hxx
@@ -49,7 +49,7 @@ class SvxColorValueSet : public ValueSet, public DragSourceHelper
private:
- BOOL bLeft;
+ sal_Bool bLeft;
Point aDragPosPixel;
protected:
@@ -70,7 +70,7 @@ public:
SvxColorValueSet( Window* pParent, WinBits nWinStyle = WB_ITEMBORDER );
SvxColorValueSet( Window* pParent, const ResId& rResId );
- BOOL IsLeftButton() const { return bLeft; }
+ sal_Bool IsLeftButton() const { return bLeft; }
};
/*************************************************************************
@@ -82,7 +82,7 @@ public:
class SVX_DLLPUBLIC SvxColorChildWindow : public SfxChildWindow
{
public:
- SvxColorChildWindow( Window*, USHORT, SfxBindings*,
+ SvxColorChildWindow( Window*, sal_uInt16, SfxBindings*,
SfxChildWinInfo* );
SFX_DECL_CHILDWINDOW(SvxColorChildWindow);
@@ -101,10 +101,10 @@ class SvxColorDockingWindow : public SfxDockingWindow, public SfxListener
private:
XColorTable* pColorTable;
SvxColorValueSet aColorSet;
- USHORT nLeftSlot;
- USHORT nRightSlot;
- USHORT nCols;
- USHORT nLines;
+ sal_uInt16 nLeftSlot;
+ sal_uInt16 nRightSlot;
+ sal_uInt16 nCols;
+ sal_uInt16 nLines;
long nCount;
Size aColorSize;
Size aItemSize;
@@ -122,7 +122,7 @@ private:
//#endif
protected:
- virtual BOOL Close();
+ virtual sal_Bool Close();
virtual void Resize();
virtual void Resizing( Size& rSize );
@@ -135,7 +135,7 @@ public:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
- void SetSlotIDs( USHORT nLeft, USHORT nRight )
+ void SetSlotIDs( sal_uInt16 nLeft, sal_uInt16 nRight )
{ nLeftSlot = nLeft; nRightSlot = nRight; }
virtual long Notify( NotifyEvent& rNEvt );
diff --git a/svx/inc/svx/connctrl.hxx b/svx/inc/svx/connctrl.hxx
index 468fffcc43b7..daab7e093ef1 100644
--- a/svx/inc/svx/connctrl.hxx
+++ b/svx/inc/svx/connctrl.hxx
@@ -64,7 +64,7 @@ public:
virtual void MouseButtonDown( const MouseEvent& rMEvt );
void SetAttributes( const SfxItemSet& rInAttrs );
- USHORT GetLineDeltaAnz();
+ sal_uInt16 GetLineDeltaAnz();
void Construct();
void SetView( const SdrView* pSdrView ) { pView = pSdrView; }
diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx
index 034ec5485536..c0e78425dcdd 100644
--- a/svx/inc/svx/contdlg.hxx
+++ b/svx/inc/svx/contdlg.hxx
@@ -45,11 +45,11 @@ class SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow
{
public:
- SvxContourDlgChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+ SvxContourDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
SFX_DECL_CHILDWINDOW( SvxContourDlgChildWindow );
- static void UpdateContourDlg( const Graphic& rGraphic, BOOL bGraphicLinked,
+ static void UpdateContourDlg( const Graphic& rGraphic, sal_Bool bGraphicLinked,
const PolyPolygon* pPolyPoly = NULL,
void* pEditingObj = NULL );
};
@@ -71,11 +71,11 @@ class SvxContourDlgItem : public SfxControllerItem
protected:
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
public:
- SvxContourDlgItem( USHORT nId, SvxSuperContourDlg& rDlg, SfxBindings& rBindings );
+ SvxContourDlgItem( sal_uInt16 nId, SvxSuperContourDlg& rDlg, SfxBindings& rBindings );
};
/*************************************************************************
@@ -104,12 +104,12 @@ public:
Window* pParent, const ResId& rResId );
~SvxContourDlg();
- void SetExecState( BOOL bEnable );
+ void SetExecState( sal_Bool bEnable );
void SetGraphic( const Graphic& rGraphic );
- void SetGraphicLinked( BOOL bLinked );
+ void SetGraphicLinked( sal_Bool bLinked );
const Graphic& GetGraphic() const;
- BOOL IsGraphicChanged() const;
+ sal_Bool IsGraphicChanged() const;
void SetPolyPolygon( const PolyPolygon& rPolyPoly );
PolyPolygon GetPolyPolygon();
@@ -117,12 +117,12 @@ public:
void SetEditingObject( void* pObj );
const void* GetEditingObject() const;
- void Update( const Graphic& rGraphic, BOOL bGraphicLinked,
+ void Update( const Graphic& rGraphic, sal_Bool bGraphicLinked,
const PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL );
static PolyPolygon CreateAutoContour( const Graphic& rGraphic,
const Rectangle* pRect = NULL,
- const ULONG nFlags = 0L );
+ const sal_uIntPtr nFlags = 0L );
static void ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic,
const MapUnit eUnit, const Size& rDisplaySize );
};
diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx
index abedd54f0c00..1189a7a8a7be 100644
--- a/svx/inc/svx/ctredlin.hxx
+++ b/svx/inc/svx/ctredlin.hxx
@@ -64,7 +64,7 @@ class SVX_DLLPUBLIC RedlinData
public:
RedlinData();
virtual ~RedlinData();
- BOOL bDisabled;
+ sal_Bool bDisabled;
DateTime aDateTime;
void* pData;
};
@@ -84,12 +84,12 @@ private:
Color aPrivColor;
public:
- SvLBoxColorString( SvLBoxEntry*,USHORT nFlags,const XubString& rStr,
+ SvLBoxColorString( SvLBoxEntry*,sal_uInt16 nFlags,const XubString& rStr,
const Color& rCol);
SvLBoxColorString();
~SvLBoxColorString();
- void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* );
+ void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
SvLBoxItem* Create() const;
};
@@ -99,12 +99,12 @@ class SVX_DLLPUBLIC SvxRedlinTable : public SvxSimpleTable
private:
- BOOL bIsCalc;
- USHORT nDatePos;
- BOOL bAuthor;
- BOOL bDate;
- BOOL bComment;
- USHORT nDaTiMode;
+ sal_Bool bIsCalc;
+ sal_uInt16 nDatePos;
+ sal_Bool bAuthor;
+ sal_Bool bDate;
+ sal_Bool bComment;
+ sal_uInt16 nDaTiMode;
DateTime aDaTiFirst;
DateTime aDaTiLast;
DateTime aDaTiFilterFirst;
@@ -129,35 +129,35 @@ public:
~SvxRedlinTable();
// For FilterPage only {
- void SetFilterDate(BOOL bFlag=TRUE);
- void SetDateTimeMode(USHORT nMode);
+ void SetFilterDate(sal_Bool bFlag=sal_True);
+ void SetDateTimeMode(sal_uInt16 nMode);
void SetFirstDate(const Date&);
void SetLastDate(const Date&);
void SetFirstTime(const Time&);
void SetLastTime(const Time&);
- void SetFilterAuthor(BOOL bFlag=TRUE);
+ void SetFilterAuthor(sal_Bool bFlag=sal_True);
void SetAuthor(const String &);
- void SetFilterComment(BOOL bFlag=TRUE);
+ void SetFilterComment(sal_Bool bFlag=sal_True);
void SetCommentParams( const utl::SearchParam* pSearchPara );
void UpdateFilterTest();
// } For FilterPage only
- void SetCalcView(BOOL bFlag=TRUE);
- BOOL IsValidCalcEntry(const String& ,RedlinData *pUserData);
- BOOL IsValidWriterEntry(const String& ,RedlinData *pUserData);
+ void SetCalcView(sal_Bool bFlag=sal_True);
+ sal_Bool IsValidCalcEntry(const String& ,RedlinData *pUserData);
+ sal_Bool IsValidWriterEntry(const String& ,RedlinData *pUserData);
// keine NULL-Ptr. ueberpruefung {
- BOOL IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment);
- BOOL IsValidEntry(const String* pAuthor,const DateTime *pDateTime);
- BOOL IsValidComment(const String* pComment);
+ sal_Bool IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment);
+ sal_Bool IsValidEntry(const String* pAuthor,const DateTime *pDateTime);
+ sal_Bool IsValidComment(const String* pComment);
// }
SvLBoxEntry* InsertEntry(const String& ,RedlinData *pUserData,
- SvLBoxEntry* pParent=NULL,ULONG nPos=LIST_APPEND);
+ SvLBoxEntry* pParent=NULL,sal_uIntPtr nPos=LIST_APPEND);
SvLBoxEntry* InsertEntry(const String& ,RedlinData *pUserData,const Color&,
- SvLBoxEntry* pParent=NULL,ULONG nPos=LIST_APPEND);
+ SvLBoxEntry* pParent=NULL,sal_uIntPtr nPos=LIST_APPEND);
virtual SvLBoxEntry* CreateEntry() const;
@@ -204,7 +204,7 @@ private:
String aActionStr;
String aRangeStr;
String aStrMyName;
- BOOL bModified;
+ sal_Bool bModified;
DECL_LINK( SelDateHdl, ListBox* );
DECL_LINK( RowEnableHdl, CheckBox* );
@@ -216,9 +216,9 @@ private:
protected:
- void ShowDateFields(USHORT nKind);
- void EnableDateLine1(BOOL bFlag);
- void EnableDateLine2(BOOL bFlag);
+ void ShowDateFields(sal_uInt16 nKind);
+ void EnableDateLine1(sal_Bool bFlag);
+ void EnableDateLine2(sal_Bool bFlag);
public:
SvxTPFilter( Window * pParent);
@@ -237,15 +237,15 @@ public:
Time GetLastTime() const;
void SetLastTime(const Time &aTime);
- void SetDateMode(USHORT nMode);
- USHORT GetDateMode();
+ void SetDateMode(sal_uInt16 nMode);
+ sal_uInt16 GetDateMode();
void ClearAuthors();
- void InsertAuthor( const String& rString, USHORT nPos = LISTBOX_APPEND );
- USHORT GetSelectedAuthorPos();
+ void InsertAuthor( const String& rString, sal_uInt16 nPos = LISTBOX_APPEND );
+ sal_uInt16 GetSelectedAuthorPos();
String GetSelectedAuthor()const;
- void SelectedAuthorPos(USHORT nPos);
- USHORT SelectAuthor(const String& aString);
+ void SelectedAuthorPos(sal_uInt16 nPos);
+ sal_uInt16 SelectAuthor(const String& aString);
void SetComment(const String &rComment);
String GetComment()const;
@@ -253,27 +253,27 @@ public:
// Methoden fuer Calc {
void SetRange(const String& rString);
String GetRange() const;
- void HideRange(BOOL bHide=TRUE);
- void DisableRange(BOOL bFlag=TRUE);
+ void HideRange(sal_Bool bHide=sal_True);
+ void DisableRange(sal_Bool bFlag=sal_True);
void SetFocusToRange();
// } Methoden fuer Calc
- void HideClocks(BOOL bHide=TRUE);
- void DisableRef(BOOL bFlag);
+ void HideClocks(sal_Bool bHide=sal_True);
+ void DisableRef(sal_Bool bFlag);
- BOOL IsDate();
- BOOL IsAuthor();
- BOOL IsRange();
- BOOL IsAction();
- BOOL IsComment();
+ sal_Bool IsDate();
+ sal_Bool IsAuthor();
+ sal_Bool IsRange();
+ sal_Bool IsAction();
+ sal_Bool IsComment();
- void ShowAction(BOOL bShow=TRUE);
+ void ShowAction(sal_Bool bShow=sal_True);
- void CheckDate(BOOL bFlag=TRUE);
- void CheckAuthor(BOOL bFlag=TRUE);
- void CheckRange(BOOL bFlag=TRUE);
- void CheckAction(BOOL bFlag=TRUE);
- void CheckComment(BOOL bFlag=TRUE);
+ void CheckDate(sal_Bool bFlag=sal_True);
+ void CheckAuthor(sal_Bool bFlag=sal_True);
+ void CheckRange(sal_Bool bFlag=sal_True);
+ void CheckAction(sal_Bool bFlag=sal_True);
+ void CheckComment(sal_Bool bFlag=sal_True);
ListBox* GetLbAction();
@@ -352,21 +352,21 @@ public:
void InsertCalcHeader();
SvxRedlinTable* GetTableControl();
- void EnableAccept(BOOL nFlag=TRUE);
- void EnableAcceptAll(BOOL nFlag=TRUE);
- void EnableReject(BOOL nFlag=TRUE);
- void EnableRejectAll(BOOL nFlag=TRUE);
- void EnableUndo(BOOL nFlag=TRUE);
+ void EnableAccept(sal_Bool nFlag=sal_True);
+ void EnableAcceptAll(sal_Bool nFlag=sal_True);
+ void EnableReject(sal_Bool nFlag=sal_True);
+ void EnableRejectAll(sal_Bool nFlag=sal_True);
+ void EnableUndo(sal_Bool nFlag=sal_True);
- void DisableAccept() {EnableAccept(FALSE);}
- void DisableAcceptAll() {EnableAcceptAll(FALSE);}
- void DisableReject() {EnableReject(FALSE);}
- void DisableRejectAll() {EnableRejectAll(FALSE);}
- void DisableUndo() {EnableUndo(FALSE);}
+ void DisableAccept() {EnableAccept(sal_False);}
+ void DisableAcceptAll() {EnableAcceptAll(sal_False);}
+ void DisableReject() {EnableReject(sal_False);}
+ void DisableRejectAll() {EnableRejectAll(sal_False);}
+ void DisableUndo() {EnableUndo(sal_False);}
- void ShowUndo(BOOL nFlag=TRUE);
- void HideUndo() {ShowUndo(FALSE);}
- BOOL IsUndoVisible();
+ void ShowUndo(sal_Bool nFlag=sal_True);
+ void HideUndo() {ShowUndo(sal_False);}
+ sal_Bool IsUndoVisible();
Size GetMinSizePixel();
@@ -415,8 +415,8 @@ public:
void ShowFilterPage();
void ShowViewPage();
- BOOL IsFilterPageVisible();
- BOOL IsViewPageVisible();
+ sal_Bool IsFilterPageVisible();
+ sal_Bool IsViewPageVisible();
SvxTPFilter* GetFilterPage();
SvxTPView* GetViewPage();
diff --git a/svx/inc/svx/cube3d.hxx b/svx/inc/svx/cube3d.hxx
index 00da40a852e9..a69a06ab721c 100644
--- a/svx/inc/svx/cube3d.hxx
+++ b/svx/inc/svx/cube3d.hxx
@@ -55,7 +55,7 @@ private:
// Parameter
basegfx::B3DPoint aCubePos;
basegfx::B3DVector aCubeSize;
- UINT16 nSideFlags;
+ sal_uInt16 nSideFlags;
// BOOLeans
unsigned bPosIsCenter : 1;
@@ -69,8 +69,8 @@ public:
E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, const basegfx::B3DVector& r3DSize);
E3dCubeObj();
- virtual UINT16 GetObjIdentifier() const;
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+ virtual sal_uInt16 GetObjIdentifier() const;
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
virtual void operator=(const SdrObject&);
@@ -81,11 +81,11 @@ public:
void SetCubeSize(const basegfx::B3DVector& rNew);
const basegfx::B3DVector& GetCubeSize() { return aCubeSize; }
- void SetPosIsCenter(BOOL bNew);
- BOOL GetPosIsCenter() { return (BOOL)bPosIsCenter; }
+ void SetPosIsCenter(sal_Bool bNew);
+ sal_Bool GetPosIsCenter() { return (sal_Bool)bPosIsCenter; }
- void SetSideFlags(UINT16 nNew);
- UINT16 GetSideFlags() { return nSideFlags; }
+ void SetSideFlags(sal_uInt16 nNew);
+ sal_uInt16 GetSideFlags() { return nSideFlags; }
// TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
virtual void TakeObjNameSingul(String& rName) const;
diff --git a/svx/inc/svx/databaseregistrationui.hxx b/svx/inc/svx/databaseregistrationui.hxx
index 123e5af7d5a8..d168ed5b036b 100644
--- a/svx/inc/svx/databaseregistrationui.hxx
+++ b/svx/inc/svx/databaseregistrationui.hxx
@@ -44,7 +44,7 @@ namespace svx
/** opens a dialog which allows the user to administrate the database registrations
*/
- USHORT SVX_DLLPUBLIC administrateDatabaseRegistration( Window* _parentWindow );
+ sal_uInt16 SVX_DLLPUBLIC administrateDatabaseRegistration( Window* _parentWindow );
//........................................................................
} // namespace svx
diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx
index 0894540d1972..7df0dd5c38cb 100755
--- a/svx/inc/svx/dbtoolsclient.hxx
+++ b/svx/inc/svx/dbtoolsclient.hxx
@@ -57,7 +57,7 @@ namespace svxform
static ::connectivity::simple::createDataAccessToolsFactoryFunction
s_pFactoryCreationFunc;
//add by BerryJia for fixing Bug97420 Time:2002-9-12-11:00(PRC time)
- mutable BOOL m_bCreateAlready;
+ mutable sal_Bool m_bCreateAlready;
private:
mutable ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory > m_xDataAccessFactory;
diff --git a/svx/inc/svx/deflt3d.hxx b/svx/inc/svx/deflt3d.hxx
index cfd05a652fe0..c09cbafd8e1f 100644
--- a/svx/inc/svx/deflt3d.hxx
+++ b/svx/inc/svx/deflt3d.hxx
@@ -44,14 +44,14 @@ class SVX_DLLPUBLIC E3dDefaultAttributes
private:
// Compound-Objekt
Color aDefaultAmbientColor;
- BOOL bDefaultCreateNormals;
- BOOL bDefaultCreateTexture;
+ sal_Bool bDefaultCreateNormals;
+ sal_Bool bDefaultCreateTexture;
// Cube-Objekt
basegfx::B3DPoint aDefaultCubePos;
basegfx::B3DVector aDefaultCubeSize;
- UINT16 nDefaultCubeSideFlags;
- BOOL bDefaultCubePosIsCenter;
+ sal_uInt16 nDefaultCubeSideFlags;
+ sal_Bool bDefaultCubePosIsCenter;
// Sphere-Objekt
basegfx::B3DPoint aDefaultSphereCenter;
@@ -59,18 +59,18 @@ private:
// Lathe-Objekt
long nDefaultLatheEndAngle;
- BOOL bDefaultLatheSmoothed;
- BOOL bDefaultLatheSmoothFrontBack;
- BOOL bDefaultLatheCharacterMode;
- BOOL bDefaultLatheCloseFront;
- BOOL bDefaultLatheCloseBack;
+ sal_Bool bDefaultLatheSmoothed;
+ sal_Bool bDefaultLatheSmoothFrontBack;
+ sal_Bool bDefaultLatheCharacterMode;
+ sal_Bool bDefaultLatheCloseFront;
+ sal_Bool bDefaultLatheCloseBack;
// Extrude-Objekt
- BOOL bDefaultExtrudeSmoothed;
- BOOL bDefaultExtrudeSmoothFrontBack;
- BOOL bDefaultExtrudeCharacterMode;
- BOOL bDefaultExtrudeCloseFront;
- BOOL bDefaultExtrudeCloseBack;
+ sal_Bool bDefaultExtrudeSmoothed;
+ sal_Bool bDefaultExtrudeSmoothFrontBack;
+ sal_Bool bDefaultExtrudeCharacterMode;
+ sal_Bool bDefaultExtrudeCloseFront;
+ sal_Bool bDefaultExtrudeCloseBack;
public:
// Konstruktor
@@ -84,20 +84,20 @@ public:
const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; }
void SetDefaultAmbientColor(const Color& rNew) { aDefaultAmbientColor = rNew; }
- BOOL GetDefaultCreateNormals() const { return bDefaultCreateNormals; }
- void SetDefaultCreateNormals(const BOOL bNew) { bDefaultCreateNormals = bNew; }
- BOOL GetDefaultCreateTexture() const { return bDefaultCreateTexture; }
- void SetDefaultCreateTexture(const BOOL bNew) { bDefaultCreateTexture = bNew; }
+ sal_Bool GetDefaultCreateNormals() const { return bDefaultCreateNormals; }
+ void SetDefaultCreateNormals(const sal_Bool bNew) { bDefaultCreateNormals = bNew; }
+ sal_Bool GetDefaultCreateTexture() const { return bDefaultCreateTexture; }
+ void SetDefaultCreateTexture(const sal_Bool bNew) { bDefaultCreateTexture = bNew; }
// Cube-Objekt
const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; }
void SetDefaultCubePos(const basegfx::B3DPoint& rNew) { aDefaultCubePos = rNew; }
const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; }
void SetDefaultCubeSize(const basegfx::B3DVector& rNew) { aDefaultCubeSize = rNew; }
- UINT16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; }
- void SetDefaultCubeSideFlags(const UINT16 nNew) { nDefaultCubeSideFlags = nNew; }
- BOOL GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; }
- void SetDefaultCubePosIsCenter(const BOOL bNew) { bDefaultCubePosIsCenter = bNew; }
+ sal_uInt16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; }
+ void SetDefaultCubeSideFlags(const sal_uInt16 nNew) { nDefaultCubeSideFlags = nNew; }
+ sal_Bool GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; }
+ void SetDefaultCubePosIsCenter(const sal_Bool bNew) { bDefaultCubePosIsCenter = bNew; }
// Sphere-Objekt
const basegfx::B3DPoint& GetDefaultSphereCenter() { return aDefaultSphereCenter; }
@@ -108,28 +108,28 @@ public:
// Lathe-Objekt
long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; }
void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; }
- BOOL GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; }
- void SetDefaultLatheSmoothed(const BOOL bNew) { bDefaultLatheSmoothed = bNew; }
- BOOL GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; }
- void SetDefaultLatheSmoothFrontBack(const BOOL bNew) { bDefaultLatheSmoothFrontBack = bNew; }
- BOOL GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; }
- void SetDefaultLatheCharacterMode(const BOOL bNew) { bDefaultLatheCharacterMode = bNew; }
- BOOL GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; }
- void SetDefaultLatheCloseFront(const BOOL bNew) { bDefaultLatheCloseFront = bNew; }
- BOOL GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; }
- void SetDefaultLatheCloseBack(const BOOL bNew) { bDefaultLatheCloseBack = bNew; }
+ sal_Bool GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; }
+ void SetDefaultLatheSmoothed(const sal_Bool bNew) { bDefaultLatheSmoothed = bNew; }
+ sal_Bool GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; }
+ void SetDefaultLatheSmoothFrontBack(const sal_Bool bNew) { bDefaultLatheSmoothFrontBack = bNew; }
+ sal_Bool GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; }
+ void SetDefaultLatheCharacterMode(const sal_Bool bNew) { bDefaultLatheCharacterMode = bNew; }
+ sal_Bool GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; }
+ void SetDefaultLatheCloseFront(const sal_Bool bNew) { bDefaultLatheCloseFront = bNew; }
+ sal_Bool GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; }
+ void SetDefaultLatheCloseBack(const sal_Bool bNew) { bDefaultLatheCloseBack = bNew; }
// Extrude-Objekt
- BOOL GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; }
- void SetDefaultExtrudeSmoothed(const BOOL bNew) { bDefaultExtrudeSmoothed = bNew; }
- BOOL GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; }
- void SetDefaultExtrudeSmoothFrontBack(const BOOL bNew) { bDefaultExtrudeSmoothFrontBack = bNew; }
- BOOL GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; }
- void SetDefaultExtrudeCharacterMode(const BOOL bNew) { bDefaultExtrudeCharacterMode = bNew; }
- BOOL GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; }
- void SetDefaultExtrudeCloseFront(const BOOL bNew) { bDefaultExtrudeCloseFront = bNew; }
- BOOL GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; }
- void SetDefaultExtrudeCloseBack(const BOOL bNew) { bDefaultExtrudeCloseBack = bNew; }
+ sal_Bool GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; }
+ void SetDefaultExtrudeSmoothed(const sal_Bool bNew) { bDefaultExtrudeSmoothed = bNew; }
+ sal_Bool GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; }
+ void SetDefaultExtrudeSmoothFrontBack(const sal_Bool bNew) { bDefaultExtrudeSmoothFrontBack = bNew; }
+ sal_Bool GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; }
+ void SetDefaultExtrudeCharacterMode(const sal_Bool bNew) { bDefaultExtrudeCharacterMode = bNew; }
+ sal_Bool GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; }
+ void SetDefaultExtrudeCloseFront(const sal_Bool bNew) { bDefaultExtrudeCloseFront = bNew; }
+ sal_Bool GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; }
+ void SetDefaultExtrudeCloseBack(const sal_Bool bNew) { bDefaultExtrudeCloseBack = bNew; }
};
#endif // _E3D_DEFLT3D_HXX
diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx
index 28b1bf1b9b6f..a6c2ce21829e 100644
--- a/svx/inc/svx/dlgctrl.hxx
+++ b/svx/inc/svx/dlgctrl.hxx
@@ -82,7 +82,7 @@ public:
|* eines Objekts
|*
\************************************************************************/
-typedef UINT16 CTL_STATE;
+typedef sal_uInt16 CTL_STATE;
#define CS_NOHORZ 1 // no horizontal input information is used
#define CS_NOVERT 2 // no vertikal input information is used
@@ -91,15 +91,15 @@ class SvxRectCtlAccessibleContext;
class SVX_DLLPUBLIC SvxRectCtl : public Control
{
private:
- SVX_DLLPRIVATE void InitSettings( BOOL bForeground, BOOL bBackground );
+ SVX_DLLPRIVATE void InitSettings( sal_Bool bForeground, sal_Bool bBackground );
SVX_DLLPRIVATE void InitRectBitmap( void );
SVX_DLLPRIVATE Bitmap& GetRectBitmap( void );
SVX_DLLPRIVATE void Resize_Impl();
protected:
SvxRectCtlAccessibleContext* pAccContext;
- USHORT nBorderWidth;
- USHORT nRadius;
+ sal_uInt16 nBorderWidth;
+ sal_uInt16 nRadius;
Size aSize;
Point aPtLT, aPtMT, aPtRT;
Point aPtLM, aPtMM, aPtRM;
@@ -124,7 +124,7 @@ protected:
Point GetApproxLogPtFromPixPt( const Point& rRoughPixelPoint ) const;
public:
SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt = RP_MM,
- USHORT nBorder = 200, USHORT nCircle = 80, CTL_STYLE eStyle = CS_RECT );
+ sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT );
virtual ~SvxRectCtl();
virtual void Paint( const Rectangle& rRect );
@@ -140,7 +140,7 @@ public:
void SetState( CTL_STATE nState );
- UINT8 GetNumOfChilds( void ) const; // returns number of usable radio buttons
+ sal_uInt8 GetNumOfChilds( void ) const; // returns number of usable radio buttons
Rectangle CalculateFocusRectangle( void ) const;
Rectangle CalculateFocusRectangle( RECT_POINT eRectPoint ) const;
@@ -168,7 +168,7 @@ private:
protected:
Font aFont;
Size aFontSize;
- BOOL bPositive;
+ sal_Bool bPositive;
public:
SvxAngleCtl( Window* pParent, const ResId& rResId );
@@ -189,9 +189,9 @@ class SVX_DLLPUBLIC SvxBitmapCtl
{
protected:
Size aSize;
- USHORT nLines;
+ sal_uInt16 nLines;
Color aPixelColor, aBackgroundColor;
- const USHORT* pBmpArray;
+ const sal_uInt16* pBmpArray;
public:
SvxBitmapCtl( Window* pParent, const Size& rSize );
@@ -199,8 +199,8 @@ public:
XOBitmap GetXBitmap();
- void SetBmpArray( const USHORT* pPixel ) { pBmpArray = pPixel; }
- void SetLines( USHORT nLns ) { nLines = nLns; }
+ void SetBmpArray( const sal_uInt16* pPixel ) { pBmpArray = pPixel; }
+ void SetLines( sal_uInt16 nLns ) { nLines = nLns; }
void SetPixelColor( Color aColor ) { aPixelColor = aColor; }
void SetBackgroundColor( Color aColor ) { aBackgroundColor = aColor; }
};
@@ -216,19 +216,19 @@ private:
using OutputDevice::SetLineColor;
protected:
- USHORT nLines, nSquares;
+ sal_uInt16 nLines, nSquares;
Color aPixelColor;
Color aBackgroundColor;
Color aLineColor;
Size aRectSize;
- USHORT* pPixel;
- BOOL bPaintable;
+ sal_uInt16* pPixel;
+ sal_Bool bPaintable;
- void ChangePixel( USHORT nPixel );
+ void ChangePixel( sal_uInt16 nPixel );
public:
SvxPixelCtl( Window* pParent, const ResId& rResId,
- USHORT nNumber = 8 );
+ sal_uInt16 nNumber = 8 );
~SvxPixelCtl();
virtual void Paint( const Rectangle& rRect );
@@ -240,14 +240,14 @@ public:
void SetBackgroundColor( const Color& rCol ) { aBackgroundColor = rCol; }
void SetLineColor( const Color& rCol ) { aLineColor = rCol; }
- USHORT GetLineCount() const { return nLines; }
+ sal_uInt16 GetLineCount() const { return nLines; }
Color GetPixelColor() const { return aPixelColor; }
Color GetBackgroundColor() const { return aBackgroundColor; }
- USHORT GetBitmapPixel( const USHORT nPixelNumber );
- USHORT* GetBitmapPixelPtr() { return pPixel; }
+ sal_uInt16 GetBitmapPixel( const sal_uInt16 nPixelNumber );
+ sal_uInt16* GetBitmapPixelPtr() { return pPixel; }
- void SetPaintable( BOOL bTmp ) { bPaintable = bTmp; }
+ void SetPaintable( sal_Bool bTmp ) { bPaintable = bTmp; }
void Reset();
};
@@ -266,7 +266,7 @@ public:
virtual void Fill( const XColorTable* pTab );
void Append( XColorEntry* pEntry, Bitmap* pBmp = NULL );
- void Modify( XColorEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+ void Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
};
/*************************************************************************
@@ -278,20 +278,20 @@ class SVX_DLLPUBLIC HatchingLB : public ListBox
{
public:
- HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE );
- HatchingLB( Window* pParent, WinBits aWB, BOOL bUserDraw = TRUE );
+ HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True );
+ HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw = sal_True );
virtual void Fill( const XHatchList* pList );
virtual void UserDraw( const UserDrawEvent& rUDEvt );
void Append( XHatchEntry* pEntry, Bitmap* pBmp = NULL );
- void Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+ void Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
void SelectEntryByList( const XHatchList* pList, const String& rStr,
- const XHatch& rXHatch, USHORT nDist = 0 );
+ const XHatch& rXHatch, sal_uInt16 nDist = 0 );
private:
XHatchList* mpList;
- BOOL mbUserDraw;
+ sal_Bool mbUserDraw;
};
/*************************************************************************
@@ -302,20 +302,20 @@ private:
class SVX_DLLPUBLIC GradientLB : public ListBox
{
public:
- GradientLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE );
- GradientLB( Window* pParent, WinBits aWB, BOOL bUserDraw = TRUE );
+ GradientLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True );
+ GradientLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw = sal_True );
virtual void Fill( const XGradientList* pList );
virtual void UserDraw( const UserDrawEvent& rUDEvt );
void Append( XGradientEntry* pEntry, Bitmap* pBmp = NULL );
- void Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+ void Modify( XGradientEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
void SelectEntryByList( const XGradientList* pList, const String& rStr,
- const XGradient& rXGradient, USHORT nDist = 0 );
+ const XGradient& rXGradient, sal_uInt16 nDist = 0 );
private:
XGradientList* mpList;
- BOOL mbUserDraw;
+ sal_Bool mbUserDraw;
};
/*************************************************************************
@@ -326,13 +326,13 @@ private:
class SVX_DLLPUBLIC BitmapLB : public ListBox
{
public:
- BitmapLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE );
+ BitmapLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True );
virtual void Fill( const XBitmapList* pList );
virtual void UserDraw( const UserDrawEvent& rUDEvt );
void Append( XBitmapEntry* pEntry, Bitmap* pBmp = NULL );
- void Modify( XBitmapEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+ void Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
void SelectEntryByList( const XBitmapList* pList, const String& rStr,
const Bitmap& rBmp);
@@ -341,7 +341,7 @@ private:
Bitmap aBitmap;
XBitmapList* mpList;
- BOOL mbUserDraw;
+ sal_Bool mbUserDraw;
SVX_DLLPRIVATE void SetVirtualDevice();
};
@@ -402,9 +402,9 @@ public:
virtual void Fill( const XDashList* pList );
void Append( XDashEntry* pEntry, Bitmap* pBmp = NULL );
- void Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL );
+ void Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL );
void SelectEntryByList( const XDashList* pList, const String& rStr,
- const XDash& rDash, USHORT nDist = 0 );
+ const XDash& rDash, sal_uInt16 nDist = 0 );
void FillStyles();
};
@@ -420,12 +420,12 @@ public:
LineEndLB( Window* pParent, ResId Id ) : ListBox( pParent, Id ) {}
LineEndLB( Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {}
- virtual void Fill( const XLineEndList* pList, BOOL bStart = TRUE );
+ virtual void Fill( const XLineEndList* pList, sal_Bool bStart = sal_True );
void Append( XLineEndEntry* pEntry, Bitmap* pBmp = NULL,
- BOOL bStart = TRUE );
- void Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL,
- BOOL bStart = TRUE );
+ sal_Bool bStart = sal_True );
+ void Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL,
+ sal_Bool bStart = sal_True );
};
//////////////////////////////////////////////////////////////////////////////
@@ -485,7 +485,7 @@ public:
void SetLineAttributes(const SfxItemSet& rItemSet);
- void ShowSymbol( BOOL b ) { mbWithSymbol = b; };
+ void ShowSymbol( sal_Bool b ) { mbWithSymbol = b; };
void SetSymbol( Graphic* p, const Size& s );
void ResizeSymbol( const Size& s );
diff --git a/svx/inc/svx/drawitem.hxx b/svx/inc/svx/drawitem.hxx
index 9bfdb5cfd87a..1f8536068c76 100644
--- a/svx/inc/svx/drawitem.hxx
+++ b/svx/inc/svx/drawitem.hxx
@@ -48,7 +48,7 @@ public:
TYPEINFO();
SvxColorTableItem();
SvxColorTableItem( XColorTable* pTable,
- USHORT nWhich );
+ sal_uInt16 nWhich );
SvxColorTableItem( const SvxColorTableItem& );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -58,8 +58,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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
XColorTable* GetColorTable() const { return pColorTable; }
void SetColorTable( XColorTable* pTable ) {
@@ -82,7 +82,7 @@ public:
TYPEINFO();
SvxGradientListItem();
SvxGradientListItem( XGradientList* pList,
- USHORT nWhich );
+ sal_uInt16 nWhich );
SvxGradientListItem( const SvxGradientListItem& );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -92,8 +92,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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
XGradientList* GetGradientList() const { return pGradientList; }
void SetGradientList( XGradientList* pList ) {
@@ -117,7 +117,7 @@ public:
TYPEINFO();
SvxHatchListItem();
SvxHatchListItem( XHatchList* pList,
- USHORT nWhich );
+ sal_uInt16 nWhich );
SvxHatchListItem( const SvxHatchListItem& );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -127,8 +127,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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
XHatchList* GetHatchList() const { return pHatchList; }
void SetHatchList( XHatchList* pList ) {
@@ -152,7 +152,7 @@ public:
TYPEINFO();
SvxBitmapListItem();
SvxBitmapListItem( XBitmapList* pBL,
- USHORT nWhich );
+ sal_uInt16 nWhich );
SvxBitmapListItem( const SvxBitmapListItem& );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -162,8 +162,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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
XBitmapList* GetBitmapList() const { return pBitmapList; }
void SetBitmapList( XBitmapList* pList ) {
@@ -187,7 +187,7 @@ public:
TYPEINFO();
SvxDashListItem();
SvxDashListItem( XDashList* pList,
- USHORT nWhich );
+ sal_uInt16 nWhich );
SvxDashListItem( const SvxDashListItem& );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -197,8 +197,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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
XDashList* GetDashList() const { return pDashList; }
void SetDashList( XDashList* pList );
@@ -221,7 +221,7 @@ public:
TYPEINFO();
SvxLineEndListItem();
SvxLineEndListItem( XLineEndList* pList,
- USHORT nWhich );
+ sal_uInt16 nWhich );
SvxLineEndListItem( const SvxLineEndListItem& );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -231,8 +231,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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId );
XLineEndList* GetLineEndList() const { return pLineEndList; }
void SetLineEndList( XLineEndList* pList ) {
diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx
index b8aea314372b..aef5de313ed9 100644
--- a/svx/inc/svx/e3ditem.hxx
+++ b/svx/inc/svx/e3ditem.hxx
@@ -44,18 +44,18 @@ class SVX_DLLPUBLIC SvxB3DVectorItem : public SfxPoolItem
public:
TYPEINFO();
SvxB3DVectorItem();
- SvxB3DVectorItem( USHORT nWhich, const basegfx::B3DVector& rVal );
- SvxB3DVectorItem( USHORT nWhich, SvStream & );
+ SvxB3DVectorItem( sal_uInt16 nWhich, const basegfx::B3DVector& rVal );
+ SvxB3DVectorItem( sal_uInt16 nWhich, SvStream & );
SvxB3DVectorItem( const SvxB3DVectorItem& );
~SvxB3DVectorItem();
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, USHORT nVersion) const;
- virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
+ virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const;
+ virtual SvStream& Store(SvStream &, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
const basegfx::B3DVector& GetValue() const { return aVal; }
void SetValue( const basegfx::B3DVector& rNewVal ) {
@@ -63,7 +63,7 @@ public:
aVal = rNewVal;
}
- virtual USHORT GetVersion (USHORT nFileFormatVersion) const;
+ virtual sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const;
};
#endif
diff --git a/svx/inc/svx/e3dundo.hxx b/svx/inc/svx/e3dundo.hxx
index f5081eeccfa0..4c087ff4f88e 100644
--- a/svx/inc/svx/e3dundo.hxx
+++ b/svx/inc/svx/e3dundo.hxx
@@ -57,7 +57,7 @@ class E3dUndoAction : public SdrUndoAction
virtual ~E3dUndoAction ();
- virtual BOOL CanRepeat(SfxRepeatTarget&) const;
+ virtual sal_Bool CanRepeat(SfxRepeatTarget&) const;
};
/************************************************************************\
@@ -100,7 +100,7 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
SdrObject* pObject;
E3dView* pView;
- BOOL bUseSubObjects;
+ sal_Bool bUseSubObjects;
const SfxItemSet aNewSet;
const SfxItemSet aOldSet;
@@ -111,11 +111,11 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
E3dObject* pInObject,
const SfxItemSet& rNewSet,
const SfxItemSet& rOldSet,
- BOOL bUseSubObj);
+ sal_Bool bUseSubObj);
virtual ~E3dAttributesUndoAction();
- virtual BOOL CanRepeat(SfxRepeatTarget& rView) const;
+ virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const;
virtual void Undo();
virtual void Redo();
virtual void Repeat();
diff --git a/svx/inc/svx/extrud3d.hxx b/svx/inc/svx/extrud3d.hxx
index f429742be448..0d4372fba6a3 100644
--- a/svx/inc/svx/extrud3d.hxx
+++ b/svx/inc/svx/extrud3d.hxx
@@ -89,7 +89,7 @@ public:
sal_Bool GetCloseBack() const
{ return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); }
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void operator=(const SdrObject&);
@@ -102,7 +102,7 @@ public:
const basegfx::B2DPolyPolygon &GetExtrudePolygon() { return maExtrudePolygon; }
// Aufbrechen
- virtual BOOL IsBreakObjPossible();
+ virtual sal_Bool IsBreakObjPossible();
virtual SdrAttrObj* GetBreakObj();
};
diff --git a/svx/inc/svx/extrusioncolorcontrol.hxx b/svx/inc/svx/extrusioncolorcontrol.hxx
index ff4a53e65a41..a592d8646a6f 100644
--- a/svx/inc/svx/extrusioncolorcontrol.hxx
+++ b/svx/inc/svx/extrusioncolorcontrol.hxx
@@ -41,10 +41,10 @@ private:
public:
SFX_DECL_TOOLBOX_CONTROL();
- ExtrusionColorControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ ExtrusionColorControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~ExtrusionColorControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
diff --git a/svx/inc/svx/f3dchild.hxx b/svx/inc/svx/f3dchild.hxx
index 853280d16f28..ebc85d1fc6c5 100644
--- a/svx/inc/svx/f3dchild.hxx
+++ b/svx/inc/svx/f3dchild.hxx
@@ -42,7 +42,7 @@
class SVX_DLLPUBLIC Svx3DChildWindow : public SfxChildWindow
{
public:
- Svx3DChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+ Svx3DChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
SFX_DECL_CHILDWINDOW(Svx3DChildWindow);
};
diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx
index 51ee743ca093..ebca73fc7a06 100644
--- a/svx/inc/svx/fillctrl.hxx
+++ b/svx/inc/svx/fillctrl.hxx
@@ -61,17 +61,17 @@ private:
SvxFillTypeBox* pFillTypeLB;
SvxFillAttrBox* pFillAttrLB;
- BOOL bUpdate;
- BOOL bIgnoreStatusUpdate;
- USHORT eLastXFS;
+ sal_Bool bUpdate;
+ sal_Bool bIgnoreStatusUpdate;
+ sal_uInt16 eLastXFS;
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFillToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxFillToolBoxControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
void Update( const SfxPoolItem* pState );
virtual Window* CreateItemWindow( Window *pParent );
diff --git a/svx/inc/svx/flagsdef.hxx b/svx/inc/svx/flagsdef.hxx
index 43fd292ddb36..9a6ca6f838e6 100644
--- a/svx/inc/svx/flagsdef.hxx
+++ b/svx/inc/svx/flagsdef.hxx
@@ -45,13 +45,13 @@
#define SVX_HIDESHADOWCTL 0x01
//CHINA001 copy from chardlg.hxx
-#define DISABLE_CASEMAP ((USHORT)0x0001)
-#define DISABLE_WORDLINE ((USHORT)0x0002)
-#define DISABLE_BLINK ((USHORT)0x0004)
-#define DISABLE_UNDERLINE_COLOR ((USHORT)0x0008)
+#define DISABLE_CASEMAP ((sal_uInt16)0x0001)
+#define DISABLE_WORDLINE ((sal_uInt16)0x0002)
+#define DISABLE_BLINK ((sal_uInt16)0x0004)
+#define DISABLE_UNDERLINE_COLOR ((sal_uInt16)0x0008)
-#define DISABLE_LANGUAGE ((USHORT)0x0010)
-#define DISABLE_HIDE_LANGUAGE ((USHORT)0x0020)
+#define DISABLE_LANGUAGE ((sal_uInt16)0x0010)
+#define DISABLE_HIDE_LANGUAGE ((sal_uInt16)0x0020)
//CHINA001 flags for SvxCharBasePage's child class
#define SVX_PREVIEW_CHARACTER 0x01
diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx
index 4b6fd22b2587..13eb8a697de0 100644
--- a/svx/inc/svx/float3d.hxx
+++ b/svx/inc/svx/float3d.hxx
@@ -201,7 +201,7 @@ private:
// der Rest ...
Image aImgLightOn;
Image aImgLightOff;
- BOOL bUpdate;
+ sal_Bool bUpdate;
ViewType3D eViewType;
Size aSize;
@@ -226,7 +226,7 @@ private:
// ItemSet used to remember set 2d attributes
SfxItemSet* mpRemember2DAttributes;
- BOOL bOnly3DChanged;
+ sal_Bool bOnly3DChanged;
//------------------------------------
@@ -247,8 +247,8 @@ private:
SVX_DLLPRIVATE void Construct();
SVX_DLLPRIVATE void Reset();
- SVX_DLLPRIVATE BOOL LBSelectColor( ColorLB* pLb, const Color& rColor );
- SVX_DLLPRIVATE USHORT GetLightSource( const PushButton* pBtn = NULL );
+ SVX_DLLPRIVATE sal_Bool LBSelectColor( ColorLB* pLb, const Color& rColor );
+ SVX_DLLPRIVATE sal_uInt16 GetLightSource( const PushButton* pBtn = NULL );
SVX_DLLPRIVATE ColorLB* GetLbByButton( const PushButton* pBtn = NULL );
SVX_DLLPRIVATE bool GetUILightState( ImageButton& aBtn ) const;
@@ -263,7 +263,7 @@ public:
~Svx3DWin();
void InitColorLB( const SdrModel* pDoc );
- BOOL IsUpdateMode() const { return bUpdate; }
+ sal_Bool IsUpdateMode() const { return bUpdate; }
void Update( SfxItemSet& rSet );
void GetAttr( SfxItemSet& rSet );
@@ -283,11 +283,11 @@ class Svx3DCtrlItem : public SfxControllerItem
Svx3DWin* p3DWin;
protected:
- virtual void StateChanged( USHORT nSId, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState,
const SfxPoolItem* pState );
public:
- Svx3DCtrlItem( USHORT, Svx3DWin*, SfxBindings* );
+ Svx3DCtrlItem( sal_uInt16, Svx3DWin*, SfxBindings* );
};
/*************************************************************************
@@ -299,14 +299,14 @@ class Svx3DCtrlItem : public SfxControllerItem
class SvxConvertTo3DItem : public SfxControllerItem
{
- BOOL bState;
+ sal_Bool bState;
protected:
- virtual void StateChanged(UINT16 nSId, SfxItemState eState, const SfxPoolItem* pState);
+ virtual void StateChanged(sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState);
public:
- SvxConvertTo3DItem(UINT16 nId, SfxBindings* pBindings);
- BOOL GetState() const { return bState; }
+ SvxConvertTo3DItem(sal_uInt16 nId, SfxBindings* pBindings);
+ sal_Bool GetState() const { return bState; }
};
#endif // _SVX_FLOAT3D_HXX
diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx
index 9d8ad2ca9e64..a8e7519adb43 100644
--- a/svx/inc/svx/fmmodel.hxx
+++ b/svx/inc/svx/fmmodel.hxx
@@ -60,16 +60,16 @@ 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, int bUseExtColorTable);
FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers,
- FASTBOOL bUseExtColorTable);
+ int bUseExtColorTable);
virtual ~FmFormModel();
- virtual SdrPage* AllocPage(FASTBOOL bMasterPage);
+ virtual SdrPage* AllocPage(int bMasterPage);
virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
virtual SdrPage* RemovePage(sal_uInt16 nPgNum);
- virtual void MovePage(USHORT nPgNum, USHORT nNewPos);
+ virtual void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos);
virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum);
@@ -83,8 +83,8 @@ public:
sal_Bool GetAutoControlFocus() const { return m_bAutoControlFocus; }
void SetAutoControlFocus( sal_Bool _bAutoControlFocus );
- /** check whether the OpenInDesignMode has been set explicitly or been loaded (<FALSE/>)
- or if it still has the default value from construction (<TRUE/>)
+ /** check whether the OpenInDesignMode has been set explicitly or been loaded (<sal_False/>)
+ or if it still has the default value from construction (<sal_True/>)
*/
sal_Bool OpenInDesignModeIsDefaulted();
diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx
index 34f0ea62a8bf..2098fa73fb22 100644
--- a/svx/inc/svx/fmview.hxx
+++ b/svx/inc/svx/fmview.hxx
@@ -97,8 +97,8 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats,
sal_uInt16 _nControlObjectID,
const ::rtl::OUString& _rFieldPostfix,
- UINT32 _nInventor,
- UINT16 _nLabelObjectID,
+ sal_uInt32 _nInventor,
+ sal_uInt16 _nLabelObjectID,
SdrPage* _pLabelPage,
SdrPage* _pControlPage,
SdrModel* _pModel,
@@ -114,11 +114,11 @@ public:
using E3dView::Paste;
virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
- virtual BOOL MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin );
+ virtual sal_Bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin );
/** grab the focus to the first form control on the view
@param _bForceSync
- <TRUE/> if the handling should be done synchronously.
+ <sal_True/> if the handling should be done synchronously.
*/
SVX_DLLPRIVATE void GrabFirstControlFocus( sal_Bool _bForceSync = sal_False );
@@ -128,7 +128,7 @@ public:
GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const;
// SdrView
- BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
+ sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
/// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL"
FmFormPage* GetCurPage();
diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx
index f28e158df1df..57bcdc0c6705 100644
--- a/svx/inc/svx/fntctl.hxx
+++ b/svx/inc/svx/fntctl.hxx
@@ -49,13 +49,13 @@ private:
//#if 0 // _SOLAR__PRIVATE
SVX_DLLPRIVATE void FillMenu();
DECL_LINK( MenuSelect, FontNameMenu * );
- SVX_DLLPRIVATE virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ SVX_DLLPRIVATE virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
//#endif
public:
- SvxFontMenuControl( USHORT nId, Menu&, SfxBindings& );
+ SvxFontMenuControl( sal_uInt16 nId, Menu&, SfxBindings& );
~SvxFontMenuControl();
virtual PopupMenu* GetPopup() const;
diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx
index 2b49e413e7be..4be1173db44c 100644
--- a/svx/inc/svx/fntctrl.hxx
+++ b/svx/inc/svx/fntctrl.hxx
@@ -49,7 +49,7 @@ class SVX_DLLPUBLIC SvxFontPrevWindow : public Window
private:
FontPrevWin_Impl* pImpl;
- SVX_DLLPRIVATE void InitSettings( BOOL bForeground, BOOL bBackground );
+ SVX_DLLPRIVATE void InitSettings( sal_Bool bForeground, sal_Bool bBackground );
public:
SvxFontPrevWindow( Window* pParent, const ResId& rId );
@@ -70,15 +70,15 @@ public:
void SetColor( const Color& rColor );
void ResetColor();
void SetBackColor( const Color& rColor );
- void UseResourceText( BOOL bUse = TRUE );
+ void UseResourceText( sal_Bool bUse = sal_True );
void Paint( const Rectangle& );
- BOOL IsTwoLines() const;
- void SetTwoLines(BOOL bSet);
+ sal_Bool IsTwoLines() const;
+ void SetTwoLines(sal_Bool bSet);
void SetBrackets(sal_Unicode cStart, sal_Unicode cEnd);
- void SetFontWidthScale( UINT16 nScaleInPercent );
+ void SetFontWidthScale( sal_uInt16 nScaleInPercent );
void AutoCorrectFontColor( void );
diff --git a/svx/inc/svx/fntszctl.hxx b/svx/inc/svx/fntszctl.hxx
index dfeec808e602..9ae8da4a27d7 100644
--- a/svx/inc/svx/fntszctl.hxx
+++ b/svx/inc/svx/fntszctl.hxx
@@ -51,11 +51,11 @@ private:
//#endif
protected:
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
public:
- SvxFontSizeMenuControl( USHORT nId, Menu&, SfxBindings& );
+ SvxFontSizeMenuControl( sal_uInt16 nId, Menu&, SfxBindings& );
~SvxFontSizeMenuControl();
virtual PopupMenu* GetPopup() const;
diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx
index 73f0ac5dd712..2e696fdaaee6 100644
--- a/svx/inc/svx/fontwork.hxx
+++ b/svx/inc/svx/fontwork.hxx
@@ -73,11 +73,11 @@ class SvxFontWorkControllerItem : public SfxControllerItem
SvxFontWorkDialog &rFontWorkDlg;
protected:
- virtual void StateChanged(USHORT nSID, SfxItemState eState,
+ virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState);
public:
- SvxFontWorkControllerItem(USHORT nId, SvxFontWorkDialog&, SfxBindings&);
+ SvxFontWorkControllerItem(sal_uInt16 nId, SvxFontWorkDialog&, SfxBindings&);
};
/*************************************************************************
@@ -89,7 +89,7 @@ public:
class SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow
{
public:
- SvxFontWorkChildWindow(Window*, USHORT, SfxBindings*, SfxChildWinInfo*);
+ SvxFontWorkChildWindow(Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*);
SFX_DECL_CHILDWINDOW(SvxFontWorkChildWindow);
};
@@ -126,11 +126,11 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
SfxBindings& rBindings;
Timer aInputTimer;
- BOOL bUserZoomedIn;
+ sal_Bool bUserZoomedIn;
- USHORT nLastStyleTbxId;
- USHORT nLastAdjustTbxId;
- USHORT nLastShadowTbxId;
+ sal_uInt16 nLastStyleTbxId;
+ sal_uInt16 nLastAdjustTbxId;
+ sal_uInt16 nLastShadowTbxId;
long nSaveShadowX;
long nSaveShadowY;
long nSaveShadowAngle;
@@ -164,7 +164,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
void SetShowForm_Impl(const XFormTextHideFormItem*);
void SetOutline_Impl(const XFormTextOutlineItem*);
void SetShadow_Impl(const XFormTextShadowItem*,
- BOOL bRestoreValues = FALSE);
+ sal_Bool bRestoreValues = sal_False);
void SetShadowColor_Impl(const XFormTextShadowColorItem*);
void SetShadowXVal_Impl(const XFormTextShadowXValItem*);
void SetShadowYVal_Impl(const XFormTextShadowYValItem*);
@@ -186,7 +186,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
~SvxFontWorkDialog();
void SetColorTable(const XColorTable* pTable);
- void SetActive(BOOL bActivate = TRUE);
+ void SetActive(sal_Bool bActivate = sal_True);
void CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
const SfxItemSet& rAttr, SdrObject& rOldObj,
diff --git a/svx/inc/svx/fontworkgallery.hxx b/svx/inc/svx/fontworkgallery.hxx
index 40ac3cef966a..36502ccecca5 100644
--- a/svx/inc/svx/fontworkgallery.hxx
+++ b/svx/inc/svx/fontworkgallery.hxx
@@ -63,10 +63,10 @@ class SVX_DLLPUBLIC FontWorkShapeTypeControl : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- FontWorkShapeTypeControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~FontWorkShapeTypeControl();
- virtual void Select( BOOL bMod1 = FALSE );
+ virtual void Select( sal_Bool bMod1 = sal_False );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
};
diff --git a/svx/inc/svx/formatpaintbrushctrl.hxx b/svx/inc/svx/formatpaintbrushctrl.hxx
index b380e051daf8..9f06a58c8b1d 100644
--- a/svx/inc/svx/formatpaintbrushctrl.hxx
+++ b/svx/inc/svx/formatpaintbrushctrl.hxx
@@ -49,14 +49,14 @@ class SVX_DLLPUBLIC FormatPaintBrushToolBoxControl : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- FormatPaintBrushToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~FormatPaintBrushToolBoxControl();
virtual void DoubleClick();
virtual void Click();
- virtual void Select( BOOL bMod1 = FALSE );
+ virtual void Select( sal_Bool bMod1 = sal_False );
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
private:
DECL_LINK( WaitDoubleClickHdl, void* );
diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx
index b342c58809bb..2b2613226b85 100644
--- a/svx/inc/svx/frmsel.hxx
+++ b/svx/inc/svx/frmsel.hxx
@@ -128,7 +128,7 @@ 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( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSec ) 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 +159,7 @@ 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( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSec );
/** Sets the passed color to all selected frame borders. */
void SetColorToSelection( const Color& rColor );
diff --git a/svx/inc/svx/galbrws.hxx b/svx/inc/svx/galbrws.hxx
index f54901db543d..1a19e773baa9 100644
--- a/svx/inc/svx/galbrws.hxx
+++ b/svx/inc/svx/galbrws.hxx
@@ -47,7 +47,7 @@
class SVX_DLLPUBLIC GalleryChildWindow : public SfxChildWindow
{
public:
- GalleryChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+ GalleryChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
~GalleryChildWindow();
SFX_DECL_CHILDWINDOW( GalleryChildWindow );
@@ -88,7 +88,7 @@ private:
void InitSettings();
- virtual BOOL Close();
+ virtual sal_Bool Close();
virtual void Resize();
virtual void GetFocus();
@@ -107,10 +107,10 @@ public:
INetURLObject GetURL() const;
String GetFilterName() const;
Graphic GetGraphic() const;
- BOOL GetVCDrawModel( FmFormModel& rModel ) const;
- BOOL IsLinkage() const;
+ sal_Bool GetVCDrawModel( FmFormModel& rModel ) const;
+ sal_Bool IsLinkage() const;
- BOOL KeyInput( const KeyEvent& rKEvt, Window* pWindow );
+ sal_Bool KeyInput( const KeyEvent& rKEvt, Window* pWindow );
};
#endif // _SVX_GALBRWS_HXX_
diff --git a/svx/inc/svx/galctrl.hxx b/svx/inc/svx/galctrl.hxx
index 3acf53dbeddb..53fce03cd6c9 100644
--- a/svx/inc/svx/galctrl.hxx
+++ b/svx/inc/svx/galctrl.hxx
@@ -65,7 +65,7 @@ private:
Rectangle aPreviewRect;
GalleryTheme* mpTheme;
- SVX_DLLPRIVATE BOOL ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
+ SVX_DLLPRIVATE sal_Bool ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const;
SVX_DLLPRIVATE void InitSettings();
// Window
@@ -145,14 +145,14 @@ private:
Link maSelectHdl;
GalleryTheme* mpTheme;
- ULONG mnCurRow;
- BOOL mbInit;
+ sal_uIntPtr mnCurRow;
+ sal_Bool mbInit;
void InitSettings();
// BrowseBox
- virtual BOOL SeekRow( long nRow );
- virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const;
+ virtual sal_Bool SeekRow( long nRow );
+ virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const;
virtual void DoubleClick( const BrowserMouseEvent& rEvt );
virtual void Select();
virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt );
@@ -181,7 +181,7 @@ public:
@return
the text out of the cell
*/
- virtual String GetCellText(long _nRow, USHORT _nColId) const;
+ virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const;
// from IAccessibleTableProvider
virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex);
diff --git a/svx/inc/svx/gallery.hxx b/svx/inc/svx/gallery.hxx
index 68a5c68539f1..d87d93f8cc22 100644
--- a/svx/inc/svx/gallery.hxx
+++ b/svx/inc/svx/gallery.hxx
@@ -118,57 +118,57 @@ public:
INetURLObject GetURL() const;
String GetFilterName() const;
Graphic GetGraphic() const;
- BOOL GetVCDrawModel( FmFormModel& rModel ) const;
- BOOL IsLinkage() const;
+ sal_Bool GetVCDrawModel( FmFormModel& rModel ) const;
+ sal_Bool IsLinkage() const;
- static BOOL FillThemeList( List& rThemeList );
+ static sal_Bool FillThemeList( List& rThemeList );
// FillObjList is filling rObjList with Strings of the internal Gallery Object URL
- static BOOL FillObjList( const String& rThemeName, List& rObjList );
- static BOOL FillObjList( ULONG nThemeId, List& rObjList );
+ static sal_Bool FillObjList( const String& rThemeName, List& rObjList );
+ static sal_Bool FillObjList( sal_uIntPtr nThemeId, List& rObjList );
// FillObjTitleList is filling the rList with the title for each gallery object
static sal_Bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< rtl::OUString >& rList );
- static BOOL InsertURL( const String& rThemeName, const String& rURL );
- static BOOL InsertURL( ULONG nThemeId, const String& rURL );
+ static sal_Bool InsertURL( const String& rThemeName, const String& rURL );
+ static sal_Bool InsertURL( sal_uIntPtr nThemeId, const String& rURL );
- static BOOL InsertURL( const String& rThemeName, const String& rURL,
- const ULONG nSgaFormat /* = SGA_FORMAT_ALL */ );
- static BOOL InsertURL( ULONG nThemeId, const String& rURL,
- const ULONG nSgaFormat /* = SGA_FORMAT_ALL */ );
+ static sal_Bool InsertURL( const String& rThemeName, const String& rURL,
+ const sal_uIntPtr nSgaFormat /* = SGA_FORMAT_ALL */ );
+ static sal_Bool InsertURL( sal_uIntPtr nThemeId, const String& rURL,
+ const sal_uIntPtr nSgaFormat /* = SGA_FORMAT_ALL */ );
- static ULONG GetObjCount( const String& rThemeName );
- static ULONG GetObjCount( ULONG nThemeId );
+ static sal_uIntPtr GetObjCount( const String& rThemeName );
+ static sal_uIntPtr GetObjCount( sal_uIntPtr nThemeId );
- static BOOL GetGraphicObj( const String& rThemeName, ULONG nPos,
+ static sal_Bool GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos,
Graphic* pGraphic = NULL, Bitmap* pThumb = NULL,
- BOOL bProgess = FALSE );
- static BOOL GetGraphicObj( ULONG nThemeId, ULONG nPos,
+ sal_Bool bProgess = sal_False );
+ static sal_Bool GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
Graphic* pGraphic = NULL, Bitmap* pThumb = NULL,
- BOOL bProgess = FALSE );
+ sal_Bool bProgess = sal_False );
- static BOOL InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic );
- static BOOL InsertGraphicObj( ULONG nThemeId, const Graphic& rGraphic );
+ static sal_Bool InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic );
+ static sal_Bool InsertGraphicObj( sal_uIntPtr nThemeId, const Graphic& rGraphic );
- static ULONG GetSdrObjCount( const String& rThemeName );
- static ULONG GetSdrObjCount( ULONG nThemeId );
+ static sal_uIntPtr GetSdrObjCount( const String& rThemeName );
+ static sal_uIntPtr GetSdrObjCount( sal_uIntPtr nThemeId );
- static BOOL GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
+ static sal_Bool GetSdrObj( const String& rThemeName, sal_uIntPtr nSdrModelPos,
SdrModel* pModel = NULL, Bitmap* pThumb = NULL );
- static BOOL GetSdrObj( ULONG nThemeId, ULONG nSdrModelPos,
+ static sal_Bool GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
SdrModel* pModel = NULL, Bitmap* pThumb = NULL );
- static BOOL InsertSdrObj( const String& rThemeName, FmFormModel& rModel );
- static BOOL InsertSdrObj( ULONG nThemeId, FmFormModel& rModel );
+ static sal_Bool InsertSdrObj( const String& rThemeName, FmFormModel& rModel );
+ static sal_Bool InsertSdrObj( sal_uIntPtr nThemeId, FmFormModel& rModel );
- static BOOL BeginLocking( const String& rThemeName );
- static BOOL BeginLocking( ULONG nThemeId );
+ static sal_Bool BeginLocking( const String& rThemeName );
+ static sal_Bool BeginLocking( sal_uIntPtr nThemeId );
- static BOOL EndLocking( const String& rThemeName );
- static BOOL EndLocking( ULONG nThemeId );
+ static sal_Bool EndLocking( const String& rThemeName );
+ static sal_Bool EndLocking( sal_uIntPtr nThemeId );
- static BOOL DrawCentered( OutputDevice* pOut, const FmFormModel& rModel );
+ static sal_Bool DrawCentered( OutputDevice* pOut, const FmFormModel& rModel );
};
#endif // _GALLERY_HXX_
diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx
index 7b58456a8889..b4171c242cb6 100644
--- a/svx/inc/svx/gallery1.hxx
+++ b/svx/inc/svx/gallery1.hxx
@@ -52,12 +52,12 @@ private:
INetURLObject aThmURL;
INetURLObject aSdgURL;
INetURLObject aSdvURL;
- UINT32 nFileNumber;
- UINT32 nId;
- BOOL bReadOnly;
- BOOL bImported;
- BOOL bModified;
- BOOL bThemeNameFromResource;
+ sal_uInt32 nFileNumber;
+ sal_uInt32 nId;
+ sal_Bool bReadOnly;
+ sal_Bool bImported;
+ sal_Bool bModified;
+ sal_Bool bThemeNameFromResource;
GalleryThemeEntry();
INetURLObject ImplGetURLIgnoreCase( const INetURLObject& rURL ) const;
@@ -65,31 +65,31 @@ private:
public:
GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName,
- UINT32 nFileNumber, BOOL bReadOnly, BOOL bImported,
- BOOL bNewFile, UINT32 nId, BOOL bThemeNameFromResource );
+ sal_uInt32 nFileNumber, sal_Bool bReadOnly, sal_Bool bImported,
+ sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource );
~GalleryThemeEntry() {};
const String& GetThemeName() const { return aName; }
- UINT32 GetFileNumber() const { return nFileNumber; }
+ sal_uInt32 GetFileNumber() const { return nFileNumber; }
const INetURLObject& GetThmURL() const { return aThmURL; }
const INetURLObject& GetSdgURL() const { return aSdgURL; }
const INetURLObject& GetSdvURL() const { return aSdvURL; }
- BOOL IsImported() const { return bImported; }
- BOOL IsReadOnly() const { return bReadOnly; }
- BOOL IsDefault() const;
+ sal_Bool IsImported() const { return bImported; }
+ sal_Bool IsReadOnly() const { return bReadOnly; }
+ sal_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() ); }
+ sal_Bool IsModified() const { return bModified; }
+ void SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); }
void SetName( const String& rNewName );
- BOOL IsNameFromResource() const { return bThemeNameFromResource; }
+ sal_Bool IsNameFromResource() const { return bThemeNameFromResource; }
- UINT32 GetId() const { return nId; }
- void SetId( UINT32 nNewId, BOOL bResetThemeName );
+ sal_uInt32 GetId() const { return nId; }
+ void SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName );
};
DECLARE_LIST( GalleryThemeList, GalleryThemeEntry* )
@@ -133,8 +133,8 @@ private:
INetURLObject aRelURL;
INetURLObject aUserURL;
rtl_TextEncoding nReadTextEncoding;
- ULONG nLastFileNumber;
- BOOL bMultiPath;
+ sal_uIntPtr nLastFileNumber;
+ sal_Bool bMultiPath;
void ImplLoad( const String& rMultiPath );
void ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly );
@@ -142,7 +142,7 @@ private:
void ImplWriteImportList();
SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const String& rThemeName );
- GalleryThemeEntry* ImplGetThemeEntry( ULONG nThemeId );
+ GalleryThemeEntry* ImplGetThemeEntry( sal_uIntPtr nThemeId );
GalleryImportThemeEntry* ImplGetImportThemeEntry( const String& rImportName );
GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry );
@@ -155,17 +155,17 @@ public:
SVX_DLLPUBLIC static Gallery* GetGalleryInstance();
- ULONG GetThemeCount() const { return aThemeList.Count(); }
- const GalleryThemeEntry* GetThemeInfo( ULONG nPos ) { return aThemeList.GetObject( nPos ); }
+ sal_uIntPtr GetThemeCount() const { return aThemeList.Count(); }
+ const GalleryThemeEntry* GetThemeInfo( sal_uIntPtr nPos ) { return aThemeList.GetObject( nPos ); }
const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); }
- SVX_DLLPUBLIC BOOL HasTheme( const String& rThemeName );
- String GetThemeName( ULONG nThemeId ) const;
+ SVX_DLLPUBLIC sal_Bool HasTheme( const String& rThemeName );
+ String GetThemeName( sal_uIntPtr nThemeId ) const;
- SVX_DLLPUBLIC BOOL CreateTheme( const String& rThemeName, UINT32 nNumFrom = 0 );
- BOOL CreateImportTheme( const INetURLObject& rURL, const String& rFileName );
- BOOL RenameTheme( const String& rOldName, const String& rNewName );
- SVX_DLLPUBLIC BOOL RemoveTheme( const String& rThemeName );
+ SVX_DLLPUBLIC sal_Bool CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom = 0 );
+ sal_Bool CreateImportTheme( const INetURLObject& rURL, const String& rFileName );
+ sal_Bool RenameTheme( const String& rOldName, const String& rNewName );
+ SVX_DLLPUBLIC sal_Bool RemoveTheme( const String& rThemeName );
SVX_DLLPUBLIC GalleryTheme* AcquireTheme( const String& rThemeName, SfxListener& rListener );
SVX_DLLPUBLIC void ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener );
@@ -177,7 +177,7 @@ public:
const INetURLObject& GetUserURL() const { return aUserURL; }
const INetURLObject& GetRelativeURL() const { return aRelURL; }
- BOOL IsMultiPath() const { return bMultiPath; }
+ sal_Bool IsMultiPath() const { return bMultiPath; }
};
#endif // _SVX_GALLERY1_HXX_
diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx
index dd8b08fc8fad..f807ca6908de 100644
--- a/svx/inc/svx/galmisc.hxx
+++ b/svx/inc/svx/galmisc.hxx
@@ -73,7 +73,7 @@ enum SgaObjKind
// - Defines -
// -----------
-#define IV_IMAPINFO (UINT32('S')*0x00000001+UINT32('D')*0x00000100+UINT32('U')*0x00010000+UINT32('D')*0x01000000)
+#define IV_IMAPINFO (sal_uInt32('S')*0x00000001+sal_uInt32('D')*0x00000100+sal_uInt32('U')*0x00010000+sal_uInt32('D')*0x01000000)
#define ID_IMAPINFO 2
#define USERDATA_HDL() (LINK(this,SgaUserDataFactory,MakeUserData))
@@ -104,16 +104,16 @@ class ImageMap;
class Gallery;
SVX_DLLPUBLIC ResMgr* GetGalleryResMgr();
-USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, String& rFilterName, BOOL bShowProgress = FALSE );
-BOOL GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel );
-BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap );
-SVX_DLLPUBLIC String GetReducedString( const INetURLObject& rURL, ULONG nMaxLen );
+sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, String& rFilterName, sal_Bool bShowProgress = sal_False );
+sal_Bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel );
+sal_Bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap );
+SVX_DLLPUBLIC String GetReducedString( const INetURLObject& rURL, sal_uIntPtr nMaxLen );
String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL );
-BOOL FileExists( const INetURLObject& rURL );
-BOOL CreateDir( const INetURLObject& rURL );
-BOOL CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL );
-BOOL KillFile( const INetURLObject& rURL );
+sal_Bool FileExists( const INetURLObject& rURL );
+sal_Bool CreateDir( const INetURLObject& rURL );
+sal_Bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL );
+sal_Bool KillFile( const INetURLObject& rURL );
BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId );
@@ -173,7 +173,7 @@ class SVX_DLLPUBLIC GalleryProgress
GalleryProgress( GraphicFilter* pFilter = NULL );
~GalleryProgress();
- void Update( ULONG nVal, ULONG nMaxVal );
+ void Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal );
};
// -----------------------
@@ -201,7 +201,7 @@ private:
protected:
- GalleryTransferable( GalleryTheme* pTheme, ULONG nObjectPos, bool bLazy );
+ GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy );
~GalleryTransferable();
void InitData( bool bLazy );
@@ -238,25 +238,25 @@ class GalleryHint : public SfxHint
{
private:
- ULONG mnType;
+ sal_uIntPtr mnType;
String maThemeName;
String maStringData;
- ULONG mnData1;
- ULONG mnData2;
+ sal_uIntPtr mnData1;
+ sal_uIntPtr mnData2;
public:
- GalleryHint( ULONG nType, const String& rThemeName, ULONG nData1 = 0UL, ULONG nData2 = 0UL ) :
+ GalleryHint( sal_uIntPtr nType, const String& rThemeName, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) :
mnType( nType ), maThemeName( rThemeName ), mnData1( nData1 ), mnData2( nData2 ) {}
- GalleryHint( ULONG nType, const String& rThemeName, const String& rStringData, ULONG nData1 = 0UL, ULONG nData2 = 0UL ) :
+ GalleryHint( sal_uIntPtr nType, const String& rThemeName, const String& rStringData, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) :
mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ), mnData2( nData2 ) {}
- ULONG GetType() const { return mnType; }
+ sal_uIntPtr GetType() const { return mnType; }
const String& GetThemeName() const { return maThemeName; }
const String& GetStringData() const { return maStringData; }
- ULONG GetData1() const { return mnData1; }
- ULONG GetData2() const { return mnData2; }
+ sal_uIntPtr GetData1() const { return mnData1; }
+ sal_uIntPtr GetData2() const { return mnData2; }
};
#endif
diff --git a/svx/inc/svx/galtheme.hxx b/svx/inc/svx/galtheme.hxx
index aa77bba25d26..566372ddb41b 100644
--- a/svx/inc/svx/galtheme.hxx
+++ b/svx/inc/svx/galtheme.hxx
@@ -56,7 +56,7 @@ struct GalleryObject
INetURLObject aURL;
sal_uInt32 nOffset;
SgaObjKind eObjKind;
- BOOL bDummy;
+ sal_Bool bDummy;
};
DECLARE_LIST( GalleryObjectList, GalleryObject* )
@@ -73,7 +73,7 @@ class ListBox;
struct GalDragParams
{
Region aDragRegion;
- ULONG nDragObjPos;
+ sal_uIntPtr nDragObjPos;
String aThemeName;
String aFileName;
SgaObjKind eObjKind;
@@ -106,24 +106,24 @@ private:
SotStorageRef aSvDrawStorageRef;
Gallery* pParent;
GalleryThemeEntry* pThm;
- ULONG mnThemeLockCount;
- ULONG mnBroadcasterLockCount;
- ULONG nDragPos;
- BOOL bDragging;
- BOOL bAbortActualize;
+ sal_uIntPtr mnThemeLockCount;
+ sal_uIntPtr mnBroadcasterLockCount;
+ sal_uIntPtr nDragPos;
+ sal_Bool bDragging;
+ sal_Bool bAbortActualize;
void ImplCreateSvDrawStorage();
SVX_DLLPUBLIC SgaObject* ImplReadSgaObject( GalleryObject* pEntry );
- BOOL ImplWriteSgaObject( const SgaObject& rObj, ULONG nPos, GalleryObject* pExistentEntry );
+ sal_Bool ImplWriteSgaObject( const SgaObject& rObj, sal_uIntPtr nPos, GalleryObject* pExistentEntry );
void ImplRead();
void ImplWrite();
- const GalleryObject* ImplGetGalleryObject( ULONG nPos ) const { return aObjectList.GetObject( nPos ); }
+ const GalleryObject* ImplGetGalleryObject( sal_uIntPtr nPos ) const { return aObjectList.GetObject( nPos ); }
SVX_DLLPUBLIC const GalleryObject* ImplGetGalleryObject( const INetURLObject& rURL );
- ULONG ImplGetGalleryObjectPos( const GalleryObject* pObj ) const { return aObjectList.GetPos( pObj ); }
+ sal_uIntPtr ImplGetGalleryObjectPos( const GalleryObject* pObj ) const { return aObjectList.GetPos( pObj ); }
INetURLObject ImplGetURL( const GalleryObject* pObject ) const;
- INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat = CVT_UNKNOWN );
- void ImplSetModified( BOOL bModified );
- void ImplBroadcast( ULONG nUpdatePos );
+ INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat = CVT_UNKNOWN );
+ void ImplSetModified( sal_Bool bModified );
+ void ImplBroadcast( sal_uIntPtr nUpdatePos );
GalleryTheme();
GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry );
@@ -131,16 +131,16 @@ private:
public:
- static GalleryThemeEntry* CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly );
+ static GalleryThemeEntry* CreateThemeEntry( const INetURLObject& rURL, sal_Bool bReadOnly );
- ULONG GetObjectCount() const { return aObjectList.Count(); }
+ sal_uIntPtr GetObjectCount() const { return aObjectList.Count(); }
- SVX_DLLPUBLIC SgaObject* AcquireObject( ULONG nPos );
+ SVX_DLLPUBLIC SgaObject* AcquireObject( sal_uIntPtr 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 sal_Bool InsertObject( const SgaObject& rObj, sal_uIntPtr nPos = LIST_APPEND );
+ SVX_DLLPUBLIC sal_Bool RemoveObject( sal_uIntPtr nPos );
+ sal_Bool ChangeObjectPos( sal_uIntPtr nOldPos, sal_uIntPtr nNewPos );
SVX_DLLPUBLIC const String& GetName() const;
const String& GetRealName() const;
@@ -154,69 +154,69 @@ public:
SVX_DLLPUBLIC const INetURLObject& GetSdgURL() const;
const INetURLObject& GetSdvURL() const;
- SVX_DLLPUBLIC UINT32 GetId() const;
- void SetId( UINT32 nNewId, BOOL bResetThemeName );
+ SVX_DLLPUBLIC sal_uInt32 GetId() const;
+ void SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName );
- void SetDragging( BOOL bSet ) { bDragging = bSet; }
- BOOL IsDragging() const { return bDragging; }
+ void SetDragging( sal_Bool bSet ) { bDragging = bSet; }
+ sal_Bool IsDragging() const { return bDragging; }
void LockTheme() { ++mnThemeLockCount; }
- BOOL UnlockTheme();
+ sal_Bool UnlockTheme();
void LockBroadcaster() { mnBroadcasterLockCount++; }
- SVX_DLLPUBLIC void UnlockBroadcaster( ULONG nUpdatePos = 0 );
- BOOL IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; }
+ SVX_DLLPUBLIC void UnlockBroadcaster( sal_uIntPtr nUpdatePos = 0 );
+ sal_Bool IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; }
- void SetDragPos( ULONG nPos ) { nDragPos = nPos; }
- ULONG GetDragPos() const { return nDragPos; }
+ void SetDragPos( sal_uIntPtr nPos ) { nDragPos = nPos; }
+ sal_uIntPtr GetDragPos() const { return nDragPos; }
- BOOL IsThemeNameFromResource() const;
+ sal_Bool IsThemeNameFromResource() const;
- SVX_DLLPUBLIC BOOL IsImported() const;
- SVX_DLLPUBLIC BOOL IsReadOnly() const;
- SVX_DLLPUBLIC BOOL IsDefault() const;
- BOOL IsModified() const;
+ SVX_DLLPUBLIC sal_Bool IsImported() const;
+ SVX_DLLPUBLIC sal_Bool IsReadOnly() const;
+ SVX_DLLPUBLIC sal_Bool IsDefault() const;
+ sal_Bool IsModified() const;
SVX_DLLPUBLIC void Actualize( const Link& rActualizeLink, GalleryProgress* pProgress = NULL );
- void AbortActualize() { bAbortActualize = TRUE; }
+ void AbortActualize() { bAbortActualize = sal_True; }
Gallery* GetParent() const { return pParent; }
SotStorageRef GetSvDrawStorage() const { return aSvDrawStorageRef; }
public:
- SgaObjKind GetObjectKind( ULONG nPos ) const
+ SgaObjKind GetObjectKind( sal_uIntPtr nPos ) const
{
DBG_ASSERT( nPos < GetObjectCount(), "Position out of range" );
return ImplGetGalleryObject( nPos )->eObjKind;
}
- const INetURLObject& GetObjectURL( ULONG nPos ) const
+ const INetURLObject& GetObjectURL( sal_uIntPtr nPos ) const
{
DBG_ASSERT( nPos < GetObjectCount(), "Position out of range" );
return ImplGetGalleryObject( nPos )->aURL;
}
- BOOL GetThumb( ULONG nPos, Bitmap& rBmp, BOOL bProgress = FALSE );
+ sal_Bool GetThumb( sal_uIntPtr nPos, Bitmap& rBmp, sal_Bool bProgress = sal_False );
- SVX_DLLPUBLIC BOOL GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress = FALSE );
- SVX_DLLPUBLIC BOOL InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos = LIST_APPEND );
+ SVX_DLLPUBLIC sal_Bool GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool bProgress = sal_False );
+ SVX_DLLPUBLIC sal_Bool InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos = LIST_APPEND );
- SVX_DLLPUBLIC BOOL GetModel( ULONG nPos, SdrModel& rModel, BOOL bProgress = FALSE );
- SVX_DLLPUBLIC BOOL InsertModel( const FmFormModel& rModel, ULONG nInsertPos = LIST_APPEND );
+ SVX_DLLPUBLIC sal_Bool GetModel( sal_uIntPtr nPos, SdrModel& rModel, sal_Bool bProgress = sal_False );
+ SVX_DLLPUBLIC sal_Bool InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos = LIST_APPEND );
- BOOL GetModelStream( ULONG nPos, SotStorageStreamRef& rModelStreamRef, BOOL bProgress = FALSE );
- BOOL InsertModelStream( const SotStorageStreamRef& rModelStream, ULONG nInsertPos = LIST_APPEND );
+ sal_Bool GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rModelStreamRef, sal_Bool bProgress = sal_False );
+ sal_Bool InsertModelStream( const SotStorageStreamRef& rModelStream, sal_uIntPtr nInsertPos = LIST_APPEND );
- BOOL GetURL( ULONG nPos, INetURLObject& rURL, BOOL bProgress = FALSE );
- SVX_DLLPUBLIC BOOL InsertURL( const INetURLObject& rURL, ULONG nInsertPos = LIST_APPEND );
- BOOL InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG nInsertPos = LIST_APPEND );
+ sal_Bool GetURL( sal_uIntPtr nPos, INetURLObject& rURL, sal_Bool bProgress = sal_False );
+ SVX_DLLPUBLIC sal_Bool InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos = LIST_APPEND );
+ sal_Bool InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos = LIST_APPEND );
- BOOL InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, ULONG nInsertPos );
+ sal_Bool InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos );
- void CopyToClipboard( Window* pWindow, ULONG nPos );
- void StartDrag( Window* pWindow, ULONG nPos );
+ void CopyToClipboard( Window* pWindow, sal_uIntPtr nPos );
+ void StartDrag( Window* pWindow, sal_uIntPtr nPos );
public:
diff --git a/svx/inc/svx/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx
index 0c68f73f48f6..bd63bae43cf4 100644
--- a/svx/inc/svx/grafctrl.hxx
+++ b/svx/inc/svx/grafctrl.hxx
@@ -41,7 +41,7 @@ class SVX_DLLPUBLIC TbxImageItem : public SfxUInt16Item
{
public:
TYPEINFO();
- TbxImageItem( USHORT nWhich = 0, UINT16 nImage = 0 );
+ TbxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual int operator==( const SfxPoolItem& ) const;
@@ -57,10 +57,10 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxGrafFilterToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxGrafFilterToolBoxControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
};
@@ -74,10 +74,10 @@ class SvxGrafToolBoxControl : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxGrafToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxGrafToolBoxControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual Window* CreateItemWindow( Window *pParent );
};
@@ -89,7 +89,7 @@ class SVX_DLLPUBLIC SvxGrafRedToolBoxControl : public SvxGrafToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxGrafRedToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxGrafRedToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
};
// ------------------------------
@@ -100,7 +100,7 @@ class SVX_DLLPUBLIC SvxGrafGreenToolBoxControl : public SvxGrafToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxGrafGreenToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxGrafGreenToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
};
// -----------------------------
@@ -111,7 +111,7 @@ class SVX_DLLPUBLIC SvxGrafBlueToolBoxControl : public SvxGrafToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxGrafBlueToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxGrafBlueToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
};
// ----------------------------------
@@ -122,7 +122,7 @@ class SVX_DLLPUBLIC SvxGrafLuminanceToolBoxControl : public SvxGrafToolBoxContro
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxGrafLuminanceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxGrafLuminanceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
};
// ---------------------------------
@@ -133,7 +133,7 @@ class SVX_DLLPUBLIC SvxGrafContrastToolBoxControl : public SvxGrafToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxGrafContrastToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxGrafContrastToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
};
// ------------------------------
@@ -144,7 +144,7 @@ class SVX_DLLPUBLIC SvxGrafGammaToolBoxControl : public SvxGrafToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxGrafGammaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxGrafGammaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
};
// -------------------------------------
@@ -155,7 +155,7 @@ class SVX_DLLPUBLIC SvxGrafTransparenceToolBoxControl : public SvxGrafToolBoxCon
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxGrafTransparenceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxGrafTransparenceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
};
// -----------------------------
@@ -166,10 +166,10 @@ class SVX_DLLPUBLIC SvxGrafModeToolBoxControl : public SfxToolBoxControl, public
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxGrafModeToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxGrafModeToolBoxControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual Window* CreateItemWindow( Window *pParent );
};
diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx
index f71f7fe6c43c..a06cbbab8aa6 100644
--- a/svx/inc/svx/graphctl.hxx
+++ b/svx/inc/svx/graphctl.hxx
@@ -65,10 +65,10 @@ class SVX_DLLPUBLIC GraphCtrl : public Control
GraphCtrlUserCall* pUserCall;
WinBits nWinStyle;
SdrObjKind eObjKind;
- USHORT nPolyEdit;
- BOOL bEditMode;
- BOOL bSdrMode;
- BOOL bAnim;
+ sal_uInt16 nPolyEdit;
+ sal_Bool bEditMode;
+ sal_Bool bSdrMode;
+ sal_Bool bAnim;
DECL_LINK( UpdateHdl, Timer* );
@@ -103,17 +103,17 @@ public:
void SetWinStyle( WinBits nWinBits );
WinBits GetWinStyle() const { return nWinStyle; }
- void SetGraphic( const Graphic& rGraphic, BOOL bNewModel = TRUE );
+ void SetGraphic( const Graphic& rGraphic, sal_Bool bNewModel = sal_True );
const Graphic& GetGraphic() const { return aGraphic; }
const Size& GetGraphicSize() const { return aGraphSize; }
const Point& GetMousePos() const { return aMousePos; }
- void SetEditMode( const BOOL bEditMode );
- BOOL IsEditMode() const { return bEditMode; }
+ void SetEditMode( const sal_Bool bEditMode );
+ sal_Bool IsEditMode() const { return bEditMode; }
- void SetPolyEditMode( const USHORT nPolyEdit );
- USHORT GetPolyEditMode() const { return nPolyEdit; }
+ void SetPolyEditMode( const sal_uInt16 nPolyEdit );
+ sal_uInt16 GetPolyEditMode() const { return nPolyEdit; }
void SetObjKind( const SdrObjKind eObjKind );
SdrObjKind GetObjKind() const { return eObjKind; }
@@ -121,7 +121,7 @@ public:
SdrModel* GetSdrModel() const { return pModel; }
SdrView* GetSdrView() const { return pView; }
SdrObject* GetSelectedSdrObject() const;
- BOOL IsChanged() const { return bSdrMode ? pModel->IsChanged() : FALSE; }
+ sal_Bool IsChanged() const { return bSdrMode ? pModel->IsChanged() : sal_False; }
void SetMousePosLink( const Link& rLink ) { aMousePosLink = rLink; }
const Link& GetMousePosLink() const { return aMousePosLink; }
diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx
index fd4ccc175135..c382ca01e6eb 100644
--- a/svx/inc/svx/grfcrop.hxx
+++ b/svx/inc/svx/grfcrop.hxx
@@ -38,25 +38,25 @@ class SVX_DLLPUBLIC SvxGrfCrop : public SfxPoolItem
{
sal_Int32 nLeft, nRight, nTop, nBottom;
public:
- SvxGrfCrop( USHORT );
+ SvxGrfCrop( sal_uInt16 );
SvxGrfCrop( sal_Int32 nLeft, sal_Int32 nRight,
sal_Int32 nTop, sal_Int32 nBottom,
- USHORT );
+ sal_uInt16 );
virtual ~SvxGrfCrop();
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
- virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const;
- virtual SvStream& Store(SvStream &, USHORT nIVer) const;
+ virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const;
+ virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
+ sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
+ sal_uInt8 nMemberId = 0 );
void SetLeft( sal_Int32 nVal ) { nLeft = nVal; }
void SetRight( sal_Int32 nVal ) { nRight = nVal; }
diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx
index 445d986b2c5e..dbdc681e0419 100644
--- a/svx/inc/svx/gridctrl.hxx
+++ b/svx/inc/svx/gridctrl.hxx
@@ -288,7 +288,7 @@ private:
sal_uInt16 m_nOptionMask; // the mask of options to be enabled in setDataSource
// (with respect to the data source capabilities)
// defaults to (insert | update | delete)
- USHORT m_nLastColId;
+ sal_uInt16 m_nLastColId;
long m_nLastRowId;
sal_Bool m_bDesignMode : 1; // default = sal_False
@@ -393,7 +393,7 @@ public:
@return
the text out of the cell
*/
- virtual String GetCellText(long _nRow, USHORT _nColId) const;
+ virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const;
void RemoveRows(sal_Bool bNewCursor);
@@ -517,7 +517,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
getServiceManager() const { return m_xServiceFactory; }
- /// returns <TRUE/> if the text of the given cell can be copied into the clipboard
+ /// returns <sal_True/> if the text of the given cell can be copied into the clipboard
sal_Bool canCopyCellText(sal_Int32 _nRow, sal_Int16 _nColId);
/// copies the text of the given cell into the clipboard
void copyCellText(sal_Int32 _nRow, sal_Int16 _nColId);
diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx
index b3c425b85b93..297d44acaa07 100644
--- a/svx/inc/svx/hdft.hxx
+++ b/svx/inc/svx/hdft.hxx
@@ -54,21 +54,21 @@ class SVX_DLLPUBLIC SvxHFPage: public SfxTabPage
public:
- virtual BOOL FillItemSet( SfxItemSet& rOutSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rOutSet );
virtual void Reset( const SfxItemSet& rSet );
virtual ~SvxHFPage();
- void DisableDeleteQueryBox() { bDisableQueryBox = TRUE; }
- void EnableBackgroundSelector( BOOL bNew ) { bEnableBackgroundSelector = bNew; }
+ void DisableDeleteQueryBox() { bDisableQueryBox = sal_True; }
+ void EnableBackgroundSelector( sal_Bool bNew ) { bEnableBackgroundSelector = bNew; }
void EnableDynamicSpacing();
protected:
virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet = 0 );
- SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rSet,
- USHORT nSetId );
+ SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rSet,
+ sal_uInt16 nSetId );
CheckBox aTurnOnBox;
CheckBox aCntSharedBox;
@@ -86,11 +86,11 @@ protected:
SvxPageWindow aBspWin;
PushButton aBackgroundBtn;
- USHORT nId;
+ sal_uInt16 nId;
SfxItemSet* pBBSet;
- BOOL bDisableQueryBox;
- BOOL bEnableBackgroundSelector;
- FASTBOOL bInReset;
+ sal_Bool bDisableQueryBox;
+ sal_Bool bEnableBackgroundSelector;
+ int bInReset;
void InitHandler();
DECL_LINK( TurnOnHdl, CheckBox*);
@@ -114,7 +114,7 @@ class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage
{
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
private:
SvxHeaderPage( Window* pParent, const SfxItemSet& rSet );
@@ -126,7 +126,7 @@ class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
{
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
private:
SVX_DLLPRIVATE SvxFooterPage( Window* pParent, const SfxItemSet& rSet );
diff --git a/svx/inc/svx/hlnkitem.hxx b/svx/inc/svx/hlnkitem.hxx
index b9540e8845ca..bdc0e1ff0e05 100644
--- a/svx/inc/svx/hlnkitem.hxx
+++ b/svx/inc/svx/hlnkitem.hxx
@@ -55,18 +55,18 @@ class SVX_DLLPUBLIC SvxHyperlinkItem : public SfxPoolItem
String sIntName;
SvxMacroTableDtor* pMacroTable;
- USHORT nMacroEvents;
+ sal_uInt16 nMacroEvents;
public:
TYPEINFO();
- SvxHyperlinkItem( USHORT _nWhich = SID_HYPERLINK_GETLINK ):
+ SvxHyperlinkItem( sal_uInt16 _nWhich = SID_HYPERLINK_GETLINK ):
SfxPoolItem(_nWhich), pMacroTable(NULL) { eType = HLINK_DEFAULT; nMacroEvents=0; };
SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem );
- SvxHyperlinkItem( USHORT nWhich, String& rName, String& rURL,
+ SvxHyperlinkItem( sal_uInt16 nWhich, String& rName, String& rURL,
String& rTarget, String& rIntName,
SvxLinkInsertMode eTyp = HLINK_FIELD,
- USHORT nEvents = 0,
+ sal_uInt16 nEvents = 0,
SvxMacroTableDtor *pMacroTbl =NULL );
virtual ~SvxHyperlinkItem () { delete pMacroTable; }
@@ -74,8 +74,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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
const String& GetName() const { return sName; }
void SetName(const String& rName) { sName = rName; }
@@ -92,16 +92,16 @@ public:
SvxLinkInsertMode GetInsertMode() const { return eType; }
void SetInsertMode( SvxLinkInsertMode eNew ) { eType = eNew; }
- void SetMacro( USHORT nEvent, const SvxMacro& rMacro );
+ void SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro );
void SetMacroTable( const SvxMacroTableDtor& rTbl );
const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTable; }
- void SetMacroEvents (const USHORT nEvents) { nMacroEvents = nEvents; }
- USHORT GetMacroEvents() const { return nMacroEvents; }
+ void SetMacroEvents (const sal_uInt16 nEvents) { nMacroEvents = nEvents; }
+ sal_uInt16 GetMacroEvents() const { return nMacroEvents; }
- virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const;
- virtual SfxPoolItem* Create( SvStream &, USHORT nVer ) const;
+ virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const;
+ virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVer ) const;
};
diff --git a/svx/inc/svx/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx
index fc129763e63f..f35df8dc73a8 100644
--- a/svx/inc/svx/hyperdlg.hxx
+++ b/svx/inc/svx/hyperdlg.hxx
@@ -47,7 +47,7 @@ private:
AbstractSvxHpLinkDlg* mpDlg;
public:
- SvxHlinkDlgWrapper( Window*pParent, USHORT nId,
+ SvxHlinkDlgWrapper( Window*pParent, sal_uInt16 nId,
SfxBindings* pBindings, SfxChildWinInfo* pInfo );
SFX_DECL_CHILDWINDOW(SvxHlinkDlgWrapper);
diff --git a/svx/inc/svx/hyprlink.hxx b/svx/inc/svx/hyprlink.hxx
index 0a5af0afae82..bb869f5e5cb5 100644
--- a/svx/inc/svx/hyprlink.hxx
+++ b/svx/inc/svx/hyprlink.hxx
@@ -34,7 +34,7 @@
class SVX_DLLPUBLIC SvxHyperlinkDlgWrapper : public SfxChildWindow
{
public:
- SvxHyperlinkDlgWrapper( Window*pParent, USHORT nId,
+ SvxHyperlinkDlgWrapper( Window*pParent, sal_uInt16 nId,
SfxBindings* pBindings, SfxChildWinInfo* pInfo );
SFX_DECL_CHILDWINDOW(SvxHyperlinkDlgWrapper);
};
diff --git a/svx/inc/svx/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx
index d1a6961453a5..7e82f0bc36e2 100644
--- a/svx/inc/svx/imapdlg.hxx
+++ b/svx/inc/svx/imapdlg.hxx
@@ -74,7 +74,7 @@ class SVX_DLLPUBLIC SvxIMapDlgChildWindow : public SfxChildWindow
{
public:
- SvxIMapDlgChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+ SvxIMapDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
SFX_DECL_CHILDWINDOW( SvxIMapDlgChildWindow );
@@ -101,13 +101,13 @@ class SvxIMapDlgItem : public SfxControllerItem
protected:
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
public:
- SvxIMapDlgItem( USHORT nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings );
+ SvxIMapDlgItem( sal_uInt16 nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings );
};
@@ -144,7 +144,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
SvxIMapDlgItem aIMapItem;
virtual void Resize();
- virtual BOOL Close();
+ virtual sal_Bool Close();
#ifdef _IMAPDLG_PRIVATE
@@ -160,7 +160,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
DECL_LINK( MiscHdl, void* );
void DoOpen();
- BOOL DoSave();
+ sal_Bool DoSave();
#endif
@@ -171,7 +171,7 @@ public:
Window* pParent, const ResId& rResId );
~SvxIMapDlg();
- void SetExecState( BOOL bEnable );
+ void SetExecState( sal_Bool bEnable );
void SetGraphic( const Graphic& rGraphic );
diff --git a/svx/inc/svx/insctrl.hxx b/svx/inc/svx/insctrl.hxx
index e7fa02c70d91..dd5baa6bcc74 100644
--- a/svx/inc/svx/insctrl.hxx
+++ b/svx/inc/svx/insctrl.hxx
@@ -37,20 +37,20 @@
class SVX_DLLPUBLIC SvxInsertStatusBarControl : public SfxStatusBarControl
{
public:
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual void Click();
virtual void Paint( const UserDrawEvent& rEvt );
SFX_DECL_STATUSBAR_CONTROL();
- SvxInsertStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+ SvxInsertStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
~SvxInsertStatusBarControl();
- static ULONG GetDefItemWidth(const StatusBar& rStb);
+ static sal_uIntPtr GetDefItemWidth(const StatusBar& rStb);
private:
- BOOL bInsert;
+ sal_Bool bInsert;
#ifdef _SVX_INSCTRL_CXX
SVX_DLLPRIVATE void DrawItemText_Impl();
diff --git a/svx/inc/svx/ipolypolygoneditorcontroller.hxx b/svx/inc/svx/ipolypolygoneditorcontroller.hxx
index 6c3a35218df6..205f8f7e7254 100644
--- a/svx/inc/svx/ipolypolygoneditorcontroller.hxx
+++ b/svx/inc/svx/ipolypolygoneditorcontroller.hxx
@@ -54,20 +54,20 @@ class IPolyPolygonEditorController
{
public:
virtual void DeleteMarkedPoints() = 0;
- virtual BOOL IsDeleteMarkedPointsPossible() const = 0;
+ virtual sal_Bool IsDeleteMarkedPointsPossible() const = 0;
virtual void RipUpAtMarkedPoints() = 0;
virtual bool IsRipUpAtMarkedPointsPossible() const = 0;
- virtual BOOL IsSetMarkedSegmentsKindPossible() const = 0;
+ virtual sal_Bool IsSetMarkedSegmentsKindPossible() const = 0;
virtual SdrPathSegmentKind GetMarkedSegmentsKind() const = 0;
virtual void SetMarkedSegmentsKind(SdrPathSegmentKind eKind) = 0;
- virtual BOOL IsSetMarkedPointsSmoothPossible() const = 0;
+ virtual sal_Bool IsSetMarkedPointsSmoothPossible() const = 0;
virtual SdrPathSmoothKind GetMarkedPointsSmooth() const = 0;
virtual void SetMarkedPointsSmooth(SdrPathSmoothKind eKind) = 0;
- virtual void CloseMarkedObjects(BOOL bToggle, BOOL bOpen ) = 0;
+ virtual void CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen ) = 0;
virtual bool IsOpenCloseMarkedObjectsPossible() const = 0;
virtual SdrObjClosedKind GetMarkedObjectsClosedState() const = 0;
};
diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx
index 8f6506b90e66..8f02fdc2ef3e 100644
--- a/svx/inc/svx/itemwin.hxx
+++ b/svx/inc/svx/itemwin.hxx
@@ -43,10 +43,10 @@ class SfxObjectShell;
class SvxLineBox : public LineLB
{
BmpColorMode meBmpMode;
- USHORT nCurPos;
+ sal_uInt16 nCurPos;
Timer aDelayTimer;
Size aLogicalSize;
- BOOL bRelease;
+ sal_Bool bRelease;
SfxObjectShell* mpSh;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
@@ -77,11 +77,11 @@ class SvxColorBox : public ColorLB
{
using Window::Update;
- USHORT nCurPos;
- USHORT nId;
+ sal_uInt16 nCurPos;
+ sal_uInt16 nId;
Timer aDelayTimer;
Size aLogicalSize;
- BOOL bRelease;
+ sal_Bool bRelease;
::rtl::OUString maCommand;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
@@ -152,17 +152,17 @@ public:
SvxFillTypeBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
~SvxFillTypeBox();
- void Selected() { bSelect = TRUE; }
- BOOL IsRelease() { return bRelease;}
+ void Selected() { bSelect = sal_True; }
+ sal_Bool IsRelease() { return bRelease;}
protected:
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
private:
- USHORT nCurPos;
- BOOL bSelect;
- BOOL bRelease;
+ sal_uInt16 nCurPos;
+ sal_Bool bSelect;
+ sal_Bool bRelease;
#ifdef _SVX_ITEMWIN_CXX
void ReleaseFocus_Impl();
@@ -177,7 +177,7 @@ public:
SvxFillAttrBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL );
~SvxFillAttrBox();
- BOOL IsRelease() { return bRelease;}
+ sal_Bool IsRelease() { return bRelease;}
protected:
virtual long PreNotify( NotifyEvent& rNEvt );
@@ -185,8 +185,8 @@ protected:
virtual void Select();
private:
- USHORT nCurPos;
- BOOL bRelease;
+ sal_uInt16 nCurPos;
+ sal_Bool bRelease;
#ifdef _SVX_ITEMWIN_CXX
void ReleaseFocus_Impl();
diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx
index 0c4efa6b7231..862a442517e7 100644
--- a/svx/inc/svx/langbox.hxx
+++ b/svx/inc/svx/langbox.hxx
@@ -58,7 +58,7 @@ class SvtLanguageTable;
// load language strings from resource
-SVX_DLLPUBLIC String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg );
+SVX_DLLPUBLIC String GetDicInfoStr( const String& rName, const sal_uInt16 nLang, sal_Bool bNeg );
class SVX_DLLPUBLIC SvxLanguageBox : public ListBox
{
@@ -69,34 +69,34 @@ private:
Image m_aCheckedImage;
Image m_aCheckedImageHC;
String m_aAllString;
- com::sun::star::uno::Sequence< INT16 > *m_pSpellUsedLang;
+ com::sun::star::uno::Sequence< sal_Int16 > *m_pSpellUsedLang;
SvtLanguageTable* m_pLangTable;
- INT16 m_nLangList;
- BOOL m_bHasLangNone;
- BOOL m_bLangNoneIsLangAll;
- BOOL m_bWithCheckmark;
+ sal_Int16 m_nLangList;
+ sal_Bool m_bHasLangNone;
+ sal_Bool m_bLangNoneIsLangAll;
+ sal_Bool m_bWithCheckmark;
SVX_DLLPRIVATE void Init();
- SVX_DLLPRIVATE USHORT ImplInsertImgEntry( const String& rEntry, USHORT nPos, bool bChecked );
- SVX_DLLPRIVATE USHORT ImplInsertLanguage(LanguageType, USHORT, sal_Int16 );
+ SVX_DLLPRIVATE sal_uInt16 ImplInsertImgEntry( const String& rEntry, sal_uInt16 nPos, bool bChecked );
+ SVX_DLLPRIVATE sal_uInt16 ImplInsertLanguage(LanguageType, sal_uInt16, sal_Int16 );
public:
- SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck = FALSE);
- SvxLanguageBox( Window* pParent, const ResId& rResId, BOOL bCheck = FALSE);
+ SvxLanguageBox( Window* pParent, WinBits nWinStyle, sal_Bool bCheck = sal_False);
+ SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool bCheck = sal_False);
~SvxLanguageBox();
- void SetLanguageList( INT16 nLangList,
- BOOL bHasLangNone, BOOL bLangNoneIsLangAll = FALSE,
- BOOL bCheckSpellAvail = FALSE );
+ void SetLanguageList( sal_Int16 nLangList,
+ sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll = sal_False,
+ sal_Bool bCheckSpellAvail = sal_False );
- USHORT InsertLanguage( const LanguageType eLangType, USHORT nPos = LISTBOX_APPEND );
- USHORT InsertDefaultLanguage( sal_Int16 nType, USHORT nPos = LISTBOX_APPEND );
- USHORT InsertLanguage( const LanguageType eLangType,
- BOOL bCheckEntry, USHORT nPos = LISTBOX_APPEND );
+ sal_uInt16 InsertLanguage( const LanguageType eLangType, sal_uInt16 nPos = LISTBOX_APPEND );
+ sal_uInt16 InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos = LISTBOX_APPEND );
+ sal_uInt16 InsertLanguage( const LanguageType eLangType,
+ sal_Bool bCheckEntry, sal_uInt16 nPos = LISTBOX_APPEND );
void RemoveLanguage( const LanguageType eLangType );
- void SelectLanguage( const LanguageType eLangType, BOOL bSelect = TRUE );
+ void SelectLanguage( const LanguageType eLangType, sal_Bool bSelect = sal_True );
LanguageType GetSelectLanguage() const;
- BOOL IsLanguageSelected( const LanguageType eLangType ) const;
+ sal_Bool IsLanguageSelected( const LanguageType eLangType ) const;
};
#if ENABLE_LAYOUT
@@ -110,7 +110,7 @@ class SVX_DLLPUBLIC SvxLanguageBox : public ListBox
DECL_GET_WINDOW (SvxLanguageBox);*/
public:
- SvxLanguageBox( Context*, const char*, BOOL bCheck = FALSE );
+ SvxLanguageBox( Context*, const char*, sal_Bool bCheck = sal_False );
~SvxLanguageBox ();
void SetLanguageList (sal_Int16 list, bool hasLangNone, bool langNoneIsLangAll=false, bool checkSpellAvailable=false);
diff --git a/svx/inc/svx/lathe3d.hxx b/svx/inc/svx/lathe3d.hxx
index 9ddd90a6bfac..714475038fd0 100644
--- a/svx/inc/svx/lathe3d.hxx
+++ b/svx/inc/svx/lathe3d.hxx
@@ -98,12 +98,12 @@ private:
sal_Bool GetCloseBack() const
{ return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); }
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
void ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs);
virtual void operator=(const SdrObject&);
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
// TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
virtual void TakeObjNameSingul(String& rName) const;
@@ -114,7 +114,7 @@ private:
const basegfx::B2DPolyPolygon& GetPolyPoly2D() { return maPolyPoly2D; }
// Aufbrechen
- virtual BOOL IsBreakObjPossible();
+ virtual sal_Bool IsBreakObjPossible();
virtual SdrAttrObj* GetBreakObj();
};
diff --git a/svx/inc/svx/layctrl.hxx b/svx/inc/svx/layctrl.hxx
index 1bbdc714b7c9..cf77a41f0ee7 100644
--- a/svx/inc/svx/layctrl.hxx
+++ b/svx/inc/svx/layctrl.hxx
@@ -38,19 +38,19 @@
class SVX_DLLPUBLIC SvxTableToolBoxControl : public SfxToolBoxControl
{
private:
- FASTBOOL bEnabled;
+ int bEnabled;
public:
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
virtual SfxPopupWindow* CreatePopupWindowCascading();
- virtual void StateChanged( USHORT nSID,
+ virtual void StateChanged( sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState );
SFX_DECL_TOOLBOX_CONTROL();
- SvxTableToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxTableToolBoxControl();
};
@@ -58,7 +58,7 @@ public:
class SVX_DLLPUBLIC SvxColumnsToolBoxControl : public SfxToolBoxControl
{
- FASTBOOL bEnabled;
+ int bEnabled;
public:
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
@@ -66,10 +66,10 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxColumnsToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxColumnsToolBoxControl();
- virtual void StateChanged( USHORT nSID,
+ virtual void StateChanged( sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState );
};
diff --git a/svx/inc/svx/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx
index 36c82c64f44b..6129a17d9c28 100644
--- a/svx/inc/svx/lboxctrl.hxx
+++ b/svx/inc/svx/lboxctrl.hxx
@@ -44,7 +44,7 @@ protected:
String aActionStr;
SvxPopupWindowListBox * pPopupWin;
- void Impl_SetInfo( USHORT nCount );
+ void Impl_SetInfo( sal_uInt16 nCount );
DECL_LINK( PopupModeEndHdl, void * );
DECL_LINK( SelectHdl, void * );
@@ -52,12 +52,12 @@ protected:
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxListBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
virtual ~SvxListBoxControl();
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
- virtual void StateChanged( USHORT nSID,
+ virtual void StateChanged( sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState );
};
@@ -72,10 +72,10 @@ class SVX_DLLPUBLIC SvxUndoRedoControl : public SvxListBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxUndoRedoControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxUndoRedoControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
virtual ~SvxUndoRedoControl();
- virtual void StateChanged( USHORT nSID,
+ virtual void StateChanged( sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState );
diff --git a/svx/inc/svx/linectrl.hxx b/svx/inc/svx/linectrl.hxx
index 43c96f128671..ea553d20aef5 100644
--- a/svx/inc/svx/linectrl.hxx
+++ b/svx/inc/svx/linectrl.hxx
@@ -50,15 +50,15 @@ private:
XLineStyleItem* pStyleItem;
XLineDashItem* pDashItem;
- BOOL bUpdate;
+ sal_Bool bUpdate;
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxLineStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxLineStyleToolBoxControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
void Update( const SfxPoolItem* pState );
virtual Window* CreateItemWindow( Window *pParent );
@@ -73,10 +73,10 @@ class SVX_DLLPUBLIC SvxLineWidthToolBoxControl : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxLineWidthToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxLineWidthToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxLineWidthToolBoxControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual Window* CreateItemWindow( Window *pParent );
};
@@ -90,10 +90,10 @@ class SVX_DLLPUBLIC SvxLineColorToolBoxControl : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxLineColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxLineColorToolBoxControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
void Update( const SfxPoolItem* pState );
virtual Window* CreateItemWindow( Window *pParent );
@@ -109,11 +109,11 @@ class SvxLineEndWindow : public SfxPopupWindow
private:
XLineEndList* pLineEndList;
ValueSet aLineEndSet;
- USHORT nCols;
- USHORT nLines;
- ULONG nLineEndWidth;
+ sal_uInt16 nCols;
+ sal_uInt16 nLines;
+ sal_uIntPtr nLineEndWidth;
Size aBmpSize;
- BOOL bPopupMode;
+ sal_Bool bPopupMode;
bool mbInResize;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
@@ -126,7 +126,7 @@ private:
protected:
virtual void Resizing( Size& rSize );
virtual void Resize();
- virtual BOOL Close();
+ virtual sal_Bool Close();
virtual void PopupModeEnd();
/** This function is called when the window gets the focus. It grabs
@@ -136,10 +136,10 @@ protected:
virtual void GetFocus (void);
public:
- SvxLineEndWindow( USHORT nId,
+ SvxLineEndWindow( sal_uInt16 nId,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
const String& rWndTitle );
- SvxLineEndWindow( USHORT nId,
+ SvxLineEndWindow( sal_uInt16 nId,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
Window* pParentWindow,
const String& rWndTitle );
@@ -147,7 +147,7 @@ public:
void StartSelection();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindow* Clone() const;
};
@@ -160,10 +160,10 @@ class SVX_DLLPUBLIC SvxLineEndToolBoxControl : public SfxToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxLineEndToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxLineEndToolBoxControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
diff --git a/svx/inc/svx/modctrl.hxx b/svx/inc/svx/modctrl.hxx
index fd9e085c826e..8b7702341dbc 100644
--- a/svx/inc/svx/modctrl.hxx
+++ b/svx/inc/svx/modctrl.hxx
@@ -37,18 +37,18 @@
class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl
{
public:
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt );
SFX_DECL_STATUSBAR_CONTROL();
- SvxModifyControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+ SvxModifyControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
- static ULONG GetDefItemWidth(const StatusBar& rStb);
+ static sal_uIntPtr GetDefItemWidth(const StatusBar& rStb);
private:
- BOOL bState;
+ sal_Bool bState;
#ifdef _SVX_MODCTRL_CXX
SVX_DLLPRIVATE void DrawItemText_Impl();
diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx
index 6869a97e424a..92f00114edf4 100644
--- a/svx/inc/svx/msdffdef.hxx
+++ b/svx/inc/svx/msdffdef.hxx
@@ -249,7 +249,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
+// Werte fuer den sal_uIntPtr im DFF_PST_TextHeaderAtom
enum DFF_TextHeader {
DFFTH_TITLE,
DFFTH_BODY,
@@ -273,15 +273,15 @@ enum DFF_TextHeader {
// Transform
#define DFF_Prop_Rotation 4 // Fixed Point 16.16 degrees
// Protection
-#define DFF_Prop_LockRotation 119 // BOOL No rotation
-#define DFF_Prop_LockAspectRatio 120 // BOOL Don't allow changes in aspect ratio
-#define DFF_Prop_LockPosition 121 // BOOL Don't allow the shape to be moved
-#define DFF_Prop_LockAgainstSelect 122 // BOOL Shape may not be selected
-#define DFF_Prop_LockCropping 123 // BOOL No cropping this shape
-#define DFF_Prop_LockVertices 124 // BOOL Edit Points not allowed
-#define DFF_Prop_LockText 125 // BOOL Do not edit text
-#define DFF_Prop_LockAdjustHandles 126 // BOOL Do not adjust
-#define DFF_Prop_LockAgainstGrouping 127 // BOOL Do not group this shape
+#define DFF_Prop_LockRotation 119 // sal_Bool No rotation
+#define DFF_Prop_LockAspectRatio 120 // sal_Bool Don't allow changes in aspect ratio
+#define DFF_Prop_LockPosition 121 // sal_Bool Don't allow the shape to be moved
+#define DFF_Prop_LockAgainstSelect 122 // sal_Bool Shape may not be selected
+#define DFF_Prop_LockCropping 123 // sal_Bool No cropping this shape
+#define DFF_Prop_LockVertices 124 // sal_Bool Edit Points not allowed
+#define DFF_Prop_LockText 125 // sal_Bool Do not edit text
+#define DFF_Prop_LockAdjustHandles 126 // sal_Bool Do not adjust
+#define DFF_Prop_LockAgainstGrouping 127 // sal_Bool Do not group this shape
// Text
#define DFF_Prop_lTxid 128 // LONG id for the text, value determined by the host
#define DFF_Prop_dxTextLeft 129 // LONG margins relative to shape's inscribed text rectangle (in EMUs)
@@ -295,11 +295,11 @@ enum DFF_TextHeader {
#define DFF_Prop_cdirFont 137 // MSO_CDIR Font rotation
#define DFF_Prop_hspNext 138 // MSO_HSP ID of the next shape (used by Word for linked textboxes)
#define DFF_Prop_txdir 139 // MSO_TXDIR Bi-Di Text direction
-#define DFF_Prop_SelectText 187 // BOOL TRUE if single click selects text, FALSE if two clicks
-#define DFF_Prop_AutoTextMargin 188 // BOOL use host's margin calculations
-#define DFF_Prop_RotateText 189 // BOOL Rotate text with shape
-#define DFF_Prop_FitShapeToText 190 // BOOL Size shape to fit text size
-#define DFF_Prop_FitTextToShape 191 // BOOL Size text to fit shape size
+#define DFF_Prop_SelectText 187 // sal_Bool sal_True if single click selects text, sal_False if two clicks
+#define DFF_Prop_AutoTextMargin 188 // sal_Bool use host's margin calculations
+#define DFF_Prop_RotateText 189 // sal_Bool Rotate text with shape
+#define DFF_Prop_FitShapeToText 190 // sal_Bool Size shape to fit text size
+#define DFF_Prop_FitTextToShape 191 // sal_Bool Size text to fit shape size
// GeoText
#define DFF_Prop_gtextUNICODE 192 // WCHAR* UNICODE text string
#define DFF_Prop_gtextRTF 193 // char* RTF text string
@@ -307,22 +307,22 @@ enum DFF_TextHeader {
#define DFF_Prop_gtextSize 195 // LONG default point size
#define DFF_Prop_gtextSpacing 196 // LONG fixed point 16.16
#define DFF_Prop_gtextFont 197 // WCHAR* font family name
-#define DFF_Prop_gtextFReverseRows 240 // BOOL 8000 Reverse row order
-#define DFF_Prop_fGtext 241 // BOOL 4000 Has text effect
-#define DFF_Prop_gtextFVertical 242 // BOOL 2000 Rotate characters
-#define DFF_Prop_gtextFKern 243 // BOOL 1000 Kern characters
-#define DFF_Prop_gtextFTight 244 // BOOL 800 Tightening or tracking
-#define DFF_Prop_gtextFStretch 245 // BOOL 400 Stretch to fit shape
-#define DFF_Prop_gtextFShrinkFit 246 // BOOL 200 Char bounding box
-#define DFF_Prop_gtextFBestFit 247 // BOOL 100 Scale text-on-path
-#define DFF_Prop_gtextFNormalize 248 // BOOL 80 Stretch char height
-#define DFF_Prop_gtextFDxMeasure 249 // BOOL 40 Do not measure along path
-#define DFF_Prop_gtextFBold 250 // BOOL 20 Bold font
-#define DFF_Prop_gtextFItalic 251 // BOOL 10 Italic font
-#define DFF_Prop_gtextFUnderline 252 // BOOL 8 Underline font
-#define DFF_Prop_gtextFShadow 253 // BOOL 4 Shadow font
-#define DFF_Prop_gtextFSmallcaps 254 // BOOL 2 Small caps font
-#define DFF_Prop_gtextFStrikethrough 255 // BOOL 1 Strike through font
+#define DFF_Prop_gtextFReverseRows 240 // sal_Bool 8000 Reverse row order
+#define DFF_Prop_fGtext 241 // sal_Bool 4000 Has text effect
+#define DFF_Prop_gtextFVertical 242 // sal_Bool 2000 Rotate characters
+#define DFF_Prop_gtextFKern 243 // sal_Bool 1000 Kern characters
+#define DFF_Prop_gtextFTight 244 // sal_Bool 800 Tightening or tracking
+#define DFF_Prop_gtextFStretch 245 // sal_Bool 400 Stretch to fit shape
+#define DFF_Prop_gtextFShrinkFit 246 // sal_Bool 200 Char bounding box
+#define DFF_Prop_gtextFBestFit 247 // sal_Bool 100 Scale text-on-path
+#define DFF_Prop_gtextFNormalize 248 // sal_Bool 80 Stretch char height
+#define DFF_Prop_gtextFDxMeasure 249 // sal_Bool 40 Do not measure along path
+#define DFF_Prop_gtextFBold 250 // sal_Bool 20 Bold font
+#define DFF_Prop_gtextFItalic 251 // sal_Bool 10 Italic font
+#define DFF_Prop_gtextFUnderline 252 // sal_Bool 8 Underline font
+#define DFF_Prop_gtextFShadow 253 // sal_Bool 4 Shadow font
+#define DFF_Prop_gtextFSmallcaps 254 // sal_Bool 2 Small caps font
+#define DFF_Prop_gtextFStrikethrough 255 // sal_Bool 1 Strike through font
// Blip
#define DFF_Prop_cropFromTop 256 // LONG 16.16 fraction times total image width or height, as appropriate.
#define DFF_Prop_cropFromBottom 257 // LONG
@@ -342,10 +342,10 @@ enum DFF_TextHeader {
#define DFF_Prop_pibPrint 271 // IMsoBlip* Blip to display when printing
#define DFF_Prop_pibPrintName 272 // WCHAR* Blip file name
#define DFF_Prop_pibPrintFlags 273 // MSO_BLIPFLAGS Blip flags
-#define DFF_Prop_fNoHitTestPicture 316 // BOOL Do not hit test the picture
-#define DFF_Prop_pictureGray 317 // BOOL grayscale display
-#define DFF_Prop_pictureBiLevel 318 // BOOL bi-level display
-#define DFF_Prop_pictureActive 319 // BOOL Server is active (OLE objects only)
+#define DFF_Prop_fNoHitTestPicture 316 // sal_Bool Do not hit test the picture
+#define DFF_Prop_pictureGray 317 // sal_Bool grayscale display
+#define DFF_Prop_pictureBiLevel 318 // sal_Bool bi-level display
+#define DFF_Prop_pictureActive 319 // sal_Bool Server is active (OLE objects only)
// Geometry
#define DFF_Prop_geoLeft 320 // LONG Defines the G (geometry) coordinate space.
#define DFF_Prop_geoTop 321 // LONG
@@ -371,12 +371,12 @@ enum DFF_TextHeader {
#define DFF_Prop_pFormulas 342 // LONG
#define DFF_Prop_textRectangles 343 // LONG
#define DFF_Prop_connectorType 344 // LONG ->0=none, 1=segments, 2=custom, 3=rect
-#define DFF_Prop_fShadowOK 378 // BOOL Shadow may be set
-#define DFF_Prop_f3DOK 379 // BOOL 3D may be set
-#define DFF_Prop_fLineOK 380 // BOOL Line style may be set
-#define DFF_Prop_fGtextOK 381 // BOOL Text effect (FontWork) supported
+#define DFF_Prop_fShadowOK 378 // sal_Bool Shadow may be set
+#define DFF_Prop_f3DOK 379 // sal_Bool 3D may be set
+#define DFF_Prop_fLineOK 380 // sal_Bool Line style may be set
+#define DFF_Prop_fGtextOK 381 // sal_Bool Text effect (FontWork) supported
#define DFF_Prop_fFillShadeShapeOK 382 // BOOL
-#define DFF_Prop_fFillOK 383 // BOOL OK to fill the shape through the UI or VBA?
+#define DFF_Prop_fFillOK 383 // sal_Bool OK to fill the shape through the UI or VBA?
// FillStyle
#define DFF_Prop_fillType 384 // MSO_FILLTYPE Type of fill
#define DFF_Prop_fillColor 385 // MSO_CLR Foreground color
@@ -407,11 +407,11 @@ enum DFF_TextHeader {
#define DFF_Prop_fillShapeOriginX 410 // LONG
#define DFF_Prop_fillShapeOriginY 411 // LONG
#define DFF_Prop_fillShadeType 412 // MSO_SHADETYPE Type of shading, if a shaded (gradient) fill.
-#define DFF_Prop_fFilled 443 // BOOL Is shape filled?
-#define DFF_Prop_fHitTestFill 444 // BOOL Should we hit test fill?
-#define DFF_Prop_fillShape 445 // BOOL Register pattern on shape
-#define DFF_Prop_fillUseRect 446 // BOOL Use the large rect?
-#define DFF_Prop_fNoFillHitTest 447 // BOOL Hit test a shape as though filled
+#define DFF_Prop_fFilled 443 // sal_Bool Is shape filled?
+#define DFF_Prop_fHitTestFill 444 // sal_Bool Should we hit test fill?
+#define DFF_Prop_fillShape 445 // sal_Bool Register pattern on shape
+#define DFF_Prop_fillUseRect 446 // sal_Bool Use the large rect?
+#define DFF_Prop_fNoFillHitTest 447 // sal_Bool Hit test a shape as though filled
// LineStyle
#define DFF_Prop_lineColor 448 // MSO_CLR Color of line
#define DFF_Prop_lineOpacity 449 // LONG Not implemented
@@ -437,11 +437,11 @@ enum DFF_TextHeader {
#define DFF_Prop_lineEndArrowLength 469 // MSO_LINEENDLENGTH Arrow at end
#define DFF_Prop_lineJoinStyle 470 // MSO_LINEJOIN How to join lines
#define DFF_Prop_lineEndCapStyle 471 // MSO_LINECAP How to end lines
-#define DFF_Prop_fArrowheadsOK 507 // BOOL Allow arrowheads if prop. is set
-#define DFF_Prop_fLine 508 // BOOL Any line?
-#define DFF_Prop_fHitTestLine 509 // BOOL Should we hit test lines?
-#define DFF_Prop_lineFillShape 510 // BOOL Register pattern on shape
-#define DFF_Prop_fNoLineDrawDash 511 // BOOL Draw a dashed line if no line
+#define DFF_Prop_fArrowheadsOK 507 // sal_Bool Allow arrowheads if prop. is set
+#define DFF_Prop_fLine 508 // sal_Bool Any line?
+#define DFF_Prop_fHitTestLine 509 // sal_Bool Should we hit test lines?
+#define DFF_Prop_lineFillShape 510 // sal_Bool Register pattern on shape
+#define DFF_Prop_fNoLineDrawDash 511 // sal_Bool Draw a dashed line if no line
// ShadowStyle
#define DFF_Prop_shadowType 512 // MSO_SHADOWTYPE Type of effect
#define DFF_Prop_shadowColor 513 // MSO_CLR Foreground color
@@ -461,8 +461,8 @@ enum DFF_TextHeader {
#define DFF_Prop_shadowWeight 527 // LONG scaling factor
#define DFF_Prop_shadowOriginX 528 // LONG
#define DFF_Prop_shadowOriginY 529 // LONG
-#define DFF_Prop_fShadow 574 // BOOL Any shadow?
-#define DFF_Prop_fshadowObscured 575 // BOOL Excel5-style shadow
+#define DFF_Prop_fShadow 574 // sal_Bool Any shadow?
+#define DFF_Prop_fshadowObscured 575 // sal_Bool Excel5-style shadow
// PerspectiveStyle
#define DFF_Prop_perspectiveType 576 // MSO_XFORMTYPE Where transform applies
#define DFF_Prop_perspectiveOffsetX 577 // LONG The LONG values define a transformation matrix, effectively, each value is scaled by the perspectiveWeight parameter.
@@ -476,7 +476,7 @@ enum DFF_TextHeader {
#define DFF_Prop_perspectiveWeight 585 // LONG Scaling factor
#define DFF_Prop_perspectiveOriginX 586 // LONG
#define DFF_Prop_perspectiveOriginY 587 // LONG
-#define DFF_Prop_fPerspective 639 // BOOL On/off
+#define DFF_Prop_fPerspective 639 // sal_Bool On/off
// 3D Object
#define DFF_Prop_c3DSpecularAmt 640 // LONG Fixed-point 16.16
#define DFF_Prop_c3DDiffuseAmt 641 // LONG Fixed-point 16.16
@@ -487,8 +487,8 @@ enum DFF_TextHeader {
#define DFF_Prop_c3DExtrudePlane 646 // LONG Extrusion direction
#define DFF_Prop_c3DExtrusionColor 647 // MSO_CLR Basic color of extruded part of shape; the lighting model used will determine the exact shades used when rendering.
#define DFF_Prop_c3DCrMod 648 // MSO_CLR Modification for BW views
-#define DFF_Prop_f3D 700 // BOOL Does this shape have a 3D effect?
-#define DFF_Prop_fc3DMetallic 701 // BOOL Use metallic specularity?
+#define DFF_Prop_f3D 700 // sal_Bool Does this shape have a 3D effect?
+#define DFF_Prop_fc3DMetallic 701 // sal_Bool Use metallic specularity?
#define DFF_Prop_fc3DUseExtrusionColor 702 // BOOL
#define DFF_Prop_fc3DLightFace 703 // BOOL
// 3D Style
@@ -521,20 +521,20 @@ enum DFF_TextHeader {
#define DFF_Prop_c3DFillIntensity 730 // LONG Fixed point intensity
#define DFF_Prop_fc3DConstrainRotation 763 // BOOL
#define DFF_Prop_fc3DRotationCenterAuto 764 // BOOL
-#define DFF_Prop_fc3DParallel 765 // BOOL Parallel projection?
-#define DFF_Prop_fc3DKeyHarsh 766 // BOOL Is key lighting harsh?
-#define DFF_Prop_fc3DFillHarsh 767 // BOOL Is fill lighting harsh?
+#define DFF_Prop_fc3DParallel 765 // sal_Bool Parallel projection?
+#define DFF_Prop_fc3DKeyHarsh 766 // sal_Bool Is key lighting harsh?
+#define DFF_Prop_fc3DFillHarsh 767 // sal_Bool Is fill lighting harsh?
// Shape
#define DFF_Prop_hspMaster 769 // MSO_HSP master shape
#define DFF_Prop_cxstyle 771 // MSO_CXSTYLE Type of connector
#define DFF_Prop_bWMode 772 // MSO_BWMODE Settings for modifications to be made when in different forms of black-and-white mode.
#define DFF_Prop_bWModePureBW 773 // MSO_BWMODE
#define DFF_Prop_bWModeBW 774 // MSO_BWMODE
-#define DFF_Prop_fOleIcon 826 // BOOL For OLE objects, whether the object is in icon form
-#define DFF_Prop_fPreferRelativeResize 827 // BOOL For UI only. Prefer relative resizing.
-#define DFF_Prop_fLockShapeType 828 // BOOL Lock the shape type (don't allow Change Shape)
+#define DFF_Prop_fOleIcon 826 // sal_Bool For OLE objects, whether the object is in icon form
+#define DFF_Prop_fPreferRelativeResize 827 // sal_Bool For UI only. Prefer relative resizing.
+#define DFF_Prop_fLockShapeType 828 // sal_Bool Lock the shape type (don't allow Change Shape)
#define DFF_Prop_fDeleteAttachedObject 830 // BOOL
-#define DFF_Prop_fBackground 831 // BOOL If TRUE, this is the background shape.
+#define DFF_Prop_fBackground 831 // sal_Bool If sal_True, this is the background shape.
// Callout
#define DFF_Prop_spcot 832 // MSO_SPCOT Callout type
@@ -543,13 +543,13 @@ enum DFF_TextHeader {
#define DFF_Prop_spcod 835 // MSO_SPCOD Callout drop type
#define DFF_Prop_dxyCalloutDropSpecified 836 // LONG if mso_spcodSpecified, the actual drop distance
#define DFF_Prop_dxyCalloutLengthSpecified 837 // LONG if fCalloutLengthSpecified, the actual distance
-#define DFF_Prop_fCallout 889 // BOOL Is the shape a callout?
-#define DFF_Prop_fCalloutAccentBar 890 // BOOL does callout have accent bar
-#define DFF_Prop_fCalloutTextBorder 891 // BOOL does callout have a text border
+#define DFF_Prop_fCallout 889 // sal_Bool Is the shape a callout?
+#define DFF_Prop_fCalloutAccentBar 890 // sal_Bool does callout have accent bar
+#define DFF_Prop_fCalloutTextBorder 891 // sal_Bool does callout have a text border
#define DFF_Prop_fCalloutMinusX 892 // BOOL
#define DFF_Prop_fCalloutMinusY 893 // BOOL
-#define DFF_Prop_fCalloutDropAuto 894 // BOOL If true, then we occasionally invert the drop distance
-#define DFF_Prop_fCalloutLengthSpecified 895 // BOOL if true, we look at dxyCalloutLengthSpecified
+#define DFF_Prop_fCalloutDropAuto 894 // sal_Bool If true, then we occasionally invert the drop distance
+#define DFF_Prop_fCalloutLengthSpecified 895 // sal_Bool if true, we look at dxyCalloutLengthSpecified
// GroupShape
#define DFF_Prop_wzName 896 // WCHAR* Shape Name (present only if explicitly set)
@@ -563,13 +563,13 @@ enum DFF_TextHeader {
#define DFF_Prop_lidRegroup 904 // LONG Regroup ID
#define DFF_Prop_tableProperties 927 // LONG
#define DFF_Prop_tableRowProperties 928 // LONG*
-#define DFF_Prop_fEditedWrap 953 // BOOL Has the wrap polygon been edited?
-#define DFF_Prop_fBehindDocument 954 // BOOL Word-only (shape is behind text)
-#define DFF_Prop_fOnDblClickNotify 955 // BOOL Notify client on a double click
-#define DFF_Prop_fIsButton 956 // BOOL A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros.
-#define DFF_Prop_fOneD 957 // BOOL 1D adjustment
-#define DFF_Prop_fHidden 958 // BOOL Do not display
-#define DFF_Prop_fPrint 959 // BOOL Print this shape
+#define DFF_Prop_fEditedWrap 953 // sal_Bool Has the wrap polygon been edited?
+#define DFF_Prop_fBehindDocument 954 // sal_Bool Word-only (shape is behind text)
+#define DFF_Prop_fOnDblClickNotify 955 // sal_Bool Notify client on a double click
+#define DFF_Prop_fIsButton 956 // sal_Bool A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros.
+#define DFF_Prop_fOneD 957 // sal_Bool 1D adjustment
+#define DFF_Prop_fHidden 958 // sal_Bool Do not display
+#define DFF_Prop_fPrint 959 // sal_Bool Print this shape
// entsprechende BitFlags
#define DFF_PBit_EditedWrap 0x00000040
#define DFF_PBit_BehindDocument 0x00000020
@@ -1078,17 +1078,17 @@ enum MSO_LineCap {
// BStore-Container
// FBSE - File Blip Store Entry
typedef struct _MSOF_BSE {
- BYTE btWin32; // Required type on Win32
- BYTE btMacOS; // Required type on Mac
- BYTE rgbUid[16]; // Identifier of blip
- USHORT tag; // currently unused
- ULONG size; // Blip size in stream
- ULONG cRef; // Reference count on the blip
- ULONG /*MSOFO*/ foDelay; // File offset in the delay stream
- BYTE usage; // How this blip is used (MSOBLIPUSAGE)
- BYTE cbName; // length of the blip name
- BYTE unused2; // for the future
- BYTE unused3; // for the future
+ sal_uInt8 btWin32; // Required type on Win32
+ sal_uInt8 btMacOS; // Required type on Mac
+ sal_uInt8 rgbUid[16]; // Identifier of blip
+ sal_uInt16 tag; // currently unused
+ sal_uIntPtr size; // Blip size in stream
+ sal_uIntPtr cRef; // Reference count on the blip
+ sal_uIntPtr /*MSOFO*/ foDelay; // File offset in the delay stream
+ sal_uInt8 usage; // How this blip is used (MSOBLIPUSAGE)
+ sal_uInt8 cbName; // length of the blip name
+ sal_uInt8 unused2; // for the future
+ sal_uInt8 unused3; // for the future
} MSO_FBSE;
typedef enum {
@@ -1188,12 +1188,12 @@ typedef enum {
#ifdef Hier_noch_was_aus_der_Doku
/* The secondary, or data, UID - should always be set. */
-BYTE m_rgbUid[16];
+sal_uInt8 m_rgbUid[16];
/* The primary UID - this defaults to 0, in which case the primary ID is
that of the internal data. NOTE!: The primary UID is only saved to disk
if (blip_instance ^ blip_signature == 1). Blip_instance is MSO_FBH.inst and
blip_signature is one of the values defined in MSO_BI */
-BYTE m_rgbUidPrimary[16]; // optional based on the above check
+sal_uInt8 m_rgbUidPrimary[16]; // optional based on the above check
/* Metafile Blip overhead = 34 bytes. m_cb gives the number of
bytes required to store an uncompressed version of the file, m_cbSave
@@ -1205,18 +1205,18 @@ int m_cb; // Cache of the metafile size
RECT m_rcBounds; // Boundary of metafile drawing commands
POINT m_ptSize; // Size of metafile in EMUs
int m_cbSave; // Cache of saved size (size of m_pvBits)
-BYTE m_fCompression; // MSO_BLIPCOMPRESSION
-BYTE m_fFilter; // always mso_filterNone
+sal_uInt8 m_fCompression; // MSO_BLIPCOMPRESSION
+sal_uInt8 m_fFilter; // always mso_filterNone
void *m_pvBits; // Compressed bits of metafile.
/* The secondary, or data, UID - should always be set. */
-BYTE m_rgbUid[16];
+sal_uInt8 m_rgbUid[16];
/* The primary UID - this defaults to 0, in which case the primary ID is
that of the internal data. NOTE!: The primary UID is only saved to disk
if (blip_instance ^ blip_signature == 1). Blip_instance is MSO_FBH.finst and
blip_signature is one of the values defined in MSO_BI*/
-BYTE m_rgbUidPrimary[16]; // optional based on the above check
-BYTE m_bTag;
+sal_uInt8 m_rgbUidPrimary[16]; // optional based on the above check
+sal_uInt8 m_bTag;
void *m_pvBits; // raster bits of the blip.
#endif
diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx
index 493cdb6b10d2..00a423d8b46c 100644
--- a/svx/inc/svx/numfmtsh.hxx
+++ b/svx/inc/svx/numfmtsh.hxx
@@ -123,14 +123,14 @@ public:
const String* pNumStr = NULL );
- void GetInitSettings( USHORT& nCatLbPos,
+ void GetInitSettings( sal_uInt16& nCatLbPos,
LanguageType& rLangType,
- USHORT& nFmtLbSelPos,
+ sal_uInt16& nFmtLbSelPos,
SvStrings& rFmtEntries,
String& rPrevString,
Color*& rpPrevColor );
- void CategoryChanged( USHORT nCatLbPos,
+ void CategoryChanged( sal_uInt16 nCatLbPos,
short& rFmtSelPos,
SvStrings& rFmtEntries );
@@ -138,34 +138,34 @@ public:
short& rFmtSelPos,
SvStrings& rFmtEntries );
- void FormatChanged( USHORT nFmtLbPos,
+ void FormatChanged( sal_uInt16 nFmtLbPos,
String& rPreviewStr,
Color*& rpFontColor );
- BOOL AddFormat( String& rFormat,
+ sal_Bool AddFormat( String& rFormat,
xub_StrLen& rErrPos,
- USHORT& rCatLbSelPos,
+ sal_uInt16& rCatLbSelPos,
short& rFmtSelPos,
SvStrings& rFmtEntries );
- BOOL RemoveFormat( const String& rFormat,
- USHORT& rCatLbSelPos,
+ sal_Bool RemoveFormat( const String& rFormat,
+ sal_uInt16& rCatLbSelPos,
short& rFmtSelPos,
SvStrings& rFmtEntries );
void MakeFormat( String& rFormat,
- BOOL bThousand,
- BOOL bNegRed,
- USHORT nPrecision,
- USHORT nLeadingZeroes,
- USHORT nCurrencyEntryPos);
+ sal_Bool bThousand,
+ sal_Bool bNegRed,
+ sal_uInt16 nPrecision,
+ sal_uInt16 nLeadingZeroes,
+ sal_uInt16 nCurrencyEntryPos);
void GetOptions( const String& rFormat,
- BOOL& rThousand,
- BOOL& rNegRed,
- USHORT& rPrecision,
- USHORT& rLeadingZeroes,
- USHORT& rCatLbPos );
+ sal_Bool& rThousand,
+ sal_Bool& rNegRed,
+ sal_uInt16& rPrecision,
+ sal_uInt16& rLeadingZeroes,
+ sal_uInt16& rCatLbPos );
void MakePreviewString( const String& rFormatStr,
String& rPreviewStr,
@@ -176,11 +176,11 @@ public:
Color*& rpFontColor,
double nValue);
- BOOL IsUserDefined( const String& rFmtString );
- BOOL IsTmpCurrencyFormat( const String& rFmtString );
- BOOL FindEntry( const String& rFmtString, sal_uInt32* pAt = NULL );
+ sal_Bool IsUserDefined( const String& rFmtString );
+ sal_Bool IsTmpCurrencyFormat( const String& rFmtString );
+ sal_Bool FindEntry( const String& rFmtString, sal_uInt32* pAt = NULL );
- void ValidateNewEntries( BOOL bValidate = TRUE ) { bUndoAddList = !bValidate; }
+ void ValidateNewEntries( sal_Bool bValidate = sal_True ) { bUndoAddList = !bValidate; }
sal_uInt32 GetUpdateDataCount() const;
void GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize );
@@ -195,25 +195,25 @@ public:
String GetComment4Entry(short nEntry);
short GetCategory4Entry(short nEntry);
- BOOL GetUserDefined4Entry(short nEntry);
+ sal_Bool GetUserDefined4Entry(short nEntry);
String GetFormat4Entry(short nEntry);
void SetComment4Entry(short nEntry,String aCommentString);
- BOOL IsBankingSymbol(USHORT nPos);
- void SetCurrencySymbol(USHORT nPos);
+ sal_Bool IsBankingSymbol(sal_uInt16 nPos);
+ void SetCurrencySymbol(sal_uInt16 nPos);
sal_uInt32 GetCurrencySymbol();
- USHORT FindCurrencyFormat( const String& rFmtString );
- USHORT FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,BOOL bTmpBanking);
+ sal_uInt16 FindCurrencyFormat( const String& rFmtString );
+ sal_uInt16 FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,sal_Bool bTmpBanking);
NfCurrencyEntry* GetCurCurrencyEntry();
void SetCurCurrencyEntry(NfCurrencyEntry*);
short GetListPos4Entry(sal_uInt32 nIdx);
short GetListPos4Entry( const String& rFmtString );
- void GetCurrencySymbols( SvStringsDtor& rList, USHORT* pPos );
- void GetCurrencySymbols( SvStringsDtor& rList, BOOL bFlag );
+ void GetCurrencySymbols( SvStringsDtor& rList, sal_uInt16* pPos );
+ void GetCurrencySymbols( SvStringsDtor& rList, sal_Bool bFlag );
- USHORT FindCurrencyTableEntry( const String& rFmtString, BOOL &bTestBanking );
- BOOL IsInTable(USHORT nPos,BOOL bTmpBanking,const String &rFmtString);
+ sal_uInt16 FindCurrencyTableEntry( const String& rFmtString, sal_Bool &bTestBanking );
+ sal_Bool IsInTable(sal_uInt16 nPos,sal_Bool bTmpBanking,const String &rFmtString);
void GetCurrencyFormats(SvStrings& rList);
@@ -225,7 +225,7 @@ private:
SvxNumberValueType eValType;
String aValStr;
double nValNum;
- BOOL bUndoAddList;
+ sal_Bool bUndoAddList;
SvULongs aAddList;
SvULongs aDelList;
SvULongs aCurEntryList;
@@ -235,13 +235,13 @@ private:
LanguageType eCurLanguage;
SvUShorts aCurCurrencyList;
NfCurrencyEntry* pCurCurrencyEntry;
- BOOL bBankingSymbol;
- USHORT nCurCurrencyEntryPos;
+ sal_Bool bBankingSymbol;
+ sal_uInt16 nCurCurrencyEntryPos;
SvStrings aCurrencyFormatList;
#ifdef _SVX_NUMFMTSH_CXX
SVX_DLLPRIVATE short FillEntryList_Impl( SvStrings& rList );
- SVX_DLLPRIVATE void FillEListWithStd_Impl( SvStrings& rList,USHORT aPrivCat, short &Pos);
+ SVX_DLLPRIVATE void FillEListWithStd_Impl( SvStrings& rList,sal_uInt16 aPrivCat, short &Pos);
SVX_DLLPRIVATE short FillEListWithFormats_Impl( SvStrings& rList,short nSelPos,
NfIndexTableOffset eOffsetStart,
NfIndexTableOffset eOffsetEnd);
@@ -253,12 +253,12 @@ private:
SVX_DLLPRIVATE short FillEListWithUserCurrencys( SvStrings& rList,short nSelPos);
SVX_DLLPRIVATE short FillEListWithUsD_Impl( SvStrings& rList, sal_uInt16 nPrivCat, short Pos );
- SVX_DLLPRIVATE BOOL IsRemoved_Impl( sal_uInt32 nKey );
- SVX_DLLPRIVATE BOOL IsAdded_Impl( sal_uInt32 nKey );
+ SVX_DLLPRIVATE sal_Bool IsRemoved_Impl( sal_uInt32 nKey );
+ SVX_DLLPRIVATE sal_Bool IsAdded_Impl( sal_uInt32 nKey );
SVX_DLLPRIVATE void GetPreviewString_Impl( String& rString,
Color*& rpColor );
- SVX_DLLPRIVATE void PosToCategory_Impl( USHORT nPos, short& rCategory );
- SVX_DLLPRIVATE void CategoryToPos_Impl( short nCategory, USHORT& rPos );
+ SVX_DLLPRIVATE void PosToCategory_Impl( sal_uInt16 nPos, short& rCategory );
+ SVX_DLLPRIVATE void CategoryToPos_Impl( short nCategory, sal_uInt16& rPos );
#endif
};
diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx
index 167cb094d1e1..6b3793d2aea9 100644
--- a/svx/inc/svx/numinf.hxx
+++ b/svx/inc/svx/numinf.hxx
@@ -47,23 +47,23 @@ class SVX_DLLPUBLIC SvxNumberInfoItem : public SfxPoolItem
public:
TYPEINFO();
- SvxNumberInfoItem( const USHORT nId );
+ SvxNumberInfoItem( const sal_uInt16 nId );
SvxNumberInfoItem( SvNumberFormatter* pNumFormatter,
- const USHORT nId );
+ const sal_uInt16 nId );
SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const String& rVal,
- const USHORT nId );
+ const sal_uInt16 nId );
SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal,
- const USHORT nId );
+ const sal_uInt16 nId );
// if both double and String are supplied, String is used for text formats
SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal,
- const String& rValueStr, const USHORT nId );
+ const String& rValueStr, const sal_uInt16 nId );
SvxNumberInfoItem( const SvxNumberInfoItem& );
~SvxNumberInfoItem();
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const;
- virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const;
+ virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const;
+ virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/numvset.hxx b/svx/inc/svx/numvset.hxx
index d174e1d6fba5..6118460a8356 100644
--- a/svx/inc/svx/numvset.hxx
+++ b/svx/inc/svx/numvset.hxx
@@ -55,7 +55,7 @@ class SvxNumRule;
struct SvxBmpItemInfo
{
SvxBrushItem* pBrushItem;
- USHORT nItemId;
+ sal_uInt16 nItemId;
};
/*-----------------09/09/97 01:05pm-----------------
@@ -64,8 +64,8 @@ struct SvxBmpItemInfo
class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
{
Color aLineColor;
- USHORT nPageType;
- BOOL bHTMLMode;
+ sal_uInt16 nPageType;
+ sal_Bool bHTMLMode;
Rectangle aOrgRect;
VirtualDevice* pVDev;
@@ -80,12 +80,12 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
com::sun::star::uno::Reference<
com::sun::star::container::XIndexAccess> > aOutlineSettings;
public:
- SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nType );
+ SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType );
~SvxNumValueSet();
virtual void UserDraw( const UserDrawEvent& rUDEvt );
- void SetHTMLMode(BOOL bSet) {bHTMLMode = bSet;}
+ void SetHTMLMode(sal_Bool bSet) {bHTMLMode = bSet;}
void SetNumberingSettings(
const com::sun::star::uno::Sequence<
com::sun::star::uno::Sequence<
@@ -109,13 +109,13 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet
{
String sBullets;
Timer aFormatTimer;
- BOOL bGrfNotFound;
+ sal_Bool bGrfNotFound;
protected:
DECL_LINK(FormatHdl_Impl, Timer*);
- void SetGrfNotFound(BOOL bSet) {bGrfNotFound = bSet;}
- BOOL IsGrfNotFound()const {return bGrfNotFound;}
+ void SetGrfNotFound(sal_Bool bSet) {bGrfNotFound = bSet;}
+ sal_Bool IsGrfNotFound()const {return bGrfNotFound;}
Timer& GetFormatTimer() {return aFormatTimer;}
@@ -136,8 +136,8 @@ class SvxNumberingPreview : public Window
Font aStdFont;
long nPageWidth;
const String* pOutlineNames;
- BOOL bPosition;
- UINT16 nActLevel;
+ sal_Bool bPosition;
+ sal_uInt16 nActLevel;
protected:
virtual void Paint( const Rectangle& rRect );
@@ -145,7 +145,7 @@ class SvxNumberingPreview : public Window
public:
SvxNumberingPreview(Window* pParent, const ResId& rResId ) :
Window(pParent, rResId),
- pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(FALSE), nActLevel(USHRT_MAX)
+ pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(sal_False), nActLevel(USHRT_MAX)
{ SetBorderStyle( WINDOW_BORDER_MONO ); }
void SetNumRule(const SvxNumRule* pNum)
@@ -155,8 +155,8 @@ class SvxNumberingPreview : public Window
void SetOutlineNames(const String* pNames)
{pOutlineNames = pNames;}
void SetPositionMode()
- { bPosition = TRUE;}
- void SetLevel(USHORT nSet) {nActLevel = nSet;}
+ { bPosition = sal_True;}
+ void SetLevel(sal_uInt16 nSet) {nActLevel = nSet;}
};
diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx
index 1116fd3fa033..c21f6d2ddcf2 100644
--- a/svx/inc/svx/obj3d.hxx
+++ b/svx/inc/svx/obj3d.hxx
@@ -92,10 +92,10 @@ public:
SVX_DLLPUBLIC E3dObjList(const E3dObjList& rSrcList);
SVX_DLLPUBLIC virtual ~E3dObjList();
- virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL);
- virtual void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL);
- virtual SdrObject* NbcRemoveObject(ULONG nObjNum);
- virtual SdrObject* RemoveObject(ULONG nObjNum);
+ virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL);
+ virtual void InsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL);
+ virtual SdrObject* NbcRemoveObject(sal_uIntPtr nObjNum);
+ virtual SdrObject* RemoveObject(sal_uIntPtr nObjNum);
};
/*************************************************************************
@@ -141,7 +141,7 @@ protected:
// and no instances should be created from anyone, so i move the constructors
// to protected area
E3dObject();
- E3dObject(BOOL bIsFromChart);
+ E3dObject(sal_Bool bIsFromChart);
public:
TYPEINFO();
@@ -150,8 +150,8 @@ public:
virtual ~E3dObject();
- virtual UINT32 GetObjInventor() const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt32 GetObjInventor() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
@@ -193,7 +193,7 @@ public:
// TakeObjName...() ist fuer die Anzeige in der UI, z.B. "3 Rahmen selektiert".
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
- USHORT GetLogicalGroup() { return 0; }
+ sal_uInt16 GetLogicalGroup() { return 0; }
virtual void operator=(const SdrObject&);
virtual SdrObjGeoData *NewGeoData() const;
@@ -205,7 +205,7 @@ public:
void SetSelected(bool bNew);
// Aufbrechen
- virtual BOOL IsBreakObjPossible();
+ virtual sal_Bool IsBreakObjPossible();
virtual SdrAttrObj* GetBreakObj();
};
@@ -255,28 +255,28 @@ public :
virtual sal_uInt32 GetHdlCount() const;
virtual void AddToHdlList(SdrHdlList& rHdlList) const;
- // DoubleSided: TRUE/FALSE
- BOOL GetDoubleSided() const
+ // DoubleSided: sal_True/FALSE
+ sal_Bool GetDoubleSided() const
{ return ((const Svx3DDoubleSidedItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue(); }
- // NormalsKind: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE
+ // NormalsKind: 0 == sal_False/FALSE, 1 == sal_True/sal_False, else == sal_True/TRUE
sal_uInt16 GetNormalsKind() const
{ return ((const Svx3DNormalsKindItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue(); }
- // NormalsInvert: TRUE/FALSE
- BOOL GetNormalsInvert() const
+ // NormalsInvert: sal_True/FALSE
+ sal_Bool GetNormalsInvert() const
{ return ((const Svx3DNormalsInvertItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue(); }
- // TextureProjX: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE
+ // TextureProjX: 0 == sal_False/FALSE, 1 == sal_True/sal_False, else == sal_True/TRUE
sal_uInt16 GetTextureProjectionX() const
{ return ((const Svx3DTextureProjectionXItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue(); }
- // TextureProjY: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE
+ // TextureProjY: 0 == sal_False/FALSE, 1 == sal_True/sal_False, else == sal_True/TRUE
sal_uInt16 GetTextureProjectionY() const
{ return ((const Svx3DTextureProjectionYItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue(); }
- // Shadow3D: TRUE/FALSE
- BOOL GetShadow3D() const
+ // Shadow3D: sal_True/FALSE
+ sal_Bool GetShadow3D() const
{ return ((const Svx3DShadow3DItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue(); }
// MaterialColor: Color
@@ -295,24 +295,24 @@ public :
sal_uInt16 GetMaterialSpecularIntensity() const
{ return ((const Svx3DMaterialSpecularIntensityItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue(); }
- // TextureFilter: TRUE/FALSE
- BOOL GetTextureFilter() const
+ // TextureFilter: sal_True/FALSE
+ sal_Bool GetTextureFilter() const
{ return ((const Svx3DTextureFilterItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue(); }
// #i28528#
// Added extra Item (Bool) for chart2 to be able to show reduced line geometry
- BOOL GetReducedLineGeometry() const
+ sal_Bool GetReducedLineGeometry() const
{ return ((const Svx3DReducedLineGeometryItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY)).GetValue(); }
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void RecalcSnapRect();
// Parameter Geometrieerzeugung setzen/lesen
- BOOL GetCreateNormals() const { return bCreateNormals; }
- void SetCreateNormals(BOOL bNew);
+ sal_Bool GetCreateNormals() const { return bCreateNormals; }
+ void SetCreateNormals(sal_Bool bNew);
- BOOL GetCreateTexture() const { return bCreateTexture; }
- void SetCreateTexture(BOOL bNew);
+ sal_Bool GetCreateTexture() const { return bCreateTexture; }
+ void SetCreateTexture(sal_Bool bNew);
// Copy-Operator
virtual void operator=(const SdrObject&);
diff --git a/svx/inc/svx/ofaitem.hxx b/svx/inc/svx/ofaitem.hxx
index 50f18ccb9ed9..8e58cb5ef742 100644
--- a/svx/inc/svx/ofaitem.hxx
+++ b/svx/inc/svx/ofaitem.hxx
@@ -40,7 +40,7 @@ private:
void* pPtr;
public:
- OfaPtrItem( USHORT nWhich, void *pPtr );
+ OfaPtrItem( sal_uInt16 nWhich, void *pPtr );
OfaPtrItem( const OfaPtrItem& );
virtual int operator==( const SfxPoolItem& ) const;
diff --git a/svx/inc/svx/optgenrl.hxx b/svx/inc/svx/optgenrl.hxx
index 50520aac0204..bea7ae38def5 100644
--- a/svx/inc/svx/optgenrl.hxx
+++ b/svx/inc/svx/optgenrl.hxx
@@ -28,22 +28,22 @@
#define _SVX_OPTGENRL_HXX
// Defines for setting the fokus of a Edit via a slot from external.
-#define UNKNOWN_EDIT ((USHORT)0)
-#define COMPANY_EDIT ((USHORT)1)
-#define FIRSTNAME_EDIT ((USHORT)2)
-#define LASTNAME_EDIT ((USHORT)3)
-#define STREET_EDIT ((USHORT)4)
-#define COUNTRY_EDIT ((USHORT)5)
-#define PLZ_EDIT ((USHORT)6)
-#define CITY_EDIT ((USHORT)7)
-#define STATE_EDIT ((USHORT)8)
-#define TITLE_EDIT ((USHORT)9)
-#define POSITION_EDIT ((USHORT)10)
-#define SHORTNAME_EDIT ((USHORT)11)
-#define TELPRIV_EDIT ((USHORT)12)
-#define TELCOMPANY_EDIT ((USHORT)13)
-#define FAX_EDIT ((USHORT)14)
-#define EMAIL_EDIT ((USHORT)15)
+#define UNKNOWN_EDIT ((sal_uInt16)0)
+#define COMPANY_EDIT ((sal_uInt16)1)
+#define FIRSTNAME_EDIT ((sal_uInt16)2)
+#define LASTNAME_EDIT ((sal_uInt16)3)
+#define STREET_EDIT ((sal_uInt16)4)
+#define COUNTRY_EDIT ((sal_uInt16)5)
+#define PLZ_EDIT ((sal_uInt16)6)
+#define CITY_EDIT ((sal_uInt16)7)
+#define STATE_EDIT ((sal_uInt16)8)
+#define TITLE_EDIT ((sal_uInt16)9)
+#define POSITION_EDIT ((sal_uInt16)10)
+#define SHORTNAME_EDIT ((sal_uInt16)11)
+#define TELPRIV_EDIT ((sal_uInt16)12)
+#define TELCOMPANY_EDIT ((sal_uInt16)13)
+#define FAX_EDIT ((sal_uInt16)14)
+#define EMAIL_EDIT ((sal_uInt16)15)
#endif // #ifndef _SVX_OPTGENRL_HXX
diff --git a/svx/inc/svx/optgrid.hxx b/svx/inc/svx/optgrid.hxx
index 6dd2a5f9371d..dda6afae6104 100644
--- a/svx/inc/svx/optgrid.hxx
+++ b/svx/inc/svx/optgrid.hxx
@@ -43,42 +43,42 @@ class SvxGridTabPage;
class SVX_DLLPUBLIC SvxOptionsGrid
{
protected:
- UINT32 nFldDrawX;
- UINT32 nFldDivisionX;
- UINT32 nFldDrawY;
- UINT32 nFldDivisionY;
- UINT32 nFldSnapX;
- UINT32 nFldSnapY;
- BOOL bUseGridsnap:1;
- BOOL bSynchronize:1;
- BOOL bGridVisible:1;
- BOOL bEqualGrid: 1;
+ sal_uInt32 nFldDrawX;
+ sal_uInt32 nFldDivisionX;
+ sal_uInt32 nFldDrawY;
+ sal_uInt32 nFldDivisionY;
+ sal_uInt32 nFldSnapX;
+ sal_uInt32 nFldSnapY;
+ sal_Bool bUseGridsnap:1;
+ sal_Bool bSynchronize:1;
+ sal_Bool bGridVisible:1;
+ sal_Bool bEqualGrid: 1;
public:
SvxOptionsGrid();
~SvxOptionsGrid();
- void SetFldDrawX( UINT32 nSet){nFldDrawX = nSet;}
- void SetFldDivisionX(UINT32 nSet){nFldDivisionX = nSet;}
- void SetFldDrawY ( UINT32 nSet){nFldDrawY = nSet;}
- void SetFldDivisionY(UINT32 nSet){nFldDivisionY = nSet;}
- void SetFldSnapX( UINT32 nSet){nFldSnapX = nSet;}
- void SetFldSnapY ( UINT32 nSet){nFldSnapY = nSet;}
- void SetUseGridSnap( BOOL bSet ) {bUseGridsnap = bSet;}
- void SetSynchronize( BOOL bSet ) {bSynchronize = bSet;}
- void SetGridVisible( BOOL bSet ) {bGridVisible = bSet;}
- void SetEqualGrid( BOOL bSet ) {bEqualGrid = bSet;}
-
- UINT32 GetFldDrawX( ) const { return nFldDrawX; }
- UINT32 GetFldDivisionX() const { return nFldDivisionX;}
- UINT32 GetFldDrawY ( ) const { return nFldDrawY; }
- UINT32 GetFldDivisionY() const { return nFldDivisionY;}
- UINT32 GetFldSnapX( ) const { return nFldSnapX; }
- UINT32 GetFldSnapY ( ) const { return nFldSnapY; }
- BOOL GetUseGridSnap( ) const { return bUseGridsnap; }
- BOOL GetSynchronize( ) const { return bSynchronize; }
- BOOL GetGridVisible( ) const { return bGridVisible; }
- BOOL GetEqualGrid() const { return bEqualGrid; }
+ void SetFldDrawX( sal_uInt32 nSet){nFldDrawX = nSet;}
+ void SetFldDivisionX(sal_uInt32 nSet){nFldDivisionX = nSet;}
+ void SetFldDrawY ( sal_uInt32 nSet){nFldDrawY = nSet;}
+ void SetFldDivisionY(sal_uInt32 nSet){nFldDivisionY = nSet;}
+ void SetFldSnapX( sal_uInt32 nSet){nFldSnapX = nSet;}
+ void SetFldSnapY ( sal_uInt32 nSet){nFldSnapY = nSet;}
+ void SetUseGridSnap( sal_Bool bSet ) {bUseGridsnap = bSet;}
+ void SetSynchronize( sal_Bool bSet ) {bSynchronize = bSet;}
+ void SetGridVisible( sal_Bool bSet ) {bGridVisible = bSet;}
+ void SetEqualGrid( sal_Bool bSet ) {bEqualGrid = bSet;}
+
+ sal_uInt32 GetFldDrawX( ) const { return nFldDrawX; }
+ sal_uInt32 GetFldDivisionX() const { return nFldDivisionX;}
+ sal_uInt32 GetFldDrawY ( ) const { return nFldDrawY; }
+ sal_uInt32 GetFldDivisionY() const { return nFldDivisionY;}
+ sal_uInt32 GetFldSnapX( ) const { return nFldSnapX; }
+ sal_uInt32 GetFldSnapY ( ) const { return nFldSnapY; }
+ sal_Bool GetUseGridSnap( ) const { return bUseGridsnap; }
+ sal_Bool GetSynchronize( ) const { return bSynchronize; }
+ sal_Bool GetGridVisible( ) const { return bGridVisible; }
+ sal_Bool GetEqualGrid() const { return bEqualGrid; }
};
// class SvxGridItem -----------------------------------------------------
@@ -89,7 +89,7 @@ class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem
friend class SvxGridTabPage;
public:
- SvxGridItem( USHORT _nWhich) : SfxPoolItem(_nWhich){};
+ SvxGridItem( sal_uInt16 _nWhich) : SfxPoolItem(_nWhich){};
SvxGridItem( const SvxGridItem& pTestItem );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
@@ -114,7 +114,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual void ActivatePage( const SfxItemSet& rSet );
@@ -163,8 +163,8 @@ protected:
MetricField aMtrFldBezAngle;
private:
- BOOL bAttrModified;
-// BOOL bEqualGrid; // Neu
+ sal_Bool bAttrModified;
+// sal_Bool bEqualGrid; // Neu
#ifdef _SVX_OPTGRID_CXX
DECL_LINK( ClickRotateHdl_Impl, void * );
diff --git a/svx/inc/svx/pagectrl.hxx b/svx/inc/svx/pagectrl.hxx
index 74a79d8e3a0d..c7554b4a445a 100644
--- a/svx/inc/svx/pagectrl.hxx
+++ b/svx/inc/svx/pagectrl.hxx
@@ -69,13 +69,13 @@ private:
Color aFtColor;
SvxBoxItem* pFtBorder;
- BOOL bFooter :1;
- BOOL bHeader :1;
- BOOL bTable :1;
- BOOL bHorz :1;
- BOOL bVert :1;
+ sal_Bool bFooter :1;
+ sal_Bool bHeader :1;
+ sal_Bool bTable :1;
+ sal_Bool bHorz :1;
+ sal_Bool bVert :1;
- USHORT eUsage;
+ sal_uInt16 eUsage;
String aLeftText;
String aRightText;
@@ -84,8 +84,8 @@ protected:
virtual void Paint( const Rectangle& rRect );
virtual void DrawPage( const Point& rPoint,
- const BOOL bSecond,
- const BOOL bEnabled );
+ const sal_Bool bSecond,
+ const sal_Bool bEnabled );
public:
SvxPageWindow( Window* pParent, const ResId& rId );
@@ -143,20 +143,20 @@ public:
const Color& GetFtColor() const { return aFtColor; }
const SvxBoxItem& GetFtBorder() const { return *pFtBorder; }
- void SetUsage( USHORT eU ) { eUsage = eU; }
- USHORT GetUsage() const { return eUsage;}
+ void SetUsage( sal_uInt16 eU ) { eUsage = eU; }
+ sal_uInt16 GetUsage() const { return eUsage;}
- void SetHeader( BOOL bNew ) { bHeader = bNew; }
- BOOL GetHeader() const { return bHeader;}
- void SetFooter( BOOL bNew ) { bFooter = bNew; }
- BOOL GetFooter() const { return bFooter;}
+ void SetHeader( sal_Bool bNew ) { bHeader = bNew; }
+ sal_Bool GetHeader() const { return bHeader;}
+ void SetFooter( sal_Bool bNew ) { bFooter = bNew; }
+ sal_Bool GetFooter() const { return bFooter;}
- void SetTable( BOOL bNew ) { bTable = bNew; }
- BOOL GetTable() const { return bTable;}
- void SetHorz( BOOL bNew ) { bHorz = bNew; }
- BOOL GetHorz() const { return bHorz;}
- void SetVert( BOOL bNew ) { bVert = bNew; }
- BOOL GetVert() const { return bVert;}
+ void SetTable( sal_Bool bNew ) { bTable = bNew; }
+ sal_Bool GetTable() const { return bTable;}
+ void SetHorz( sal_Bool bNew ) { bHorz = bNew; }
+ sal_Bool GetHorz() const { return bHorz;}
+ void SetVert( sal_Bool bNew ) { bVert = bNew; }
+ sal_Bool GetVert() const { return bVert;}
void EnableFrameDirection(sal_Bool bEnable);
//uses enum SvxFrameDirection
diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx
index 97a325751ca4..50c7c8f86b59 100644
--- a/svx/inc/svx/pageitem.hxx
+++ b/svx/inc/svx/pageitem.hxx
@@ -81,13 +81,13 @@ class SVX_DLLPUBLIC SvxPageItem: public SfxPoolItem
private:
String aDescName; // Name der Vorlage
SvxNumType eNumType; // Numerierung
- BOOL bLandscape; // Portrait / Landscape
- USHORT eUse; // Layout
+ sal_Bool bLandscape; // Portrait / Landscape
+ sal_uInt16 eUse; // Layout
public:
TYPEINFO();
- SvxPageItem( const USHORT nId );
+ SvxPageItem( const sal_uInt16 nId );
SvxPageItem( const SvxPageItem& rItem );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
@@ -98,17 +98,17 @@ 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 SfxPoolItem* Create( SvStream&, USHORT ) const;
- virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const;
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const;
+ virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const;
// Ausrichtung
- USHORT GetPageUsage() const { return eUse; }
- void SetPageUsage(USHORT eU) { eUse= eU; }
+ sal_uInt16 GetPageUsage() const { return eUse; }
+ void SetPageUsage(sal_uInt16 eU) { eUse= eU; }
- BOOL IsLandscape() const { return bLandscape; }
- void SetLandscape(BOOL bL) { bLandscape = bL; }
+ sal_Bool IsLandscape() const { return bLandscape; }
+ void SetLandscape(sal_Bool bL) { bLandscape = bL; }
// Numerierung
SvxNumType GetNumType() const { return eNumType; }
@@ -135,9 +135,9 @@ Dieses Item dient als Container fuer Header- und Footer-Attribute.
class SVX_DLLPUBLIC SvxSetItem: public SfxSetItem
{
public:
- SvxSetItem( const USHORT nId, const SfxItemSet& rSet );
+ SvxSetItem( const sal_uInt16 nId, const SfxItemSet& rSet );
SvxSetItem( const SvxSetItem& rItem );
- SvxSetItem( const USHORT nId, SfxItemSet* pSet );
+ SvxSetItem( const sal_uInt16 nId, SfxItemSet* pSet );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
@@ -146,8 +146,8 @@ public:
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- virtual SfxPoolItem* Create( SvStream&, USHORT nVersion ) const;
- virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const;
+ virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const;
+ virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const;
};
diff --git a/svx/inc/svx/paraprev.hxx b/svx/inc/svx/paraprev.hxx
index 25f454daee6d..f01c9f4948b5 100644
--- a/svx/inc/svx/paraprev.hxx
+++ b/svx/inc/svx/paraprev.hxx
@@ -59,15 +59,15 @@ private:
long nRightMargin;
short nFirstLineOfst;
// Abstaende
- USHORT nUpper;
- USHORT nLower;
+ sal_uInt16 nUpper;
+ sal_uInt16 nLower;
// Ausrichtung
SvxAdjust eAdjust;
// Letzte Zeile im Blocksatz
SvxAdjust eLastLine;
// Zeilenabstand
SvxPrevLineSpace eLine;
- USHORT nLineVal;
+ sal_uInt16 nLineVal;
String aText;
Rectangle Lines[9];
@@ -75,7 +75,7 @@ private:
protected:
virtual void Paint( const Rectangle& rRect );
- void DrawParagraph( BOOL bAll );
+ void DrawParagraph( sal_Bool bAll );
public:
SvxParaPrevWindow( Window* pParent, const ResId& rId );
@@ -83,11 +83,11 @@ public:
void SetFirstLineOfst( short nNew ) { nFirstLineOfst = nNew; }
void SetLeftMargin( long nNew ) { nLeftMargin = nNew; }
void SetRightMargin( long nNew ) { nRightMargin = nNew; }
- void SetUpper( USHORT nNew ) { nUpper = nNew; }
- void SetLower( USHORT nNew ) { nLower = nNew; }
+ void SetUpper( sal_uInt16 nNew ) { nUpper = nNew; }
+ void SetLower( sal_uInt16 nNew ) { nLower = nNew; }
void SetAdjust( SvxAdjust eNew ) { eAdjust = eNew; }
void SetLastLine( SvxAdjust eNew ) { eLastLine = eNew; }
- void SetLineSpace( SvxPrevLineSpace eNew, USHORT nNew = 0 )
+ void SetLineSpace( SvxPrevLineSpace eNew, sal_uInt16 nNew = 0 )
{ eLine = eNew; nLineVal = nNew; }
void SetText( const String& rStr ) { aText = rStr; }
void SetSize( Size aNew ) { aSize = aNew; }
@@ -95,18 +95,18 @@ public:
short GetFirstLineOfst() const { return nFirstLineOfst; }
long GetLeftMargin() const { return nLeftMargin; }
long GetRightMargin() const { return nRightMargin; }
- USHORT GetUpper() const { return nUpper; }
- USHORT GetLower() const { return nLower; }
+ sal_uInt16 GetUpper() const { return nUpper; }
+ sal_uInt16 GetLower() const { return nLower; }
SvxAdjust GetAdjust() const { return eAdjust; }
SvxPrevLineSpace GetLineEnum() const { return eLine; }
- USHORT GetLineValue() const { return nLineVal; }
+ sal_uInt16 GetLineValue() const { return nLineVal; }
String GetText() const { return aText; }
Size GetSize() const { return aSize; }
void OutputSizeChanged();
- void Draw( BOOL bAll ) { DrawParagraph( bAll ); }
+ void Draw( sal_Bool bAll ) { DrawParagraph( bAll ); }
};
#endif
diff --git a/svx/inc/svx/passwd.hxx b/svx/inc/svx/passwd.hxx
index 9a6b14f0144a..a52caa23335e 100644
--- a/svx/inc/svx/passwd.hxx
+++ b/svx/inc/svx/passwd.hxx
@@ -66,13 +66,13 @@ private:
Link aCheckPasswordHdl;
- BOOL bEmpty;
+ sal_Bool bEmpty;
DECL_LINK( ButtonHdl, OKButton * );
DECL_LINK( EditModifyHdl, Edit * );
public:
- SvxPasswordDialog( Window* pParent, BOOL bAllowEmptyPasswords = FALSE, BOOL bDisableOldPassword = FALSE );
+ SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPasswords = sal_False, sal_Bool bDisableOldPassword = sal_False );
~SvxPasswordDialog();
String GetOldPassword() const { return aOldPasswdED.GetText(); }
diff --git a/svx/inc/svx/pfiledlg.hxx b/svx/inc/svx/pfiledlg.hxx
index 93d99c4774a2..a3ed8bf6b050 100644
--- a/svx/inc/svx/pfiledlg.hxx
+++ b/svx/inc/svx/pfiledlg.hxx
@@ -46,13 +46,13 @@ private:
public:
// with nKind = SID_INSERT_SOUND or
// nKind = SID_INSERT_VIDEO
- SvxPluginFileDlg (Window *pParent, USHORT nKind );
+ SvxPluginFileDlg (Window *pParent, sal_uInt16 nKind );
~SvxPluginFileDlg ();
ErrCode Execute();
String GetPath() const;
- static bool IsAvailable (USHORT nKind);
+ static bool IsAvailable (sal_uInt16 nKind);
void SetContext( sfx2::FileDialogHelper::Context eNewContext );
};
diff --git a/svx/inc/svx/polygn3d.hxx b/svx/inc/svx/polygn3d.hxx
index 0517b6464907..9b2b469d3dac 100644
--- a/svx/inc/svx/polygn3d.hxx
+++ b/svx/inc/svx/polygn3d.hxx
@@ -38,7 +38,7 @@ private:
basegfx::B3DPolyPolygon aPolyPoly3D;
basegfx::B3DPolyPolygon aPolyNormals3D;
basegfx::B2DPolyPolygon aPolyTexture2D;
- BOOL bLineOnly;
+ sal_Bool bLineOnly;
SVX_DLLPRIVATE void CreateDefaultNormals();
SVX_DLLPRIVATE void CreateDefaultTexture();
@@ -56,18 +56,18 @@ public:
E3dPolygonObj(
E3dDefaultAttributes& rDefault,
const basegfx::B3DPolyPolygon& rPolyPoly3D,
- BOOL bLinOnly=FALSE);
+ sal_Bool bLinOnly=sal_False);
E3dPolygonObj(
E3dDefaultAttributes& rDefault,
const basegfx::B3DPolyPolygon& rPolyPoly3D,
const basegfx::B3DPolyPolygon& rPolyNormals3D,
- BOOL bLinOnly=FALSE);
+ sal_Bool bLinOnly=sal_False);
E3dPolygonObj(
E3dDefaultAttributes& rDefault,
const basegfx::B3DPolyPolygon& rPolyPoly3D,
const basegfx::B3DPolyPolygon& rPolyNormals3D,
const basegfx::B2DPolyPolygon& rPolyTexture2D,
- BOOL bLinOnly=FALSE);
+ sal_Bool bLinOnly=sal_False);
E3dPolygonObj();
virtual ~E3dPolygonObj();
@@ -76,14 +76,14 @@ public:
const basegfx::B3DPolyPolygon& GetPolyNormals3D() const { return aPolyNormals3D; }
const basegfx::B2DPolyPolygon& GetPolyTexture2D() const { return aPolyTexture2D; }
- virtual UINT16 GetObjIdentifier() const;
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+ virtual sal_uInt16 GetObjIdentifier() const;
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
virtual void operator=(const SdrObject&);
// LineOnly?
- BOOL GetLineOnly() { return bLineOnly; }
- void SetLineOnly(BOOL bNew);
+ sal_Bool GetLineOnly() { return bLineOnly; }
+ void SetLineOnly(sal_Bool bNew);
};
#endif // _E3D_POLYGON3D_HXX
diff --git a/svx/inc/svx/postattr.hxx b/svx/inc/svx/postattr.hxx
index 840312cf0c46..5d75187b58b5 100644
--- a/svx/inc/svx/postattr.hxx
+++ b/svx/inc/svx/postattr.hxx
@@ -46,9 +46,9 @@ class SVX_DLLPUBLIC SvxPostItAuthorItem: public SfxStringItem
public:
TYPEINFO();
- SvxPostItAuthorItem( USHORT nWhich );
+ SvxPostItAuthorItem( sal_uInt16 nWhich );
- SvxPostItAuthorItem( const String& rAuthor, USHORT nWhich );
+ SvxPostItAuthorItem( const String& rAuthor, sal_uInt16 nWhich );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
@@ -78,9 +78,9 @@ class SVX_DLLPUBLIC SvxPostItDateItem: public SfxStringItem
public:
TYPEINFO();
- SvxPostItDateItem( USHORT nWhich );
+ SvxPostItDateItem( sal_uInt16 nWhich );
- SvxPostItDateItem( const String& rDate, USHORT nWhich );
+ SvxPostItDateItem( const String& rDate, sal_uInt16 nWhich );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
@@ -109,9 +109,9 @@ class SVX_DLLPUBLIC SvxPostItTextItem: public SfxStringItem
public:
TYPEINFO();
- SvxPostItTextItem( USHORT nWhich );
+ SvxPostItTextItem( sal_uInt16 nWhich );
- SvxPostItTextItem( const String& rText, USHORT nWhich );
+ SvxPostItTextItem( const String& rText, sal_uInt16 nWhich );
// "pure virtual Methoden" vom SfxPoolItem
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/pszctrl.hxx b/svx/inc/svx/pszctrl.hxx
index 54ec2788521f..4d6e8d29d49d 100644
--- a/svx/inc/svx/pszctrl.hxx
+++ b/svx/inc/svx/pszctrl.hxx
@@ -47,14 +47,14 @@ private:
public:
SFX_DECL_STATUSBAR_CONTROL();
- SvxPosSizeStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+ SvxPosSizeStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
~SvxPosSizeStatusBarControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt );
virtual void Command( const CommandEvent& rCEvt );
- static ULONG GetDefItemWidth( const StatusBar& rStb );
+ static sal_uIntPtr GetDefItemWidth( const StatusBar& rStb );
};
diff --git a/svx/inc/svx/relfld.hxx b/svx/inc/svx/relfld.hxx
index 02d9ca20a5d3..192870b1d1b9 100644
--- a/svx/inc/svx/relfld.hxx
+++ b/svx/inc/svx/relfld.hxx
@@ -46,12 +46,12 @@
class SVX_DLLPUBLIC SvxRelativeField : public MetricField
{
private:
- USHORT nRelMin;
- USHORT nRelMax;
- USHORT nRelStep;
- BOOL bRelativeMode;
- BOOL bRelative;
- BOOL bNegativeEnabled;
+ sal_uInt16 nRelMin;
+ sal_uInt16 nRelMax;
+ sal_uInt16 nRelStep;
+ sal_Bool bRelativeMode;
+ sal_Bool bRelative;
+ sal_Bool bNegativeEnabled;
protected:
void Modify();
@@ -60,12 +60,12 @@ public:
SvxRelativeField( Window* pParent, WinBits nWinStyle = 0 );
SvxRelativeField( Window* pParent, const ResId& rResId );
- void EnableRelativeMode( USHORT nMin = 50, USHORT nMax = 150,
- USHORT nStep = 5 );
- BOOL IsRelativeMode() const { return bRelativeMode; }
- void SetRelative( BOOL bRelative = FALSE );
- BOOL IsRelative() const { return bRelative; }
- void EnableNegativeMode() {bNegativeEnabled = TRUE;}
+ void EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150,
+ sal_uInt16 nStep = 5 );
+ sal_Bool IsRelativeMode() const { return bRelativeMode; }
+ void SetRelative( sal_Bool bRelative = sal_False );
+ sal_Bool IsRelative() const { return bRelative; }
+ void EnableNegativeMode() {bNegativeEnabled = sal_True;}
};
diff --git a/svx/inc/svx/rotmodit.hxx b/svx/inc/svx/rotmodit.hxx
index 8177713e6013..d379713e9a37 100644
--- a/svx/inc/svx/rotmodit.hxx
+++ b/svx/inc/svx/rotmodit.hxx
@@ -47,21 +47,21 @@ class SVX_DLLPUBLIC SvxRotateModeItem: public SfxEnumItem
public:
TYPEINFO();
- SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, USHORT nWhich=0);
+ SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, sal_uInt16 nWhich=0);
SvxRotateModeItem( const SvxRotateModeItem& rItem );
~SvxRotateModeItem();
- virtual USHORT GetValueCount() const;
- virtual String GetValueText( USHORT nVal ) const;
+ virtual sal_uInt16 GetValueCount() const;
+ virtual String GetValueText( sal_uInt16 nVal ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, USHORT) const;
- virtual USHORT GetVersion( USHORT nFileVersion ) const;
+ virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const;
+ virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
diff --git a/svx/inc/svx/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx
index e8deecfed145..6b37b0cb85b0 100644
--- a/svx/inc/svx/rubydialog.hxx
+++ b/svx/inc/svx/rubydialog.hxx
@@ -65,7 +65,7 @@ class SVX_DLLPUBLIC SvxRubyChildWindow : public SfxChildWindow
{
public:
- SvxRubyChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* );
+ SvxRubyChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* );
SFX_DECL_CHILDWINDOW( SvxRubyChildWindow );
@@ -128,7 +128,7 @@ class SvxRubyDialog : public SfxModelessDialog
long nLastPos;
long nCurrentEdit;
- BOOL bModified;
+ sal_Bool bModified;
com::sun::star::uno::Reference<com::sun::star::view::XSelectionChangeListener> xImpl;
SfxBindings* pBindings;
@@ -152,13 +152,13 @@ class SvxRubyDialog : public SfxModelessDialog
void AssertOneEntry();
void Update();
- virtual BOOL Close();
+ virtual sal_Bool Close();
long GetLastPos() const {return nLastPos;}
void SetLastPos(long nSet) {nLastPos = nSet;}
- BOOL IsModified() const {return bModified;}
- void SetModified(BOOL bSet) {bModified = bSet;}
+ sal_Bool IsModified() const {return bModified;}
+ void SetModified(sal_Bool bSet) {bModified = bSet;}
void EnableControls(sal_Bool bEnable)
{
diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx
index d27f3a079495..8031dbbd3112 100644
--- a/svx/inc/svx/ruler.hxx
+++ b/svx/inc/svx/ruler.hxx
@@ -63,13 +63,13 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
SvxObjectItem *pObjectItem; //Objekt
Window *pEditWin;
SvxRuler_Impl *pRuler_Imp;
- BOOL bAppSetNullOffset :1;
- BOOL bHorz :1;
+ sal_Bool bAppSetNullOffset :1;
+ sal_Bool bHorz :1;
long lLogicNullOffset; // in logischen Koordinaten
long lAppNullOffset; // in logischen Koordinaten
long lMinFrame; // minimale Framebreite in Pixel
long lInitialDragPos;
- USHORT nFlags;
+ sal_uInt16 nFlags;
enum {
NONE = 0x0000,
DRAG_OBJECT = 0x0001,
@@ -82,28 +82,28 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
DRAG_OBJECT_LEFT_INDENT_ONLY = DRAG_OBJECT_SIZE_PROPORTIONAL
}
nDragType;
- USHORT nDefTabType;
- USHORT nTabCount;
- USHORT nTabBufSize;
+ sal_uInt16 nDefTabType;
+ sal_uInt16 nTabCount;
+ sal_uInt16 nTabBufSize;
long lDefTabDist;
long lTabPos;
RulerTab *pTabs; // Tabpositionen in Pixel
RulerIndent *pIndents; // Absatzraender in Pixel
RulerBorder *pBorders;
- USHORT nBorderCount;
+ sal_uInt16 nBorderCount;
RulerBorder *pObjectBorders;
SfxBindings *pBindings;
long nDragOffset;
long nMaxLeft;
long nMaxRight;
- BOOL bValid;
- BOOL bListening;
- BOOL bActive;
+ sal_Bool bValid;
+ sal_Bool bListening;
+ sal_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;
+ long GetCorrectedDragPos( sal_Bool bLeft = sal_True, sal_Bool bRight = sal_True );
+ void DrawLine_Impl(long &lTabPos, int, sal_Bool Hori=sal_True);
+ sal_uInt16 GetObjectBordersOff(sal_uInt16 nIdx) const;
// Seitenr"ander oder umgebender Rahmen
void UpdateFrame(const SvxLongLRSpaceItem *);
@@ -118,7 +118,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
// Seitenposition und -breite
void Update(const SvxPagePosSizeItem *);
// Spalten
- void Update(const SvxColumnItem *, USHORT nSID);
+ void Update(const SvxColumnItem *, sal_uInt16 nSID);
// Object Selektion
void Update(const SvxObjectItem *);
// Protect
@@ -192,8 +192,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
DECL_LINK( MenuSelect, Menu * );
void PrepareProportional_Impl(RulerType);
- USHORT GetNextVisible(USHORT nColumn);
- USHORT GetPrevVisible(USHORT nColumn);
+ sal_uInt16 GetNextVisible(sal_uInt16 nColumn);
+ sal_uInt16 GetPrevVisible(sal_uInt16 nColumn);
//#endif
void Update();
@@ -217,16 +217,16 @@ protected:
// Berechnung der Grenzwerte fuer Objectgrenzen
// Werte sind bezogen auf die Seite
- virtual BOOL CalcLimits(long &nMax1, long &nMax2, BOOL bFirst) const;
- BOOL IsActLastColumn(
- BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX) const ;
- BOOL IsActFirstColumn(
- BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX) const;
- USHORT GetActLeftColumn(
- BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX ) const;
- USHORT GetActRightColumn (
- BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX ) const;
- long CalcPropMaxRight(USHORT nCol=USHRT_MAX) const;
+ virtual sal_Bool CalcLimits(long &nMax1, long &nMax2, sal_Bool bFirst) const;
+ sal_Bool IsActLastColumn(
+ sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX) const ;
+ sal_Bool IsActFirstColumn(
+ sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX) const;
+ sal_uInt16 GetActLeftColumn(
+ sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX ) const;
+ sal_uInt16 GetActRightColumn (
+ sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX ) const;
+ long CalcPropMaxRight(sal_uInt16 nCol=USHRT_MAX) const;
public:
#define SVXRULER_SUPPORT_TABS 0x0001
@@ -240,7 +240,7 @@ public:
SvxRuler(Window* pParent,
Window *pEditWin,
- USHORT nRulerFlags,
+ sal_uInt16 nRulerFlags,
SfxBindings &rBindings,
WinBits nWinStyle = WB_STDRULER);
~SvxRuler();
@@ -248,7 +248,7 @@ public:
void SetMinFrameSize(long lSize);
long GetMinFrameSize() const ;
- USHORT GetRulerFlags() const { return nFlags; }
+ sal_uInt16 GetRulerFlags() const { return nFlags; }
void SetDefTabDist(long);
long GetDefTabDist() const;
@@ -257,13 +257,13 @@ public:
void SetNullOffsetLogic(long lOff = 0);
long GetNullOffsetLogic() const { return lAppNullOffset; }
- void SetActive(BOOL bOn = TRUE);
- BOOL IsActive() const { return bActive; }
+ void SetActive(sal_Bool bOn = sal_True);
+ sal_Bool IsActive() const { return bActive; }
void ForceUpdate() { Update(); }
//#i24363# tab stops relative to indent
- void SetTabsRelativeToIndent( BOOL bRel = TRUE );
+ void SetTabsRelativeToIndent( sal_Bool bRel = sal_True );
};
#endif
diff --git a/svx/inc/svx/rulritem.hxx b/svx/inc/svx/rulritem.hxx
index f6b81e1eedb8..753422f609c2 100644
--- a/svx/inc/svx/rulritem.hxx
+++ b/svx/inc/svx/rulritem.hxx
@@ -44,8 +44,8 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem
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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual String GetValueText() const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -60,7 +60,7 @@ private:
public:
TYPEINFO();
- SvxLongLRSpaceItem(long lLeft, long lRight, USHORT nId);
+ SvxLongLRSpaceItem(long lLeft, long lRight, sal_uInt16 nId);
SvxLongLRSpaceItem(const SvxLongLRSpaceItem &);
SvxLongLRSpaceItem();
@@ -80,8 +80,8 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem
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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual String GetValueText() const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -96,7 +96,7 @@ private:
public:
TYPEINFO();
- SvxLongULSpaceItem(long lUpper, long lLower, USHORT nId);
+ SvxLongULSpaceItem(long lUpper, long lLower, sal_uInt16 nId);
SvxLongULSpaceItem(const SvxLongULSpaceItem &);
SvxLongULSpaceItem();
@@ -115,8 +115,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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual String GetValueText() const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
@@ -145,13 +145,13 @@ struct SvxColumnDescription
{
long nStart; /* Spaltenbeginn */
long nEnd; /* Spaltenende */
- BOOL bVisible; /* Sichtbarkeit */
+ sal_Bool bVisible; /* Sichtbarkeit */
long nEndMin; //min. possible position of end
long nEndMax; //max. possible position of end
SvxColumnDescription():
- nStart(0), nEnd(0), bVisible(TRUE), nEndMin(0), nEndMax(0) {}
+ nStart(0), nEnd(0), bVisible(sal_True), nEndMin(0), nEndMax(0) {}
SvxColumnDescription(const SvxColumnDescription &rCopy) :
nStart(rCopy.nStart), nEnd(rCopy.nEnd),
@@ -159,13 +159,13 @@ struct SvxColumnDescription
nEndMin(rCopy.nEndMin), nEndMax(rCopy.nEndMax)
{}
- SvxColumnDescription(long start, long end, BOOL bVis = TRUE):
+ SvxColumnDescription(long start, long end, sal_Bool bVis = sal_True):
nStart(start), nEnd(end),
bVisible(bVis),
nEndMin(0), nEndMax(0) {}
SvxColumnDescription(long start, long end,
- long endMin, long endMax, BOOL bVis = TRUE):
+ long endMin, long endMax, sal_Bool bVis = sal_True):
nStart(start), nEnd(end),
bVisible(bVis),
nEndMin(endMin), nEndMax(endMax)
@@ -194,9 +194,9 @@ class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem
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
+ sal_uInt16 nActColumn; // die aktuelle Spalte
+ sal_Bool bTable; // Tabelle?
+ sal_Bool bOrtho; // Gleichverteilte Spalten
void DeleteAndDestroyColumns();
@@ -210,47 +210,47 @@ 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
public:
TYPEINFO();
// rechter Rand des umgebenden Rahmens
// nLeft, nRight jeweils der Abstand zum umgebenden Rahmen
- SvxColumnItem(USHORT nAct = 0); // Spalten
- SvxColumnItem(USHORT nActCol,
- USHORT nLeft, USHORT nRight = 0); // Tabelle mit Raendern
+ SvxColumnItem(sal_uInt16 nAct = 0); // Spalten
+ SvxColumnItem(sal_uInt16 nActCol,
+ sal_uInt16 nLeft, sal_uInt16 nRight = 0); // Tabelle mit Raendern
SvxColumnItem(const SvxColumnItem &);
~SvxColumnItem();
const SvxColumnItem &operator=(const SvxColumnItem &);
- USHORT Count() const { return aColumns.Count(); }
- SvxColumnDescription &operator[](USHORT i)
+ sal_uInt16 Count() const { return aColumns.Count(); }
+ SvxColumnDescription &operator[](sal_uInt16 i)
{ return *(SvxColumnDescription*)aColumns[i]; }
- const SvxColumnDescription &operator[](USHORT i) const
+ const SvxColumnDescription &operator[](sal_uInt16 i) const
{ return *(SvxColumnDescription*)aColumns[i]; }
- void Insert(const SvxColumnDescription &rDesc, USHORT nPos) {
+ void Insert(const SvxColumnDescription &rDesc, sal_uInt16 nPos) {
SvxColumnDescription* pDesc = new SvxColumnDescription(rDesc);
aColumns.Insert(pDesc, nPos);
}
void Append(const SvxColumnDescription &rDesc) { Insert(rDesc, Count()); }
void SetLeft(long left) { nLeft = left; }
void SetRight(long right) { nRight = right; }
- void SetActColumn(USHORT nCol) { nActColumn = nCol; }
+ void SetActColumn(sal_uInt16 nCol) { nActColumn = nCol; }
- USHORT GetActColumn() const { return nActColumn; }
- BOOL IsFirstAct() const { return nActColumn == 0; }
- BOOL IsLastAct() const { return nActColumn == Count()-1; }
+ sal_uInt16 GetActColumn() const { return nActColumn; }
+ sal_Bool IsFirstAct() const { return nActColumn == 0; }
+ sal_Bool IsLastAct() const { return nActColumn == Count()-1; }
long GetLeft() { return nLeft; }
long GetRight() { return nRight; }
- BOOL IsTable() const { return bTable; }
+ sal_Bool IsTable() const { return bTable; }
- BOOL CalcOrtho() const;
- void SetOrtho(BOOL bVal) { bOrtho = bVal; }
- BOOL IsOrtho () const { return FALSE ; }
+ sal_Bool CalcOrtho() const;
+ void SetOrtho(sal_Bool bVal) { bOrtho = bVal; }
+ sal_Bool IsOrtho () const { return sal_False ; }
- BOOL IsConsistent() const { return nActColumn < aColumns.Count(); }
+ sal_Bool IsConsistent() const { return nActColumn < aColumns.Count(); }
long GetVisibleRight() const;// rechter sichtbare Rand der aktuellen Spalte
};
@@ -263,7 +263,7 @@ private:
long nEndX; /* Ende in X-Richtung */
long nStartY; /* Beginn in Y-Richtung */
long nEndY; /* Ende in Y-Richtung */
- BOOL bLimits; /* Grenzwertkontrolle durch die Applikation */
+ sal_Bool bLimits; /* Grenzwertkontrolle durch die Applikation */
protected:
virtual int operator==( const SfxPoolItem& ) const;
@@ -274,18 +274,18 @@ 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
private:
SVX_DLLPRIVATE const SvxObjectItem &operator=(const SvxObjectItem &); // n.i.
public:
TYPEINFO();
SvxObjectItem(long nStartX, long nEndX,
long nStartY, long nEndY,
- BOOL bLimits = FALSE);
+ sal_Bool bLimits = sal_False);
SvxObjectItem(const SvxObjectItem &);
- BOOL HasLimits() const { return bLimits; }
+ sal_Bool HasLimits() const { return bLimits; }
long GetStartX() const { return nStartX; }
long GetEndX() const { return nEndX; }
diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx
index dfda9ac1a36e..bd01c7f35475 100644
--- a/svx/inc/svx/scene3d.hxx
+++ b/svx/inc/svx/scene3d.hxx
@@ -128,7 +128,7 @@ public:
{ return ((const Svx3DFocalLengthItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); }
// Two sided lighting:
- BOOL GetTwoSidedLighting() const
+ sal_Bool GetTwoSidedLighting() const
{ return ((const Svx3DTwoSidedLightingItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue(); }
// Lightcolor:
@@ -154,21 +154,21 @@ public:
{ return ((const Svx3DAmbientcolorItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_AMBIENTCOLOR)).GetValue(); }
// Light on/off:
- BOOL GetLightOnOff1() const
+ sal_Bool GetLightOnOff1() const
{ return ((const Svx3DLightOnOff1Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue(); }
- BOOL GetLightOnOff2() const
+ sal_Bool GetLightOnOff2() const
{ return ((const Svx3DLightOnOff2Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue(); }
- BOOL GetLightOnOff3() const
+ sal_Bool GetLightOnOff3() const
{ return ((const Svx3DLightOnOff3Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue(); }
- BOOL GetLightOnOff4() const
+ sal_Bool GetLightOnOff4() const
{ return ((const Svx3DLightOnOff4Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue(); }
- BOOL GetLightOnOff5() const
+ sal_Bool GetLightOnOff5() const
{ return ((const Svx3DLightOnOff5Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue(); }
- BOOL GetLightOnOff6() const
+ sal_Bool GetLightOnOff6() const
{ return ((const Svx3DLightOnOff6Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue(); }
- BOOL GetLightOnOff7() const
+ sal_Bool GetLightOnOff7() const
{ return ((const Svx3DLightOnOff7Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue(); }
- BOOL GetLightOnOff8() const
+ sal_Bool GetLightOnOff8() const
{ return ((const Svx3DLightOnOff8Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue(); }
// Light direction:
@@ -198,9 +198,9 @@ public:
{ return ((const Svx3DShadeModeItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue(); }
// set flag to draw only selected
- void SetDrawOnlySelected(BOOL bNew) { bDrawOnlySelected = bNew; }
+ void SetDrawOnlySelected(sal_Bool bNew) { bDrawOnlySelected = bNew; }
bool GetDrawOnlySelected() const { return bDrawOnlySelected; }
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void NbcSetSnapRect(const Rectangle& rRect);
virtual void NbcMove(const Size& rSize);
@@ -233,7 +233,7 @@ public:
B3dCamera& GetCameraSet() { return aCameraSet; }
// Aufbrechen
- virtual BOOL IsBreakObjPossible();
+ virtual sal_Bool IsBreakObjPossible();
basegfx::B3DVector GetShadowPlaneDirection() const;
void SetShadowPlaneDirection(const basegfx::B3DVector& rVec);
@@ -242,10 +242,10 @@ public:
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 int BegCreate(SdrDragStat& rStat);
+ virtual int MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden
+ virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual int BckCreate(SdrDragStat& rStat);
virtual void BrkCreate(SdrDragStat& rStat);
};
diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx
index f78a98081efb..381221354397 100644
--- a/svx/inc/svx/sdangitm.hxx
+++ b/svx/inc/svx/sdangitm.hxx
@@ -38,10 +38,10 @@ class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item {
public:
TYPEINFO();
SdrAngleItem(): SfxInt32Item() {}
- SdrAngleItem(USHORT nId, INT32 nAngle=0): SfxInt32Item(nId,nAngle) {}
- SdrAngleItem(USHORT nId, SvStream& rIn): SfxInt32Item(nId,rIn) {}
+ SdrAngleItem(sal_uInt16 nId, sal_Int32 nAngle=0): SfxInt32Item(nId,nAngle) {}
+ SdrAngleItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx
index 0eee8e872453..41218bd401f7 100644
--- a/svx/inc/svx/sdasitm.hxx
+++ b/svx/inc/svx/sdasitm.hxx
@@ -99,8 +99,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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const;
@@ -129,7 +129,7 @@ class SdrCustomShapeReplacementURLItem : public SfxStringItem
//---------------------------
class SdrTextWordWrapItem : public SdrOnOffItem {
public:
- SdrTextWordWrapItem( BOOL bAuto = FALSE ): SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto ) {}
+ SdrTextWordWrapItem( sal_Bool bAuto = sal_False ): SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto ) {}
SdrTextWordWrapItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, rIn ) {}
};
@@ -138,7 +138,7 @@ public:
//-------------------------------
class SdrTextAutoGrowSizeItem : public SdrOnOffItem {
public:
- SdrTextAutoGrowSizeItem( BOOL bAuto = FALSE ): SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) {}
+ SdrTextAutoGrowSizeItem( sal_Bool bAuto = sal_False ): SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) {}
SdrTextAutoGrowSizeItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, rIn ) {}
};
diff --git a/svx/inc/svx/sdgcoitm.hxx b/svx/inc/svx/sdgcoitm.hxx
index 8ed0c2a0bb04..83a0f7806db1 100644
--- a/svx/inc/svx/sdgcoitm.hxx
+++ b/svx/inc/svx/sdgcoitm.hxx
@@ -46,7 +46,7 @@ public:
SdrGrafRedItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFRED, rIn ) {}
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
};
//-------------------
@@ -63,7 +63,7 @@ public:
SdrGrafGreenItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, rIn ) {}
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
};
//-------------------
@@ -80,7 +80,7 @@ public:
SdrGrafBlueItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, rIn ) {}
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
};
#endif // _SDGCOITM_HXX
diff --git a/svx/inc/svx/sdgcpitm.hxx b/svx/inc/svx/sdgcpitm.hxx
index 9980db89a858..0a14d64a9c53 100644
--- a/svx/inc/svx/sdgcpitm.hxx
+++ b/svx/inc/svx/sdgcpitm.hxx
@@ -43,12 +43,12 @@ public:
SdrGrafCropItem( sal_Int32 nLeftCrop = 0, sal_Int32 nTopCrop = 0,
sal_Int32 nRightCrop = 0, sal_Int32 nBottomCrop = 0,
- USHORT nWhichId = SDRATTR_GRAFCROP ) :
+ sal_uInt16 nWhichId = SDRATTR_GRAFCROP ) :
SvxGrfCrop( nLeftCrop, nRightCrop, nTopCrop, nBottomCrop, nWhichId ) {}
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
- virtual USHORT GetVersion( USHORT nFileVersion ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
+ virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const;
};
#endif // _SDGCPITM_HXX
diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx
index 13026e67988b..8a3a17bdad4e 100644
--- a/svx/inc/svx/sdggaitm.hxx
+++ b/svx/inc/svx/sdggaitm.hxx
@@ -42,14 +42,14 @@ public:
TYPEINFO();
- SdrGrafGamma100Item( ULONG nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {}
+ SdrGrafGamma100Item( sal_uIntPtr nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {}
SdrGrafGamma100Item( SvStream& rIn ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, rIn ) {}
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
#endif // _SDGGAITM_HXX
diff --git a/svx/inc/svx/sdginitm.hxx b/svx/inc/svx/sdginitm.hxx
index ca43ea6b2b31..41d37fbe5642 100644
--- a/svx/inc/svx/sdginitm.hxx
+++ b/svx/inc/svx/sdginitm.hxx
@@ -42,11 +42,11 @@ public:
TYPEINFO();
- SdrGrafInvertItem( BOOL bInvert = FALSE ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {}
+ SdrGrafInvertItem( sal_Bool bInvert = sal_False ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {}
SdrGrafInvertItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_GRAFINVERT, rIn ) {}
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
};
#endif // _SDGINITM_HXX
diff --git a/svx/inc/svx/sdgluitm.hxx b/svx/inc/svx/sdgluitm.hxx
index 41f81f168b24..afa5eea3fd19 100644
--- a/svx/inc/svx/sdgluitm.hxx
+++ b/svx/inc/svx/sdgluitm.hxx
@@ -46,7 +46,7 @@ public:
SdrGrafLuminanceItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, rIn ) {}
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
};
//----------------------
@@ -63,7 +63,7 @@ public:
SdrGrafContrastItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, rIn ) {}
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
};
#endif // _SDGLUITM_HXX
diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx
index 77577b31b7d2..7e79d6020ab1 100644
--- a/svx/inc/svx/sdgmoitm.hxx
+++ b/svx/inc/svx/sdgmoitm.hxx
@@ -43,15 +43,15 @@ public:
TYPEINFO();
- SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (USHORT)eMode ) {}
+ SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (sal_uInt16)eMode ) {}
SdrGrafModeItem( SvStream& rIn ) : SfxEnumItem( SDRATTR_GRAFMODE, rIn ) {}
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
- virtual USHORT GetValueCount() const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
+ virtual sal_uInt16 GetValueCount() const;
GraphicDrawMode GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); }
- virtual String GetValueTextByPos( USHORT nPos ) const;
+ virtual String GetValueTextByPos( sal_uInt16 nPos ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/svx/inc/svx/sdgtritm.hxx b/svx/inc/svx/sdgtritm.hxx
index 47359d9b6bbf..af80263dba00 100644
--- a/svx/inc/svx/sdgtritm.hxx
+++ b/svx/inc/svx/sdgtritm.hxx
@@ -41,11 +41,11 @@ class SVX_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem
public:
TYPEINFO();
- SdrGrafTransparenceItem( USHORT nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {}
+ SdrGrafTransparenceItem( sal_uInt16 nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {}
SdrGrafTransparenceItem( SvStream& rIn ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, rIn ) {}
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
};
#endif // _SDGTRITM_HXX
diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx
index 6e74cba29a59..fdcffbfe79c0 100644
--- a/svx/inc/svx/sdmetitm.hxx
+++ b/svx/inc/svx/sdmetitm.hxx
@@ -40,12 +40,12 @@ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item {
public:
TYPEINFO();
SdrMetricItem(): SfxInt32Item() {}
- SdrMetricItem(USHORT nId, INT32 nVal=0): SfxInt32Item(nId,nVal) {}
- SdrMetricItem(USHORT nId, SvStream& rIn): SfxInt32Item(nId,rIn) {}
+ SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal=0): SfxInt32Item(nId,nVal) {}
+ SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual FASTBOOL HasMetrics() const;
- virtual FASTBOOL ScaleMetrics(long nMul, long nDiv);
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual int HasMetrics() const;
+ virtual int ScaleMetrics(long nMul, long nDiv);
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx
index 415cfd151bc9..b5bb0b877189 100644
--- a/svx/inc/svx/sdooitm.hxx
+++ b/svx/inc/svx/sdooitm.hxx
@@ -40,12 +40,12 @@ class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem {
public:
TYPEINFO();
SdrOnOffItem(): SfxBoolItem() {}
- SdrOnOffItem(USHORT nId, BOOL bOn=FALSE): SfxBoolItem(nId,bOn) {}
- SdrOnOffItem(USHORT nId, SvStream& rIn): SfxBoolItem(nId,rIn) {}
+ SdrOnOffItem(sal_uInt16 nId, sal_Bool bOn=sal_False): SfxBoolItem(nId,bOn) {}
+ SdrOnOffItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
- virtual String GetValueTextByVal(BOOL bVal) const;
+ virtual String GetValueTextByVal(sal_Bool bVal) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx
index 59f31998b71a..39b102f0b4ac 100644
--- a/svx/inc/svx/sdprcitm.hxx
+++ b/svx/inc/svx/sdprcitm.hxx
@@ -41,10 +41,10 @@ class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item
public:
TYPEINFO();
SdrPercentItem(): SfxUInt16Item() {}
- SdrPercentItem(USHORT nId, UINT16 nVal=0): SfxUInt16Item(nId,nVal) {}
- SdrPercentItem(USHORT nId, SvStream& rIn): SfxUInt16Item(nId,rIn) {}
+ SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal=0): SfxUInt16Item(nId,nVal) {}
+ SdrPercentItem(sal_uInt16 nId, SvStream& rIn): SfxUInt16Item(nId,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
@@ -63,10 +63,10 @@ class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item
public:
TYPEINFO();
SdrSignedPercentItem(): SfxInt16Item() {}
- SdrSignedPercentItem( USHORT nId, INT16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {}
- SdrSignedPercentItem( USHORT nId, SvStream& rIn ) : SfxInt16Item( nId,rIn ) {}
+ SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {}
+ SdrSignedPercentItem( sal_uInt16 nId, SvStream& rIn ) : SfxInt16Item( nId,rIn ) {}
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0 ) const;
diff --git a/svx/inc/svx/sdshitm.hxx b/svx/inc/svx/sdshitm.hxx
index 95f98ce943f6..6201fbeb833c 100644
--- a/svx/inc/svx/sdshitm.hxx
+++ b/svx/inc/svx/sdshitm.hxx
@@ -37,7 +37,7 @@
//------------------------------
class SdrShadowItem: public SdrOnOffItem {
public:
- SdrShadowItem(BOOL bShadow=FALSE): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {}
+ SdrShadowItem(sal_Bool bShadow=sal_False): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {}
SdrShadowItem(SvStream& rIn): SdrOnOffItem(SDRATTR_SHADOW, rIn) {}
};
diff --git a/svx/inc/svx/sdshtitm.hxx b/svx/inc/svx/sdshtitm.hxx
index 34a2cf4eb924..787ed8b3c355 100644
--- a/svx/inc/svx/sdshtitm.hxx
+++ b/svx/inc/svx/sdshtitm.hxx
@@ -35,7 +35,7 @@
//---------------------
class SdrShadowTransparenceItem: public SdrPercentItem {
public:
- SdrShadowTransparenceItem(USHORT nTransp=0): SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,nTransp) {}
+ SdrShadowTransparenceItem(sal_uInt16 nTransp=0): SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,nTransp) {}
SdrShadowTransparenceItem(SvStream& rIn) : SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,rIn) {}
};
diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx
index c10b75a8ffc7..5bdcb4097997 100644
--- a/svx/inc/svx/sdtaaitm.hxx
+++ b/svx/inc/svx/sdtaaitm.hxx
@@ -34,12 +34,12 @@
class SVX_DLLPUBLIC SdrTextAniAmountItem: public SfxInt16Item {
public:
TYPEINFO();
- SdrTextAniAmountItem(INT16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {}
+ SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {}
SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual FASTBOOL HasMetrics() const;
- virtual FASTBOOL ScaleMetrics(long nMul, long nDiv);
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual int HasMetrics() const;
+ virtual int ScaleMetrics(long nMul, long nDiv);
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx
index 2317f41bdbe1..f7d92cf97d14 100644
--- a/svx/inc/svx/sdtaditm.hxx
+++ b/svx/inc/svx/sdtaditm.hxx
@@ -43,17 +43,17 @@ enum SdrTextAniDirection {SDRTEXTANI_LEFT,
class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem {
public:
TYPEINFO();
- SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(USHORT)eDir) {}
+ SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(sal_uInt16)eDir) {}
SdrTextAniDirectionItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 4; }
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const; // { return 4; }
SdrTextAniDirection GetValue() const { return (SdrTextAniDirection)SfxEnumItem::GetValue(); }
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(USHORT nPos) const;
+ virtual String GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sdtagitm.hxx b/svx/inc/svx/sdtagitm.hxx
index e76ddb8ec7c4..77168575ff14 100644
--- a/svx/inc/svx/sdtagitm.hxx
+++ b/svx/inc/svx/sdtagitm.hxx
@@ -35,7 +35,7 @@
//------------------------------------
class SdrTextAutoGrowHeightItem: public SdrOnOffItem {
public:
- SdrTextAutoGrowHeightItem(BOOL bAuto=TRUE): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,bAuto) {}
+ SdrTextAutoGrowHeightItem(sal_Bool bAuto=sal_True): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,bAuto) {}
SdrTextAutoGrowHeightItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,rIn) {}
};
@@ -44,7 +44,7 @@ public:
//------------------------------------
class SdrTextAutoGrowWidthItem: public SdrOnOffItem {
public:
- SdrTextAutoGrowWidthItem(BOOL bAuto=FALSE): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,bAuto) {}
+ SdrTextAutoGrowWidthItem(sal_Bool bAuto=sal_False): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,bAuto) {}
SdrTextAutoGrowWidthItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,rIn) {}
};
diff --git a/svx/inc/svx/sdtaiitm.hxx b/svx/inc/svx/sdtaiitm.hxx
index a7e5d9506dcb..7e59841c92c4 100644
--- a/svx/inc/svx/sdtaiitm.hxx
+++ b/svx/inc/svx/sdtaiitm.hxx
@@ -32,13 +32,13 @@
class SdrTextAniStartInsideItem: public SdrYesNoItem {
public:
- SdrTextAniStartInsideItem(BOOL bOn=FALSE): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {}
+ SdrTextAniStartInsideItem(sal_Bool bOn=sal_False): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {}
SdrTextAniStartInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,rIn) {}
};
class SdrTextAniStopInsideItem: public SdrYesNoItem {
public:
- SdrTextAniStopInsideItem(BOOL bOn=FALSE): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {}
+ SdrTextAniStopInsideItem(sal_Bool bOn=sal_False): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {}
SdrTextAniStopInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,rIn) {}
};
diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx
index 6caba22c1ffc..e1ca695d2169 100644
--- a/svx/inc/svx/sdtaitm.hxx
+++ b/svx/inc/svx/sdtaitm.hxx
@@ -45,17 +45,17 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // Kopfbuendig (so wie man e
class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem {
public:
TYPEINFO();
- SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(USHORT)eAdj) {}
+ SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(sal_uInt16)eAdj) {}
SdrTextVertAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_VERTADJUST,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 5; }
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const; // { return 5; }
SdrTextVertAdjust GetValue() const { return (SdrTextVertAdjust)SfxEnumItem::GetValue(); }
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(USHORT nPos) const;
+ virtual String GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
@@ -72,17 +72,17 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // Linksbuendig verankert
class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem {
public:
TYPEINFO();
- SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(USHORT)eAdj) {}
+ SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(sal_uInt16)eAdj) {}
SdrTextHorzAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_HORZADJUST,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 5; }
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const; // { return 5; }
SdrTextHorzAdjust GetValue() const { return (SdrTextHorzAdjust)SfxEnumItem::GetValue(); }
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(USHORT nPos) const;
+ virtual String GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx
index f303692644ee..90a163d426b5 100644
--- a/svx/inc/svx/sdtakitm.hxx
+++ b/svx/inc/svx/sdtakitm.hxx
@@ -45,8 +45,8 @@ enum SdrTextAniKind {SDRTEXTANI_NONE,
// Einfach nur Blinken. Direction und Amount ohne Wirkung.
// Frequenz siehe Delay, 0=0.5Hz (Delay=250).
// Count=Anzahl der blinker. 0=Endlos.
-// StartInside: FALSE=beginnend mit Pause, TRUE=Beginnend mit Puls
-// StopInside: FALSE=Nach Count blinkern nicht sichtbar, TRUE=sichtbar
+// StartInside: sal_False=beginnend mit Pause, sal_True=Beginnend mit Puls
+// StopInside: sal_False=Nach Count blinkern nicht sichtbar, sal_True=sichtbar
// (nur wenn Count!=0)
// - SDRTEXTANI_SCROLL:
// Schrift laeuft rein, laeuft vollstaendig durch. Wenn ganz verschwunden
@@ -54,12 +54,12 @@ enum SdrTextAniKind {SDRTEXTANI_NONE,
// Delay in ms, Sonderfall Delay=0 wird auf 50ms defaulted (20Hz)
// Count=Durchlaufanzahl (0=Endlos)
// Direction: ist eben die Richtung in die gescrollt wird.
-// StartInside: FALSE=Schrift wird auch beim ersten Durchlauf reingescrollt
-// TRUE=Der linke Teil der Schrift steht beim ersten Durchlauf
+// StartInside: sal_False=Schrift wird auch beim ersten Durchlauf reingescrollt
+// sal_True=Der linke Teil der Schrift steht beim ersten Durchlauf
// bereits da (im sichtbaren "Scrollbereich")
-// StopInside: FALSE=Schrift wird auch beim letzten Durchlauf vollstaendig
+// StopInside: sal_False=Schrift wird auch beim letzten Durchlauf vollstaendig
// rausgescrollt
-// TRUE=Schrift wird beim letzten Durchlauf nicht rausgescrollt
+// sal_True=Schrift wird beim letzten Durchlauf nicht rausgescrollt
// (nur wenn Count!=0)
// Amount: Schrittweite in logischen Einheiten. Negative Werte bedeuten
// Pixel statt log. Einheiten. Wenn Amount=0, dann wird auf
@@ -74,31 +74,31 @@ enum SdrTextAniKind {SDRTEXTANI_NONE,
// Alle andern Parameter wie SDRTEXTANI_SCROLL
// - SDRTEXTANI_SLIDE:
// Schrift wird nur reingeschoben bis zur Originalposition.
-// -> also wie SCROLL mit StartInside=FALSE, StopInside=TRUE
+// -> also wie SCROLL mit StartInside=sal_False, StopInside=TRUE
// und Count=1. Count=0 wird als Count=1 interpretiert.
// Fuer jeden Count>1 wird der Text jedoch ruekwaerts wieder vollstaendig
// rausgeschoben (aehnlich wie ALTERNATE) und dann wieder reingeschoben.
// StopInside wird nicht ausgewertet, weil immer Inside gestoppt wird.
// StartInside wird nicht ausgewertet, weil immer Outside gestartet wird.
// Alle andern Parameter wie SDRTEXTANI_SCROLL
-// StartInside,StopInside: Bei TRUE ist die anfaengliche/entgueltige
+// StartInside,StopInside: Bei sal_True ist die anfaengliche/entgueltige
// Textposition abhaengig von der Textverankerung am Zeichenobjekt. Sie
// entspricht der Textposition bei normalem Paint (ohne Laufschrift).
class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem {
public:
TYPEINFO();
- SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(USHORT)eKind) {}
+ SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(sal_uInt16)eKind) {}
SdrTextAniKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIKIND,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 5; }
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const; // { return 5; }
SdrTextAniKind GetValue() const { return (SdrTextAniKind)SfxEnumItem::GetValue(); }
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(USHORT nPos) const;
+ virtual String GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx
index 68069fffa11f..eeb1ca587ffb 100644
--- a/svx/inc/svx/sdtayitm.hxx
+++ b/svx/inc/svx/sdtayitm.hxx
@@ -34,10 +34,10 @@
class SVX_DLLPUBLIC SdrTextAniDelayItem: public SfxUInt16Item {
public:
TYPEINFO();
- SdrTextAniDelayItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {}
+ SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {}
SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sdtcfitm.hxx b/svx/inc/svx/sdtcfitm.hxx
index 1763b24bd937..17d2e49a8499 100644
--- a/svx/inc/svx/sdtcfitm.hxx
+++ b/svx/inc/svx/sdtcfitm.hxx
@@ -35,7 +35,7 @@
//------------------------------------
class SdrTextContourFrameItem: public SdrOnOffItem {
public:
- SdrTextContourFrameItem(BOOL bOn=FALSE): SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {}
+ SdrTextContourFrameItem(sal_Bool bOn=sal_False): SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {}
SdrTextContourFrameItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,rIn) {}
};
diff --git a/svx/inc/svx/sdtfchim.hxx b/svx/inc/svx/sdtfchim.hxx
index dbfbfab2aeac..a47daa354b76 100644
--- a/svx/inc/svx/sdtfchim.hxx
+++ b/svx/inc/svx/sdtfchim.hxx
@@ -34,7 +34,7 @@ class SVX_DLLPUBLIC SdrTextFixedCellHeightItem : public SfxBoolItem
public:
TYPEINFO();
- SdrTextFixedCellHeightItem( BOOL bUseFixedCellHeight = FALSE );
+ SdrTextFixedCellHeightItem( sal_Bool bUseFixedCellHeight = sal_False );
SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion );
SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation,
@@ -46,8 +46,8 @@ public:
SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
- SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
#ifdef SDR_ISPOOLABLE
SVX_DLLPRIVATE virtual int IsPoolable() const;
diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx
index 324b8f8d0143..f3f18ed8acac 100644
--- a/svx/inc/svx/sdtfsitm.hxx
+++ b/svx/inc/svx/sdtfsitm.hxx
@@ -51,21 +51,21 @@ enum SdrFitToSizeType {SDRTEXTFIT_NONE, // - kein FitToSize
class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem: public SfxEnumItem {
public:
TYPEINFO();
- SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(USHORT)eFit) {}
+ SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(sal_uInt16)eFit) {}
SdrTextFitToSizeTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 4; }
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const; // { return 4; }
SdrFitToSizeType GetValue() const { return (SdrFitToSizeType)SfxEnumItem::GetValue(); }
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(USHORT nPos) const;
+ virtual String GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
virtual int HasBoolValue() const;
- virtual BOOL GetBoolValue() const;
- virtual void SetBoolValue(BOOL bVal);
+ virtual sal_Bool GetBoolValue() const;
+ virtual void SetBoolValue(sal_Bool bVal);
};
#endif
diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx
index 6486cda18e31..29e13913df06 100644
--- a/svx/inc/svx/sdynitm.hxx
+++ b/svx/inc/svx/sdynitm.hxx
@@ -40,11 +40,11 @@ class SVX_DLLPUBLIC SdrYesNoItem: public SfxBoolItem {
public:
TYPEINFO();
SdrYesNoItem(): SfxBoolItem() {}
- SdrYesNoItem(USHORT nId, BOOL bOn=FALSE): SfxBoolItem(nId,bOn) {}
- SdrYesNoItem(USHORT nId, SvStream& rIn): SfxBoolItem(nId,rIn) {}
+ SdrYesNoItem(sal_uInt16 nId, sal_Bool bOn=sal_False): SfxBoolItem(nId,bOn) {}
+ SdrYesNoItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual String GetValueTextByVal(BOOL bVal) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual String GetValueTextByVal(sal_Bool bVal) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
#ifdef SDR_ISPOOLABLE
virtual int IsPoolable() const;
diff --git a/svx/inc/svx/selctrl.hxx b/svx/inc/svx/selctrl.hxx
index 5d7fac4f4a5e..792b4862bf04 100644
--- a/svx/inc/svx/selctrl.hxx
+++ b/svx/inc/svx/selctrl.hxx
@@ -37,19 +37,19 @@
class SVX_DLLPUBLIC SvxSelectionModeControl : public SfxStatusBarControl
{
public:
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual void Click();
virtual void Paint( const UserDrawEvent& rEvt );
SFX_DECL_STATUSBAR_CONTROL();
- SvxSelectionModeControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+ SvxSelectionModeControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
- static ULONG GetDefItemWidth(const StatusBar& rStb);
+ static sal_uIntPtr GetDefItemWidth(const StatusBar& rStb);
private:
- USHORT nState;
+ sal_uInt16 nState;
#ifdef _SVX_SELCTRL_CXX
SVX_DLLPRIVATE void DrawItemText_Impl();
diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx
index e24dedbdc22c..c9c59c64f6c3 100644
--- a/svx/inc/svx/simptabl.hxx
+++ b/svx/inc/svx/simptabl.hxx
@@ -72,11 +72,11 @@ private:
SvxSimpTblContainer aPrivContainer;
HeaderBar aHeaderBar;
long nOldPos;
- USHORT nHeaderItemId;
- BOOL bResizeFlag;
- BOOL bPaintFlag;
- BOOL bSortDirection;
- USHORT nSortCol;
+ sal_uInt16 nHeaderItemId;
+ sal_Bool bResizeFlag;
+ sal_Bool bPaintFlag;
+ sal_Bool bSortDirection;
+ sal_uInt16 nSortCol;
Window* pMyParentWin;
DECL_LINK( StartDragHdl, HeaderBar* );
@@ -112,7 +112,7 @@ public:
~SvxSimpleTable();
void InsertHeaderEntry(const XubString& rText,
- USHORT nCol=HEADERBAR_APPEND,
+ sal_uInt16 nCol=HEADERBAR_APPEND,
HeaderBarItemBits nBits = HIB_STDSTYLE);
void SetTabs( long* pTabs, MapUnit = MAP_APPFONT );
@@ -137,11 +137,11 @@ public:
void ShowTable();
void HideTable();
- BOOL IsVisible() const;
+ sal_Bool IsVisible() const;
void EnableTable();
void DisableTable();
- BOOL IsEnabled() const;
+ sal_Bool IsEnabled() const;
void TableToTop();
void SetPosPixel( const Point& rNewPos );
@@ -154,11 +154,11 @@ public:
Size GetSizePixel() const;
Size GetOutputSizePixel() const;
- USHORT GetSelectedCol();
- void SortByCol(USHORT,BOOL bDir=TRUE);
- BOOL GetSortDirection(){ return bSortDirection;}
- USHORT GetSortedCol(){ return nSortCol;}
- SvLBoxItem* GetEntryAtPos( SvLBoxEntry* pEntry, USHORT nPos ) const;
+ sal_uInt16 GetSelectedCol();
+ void SortByCol(sal_uInt16,sal_Bool bDir=sal_True);
+ sal_Bool GetSortDirection(){ return bSortDirection;}
+ sal_uInt16 GetSortedCol(){ return nSortCol;}
+ SvLBoxItem* GetEntryAtPos( SvLBoxEntry* pEntry, sal_uInt16 nPos ) const;
CommandEvent GetCommandEvent()const;
inline sal_Bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); }
diff --git a/svx/inc/svx/sphere3d.hxx b/svx/inc/svx/sphere3d.hxx
index 90dfca18c173..08c5c4eff7f1 100644
--- a/svx/inc/svx/sphere3d.hxx
+++ b/svx/inc/svx/sphere3d.hxx
@@ -67,8 +67,8 @@ public:
sal_uInt32 GetVerticalSegments() const
{ return ((const Svx3DVerticalSegmentsItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); }
- virtual UINT16 GetObjIdentifier() const;
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+ virtual sal_uInt16 GetObjIdentifier() const;
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
virtual void operator=(const SdrObject&);
diff --git a/svx/inc/svx/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx
index 0253f61a7785..b4e8cb17a555 100644
--- a/svx/inc/svx/srchdlg.hxx
+++ b/svx/inc/svx/srchdlg.hxx
@@ -64,7 +64,7 @@ struct SearchDlg_Impl;
struct SearchAttrItem
{
- USHORT nSlot;
+ sal_uInt16 nSlot;
SfxPoolItem* pItem;
};
@@ -82,17 +82,17 @@ public:
void Put( const SfxItemSet& rSet );
SfxItemSet& Get( SfxItemSet& rSet );
void Clear();
- USHORT Count() const { return SrchAttrItemList::Count(); }
- SearchAttrItem& operator[](USHORT nPos) const
+ sal_uInt16 Count() const { return SrchAttrItemList::Count(); }
+ SearchAttrItem& operator[](sal_uInt16 nPos) const
{ return SrchAttrItemList::operator[]( nPos ); }
- SearchAttrItem& GetObject( USHORT nPos ) const
+ SearchAttrItem& GetObject( sal_uInt16 nPos ) const
{ return SrchAttrItemList::GetObject( nPos ); }
// der Pointer auf das Item wird nicht kopiert!!! (also nicht l"oschen)
void Insert( const SearchAttrItem& rItem )
{ SrchAttrItemList::Insert( rItem, SrchAttrItemList::Count() ); }
// l"oscht die Pointer auf die Items
- void Remove( USHORT nPos, USHORT nLen = 1 );
+ void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 );
};
#ifndef SV_NODIALOG
@@ -107,7 +107,7 @@ class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow
{
SvxSearchDialog *dialog;
public:
- SvxSearchDialogWrapper( Window*pParent, USHORT nId,
+ SvxSearchDialogWrapper( Window*pParent, sal_uInt16 nId,
SfxBindings* pBindings, SfxChildWinInfo* pInfo );
~SvxSearchDialogWrapper ();
@@ -140,7 +140,7 @@ public:
SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind );
~SvxSearchDialog();
- virtual BOOL Close();
+ virtual sal_Bool Close();
// Window
virtual void Activate();
@@ -153,12 +153,12 @@ public:
const SearchAttrItemList* GetReplaceItemList() const
{ return pReplaceList; }
- inline BOOL HasSearchAttributes() const;
- inline BOOL HasReplaceAttributes() const;
+ inline sal_Bool HasSearchAttributes() const;
+ inline sal_Bool HasReplaceAttributes() const;
PushButton& GetReplaceBtn() { return aReplaceBtn; }
- INT32 GetTransliterationFlags() const;
+ sal_Int32 GetTransliterationFlags() const;
private:
FixedText aSearchText;
@@ -214,14 +214,14 @@ private:
CheckBox aAllSheetsCB;
SfxBindings& rBindings;
- BOOL bWriter;
- BOOL bSearch;
- BOOL bFormat;
- USHORT nOptions;
- FASTBOOL bSet;
- FASTBOOL bReadOnly;
- FASTBOOL bConstruct;
- ULONG nModifyFlag;
+ sal_Bool bWriter;
+ sal_Bool bSearch;
+ sal_Bool bFormat;
+ sal_uInt16 nOptions;
+ int bSet;
+ int bReadOnly;
+ int bConstruct;
+ sal_uIntPtr nModifyFlag;
String aStylesStr;
String aLayoutStr;
LocalizedString aCalcStr;
@@ -240,7 +240,7 @@ private:
SvxSearchController* pSearchSetController;
SvxSearchController* pReplaceSetController;
- mutable INT32 nTransliterationFlags;
+ mutable sal_Int32 nTransliterationFlags;
#ifdef _SVX_SRCHDLG_CXX
DECL_LINK( ModifyHdl_Impl, ComboBox* pEdit );
@@ -260,31 +260,31 @@ private:
void Init_Impl( int bHasItemSet );
void InitAttrList_Impl( const SfxItemSet* pSSet,
const SfxItemSet* pRSet );
- void Remember_Impl( const String &rStr,BOOL bSearch );
+ void Remember_Impl( const String &rStr,sal_Bool bSearch );
void PaintAttrText_Impl();
- String& BuildAttrText_Impl( String& rStr, BOOL bSrchFlag ) const;
+ String& BuildAttrText_Impl( String& rStr, sal_Bool bSrchFlag ) const;
void TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool );
- void EnableControls_Impl( const USHORT nFlags );
+ void EnableControls_Impl( const sal_uInt16 nFlags );
void EnableControl_Impl( Control* pCtrl );
void SetItem_Impl( const SvxSearchItem* pItem );
void SetModifyFlag_Impl( const Control* pCtrl );
void SaveToModule_Impl();
- void ApplyTransliterationFlags_Impl( INT32 nSettings );
+ void ApplyTransliterationFlags_Impl( sal_Int32 nSettings );
#endif
};
#include <sfx2/layout-post.hxx>
-inline BOOL SvxSearchDialog::HasSearchAttributes() const
+inline sal_Bool SvxSearchDialog::HasSearchAttributes() const
{
int bLen = aSearchAttrText.GetText().Len();
return ( aSearchAttrText.IsEnabled() && bLen );
}
-inline BOOL SvxSearchDialog::HasReplaceAttributes() const
+inline sal_Bool SvxSearchDialog::HasReplaceAttributes() const
{
int bLen = aReplaceAttrText.GetText().Len();
return ( aReplaceAttrText.IsEnabled() && bLen );
diff --git a/svx/inc/svx/subtoolboxcontrol.hxx b/svx/inc/svx/subtoolboxcontrol.hxx
index 36b0676fece4..f96562661703 100644
--- a/svx/inc/svx/subtoolboxcontrol.hxx
+++ b/svx/inc/svx/subtoolboxcontrol.hxx
@@ -40,7 +40,7 @@ class SVX_DLLPUBLIC SvxSubToolBoxControl : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxSubToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxSubToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxSubToolBoxControl();
virtual SfxPopupWindowType GetPopupWindowType() const;
diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx
index 15640bb17cba..a197fded69c9 100644
--- a/svx/inc/svx/svdcrtv.hxx
+++ b/svx/inc/svx/svdcrtv.hxx
@@ -71,10 +71,10 @@ protected:
Pointer aAktCreatePointer;
- INT32 nAutoCloseDistPix;
- INT32 nFreeHandMinDistPix;
- UINT32 nAktInvent; // Aktuell eingestelltes
- UINT16 nAktIdent; // Obj fuer Neuerzeugung
+ sal_Int32 nAutoCloseDistPix;
+ sal_Int32 nFreeHandMinDistPix;
+ sal_uInt32 nAktInvent; // Aktuell eingestelltes
+ sal_uInt16 nAktIdent; // Obj fuer Neuerzeugung
unsigned bAutoTextEdit : 1; // Textedit nach dem erzeugen eines Textrahmens starten
unsigned b1stPointAsCenter : 1;
@@ -92,9 +92,9 @@ protected:
sal_Bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
sal_Int16 nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject);
- void ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/);
- void HideCreateObj(/*OutputDevice* pOut, BOOL bFull*/);
- BOOL CheckEdgeMode();
+ void ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/);
+ void HideCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/);
+ sal_Bool CheckEdgeMode();
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -102,14 +102,14 @@ protected:
virtual ~SdrCreateView();
public:
- virtual BOOL IsAction() const;
+ virtual sal_Bool IsAction() const;
virtual void MovAction(const Point& rPnt);
virtual void EndAction();
virtual void BckAction();
virtual void BrkAction();
virtual void TakeActionRect(Rectangle& rRect) const;
- virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
+ virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
void SetActiveLayer(const String& rName) { aAktLayer=rName; }
const String& GetActiveLayer() const { return aAktLayer; }
@@ -119,70 +119,70 @@ public:
// Ist der MeasureLayer nicht gesetzt (Leerstring), so
// wird der ActiveLayer auch fuer Bemassung verwendet.
void SetEditMode(SdrViewEditMode eMode) { SdrDragView::SetEditMode(eMode); CheckEdgeMode(); }
- void SetEditMode(BOOL bOn=TRUE) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); }
- void SetCreateMode(BOOL bOn=TRUE) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); }
- void SetGluePointEditMode(BOOL bOn=TRUE) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); }
+ void SetEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); }
+ void SetCreateMode(sal_Bool bOn=sal_True) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); }
+ void SetGluePointEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); }
// Feststellen, ob Textwerkzeug aktiviert
- BOOL IsTextTool() const;
+ sal_Bool IsTextTool() const;
// Feststellen, ob Objektverbinderwerkzeug aktiviert
- BOOL IsEdgeTool() const;
+ sal_Bool IsEdgeTool() const;
// Feststellen, ob Bemassungswerkzeug aktiviert
- BOOL IsMeasureTool() const;
+ sal_Bool IsMeasureTool() const;
- void SetCurrentObj(UINT16 nIdent, UINT32 nInvent=SdrInventor);
- void TakeCurrentObj(UINT16& nIdent, UINT32& nInvent) const { nInvent=nAktInvent; nIdent=nAktIdent; }
- UINT32 GetCurrentObjInventor() const { return nAktInvent; }
- UINT16 GetCurrentObjIdentifier() const { return nAktIdent; }
+ void SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent=SdrInventor);
+ void TakeCurrentObj(sal_uInt16& nIdent, sal_uInt32& nInvent) const { nInvent=nAktInvent; nIdent=nAktIdent; }
+ sal_uInt32 GetCurrentObjInventor() const { return nAktInvent; }
+ sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; }
// Starten des normalen Create
- BOOL BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
+ sal_Bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
sal_Bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject);
void MovCreateObj(const Point& rPnt);
- BOOL EndCreateObj(SdrCreateCmd eCmd);
+ sal_Bool EndCreateObj(SdrCreateCmd eCmd);
void BckCreateObj(); // z.B. wieder 1 Polygonpunkt zurueck.
void BrkCreateObj();
- BOOL IsCreateObj() const { return pAktCreate!=NULL; }
+ sal_Bool IsCreateObj() const { return pAktCreate!=NULL; }
SdrObject* GetCreateObj() const { return pAktCreate; }
// BegCreateCaptionObj() erzeugt ein SdrCaptionObj (Legendenobjekt).
// rObjSiz ist die anfaengliche Groesse des Legenden-Textrahmens.
// gedraggd wird lediglich die Laenge des Zipfel.
- BOOL BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
+ sal_Bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
- // Wenn TextEditAfterCreate auf TRUE steht (das ist der Default),
+ // Wenn TextEditAfterCreate auf sal_True steht (das ist der Default),
// dann wird nach dem erzeugen eines Textrahmenobjekts (OBJ_TEXT,
// OBJ_TEXTEXT, OBJ_OUTLINERTEXT, OBJ_TITLETEXT, OBJ_CAPTION)
// automatisch ein TextEdit (SdrObjEditView::SdrBeginTextEdit) gestartet.
- BOOL IsTextEditAfterCreate() const { return bAutoTextEdit; }
- void SetTextEditAfterCreate(BOOL bOn) { bAutoTextEdit = bOn; }
+ sal_Bool IsTextEditAfterCreate() const { return bAutoTextEdit; }
+ void SetTextEditAfterCreate(sal_Bool bOn) { bAutoTextEdit = bOn; }
// Erzeugen eines Kreises/Rechtecks/Textrahmens wobei der 1. Punkt
// nicht die linke obere Ecke, sondern das Zentrum des Objekts vorgibt.
// Persistentes Flag. Default=FALSE.
- BOOL IsCreate1stPointAsCenter() const { return b1stPointAsCenter; }
- void SetCreate1stPointAsCenter(BOOL bOn) { b1stPointAsCenter = bOn; }
+ sal_Bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; }
+ void SetCreate1stPointAsCenter(sal_Bool bOn) { b1stPointAsCenter = bOn; }
// Fuer Polylines (OBJ_PLIN) und Freihandlinien (OBJ_FREELINE). Ist dieses
- // Flag TRUE, werden diese beiden Objekttypen implizit geschlossen und in
+ // Flag sal_True, werden diese beiden Objekttypen implizit geschlossen und in
// Polygon (OBJ_POLY) bzw. Freihandflaeche (OBJ_FREEFILL) gewandelt falls
// zum Ende des Create die Distanz zwischen Startpunkt und Endpunkt des
// Objekts <=n Pixel ist, wobei SetAutoCloseDistPix vorgegeben wird.
// Default=TRUE.
- BOOL IsAutoClosePolys() const { return bAutoClosePolys; }
- void SetAutoClosePolys(BOOL bOn) { bAutoClosePolys=bOn; }
+ sal_Bool IsAutoClosePolys() const { return bAutoClosePolys; }
+ void SetAutoClosePolys(sal_Bool bOn) { bAutoClosePolys=bOn; }
// Default=5 Pixel.
- USHORT GetAutoCloseDistPix() const { return USHORT(nAutoCloseDistPix); }
- void SetAutoCloseDistPix(USHORT nVal) { nAutoCloseDistPix=nVal; }
+ sal_uInt16 GetAutoCloseDistPix() const { return sal_uInt16(nAutoCloseDistPix); }
+ void SetAutoCloseDistPix(sal_uInt16 nVal) { nAutoCloseDistPix=nVal; }
// Vorgabe des minimalen Pixelabstands zwischen 2 Bezierpunkten bei der
// Erzeugung einer Freihandlinie.
// Default=10 Pixel.
- USHORT GetFreeHandMinDistPix() const { return USHORT(nFreeHandMinDistPix); }
- void SetFreeHandMinDistPix(USHORT nVal) { nFreeHandMinDistPix=nVal; }
+ sal_uInt16 GetFreeHandMinDistPix() const { return sal_uInt16(nFreeHandMinDistPix); }
+ void SetFreeHandMinDistPix(sal_uInt16 nVal) { nFreeHandMinDistPix=nVal; }
// Wer das (zur restlichen Create-Funktionalitaet von SvDraw) inkompatible
// Create-Interface am PathObj beibehalten moechte muss das nachfolgende
@@ -190,19 +190,19 @@ public:
// OBJ_POLY, OBJ_PLIN, OBJ_PATHLINE, OBJ_PATHFILL
// Dieses Flag hat nur voruebergehenden Character. Die betroffenen
// Applikationen sollten alsbald umgestellt werden.
- // Default=FALSE;
- BOOL IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; }
- void SetUseIncompatiblePathCreateInterface(BOOL bOn) { bUseIncompatiblePathCreateInterface = bOn; }
+ // Default=sal_False;
+ sal_Bool IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; }
+ void SetUseIncompatiblePathCreateInterface(sal_Bool bOn) { bUseIncompatiblePathCreateInterface = bOn; }
void SetConnectMarker(const SdrObjConnection& rCon, const SdrPageView& rPV);
void HideConnectMarker();
// Attribute des ggf. gerade in der Erzeugung befindlichen Objekts
/* new interface src537 */
- BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
+ sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
- BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
- SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const;
- BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+ sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
+ SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
+ sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
};
#endif //_SVDCRTV_HXX
diff --git a/svx/inc/svx/svddef.hxx b/svx/inc/svx/svddef.hxx
index a9e5d175680c..d702a6eac5ab 100644
--- a/svx/inc/svx/svddef.hxx
+++ b/svx/inc/svx/svddef.hxx
@@ -95,7 +95,7 @@
#define SDRATTR_MISC_FIRST (SDRATTR_CAPTION_LAST + 1) /* 1097 */ /* 1097 */ /* 1080 */ /* Pool V1: 1053 */
#define SDRATTR_ECKENRADIUS (SDRATTR_MISC_FIRST + 0) /* 1097 */ /* 1097 */ /* 1080 long, def=0 */
#define SDRATTR_TEXT_MINFRAMEHEIGHT (SDRATTR_MISC_FIRST + 1) /* 1098 */ /* 1098 */ /* 1081 long, def=0 */
-#define SDRATTR_TEXT_AUTOGROWHEIGHT (SDRATTR_MISC_FIRST + 2) /* 1099 */ /* 1099 */ /* 1082 BOOL, def=TRUE */
+#define SDRATTR_TEXT_AUTOGROWHEIGHT (SDRATTR_MISC_FIRST + 2) /* 1099 */ /* 1099 */ /* 1082 sal_Bool, def=sal_True */
#define SDRATTR_TEXT_FITTOSIZE (SDRATTR_MISC_FIRST + 3) /* 1100 */ /* 1100 */ /* 1083 enum, def=SDRTEXTFIT_NONE */
#define SDRATTR_TEXT_LEFTDIST (SDRATTR_MISC_FIRST + 4) /* 1101 */ /* 1101 */ /* 1084 long, def=0 */ /* Pool V2 */
#define SDRATTR_TEXT_RIGHTDIST (SDRATTR_MISC_FIRST + 5) /* 1102 */ /* 1102 */ /* 1085 long, def=0 */ /* Pool V2 */
@@ -105,15 +105,15 @@
#define SDRATTR_TEXT_MAXFRAMEHEIGHT (SDRATTR_MISC_FIRST + 9) /* 1106 */ /* 1106 */ /* 1089 long, def=0 - Pool V2 */
#define SDRATTR_TEXT_MINFRAMEWIDTH (SDRATTR_MISC_FIRST +10) /* 1107 */ /* 1107 */ /* 1090 long, def=0 - Pool V2 */
#define SDRATTR_TEXT_MAXFRAMEWIDTH (SDRATTR_MISC_FIRST +11) /* 1108 */ /* 1108 */ /* 1091 long, def=0 - Pool V2 */
-#define SDRATTR_TEXT_AUTOGROWWIDTH (SDRATTR_MISC_FIRST +12) /* 1109 */ /* 1109 */ /* 1092 BOOL, def=FALSE - Pool V2 */
+#define SDRATTR_TEXT_AUTOGROWWIDTH (SDRATTR_MISC_FIRST +12) /* 1109 */ /* 1109 */ /* 1092 sal_Bool, def=sal_False - Pool V2 */
#define SDRATTR_TEXT_HORZADJUST (SDRATTR_MISC_FIRST +13) /* 1110 */ /* 1110 */ /* 1093 enum, def=SDRTEXTHORZADJUST_LEFT */ /* Pool V2+ (04-12-1995) */
#define SDRATTR_TEXT_ANIKIND (SDRATTR_MISC_FIRST +14) /* 1111 */ /* 1111 */ /* 1094 enum, def=SDRTEXTANI_NONE - Pool V2/V4 */
#define SDRATTR_TEXT_ANIDIRECTION (SDRATTR_MISC_FIRST +15) /* 1112 */ /* 1112 */ /* 1095 enum, def=SDRTEXTANI_LEFT - Pool V2/V4 */
-#define SDRATTR_TEXT_ANISTARTINSIDE (SDRATTR_MISC_FIRST +16) /* 1113 */ /* 1113 */ /* 1096 BOOL, def=FALSE - Pool V2/V4 */
-#define SDRATTR_TEXT_ANISTOPINSIDE (SDRATTR_MISC_FIRST +17) /* 1114 */ /* 1114 */ /* 1097 BOOL, def=FALSE - Pool V2/V4 */
-#define SDRATTR_TEXT_ANICOUNT (SDRATTR_MISC_FIRST +18) /* 1115 */ /* 1115 */ /* 1098 USHORT, def=0 - Pool V2/V4 */
-#define SDRATTR_TEXT_ANIDELAY (SDRATTR_MISC_FIRST +19) /* 1116 */ /* 1116 */ /* 1099 USHORT, def=0 - Pool V2/V4 */
-#define SDRATTR_TEXT_ANIAMOUNT (SDRATTR_MISC_FIRST +20) /* 1117 */ /* 1117 */ /* 1100 USHORT, def=0 - Pool V2/V4 */
+#define SDRATTR_TEXT_ANISTARTINSIDE (SDRATTR_MISC_FIRST +16) /* 1113 */ /* 1113 */ /* 1096 sal_Bool, def=sal_False - Pool V2/V4 */
+#define SDRATTR_TEXT_ANISTOPINSIDE (SDRATTR_MISC_FIRST +17) /* 1114 */ /* 1114 */ /* 1097 sal_Bool, def=sal_False - Pool V2/V4 */
+#define SDRATTR_TEXT_ANICOUNT (SDRATTR_MISC_FIRST +18) /* 1115 */ /* 1115 */ /* 1098 sal_uInt16, def=0 - Pool V2/V4 */
+#define SDRATTR_TEXT_ANIDELAY (SDRATTR_MISC_FIRST +19) /* 1116 */ /* 1116 */ /* 1099 sal_uInt16, def=0 - Pool V2/V4 */
+#define SDRATTR_TEXT_ANIAMOUNT (SDRATTR_MISC_FIRST +20) /* 1117 */ /* 1117 */ /* 1100 sal_uInt16, def=0 - Pool V2/V4 */
#define SDRATTR_TEXT_CONTOURFRAME (SDRATTR_MISC_FIRST +21) /* 1118 */ /* 1118 */ /* 1101 */ /* Pool V2 */
#define SDRATTR_CUSTOMSHAPE_ADJUSTMENT (SDRATTR_MISC_FIRST +22) /* 1119 */ /* 1119 */ /* 1102 */ /* Pool V2 */
#define SDRATTR_XMLATTRIBUTES (SDRATTR_MISC_FIRST +23) /* 1120 */ /* 1120 */ /* 1103 */ /* Pool V2 */
@@ -168,10 +168,10 @@
// Nur fuer Interfaceing, not implemented yet. /* V4+ */
#define SDRATTR_NOTPERSIST_FIRST (SDRATTR_CIRC_LAST + 1) /* 1180 */ /* 1172 */ /* 1127 */ /* 1110 */ /* Pool V1: 1058 */
-#define SDRATTR_OBJMOVEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 0) /* 1180 BOOL, def=FALSE */
-#define SDRATTR_OBJSIZEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 1) /* 1181 BOOL, def=FALSE */
-#define SDRATTR_OBJPRINTABLE (SDRATTR_NOTPERSIST_FIRST+ 2) /* 1182 BOOL, def=TRUE */
-#define SDRATTR_LAYERID (SDRATTR_NOTPERSIST_FIRST+ 3) /* 1183 USHORT, def=0 */
+#define SDRATTR_OBJMOVEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 0) /* 1180 sal_Bool, def=sal_False */
+#define SDRATTR_OBJSIZEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 1) /* 1181 sal_Bool, def=sal_False */
+#define SDRATTR_OBJPRINTABLE (SDRATTR_NOTPERSIST_FIRST+ 2) /* 1182 sal_Bool, def=sal_True */
+#define SDRATTR_LAYERID (SDRATTR_NOTPERSIST_FIRST+ 3) /* 1183 sal_uInt16, def=0 */
#define SDRATTR_LAYERNAME (SDRATTR_NOTPERSIST_FIRST+ 4) /* 1184 String, def="" */
#define SDRATTR_OBJECTNAME (SDRATTR_NOTPERSIST_FIRST+ 5) /* 1185 String, def="" */
#define SDRATTR_ALLPOSITIONX (SDRATTR_NOTPERSIST_FIRST+ 6) /* 1186 long, def=0 */
diff --git a/svx/inc/svx/svddrag.hxx b/svx/inc/svx/svddrag.hxx
index 4b24c69bafcd..8b2ff7f6a733 100644
--- a/svx/inc/svx/svddrag.hxx
+++ b/svx/inc/svx/svddrag.hxx
@@ -69,11 +69,11 @@ protected:
Point aReservePoint4;
Rectangle aReserveRect1;
Rectangle aReserveRect2;
- FASTBOOL bEndDragChangesAttributes;
- FASTBOOL bEndDragChangesGeoAndAttributes;
- FASTBOOL bMouseIsUp;
- FASTBOOL aReserveBool3;
- FASTBOOL aReserveBool4;
+ int bEndDragChangesAttributes;
+ int bEndDragChangesGeoAndAttributes;
+ int bMouseIsUp;
+ int aReserveBool3;
+ int aReserveBool4;
long aReserveLong1;
long aReserveLong2;
long aReserveLong3;
@@ -83,34 +83,34 @@ protected:
void* aReservePtr3;
void* aReservePtr4;
- FASTBOOL bShown; // Xor sichrbar?
- USHORT nMinMov; // Soviel muss erstmal minimal bewegt werden
- FASTBOOL bMinMoved; // MinMove durchbrochen?
+ int bShown; // Xor sichrbar?
+ sal_uInt16 nMinMov; // Soviel muss erstmal minimal bewegt werden
+ int bMinMoved; // MinMove durchbrochen?
- FASTBOOL bHorFixed; // nur Vertikal draggen
- FASTBOOL bVerFixed; // nur Horizontal draggen
- FASTBOOL bWantNoSnap; // TRUE=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet
+ int bHorFixed; // nur Vertikal draggen
+ int bVerFixed; // nur Horizontal draggen
+ int bWantNoSnap; // sal_True=Fuer die Entscheidung ob fuer pObj->MovCreate() NoSnapPos verwendet
// werden soll. Entsprechend wird auch NoSnapPos in den Buffer geschrieben.
- FASTBOOL bOrtho4;
- FASTBOOL bOrtho8;
+ int bOrtho4;
+ int bOrtho8;
SdrDragMethod* pDragMethod;
protected:
- void Clear(FASTBOOL bLeaveOne);
- Point& Pnt(ULONG nNum) { return *((Point*)aPnts.GetObject(nNum)); }
+ void Clear(int bLeaveOne);
+ Point& Pnt(sal_uIntPtr nNum) { return *((Point*)aPnts.GetObject(nNum)); }
//public:
SdrDragStatUserData* pUser; // Userdata
public:
SdrDragStat(): aPnts(1024,16,16) { pUser=NULL; Reset(); }
- ~SdrDragStat() { Clear(FALSE); }
+ ~SdrDragStat() { Clear(sal_False); }
void Reset();
SdrView* GetView() const { return pView; }
void SetView(SdrView* pV) { pView=pV; }
SdrPageView* GetPageView() const { return pPageView; }
void SetPageView(SdrPageView* pPV) { pPageView=pPV; }
- const Point& GetPoint(ULONG nNum) const { return *((Point*)aPnts.GetObject(nNum)); }
- ULONG GetPointAnz() const { return aPnts.Count(); }
+ const Point& GetPoint(sal_uIntPtr nNum) const { return *((Point*)aPnts.GetObject(nNum)); }
+ sal_uIntPtr GetPointAnz() const { return aPnts.Count(); }
const Point& GetStart() const { return GetPoint(0); }
Point& Start() { return Pnt(0); }
const Point& GetPrev() const { return GetPoint(GetPointAnz()-(GetPointAnz()>=2 ? 2:1)); }
@@ -129,50 +129,50 @@ public:
void SetHdl(SdrHdl* pH) { pHdl=pH; }
SdrDragStatUserData* GetUser() const { return pUser; }
void SetUser(SdrDragStatUserData* pU) { pUser=pU; }
- FASTBOOL IsShown() const { return bShown; }
- void SetShown(FASTBOOL bOn) { bShown=bOn; }
+ int IsShown() const { return bShown; }
+ void SetShown(int bOn) { bShown=bOn; }
- FASTBOOL IsMinMoved() const { return bMinMoved; }
- void SetMinMoved() { bMinMoved=TRUE; }
- void ResetMinMoved() { bMinMoved=FALSE; }
- void SetMinMove(USHORT nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; }
- USHORT GetMinMove() const { return nMinMov; }
+ int IsMinMoved() const { return bMinMoved; }
+ void SetMinMoved() { bMinMoved=sal_True; }
+ void ResetMinMoved() { bMinMoved=sal_False; }
+ void SetMinMove(sal_uInt16 nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; }
+ sal_uInt16 GetMinMove() const { return nMinMov; }
- FASTBOOL IsHorFixed() const { return bHorFixed; }
- void SetHorFixed(FASTBOOL bOn) { bHorFixed=bOn; }
- FASTBOOL IsVerFixed() const { return bVerFixed; }
- void SetVerFixed(FASTBOOL bOn) { bVerFixed=bOn; }
+ int IsHorFixed() const { return bHorFixed; }
+ void SetHorFixed(int bOn) { bHorFixed=bOn; }
+ int IsVerFixed() const { return bVerFixed; }
+ void SetVerFixed(int bOn) { bVerFixed=bOn; }
// Hier kann das Obj sagen: "Ich will keinen Koordinatenfang!"
// z.B. fuer den Winkel des Kreisbogen...
- FASTBOOL IsNoSnap() const { return bWantNoSnap; }
- void SetNoSnap(FASTBOOL bOn=TRUE) { bWantNoSnap=bOn; }
+ int IsNoSnap() const { return bWantNoSnap; }
+ void SetNoSnap(int bOn=sal_True) { bWantNoSnap=bOn; }
// Und hier kann das Obj sagen welches Ortho (wenn ueberhaupt eins)
// sinnvoll auf ihm angewendet werden kann.
// Ortho4 bedeutet Ortho in 4 Richtungen (fuer Rect und Cirt)
- FASTBOOL IsOrtho4Possible() const { return bOrtho4; }
- void SetOrtho4Possible(FASTBOOL bOn=TRUE) { bOrtho4=bOn; }
+ int IsOrtho4Possible() const { return bOrtho4; }
+ void SetOrtho4Possible(int bOn=sal_True) { bOrtho4=bOn; }
// Ortho8 bedeutet Ortho in 8 Richtungen (fuer Linien)
- FASTBOOL IsOrtho8Possible() const { return bOrtho8; }
- void SetOrtho8Possible(FASTBOOL bOn=TRUE) { bOrtho8=bOn; }
+ int IsOrtho8Possible() const { return bOrtho8; }
+ void SetOrtho8Possible(int bOn=sal_True) { bOrtho8=bOn; }
// Wird vom gedraggten Objekt gesetzt
- FASTBOOL IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; }
- void SetEndDragChangesAttributes(FASTBOOL bOn) { bEndDragChangesAttributes=bOn; }
- FASTBOOL IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; }
- void SetEndDragChangesGeoAndAttributes(FASTBOOL bOn) { bEndDragChangesGeoAndAttributes=bOn; }
+ int IsEndDragChangesAttributes() const { return bEndDragChangesAttributes; }
+ void SetEndDragChangesAttributes(int bOn) { bEndDragChangesAttributes=bOn; }
+ int IsEndDragChangesGeoAndAttributes() const { return bEndDragChangesGeoAndAttributes; }
+ void SetEndDragChangesGeoAndAttributes(int bOn) { bEndDragChangesGeoAndAttributes=bOn; }
// Wird von der View gesetzt und kann vom Obj ausgewertet werden
- FASTBOOL IsMouseDown() const { return !bMouseIsUp; }
- void SetMouseDown(FASTBOOL bDown) { bMouseIsUp=!bDown; }
+ int IsMouseDown() const { return !bMouseIsUp; }
+ void SetMouseDown(int bDown) { bMouseIsUp=!bDown; }
Point KorregPos(const Point& rNow, const Point& rPrev) const;
void Reset(const Point& rPnt);
void NextMove(const Point& rPnt);
- void NextPoint(FASTBOOL bSaveReal=FALSE);
+ void NextPoint(int bSaveReal=sal_False);
void PrevPoint();
- FASTBOOL CheckMinMoved(const Point& rPnt);
+ int CheckMinMoved(const Point& rPnt);
long GetDX() const { return GetNow().X()-GetPrev().X(); }
long GetDY() const { return GetNow().Y()-GetPrev().Y(); }
Fraction GetXFact() const;
diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx
index 9ad7a412dcc3..66b2c8643717 100644
--- a/svx/inc/svx/svddrgv.hxx
+++ b/svx/inc/svx/svddrgv.hxx
@@ -67,10 +67,10 @@ protected:
SdrMarkList aFollowingEdges; // Wenn Knoten gedraggd werden, sollen alle Kanten als Xor folgen
SdrHdlKind eDragHdl;
- ULONG nDragXorPolyLimit;
- ULONG nDragXorPointLimit;
- USHORT nRubberEdgeDraggingLimit;
- USHORT nDetailedEdgeDraggingLimit;
+ sal_uIntPtr nDragXorPolyLimit;
+ sal_uIntPtr nDragXorPointLimit;
+ sal_uInt16 nRubberEdgeDraggingLimit;
+ sal_uInt16 nDetailedEdgeDraggingLimit;
unsigned bFramDrag : 1; // z.Zt. FrameDrag
unsigned bDragSpecial : 1; // z.Zt. Special Obj-Dragging
@@ -110,7 +110,7 @@ protected:
virtual ~SdrDragView();
public:
- virtual BOOL IsAction() const;
+ virtual sal_Bool IsAction() const;
virtual void MovAction(const Point& rPnt);
virtual void EndAction();
virtual void BckAction();
@@ -124,72 +124,72 @@ public:
// In der Regel ist das die linke obere Ecke des zu erwartenden neuen
// SnapRects. Ausnahme: CaptionObj. Dort ist es die Position des
// "Schwanzendes".
- // Bei Returncode FALSE konnte ich die Position nicht bestimmen
+ // Bei Returncode sal_False konnte ich die Position nicht bestimmen
// (z.B. Punktverschiebung, Mehrfachselektion, Schieben der
// Spiegelschse, ...)
- BOOL TakeDragObjAnchorPos(Point& rPos, BOOL bTopRight = FALSE ) const;
+ sal_Bool TakeDragObjAnchorPos(Point& rPos, sal_Bool bTopRight = sal_False ) const;
// Wird pForcedMeth uebergeben, so wird pHdl, ... nicht ausgewerten, sondern diese
// Drag-Methode verwendet. Die Instanz geht dabei ins Eigentum der View ueber und
// wird zum Ende des Draggings destruiert.
- virtual BOOL BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL);
+ virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL);
void MovDragObj(const Point& rPnt);
- BOOL EndDragObj(BOOL bCopy=FALSE);
+ sal_Bool EndDragObj(sal_Bool bCopy=sal_False);
void BrkDragObj();
- BOOL IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; }
+ sal_Bool IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; }
SdrHdl* GetDragHdl() const { return pDragHdl; }
SdrDragMethod* GetDragMethod() const { return mpCurrentSdrDragMethod; }
- BOOL IsDraggingPoints() const { return eDragHdl==HDL_POLY; }
- BOOL IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; }
+ sal_Bool IsDraggingPoints() const { return eDragHdl==HDL_POLY; }
+ sal_Bool IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; }
// Wer das beim BegDrag oder mittendrin schon festlegen will.
- // (Wird bei jedem BegDrag auf FALSE zurueckgesetzt, also nach
+ // (Wird bei jedem BegDrag auf sal_False zurueckgesetzt, also nach
// BegDrag setzen.)
- void SetDragWithCopy(BOOL bOn) { bDragWithCopy = bOn; }
- BOOL IsDragWithCopy() const { return bDragWithCopy; }
+ void SetDragWithCopy(sal_Bool bOn) { bDragWithCopy = bOn; }
+ sal_Bool IsDragWithCopy() const { return bDragWithCopy; }
- void SetInsertGluePoint(BOOL bOn) { bInsGluePoint = bOn; }
- BOOL IsInsertGluePoint() const { return bInsGluePoint; }
+ void SetInsertGluePoint(sal_Bool bOn) { bInsGluePoint = bOn; }
+ sal_Bool IsInsertGluePoint() const { return bInsGluePoint; }
// Interaktives einfuegen eines neuen Punktes. nIdx=0 => vor dem ersten Punkt.
- BOOL IsInsObjPointPossible() const;
- BOOL IsInsPointPossible() const { return IsInsObjPointPossible(); }
+ sal_Bool IsInsObjPointPossible() const;
+ sal_Bool IsInsPointPossible() const { return IsInsObjPointPossible(); }
sal_Bool BegInsObjPoint(const Point& rPnt, sal_Bool bNewObj) { return ImpBegInsObjPoint(sal_False, 0L, rPnt, bNewObj, 0L); }
void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); }
- BOOL EndInsObjPoint(SdrCreateCmd eCmd);
+ sal_Bool EndInsObjPoint(SdrCreateCmd eCmd);
void BrkInsObjPoint() { BrkDragObj(); }
- BOOL IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; }
+ sal_Bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; }
// Fuer die App zum Verwalten des Status. GetPreferedPointer() wird
// spaeter vielleicht einen passenden Pointer dafuer liefern
- void SetInsObjPointMode(BOOL bOn) { bInsObjPointMode = bOn; }
- BOOL IsInsObjPointMode() const { return bInsObjPointMode; }
+ void SetInsObjPointMode(sal_Bool bOn) { bInsObjPointMode = bOn; }
+ sal_Bool IsInsObjPointMode() const { return bInsObjPointMode; }
- BOOL IsInsGluePointPossible() const;
- BOOL BegInsGluePoint(const Point& rPnt);
+ sal_Bool IsInsGluePointPossible() const;
+ sal_Bool BegInsGluePoint(const Point& rPnt);
void MovInsGluePoint(const Point& rPnt) { MovDragObj(rPnt); }
- BOOL EndInsGluePoint() { return EndDragObj(); }
+ sal_Bool EndInsGluePoint() { return EndDragObj(); }
void BrkInsGluePoint() { BrkDragObj(); }
- BOOL IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; }
+ sal_Bool IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; }
// Fuer die App zum Verwalten des Status. GetPreferedPointer() wird
// spaeter vielleicht einen passenden Pointer dafuer liefern
- void SetInsGluePointMode(BOOL bOn) { bInsGluePointMode = bOn; }
- BOOL IsInsGluePointMode() const { return bInsGluePointMode; }
+ void SetInsGluePointMode(sal_Bool bOn) { bInsGluePointMode = bOn; }
+ sal_Bool IsInsGluePointMode() const { return bInsGluePointMode; }
// Begrenzungslinien ueber's gesamte Win waehrend des Draggens
// Persistent. Default=FALSE.
- void SetDragStripes(BOOL bOn);
- BOOL IsDragStripes() const { return bDragStripes; }
+ void SetDragStripes(sal_Bool bOn);
+ sal_Bool IsDragStripes() const { return bDragStripes; }
// Handles waehrend des Draggens verstecken
- //HMHvoid SetDragHdlHide(BOOL bOn);
+ //HMHvoid SetDragHdlHide(sal_Bool bOn);
//HMHBOOL IsDragHdlHide() const { return bNoDragHdl; }
// Beim Draggen von Polygonpunkten und Klebepunkten
// die Maus verstecken. Default=FALSE
- void SetMouseHideWhileDraggingPoints(BOOL bOn) { bMouseHideWhileDraggingPoints = bOn; }
- BOOL IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; }
+ void SetMouseHideWhileDraggingPoints(sal_Bool bOn) { bMouseHideWhileDraggingPoints = bOn; }
+ sal_Bool IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; }
// Beim Draggen werden i.d.R. die Konturen der markierten Objekte
// als Xor-Polygone dargestellt. Wird dieses Flag hier gesetzt,
@@ -198,22 +198,22 @@ public:
// hat diese Einstellung keine Auswirkung.
// Auch waerend des Draggens umschaltbar.
// Default=Off
- void SetNoDragXorPolys(BOOL bOn);
- BOOL IsNoDragXorPolys() const { return bNoDragXorPolys; }
+ void SetNoDragXorPolys(sal_Bool bOn);
+ sal_Bool IsNoDragXorPolys() const { return bNoDragXorPolys; }
// Uebersteigt die Anzahl der markierten Objekte den hier eingestellten
// Wert, wird implizit (temporaer) auf NoDragPolys geschaltet.
// PolyPolygone etc werden entsprechend als mehrere Objekte gewertet.
// Default=100
- void SetDragXorPolyLimit(ULONG nObjAnz) { nDragXorPolyLimit=nObjAnz; }
- ULONG GetDragXorPolyLimit() const { return nDragXorPolyLimit; }
+ void SetDragXorPolyLimit(sal_uIntPtr nObjAnz) { nDragXorPolyLimit=nObjAnz; }
+ sal_uIntPtr GetDragXorPolyLimit() const { return nDragXorPolyLimit; }
// Wie DragXorPolyLimit, jedoch bezogen auf die Gesamtpunktanzahl
// aller Polygone. Default=500.
// Auf NoDragPolys wird (temporaer) geschaltet, wenn eins der Limits
// ueberstiegen wird.
- void SetDragXorPointLimit(ULONG nPntAnz) { nDragXorPointLimit=nPntAnz; }
- ULONG GetDragXorPointLimit() const { return nDragXorPointLimit; }
+ void SetDragXorPointLimit(sal_uIntPtr nPntAnz) { nDragXorPointLimit=nPntAnz; }
+ sal_uIntPtr GetDragXorPointLimit() const { return nDragXorPointLimit; }
void SetSolidDragging(bool bOn);
bool IsSolidDragging() const;
@@ -221,14 +221,14 @@ public:
// Dragging/Creating von Verbindern:
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Verbinder an Objektscheitelpunkte ankleben
- // Default=TRUE=Ja
- void SetAutoVertexConnectors(BOOL bOn) { bAutoVertexCon = bOn; }
- BOOL IsAutoVertexConnectors() const { return bAutoVertexCon; }
+ // Default=sal_True=Ja
+ void SetAutoVertexConnectors(sal_Bool bOn) { bAutoVertexCon = bOn; }
+ sal_Bool IsAutoVertexConnectors() const { return bAutoVertexCon; }
// Verbinder an Objektecken ankleben
- // Default=FALSE=Nein
- void SetAutoCornerConnectors(BOOL bOn) { bAutoCornerCon = bOn; }
- BOOL IsAutoCornerConnectors() const { return bAutoCornerCon; }
+ // Default=sal_False=Nein
+ void SetAutoCornerConnectors(sal_Bool bOn) { bAutoCornerCon = bOn; }
+ sal_Bool IsAutoCornerConnectors() const { return bAutoCornerCon; }
// Dragging von verbundenen Objekten (Nodes):
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -237,22 +237,22 @@ public:
// Gummibaender sondern komplette Neuberechnunen sind beim Draggen sichtbar.
// Diese detalierte Darstellung ist eh nur beim MoveDrag moeglich.
// Defaultwert ist 10
- void SetDetailedEdgeDragging(BOOL bOn); // Default an
- BOOL IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; }
+ void SetDetailedEdgeDragging(sal_Bool bOn); // Default an
+ sal_Bool IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; }
- void SetDetailedEdgeDraggingLimit(USHORT nEdgeObjAnz);
- USHORT GetDetailedEdgeDraggingLimit() const { return nDetailedEdgeDraggingLimit; }
+ void SetDetailedEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz);
+ sal_uInt16 GetDetailedEdgeDraggingLimit() const { return nDetailedEdgeDraggingLimit; }
// EdgeDraggingLimit: Sind mehr als nEdgeObjAnz Kanten betroffen, werden
// diese beim interaktiven Draggen nicht mit angezeigt.
// Gemeint sind hier die "Gummibaender", die weniger Rechenzeit benoetigen
// als die kompletten Neuberechnungen beim DetailedEdgeDragging.
// Defaultwert ist 100
- void SetRubberEdgeDragging(BOOL bOn); // Default an
- BOOL IsRubberEdgeDragging() const { return bRubberEdgeDragging; }
+ void SetRubberEdgeDragging(sal_Bool bOn); // Default an
+ sal_Bool IsRubberEdgeDragging() const { return bRubberEdgeDragging; }
- void SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz);
- USHORT GetRubberEdgeDraggingLimit() const { return nRubberEdgeDraggingLimit; }
+ void SetRubberEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz);
+ sal_uInt16 GetRubberEdgeDraggingLimit() const { return nRubberEdgeDraggingLimit; }
// Verbinderhandling also zu deutsch wie folgt (bei Defaulteinstellungen):
// - Sind bis max 10 Verbinder betroffen werden diese bei jedem
@@ -264,29 +264,29 @@ public:
// Ist ein spezieller Dragmode eingeschaltet, wie Rotate, Mirror oder Crook,
// dann leitet ein Hit auf das markierte Objekt genau dieses Dragging ein.
- // Setzt man MarkedHitMovesAlways auf TRUE, so leitet ein Hit auf das
+ // Setzt man MarkedHitMovesAlways auf sal_True, so leitet ein Hit auf das
// markierte Objekt immer ein Moven ein, unabhaengig vom gesetzten DragMode.
// Dieses Flag ist persistent und sollte von der App fuer den Anwender
// konfigurierbar sein!
- void SetMarkedHitMovesAlways(BOOL bOn) { bMarkedHitMovesAlways = bOn; }
- BOOL IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; }
+ void SetMarkedHitMovesAlways(sal_Bool bOn) { bMarkedHitMovesAlways = bOn; }
+ sal_Bool IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; }
// Beim Draggen der Spiegelachse das Spiegelbild der markierten Objekte
// als Xor darstellen? Persistent. Noch nicht implementiert. Default TRUE.
- void SetMirrRefDragObj(BOOL bOn) { bMirrRefDragObj = bOn; }
- BOOL IsMirrRefDragObj() const { return bMirrRefDragObj; }
+ void SetMirrRefDragObj(sal_Bool bOn) { bMirrRefDragObj = bOn; }
+ sal_Bool IsMirrRefDragObj() const { return bMirrRefDragObj; }
- BOOL IsOrthoDesired() const;
+ sal_Bool IsOrthoDesired() const;
// Beim Resize die Mitte als Referenz
// Default=FALSE.
- BOOL IsResizeAtCenter() const { return bResizeAtCenter; }
- void SetResizeAtCenter(BOOL bOn) { bResizeAtCenter = bOn; }
+ sal_Bool IsResizeAtCenter() const { return bResizeAtCenter; }
+ void SetResizeAtCenter(sal_Bool bOn) { bResizeAtCenter = bOn; }
// Symmetrisches Crook
// Default=FALSE.
- BOOL IsCrookAtCenter() const { return bCrookAtCenter; }
- void SetCrookAtCenter(BOOL bOn) { bCrookAtCenter = bOn; }
+ sal_Bool IsCrookAtCenter() const { return bCrookAtCenter; }
+ void SetCrookAtCenter(sal_Bool bOn) { bCrookAtCenter = bOn; }
// Begrenzung des Arbeitsbereichs. Die Begrenzung bezieht sich auf die
// View, nicht auf die einzelnen PageViews. Von der View wird diese
@@ -305,7 +305,7 @@ public:
// Das DragLimit ist bezogen auf die Page des Objekts.
// (Oder auf die View??? Muss ich mal^^^^recherchieren. Joe.)
- // FALSE=Kein Limit.
+ // sal_False=Kein Limit.
// Das Rueckgabe-Rect muss absolute Koordinaten enthalten. Der Maximale
// Dragbereich wird von der View dann so gewaehlt, dass das SnapRect des
// Objekts bis Maximal auf die Kante des LimitRects gemoved bzw. gesized
@@ -314,7 +314,7 @@ public:
// Rundungsfehler auftreten koennen, wodurch das LimitRect minnimal
// ueberschritten werden koennte...
// Implementiert fuer Move und Resize.
- virtual BOOL TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
+ virtual sal_Bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
};
#endif //_SVDDRGV_HXX
diff --git a/svx/inc/svx/svdedtv.hxx b/svx/inc/svx/svdedtv.hxx
index 83429ae6c58e..a9ad00e3c6d7 100644
--- a/svx/inc/svx/svdedtv.hxx
+++ b/svx/inc/svx/svdedtv.hxx
@@ -149,12 +149,12 @@ protected:
void ImpBroadcastEdgesOfMarkedNodes();
// Konvertierung der markierten Objekte in Poly bzw. Bezier.
- void ImpConvertTo(BOOL bPath, BOOL bLineToArea);
+ void ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea);
// Konvertiert ein Obj, wirft bei Erfolg das alte as seiner Liste und
// fuegt das neue an dessen Position ein. Inkl Undo. Es wird weder ein
// MarkEntry noch ein ModelChgBroadcast generiert.
- SdrObject* ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLineToArea);
+ SdrObject* ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea);
// Setzen der beiden Flags bToTopPossible und bToBtmPossible.
// bToTopPossibleDirty und bToBtmPossibleDirty werden dabei gleichzeitig
@@ -177,11 +177,11 @@ protected:
// fuer DismantleMarkedObjects
sal_Bool ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPpolygon, sal_Bool bMakeLines) const;
sal_Bool ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines) const;
- void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, ULONG& rPos, SdrPageView* pPV, BOOL bMakeLines);
+ void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines);
void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode,
- BOOL bVertical, BOOL bNoContortion, BOOL bRotate, const Rectangle& rMarkRect);
- void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion);
- BOOL ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const;
+ sal_Bool bVertical, sal_Bool bNoContortion, sal_Bool bRotate, const Rectangle& rMarkRect);
+ void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion);
+ sal_Bool ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const;
void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID);
// Entfernt alle Obj der MarkList aus ihren ObjLists inkl Undo.
@@ -223,11 +223,11 @@ public:
void AddUndoActions( std::vector< SdrUndoAction* >& );
// Layerverwaltung. Mit Undo.
- SdrLayer* InsertNewLayer(const String& rName, USHORT nPos=0xFFFF);
+ SdrLayer* InsertNewLayer(const String& rName, sal_uInt16 nPos=0xFFFF);
// Loeschen eines Layer inkl. aller darauf befindlichen Objekte
void DeleteLayer(const String& rName);
// Verschieben eines Layer (Layerreihenfolge aendern)
- void MoveLayer(const String& rName, USHORT nNewPos);
+ void MoveLayer(const String& rName, sal_uInt16 nNewPos);
// Markierte Objekte die ausserhalb ihrer Page liegen
// werden ggf. einer anderen Page zugewiesen
@@ -235,23 +235,23 @@ public:
void ForceMarkedObjToAnotherPage();
void ForceMarkedToAnotherPage() { ForceMarkedObjToAnotherPage(); }
- BOOL IsReadOnly() const { ForcePossibilities(); return bReadOnly; }
+ sal_Bool IsReadOnly() const { ForcePossibilities(); return bReadOnly; }
// Loeschen aller markierten Objekte
void DeleteMarkedObj();
- BOOL IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; }
+ sal_Bool IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; }
// Logisch- umschliessendes Rect aller markierten Objekte setzen.
// Das das wirklich geschieht ist nicht garantiert, denn eine
// waagerechte Linie hat z.B. immer eine Hoehe von 0.
- void SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy=FALSE);
+ void SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy=sal_False);
void MoveMarkedObj(const Size& rSiz, bool bCopy=false);
void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
long GetMarkedObjRotate() const;
void RotateMarkedObj(const Point& rRef, long nWink, bool bCopy=false);
void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false);
- void MirrorMarkedObjHorizontal(BOOL bCopy=FALSE);
- void MirrorMarkedObjVertical(BOOL bCopy=FALSE);
+ void MirrorMarkedObjHorizontal(sal_Bool bCopy=sal_False);
+ void MirrorMarkedObjVertical(sal_Bool bCopy=sal_False);
long GetMarkedObjShear() const;
void ShearMarkedObj(const Point& rRef, long nWink, bool bVShear=false, bool bCopy=false);
void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false);
@@ -259,28 +259,28 @@ public:
// Markierte Objekte kopieren und anstelle der alten markieren
void CopyMarkedObj();
- void SetAllMarkedRect(const Rectangle& rRect, BOOL bCopy=FALSE) { SetMarkedObjRect(rRect,bCopy); }
- void MoveAllMarked(const Size& rSiz, BOOL bCopy=FALSE) { MoveMarkedObj (rSiz,bCopy); }
- void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, BOOL bCopy=FALSE) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); }
+ void SetAllMarkedRect(const Rectangle& rRect, sal_Bool bCopy=sal_False) { SetMarkedObjRect(rRect,bCopy); }
+ void MoveAllMarked(const Size& rSiz, sal_Bool bCopy=sal_False) { MoveMarkedObj (rSiz,bCopy); }
+ void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, sal_Bool bCopy=sal_False) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); }
long GetAllMarkedRotate() const { return GetMarkedObjRotate(); }
- void RotateAllMarked(const Point& rRef, long nWink, BOOL bCopy=FALSE) { RotateMarkedObj(rRef,nWink,bCopy); }
- void MirrorAllMarked(const Point& rRef1, const Point& rRef2, BOOL bCopy=FALSE) { MirrorMarkedObj(rRef1,rRef2,bCopy); }
- void MirrorAllMarkedHorizontal(BOOL bCopy=FALSE) { MirrorMarkedObjHorizontal(bCopy); }
- void MirrorAllMarkedVertical(BOOL bCopy=FALSE) { MirrorMarkedObjVertical(bCopy); }
+ void RotateAllMarked(const Point& rRef, long nWink, sal_Bool bCopy=sal_False) { RotateMarkedObj(rRef,nWink,bCopy); }
+ void MirrorAllMarked(const Point& rRef1, const Point& rRef2, sal_Bool bCopy=sal_False) { MirrorMarkedObj(rRef1,rRef2,bCopy); }
+ void MirrorAllMarkedHorizontal(sal_Bool bCopy=sal_False) { MirrorMarkedObjHorizontal(bCopy); }
+ void MirrorAllMarkedVertical(sal_Bool bCopy=sal_False) { MirrorMarkedObjVertical(bCopy); }
long GetAllMarkedShear() const { return GetMarkedObjShear(); }
- void ShearAllMarked(const Point& rRef, long nWink, BOOL bVShear=FALSE, BOOL bCopy=FALSE) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); }
- void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, BOOL bVertical=FALSE, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); }
+ void ShearAllMarked(const Point& rRef, long nWink, sal_Bool bVShear=sal_False, sal_Bool bCopy=sal_False) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); }
+ void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, sal_Bool bVertical=sal_False, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); }
void CopyMarked() { CopyMarkedObj(); }
- BOOL IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; }
- BOOL IsResizeAllowed(BOOL bProp=FALSE) const;
- BOOL IsRotateAllowed(BOOL b90Deg=FALSE) const;
- BOOL IsMirrorAllowed(BOOL b45Deg=FALSE, BOOL b90Deg=FALSE) const;
- BOOL IsTransparenceAllowed() const;
- BOOL IsGradientAllowed() const;
- BOOL IsShearAllowed() const;
- BOOL IsEdgeRadiusAllowed() const;
- BOOL IsCrookAllowed(BOOL bNoContortion=FALSE) const;
- BOOL IsDistortAllowed(BOOL bNoContortion=FALSE) const;
+ sal_Bool IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; }
+ sal_Bool IsResizeAllowed(sal_Bool bProp=sal_False) const;
+ sal_Bool IsRotateAllowed(sal_Bool b90Deg=sal_False) const;
+ sal_Bool IsMirrorAllowed(sal_Bool b45Deg=sal_False, sal_Bool b90Deg=sal_False) const;
+ sal_Bool IsTransparenceAllowed() const;
+ sal_Bool IsGradientAllowed() const;
+ sal_Bool IsShearAllowed() const;
+ sal_Bool IsEdgeRadiusAllowed() const;
+ sal_Bool IsCrookAllowed(sal_Bool bNoContortion=sal_False) const;
+ sal_Bool IsDistortAllowed(sal_Bool bNoContortion=sal_False) const;
// Vereinigen mehrerer Objekte zu einem PolyPolygon:
// - Rechtecke/Kreise/Text... werden implizit gewandelt.
@@ -306,9 +306,9 @@ public:
// Memberobjekten um PathObjs handelt.
// bMakeLines=TRUE: alle Polygone werden in einzelne Linien bzw.
// Beziersegmente zerlegt
- void DismantleMarkedObjects(BOOL bMakeLines=FALSE);
- BOOL IsCombinePossible(BOOL bNoPolyPoly=FALSE) const;
- BOOL IsDismantlePossible(BOOL bMakeLines=FALSE) const;
+ void DismantleMarkedObjects(sal_Bool bMakeLines=sal_False);
+ sal_Bool IsCombinePossible(sal_Bool bNoPolyPoly=sal_False) const;
+ sal_Bool IsDismantlePossible(sal_Bool bMakeLines=sal_False) const;
// Ein neues bereits fertig konstruiertes Obj einfuegen. Das Obj gehoert
// anschliessend dem Model. Nach dem Einfuegen wird das neue Objekt
@@ -317,7 +317,7 @@ public:
// wenn der Ziel-Layer gesperrt oder nicht sichtbar ist. In diesem Fall
// returniert die Methode mit FALSE.
// Die Methode generiert u.a. auch eine Undo-Action.
- BOOL InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions=0);
+ sal_Bool InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions=0);
// Ein Zeichenobjekt durch ein neues ersetzen. *pNewObj gehoert
// anschliessend mir, *pOldObj wandert ins Undo.
@@ -327,13 +327,13 @@ public:
// ReplaceObject(...);
// ...
// EndUndo();
- void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, BOOL bMark=TRUE);
+ void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark=sal_True);
- void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll);
- void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const;
- void MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const;
- SfxItemSet GetAttrFromMarked(BOOL bOnlyHardAttr) const;
- void SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll);
+ void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
+ void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const;
+ void MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const;
+ SfxItemSet GetAttrFromMarked(sal_Bool bOnlyHardAttr) const;
+ void SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
// Geometrische Attribute (Position, Groesse, Drehwinkel)
// Bei der Position wird ein evtl. gesetzter PageOrigin beruecksichtigt.
@@ -348,14 +348,14 @@ public:
SfxStyleSheet* GetStyleSheetFromMarked() const;
// z.Zt. noch ohne Undo :(
- void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+ void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
/* new interface src537 */
- BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const;
+ sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const;
- BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
- SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const;
- BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+ sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
+ SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
+ sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
// Alle markierten Objekte zu einer Gruppe zusammenfassen.
// Anschliessend wird die neue Gruppe markiert. Bei einer
@@ -373,25 +373,25 @@ public:
// zusaetzlich markiert.
void UnGroupMarked();
- BOOL IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; }
- BOOL IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; }
- BOOL IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; }
+ sal_Bool IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; }
+ sal_Bool IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; }
+ sal_Bool IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; }
- // Markierte Objekte in Polygone/Bezierkurven verwandeln. Die BOOL-
- // Funktionen returnen TRUE, wenn wenigstens eins der markierten
+ // Markierte Objekte in Polygone/Bezierkurven verwandeln. Die sal_Bool-
+ // Funktionen returnen sal_True, wenn wenigstens eins der markierten
// Objekte gewandelt werden kann. Memberobjekte von Gruppenobjekten
// werden ebenfalls gewandelt. Naehere Beschreibung siehe SdrObj.HXX.
- BOOL IsConvertToPathObjPossible(BOOL bLineToArea) const { ForcePossibilities(); return BOOL(bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath); }
- BOOL IsConvertToPolyObjPossible(BOOL bLineToArea) const { ForcePossibilities(); return BOOL(bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly); }
- BOOL IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; }
- void ConvertMarkedToPathObj(BOOL bLineToArea);
- void ConvertMarkedToPolyObj(BOOL bLineToArea);
+ sal_Bool IsConvertToPathObjPossible(sal_Bool bLineToArea) const { ForcePossibilities(); return sal_Bool(bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath); }
+ sal_Bool IsConvertToPolyObjPossible(sal_Bool bLineToArea) const { ForcePossibilities(); return sal_Bool(bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly); }
+ sal_Bool IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; }
+ void ConvertMarkedToPathObj(sal_Bool bLineToArea);
+ void ConvertMarkedToPolyObj(sal_Bool bLineToArea);
// Alle markierten Objekte untereinander ausrichten. Normalerweise werden
- // das SnapRect der Obj verwendet. Ist bBoundRects=TRUE, werden stattdessen
+ // das SnapRect der Obj verwendet. Ist bBoundRects=sal_True, werden stattdessen
// die BoundRects ausgerichtet.
- void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL bBoundRects=FALSE);
- BOOL IsAlignPossible() const;
+ void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_Bool bBoundRects=sal_False);
+ sal_Bool IsAlignPossible() const;
// Markierte Objekte etwas nach "oben" holen
void MovMarkedToTop();
@@ -419,12 +419,12 @@ public:
// Feststellen, ob nach vorn/hinten stellen moeglich ist
// GetMaxToTop/BtmObj() wird von diesen Methoden nur begrenzt
// beruecksichtigt, d.h. es kann vorkommen dass IsToTopPossible()
- // TRUE liefert, MovMarkedToTop() jedoch nichts aendert (z.B. bei
+ // sal_True liefert, MovMarkedToTop() jedoch nichts aendert (z.B. bei
// Mehrfachselektion), weil eine von der abgeleiteten View ueber
// GetMaxToTopObj() auferlegte Restriktion dies verhindert.
- BOOL IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; }
- BOOL IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; }
- BOOL IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; }
+ sal_Bool IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; }
+ sal_Bool IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; }
+ sal_Bool IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; }
// Ueber diese Methoden stellt die View fest, wie weit ein Objekt
// nach vorn bzw. nach hinten gestellt werden darf (Z-Order). Das
@@ -436,21 +436,21 @@ public:
// Folgende Methode wird gerufen, wenn z.B. durch ToTop, ToBtm, ... die
// Reihenfolgen der Objekte geaendert wurde. Der Aufruf erfolgt dann nach
// jedem SdrObjList::SetObjectOrdNum(nOldPos,nNewPos);
- virtual void ObjOrderChanged(SdrObject* pObj, ULONG nOldPos, ULONG nNewPos);
+ virtual void ObjOrderChanged(SdrObject* pObj, sal_uIntPtr nOldPos, sal_uIntPtr nNewPos);
// Falls ein oder mehrere Objekte des Types SdrGrafObj oder SdrOle2Obj
// markiert sind und diese in der Lage sind ein StarView-Metafile zu
// liefern, konvertiert diese Methode das Metafile in Drawingobjekte.
// Die SdrGrafObjs/SdrOle2Objs werden dann durch die neue Objekte ersetzt.
void DoImportMarkedMtf(SvdProgressInfo *pProgrInfo=NULL);
- BOOL IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; }
+ sal_Bool IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; }
// Wird der Modus VirtualObjectBundling eingeschaltet, werden beim
// ToTop/ToBtm virtuelle Objekte die dasselbe Objekt referenzieren
// in ihrer Z-Order buendig zusammengehalten (Writer).
- // Defaulteinstellung ist FALSE=ausgeschaltet.
- void SetVirtualObjectBundling(BOOL bOn) { bBundleVirtObj=bOn; }
- BOOL IsVirtualObjectBundling() const { return bBundleVirtObj; }
+ // Defaulteinstellung ist sal_False=ausgeschaltet.
+ void SetVirtualObjectBundling(sal_Bool bOn) { bBundleVirtObj=bOn; }
+ sal_Bool IsVirtualObjectBundling() const { return bBundleVirtObj; }
// von der SdrMarkView ueberladen fuer den internen gebrauch
virtual void MarkListHasChanged();
diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx
index 505c52f8064a..aec7a656077e 100644
--- a/svx/inc/svx/svdedxv.hxx
+++ b/svx/inc/svx/svdedxv.hxx
@@ -105,7 +105,7 @@ protected:
Link aOldCalcFieldValueLink; // Zum rufen des alten Handlers
Point aMacroDownPos;
- USHORT nMacroTol;
+ sal_uInt16 nMacroTol;
unsigned bTextEditDontDelete : 1; // Outliner und View bei SdrEndTextEdit nicht deleten (f. Rechtschreibpruefung)
unsigned bTextEditOnlyOneView : 1; // Nur eine OutlinerView (f. Rechtschreibpruefung)
@@ -125,13 +125,13 @@ protected:
// Eine neue OutlinerView auf dem Heap anlegen und alle erforderlichen Parameter setzen.
// pTextEditObj, pTextEditPV und pTextEditOutliner muessen initiallisiert sein.
- OutlinerView* ImpMakeOutlinerView(Window* pWin, BOOL bNoPaint, OutlinerView* pGivenView) const;
+ OutlinerView* ImpMakeOutlinerView(Window* pWin, sal_Bool bNoPaint, OutlinerView* pGivenView) const;
void ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectangle& rRect) const;
void ImpInvalidateOutlinerView(OutlinerView& rOutlView) const;
- // Feststellen, ob der gesamte Text markiert ist. Liefert auch TRUE wenn
+ // Feststellen, ob der gesamte Text markiert ist. Liefert auch sal_True wenn
// kein Text vorhanden ist.
- BOOL ImpIsTextEditAllSelected() const;
+ sal_Bool ImpIsTextEditAllSelected() const;
void ImpMakeTextCursorAreaVisible();
// Handler fuer AutoGrowing Text bei aktivem Outliner
@@ -151,7 +151,7 @@ protected:
public:
// Actionhandling fuer Macromodus
- virtual BOOL IsAction() const;
+ virtual sal_Bool IsAction() const;
virtual void MovAction(const Point& rPnt);
virtual void EndAction();
virtual void BrkAction();
@@ -166,8 +166,8 @@ public:
//************************************************************************
// QuickTextEditMode bedeutet, dass Objekte mit Text sofort beim Anklicken
// editiert werden sollen. Default=TRUE. Persistent.
- void SetQuickTextEditMode(BOOL bOn) { bQuickTextEditMode=bOn; }
- BOOL IsQuickTextEditMode() const { return bQuickTextEditMode; }
+ void SetQuickTextEditMode(sal_Bool bOn) { bQuickTextEditMode=bOn; }
+ sal_Bool IsQuickTextEditMode() const { return bQuickTextEditMode; }
// Starten des TextEditMode. Ist pWin==NULL, wird das erste an der View
// angemeldete Win verwendet.
@@ -178,7 +178,7 @@ public:
// Ueber den Parameter pEditOutliner kann die Applikation einen eigenen
// Outliner vorgeben, der zum Editieren verwendet wird. Dieser gehoert
// nach Aufruf von SdrBeginTextEdit der SdrObjEditView und wird von dieser
- // spaeter via delete zerstoert (falls bDontDeleteOutliner=FALSE). Die
+ // spaeter via delete zerstoert (falls bDontDeleteOutliner=sal_False). Die
// SdrObjEditView setzt dann das Modusflag (EditEngine/Outliner) an
// dieser Instanz und ausserdem auch den StatusEventHdl.
// Ebenso kann eine spezifische OutlinerView vorgegeben werden.
@@ -194,23 +194,23 @@ public:
virtual SdrEndTextEditKind SdrEndTextEdit(sal_Bool bDontDeleteReally = sal_False);
virtual bool IsTextEdit() const;
- // TRUE=Es wird ein Textrahmen (OBJ_TEXT,OBJ_OUTLINETEXT,...) editiert
+ // sal_True=Es wird ein Textrahmen (OBJ_TEXT,OBJ_OUTLINETEXT,...) editiert
// ansonsten handelt es sich um ein beschriftetes Zeichenobjekt, an dem
// der Text ja bekanntlich hor. und vert. zentriert wird.
- BOOL IsTextEditFrame() const;
+ sal_Bool IsTextEditFrame() const;
- // Diese Methode liefert TRUE, wenn der Punkt rHit innerhalb der
+ // Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb der
// des Objektbereichs oder der OutlinerView liegt.
- BOOL IsTextEditHit(const Point& rHit, short nTol) const;
+ sal_Bool IsTextEditHit(const Point& rHit, short nTol) const;
- // Diese Methode liefert TRUE, wenn der Punkt rHit innerhalb des
+ // Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb des
// Handle-dicken Rahmens liegt, der die OutlinerView bei TextFrames
// umschliesst.
- BOOL IsTextEditFrameHit(const Point& rHit) const;
+ sal_Bool IsTextEditFrameHit(const Point& rHit) const;
// Bei aktiver Selektion, also zwischen MouseButtonDown und
// MouseButtonUp liefert diese Methode immer TRUE.
- BOOL IsTextEditInSelectionMode() const;
+ sal_Bool IsTextEditInSelectionMode() const;
// Folgende Methode addiert einen passenden Offset zum MouseEvent
// um diesen an den Outliner weiterzureichen.
@@ -234,24 +234,24 @@ public:
const OutlinerView* GetTextEditOutlinerView() const { return pTextEditOutlinerView; }
OutlinerView* GetTextEditOutlinerView() { return pTextEditOutlinerView; }
- virtual BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
- virtual BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
- virtual BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
- virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
- virtual BOOL Command(const CommandEvent& rCEvt, Window* pWin);
- BOOL Cut(ULONG nFormat=SDR_ANYFORMAT);
- BOOL Yank(ULONG nFormat=SDR_ANYFORMAT);
- BOOL Paste(Window* pWin=NULL, ULONG nFormat=SDR_ANYFORMAT);
+ virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
+ virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
+ virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
+ virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
+ virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin);
+ sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT);
+ sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT);
+ sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT);
// #97766# make virtual to change implementation e.g. for SdOutlineView
virtual sal_uInt16 GetScriptType() const;
/* new interface src537 */
- BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
+ sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
- BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
- SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const;
- BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+ sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
+ SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
+ sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
// Intern: Beim Splitteraufziehen neue OutlinerView...
virtual void AddWindowToPaintView(OutputDevice* pNewWin);
@@ -262,16 +262,16 @@ public:
//************************************************************************
// Persistent. Default TRUE. SvDraw wertet das Flag u.a. bei
// SdrView::GetPreferedPointer() aus. Hat nur Wirkung, wenn das Dokument
- // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==TRUE).
- void SetMacroMode(BOOL bOn) { bMacroMode=bOn; }
- BOOL IsMacroMode() const { return bMacroMode; }
- BOOL BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin);
- BOOL BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); }
+ // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==sal_True).
+ void SetMacroMode(sal_Bool bOn) { bMacroMode=bOn; }
+ sal_Bool IsMacroMode() const { return bMacroMode; }
+ sal_Bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin);
+ sal_Bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); }
void MovMacroObj(const Point& rPnt);
void BrkMacroObj();
- BOOL EndMacroObj();
- BOOL IsMacroObj() const { return pMacroObj!=NULL; }
- BOOL IsMacroObjDown() const { return bMacroDown; }
+ sal_Bool EndMacroObj();
+ sal_Bool IsMacroObj() const { return pMacroObj!=NULL; }
+ sal_Bool IsMacroObjDown() const { return bMacroDown; }
/** fills the given any with a XTextCursor for the current text selection.
Leaves the any untouched if there currently is no text selected */
@@ -282,7 +282,7 @@ public:
rtl::Reference< sdr::SelectionController > getSelectionController() const { return mxSelectionController; }
/** returns true if the shape identified by its inventor and identifier supports format paint brush operation */
- virtual bool SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const;
+ virtual bool SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const;
/** returns a format paint brush set from the current selection */
virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet );
diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx
index 527c1ac17bf8..7ea8d181e2fa 100644
--- a/svx/inc/svx/svdetc.hxx
+++ b/svx/inc/svx/svdetc.hxx
@@ -41,11 +41,11 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
// ExchangeFormat-Id der DrawingEngine holen. Daten koennen dann per
-// static BOOL CopyData(pData,nLen,nFormat);
+// static sal_Bool CopyData(pData,nLen,nFormat);
// bereitgestellt werden, wobei pData/nLen einen SvMemoryStream beschreiben in
// dem ein SdrModel gestreamt wird an dem fuer die Zeitdauer des Streamens das
-// Flag SdrModel::SetStreamingSdrModel(TRUE) gesetzt wird.
-// ULONG SdrGetExchangeFormat(); -- JP 18.01.99 - dafuer gibt es ein define
+// Flag SdrModel::SetStreamingSdrModel(sal_True) gesetzt wird.
+// sal_uIntPtr SdrGetExchangeFormat(); -- JP 18.01.99 - dafuer gibt es ein define
class SdrOutliner;
class SdrModel;
@@ -62,7 +62,7 @@ namespace com { namespace sun { namespace star { namespace lang {
// Ist pMod<>NULL, dann wird der MapMode des uebergebenen
// Models verwendet. Die resultierende Default-Fonthoehe bleibt
// jedoch dieselbe (die logische Fonthoehe wird umgerechnet).
-SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pMod );
+SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pMod );
// Globale Defaulteinstellungen fuer die DrawingEngine.
// Diese Einstellungen sollte man direkt beim Applikationsstart
@@ -73,7 +73,7 @@ friend class SdrAttrObj;
String aFontName;
FontFamily eFontFamily;
Color aFontColor;
- ULONG nFontHeight;
+ sal_uIntPtr nFontHeight;
MapUnit eMapUnit;
Fraction aMapFraction;
@@ -96,8 +96,8 @@ public:
// 847/100mm entspricht also ca. 24 Point. Verwendet man stattdessen
// beispielsweise Twips (SetMapUnit(MAP_TWIP)) (20 Twip = 1 Point) muss
// man als Fonthoehe 480 angeben um 24 Point als default zu erhalten.
- static void SetFontHeight(ULONG nHeight) { GetDefaults().nFontHeight=nHeight; }
- static ULONG GetFontHeight() { return GetDefaults().nFontHeight; }
+ static void SetFontHeight(sal_uIntPtr nHeight) { GetDefaults().nFontHeight=nHeight; }
+ static sal_uIntPtr GetFontHeight() { return GetDefaults().nFontHeight; }
// Der MapMode wird fuer den globalen Outliner benoetigt.
// Gleichzeitig bekommt auch jedes neu instanziierte SdrModel
// diesen MapMode default zugewiesen.
@@ -119,26 +119,26 @@ public:
// Ist pMod<>NULL, dann wird der MapMode des uebergebenen
// Models verwendet. Die resultierende Default-Fonthoehe bleibt
// jedoch dieselbe (die logische Fonthoehe wird umgerechnet).
- friend SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pMod );
+ friend SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pMod );
};
class SfxItemSet;
// Liefert eine Ersatzdarstellung fuer einen XFillStyle
-// Bei XFILL_NONE gibt's FALSE und rCol bleibt unveraendert.
-SVX_DLLPUBLIC FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol);
+// Bei XFILL_NONE gibt's sal_False und rCol bleibt unveraendert.
+SVX_DLLPUBLIC int GetDraftFillColor(const SfxItemSet& rSet, Color& rCol);
// Ein Container fuer USHORTs (im Prinzip ein dynamisches Array)
class UShortCont {
Container aArr;
public:
- UShortCont(USHORT nBlock, USHORT nInit, USHORT nResize): aArr(nBlock,nInit,nResize) {}
+ UShortCont(sal_uInt16 nBlock, sal_uInt16 nInit, sal_uInt16 nResize): aArr(nBlock,nInit,nResize) {}
void Clear() { aArr.Clear(); }
- void Insert(USHORT nElem, ULONG nPos=CONTAINER_APPEND) { aArr.Insert((void*)ULONG(nElem),nPos); }
- void Remove(ULONG nPos) { aArr.Remove(nPos); }
- void Replace(USHORT nElem, ULONG nPos) { aArr.Replace((void*)ULONG(nElem),nPos); }
- USHORT GetObject(ULONG nPos) const { return USHORT(ULONG(aArr.GetObject(nPos))); }
- ULONG GetPos(USHORT nElem) const { return aArr.GetPos((void*)(ULONG)nElem); }
- ULONG GetCount() const { return aArr.Count(); }
+ void Insert(sal_uInt16 nElem, sal_uIntPtr nPos=CONTAINER_APPEND) { aArr.Insert((void*)sal_uIntPtr(nElem),nPos); }
+ void Remove(sal_uIntPtr nPos) { aArr.Remove(nPos); }
+ void Replace(sal_uInt16 nElem, sal_uIntPtr nPos) { aArr.Replace((void*)sal_uIntPtr(nElem),nPos); }
+ sal_uInt16 GetObject(sal_uIntPtr nPos) const { return sal_uInt16(sal_uIntPtr(aArr.GetObject(nPos))); }
+ sal_uIntPtr GetPos(sal_uInt16 nElem) const { return aArr.GetPos((void*)(sal_uIntPtr)nElem); }
+ sal_uIntPtr GetCount() const { return aArr.Count(); }
void Sort();
};
@@ -151,7 +151,7 @@ private:
//#endif // __PRIVATE
public:
ContainerSorter(Container& rNewCont): rCont(rNewCont) {}
- void DoSort(ULONG a=0, ULONG b=0xFFFFFFFF) const;
+ void DoSort(sal_uIntPtr a=0, sal_uIntPtr b=0xFFFFFFFF) const;
#ifdef This_Is_Just_For_A_Comment
Compare() muss returnieren:
-1 falls *pElem1<*pElem2
@@ -163,7 +163,7 @@ private: // damit keiner vergessen wird
virtual
void
Is1stLessThan2nd(const void* pElem1, const void* pElem2) const;
-// virtual FASTBOOL Is1stLessThan2nd(const void* pElem1, const void* pElem2) const=NULL;
+// virtual int Is1stLessThan2nd(const void* pElem1, const void* pElem2) const=NULL;
};
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -184,25 +184,25 @@ class ImpSdrHdcMerk
ImpColorMerk* pFarbMerk;
ImpClipMerk* pClipMerk;
Color* pLineColorMerk;
- USHORT nMode;
+ sal_uInt16 nMode;
public:
- ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode=SDRHDC_SAVEALL, FASTBOOL bAutoMerk=TRUE);
+ ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode=SDRHDC_SAVEALL, int bAutoMerk=sal_True);
~ImpSdrHdcMerk();
void Save(const OutputDevice& rOut);
- FASTBOOL IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; }
- void Restore(OutputDevice& rOut, USHORT nMask=SDRHDC_SAVEALL) const;
+ int IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; }
+ void Restore(OutputDevice& rOut, sal_uInt16 nMask=SDRHDC_SAVEALL) const;
};
//#endif // __PRIVATE
////////////////////////////////////////////////////////////////////////////////////////////////////
// Ein ItemSet auf Outliner- bzw. EditEngine-Items durchsuchen
-// Liefert TRUE, wenn der Set solchen Items enthaelt.
-BOOL SearchOutlinerItems(const SfxItemSet& rSet, BOOL bInklDefaults, BOOL* pbOnlyEE=NULL);
+// Liefert sal_True, wenn der Set solchen Items enthaelt.
+sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE=NULL);
// zurueck erhaelt man einen neuen WhichTable den
// man dann irgendwann mit delete platthauen muss.
-USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT nRangeEnd);
+sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd);
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -217,46 +217,46 @@ class Link;
class SVX_DLLPUBLIC SvdProgressInfo
{
private:
- ULONG nSumActionCount; // Summe aller Actions
- ULONG nSumCurAction; // Summe aller bearbeiteten Actions
+ sal_uIntPtr nSumActionCount; // Summe aller Actions
+ sal_uIntPtr nSumCurAction; // Summe aller bearbeiteten Actions
- ULONG nActionCount; // Anzahl der Actions im akt. Obj.
- ULONG nCurAction; // Anzahl bearbeiteter Act. im akt. Obj.
+ sal_uIntPtr nActionCount; // Anzahl der Actions im akt. Obj.
+ sal_uIntPtr nCurAction; // Anzahl bearbeiteter Act. im akt. Obj.
- ULONG nInsertCount; // Anzahl einzufuegender Act. im akt. Obj.
- ULONG nCurInsert; // Anzahl bereits eingefuegter Actions
+ sal_uIntPtr nInsertCount; // Anzahl einzufuegender Act. im akt. Obj.
+ sal_uIntPtr nCurInsert; // Anzahl bereits eingefuegter Actions
- ULONG nObjCount; // Anzahl der selektierten Objekte
- ULONG nCurObj; // Aktuelles Objekt
+ sal_uIntPtr nObjCount; // Anzahl der selektierten Objekte
+ sal_uIntPtr nCurObj; // Aktuelles Objekt
Link *pLink;
public:
SvdProgressInfo( Link *_pLink );
- void Init( ULONG _nSumActionCount, ULONG _nObjCount );
+ void Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount );
- BOOL SetNextObject();
+ sal_Bool SetNextObject();
- void SetActionCount( ULONG _nActionCount );
- void SetInsertCount( ULONG _nInsertCount );
+ void SetActionCount( sal_uIntPtr _nActionCount );
+ void SetInsertCount( sal_uIntPtr _nInsertCount );
- BOOL ReportActions( ULONG nAnzActions );
- BOOL ReportInserts( ULONG nAnzInserts );
+ sal_Bool ReportActions( sal_uIntPtr nAnzActions );
+ sal_Bool ReportInserts( sal_uIntPtr nAnzInserts );
- ULONG GetSumActionCount() const { return nSumActionCount; };
- ULONG GetSumCurAction() const { return nSumCurAction; };
- ULONG GetObjCount() const { return nObjCount; };
- ULONG GetCurObj() const { return nCurObj; };
+ sal_uIntPtr GetSumActionCount() const { return nSumActionCount; };
+ sal_uIntPtr GetSumCurAction() const { return nSumCurAction; };
+ sal_uIntPtr GetObjCount() const { return nObjCount; };
+ sal_uIntPtr GetCurObj() const { return nCurObj; };
- ULONG GetActionCount() const { return nActionCount; };
- ULONG GetCurAction() const { return nCurAction; };
+ sal_uIntPtr GetActionCount() const { return nActionCount; };
+ sal_uIntPtr GetCurAction() const { return nCurAction; };
- ULONG GetInsertCount() const { return nInsertCount; };
- ULONG GetCurInsert() const { return nCurInsert; };
+ sal_uIntPtr GetInsertCount() const { return nInsertCount; };
+ sal_uIntPtr GetCurInsert() const { return nCurInsert; };
void ReportError();
- BOOL ReportRescales( ULONG nAnzRescales );
+ sal_Bool ReportRescales( sal_uIntPtr nAnzRescales );
};
@@ -275,7 +275,7 @@ public:
const Link& GetLink(unsigned nNum) const { return *((Link*)(aList.GetObject(nNum))); }
void InsertLink(const Link& rLink, unsigned nPos=0xFFFF);
void RemoveLink(const Link& rLink);
- FASTBOOL HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; }
+ int HasLink(const Link& rLink) const { return FindEntry(rLink)!=0xFFFF; }
};
// Fuer die Factory in SvdObj.CXX
@@ -287,18 +287,18 @@ class AutoTimer;
class OLEObjCache : public Container
{
- ULONG nSize;
+ sal_uIntPtr nSize;
AutoTimer* pTimer;
void UnloadOnDemand();
- BOOL UnloadObj( SdrOle2Obj* pObj );
+ sal_Bool UnloadObj( SdrOle2Obj* pObj );
DECL_LINK( UnloadCheckHdl, AutoTimer* );
public:
OLEObjCache();
SVX_DLLPUBLIC ~OLEObjCache();
- void SetSize(ULONG nNewSize);
+ void SetSize(sal_uIntPtr nNewSize);
void InsertObj(SdrOle2Obj* pObj);
void RemoveObj(SdrOle2Obj* pObj);
};
@@ -315,7 +315,7 @@ public:
SdrOutliner* pOutliner;
SdrEngineDefaults* pDefaults;
ResMgr* pResMgr;
- ULONG nExchangeFormat;
+ sal_uIntPtr nExchangeFormat;
OLEObjCache aOLEObjCache;
diff --git a/svx/inc/svx/svdglev.hxx b/svx/inc/svx/svdglev.hxx
index 88cd48974f9c..efded3a48182 100644
--- a/svx/inc/svx/svdglev.hxx
+++ b/svx/inc/svx/svdglev.hxx
@@ -61,7 +61,7 @@ class SVX_DLLPUBLIC SdrGlueEditView: public SdrPolyEditView
void ImpCopyMarkedGluePoints();
typedef void (*PGlueDoFunc)(SdrGluePoint&, const SdrObject* pObj, const void*, const void*, const void*, const void*, const void*);
typedef void (*PGlueTrFunc)(Point&, const void*, const void*, const void*, const void*, const void*);
- void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL);
+ void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL);
void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL);
protected:
@@ -74,15 +74,15 @@ public:
// checken bzw. setzen/loeschen will.
// Moegliche Werte fuer nThisEsc sind z.Zt.
// SDRESC_LEFT, SDRESC_RIGHT, SDRESC_TOP und SDRESC_BOTTOM
- TRISTATE IsMarkedGluePointsEscDir(USHORT nThisEsc) const;
- void SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn);
- BOOL IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
+ TRISTATE IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const;
+ void SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bOn);
+ sal_Bool IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
// Checken/setzen, ob die Klebepunktpositionen relativ zur
- // Objektgroesse sind (Percent=TRUE) oder nicht (Percent=FALSE)
+ // Objektgroesse sind (Percent=sal_True) oder nicht (Percent=sal_False)
TRISTATE IsMarkedGluePointsPercent() const;
- void SetMarkedGluePointsPercent(BOOL bOn);
- BOOL IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
+ void SetMarkedGluePointsPercent(sal_Bool bOn);
+ sal_Bool IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
// bVert=FALSE: Horizontales Alignment checken/setzen
// SDRHORZALIGN_CENTER
@@ -94,23 +94,23 @@ public:
// SDRVERTALIGN_TOP
// SDRVERTALIGN_BOTTOM
// SDRVERTALIGN_DONTCARE (nur bei Get())
- USHORT GetMarkedGluePointsAlign(BOOL bVert) const;
- void SetMarkedGluePointsAlign(BOOL bVert, USHORT nAlign);
- BOOL IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
+ sal_uInt16 GetMarkedGluePointsAlign(sal_Bool bVert) const;
+ void SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign);
+ sal_Bool IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); }
// Alle merkierten Klebepunkte entfernen
void DeleteMarkedGluePoints();
- BOOL IsDeleteMarkedGluePointsPossible() const;
+ sal_Bool IsDeleteMarkedGluePointsPossible() const;
void MoveMarkedGluePoints (const Size& rSiz, bool bCopy=false);
void ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
void RotateMarkedGluePoints(const Point& rRef, long nWink, bool bCopy=false);
- void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, BOOL bCopy=FALSE);
- void MirrorMarkedGluePointsHorizontal(BOOL bCopy=FALSE);
- void MirrorMarkedGluePointsVertical(BOOL bCopy=FALSE);
- void ShearMarkedGluePoints(const Point& rRef, long nWink, BOOL bVShear=FALSE, BOOL bCopy=FALSE);
- void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, BOOL bVertical=FALSE, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE);
- void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE);
+ void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, sal_Bool bCopy=sal_False);
+ void MirrorMarkedGluePointsHorizontal(sal_Bool bCopy=sal_False);
+ void MirrorMarkedGluePointsVertical(sal_Bool bCopy=sal_False);
+ void ShearMarkedGluePoints(const Point& rRef, long nWink, sal_Bool bVShear=sal_False, sal_Bool bCopy=sal_False);
+ void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, sal_Bool bVertical=sal_False, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False);
+ void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False);
void AlignMarkedGluePoints(SdrHorAlign eHor, SdrVertAlign eVert);
};
diff --git a/svx/inc/svx/svdglob.hxx b/svx/inc/svx/svdglob.hxx
index 588869ff9890..1065860621db 100644
--- a/svx/inc/svx/svdglob.hxx
+++ b/svx/inc/svx/svdglob.hxx
@@ -53,7 +53,7 @@ ResMgr* ImpGetResMgr();
class SdrResId: ResId {
public:
- SdrResId(USHORT nId): ResId(nId,*ImpGetResMgr()) {}
+ SdrResId(sal_uInt16 nId): ResId(nId,*ImpGetResMgr()) {}
};
// ResourceCache fuer haeuffig benoetigte Strings
diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx
index 965aaf25225e..ed8ab7dc33b0 100644
--- a/svx/inc/svx/svdglue.hxx
+++ b/svx/inc/svx/svdglue.hxx
@@ -64,54 +64,54 @@ class SdrObject;
class SVX_DLLPUBLIC SdrGluePoint {
// Bezugspunkt ist SdrObject::GetSnapRect().Center()
// bNoPercent=FALSE: Position ist -5000..5000 (1/100)% bzw. 0..10000 (je nach Align)
- // bNoPercent=TRUE : Position ist in log Einh, rel zum Bezugspunkt
+ // bNoPercent=sal_True : Position ist in log Einh, rel zum Bezugspunkt
Point aPos;
- USHORT nEscDir;
- USHORT nId;
- USHORT nAlign;
- FASTBOOL bNoPercent:1;
- FASTBOOL bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt
- FASTBOOL bUserDefined:1; // #i38892#
+ sal_uInt16 nEscDir;
+ sal_uInt16 nId;
+ sal_uInt16 nAlign;
+ int bNoPercent:1;
+ int bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt
+ int bUserDefined:1; // #i38892#
public:
- SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=FALSE; bReallyAbsolute=FALSE; bUserDefined=TRUE; }
- SdrGluePoint(const Point& rNewPos, FASTBOOL bNewPercent=TRUE, USHORT nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=FALSE; bUserDefined=TRUE; }
+ SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=sal_False; bReallyAbsolute=sal_False; bUserDefined=sal_True; }
+ SdrGluePoint(const Point& rNewPos, int bNewPercent=sal_True, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=sal_False; bUserDefined=sal_True; }
bool operator==(const SdrGluePoint& rCmpGP) const { return aPos==rCmpGP.aPos && nEscDir==rCmpGP.nEscDir && nId==rCmpGP.nId && nAlign==rCmpGP.nAlign && bNoPercent==rCmpGP.bNoPercent && bReallyAbsolute==rCmpGP.bReallyAbsolute && bUserDefined==rCmpGP.bUserDefined; }
bool operator!=(const SdrGluePoint& rCmpGP) const { return !operator==(rCmpGP); }
const Point& GetPos() const { return aPos; }
void SetPos(const Point& rNewPos) { aPos=rNewPos; }
- USHORT GetEscDir() const { return nEscDir; }
- void SetEscDir(USHORT nNewEsc) { nEscDir=nNewEsc; }
- USHORT GetId() const { return nId; }
- void SetId(USHORT nNewId) { nId=nNewId; }
+ sal_uInt16 GetEscDir() const { return nEscDir; }
+ void SetEscDir(sal_uInt16 nNewEsc) { nEscDir=nNewEsc; }
+ sal_uInt16 GetId() const { return nId; }
+ void SetId(sal_uInt16 nNewId) { nId=nNewId; }
bool IsPercent() const { return !bNoPercent; }
- void SetPercent(FASTBOOL bOn) { bNoPercent=!bOn; }
+ void SetPercent(int bOn) { bNoPercent=!bOn; }
// Temporaer zu setzen fuer Transformationen am Bezugsobjekt
- FASTBOOL IsReallyAbsolute() const { return bReallyAbsolute; }
- void SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj);
+ int IsReallyAbsolute() const { return bReallyAbsolute; }
+ void SetReallyAbsolute(int bOn, const SdrObject& rObj);
// #i38892#
- FASTBOOL IsUserDefined() const { return bUserDefined; }
- void SetUserDefined(FASTBOOL bNew) { bUserDefined = bNew; }
+ int IsUserDefined() const { return bUserDefined; }
+ void SetUserDefined(int bNew) { bUserDefined = bNew; }
- USHORT GetAlign() const { return nAlign; }
- void SetAlign(USHORT nAlg) { nAlign=nAlg; }
- USHORT GetHorzAlign() const { return nAlign&0x00FF; }
- void SetHorzAlign(USHORT nAlg) { nAlign=(nAlign&0xFF00)|(nAlg&0x00FF); }
- USHORT GetVertAlign() const { return nAlign&0xFF00; }
- void SetVertAlign(USHORT nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); }
+ sal_uInt16 GetAlign() const { return nAlign; }
+ void SetAlign(sal_uInt16 nAlg) { nAlign=nAlg; }
+ sal_uInt16 GetHorzAlign() const { return nAlign&0x00FF; }
+ void SetHorzAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0xFF00)|(nAlg&0x00FF); }
+ sal_uInt16 GetVertAlign() const { return nAlign&0xFF00; }
+ void SetVertAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); }
void Draw(OutputDevice& rOut, const SdrObject* pObj) const;
- FASTBOOL IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const;
+ int IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const;
void Invalidate(Window& rWin, const SdrObject* pObj) const;
Point GetAbsolutePos(const SdrObject& rObj) const;
void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj);
long GetAlignAngle() const;
void SetAlignAngle(long nWink);
- long EscDirToAngle(USHORT nEsc) const;
- USHORT EscAngleToDir(long nWink) const;
+ long EscDirToAngle(sal_uInt16 nEsc) const;
+ sal_uInt16 EscAngleToDir(long nWink) const;
void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj);
void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj);
void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj);
- void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj);
+ void Shear (const Point& rRef, long nWink, double tn, int bVShear, const SdrObject* pObj);
};
#define SDRGLUEPOINT_NOTFOUND 0xFFFF
@@ -119,29 +119,29 @@ public:
class SVX_DLLPUBLIC SdrGluePointList {
Container aList;
protected:
- SdrGluePoint* GetObject(USHORT i) const { return (SdrGluePoint*)(aList.GetObject(i)); }
+ SdrGluePoint* GetObject(sal_uInt16 i) const { return (SdrGluePoint*)(aList.GetObject(i)); }
public:
SdrGluePointList(): aList(1024,4,4) {}
SdrGluePointList(const SdrGluePointList& rSrcList): aList(1024,4,4) { *this=rSrcList; }
~SdrGluePointList() { Clear(); }
void Clear();
void operator=(const SdrGluePointList& rSrcList);
- USHORT GetCount() const { return USHORT(aList.Count()); }
+ sal_uInt16 GetCount() const { return sal_uInt16(aList.Count()); }
// Beim Insert wird dem Objekt (also dem GluePoint) automatisch eine Id zugewiesen.
// ReturnCode ist der Index des neuen GluePoints in der Liste
- USHORT Insert(const SdrGluePoint& rGP);
- void Delete(USHORT nPos) { delete (SdrGluePoint*)aList.Remove(nPos); }
- SdrGluePoint& operator[](USHORT nPos) { return *GetObject(nPos); }
- const SdrGluePoint& operator[](USHORT nPos) const { return *GetObject(nPos); }
- USHORT FindGluePoint(USHORT nId) const;
- USHORT HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack=FALSE, FASTBOOL bNext=FALSE, USHORT nId0=0) const;
+ sal_uInt16 Insert(const SdrGluePoint& rGP);
+ void Delete(sal_uInt16 nPos) { delete (SdrGluePoint*)aList.Remove(nPos); }
+ SdrGluePoint& operator[](sal_uInt16 nPos) { return *GetObject(nPos); }
+ const SdrGluePoint& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); }
+ sal_uInt16 FindGluePoint(sal_uInt16 nId) const;
+ sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, int bBack=sal_False, int bNext=sal_False, sal_uInt16 nId0=0) const;
void Invalidate(Window& rWin, const SdrObject* pObj) const;
// Temporaer zu setzen fuer Transformationen am Bezugsobjekt
- void SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj);
+ void SetReallyAbsolute(int bOn, const SdrObject& rObj);
void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj);
void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj);
void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj);
- void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj);
+ void Shear (const Point& rRef, long nWink, double tn, int bVShear, const SdrObject* pObj);
};
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index f96b650d2be4..92a7071551a4 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -214,14 +214,14 @@ public:
SdrObject* GetObj() const { return pObj; }
void SetObj(SdrObject* pNewObj);
- BOOL IsSelected() const { return bSelect; }
- void SetSelected(BOOL bJa=TRUE);
+ sal_Bool IsSelected() const { return bSelect; }
+ void SetSelected(sal_Bool bJa=sal_True);
- void Set1PixMore(BOOL bJa=TRUE);
+ void Set1PixMore(sal_Bool bJa=sal_True);
void SetDrehWink(long n);
- BOOL IsCornerHdl() const { return eKind==HDL_UPLFT || eKind==HDL_UPRGT || eKind==HDL_LWLFT || eKind==HDL_LWRGT; }
- BOOL IsVertexHdl() const { return eKind==HDL_UPPER || eKind==HDL_LOWER || eKind==HDL_LEFT || eKind==HDL_RIGHT; }
+ sal_Bool IsCornerHdl() const { return eKind==HDL_UPLFT || eKind==HDL_UPRGT || eKind==HDL_LWLFT || eKind==HDL_LWRGT; }
+ sal_Bool IsVertexHdl() const { return eKind==HDL_UPPER || eKind==HDL_LOWER || eKind==HDL_LEFT || eKind==HDL_RIGHT; }
void SetObjHdlNum(sal_uInt32 nNum) { nObjHdlNum=nNum; }
sal_uInt32 GetObjHdlNum() const { return nObjHdlNum; }
@@ -232,8 +232,8 @@ public:
void SetPointNum(sal_uInt32 nNum) { nPPntNum=nNum; }
sal_uInt32 GetPointNum() const { return nPPntNum; }
- void SetPlusHdl(BOOL bOn) { bPlusHdl=bOn; }
- BOOL IsPlusHdl() const { return bPlusHdl; }
+ void SetPlusHdl(sal_Bool bOn) { bPlusHdl=bOn; }
+ sal_Bool IsPlusHdl() const { return bPlusHdl; }
void SetSourceHdlNum(sal_uInt32 nNum) { nSourceHdlNum=nNum; }
sal_uInt32 GetSourceHdlNum() const { return nSourceHdlNum; }
@@ -242,7 +242,7 @@ public:
bool IsHdlHit(const Point& rPnt) const;
// #97016# II
- virtual BOOL IsFocusHdl() const;
+ virtual sal_Bool IsFocusHdl() const;
void SetMoveOutside( bool bMoveOutside );
@@ -286,13 +286,13 @@ private:
SVX_DLLPRIVATE void CallColorChangeLink();
public:
- SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), BOOL bLum = FALSE);
+ SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), sal_Bool bLum = sal_False);
virtual ~SdrHdlColor();
- BOOL IsUseLuminance() const { return bUseLuminance; }
+ sal_Bool IsUseLuminance() const { return bUseLuminance; }
Color GetColor() const { return aMarkerColor; }
- void SetColor(Color aNew, BOOL bCallLink = FALSE);
+ void SetColor(Color aNew, sal_Bool bCallLink = sal_False);
const Size& GetSize() const { return aMarkerSize; }
void SetSize(const Size& rNew);
@@ -324,10 +324,10 @@ private:
virtual void CreateB2dIAObject();
public:
- SdrHdlGradient(const Point& rRef1, const Point& rRef2, BOOL bGrad = TRUE);
+ SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad = sal_True);
virtual ~SdrHdlGradient();
- BOOL IsGradient() const { return bGradient; }
+ sal_Bool IsGradient() const { return bGradient; }
// set the associated color handles
void SetColorHandles(SdrHdlColor* pL1, SdrHdlColor* pL2) { pColHdl1 = pL1; pColHdl2 = pL2; }
@@ -341,13 +341,13 @@ public:
DECL_LINK(ColorChangeHdl, SdrHdl*);
// transformation call, create gradient from this handle
- void FromIAOToItem(SdrObject* pObj, BOOL bSetItemOnObject, BOOL bUndo);
+ void FromIAOToItem(SdrObject* pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo);
// selection flags for interaction
- BOOL IsMoveSingleHandle() const { return bMoveSingleHandle; }
- void SetMoveSingleHandle(BOOL bNew) { bMoveSingleHandle = bNew; }
- BOOL IsMoveFirstHandle() const { return bMoveFirstHandle; }
- void SetMoveFirstHandle(BOOL bNew) { bMoveFirstHandle = bNew; }
+ sal_Bool IsMoveSingleHandle() const { return bMoveSingleHandle; }
+ void SetMoveSingleHandle(sal_Bool bNew) { bMoveSingleHandle = bNew; }
+ sal_Bool IsMoveFirstHandle() const { return bMoveFirstHandle; }
+ void SetMoveFirstHandle(sal_Bool bNew) { bMoveFirstHandle = bNew; }
};
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -414,7 +414,7 @@ public:
void SetLineCode(SdrEdgeLineCode eCode);
SdrEdgeLineCode GetLineCode() const { return eLineCode; }
- BOOL IsHorzDrag() const;
+ sal_Bool IsHorzDrag() const;
virtual Pointer GetPointer() const;
};
@@ -455,10 +455,10 @@ class ImplHdlListData;
class SVX_DLLPUBLIC SdrHdlList
{
protected:
- ULONG mnFocusIndex;
+ sal_uIntPtr mnFocusIndex;
SdrMarkView* pView;
Container aList;
- USHORT nHdlSize;
+ sal_uInt16 nHdlSize;
unsigned bRotateShear : 1;
unsigned bDistortShear : 1;
@@ -468,8 +468,8 @@ protected:
private:
SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&): aList(1024,64,64) {}
SVX_DLLPRIVATE void operator=(const SdrHdlList&) {}
- SVX_DLLPRIVATE BOOL operator==(const SdrHdlList&) const { return FALSE; }
- SVX_DLLPRIVATE BOOL operator!=(const SdrHdlList&) const { return FALSE; }
+ SVX_DLLPRIVATE sal_Bool operator==(const SdrHdlList&) const { return sal_False; }
+ SVX_DLLPRIVATE sal_Bool operator!=(const SdrHdlList&) const { return sal_False; }
public:
SdrHdlList(SdrMarkView* pV);
@@ -489,28 +489,28 @@ public:
// 2.Level PageView (Pointer)
// 3.Level Position (x+y)
void Sort();
- ULONG GetHdlCount() const { return aList.Count(); }
- SdrHdl* GetHdl(ULONG nNum) const { return (SdrHdl*)(aList.GetObject(nNum)); }
- ULONG GetHdlNum(const SdrHdl* pHdl) const;
- void SetHdlSize(USHORT nSiz);
- USHORT GetHdlSize() const { return nHdlSize; }
- void SetMoveOutside(BOOL bOn);
- BOOL IsMoveOutside() const { return bMoveOutside; }
- void SetRotateShear(BOOL bOn);
- BOOL IsRotateShear() const { return bRotateShear; }
- void SetDistortShear(BOOL bOn);
- BOOL IsDistortShear() const { return bDistortShear; }
- void SetFineHdl(BOOL bOn);
- BOOL IsFineHdl() const { return bFineHandles; }
+ sal_uIntPtr GetHdlCount() const { return aList.Count(); }
+ SdrHdl* GetHdl(sal_uIntPtr nNum) const { return (SdrHdl*)(aList.GetObject(nNum)); }
+ sal_uIntPtr GetHdlNum(const SdrHdl* pHdl) const;
+ void SetHdlSize(sal_uInt16 nSiz);
+ sal_uInt16 GetHdlSize() const { return nHdlSize; }
+ void SetMoveOutside(sal_Bool bOn);
+ sal_Bool IsMoveOutside() const { return bMoveOutside; }
+ void SetRotateShear(sal_Bool bOn);
+ sal_Bool IsRotateShear() const { return bRotateShear; }
+ void SetDistortShear(sal_Bool bOn);
+ sal_Bool IsDistortShear() const { return bDistortShear; }
+ void SetFineHdl(sal_Bool bOn);
+ sal_Bool IsFineHdl() const { return bFineHandles; }
// AddHdl uebernimmt das Handle in sein Eigentum. Es muss
// also auf dem Heap stehen, da Clear() ein delete macht.
- void AddHdl(SdrHdl* pHdl, BOOL bAtBegin=FALSE);
- SdrHdl* RemoveHdl(ULONG nNum);
+ void AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin=sal_False);
+ SdrHdl* RemoveHdl(sal_uIntPtr nNum);
// Zuletzt eingefuegte Handles werden am ehesten getroffen
// (wenn Handles uebereinander liegen).
- SdrHdl* IsHdlListHit(const Point& rPnt, BOOL bBack=FALSE, BOOL bNext=FALSE, SdrHdl* pHdl0=NULL) const;
+ SdrHdl* IsHdlListHit(const Point& rPnt, sal_Bool bBack=sal_False, sal_Bool bNext=sal_False, SdrHdl* pHdl0=NULL) const;
SdrHdl* GetHdl(SdrHdlKind eKind1) const;
};
diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx
index 1d5677ec95f6..dd6698110f67 100644
--- a/svx/inc/svx/svdhlpln.hxx
+++ b/svx/inc/svx/svdhlpln.hxx
@@ -68,7 +68,7 @@ public:
const Point& GetPos() const { return aPos; }
Pointer GetPointer() const;
- FASTBOOL IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const;
+ int IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const;
// OutputDevice wird benoetigt, da Fangpunkte eine feste Pixelgroesse haben
Rectangle GetBoundRect(const OutputDevice& rOut) const;
@@ -83,7 +83,7 @@ public:
class SVX_DLLPUBLIC SdrHelpLineList {
Container aList;
protected:
- SdrHelpLine* GetObject(USHORT i) const { return (SdrHelpLine*)(aList.GetObject(i)); }
+ SdrHelpLine* GetObject(sal_uInt16 i) const { return (SdrHelpLine*)(aList.GetObject(i)); }
public:
SdrHelpLineList(): aList(1024,4,4) {}
SdrHelpLineList(const SdrHelpLineList& rSrcList): aList(1024,4,4) { *this=rSrcList; }
@@ -92,13 +92,13 @@ public:
void operator=(const SdrHelpLineList& rSrcList);
bool operator==(const SdrHelpLineList& rCmp) const;
bool operator!=(const SdrHelpLineList& rCmp) const { return !operator==(rCmp); }
- USHORT GetCount() const { return USHORT(aList.Count()); }
- void Insert(const SdrHelpLine& rHL, USHORT nPos=0xFFFF) { aList.Insert(new SdrHelpLine(rHL),nPos); }
- void Delete(USHORT nPos) { delete (SdrHelpLine*)aList.Remove(nPos); } // #i24900#
- void Move(USHORT nPos, USHORT nNewPos) { aList.Insert(aList.Remove(nPos),nNewPos); }
- SdrHelpLine& operator[](USHORT nPos) { return *GetObject(nPos); }
- const SdrHelpLine& operator[](USHORT nPos) const { return *GetObject(nPos); }
- USHORT HitTest(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const;
+ sal_uInt16 GetCount() const { return sal_uInt16(aList.Count()); }
+ void Insert(const SdrHelpLine& rHL, sal_uInt16 nPos=0xFFFF) { aList.Insert(new SdrHelpLine(rHL),nPos); }
+ void Delete(sal_uInt16 nPos) { delete (SdrHelpLine*)aList.Remove(nPos); } // #i24900#
+ void Move(sal_uInt16 nPos, sal_uInt16 nNewPos) { aList.Insert(aList.Remove(nPos),nNewPos); }
+ SdrHelpLine& operator[](sal_uInt16 nPos) { return *GetObject(nPos); }
+ const SdrHelpLine& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); }
+ sal_uInt16 HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const;
};
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/inc/svx/svditer.hxx b/svx/inc/svx/svditer.hxx
index 8ab6c32ea061..328e673dae27 100644
--- a/svx/inc/svx/svditer.hxx
+++ b/svx/inc/svx/svditer.hxx
@@ -46,32 +46,32 @@ class SVX_DLLPUBLIC SdrObjListIter
{
List maObjList;
sal_uInt32 mnIndex;
- BOOL mbReverse;
+ sal_Bool mbReverse;
- void ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, BOOL bUseZOrder);
+ void ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bUseZOrder);
void ImpProcessMarkList(const SdrMarkList& rMarkList, SdrIterMode eMode);
- void ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, BOOL bUseZOrder);
+ void ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, sal_Bool bUseZOrder);
public:
- SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE);
+ SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False);
/** This variant lets the user choose the order in which to travel over
the objects.
@param bUseZOrder
- When <TRUE/> then the z-order defines the order of iteration.
+ When <sal_True/> then the z-order defines the order of iteration.
Otherwise the navigation position as returned by
SdrObject::GetNavigationPosition() is used.
*/
- SdrObjListIter(const SdrObjList& rObjList, BOOL bUseZOrder, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE);
+ SdrObjListIter(const SdrObjList& rObjList, sal_Bool bUseZOrder, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False);
/* SJ: the following function can now be used with every
SdrObject and is no longer limited to group objects */
- SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE);
+ SdrObjListIter(const SdrObject& rObj, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False);
/** Iterates over a list of marked objects received from the SdrMarkView. */
- SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS, BOOL bReverse = FALSE);
+ SdrObjListIter(const SdrMarkList& rMarkList, SdrIterMode eMode = IM_DEEPNOGROUPS, sal_Bool bReverse = sal_False);
void Reset() { mnIndex = (mbReverse ? maObjList.Count() : 0L); }
- BOOL IsMore() const { return (mbReverse ? mnIndex != 0 : ( mnIndex < maObjList.Count())); }
+ sal_Bool IsMore() const { return (mbReverse ? mnIndex != 0 : ( mnIndex < maObjList.Count())); }
SdrObject* Next() { return (SdrObject*)maObjList.GetObject(mbReverse ? --mnIndex : mnIndex++); }
sal_uInt32 Count() { return maObjList.Count(); }
diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx
index 492df9a12212..db7caa7ce134 100644
--- a/svx/inc/svx/svdlayer.hxx
+++ b/svx/inc/svx/svdlayer.hxx
@@ -44,7 +44,7 @@ protected:
String maTitle;
String maDescription;
SdrModel* pModel; // zum Broadcasten
- UINT16 nType; // 0=Userdefined,1=Standardlayer
+ sal_uInt16 nType; // 0=Userdefined,1=Standardlayer
SdrLayerID nID;
protected:
SdrLayer(SdrLayerID nNewID, const String& rNewName) { nID=nNewID; aName=rNewName; nType=0; pModel=NULL; }
@@ -69,8 +69,8 @@ public:
// Einem SdrLayer kann man sagen dass er ein (der) Standardlayer sein soll.
// Es wird dann laenderspeziefisch der passende Name gesetzt. SetName()
// setzt das Flag "StandardLayer" ggf. zurueck auf "Userdefined".
- void SetStandardLayer(FASTBOOL bStd=TRUE);
- FASTBOOL IsStandardLayer() const { return nType==1; }
+ void SetStandardLayer(int bStd=sal_True);
+ int IsStandardLayer() const { return nType==1; }
};
// Beim Aendern von Layerdaten muss man derzeit
@@ -105,30 +105,30 @@ public:
void SetParent(SdrLayerAdmin* pNewParent) { pParent=pNewParent; }
void SetModel(SdrModel* pNewModel);
SdrModel* GetModel() const { return pModel; }
- void InsertLayer(SdrLayer* pLayer, USHORT nPos=0xFFFF) { aLayer.Insert(pLayer,nPos); pLayer->SetModel(pModel); Broadcast(); }
- SdrLayer* RemoveLayer(USHORT nPos);
+ void InsertLayer(SdrLayer* pLayer, sal_uInt16 nPos=0xFFFF) { aLayer.Insert(pLayer,nPos); pLayer->SetModel(pModel); Broadcast(); }
+ SdrLayer* RemoveLayer(sal_uInt16 nPos);
// Alle Layer loeschen
void ClearLayer();
// Neuer Layer wird angelegt und eingefuegt
- SdrLayer* NewLayer(const String& rName, USHORT nPos=0xFFFF);
+ SdrLayer* NewLayer(const String& rName, sal_uInt16 nPos=0xFFFF);
void DeleteLayer(SdrLayer* pLayer) { aLayer.Remove(pLayer); delete pLayer; Broadcast(); }
- void MoveLayer(SdrLayer* pLayer, USHORT nNewPos=0xFFFF);
- SdrLayer* MoveLayer(USHORT nPos, USHORT nNewPos);
+ void MoveLayer(SdrLayer* pLayer, sal_uInt16 nNewPos=0xFFFF);
+ SdrLayer* MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos);
// Neuer Layer, Name wird aus der Resource geholt
- SdrLayer* NewStandardLayer(USHORT nPos=0xFFFF);
+ SdrLayer* NewStandardLayer(sal_uInt16 nPos=0xFFFF);
// Iterieren ueber alle Layer
- USHORT GetLayerCount() const { return USHORT(aLayer.Count()); }
- SdrLayer* GetLayer(USHORT i) { return (SdrLayer*)(aLayer.GetObject(i)); }
- const SdrLayer* GetLayer(USHORT i) const { return (SdrLayer*)(aLayer.GetObject(i)); }
+ sal_uInt16 GetLayerCount() const { return sal_uInt16(aLayer.Count()); }
+ SdrLayer* GetLayer(sal_uInt16 i) { return (SdrLayer*)(aLayer.GetObject(i)); }
+ const SdrLayer* GetLayer(sal_uInt16 i) const { return (SdrLayer*)(aLayer.GetObject(i)); }
- USHORT GetLayerPos(SdrLayer* pLayer) const;
+ sal_uInt16 GetLayerPos(SdrLayer* pLayer) const;
- SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); }
- const SdrLayer* GetLayer(const String& rName, FASTBOOL bInherited) const;
- SdrLayerID GetLayerID(const String& rName, FASTBOOL bInherited) const;
- SdrLayer* GetLayerPerID(USHORT nID) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); }
- const SdrLayer* GetLayerPerID(USHORT nID) const;
+ SdrLayer* GetLayer(const String& rName, int bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); }
+ const SdrLayer* GetLayer(const String& rName, int bInherited) const;
+ SdrLayerID GetLayerID(const String& rName, int bInherited) const;
+ SdrLayer* GetLayerPerID(sal_uInt16 nID) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); }
+ const SdrLayer* GetLayerPerID(sal_uInt16 nID) const;
void SetControlLayerName(const String& rNewName) { aControlLayerName=rNewName; }
const String& GetControlLayerName() const { return aControlLayerName; }
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index b1bb7d74887f..28307b6f85b2 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -166,15 +166,15 @@ public:
////////////////////////////////////////////////////////////////////////////////////////////////////
// Flag um nach dem Laden des Pools Aufzuraeumen (d.h. die RefCounts
-// neu zu bestimmen und unbenutztes wegzuwerfen). FALSE == aktiv
-#define LOADREFCOUNTS (FALSE)
+// neu zu bestimmen und unbenutztes wegzuwerfen). sal_False == aktiv
+#define LOADREFCOUNTS (sal_False)
struct SdrDocumentStreamInfo
{
- FASTBOOL mbDeleteAfterUse;
+ int mbDeleteAfterUse;
String maUserData;
com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxStorageRef;
- BOOL mbDummy1 : 1;
+ sal_Bool mbDummy1 : 1;
};
struct SdrModelImpl;
@@ -196,50 +196,50 @@ protected:
String aUIUnitStr; // see above
Fraction aUIUnitFact; // see above
int nUIUnitKomma; // see above
- FASTBOOL bUIOnlyKomma; // see above
+ int bUIOnlyKomma; // see above
SdrLayerAdmin* pLayerAdmin;
SfxItemPool* pItemPool;
- FASTBOOL bMyPool; // zum Aufraeumen von pMyPool ab 303a
+ int bMyPool; // zum Aufraeumen von pMyPool ab 303a
comphelper::IEmbeddedHelper*
m_pEmbeddedHelper; // helper for embedded objects to get rid of the SfxObjectShell
SdrOutliner* pDrawOutliner; // ein Outliner zur Textausgabe
SdrOutliner* pHitTestOutliner;// ein Outliner fuer den HitTest
- ULONG nDefTextHgt; // Default Texthoehe in logischen Einheiten
+ sal_uIntPtr nDefTextHgt; // Default Texthoehe in logischen Einheiten
OutputDevice* pRefOutDev; // ReferenzDevice fuer die EditEngine
- ULONG nProgressAkt; // fuer den
- ULONG nProgressMax; // ProgressBar-
- ULONG nProgressOfs; // -Handler
+ sal_uIntPtr nProgressAkt; // fuer den
+ sal_uIntPtr nProgressMax; // ProgressBar-
+ sal_uIntPtr nProgressOfs; // -Handler
rtl::Reference< SfxStyleSheetBasePool > mxStyleSheetPool;
SfxStyleSheet* pDefaultStyleSheet;
sfx2::LinkManager* pLinkManager; // LinkManager
Container* pUndoStack;
Container* pRedoStack;
SdrUndoGroup* pAktUndoGroup; // Fuer mehrstufige
- USHORT nUndoLevel; // Undo-Klammerung
+ sal_uInt16 nUndoLevel; // Undo-Klammerung
bool mbUndoEnabled; // If false no undo is recorded or we are during the execution of an undo action
- USHORT nProgressPercent; // fuer den ProgressBar-Handler
- USHORT nLoadVersion; // Versionsnummer der geladenen Datei
- FASTBOOL bExtColorTable; // Keinen eigenen ColorTable
+ sal_uInt16 nProgressPercent; // fuer den ProgressBar-Handler
+ sal_uInt16 nLoadVersion; // Versionsnummer der geladenen Datei
+ int bExtColorTable; // Keinen eigenen ColorTable
sal_Bool mbChanged;
- FASTBOOL bInfoChanged;
- FASTBOOL bPagNumsDirty;
- FASTBOOL bMPgNumsDirty;
- FASTBOOL bPageNotValid; // TRUE=Doc ist nur ObjektTraeger. Page ist nicht gueltig.
- FASTBOOL bSavePortable; // Metafiles portabel speichern
- FASTBOOL bNoBitmapCaching; // Bitmaps fuer Screenoutput cachen
- FASTBOOL bReadOnly;
- FASTBOOL bTransparentTextFrames;
- FASTBOOL bSaveCompressed;
- FASTBOOL bSwapGraphics;
- FASTBOOL bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode
- FASTBOOL bSaveOLEPreview; // save preview metafile of OLE objects
- UINT16 nStreamCompressMode; // Komprimiert schreiben?
- UINT16 nStreamNumberFormat;
- UINT16 nDefaultTabulator;
- UINT32 nMaxUndoCount;
- FASTBOOL bSaveNative;
- BOOL bStarDrawPreviewMode;
+ int bInfoChanged;
+ int bPagNumsDirty;
+ int bMPgNumsDirty;
+ int bPageNotValid; // sal_True=Doc ist nur ObjektTraeger. Page ist nicht gueltig.
+ int bSavePortable; // Metafiles portabel speichern
+ int bNoBitmapCaching; // Bitmaps fuer Screenoutput cachen
+ int bReadOnly;
+ int bTransparentTextFrames;
+ int bSaveCompressed;
+ int bSwapGraphics;
+ int bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode
+ int bSaveOLEPreview; // save preview metafile of OLE objects
+ sal_uInt16 nStreamCompressMode; // Komprimiert schreiben?
+ sal_uInt16 nStreamNumberFormat;
+ sal_uInt16 nDefaultTabulator;
+ sal_uInt32 nMaxUndoCount;
+ int bSaveNative;
+ sal_Bool bStarDrawPreviewMode;
//////////////////////////////////////////////////////////////////////////////
@@ -266,23 +266,23 @@ public:
bool IsAllowShapePropertyChangeListener() const;
void SetAllowShapePropertyChangeListener( bool bAllow );
- UINT16 nStarDrawPreviewMasterPageNum;
+ sal_uInt16 nStarDrawPreviewMasterPageNum;
// Reserven fuer kompatible Erweiterungen
//-/ SfxItemPool* pUndoItemPool;
SotStorage* pModelStorage;
SvxForbiddenCharactersTable* mpForbiddenCharactersTable;
- ULONG nSwapGraphicsMode;
+ sal_uIntPtr nSwapGraphicsMode;
SdrOutlinerCache* mpOutlinerCache;
SdrModelImpl* mpImpl;
- UINT16 mnCharCompressType;
- UINT16 mnHandoutPageCount;
- UINT16 nReserveUInt6;
- UINT16 nReserveUInt7;
- FASTBOOL mbModelLocked;
- FASTBOOL mbKernAsianPunctuation;
- FASTBOOL mbAddExtLeading;
- FASTBOOL mbInDestruction;
+ sal_uInt16 mnCharCompressType;
+ sal_uInt16 mnHandoutPageCount;
+ sal_uInt16 nReserveUInt6;
+ sal_uInt16 nReserveUInt7;
+ int mbModelLocked;
+ int mbKernAsianPunctuation;
+ int mbAddExtLeading;
+ int mbInDestruction;
// Zeiger auf Paletten, Listen und Tabellen
XColorTable* pColorTable;
@@ -299,8 +299,8 @@ public:
public:
const SvNumberFormatter& GetNumberFormatter() const;
- UINT16 getHandoutPageCount() const { return mnHandoutPageCount; }
- void setHandoutPageCount( UINT16 nHandoutPageCount ) { mnHandoutPageCount = nHandoutPageCount; }
+ sal_uInt16 getHandoutPageCount() const { return mnHandoutPageCount; }
+ void setHandoutPageCount( sal_uInt16 nHandoutPageCount ) { mnHandoutPageCount = nHandoutPageCount; }
protected:
@@ -310,11 +310,11 @@ private:
// Nicht implementiert:
SVX_DLLPRIVATE SdrModel(const SdrModel& rSrcModel);
SVX_DLLPRIVATE void operator=(const SdrModel& rSrcModel);
- SVX_DLLPRIVATE FASTBOOL operator==(const SdrModel& rCmpModel) const;
+ SVX_DLLPRIVATE int operator==(const SdrModel& rCmpModel) const;
//#if 0 // _SOLAR__PRIVATE
SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo);
SVX_DLLPRIVATE void ImpSetUIUnit();
- SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit = FALSE );
+ SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit = sal_False );
SVX_DLLPRIVATE void ImpReformatAllTextObjects();
SVX_DLLPRIVATE void ImpReformatAllEdgeObjects(); // #103122#
SVX_DLLPRIVATE void ImpCreateTables();
@@ -328,8 +328,8 @@ private:
public:
//#if 0 // _SOLAR__PRIVATE
- FASTBOOL IsPasteResize() const { return bPasteResize; }
- void SetPasteResize(FASTBOOL bOn) { bPasteResize=bOn; }
+ int IsPasteResize() const { return bPasteResize; }
+ void SetPasteResize(int bOn) { bPasteResize=bOn; }
//#endif // __PRIVATE
TYPEINFO();
// Steckt man hier seinen eigenen Pool rein, so wird die Klasse auch
@@ -345,15 +345,15 @@ public:
// Wahl des Pools.
SdrModel(SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
SdrModel(const String& rPath, SfxItemPool* pPool=NULL, ::comphelper::IEmbeddedHelper* pPers=NULL, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
- SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
- SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
+ SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, int bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
+ SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, int bUseExtColorTable, sal_Bool bLoadRefCounts = LOADREFCOUNTS);
virtual ~SdrModel();
void ClearModel(sal_Bool bCalledFromDestructor);
// Hier kann man erfragen, ob das Model gerade eingrstreamt wird
- FASTBOOL IsLoading() const { return sal_False /*BFS01 bLoading */; }
+ int IsLoading() const { return sal_False /*BFS01 bLoading */; }
// Muss z.B. ueberladen werden, um das Swappen/LoadOnDemand von Grafiken
- // zu ermoeglichen. Wird rbDeleteAfterUse auf TRUE gesetzt, so wird
+ // zu ermoeglichen. Wird rbDeleteAfterUse auf sal_True gesetzt, so wird
// die SvStream-Instanz vom Aufrufer nach Gebrauch destruiert.
// Wenn diese Methode NULL liefert, wird zum Swappen eine temporaere
// Datei angelegt.
@@ -364,7 +364,7 @@ public:
void BurnInStyleSheetAttributes();
// Wer sich von SdrPage ableitet muss sich auch von SdrModel ableiten
// und diese beiden VM AllocPage() und AllocModel() ueberladen...
- virtual SdrPage* AllocPage(FASTBOOL bMasterPage);
+ virtual SdrPage* AllocPage(int bMasterPage);
virtual SdrModel* AllocModel() const;
// Aenderungen an den Layern setzen das Modified-Flag und broadcasten am Model!
@@ -385,7 +385,7 @@ public:
const SdrTextObj* GetFormattingTextObj() const;
// Die TextDefaults (Font,Hoehe,Farbe) in ein Set putten
void SetTextDefaults() const;
- static void SetTextDefaults( SfxItemPool* pItemPool, ULONG nDefTextHgt );
+ static void SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt );
// ReferenzDevice fuer die EditEngine
void SetRefDevice(OutputDevice* pDev);
@@ -393,11 +393,11 @@ public:
// Wenn ein neuer MapMode am RefDevice gesetzt wird o.ae.
void RefDeviceChanged(); // noch nicht implementiert
// Default-Schrifthoehe in logischen Einheiten
- void SetDefaultFontHeight(ULONG nVal);
- ULONG GetDefaultFontHeight() const { return nDefTextHgt; }
+ void SetDefaultFontHeight(sal_uIntPtr nVal);
+ sal_uIntPtr GetDefaultFontHeight() const { return nDefTextHgt; }
// Default-Tabulatorweite fuer die EditEngine
- void SetDefaultTabulator(USHORT nVal);
- USHORT GetDefaultTabulator() const { return nDefaultTabulator; }
+ void SetDefaultTabulator(sal_uInt16 nVal);
+ sal_uInt16 GetDefaultTabulator() const { return nDefaultTabulator; }
// Der DefaultStyleSheet wird jedem Zeichenobjekt verbraten das in diesem
// Model eingefuegt wird und kein StyleSheet gesetzt hat.
@@ -449,23 +449,23 @@ public:
const Fraction& GetUIUnitFact() const { return aUIUnitFact; }
const String& GetUIUnitStr() const { return aUIUnitStr; }
int GetUIUnitKomma() const { return nUIUnitKomma; }
- FASTBOOL IsUIOnlyKomma() const { return bUIOnlyKomma; }
+ int IsUIOnlyKomma() const { return bUIOnlyKomma; }
static void TakeUnitStr(FieldUnit eUnit, String& rStr);
- void TakeMetricStr(long nVal, String& rStr, FASTBOOL bNoUnitChars=FALSE, sal_Int32 nNumDigits = -1) const;
- void TakeWinkStr(long nWink, String& rStr, FASTBOOL bNoDegChar=FALSE) const;
- void TakePercentStr(const Fraction& rVal, String& rStr, FASTBOOL bNoPercentChar=FALSE) const;
+ void TakeMetricStr(long nVal, String& rStr, int bNoUnitChars=sal_False, sal_Int32 nNumDigits = -1) const;
+ void TakeWinkStr(long nWink, String& rStr, int bNoDegChar=sal_False) const;
+ void TakePercentStr(const Fraction& rVal, String& rStr, int bNoPercentChar=sal_False) const;
// RecalcPageNums wird idR. nur von der Page gerufen.
- FASTBOOL IsPagNumsDirty() const { return bPagNumsDirty; };
- FASTBOOL IsMPgNumsDirty() const { return bMPgNumsDirty; };
- void RecalcPageNums(FASTBOOL bMaster);
+ int IsPagNumsDirty() const { return bPagNumsDirty; };
+ int IsMPgNumsDirty() const { return bMPgNumsDirty; };
+ void RecalcPageNums(int bMaster);
// Nach dem Insert gehoert die Page dem SdrModel.
- virtual void InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF);
- virtual void DeletePage(USHORT nPgNum);
+ virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
+ virtual void DeletePage(sal_uInt16 nPgNum);
// Remove bedeutet Eigentumsuebereignung an den Aufrufer (Gegenteil von Insert)
- virtual SdrPage* RemovePage(USHORT nPgNum);
- virtual void MovePage(USHORT nPgNum, USHORT nNewPos);
+ virtual SdrPage* RemovePage(sal_uInt16 nPgNum);
+ virtual void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos);
const SdrPage* GetPage(sal_uInt16 nPgNum) const;
SdrPage* GetPage(sal_uInt16 nPgNum);
sal_uInt16 GetPageCount() const;
@@ -473,11 +473,11 @@ public:
virtual void PageListChanged();
// Masterpages
- virtual void InsertMasterPage(SdrPage* pPage, USHORT nPos=0xFFFF);
- virtual void DeleteMasterPage(USHORT nPgNum);
+ virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF);
+ virtual void DeleteMasterPage(sal_uInt16 nPgNum);
// Remove bedeutet Eigentumsuebereignung an den Aufrufer (Gegenteil von Insert)
- virtual SdrPage* RemoveMasterPage(USHORT nPgNum);
- virtual void MoveMasterPage(USHORT nPgNum, USHORT nNewPos);
+ virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum);
+ virtual void MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos);
const SdrPage* GetMasterPage(sal_uInt16 nPgNum) const;
SdrPage* GetMasterPage(sal_uInt16 nPgNum);
sal_uInt16 GetMasterPageCount() const;
@@ -493,30 +493,30 @@ public:
// PageNotValid bedeutet, dass das Model lediglich Objekte traegt die zwar
// auf einer Page verankert sind, die Page aber nicht gueltig ist. Diese
// Kennzeichnung wird fuers Clipboard/Drag&Drop benoetigt.
- FASTBOOL IsPageNotValid() const { return bPageNotValid; }
- void SetPageNotValid(FASTBOOL bJa=TRUE) { bPageNotValid=bJa; }
+ int IsPageNotValid() const { return bPageNotValid; }
+ void SetPageNotValid(int bJa=sal_True) { bPageNotValid=bJa; }
- // Schaltet man dieses Flag auf TRUE, so werden Grafikobjekte
+ // Schaltet man dieses Flag auf sal_True, so werden Grafikobjekte
// portabel gespeichert. Es findet dann beim Speichern ggf.
// eine implizite Wandlung von Metafiles statt.
// Default=FALSE. Flag ist nicht persistent.
- FASTBOOL IsSavePortable() const { return bSavePortable; }
- void SetSavePortable(FASTBOOL bJa=TRUE) { bSavePortable=bJa; }
+ int IsSavePortable() const { return bSavePortable; }
+ void SetSavePortable(int bJa=sal_True) { bSavePortable=bJa; }
- // Schaltet man dieses Flag auf TRUE, so werden
+ // Schaltet man dieses Flag auf sal_True, so werden
// Pixelobjekte (stark) komprimiert gespeichert.
// Default=FALSE. Flag ist nicht persistent.
- FASTBOOL IsSaveCompressed() const { return bSaveCompressed; }
- void SetSaveCompressed(FASTBOOL bJa=TRUE) { bSaveCompressed=bJa; }
+ int IsSaveCompressed() const { return bSaveCompressed; }
+ void SetSaveCompressed(int bJa=sal_True) { bSaveCompressed=bJa; }
- // Schaltet man dieses Flag auf TRUE, so werden
+ // Schaltet man dieses Flag auf sal_True, so werden
// Grafikobjekte mit gesetztem Native-Link
// native gespeichert.
// Default=FALSE. Flag ist nicht persistent.
- FASTBOOL IsSaveNative() const { return bSaveNative; }
- void SetSaveNative(FASTBOOL bJa=TRUE) { bSaveNative=bJa; }
+ int IsSaveNative() const { return bSaveNative; }
+ void SetSaveNative(int bJa=sal_True) { bSaveNative=bJa; }
- // Schaltet man dieses Flag auf TRUE, so werden die Grafiken
+ // Schaltet man dieses Flag auf sal_True, so werden die Grafiken
// von Grafikobjekten:
// - beim Laden eines Dokuments nicht sofort mitgeladen,
// sondern erst wenn sie gebraucht (z.B. angezeigt) werden.
@@ -525,13 +525,13 @@ public:
// Damit das funktioniert, muss die virtuelle Methode
// GetDocumentStream() ueberladen werden.
// Default=FALSE. Flag ist nicht persistent.
- FASTBOOL IsSwapGraphics() const { return bSwapGraphics; }
- void SetSwapGraphics(FASTBOOL bJa=TRUE);
- void SetSwapGraphicsMode(ULONG nMode) { nSwapGraphicsMode = nMode; }
- ULONG GetSwapGraphicsMode() const { return nSwapGraphicsMode; }
+ int IsSwapGraphics() const { return bSwapGraphics; }
+ void SetSwapGraphics(int bJa=sal_True);
+ void SetSwapGraphicsMode(sal_uIntPtr nMode) { nSwapGraphicsMode = nMode; }
+ sal_uIntPtr GetSwapGraphicsMode() const { return nSwapGraphicsMode; }
- FASTBOOL IsSaveOLEPreview() const { return bSaveOLEPreview; }
- void SetSaveOLEPreview( FASTBOOL bSet) { bSaveOLEPreview = bSet; }
+ int IsSaveOLEPreview() const { return bSaveOLEPreview; }
+ void SetSaveOLEPreview( int bSet) { bSaveOLEPreview = bSet; }
// Damit die Bildschirmausgabe von Bitmaps (insbesondere bei gedrehten)
// etwas schneller wird, werden sie gecachet. Diesen Cache kann man mit
@@ -540,49 +540,49 @@ public:
// in's Undo, so wird der Cache fuer dieses Objekt sofort ausgeschaltet
// (Speicher sparen).
// Default=Cache eingeschaltet. Flag ist nicht persistent.
- FASTBOOL IsBitmapCaching() const { return !bNoBitmapCaching; }
- void SetBitmapCaching(FASTBOOL bJa=TRUE) { bNoBitmapCaching=!bJa; }
+ int IsBitmapCaching() const { return !bNoBitmapCaching; }
+ void SetBitmapCaching(int bJa=sal_True) { bNoBitmapCaching=!bJa; }
- // Defaultmaessig (FALSE) kann man Textrahmen ohne Fuellung durch
+ // Defaultmaessig (sal_False) kann man Textrahmen ohne Fuellung durch
// Mausklick selektieren. Nach Aktivierung dieses Flags trifft man sie
// nur noch in dem Bereich, wo sich auch tatsaechlich Text befindet.
- FASTBOOL IsPickThroughTransparentTextFrames() const { return bTransparentTextFrames; }
- void SetPickThroughTransparentTextFrames(FASTBOOL bOn) { bTransparentTextFrames=bOn; }
+ int IsPickThroughTransparentTextFrames() const { return bTransparentTextFrames; }
+ void SetPickThroughTransparentTextFrames(int bOn) { bTransparentTextFrames=bOn; }
// Darf denn das Model ueberhaupt veraendert werden?
// Wird nur von den Possibility-Methoden der View ausgewerdet.
// Direkte Manipulationen am Model, ... berueksichtigen dieses Flag nicht.
// Sollte ueberladen werden und entsprechend des ReadOnly-Status des Files
- // TRUE oder FALSE liefern (Methode wird oeffters gerufen, also ein Flag
+ // sal_True oder sal_False liefern (Methode wird oeffters gerufen, also ein Flag
// verwenden!).
- virtual FASTBOOL IsReadOnly() const;
- virtual void SetReadOnly(FASTBOOL bYes);
+ virtual int IsReadOnly() const;
+ virtual void SetReadOnly(int bYes);
// Vermischen zweier SdrModel. Zu beachten sei, dass rSourceModel nicht
// const ist. Die Pages werden beim einfuegen nicht kopiert, sondern gemoved.
// rSourceModel ist anschliessend u.U. weitgehend leer.
// nFirstPageNum,nLastPageNum: Die aus rSourceModel zu uebernehmenden Seiten
// nDestPos..................: Einfuegeposition
- // bMergeMasterPages.........: TRUE =benoetigte MasterPages werden aus
+ // bMergeMasterPages.........: sal_True =benoetigte MasterPages werden aus
// rSourceModel ebenfalls uebernommen
- // FALSE=Die MasterPageDescriptoren der Seiten
+ // sal_False=Die MasterPageDescriptoren der Seiten
// aus rSourceModel werden auf die
// vorhandenen MasterPages gemappt.
// bUndo.....................: Fuer das Merging wird eine UndoAction generiert.
// Undo ist nur fuer das ZielModel, nicht fuer
// rSourceModel.
- // bTreadSourceAsConst.......: TRUE=Das SourceModel wird nicht veraendert,.
+ // bTreadSourceAsConst.......: sal_True=Das SourceModel wird nicht veraendert,.
// d.h die Seiten werden kopiert.
virtual void Merge(SdrModel& rSourceModel,
- USHORT nFirstPageNum=0, USHORT nLastPageNum=0xFFFF,
- USHORT nDestPos=0xFFFF,
- FASTBOOL bMergeMasterPages=FALSE, FASTBOOL bAllMasterPages=FALSE,
- FASTBOOL bUndo=TRUE, FASTBOOL bTreadSourceAsConst=FALSE);
+ sal_uInt16 nFirstPageNum=0, sal_uInt16 nLastPageNum=0xFFFF,
+ sal_uInt16 nDestPos=0xFFFF,
+ int bMergeMasterPages=sal_False, int bAllMasterPages=sal_False,
+ int bUndo=sal_True, int bTreadSourceAsConst=sal_False);
- // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,FALSE,FALSE,bUndo,!bMoveNoCopy);
- void CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
- USHORT nDestPos,
- FASTBOOL bUndo=TRUE, FASTBOOL bMoveNoCopy=FALSE);
+ // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,sal_False,FALSE,bUndo,!bMoveNoCopy);
+ void CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
+ sal_uInt16 nDestPos,
+ int bUndo=sal_True, int bMoveNoCopy=sal_False);
// Mit BegUndo() / EndUndo() ist es moeglich beliebig viele UndoActions
// beliebig tief zu klammern. Als Kommentar der
@@ -598,7 +598,7 @@ public:
void BegUndo(SdrUndoGroup* pUndoGrp); // Undo-Klammerung auf
void EndUndo(); // Undo-Klammerung zu
void AddUndo(SdrUndoAction* pUndo);
- USHORT GetUndoBracketLevel() const { return nUndoLevel; }
+ sal_uInt16 GetUndoBracketLevel() const { return nUndoLevel; }
const SdrUndoGroup* GetAktUndoGroup() const { return pAktUndoGroup; }
// nur nach dem 1. BegUndo oder vor dem letzten EndUndo:
void SetUndoComment(const String& rComment);
@@ -607,19 +607,19 @@ public:
// Das Undo-Managment findet nur statt, wenn kein NotifyUndoAction-Handler
// gesetzt ist.
// Default ist 16. Minimaler MaxUndoActionCount ist 1!
- void SetMaxUndoActionCount(ULONG nAnz);
- ULONG GetMaxUndoActionCount() const { return nMaxUndoCount; }
+ void SetMaxUndoActionCount(sal_uIntPtr nAnz);
+ sal_uIntPtr GetMaxUndoActionCount() const { return nMaxUndoCount; }
void ClearUndoBuffer();
// UndoAction(0) ist die aktuelle (also die zuletzt eingegangene)
- ULONG GetUndoActionCount() const { return pUndoStack!=NULL ? pUndoStack->Count() : 0; }
- const SfxUndoAction* GetUndoAction(ULONG nNum) const { return (SfxUndoAction*)(pUndoStack!=NULL ? pUndoStack->GetObject(nNum) : NULL); }
+ sal_uIntPtr GetUndoActionCount() const { return pUndoStack!=NULL ? pUndoStack->Count() : 0; }
+ const SfxUndoAction* GetUndoAction(sal_uIntPtr nNum) const { return (SfxUndoAction*)(pUndoStack!=NULL ? pUndoStack->GetObject(nNum) : NULL); }
// RedoAction(0) ist die aktuelle (also die des letzten Undo)
- ULONG GetRedoActionCount() const { return pRedoStack!=NULL ? pRedoStack->Count() : 0; }
- const SfxUndoAction* GetRedoAction(ULONG nNum) const { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); }
+ sal_uIntPtr GetRedoActionCount() const { return pRedoStack!=NULL ? pRedoStack->Count() : 0; }
+ const SfxUndoAction* GetRedoAction(sal_uIntPtr nNum) const { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); }
- FASTBOOL Undo();
- FASTBOOL Redo();
- FASTBOOL Repeat(SfxRepeatTarget&);
+ int Undo();
+ int Redo();
+ int Repeat(SfxRepeatTarget&);
// Hier kann die Applikation einen Handler setzen, der die auflaufenden
// UndoActions einsammelt. Der Handler hat folgendes Aussehen:
@@ -645,7 +645,7 @@ public:
// Hier kann man einen Handler setzen der beim Streamen mehrfach gerufen
// wird und ungefaehre Auskunft ueber den Fortschreitungszustand der
// Funktion gibt. Der Handler muss folgendes Aussehen haben:
- // void __EXPORT class::IOProgressHdl(const USHORT& nPercent);
+ // void __EXPORT class::IOProgressHdl(const sal_uInt16& nPercent);
// Der erste Aufruf des Handlers erfolgt grundsaetzlich mit 0, der letzte
// mit 100. Dazwischen erfolgen maximal 99 Aufrufe mit Werten 1...99.
// Man kann also durchaus bei 0 den Progressbar Initiallisieren und bei
@@ -678,13 +678,13 @@ public:
// durch. Geprueft wird insbesondere die Verkettung von Verschachtelten
// Gruppenobjekten, aber auch Stati wie bInserted sowie Model* und Page*
// der Objects, SubLists und Pages. Bei korrekter Struktur liefert die
- // Methode TRUE, andernfalls FALSE.
+ // Methode sal_True, andernfalls FALSE.
// Dieser Check steht nur zur Verfuegung, wenn die Engine mit DBG_UTIL
// uebersetzt wurde. Andernfalls liefert die Methode immer TRUE. (ni)
- FASTBOOL CheckConsistence() const;
+ int CheckConsistence() const;
- void SetStarDrawPreviewMode(BOOL bPreview);
- BOOL IsStarDrawPreviewMode() { return bStarDrawPreviewMode; }
+ void SetStarDrawPreviewMode(sal_Bool bPreview);
+ sal_Bool IsStarDrawPreviewMode() { return bStarDrawPreviewMode; }
SotStorage* GetModelStorage() const { return pModelStorage; }
void SetModelStorage( SotStorage* pStor ) { pModelStorage = pStor; }
@@ -694,14 +694,14 @@ public:
// these functions are used by the api to disable repaints during a
// set of api calls.
- BOOL isLocked() const { return (BOOL)mbModelLocked; }
- void setLock( BOOL bLock );
+ sal_Bool isLocked() const { return (sal_Bool)mbModelLocked; }
+ void setLock( sal_Bool bLock );
void SetForbiddenCharsTable( vos::ORef<SvxForbiddenCharactersTable> xForbiddenChars );
vos::ORef<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const;
- void SetCharCompressType( UINT16 nType );
- UINT16 GetCharCompressType() const { return mnCharCompressType; }
+ void SetCharCompressType( sal_uInt16 nType );
+ sal_uInt16 GetCharCompressType() const { return mnCharCompressType; }
void SetKernAsianPunctuation( sal_Bool bEnabled );
sal_Bool IsKernAsianPunctuation() const { return (sal_Bool)mbKernAsianPunctuation; }
@@ -711,9 +711,9 @@ public:
void ReformatAllTextObjects();
- FASTBOOL HasTransparentObjects( BOOL bCheckForAlphaChannel = FALSE ) const;
+ int HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const;
- SdrOutliner* createOutliner( USHORT nOutlinerMode );
+ SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode );
void disposeOutliner( SdrOutliner* pOutliner );
sal_Bool IsWriter() const { return !bMyPool; }
diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx
index fc136b8e5a3c..26845f0ff68d 100644
--- a/svx/inc/svx/svdmrkv.hxx
+++ b/svx/inc/svx/svdmrkv.hxx
@@ -134,9 +134,9 @@ protected:
Rectangle aMarkedPointsRect;
Rectangle aMarkedGluePointsRect;
- USHORT nFrameHandlesLimit;
- ULONG mnInsPointNum; // Nummer des InsPoint
- ULONG nMarkableObjCount;
+ sal_uInt16 nFrameHandlesLimit;
+ sal_uIntPtr mnInsPointNum; // Nummer des InsPoint
+ sal_uIntPtr nMarkableObjCount;
SdrDragMode eDragMode; // Persistent
SdrViewEditMode eEditMode; // Persistent
@@ -169,7 +169,7 @@ protected:
virtual void SetMarkRects(); // Rects an den PageViews
virtual void CheckMarked(); // MarkList nach Del und Lock Layer durchsuchen...
virtual void AddDragModeHdl(SdrDragMode eMode);
- virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
+ virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
// add custom handles (used by other apps, e.g. AnchorPos)
virtual void AddCustomHdl();
@@ -178,18 +178,18 @@ protected:
void ForceUndirtyMrkPnt() const { if (bMrkPntDirty) UndirtyMrkPnt(); }
//HMHvoid ImpShowMarkHdl(bool bNoRefHdl);
- virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const;
- virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObjList* pOL, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const;
- BOOL ImpIsFrameHandles() const;
- void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT nVal=0, USHORT nOpt=0) const;
+ virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay) const;
+ virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const;
+ sal_Bool ImpIsFrameHandles() const;
+ void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 nVal=0, sal_uInt16 nOpt=0) const;
// Macht aus einer Winkelangabe in 1/100deg einen String inkl. Grad-Zeichen
- BOOL ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark);
- virtual BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark);
- BOOL MarkGluePoints(const Rectangle* pRect, BOOL bUnmark);
+ sal_Bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark);
+ virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark);
+ sal_Bool MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark);
- void SetMoveOutside(BOOL bOn);
- BOOL IsMoveOutside() const;
+ void SetMoveOutside(sal_Bool bOn);
+ sal_Bool IsMoveOutside() const;
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -197,7 +197,7 @@ protected:
virtual ~SdrMarkView();
public:
- virtual BOOL IsAction() const;
+ virtual sal_Bool IsAction() const;
virtual void MovAction(const Point& rPnt);
virtual void EndAction();
virtual void BckAction();
@@ -206,9 +206,9 @@ public:
virtual void ClearPageView();
virtual void HideSdrPage();
- virtual BOOL IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const;
+ virtual sal_Bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const;
- // Liefert TRUE wenn Objekte, Punkte oder Klebepunkte durch Rahmenaufziehen
+ // Liefert sal_True wenn Objekte, Punkte oder Klebepunkte durch Rahmenaufziehen
// selektiert werden (solange wie der Rahmen aufgezogen wird).
sal_Bool IsMarking() const { return IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); }
@@ -224,35 +224,35 @@ public:
// Das Interface wird hier evtl noch geaendert wg. Ortho-Drag
void SetDragMode(SdrDragMode eMode);
SdrDragMode GetDragMode() const { return eDragMode; }
- BOOL ChkDragMode(SdrDragMode eMode) const;
- void SetFrameHandles(BOOL bOn);
- BOOL IsFrameHandles() const { return bForceFrameHandles; }
+ sal_Bool ChkDragMode(SdrDragMode eMode) const;
+ void SetFrameHandles(sal_Bool bOn);
+ sal_Bool IsFrameHandles() const { return bForceFrameHandles; }
// Limit, ab wann implizit auf FrameHandles umgeschaltet wird. default=50.
- void SetFrameHandlesLimit(USHORT nAnz) { nFrameHandlesLimit=nAnz; }
- USHORT GetFrameHandlesLimit() const { return nFrameHandlesLimit; }
+ void SetFrameHandlesLimit(sal_uInt16 nAnz) { nFrameHandlesLimit=nAnz; }
+ sal_uInt16 GetFrameHandlesLimit() const { return nFrameHandlesLimit; }
void SetEditMode(SdrViewEditMode eMode);
SdrViewEditMode GetEditMode() const { return eEditMode; }
- void SetEditMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); }
- BOOL IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; }
- void SetCreateMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); }
- BOOL IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; }
- void SetGluePointEditMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); }
- BOOL IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT;; }
+ void SetEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); }
+ sal_Bool IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; }
+ void SetCreateMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); }
+ sal_Bool IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; }
+ void SetGluePointEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); }
+ sal_Bool IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT;; }
- void SetDesignMode(BOOL bOn=TRUE);
- BOOL IsDesignMode() const { return bDesignMode; }
+ void SetDesignMode(sal_Bool bOn=sal_True);
+ sal_Bool IsDesignMode() const { return bDesignMode; }
- void SetFrameDragSingles(BOOL bOn=TRUE) { SetFrameHandles(bOn); }
- BOOL IsFrameDragSingles() const { return IsFrameHandles(); }
+ void SetFrameDragSingles(sal_Bool bOn=sal_True) { SetFrameHandles(bOn); }
+ sal_Bool IsFrameDragSingles() const { return IsFrameHandles(); }
// Feststellen, ob und wo ein Objekt bzw. ob ein Referenzpunkt
// (Rotationsmittelpunkt,Spiegelachse) getroffen wird (SW special).
SdrHitKind PickSomething(const Point& rPnt, short nTol=-2) const;
- BOOL HasMarkableObj() const;
- ULONG GetMarkableObjCount() const;
+ sal_Bool HasMarkableObj() const;
+ sal_uIntPtr GetMarkableObjCount() const;
//HMHvoid ShowMarkHdl(bool bNoRefHdl = false);
//HMHvoid HideMarkHdl(bool bNoRefHdl = false);
//HMHBOOL IsMarkHdlShown() const { return bHdlShown; }
@@ -268,11 +268,11 @@ protected:
public:
// all available const methods for read access to selection
const SdrMarkList& GetMarkedObjectList() const { return mpSdrViewSelection->GetMarkedObjectList(); }
- ULONG TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); }
- SdrPageView* GetSdrPageViewOfMarkedByIndex(ULONG nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); }
- SdrMark* GetSdrMarkByIndex(ULONG nNum) const { return GetMarkedObjectList().GetMark(nNum); }
- SdrObject* GetMarkedObjectByIndex(ULONG nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); }
- ULONG GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); }
+ sal_uIntPtr TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); }
+ SdrPageView* GetSdrPageViewOfMarkedByIndex(sal_uIntPtr nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); }
+ SdrMark* GetSdrMarkByIndex(sal_uIntPtr nNum) const { return GetMarkedObjectList().GetMark(nNum); }
+ SdrObject* GetMarkedObjectByIndex(sal_uIntPtr nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); }
+ sal_uIntPtr GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); }
void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); }
sal_Bool AreObjectsMarked() const { return (0L != GetMarkedObjectList().GetMarkCount()); }
String GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); }
@@ -296,47 +296,47 @@ public:
void showMarkHandles();
bool areMarkHandlesHidden() const { return mbMarkHandlesHidden; }
- BOOL IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); }
- BOOL IsMarkedObjHit(const Point& rPnt, short nTol=-2) const;
+ sal_Bool IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); }
+ sal_Bool IsMarkedObjHit(const Point& rPnt, short nTol=-2) const;
// Pick: Unterstuetzte Optionen fuer nOptions sind SEARCH_NEXT, SEARCH_BACKWARD (ni)
- SdrHdl* PickHandle(const Point& rPnt, ULONG nOptions=0, SdrHdl* pHdl0=NULL) const;
+ SdrHdl* PickHandle(const Point& rPnt, sal_uIntPtr nOptions=0, SdrHdl* pHdl0=NULL) const;
// Pick: Unterstuetzte Optionen fuer nOptions sind:
// SDRSEARCH_DEEP SDRSEARCH_ALSOONMASTER SDRSEARCH_TESTMARKABLE SDRSEARCH_TESTTEXTEDIT
// SDRSEARCH_WITHTEXT SDRSEARCH_TESTTEXTAREA SDRSEARCH_BACKWARD SDRSEARCH_MARKED
// SDRSEARCH_WHOLEPAGE
- virtual BOOL PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions, SdrObject** ppRootObj, ULONG* pnMarkNum=NULL, USHORT* pnPassNum=NULL) const;
- virtual BOOL PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions=0) const;
- // BOOL PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); }
- BOOL MarkObj(const Point& rPnt, short nTol=-2, BOOL bToggle=FALSE, BOOL bDeep=FALSE);
+ virtual sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum=NULL, sal_uInt16* pnPassNum=NULL) const;
+ virtual sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const;
+ // sal_Bool PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); }
+ sal_Bool MarkObj(const Point& rPnt, short nTol=-2, sal_Bool bToggle=sal_False, sal_Bool bDeep=sal_False);
// Pick: Unterstuetzte Optionen fuer nOptions sind SDRSEARCH_PASS2BOUND und SDRSEARCH_PASS3NEAREST
- BOOL PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG* pnMarkNum=NULL, ULONG nOptions=0) const;
+ sal_Bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum=NULL, sal_uIntPtr nOptions=0) const;
// Sucht sich das Oberste der markierten Objekte (O1) und sucht von dort
// aus in Richtung nach Unten dann das erste nichtmarkierte Objekt (O2).
// Bei Erfolg wird die Markierung von O1 entfernt, an O2 gesetzt und TRUE
- // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die
+ // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die
// andere Richtung.
- BOOL MarkNextObj(BOOL bPrev=FALSE);
+ sal_Bool MarkNextObj(sal_Bool bPrev=sal_False);
// Sucht sich das Oberste der markierten Objekte (O1) das von rPnt/nTol
// getroffen wird und sucht von dort aus in Richtung nach Unten dann das
// erste nichtmarkierte Objekt (O2). Bei Erfolg wird die Markierung von
- // O1 entfernt, an O2 gesetzt und TRUE returniert.
- // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung.
- BOOL MarkNextObj(const Point& rPnt, short nTol=-2, BOOL bPrev=FALSE);
+ // O1 entfernt, an O2 gesetzt und sal_True returniert.
+ // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung.
+ sal_Bool MarkNextObj(const Point& rPnt, short nTol=-2, sal_Bool bPrev=sal_False);
// Alle Objekte innerhalb eines rechteckigen Bereichs markieren
// Markiert werden nur Objekte, die vollstaendig eingeschlossen sind.
- BOOL MarkObj(const Rectangle& rRect, BOOL bUnmark=FALSE);
- void MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark=FALSE, BOOL bImpNoSetMarkHdl=FALSE);
+ sal_Bool MarkObj(const Rectangle& rRect, sal_Bool bUnmark=sal_False);
+ void MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark=sal_False, sal_Bool bImpNoSetMarkHdl=sal_False);
void MarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => alle angezeigten Seiten
void UnmarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => alle angezeigten Seiten
// Diese Funktion kostet etwas Zeit, da die MarkList durchsucht werden muss.
- BOOL IsObjMarked(SdrObject* pObj) const;
+ sal_Bool IsObjMarked(SdrObject* pObj) const;
// void MarkAll(SdrPageView* pPV=NULL) { MarkAllObj(pPV); } -> replace with inline
void UnMarkAll(SdrPageView* pPV=NULL) { UnmarkAllObj(pPV); }
@@ -344,8 +344,8 @@ public:
// Der Wert ist als Kantenlaenge zu betrachten. Gerade Werte werden
// auf Ungerade aufgerundet: 3->3, 4->5, 5->5, 6->7, 7->7, ...
// Defaultwert ist 7, Mindestwert 3 Pixel.
- USHORT GetMarkHdlSizePixel() const;
- void SetMarkHdlSizePixel(USHORT nSiz);
+ sal_uInt16 GetMarkHdlSizePixel() const;
+ void SetMarkHdlSizePixel(sal_uInt16 nSiz);
// Die Groesse der Markierungs-Handles wird ueber die jeweilige Aufloesung
// und die Groesse des Bereichs der markierten Objekte so angepasst, dass
@@ -353,53 +353,53 @@ public:
// Dazu muessen die Handles ggf. verkleinert dargestellt werden. Mit der
// MinMarkHdlSize kann man hierfuer eine Mindestgroesse angeben.
// Defaultwert ist 3, Mindestwert 3 Pixel.
- BOOL IsSolidMarkHdl() const { return aHdl.IsFineHdl(); }
- void SetSolidMarkHdl(BOOL bOn);
+ sal_Bool IsSolidMarkHdl() const { return aHdl.IsFineHdl(); }
+ void SetSolidMarkHdl(sal_Bool bOn);
- virtual BOOL HasMarkablePoints() const;
- virtual ULONG GetMarkablePointCount() const;
- virtual BOOL HasMarkedPoints() const;
- virtual ULONG GetMarkedPointCount() const;
+ virtual sal_Bool HasMarkablePoints() const;
+ virtual sal_uIntPtr GetMarkablePointCount() const;
+ virtual sal_Bool HasMarkedPoints() const;
+ virtual sal_uIntPtr GetMarkedPointCount() const;
// Nicht alle Punkte lassen sich markieren:
- virtual BOOL IsPointMarkable(const SdrHdl& rHdl) const;
- virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE);
+ virtual sal_Bool IsPointMarkable(const SdrHdl& rHdl) const;
+ virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False);
/** should only be used from outside svx for special ui elements */
- BOOL MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark);
+ sal_Bool MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark);
// alle Punkte innerhalb dieses Rechtecks markieren (Viewkoordinaten)
- BOOL MarkPoints(const Rectangle& rRect, BOOL bUnmark=FALSE) { return MarkPoints(&rRect,bUnmark); }
- BOOL UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,TRUE); }
- BOOL UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,TRUE); }
- BOOL IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return &rHdl!=NULL && rHdl.IsSelected(); }
- BOOL MarkAllPoints() { return MarkPoints(NULL,FALSE); }
- BOOL UnmarkAllPoints() { return MarkPoints(NULL,TRUE); }
- BOOL UnMarkAllPoints() { return MarkPoints(NULL,TRUE); }
+ sal_Bool MarkPoints(const Rectangle& rRect, sal_Bool bUnmark=sal_False) { return MarkPoints(&rRect,bUnmark); }
+ sal_Bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,sal_True); }
+ sal_Bool UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,sal_True); }
+ sal_Bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return &rHdl!=NULL && rHdl.IsSelected(); }
+ sal_Bool MarkAllPoints() { return MarkPoints(NULL,sal_False); }
+ sal_Bool UnmarkAllPoints() { return MarkPoints(NULL,sal_True); }
+ sal_Bool UnMarkAllPoints() { return MarkPoints(NULL,sal_True); }
// Sucht sich den ersten markierten Punkt (P1) und sucht von dort
// aus in den ersten nichtmarkierte Punkt (P2).
// Bei Erfolg wird die Markierung von P1 entfernt, an P2 gesetzt und TRUE
- // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die
+ // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die
// andere Richtung.
- BOOL MarkNextPoint(BOOL bPrev=FALSE);
+ sal_Bool MarkNextPoint(sal_Bool bPrev=sal_False);
// Sucht sich den ersten markierten Punkt (P1) das von rPnt
// getroffen wird und sucht von dort aus den
// ersten nichtmarkierten Punkt (P2). Bei Erfolg wird die Markierung von
- // P1 entfernt, an P2 gesetzt und TRUE returniert.
- // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung.
- BOOL MarkNextPoint(const Point& rPnt, BOOL bPrev=FALSE);
+ // P1 entfernt, an P2 gesetzt und sal_True returniert.
+ // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung.
+ sal_Bool MarkNextPoint(const Point& rPnt, sal_Bool bPrev=sal_False);
// Die Nummer des passenden Handles raussuchen. Nicht gefunden
// liefert CONTAINER_ENTRY_NOTFOUND.
- ULONG GetHdlNum(SdrHdl* pHdl) const { return aHdl.GetHdlNum(pHdl); }
- SdrHdl* GetHdl(ULONG nHdlNum) const { return aHdl.GetHdl(nHdlNum); }
+ sal_uIntPtr GetHdlNum(SdrHdl* pHdl) const { return aHdl.GetHdlNum(pHdl); }
+ SdrHdl* GetHdl(sal_uIntPtr nHdlNum) const { return aHdl.GetHdl(nHdlNum); }
const SdrHdlList& GetHdlList() const { return aHdl; }
// Selektionsrahmen fuer Punktmarkierung aufziehen.
- // Wird nur gestartet, wenn HasMarkablePoints() TRUE liefert.
- // BOOL BegMarkPoints(const Point& rPnt, OutputDevice* pOut);
+ // Wird nur gestartet, wenn HasMarkablePoints() sal_True liefert.
+ // sal_Bool BegMarkPoints(const Point& rPnt, OutputDevice* pOut);
sal_Bool BegMarkPoints(const Point& rPnt, sal_Bool bUnmark = sal_False);
void MovMarkPoints(const Point& rPnt);
sal_Bool EndMarkPoints();
@@ -407,21 +407,21 @@ public:
sal_Bool IsMarkPoints() const { return (0L != mpMarkPointsOverlay); }
// Zusatzhandles dauerhaft sichtbar schalten
- void SetPlusHandlesAlwaysVisible(BOOL bOn);
- BOOL IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; }
+ void SetPlusHandlesAlwaysVisible(sal_Bool bOn);
+ sal_Bool IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; }
// Handles sichrbar waerend TextEdit (in doppelter Groesse)?
// Persistent, default=FALSE
- void SetMarkHdlWhenTextEdit(BOOL bOn) { bMarkHdlWhenTextEdit=bOn; }
- BOOL IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; }
+ void SetMarkHdlWhenTextEdit(sal_Bool bOn) { bMarkHdlWhenTextEdit=bOn; }
+ sal_Bool IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; }
- BOOL HasMarkableGluePoints() const;
- ULONG GetMarkableGluePointCount() const;
- BOOL HasMarkedGluePoints() const;
- ULONG GetMarkedGluePointCount() const;
+ sal_Bool HasMarkableGluePoints() const;
+ sal_uIntPtr GetMarkableGluePointCount() const;
+ sal_Bool HasMarkedGluePoints() const;
+ sal_uIntPtr GetMarkedGluePointCount() const;
// Ein Klebepunkt wird eindeutig identifiziert durch das SdrObject
- // (dem er zugehoert) sowie einem USHORT nId (da jedes SdrObject je
+ // (dem er zugehoert) sowie einem sal_uInt16 nId (da jedes SdrObject je
// mehrere Klebepunkte haben kann. Hier an der View kommt zudem noch
// eine SdrPageView, die stets korrekt gesetzt sein sollte.
// Alternativ kann ein Klebepunkt durch ein SdrHdl bezeichnet werden.
@@ -432,52 +432,52 @@ public:
// Handleliste erneut berechnet. Alle vorher gemerkten SdrHdl* sind
// damit ungueltig, ebenso die Punkt-Id's!
// Pick: Unterstuetzte Optionen fuer nOptions sind SEARCH_NEXT, SEARCH_BACKWARD
- BOOL PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rnId, SdrPageView*& rpPV, ULONG nOptions=0) const;
- BOOL MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* pPV, BOOL bUnmark=FALSE);
- BOOL UnmarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,TRUE); }
- BOOL IsGluePointMarked(const SdrObject* pObj, USHORT nId) const;
- BOOL UnmarkGluePoint(const SdrHdl& rHdl);
+ sal_Bool PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const;
+ sal_Bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV, sal_Bool bUnmark=sal_False);
+ sal_Bool UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,sal_True); }
+ sal_Bool IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const;
+ sal_Bool UnmarkGluePoint(const SdrHdl& rHdl);
// Hdl eines markierten GluePoints holen. Nicht markierte
// GluePoints haben keine Handles
- SdrHdl* GetGluePointHdl(const SdrObject* pObj, USHORT nId) const;
- BOOL IsGluePoint(const SdrHdl& rHdl) const { return &rHdl!=NULL && rHdl.GetKind()==HDL_GLUE; }
+ SdrHdl* GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const;
+ sal_Bool IsGluePoint(const SdrHdl& rHdl) const { return &rHdl!=NULL && rHdl.GetKind()==HDL_GLUE; }
// alle Punkte innerhalb dieses Rechtecks markieren (Viewkoordinaten)
- BOOL MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,FALSE); }
- BOOL UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,TRUE); }
- BOOL MarkAllGluePoints() { return MarkGluePoints(NULL,FALSE); }
- BOOL UnmarkAllGluePoints() { return MarkGluePoints(NULL,TRUE); }
+ sal_Bool MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,sal_False); }
+ sal_Bool UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,sal_True); }
+ sal_Bool MarkAllGluePoints() { return MarkGluePoints(NULL,sal_False); }
+ sal_Bool UnmarkAllGluePoints() { return MarkGluePoints(NULL,sal_True); }
// Sucht sich den ersten markierten Klebepunkt (P1) und sucht von dort
// aus in den ersten nichtmarkierte Klebepunkt (P2).
// Bei Erfolg wird die Markierung von P1 entfernt, an P2 gesetzt und TRUE
- // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die
+ // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die
// andere Richtung.
- BOOL MarkNextGluePoint(BOOL bPrev=FALSE);
+ sal_Bool MarkNextGluePoint(sal_Bool bPrev=sal_False);
// Sucht sich den ersten markierten Klebepunkt (P1) das von rPnt
// getroffen wird und sucht von dort aus den
// ersten nichtmarkierten Klebepunkt (P2). Bei Erfolg wird die Markierung
- // von P1 entfernt, an P2 gesetzt und TRUE returniert.
- // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung.
- BOOL MarkNextGluePoint(const Point& rPnt, BOOL bPrev=FALSE);
+ // von P1 entfernt, an P2 gesetzt und sal_True returniert.
+ // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung.
+ sal_Bool MarkNextGluePoint(const Point& rPnt, sal_Bool bPrev=sal_False);
// Selektionsrahmen fuer Klebepunktmarkierung aufziehen.
- // Wird nur gestartet, wenn HasMarkableGluePoints() TRUE liefert.
- // Der GlueEditMode TRUE wird nicht abgefragt.
- // BOOL BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut);
+ // Wird nur gestartet, wenn HasMarkableGluePoints() sal_True liefert.
+ // Der GlueEditMode sal_True wird nicht abgefragt.
+ // sal_Bool BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut);
sal_Bool BegMarkGluePoints(const Point& rPnt, sal_Bool bUnmark = sal_False);
void MovMarkGluePoints(const Point& rPnt);
sal_Bool EndMarkGluePoints();
void BrkMarkGluePoints();
sal_Bool IsMarkGluePoints() const { return (0L != mpMarkGluePointsOverlay); }
- // bRestraintPaint=FALSE bewirkt, dass die Handles nicht sofort wieder gemalt werden.
+ // bRestraintPaint=sal_False bewirkt, dass die Handles nicht sofort wieder gemalt werden.
// AdjustMarkHdl wird eh' nur gerufen, wenn was geaendert wurde; was idR ein Invalidate
// zur Folge hat. Am Ende von des Redraw werden die Handles automatisch gezeichnet.
- // Der Zweck ist, unnoetiges Flackern zu vermeiden. -> Funkt noch nich, deshalb TRUE!
- void AdjustMarkHdl(); //HMHBOOL bRestraintPaint=TRUE);
+ // Der Zweck ist, unnoetiges Flackern zu vermeiden. -> Funkt noch nich, deshalb sal_True!
+ void AdjustMarkHdl(); //HMHBOOL bRestraintPaint=sal_True);
const Rectangle& GetMarkedObjRect() const; // SnapRects der Objekte, ohne Strichstaerke
Rectangle GetMarkedObjBoundRect() const; // inkl. Strichstaerke, ueberstehende Fetzen, ...
@@ -497,9 +497,9 @@ public:
// liegen alle Memberobjekte der Gruppe im direkten Zugriff. Alle anderen
// Objekte koennen waerendessen nicht bearbeitet werden (bis zum naechsten
// LeaveGroup()). Bei einer seitenuebergreifenden Markierung wird jede Page
- // separat abgearbeitet. Die Methode liefert TRUE, wenn wenigstens eine
+ // separat abgearbeitet. Die Methode liefert sal_True, wenn wenigstens eine
// Gruppe betreten wurde.
- BOOL EnterMarkedGroup();
+ sal_Bool EnterMarkedGroup();
// Den Mittelpunkt des letzten Crook-Dragging abholen. Den kann man
// bei einem anschliessenden Rotate sinnvoll als Drehmittelpunkt setzen.
diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx
index 6d19b3f6ade0..7e052cf9eb2e 100644
--- a/svx/inc/svx/svdoashp.hxx
+++ b/svx/inc/svx/svdoashp.hxx
@@ -124,7 +124,7 @@ public:
void ImpCheckCustomGluePointsAreAdded();
// returns the new text rect that corresponds to the current logic rect, the return value can be empty if nothing changed.
- Rectangle ImpCalculateTextFrame( const FASTBOOL bHgt, const FASTBOOL bWdt );
+ Rectangle ImpCalculateTextFrame( const int bHgt, const int bWdt );
public:
// #i37011#
@@ -174,7 +174,7 @@ public:
};
sal_Bool IsDefaultGeometry( const DefaultType eDefaultType ) const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
virtual void SetModel(SdrModel* pNewModel);
@@ -187,7 +187,7 @@ public:
virtual void Move(const Size& rSiz);
virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
- virtual void Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ virtual void Shear(const Point& rRef, long nWink, double tn, int bVShear);
virtual void SetSnapRect(const Rectangle& rRect);
virtual void SetLogicRect(const Rectangle& rRect);
@@ -195,11 +195,11 @@ public:
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
- virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear);
virtual void NbcSetSnapRect(const Rectangle& rRect);
virtual void NbcSetLogicRect(const Rectangle& rRect);
- virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
+ virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
virtual void NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr );
@@ -208,22 +208,22 @@ public:
virtual bool beginSpecialDrag(SdrDragStat& rDrag) const;
virtual bool applySpecialDrag(SdrDragStat& rDrag);
- virtual FASTBOOL BegCreate( SdrDragStat& rStat );
- virtual FASTBOOL MovCreate(SdrDragStat& rStat); // #i37448#
- virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual int BegCreate( SdrDragStat& rStat );
+ virtual int MovCreate(SdrDragStat& rStat); // #i37448#
+ virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE) const;
- virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE);
- virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE);
- virtual FASTBOOL IsAutoGrowHeight() const;
- virtual FASTBOOL IsAutoGrowWidth() const;
+ virtual int AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt=sal_True, int bWdt=sal_True) const;
+ virtual int NbcAdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True);
+ virtual int AdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True);
+ virtual int IsAutoGrowHeight() const;
+ virtual int IsAutoGrowWidth() const;
virtual void SetVerticalWriting( sal_Bool bVertical );
virtual sal_Bool BegTextEdit( SdrOutliner& rOutl );
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
virtual void EndTextEdit( SdrOutliner& rOutl );
virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const;
- virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE,
- Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
+ virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText=sal_False,
+ Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const;
virtual void operator=(const SdrObject& rObj);
virtual void TakeObjNameSingul(String& rName) const;
@@ -236,7 +236,7 @@ public:
virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject);
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
virtual void SetPage( SdrPage* pNewPage );
diff --git a/svx/inc/svx/svdoattr.hxx b/svx/inc/svx/svdoattr.hxx
index 9c50c633ad72..002a838284cb 100644
--- a/svx/inc/svx/svdoattr.hxx
+++ b/svx/inc/svx/svdoattr.hxx
@@ -74,10 +74,10 @@ public:
TYPEINFO();
// Feststellen, ob bFilledObj && Fuellung!=FillNone
- BOOL HasFill() const;
+ sal_Bool HasFill() const;
// Feststellen, ob Linie!=LineNone
- BOOL HasLine() const;
+ sal_Bool HasLine() const;
virtual const Rectangle& GetSnapRect() const;
diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx
index 40cc992e96d9..30d8b407dabe 100644
--- a/svx/inc/svx/svdobj.hxx
+++ b/svx/inc/svx/svdobj.hxx
@@ -182,8 +182,8 @@ public:
OutputDevice* pOut;
const SetOfByte* pVisiLayer;
const SdrPageView* pPageView;
- USHORT nTol;
- FASTBOOL bDown;
+ sal_uInt16 nTol;
+ int bDown;
public:
SdrObjMacroHitRec()
@@ -191,7 +191,7 @@ public:
pVisiLayer(NULL),
pPageView(NULL),
nTol(0),
- bDown(FALSE)
+ bDown(sal_False)
{}
};
@@ -208,9 +208,9 @@ public:
class SVX_DLLPUBLIC SdrObjUserData
{
protected:
- UINT32 nInventor;
- UINT16 nIdentifier;
- UINT16 nVersion;
+ sal_uInt32 nInventor;
+ sal_uInt16 nIdentifier;
+ sal_uInt16 nVersion;
private:
SVX_DLLPRIVATE void operator=(const SdrObjUserData& rData); // nicht implementiert
@@ -220,7 +220,7 @@ private:
public:
TYPEINFO();
- SdrObjUserData(UINT32 nInv, UINT16 nId, UINT16 nVer)
+ SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer)
: nInventor(nInv),
nIdentifier(nId),
nVersion(nVer)
@@ -233,14 +233,14 @@ public:
virtual ~SdrObjUserData();
virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039# NULL -> 0
- UINT32 GetInventor() const { return nInventor; }
- UINT16 GetId() const { return nIdentifier; }
+ sal_uInt32 GetInventor() const { return nInventor; }
+ sal_uInt16 GetId() const { return nIdentifier; }
- virtual FASTBOOL HasMacro (const SdrObject* pObj) const;
+ virtual int HasMacro (const SdrObject* pObj) const;
virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
- virtual FASTBOOL DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj);
+ virtual int DoMacro (const SdrObjMacroHitRec& rRec, SdrObject* pObj);
virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const;
};
@@ -259,11 +259,11 @@ public:
~SdrObjUserDataList() { Clear(); }
void Clear();
- USHORT GetUserDataCount() const { return USHORT(aList.Count()); }
- SdrObjUserData* GetUserData(USHORT nNum) const { return (SdrObjUserData*)aList.GetObject(nNum); }
- void InsertUserData(SdrObjUserData* pData, USHORT nPos=0xFFFF) { aList.Insert(pData,nPos); }
- SdrObjUserData* RemoveUserData(USHORT nNum) { return (SdrObjUserData*)aList.Remove(nNum);}
- void DeleteUserData(USHORT nNum) { delete RemoveUserData(nNum); }
+ sal_uInt16 GetUserDataCount() const { return sal_uInt16(aList.Count()); }
+ SdrObjUserData* GetUserData(sal_uInt16 nNum) const { return (SdrObjUserData*)aList.GetObject(nNum); }
+ void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF) { aList.Insert(pData,nPos); }
+ SdrObjUserData* RemoveUserData(sal_uInt16 nNum) { return (SdrObjUserData*)aList.Remove(nNum);}
+ void DeleteUserData(sal_uInt16 nNum) { delete RemoveUserData(nNum); }
};
//************************************************************
@@ -279,10 +279,10 @@ public:
Rectangle aBoundRect;
Point aAnchor;
SdrGluePointList* pGPL;
- BOOL bMovProt;
- BOOL bSizProt;
- BOOL bNoPrint;
- BOOL bClosedObj;
+ sal_Bool bMovProt;
+ sal_Bool bSizProt;
+ sal_Bool bNoPrint;
+ sal_Bool bClosedObj;
bool mbVisible;
SdrLayerID mnLayerID;
@@ -303,7 +303,7 @@ class SdrObjPlusData
friend class SdrObject;
public:
- SfxBroadcaster* pBroadcast; // Broadcaster, falls dieses Obj referenziert wird (bVirtObj=TRUE). Auch fuer Konnektoren etc.
+ SfxBroadcaster* pBroadcast; // Broadcaster, falls dieses Obj referenziert wird (bVirtObj=sal_True). Auch fuer Konnektoren etc.
SdrObjUserDataList* pUserDataList; // applikationsspeziefische Daten
SdrGluePointList* pGluePoints; // Klebepunkte zum Ankleben von Objektverbindern
AutoTimer* pAutoTimer;
@@ -334,49 +334,49 @@ public:
class SdrObjTransformInfoRec
{
public:
- unsigned bSelectAllowed : 1; // FALSE=Obj kann nicht selektiert werden
- unsigned bMoveAllowed : 1; // FALSE=Obj kann nicht verschoben werden
- unsigned bResizeFreeAllowed : 1; // FALSE=Obj kann nicht frei resized werden
- unsigned bResizePropAllowed : 1; // FALSE=Obj kann nichtmal proportional resized werden
- unsigned bRotateFreeAllowed : 1; // FALSE=Obj kann nicht frei gedreht werden
- unsigned bRotate90Allowed : 1; // FALSE=Obj kann nichtmal im 90deg Raster gedreht werden
- unsigned bMirrorFreeAllowed : 1; // FALSE=Obj kann nicht frei gespiegelt werden
- unsigned bMirror45Allowed : 1; // FALSE=Obj kann nichtmal ueber Achse im 45deg Raster gespiegelt werden
- unsigned bMirror90Allowed : 1; // FALSE=Obj kann ebenfalls nicht ueber Achse im 90deg Raster gespiegelt werden
- unsigned bTransparenceAllowed : 1; // FALSE=Obj does not have an interactive transparence control
- unsigned bGradientAllowed : 1; // FALSE=Obj dooes not have an interactive gradient control
- unsigned bShearAllowed : 1; // FALSE=Obj kann nicht verzerrt werden
+ unsigned bSelectAllowed : 1; // sal_False=Obj kann nicht selektiert werden
+ unsigned bMoveAllowed : 1; // sal_False=Obj kann nicht verschoben werden
+ unsigned bResizeFreeAllowed : 1; // sal_False=Obj kann nicht frei resized werden
+ unsigned bResizePropAllowed : 1; // sal_False=Obj kann nichtmal proportional resized werden
+ unsigned bRotateFreeAllowed : 1; // sal_False=Obj kann nicht frei gedreht werden
+ unsigned bRotate90Allowed : 1; // sal_False=Obj kann nichtmal im 90deg Raster gedreht werden
+ unsigned bMirrorFreeAllowed : 1; // sal_False=Obj kann nicht frei gespiegelt werden
+ unsigned bMirror45Allowed : 1; // sal_False=Obj kann nichtmal ueber Achse im 45deg Raster gespiegelt werden
+ unsigned bMirror90Allowed : 1; // sal_False=Obj kann ebenfalls nicht ueber Achse im 90deg Raster gespiegelt werden
+ unsigned bTransparenceAllowed : 1; // sal_False=Obj does not have an interactive transparence control
+ unsigned bGradientAllowed : 1; // sal_False=Obj dooes not have an interactive gradient control
+ unsigned bShearAllowed : 1; // sal_False=Obj kann nicht verzerrt werden
unsigned bEdgeRadiusAllowed : 1;
- unsigned bNoOrthoDesired : 1; // TRUE bei Rect; ... FALSE bei BMP,MTF;
- unsigned bNoContortion : 1; // FALSE=Kein verzerren (bei Crook) moeglich (nur TRUE bei PathObj und Gruppierten PathObjs)
- unsigned bCanConvToPath : 1; // FALSE=Keine Konvertierung in PathObj moeglich
- unsigned bCanConvToPoly : 1; // FALSE=Keine Konvertierung in PolyObj moeglich
- unsigned bCanConvToContour : 1; // FALSE=no conversion down to whole contour possible
- unsigned bCanConvToPathLineToArea : 1; // FALSE=Keine Konvertierung in PathObj moeglich mit Wandlung von LineToArea
- unsigned bCanConvToPolyLineToArea : 1; // FALSE=Keine Konvertierung in PolyObj moeglich mit Wandlung von LineToArea
+ unsigned bNoOrthoDesired : 1; // sal_True bei Rect; ... sal_False bei BMP,MTF;
+ unsigned bNoContortion : 1; // sal_False=Kein verzerren (bei Crook) moeglich (nur sal_True bei PathObj und Gruppierten PathObjs)
+ unsigned bCanConvToPath : 1; // sal_False=Keine Konvertierung in PathObj moeglich
+ unsigned bCanConvToPoly : 1; // sal_False=Keine Konvertierung in PolyObj moeglich
+ unsigned bCanConvToContour : 1; // sal_False=no conversion down to whole contour possible
+ unsigned bCanConvToPathLineToArea : 1; // sal_False=Keine Konvertierung in PathObj moeglich mit Wandlung von LineToArea
+ unsigned bCanConvToPolyLineToArea : 1; // sal_False=Keine Konvertierung in PolyObj moeglich mit Wandlung von LineToArea
public:
SdrObjTransformInfoRec()
- : bSelectAllowed(TRUE),
- bMoveAllowed(TRUE),
- bResizeFreeAllowed(TRUE),
- bResizePropAllowed(TRUE),
- bRotateFreeAllowed(TRUE),
- bRotate90Allowed(TRUE),
- bMirrorFreeAllowed(TRUE),
- bMirror45Allowed(TRUE),
- bMirror90Allowed(TRUE),
- bTransparenceAllowed(TRUE),
- bGradientAllowed(TRUE),
- bShearAllowed(TRUE),
- bEdgeRadiusAllowed(TRUE),
- bNoOrthoDesired(TRUE),
- bNoContortion(TRUE),
- bCanConvToPath(TRUE),
- bCanConvToPoly(TRUE),
- bCanConvToContour(FALSE),
- bCanConvToPathLineToArea(TRUE),
- bCanConvToPolyLineToArea(TRUE)
+ : bSelectAllowed(sal_True),
+ bMoveAllowed(sal_True),
+ bResizeFreeAllowed(sal_True),
+ bResizePropAllowed(sal_True),
+ bRotateFreeAllowed(sal_True),
+ bRotate90Allowed(sal_True),
+ bMirrorFreeAllowed(sal_True),
+ bMirror45Allowed(sal_True),
+ bMirror90Allowed(sal_True),
+ bTransparenceAllowed(sal_True),
+ bGradientAllowed(sal_True),
+ bShearAllowed(sal_True),
+ bEdgeRadiusAllowed(sal_True),
+ bNoOrthoDesired(sal_True),
+ bNoContortion(sal_True),
+ bCanConvToPath(sal_True),
+ bCanConvToPoly(sal_True),
+ bCanConvToContour(sal_False),
+ bCanConvToPathLineToArea(sal_True),
+ bCanConvToPolyLineToArea(sal_True)
{}
};
@@ -466,7 +466,7 @@ protected:
unsigned bVirtObj : 1;
unsigned bSnapRectDirty : 1;
unsigned bNetLock : 1; // ni
- unsigned bInserted : 1; // nur wenn TRUE gibt's RepaintBroadcast & SetModify
+ unsigned bInserted : 1; // nur wenn sal_True gibt's RepaintBroadcast & SetModify
unsigned bGrouped : 1; // Member eines GroupObjektes?
// Die folgende Flags werden gestreamt
@@ -474,7 +474,7 @@ protected:
unsigned bSizProt : 1; // If true, the size is protected
unsigned bNoPrint : 1; // If true, the object is not printed.
unsigned mbVisible : 1; // If false, the object is not visible on screen (but maybe on printer, depending on bNoprint
- // Wenn bEmptyPresObj TRUE ist, handelt es sich um ein
+ // Wenn bEmptyPresObj sal_True ist, handelt es sich um ein
// Praesentationsobjekt, dem noch kein Inhalt zugewiesen
// wurde. Default ist das Flag auf FALSE. Die Verwaltung
// uebernimmt die Applikation. Im Zuweisungsoperator sowie
@@ -482,10 +482,10 @@ protected:
// Das Flag ist persistent.
unsigned bEmptyPresObj : 1; // Leeres Praesentationsobjekt (Draw)
- // TRUE=Objekt ist als Objekt der MasterPage nicht sichtbar
+ // sal_True=Objekt ist als Objekt der MasterPage nicht sichtbar
unsigned bNotVisibleAsMaster : 1;
- // TRUE=Es handelt sich hierbei um ein geschlossenes Objekt, also nicht Linie oder Kreisbogen ...
+ // sal_True=Es handelt sich hierbei um ein geschlossenes Objekt, also nicht Linie oder Kreisbogen ...
unsigned bClosedObj : 1;
unsigned bIsEdge : 1;
@@ -518,14 +518,14 @@ protected:
Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
// Fuer GetDragComment
- void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT nVal=0) const;
+ void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 nVal=0) const;
void ImpForcePlusData() { if (pPlusData==NULL) pPlusData=NewPlusData(); }
- String GetWinkStr(long nWink, FASTBOOL bNoDegChar=FALSE) const;
- String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, FASTBOOL bNoUnitChars=FALSE) const;
+ String GetWinkStr(long nWink, int bNoDegChar=sal_False) const;
+ String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, int bNoUnitChars=sal_False) const;
- // bNotMyself=TRUE bedeutet: Nur die ObjList auf Dirty setzen, nicht mich.
+ // bNotMyself=sal_True bedeutet: Nur die ObjList auf Dirty setzen, nicht mich.
// Wird z.B. benoetigt fuer NbcMove, denn da movt man SnapRect und aOutRect
// i.d.R. gleich mit um die Neuberechnung zu sparen.
public:
@@ -577,8 +577,8 @@ public:
virtual void AddReference(SdrVirtObj& rVrtObj);
virtual void DelReference(SdrVirtObj& rVrtObj);
- virtual UINT32 GetObjInventor() const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt32 GetObjInventor() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
// Layer interface
@@ -596,7 +596,7 @@ public:
// Ein solcher Referenzpunkt ist z.B. der Punkt eines Symbols, der
// der beim Einfuegen des Symbols auf das Raster gefangen werden soll
// oder der Fixpunkt eines Bildes innerhalb eines Animationsobjektes.
- virtual FASTBOOL HasRefPoint() const;
+ virtual int HasRefPoint() const;
virtual Point GetRefPoint() const;
virtual void SetRefPoint(const Point& rPnt);
@@ -626,15 +626,15 @@ public:
// Wird die Reihenfolge der Objekte in der Liste veraendert, so wird ein
// Dirty-Flag gesetzt (an der Page). Beim naechsten SdrObject::GetOrdNum()
// werden die Ordnungsnummer aller Objekte der Liste neu bestimmt.
- UINT32 GetOrdNum() const;
+ sal_uInt32 GetOrdNum() const;
// Diese Methode sollte nur verwendet werden, wenn man ganz genau weiss,
// was man macht:
- UINT32 GetOrdNumDirect() const { return nOrdNum; }
+ sal_uInt32 GetOrdNumDirect() const { return nOrdNum; }
// Das Setzen der Ordnungsnummer sollte nur vom Model bzw. von der Page
// geschehen.
- void SetOrdNum(UINT32 nNum) { nOrdNum=nNum; }
+ void SetOrdNum(sal_uInt32 nNum) { nOrdNum=nNum; }
/** Return the position in the navigation order for the called object.
Note that this method may update the navigation position of the
@@ -683,7 +683,7 @@ public:
// Tooling for painting a single object to a OutputDevice. This will be needed as long
// as not all painting is changed to use DrawContact objects.
sal_Bool SingleObjectPainter(OutputDevice& rOut) const;
- BOOL LineGeometryUsageIsNecessary() const;
+ sal_Bool LineGeometryUsageIsNecessary() const;
// Clone() soll eine komplette Kopie des Objektes erzeugen.
virtual SdrObject* Clone() const;
@@ -710,7 +710,7 @@ public:
// Polygon wird das wohl ein einfacher Selektionshandle sein, bei einer
// Bezierkurve dagegen koennen das schon bis zu 3 Handles werden (inkl Gewichte).
// GetHdl() und GetPlusHdl() muessen Handleinstanzen mit new erzeugen!
- // Ein Objekt, das bei HasSpacialDrag() TRUE liefert muss diese Methoden
+ // Ein Objekt, das bei HasSpacialDrag() sal_True liefert muss diese Methoden
// zur Verfuegung stellen (inkl. FillHdlList).
virtual sal_uInt32 GetHdlCount() const;
virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const;
@@ -724,8 +724,8 @@ public:
// Stuetzstellen bei Splines, Gewichte bei Bezierkurven und Pointer von
// Labelobjekten muss vom Objekt selbst gehandled werden. Um das Model
// Statusfrei zu halten werden die Statusdaten an der View gehalten und dem
- // Objekt dann uebergeben. EndDrag liefrt im Normalfall TRUE fuer Erfolg.
- // FALSE kann zurueckgegeben werden, wenn das Dragging das Objekt nicht
+ // Objekt dann uebergeben. EndDrag liefrt im Normalfall sal_True fuer Erfolg.
+ // sal_False kann zurueckgegeben werden, wenn das Dragging das Objekt nicht
// veraendert hat, wobei dir evtl. Tatsache das die Maus nicht bewegt wurde
// bereits von der View abgefangen wird.
virtual bool hasSpecialDrag() const;
@@ -749,18 +749,18 @@ public:
// BegCreate()-Methode gerufen. Bei jedem MausMode wird dann MovCreate
// gerufen. BrkCreate() bedeutet, dass der User die interaktive Objekt-
// erzeugung abgebrochen hat. EndCreate() wird gerufen beim MouseUp-Event.
- // Liefert EndCreate() ein TRUE, so ist die Objekterzeugung abgeschlossen;
+ // Liefert EndCreate() ein sal_True, so ist die Objekterzeugung abgeschlossen;
// das Objekt wird in die entsprechende Liste eingefuegt. Andernfalls
- // (EndCreate()==FALSE) gehe ich davon aus, dass weitere Punkte zur
+ // (EndCreate()==sal_False) gehe ich davon aus, dass weitere Punkte zur
// Objekterzeugung notwendig sind (Polygon,...). Der Parameter eCmd
// enthaelt die Anzahl der Mausklicks (so die App diese durchreicht).
// BckCreate() -> Letztes EndCreate() rueckgaengig machen (z.B. letzten
// Polygonpunkt wieder loeschen).
- // RetrunCode: TRUE=Weiter gehts, FALSE=Create dadurch abgebrochen.
- 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);
+ // RetrunCode: sal_True=Weiter gehts, sal_False=Create dadurch abgebrochen.
+ virtual int BegCreate(SdrDragStat& rStat);
+ virtual int MovCreate(SdrDragStat& rStat); // sal_True=Xor muss repainted werden
+ virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual int BckCreate(SdrDragStat& rStat);
virtual void BrkCreate(SdrDragStat& rStat);
// damit holt man sich den Pointer, der das Createn dieses Objekts symbolisiert
@@ -778,13 +778,13 @@ public:
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
- virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ virtual void NbcShear (const Point& rRef, long nWink, double tn, int bVShear);
virtual void Move (const Size& rSiz);
virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void Rotate(const Point& rRef, long nWink, double sn, double cs);
virtual void Mirror(const Point& rRef1, const Point& rRef2);
- virtual void Shear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ virtual void Shear (const Point& rRef, long nWink, double tn, int bVShear);
// Die relative Position eines Zeichenobjektes ist die Entfernung der
// linken oberen Eche des logisch umschliessenden Rechtecks (SnapRect)
@@ -821,7 +821,7 @@ public:
// Drehwinkel und Shear
virtual long GetRotateAngle() const;
- virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const;
+ virtual long GetShearAngle(int bVertical=sal_False) const;
// Zum Fangen von/auf ausgezeichneten Punkten eines Obj (Polygonpunkte,
// Kreismittelpunkt, ...)
@@ -864,7 +864,7 @@ public:
void SetMergedItemSetAndBroadcast(const SfxItemSet& rSet, sal_Bool bClearAllItems = sal_False);
// NotPersistAttr fuer Layer, ObjName, geometrische Transformationen, ...
- void TakeNotPersistAttr(SfxItemSet& rAttr, FASTBOOL bMerge) const;
+ void TakeNotPersistAttr(SfxItemSet& rAttr, int bMerge) const;
void ApplyNotPersistAttr(const SfxItemSet& rAttr);
void NbcApplyNotPersistAttr(const SfxItemSet& rAttr);
@@ -875,7 +875,7 @@ public:
SfxStyleSheet* GetStyleSheet() const;
// TextEdit
- virtual FASTBOOL HasTextEdit() const;
+ virtual int HasTextEdit() const;
// Return==TRUE: TextEditMode gestartet
virtual sal_Bool BegTextEdit(SdrOutliner& rOutl);
@@ -892,11 +892,11 @@ public:
void BurnInStyleSheetAttributes();
// Macrofaehigkeit, z.B. ein Rechteck als PushButton.
- virtual FASTBOOL HasMacro() const;
+ virtual int HasMacro() const;
virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec) const;
virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec) const;
virtual void PaintMacro (OutputDevice& rOut, const Rectangle& rDirtyRect, const SdrObjMacroHitRec& rRec) const;
- virtual FASTBOOL DoMacro (const SdrObjMacroHitRec& rRec);
+ virtual int DoMacro (const SdrObjMacroHitRec& rRec);
virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const;
sal_Bool IsMacroHit(const SdrObjMacroHitRec& rRec) const { return CheckMacroHit(rRec)!=NULL; }
@@ -917,15 +917,15 @@ public:
// Beim Verschieben/Resizen der Kante wird dagegen die Verbindung
// geloesst.
// Objekt ist ein Knoten?
- virtual FASTBOOL IsNode() const;
+ virtual int IsNode() const;
// Automatische Klebepunkte:
// je 4 Scheitelpunkt- und Eckpositionen muss ein Knotenobjekt liefern
// i.d.R. 0=oben, 1=rechts, 2=unten, 3=links
- virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
+ virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
// i.d.R. 0=linksoben, 1=rechtsoben, 2=rechtsunten, 3=linksunten
- virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const;
+ virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const;
// Liste aller Klebepunkte. Kann NULL sein.
virtual const SdrGluePointList* GetGluePointList() const;
@@ -935,19 +935,19 @@ public:
virtual SdrGluePointList* ForceGluePointList();
// Temporaer zu setzen fuer Transformationen am Bezugsobjekt
- void SetGlueReallyAbsolute(FASTBOOL bOn);
+ void SetGlueReallyAbsolute(int bOn);
void NbcRotateGluePoints(const Point& rRef, long nWink, double sn, double cs);
void NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2);
- void NbcShearGluePoints (const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ void NbcShearGluePoints (const Point& rRef, long nWink, double tn, int bVShear);
// Objekt ist eine Kante?
- virtual FASTBOOL IsEdge() const;
+ virtual int IsEdge() const;
// bTail1=TRUE: Linienanfang, sonst LinienEnde
// pObj=NULL: Disconnect
- virtual void ConnectToNode(FASTBOOL bTail1, SdrObject* pObj);
- virtual void DisconnectFromNode(FASTBOOL bTail1);
- virtual SdrObject* GetConnectedNode(FASTBOOL bTail1) const;
+ virtual void ConnectToNode(int bTail1, SdrObject* pObj);
+ virtual void DisconnectFromNode(int bTail1);
+ virtual SdrObject* GetConnectedNode(int bTail1) const;
/** sets the writing mode of the object's context
@@ -970,9 +970,9 @@ public:
// Bezierkurve (oder beides) zu verwandeln, dann sollten die folgenden
// Methoden ueberladen werden.
// Z.B. Ein RectObj mit Strichstaerke 10, SOLID_PEN in Polygon wandeln:
- // Im Modus bLineToArea=FALSE soll ein PolyObj mit 4 Stuetzstellen,
+ // Im Modus bLineToArea=sal_False soll ein PolyObj mit 4 Stuetzstellen,
// Strichstaerke 10 und SOLiD_PEN erzeugt werden.
- // Im Modus bLineToArea=TRUE dagegen soll das generierte Obj immer ein
+ // Im Modus bLineToArea=sal_True dagegen soll das generierte Obj immer ein
// LinienAttribut NULL_PEN haben, und die Linie (auch Linienmuster) selbst
// durch Polygonflaechen emuliert werden, die dadurch anschliessend vom
// Anwender manipuliert werden koennen. Das RectObj kann sich somit also
@@ -984,21 +984,21 @@ public:
// Der Returnwert ist jeweils ein SdrObject*, da als Rueckgabe zur Not
// auch Gruppenobjekte erlaubt sind (z.B. fuer SdrTextObj).
// Bei der Konvertierung von TextObj nach PathObj wird es wohl so sein,
- // dass beide Modi (bLineToArea=TRUE/FALSE) identisch sind.
+ // dass beide Modi (bLineToArea=sal_True/sal_False) identisch sind.
// Defaulted sind diese Methoden auf "Ich kann das nicht" (FALSE/NULL).
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
- SdrObject* ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const;
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
+ SdrObject* ConvertToPolyObj(sal_Bool bBezier, sal_Bool bLineToArea) const;
// convert this path object to contour object; bForceLineDash converts even
// when there is no filled new polygon created from line-to-polygon conversion,
// specially used for XLINE_DASH and 3D conversion
- SdrObject* ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash = FALSE) const;
- SdrObject* ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash = FALSE) const;
+ SdrObject* ConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash = sal_False) const;
+ SdrObject* ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash = sal_False) const;
// TRUE: Referenz auf ein Obj
sal_Bool IsVirtualObj() const { return bVirtObj; }
- // TRUE=Obj kann warsch. gefuellt werden; FALSE=Obj kann warsch. Linienenden haben.
+ // sal_True=Obj kann warsch. gefuellt werden; sal_False=Obj kann warsch. Linienenden haben.
// ungueltig, wenn es sich um ein GroupObj handelt.
sal_Bool IsClosedObj() const { return bClosedObj; }
@@ -1006,8 +1006,8 @@ public:
sal_Bool Is3DObj() const { return bIs3DObj; }
sal_Bool IsUnoObj() const { return bIsUnoObj; }
sal_Bool IsMasterCachable() const { return !bNotMasterCachable; }
- sal_Bool ShareLock() { sal_Bool r=!bNetLock; bNetLock=TRUE; return r; }
- void ShareUnlock() { bNetLock=FALSE; }
+ sal_Bool ShareLock() { sal_Bool r=!bNetLock; bNetLock=sal_True; return r; }
+ void ShareUnlock() { bNetLock=sal_False; }
sal_Bool IsShareLock() const { return bNetLock; }
void SetMarkProtect(sal_Bool bProt) { bMarkProt=bProt; }
sal_Bool IsMarkProtect() const { return bMarkProt; }
@@ -1035,16 +1035,16 @@ public:
sal_Bool DoesSupportTextIndentingOnLineWidthChange() const { return mbSupportTextIndentingOnLineWidthChange; }
// applikationsspeziefische Daten
- USHORT GetUserDataCount() const;
- SdrObjUserData* GetUserData(USHORT nNum) const;
+ sal_uInt16 GetUserDataCount() const;
+ SdrObjUserData* GetUserData(sal_uInt16 nNum) const;
// Insert uebernimmt den auf dem Heap angelegten Record in den Besitz
// des Zeichenobjekts
- void InsertUserData(SdrObjUserData* pData, USHORT nPos=0xFFFF);
+ void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF);
// Delete entfernt den Record aus der Liste und ruft
// ein delete (FreeMem+Dtor).
- void DeleteUserData(USHORT nNum);
+ void DeleteUserData(sal_uInt16 nNum);
// ItemPool fuer dieses Objekt wechseln
void MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L);
@@ -1108,7 +1108,7 @@ public:
// to use (0,0) as upper left and will be scaled to the given size in the matrix.
virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon);
- sal_Bool IsTransparent( BOOL bCheckForAlphaChannel = FALSE ) const;
+ sal_Bool IsTransparent( sal_Bool bCheckForAlphaChannel = sal_False ) const;
// #116168#
// Give info if object is in destruction
@@ -1155,8 +1155,8 @@ private:
class SVX_DLLPUBLIC SdrObjFactory
{
public:
- UINT32 nInventor;
- UINT16 nIdentifier;
+ sal_uInt32 nInventor;
+ sal_uInt16 nIdentifier;
// fuer MakeNewObj():
SdrPage* pPage;
@@ -1168,14 +1168,14 @@ public:
SdrObjUserData* pNewData;
private:
- SVX_DLLPRIVATE SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel);
- SVX_DLLPRIVATE SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1);
+ SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel);
+ SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1);
public:
- static SdrObject* MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL);
+ static SdrObject* MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL);
static void InsertMakeObjectHdl(const Link& rLink);
static void RemoveMakeObjectHdl(const Link& rLink);
- static SdrObjUserData* MakeNewObjUserData(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj);
+ static SdrObjUserData* MakeNewObjUserData(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj);
static void InsertMakeUserDataHdl(const Link& rLink);
static void RemoveMakeUserDataHdl(const Link& rLink);
};
diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx
index 24a11e6b51de..e85c2561798f 100644
--- a/svx/inc/svx/svdocapt.hxx
+++ b/svx/inc/svx/svdocapt.hxx
@@ -92,15 +92,15 @@ public:
virtual ~SdrCaptionObj();
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void operator=(const SdrObject& rObj);
// for calc: special shadow only for text box
- void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = TRUE; }
+ void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = sal_True; }
sal_Bool GetSpecialTextBoxShadow() const { return mbSpecialTextBoxShadow; }
// for calc: fixed note tail position.
- void SetFixedTail() { mbFixedTail = TRUE; }
+ void SetFixedTail() { mbFixedTail = sal_True; }
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
@@ -118,10 +118,10 @@ public:
virtual bool applySpecialDrag(SdrDragStat& rDrag);
virtual String getSpecialDragComment(const SdrDragStat& rDrag) const;
- virtual FASTBOOL BegCreate(SdrDragStat& rStat);
- virtual FASTBOOL MovCreate(SdrDragStat& rStat);
- virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- virtual FASTBOOL BckCreate(SdrDragStat& rStat);
+ virtual int BegCreate(SdrDragStat& rStat);
+ virtual int MovCreate(SdrDragStat& rStat);
+ virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual int BckCreate(SdrDragStat& rStat);
virtual void BrkCreate(SdrDragStat& rStat);
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
virtual Pointer GetCreatePointer() const;
@@ -149,7 +149,7 @@ protected:
virtual void RestGeoData(const SdrObjGeoData& rGeo);
public:
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
const Point& GetTailPos() const;
void SetTailPos(const Point& rPos);
diff --git a/svx/inc/svx/svdocirc.hxx b/svx/inc/svx/svdocirc.hxx
index a39417925a1e..183eb4c93f3f 100644
--- a/svx/inc/svx/svdocirc.hxx
+++ b/svx/inc/svx/svdocirc.hxx
@@ -81,8 +81,8 @@ private:
SVX_DLLPRIVATE void ImpSetAttrToCircInfo(); // Werte vom Pool kopieren
SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // Werte in den Pool kopieren
- // Liefert TRUE, wenn das Painten ein XPolygon erfordert.
- SVX_DLLPRIVATE FASTBOOL PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc
+ // Liefert sal_True, wenn das Painten ein XPolygon erfordert.
+ SVX_DLLPRIVATE int PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc
SVX_DLLPRIVATE virtual void RecalcXPoly();
protected:
@@ -103,7 +103,7 @@ public:
virtual ~SdrCircObj();
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
virtual void TakeObjNameSingul(String& rName) const;
@@ -126,18 +126,18 @@ public:
virtual bool applySpecialDrag(SdrDragStat& rDrag);
virtual String getSpecialDragComment(const SdrDragStat& rDrag) const;
- virtual FASTBOOL BegCreate(SdrDragStat& rStat);
- virtual FASTBOOL MovCreate(SdrDragStat& rStat);
- virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- virtual FASTBOOL BckCreate(SdrDragStat& rStat);
+ virtual int BegCreate(SdrDragStat& rStat);
+ virtual int MovCreate(SdrDragStat& rStat);
+ virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual int BckCreate(SdrDragStat& rStat);
virtual void BrkCreate(SdrDragStat& rStat);
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
virtual Pointer GetCreatePointer() const;
virtual void NbcMove(const Size& aSiz);
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
- virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+ virtual void NbcShear (const Point& rRef, long nWink, double tn, int bVShear);
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
protected:
virtual SdrObjGeoData* NewGeoData() const;
diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx
index 843c49424674..dfe75d5f8b6f 100644
--- a/svx/inc/svx/svdoedge.hxx
+++ b/svx/inc/svx/svdoedge.hxx
@@ -58,13 +58,13 @@ protected:
SdrObject* pObj; // Referenziertes Objekt
long nXDist; // Hor. Objektabstand wenn bXDistOvr=TRUE
long nYDist; // Vert. Objektabstand wenn bYDistOvr=TRUE
- USHORT nConId; // Konnektornummer
+ sal_uInt16 nConId; // Konnektornummer
// bitfield
- unsigned bBestConn : 1; // TRUE= es wird der guenstigste Konnektor gesucht
- unsigned bBestVertex : 1; // TRUE= es wird der guenstigste Scheitelpunkt zum konnekten gesucht
- unsigned bXDistOvr : 1; // TRUE= Hor. Objektabstand wurde gedragt (Overwrite)
- unsigned bYDistOvr : 1; // TRUE= Vert. Objektabstand wurde gedragt (Overwrite)
+ unsigned bBestConn : 1; // sal_True= es wird der guenstigste Konnektor gesucht
+ unsigned bBestVertex : 1; // sal_True= es wird der guenstigste Scheitelpunkt zum konnekten gesucht
+ unsigned bXDistOvr : 1; // sal_True= Hor. Objektabstand wurde gedragt (Overwrite)
+ unsigned bYDistOvr : 1; // sal_True= Vert. Objektabstand wurde gedragt (Overwrite)
unsigned bAutoVertex : 1; // AutoConnector am Scheitelpunkt nCon
unsigned bAutoCorner : 1; // AutoConnector am Eckpunkt nCon
@@ -73,16 +73,16 @@ public:
SVX_DLLPUBLIC ~SdrObjConnection();
void ResetVars();
- FASTBOOL TakeGluePoint(SdrGluePoint& rGP, FASTBOOL bSetAbsolutePos) const;
+ int TakeGluePoint(SdrGluePoint& rGP, int bSetAbsolutePos) const;
- inline void SetBestConnection( BOOL rB ) { bBestConn = rB; };
- inline void SetBestVertex( BOOL rB ) { bBestVertex = rB; };
- inline void SetAutoVertex( BOOL rB ) { bAutoVertex = rB; };
- inline void SetConnectorId( USHORT nId ) { nConId = nId; };
+ inline void SetBestConnection( sal_Bool rB ) { bBestConn = rB; };
+ inline void SetBestVertex( sal_Bool rB ) { bBestVertex = rB; };
+ inline void SetAutoVertex( sal_Bool rB ) { bAutoVertex = rB; };
+ inline void SetConnectorId( sal_uInt16 nId ) { nConId = nId; };
- inline BOOL IsBestConnection() const { return bBestConn; };
- inline BOOL IsBestVertex() const { return bBestVertex; };
- inline BOOL IsAutoVertex() const { return bAutoVertex; };
+ inline sal_Bool IsBestConnection() const { return bBestConn; };
+ inline sal_Bool IsBestVertex() const { return bBestVertex; };
+ inline sal_Bool IsAutoVertex() const { return bAutoVertex; };
inline sal_uInt16 GetConnectorId() const { return nConId; };
inline SdrObject* GetObject() const { return pObj; }
};
@@ -108,9 +108,9 @@ public:
// Nachfolgende Werte werden von ImpCalcEdgeTrack gesetzt
long nAngle1; // Austrittswinkel am Obj1
long nAngle2; // Austrittswinkel am Obj2
- USHORT nObj1Lines; // 1..3
- USHORT nObj2Lines; // 1..3
- USHORT nMiddleLine; // 0xFFFF=keine, sonst Punktnummer des Linienbeginns
+ sal_uInt16 nObj1Lines; // 1..3
+ sal_uInt16 nObj2Lines; // 1..3
+ sal_uInt16 nMiddleLine; // 0xFFFF=keine, sonst Punktnummer des Linienbeginns
char cOrthoForm; // Form des Ortho-Verbindes, z.B. 'Z','U',I','L','S',...
public:
@@ -125,8 +125,8 @@ public:
Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode);
const Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode) const { return ((SdrEdgeInfoRec*)this)->ImpGetLineVersatzPoint(eLineCode); }
- USHORT ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
- FASTBOOL ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
+ sal_uInt16 ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
+ int ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
void ImpSetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal);
long ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const;
};
@@ -141,7 +141,7 @@ public:
SdrObjConnection aCon1; // Verbindungszustand des Linienanfangs
SdrObjConnection aCon2; // Verbindungszustand des Linienendes
XPolygon* pEdgeTrack;
- sal_Bool bEdgeTrackDirty;// TRUE=Verbindungsverlauf muss neu berechnet werden.
+ sal_Bool bEdgeTrackDirty;// sal_True=Verbindungsverlauf muss neu berechnet werden.
sal_Bool bEdgeTrackUserDefined;
SdrEdgeInfoRec aEdgeInfo;
@@ -175,7 +175,7 @@ protected:
SdrEdgeInfoRec aEdgeInfo;
// bitfield
- unsigned bEdgeTrackDirty : 1; // TRUE=Verbindungsverlauf muss neu berechnet werden.
+ unsigned bEdgeTrackDirty : 1; // sal_True=Verbindungsverlauf muss neu berechnet werden.
unsigned bEdgeTrackUserDefined : 1;
// #109007#
@@ -207,11 +207,11 @@ protected:
XPolygon ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& rCon1, SdrObjConnection& rCon2, SdrEdgeInfoRec* pInfo) const;
XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1,
const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2,
- ULONG* pnQuality, SdrEdgeInfoRec* pInfo) const;
- static FASTBOOL ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL);
- USHORT ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const;
- FASTBOOL ImpStripPolyPoints(XPolygon& rXP) const; // entfernen ueberfluessiger Punkte
- void ImpSetTailPoint(FASTBOOL bTail1, const Point& rPt);
+ sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const;
+ static int ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL);
+ sal_uInt16 ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const;
+ int ImpStripPolyPoints(XPolygon& rXP) const; // entfernen ueberfluessiger Punkte
+ void ImpSetTailPoint(int bTail1, const Point& rPt);
void ImpUndirtyEdgeTrack(); // eventuelle Neuberechnung des Verbindungsverlaufs
void ImpDirtyEdgeTrack(); // invalidate connector path, so it will be recalculated next time
void ImpSetAttrToEdgeInfo(); // Werte vom Pool nach aEdgeInfo kopieren
@@ -223,26 +223,26 @@ public:
SdrEdgeObj();
virtual ~SdrEdgeObj();
- SdrObjConnection& GetConnection(FASTBOOL bTail1) { return *(bTail1 ? &aCon1 : &aCon2); }
+ SdrObjConnection& GetConnection(int bTail1) { return *(bTail1 ? &aCon1 : &aCon2); }
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual const Rectangle& GetCurrentBoundRect() const;
virtual const Rectangle& GetSnapRect() const;
- virtual FASTBOOL IsNode() const;
- virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
- virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const;
+ virtual int IsNode() const;
+ virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
+ virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const;
virtual const SdrGluePointList* GetGluePointList() const;
virtual SdrGluePointList* ForceGluePointList();
- virtual FASTBOOL IsEdge() const;
+ virtual int IsEdge() const;
// bTail1=TRUE: Linienanfang, sonst LinienEnde
// pObj=NULL: Disconnect
- void SetEdgeTrackDirty() { bEdgeTrackDirty=TRUE; }
- void ConnectToNode(FASTBOOL bTail1, SdrObject* pObj);
- void DisconnectFromNode(FASTBOOL bTail1);
- SdrObject* GetConnectedNode(FASTBOOL bTail1) const;
- const SdrObjConnection& GetConnection(FASTBOOL bTail1) const { return *(bTail1 ? &aCon1 : &aCon2); }
- FASTBOOL CheckNodeConnection(FASTBOOL bTail1) const;
+ void SetEdgeTrackDirty() { bEdgeTrackDirty=sal_True; }
+ void ConnectToNode(int bTail1, SdrObject* pObj);
+ void DisconnectFromNode(int bTail1);
+ SdrObject* GetConnectedNode(int bTail1) const;
+ const SdrObjConnection& GetConnection(int bTail1) const { return *(bTail1 ? &aCon1 : &aCon2); }
+ int CheckNodeConnection(int bTail1) const;
virtual void RecalcSnapRect();
virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
@@ -273,14 +273,14 @@ public:
// #102344# Added missing implementation
virtual void NbcSetAnchorPos(const Point& rPnt);
- virtual FASTBOOL BegCreate(SdrDragStat& rStat);
- virtual FASTBOOL MovCreate(SdrDragStat& rStat);
- virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- virtual FASTBOOL BckCreate(SdrDragStat& rStat);
+ virtual int BegCreate(SdrDragStat& rStat);
+ virtual int MovCreate(SdrDragStat& rStat);
+ virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual int BckCreate(SdrDragStat& rStat);
virtual void BrkCreate(SdrDragStat& rStat);
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
virtual Pointer GetCreatePointer() const;
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
virtual sal_uInt32 GetSnapPointCount() const;
virtual Point GetSnapPoint(sal_uInt32 i) const;
@@ -300,8 +300,8 @@ public:
void Reformat();
// helper methods for the StarOffice api
- Point GetTailPoint( BOOL bTail ) const;
- void SetTailPoint( BOOL bTail, const Point& rPt );
+ Point GetTailPoint( sal_Bool bTail ) const;
+ void SetTailPoint( sal_Bool bTail, const Point& rPt );
void setGluePointIndex( sal_Bool bTail, sal_Int32 nId = -1 );
sal_Int32 getGluePointIndex( sal_Bool bTail );
@@ -320,24 +320,24 @@ public:
//
// Zur Bestimmung der Verlaufslinie werden folgende Item-Parameter des SdrItemPool verwendet:
//
-// USHORT EdgeFlowAngle Default 9000 (=90.00 Deg), min 0, max 9000
+// sal_uInt16 EdgeFlowAngle Default 9000 (=90.00 Deg), min 0, max 9000
// Verlauffreiheitswinkel.
// Der Winkel, in dem die Verbindungslinie verlaufen darf.
//
-// USHORT EdgeEscAngle Default 9000 (=90.00 Deg), min 0, max 9000
+// sal_uInt16 EdgeEscAngle Default 9000 (=90.00 Deg), min 0, max 9000
// Objektaustrittswinkel.
// Der Winkel, in dem die Verbindungslinie aus dem Objekt austreten darf.
//
-// BOOL EdgeEscAsRay Default FALSE
-// TRUE= die Verbindungslinie tritt aus dem Obj Strahlenfoermig aus.
+// sal_Bool EdgeEscAsRay Default FALSE
+// sal_True= die Verbindungslinie tritt aus dem Obj Strahlenfoermig aus.
// Also Winkelvorgabe durch die Strecke ObjMitte/Konnektor.
//
-// BOOL EdgeEscUseObjAngle Default FALSE
+// sal_Bool EdgeEscUseObjAngle Default FALSE
// Objektdrehwinkelberuecksichtigung.
-// TRUE= Bei der Bestimmung des Objektaustrittswinkels wird der
+// sal_True= Bei der Bestimmung des Objektaustrittswinkels wird der
// Drehwinkel des Objekts als Offset beruecksichtigt.
//
-// ULONG EdgeFlowDefDist Default 0, min 0, max ?
+// sal_uIntPtr EdgeFlowDefDist Default 0, min 0, max ?
// Das ist der Default-Mindestabstand der bei der Berechnung der
// Verbindungslinie zu den angedockten Objekten in logischen Einheiten.
// Dieser Abstand wird innerhalb des Objektes "ueberschrieben", sobald
diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx
index 1eba8822402a..9b8f318cce16 100644
--- a/svx/inc/svx/svdograf.hxx
+++ b/svx/inc/svx/svdograf.hxx
@@ -140,7 +140,7 @@ public:
void SetGraphic(const Graphic& rGrf);
const Graphic& GetGraphic() const;
- Graphic GetTransformedGraphic( ULONG nTransformFlags = SDRGRAFOBJ_TRANSFORMATTR_ALL ) const;
+ Graphic GetTransformedGraphic( sal_uIntPtr nTransformFlags = SDRGRAFOBJ_TRANSFORMATTR_ALL ) const;
GraphicType GetGraphicType() const;
@@ -161,7 +161,7 @@ public:
void SetGraphicLink(const String& rFileName, const String& rFilterName);
void ReleaseGraphicLink();
- sal_Bool IsLinkedGraphic() const { return (BOOL)aFileName.Len(); }
+ sal_Bool IsLinkedGraphic() const { return (sal_Bool)aFileName.Len(); }
void SetFileName(const String& rFileName);
const String& GetFileName() const { return aFileName; }
@@ -172,7 +172,7 @@ public:
void StopAnimation(OutputDevice* pOutDev=NULL, long nExtraData=0L);
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
@@ -188,20 +188,20 @@ public:
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
- virtual void NbcShear (const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ virtual void NbcShear (const Point& rRef, long nWink, double tn, int bVShear);
virtual void NbcSetSnapRect(const Rectangle& rRect);
virtual void NbcSetLogicRect(const Rectangle& rRect);
virtual SdrObjGeoData* NewGeoData() const;
virtual void SaveGeoData(SdrObjGeoData& rGeo) const;
virtual void RestGeoData(const SdrObjGeoData& rGeo);
- FASTBOOL HasGDIMetaFile() const;
+ int HasGDIMetaFile() const;
const GDIMetaFile* GetGDIMetaFile() const;
virtual void SetPage(SdrPage* pNewPage);
virtual void SetModel(SdrModel* pNewModel);
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false );
diff --git a/svx/inc/svx/svdogrp.hxx b/svx/inc/svx/svdogrp.hxx
index 440e758291ca..227d2817b450 100644
--- a/svx/inc/svx/svdogrp.hxx
+++ b/svx/inc/svx/svdogrp.hxx
@@ -56,7 +56,7 @@ protected:
long nShearWink;
Point aRefPoint; // Referenzpunkt innerhalb der Objektgruppe
- FASTBOOL bRefPoint; // Ist ein RefPoint gesetzt?
+ int bRefPoint; // Ist ein RefPoint gesetzt?
public:
TYPEINFO();
@@ -64,14 +64,14 @@ public:
virtual ~SdrObjGroup();
virtual void SetBoundRectDirty();
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
virtual SdrLayerID GetLayer() const;
virtual void NbcSetLayer(SdrLayerID nLayer);
virtual void SetObjList(SdrObjList* pNewObjList);
virtual void SetPage(SdrPage* pNewPage);
virtual void SetModel(SdrModel* pNewModel);
- virtual FASTBOOL HasRefPoint() const;
+ virtual int HasRefPoint() const;
virtual Point GetRefPoint() const;
virtual void SetRefPoint(const Point& rPnt);
virtual SdrObjList* GetSubList() const;
@@ -90,16 +90,16 @@ public:
// special drag methods
virtual bool beginSpecialDrag(SdrDragStat& rDrag) const;
- virtual FASTBOOL BegCreate(SdrDragStat& rStat);
+ virtual int BegCreate(SdrDragStat& rStat);
virtual long GetRotateAngle() const;
- virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const;
+ virtual long GetShearAngle(int bVertical=sal_False) const;
virtual void Move(const Size& rSiz);
virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void Rotate(const Point& rRef, long nWink, double sn, double cs);
virtual void Mirror(const Point& rRef1, const Point& rRef2);
- virtual void Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ virtual void Shear(const Point& rRef, long nWink, double tn, int bVShear);
virtual void SetAnchorPos(const Point& rPnt);
virtual void SetRelativePos(const Point& rPnt);
virtual void SetSnapRect(const Rectangle& rRect);
@@ -109,7 +109,7 @@ public:
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
- virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear);
virtual void NbcSetAnchorPos(const Point& rPnt);
virtual void NbcSetRelativePos(const Point& rPnt);
virtual void NbcSetSnapRect(const Rectangle& rRect);
@@ -118,7 +118,7 @@ public:
virtual void NbcReformatText();
virtual void ReformatText();
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
};
#endif //_SVDOGRP_HXX
diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx
index fe8740dd40ed..11e1a5cacb23 100644
--- a/svx/inc/svx/svdomeas.hxx
+++ b/svx/inc/svx/svdomeas.hxx
@@ -77,7 +77,7 @@ protected:
Point aPt1;
Point aPt2;
- FASTBOOL bTextDirty;
+ int bTextDirty;
protected:
void ImpTakeAttr(ImpMeasureRec& rRec) const;
@@ -85,7 +85,7 @@ protected:
void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const;
basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol) const;
void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const;
- void SetTextDirty() { bTextDirty=TRUE; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(sal_True); } }
+ void SetTextDirty() { bTextDirty=sal_True; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(sal_True); } }
void UndirtyText() const;
virtual SdrObjGeoData* NewGeoData() const;
@@ -99,7 +99,7 @@ public:
virtual ~SdrMeasureObj();
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
virtual void operator=(const SdrObject& rObj);
@@ -116,10 +116,10 @@ public:
virtual bool applySpecialDrag(SdrDragStat& rDrag);
virtual String getSpecialDragComment(const SdrDragStat& rDrag) const;
- virtual FASTBOOL BegCreate(SdrDragStat& rStat);
- virtual FASTBOOL MovCreate(SdrDragStat& rStat);
- virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- virtual FASTBOOL BckCreate(SdrDragStat& rStat);
+ virtual int BegCreate(SdrDragStat& rStat);
+ virtual int MovCreate(SdrDragStat& rStat);
+ virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual int BckCreate(SdrDragStat& rStat);
virtual void BrkCreate(SdrDragStat& rStat);
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
virtual Pointer GetCreatePointer() const;
@@ -128,7 +128,7 @@ public:
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
- virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear);
virtual long GetRotateAngle() const;
virtual void RecalcSnapRect();
@@ -140,20 +140,20 @@ public:
virtual Point GetPoint(sal_uInt32 i) const;
virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i);
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
virtual sal_Bool BegTextEdit(SdrOutliner& rOutl);
virtual const Size& GetTextSize() const;
- virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE,
- Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
+ virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText=sal_False,
+ Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const;
virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const;
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
- virtual USHORT GetOutlinerViewAnchorMode() const;
+ virtual sal_uInt16 GetOutlinerViewAnchorMode() const;
virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject);
virtual OutlinerParaObject* GetOutlinerParaObject() const;
- virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
- FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const;
+ virtual int CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
+ int bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const;
// #i97878#
virtual sal_Bool TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, basegfx::B2DPolyPolygon& rPolyPolygon) const;
diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx
index 79933be98a9b..9e037fdb4bf7 100644
--- a/svx/inc/svx/svdoole2.hxx
+++ b/svx/inc/svx/svdoole2.hxx
@@ -68,8 +68,8 @@ protected:
String aProgName;
// wg. Kompatibilitaet erstmal am SdrTextObj
- BOOL bFrame : 1;
- BOOL bInDestruction : 1;
+ sal_Bool bFrame : 1;
+ sal_Bool bInDestruction : 1;
mutable bool m_bTypeAsked;
mutable bool m_bChart;
@@ -85,10 +85,10 @@ protected:
public:
TYPEINFO();
- SdrOle2Obj(FASTBOOL bFrame_=FALSE);
- SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFrame_=FALSE);
- SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, FASTBOOL bFrame_=FALSE);
- SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_=FALSE);
+ SdrOle2Obj(int bFrame_=sal_False);
+ SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, int bFrame_=sal_False);
+ SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, int bFrame_=sal_False);
+ SdrOle2Obj(const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect, int bFrame_=sal_False);
virtual ~SdrOle2Obj();
// access to svt::EmbeddedObjectRef
@@ -117,7 +117,7 @@ public:
// spaeter wieder abfragen kann (SD braucht das fuer Praesentationsobjekte).
void SetProgName(const String& rNam) { aProgName=rNam; }
const String& GetProgName() const { return aProgName; }
- FASTBOOL IsEmpty() const;
+ int IsEmpty() const;
void SetObjRef(const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rNewObjRef);
com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObjRef() const;
@@ -140,7 +140,7 @@ public:
virtual SdrObject* getFullDragClone() const;
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
@@ -155,7 +155,7 @@ public:
static sal_Bool CanUnloadRunningObj( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj,
sal_Int64 nAspect );
static sal_Bool Unload( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect );
- BOOL Unload();
+ sal_Bool Unload();
void Connect();
void Disconnect();
void ObjectLoaded();
diff --git a/svx/inc/svx/svdopath.hxx b/svx/inc/svx/svdopath.hxx
index 4ed1deb47f1f..528e7170e231 100644
--- a/svx/inc/svx/svdopath.hxx
+++ b/svx/inc/svx/svdopath.hxx
@@ -93,7 +93,7 @@ public:
virtual ~SdrPathObj();
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
virtual void operator=(const SdrObject& rObj);
@@ -115,10 +115,10 @@ public:
virtual String getSpecialDragComment(const SdrDragStat& rDrag) const;
virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const;
- virtual FASTBOOL BegCreate(SdrDragStat& rStat);
- virtual FASTBOOL MovCreate(SdrDragStat& rStat);
- virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- virtual FASTBOOL BckCreate(SdrDragStat& rStat);
+ virtual int BegCreate(SdrDragStat& rStat);
+ virtual int MovCreate(SdrDragStat& rStat);
+ virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual int BckCreate(SdrDragStat& rStat);
virtual void BrkCreate(SdrDragStat& rStat);
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
Pointer GetCreatePointer() const;
@@ -131,7 +131,7 @@ public:
virtual void NbcResize(const Point& rRefPnt, const Fraction& aXFact, const Fraction& aYFact);
virtual void NbcRotate(const Point& rRefPnt, long nAngle, double fSin, double fCos);
virtual void NbcMirror(const Point& rRefPnt1, const Point& rRefPnt2);
- virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, FASTBOOL bVShear);
+ virtual void NbcShear(const Point& rRefPnt, long nAngle, double fTan, int bVShear);
virtual sal_uInt32 GetSnapPointCount() const;
virtual Point GetSnapPoint(sal_uInt32 i) const;
@@ -154,7 +154,7 @@ protected:
virtual void RestGeoData(const SdrObjGeoData& rGeo);
public:
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
// Bezierpolygon holen/setzen
const basegfx::B2DPolyPolygon& GetPathPoly() const { return maPathPolygon; }
diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx
index b333ed8757f1..72382fde7d64 100644
--- a/svx/inc/svx/svdorect.hxx
+++ b/svx/inc/svx/svdorect.hxx
@@ -62,8 +62,8 @@ protected:
XPolygon* mpXPoly;
protected:
- // Liefert TRUE, wenn das Painten ein Polygon erfordert.
- FASTBOOL PaintNeedsXPoly(long nEckRad) const;
+ // Liefert sal_True, wenn das Painten ein Polygon erfordert.
+ int PaintNeedsXPoly(long nEckRad) const;
protected:
XPolygon ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const;
@@ -87,12 +87,12 @@ public:
// Konstruktion eines Textrahmens
SdrRectObj(SdrObjKind eNewTextKind);
SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect);
- // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen
- SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat);
+ // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen
+ SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
virtual ~SdrRectObj();
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
virtual void TakeObjNameSingul(String& rName) const;
@@ -120,15 +120,15 @@ public:
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
- virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear);
- virtual FASTBOOL DoMacro(const SdrObjMacroHitRec& rRec);
+ virtual int DoMacro(const SdrObjMacroHitRec& rRec);
virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const;
- virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const;
- virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const;
+ virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const;
+ virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const;
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
};
diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx
index 02044f0dbc25..47b12451f84e 100644
--- a/svx/inc/svx/svdotable.hxx
+++ b/svx/inc/svx/svdotable.hxx
@@ -201,28 +201,28 @@ public:
// Gleichzeitig wird der Text in den Outliner gesetzt (ggf.
// der des EditOutliners) und die PaperSize gesetzt.
- virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE, ::Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
- virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE, Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
+ virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, int bNoEditText=sal_False, ::Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const;
+ virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText=sal_False, Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const;
virtual void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const;
virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const;
- virtual FASTBOOL IsAutoGrowHeight() const;
+ virtual int IsAutoGrowHeight() const;
long GetMinTextFrameHeight() const;
long GetMaxTextFrameHeight() const;
- virtual FASTBOOL IsAutoGrowWidth() const;
+ virtual int IsAutoGrowWidth() const;
long GetMinTextFrameWidth() const;
long GetMaxTextFrameWidth() const;
- virtual FASTBOOL IsFontwork() const;
+ virtual int IsFontwork() const;
virtual void SetPage(SdrPage* pNewPage);
virtual void SetModel(SdrModel* pNewModel);
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void SetChanged();
- virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE) const;
- virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE);
+ virtual int AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt=sal_True, int bWdt=sal_True) const;
+ virtual int AdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True);
virtual void TakeObjNameSingul(String& rName) const;
virtual void TakeObjNamePlural(String& rName) const;
virtual void operator=(const SdrObject& rObj);
@@ -250,10 +250,10 @@ public:
virtual String getSpecialDragComment(const SdrDragStat& rDrag) const;
virtual basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const;
- virtual FASTBOOL BegCreate(SdrDragStat& rStat);
- virtual FASTBOOL MovCreate(SdrDragStat& rStat);
- virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- virtual FASTBOOL BckCreate(SdrDragStat& rStat);
+ virtual int BegCreate(SdrDragStat& rStat);
+ virtual int MovCreate(SdrDragStat& rStat);
+ virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual int BckCreate(SdrDragStat& rStat);
virtual void BrkCreate(SdrDragStat& rStat);
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
virtual Pointer GetCreatePointer() const;
@@ -265,7 +265,7 @@ public:
virtual void EndTextEdit(SdrOutliner& rOutl);
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
virtual void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
- virtual USHORT GetOutlinerViewAnchorMode() const;
+ virtual sal_uInt16 GetOutlinerViewAnchorMode() const;
virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject);
diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx
index 3a15d33f2cdd..5c66e793e67d 100644
--- a/svx/inc/svx/svdotext.hxx
+++ b/svx/inc/svx/svdotext.hxx
@@ -178,8 +178,8 @@ private:
protected:
// Das aRect ist gleichzeig auch das Rect vom RectObj und CircObj.
- // Bei bTextFrame=TRUE wird der Text in dieses Rect hineinformatiert.
- // Bei bTextFrame=FALSE wird der Text am Mittelpunkt des Rect zentriert.
+ // Bei bTextFrame=sal_True wird der Text in dieses Rect hineinformatiert.
+ // Bei bTextFrame=sal_False wird der Text am Mittelpunkt des Rect zentriert.
Rectangle aRect;
// Der GeoStat enthaelt den Drehwinkel und einen Shearwinkel
@@ -206,7 +206,7 @@ protected:
// OBJ_TEXTEXT Textfortsetzungsrahmen
// OBJ_TITLETEXT TitleText fuer StarDraw-Praesentation
// OBJ_OUTLINETEXT OutlineText fuer StarDraw-Praesentation
- // eTextKind hat nur Bedeutung, wenn bTextFrame=TRUE, da es sich sonst
+ // eTextKind hat nur Bedeutung, wenn bTextFrame=sal_True, da es sich sonst
// um ein beschriftetes Grafikobjekt handelt.
SdrObjKind eTextKind;
@@ -223,36 +223,36 @@ public:
protected:
// Fuer beschriftete Zeichenobjekte ist bTextFrame=FALSE. Der Textblock
// wird dann hoizontal und vertikal an aRect zentriert. Bei bTextFrame=
- // TRUE wird der Text in aRect hineinformatiert. Der eigentliche Textrahmen
- // ist durch ein SdrRectObj mit bTextFrame=TRUE realisiert.
- BOOL bTextFrame : 1;
- BOOL bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten
- BOOL bNoShear : 1; // Obj darf nicht gesheart werden (->Graf+Ole+TextFrame)
- BOOL bNoRotate : 1; // Obj darf nicht gedreht werden (->Ole)
- BOOL bNoMirror : 1; // Obj darf nicht gespiegelt werden (->Ole,TextFrame)
- BOOL bTextSizeDirty : 1;
+ // sal_True wird der Text in aRect hineinformatiert. Der eigentliche Textrahmen
+ // ist durch ein SdrRectObj mit bTextFrame=sal_True realisiert.
+ sal_Bool bTextFrame : 1;
+ sal_Bool bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten
+ sal_Bool bNoShear : 1; // Obj darf nicht gesheart werden (->Graf+Ole+TextFrame)
+ sal_Bool bNoRotate : 1; // Obj darf nicht gedreht werden (->Ole)
+ sal_Bool bNoMirror : 1; // Obj darf nicht gespiegelt werden (->Ole,TextFrame)
+ sal_Bool bTextSizeDirty : 1;
// #101684#
- BOOL mbInEditMode : 1; // Is this text obejct in edit mode?
+ sal_Bool mbInEditMode : 1; // Is this text obejct in edit mode?
// Fuer Objekt mit freier Groesse im Draw (Mengentext). Das Flag wird vom
// der App beim Create gesetzt.
// Wenn das Objekt dann spaeter in der Breite resized wird, wird
- // AutoGrowWidth abgeschaltet (Hart auf FALSE attributiert). Das Flag wird
- // dann ebenfalls auf FALSE gesetzt, sodass sich das Objekt anschliessend
+ // AutoGrowWidth abgeschaltet (Hart auf sal_False attributiert). Das Flag wird
+ // dann ebenfalls auf sal_False gesetzt, sodass sich das Objekt anschliessend
// wie ein normales Textobjekt verhaelt.
// Resize in der Breite kann sein:
// - Interaktives Resize in Einfach- oder Mehrfachselektion
// - Positions+Groesse Dialog
- BOOL bDisableAutoWidthOnDragging : 1;
+ sal_Bool bDisableAutoWidthOnDragging : 1;
// #111096#
// Allow text suppression
- BOOL mbTextHidden : 1;
+ sal_Bool mbTextHidden : 1;
// #111096#
// Flag for allowing text animation. Default is sal_true.
- BOOL mbTextAnimationAllowed : 1;
+ sal_Bool mbTextAnimationAllowed : 1;
SdrOutliner& ImpGetDrawOutliner() const;
@@ -261,7 +261,7 @@ private:
// #101029#: Extracted from ImpGetDrawOutliner()
SVX_DLLPRIVATE void ImpInitDrawOutliner( SdrOutliner& rOutl ) const;
// #101029#: Extracted from Paint()
- SVX_DLLPRIVATE void ImpSetupDrawOutlinerForPaint( FASTBOOL bContourFrame,
+ SVX_DLLPRIVATE void ImpSetupDrawOutlinerForPaint( int bContourFrame,
SdrOutliner& rOutliner,
Rectangle& rTextRect,
Rectangle& rAnchorRect,
@@ -276,29 +276,29 @@ private:
protected:
bool ImpCanConvTextToCurve() const;
SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, sal_Bool bClosed, sal_Bool bBezier, sal_Bool bNoSetAttr = sal_False) const;
- SdrObject* ImpConvertAddText(SdrObject* pObj, FASTBOOL bBezier) const;
+ SdrObject* ImpConvertAddText(SdrObject* pObj, int bBezier) const;
void ImpSetTextStyleSheetListeners();
void ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& rTextRect, const Rectangle& rAnchorRect, Fraction& rFitXKorreg) const;
void ImpJustifyRect(Rectangle& rRect) const;
void ImpCheckShear();
Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
void ImpSetTextEditParams() const;
- void SetTextSizeDirty() { bTextSizeDirty=TRUE; }
+ void SetTextSizeDirty() { bTextSizeDirty=sal_True; }
// rAnchorRect ist InOut-Parameter!
- void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, BOOL bLineWidth ) const;
+ void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const;
virtual SdrObjGeoData* NewGeoData() const;
virtual void SaveGeoData(SdrObjGeoData& rGeo) const;
virtual void RestGeoData(const SdrObjGeoData& rGeo);
- FASTBOOL NbcSetEckenradius(long nRad);
- FASTBOOL NbcSetAutoGrowHeight(bool bAuto);
- FASTBOOL NbcSetMinTextFrameHeight(long nHgt);
- FASTBOOL NbcSetMaxTextFrameHeight(long nHgt);
- FASTBOOL NbcSetAutoGrowWidth(bool bAuto);
- FASTBOOL NbcSetMinTextFrameWidth(long nWdt);
- FASTBOOL NbcSetMaxTextFrameWidth(long nWdt);
- FASTBOOL NbcSetFitToSize(SdrFitToSizeType eFit);
+ int NbcSetEckenradius(long nRad);
+ int NbcSetAutoGrowHeight(bool bAuto);
+ int NbcSetMinTextFrameHeight(long nHgt);
+ int NbcSetMaxTextFrameHeight(long nHgt);
+ int NbcSetAutoGrowWidth(bool bAuto);
+ int NbcSetMinTextFrameWidth(long nWdt);
+ int NbcSetMaxTextFrameWidth(long nWdt);
+ int NbcSetFitToSize(SdrFitToSizeType eFit);
// Konstruktoren fuer beschriftete Zeichenobjekte
SdrTextObj();
@@ -308,15 +308,15 @@ protected:
SdrTextObj(SdrObjKind eNewTextKind);
SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect);
- // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen
- SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat);
+ // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen
+ SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
virtual ~SdrTextObj();
public:
TYPEINFO();
// #101684#
- BOOL IsInEditMode() const { return mbInEditMode; }
+ sal_Bool IsInEditMode() const { return mbInEditMode; }
// via eCharSet kann der CharSet der vorliegenden Datei uebergeben werden.
// Bei RTL_TEXTENCODING_DONTKNOW wird der CharSet der aktuellen Plattform verwendet.
@@ -330,20 +330,20 @@ public:
// Eine Attributierung kann nur am Textrahmen vollzogen werden.
void SetTextLink(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet);
void ReleaseTextLink();
- FASTBOOL IsLinkedText() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; }
- FASTBOOL ReloadLinkedText(FASTBOOL bForceLoad=FALSE);
- FASTBOOL LoadText(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet);
+ int IsLinkedText() const { return pPlusData!=NULL && GetLinkUserData()!=NULL; }
+ int ReloadLinkedText(int bForceLoad=sal_False);
+ int LoadText(const String& rFileName, const String& rFilterName, rtl_TextEncoding eCharSet);
- virtual FASTBOOL AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE) const;
- virtual FASTBOOL NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE);
- virtual FASTBOOL AdjustTextFrameWidthAndHeight(FASTBOOL bHgt=TRUE, FASTBOOL bWdt=TRUE);
+ virtual int AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt=sal_True, int bWdt=sal_True) const;
+ virtual int NbcAdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True);
+ virtual int AdjustTextFrameWidthAndHeight(int bHgt=sal_True, int bWdt=sal_True);
void NbcResizeTextAttributes(const Fraction& xFact, const Fraction& yFact);
- FASTBOOL IsTextFrame() const { return bTextFrame; }
- FASTBOOL IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); }
+ int IsTextFrame() const { return bTextFrame; }
+ int IsOutlText() const { return bTextFrame && (eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT); }
SdrObjKind GetTextKind() const { return eTextKind; }
virtual bool HasText() const;
- FASTBOOL HasEditText() const;
+ int HasEditText() const;
sal_Bool IsTextEditActive() const { return (pEdtOutl != 0L); }
/** returns the currently active text. */
@@ -364,12 +364,12 @@ public:
/** returns the index of the text that contains the given point or -1 */
virtual sal_Int32 CheckTextHit(const Point& rPnt) const;
- void SetDisableAutoWidthOnDragging(FASTBOOL bOn) { bDisableAutoWidthOnDragging=bOn; }
- FASTBOOL IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; }
+ void SetDisableAutoWidthOnDragging(int bOn) { bDisableAutoWidthOnDragging=bOn; }
+ int IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; }
void NbcSetText(const String& rStr);
void SetText(const String& rStr);
- void NbcSetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat);
- void SetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat);
+ void NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
+ void SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
// FitToSize und Fontwork wird bei GetTextSize() nicht berueksichtigt!
virtual const Size& GetTextSize() const;
@@ -377,16 +377,16 @@ public:
// Gleichzeitig wird der Text in den Outliner gesetzt (ggf.
// der des EditOutliners) und die PaperSize gesetzt.
- virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText=FALSE,
- Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const;
+ virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText=sal_False,
+ Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const;
virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const;
const GeoStat& GetGeoStat() const { return aGeo; }
long GetEckenradius() const;
- virtual FASTBOOL IsAutoGrowHeight() const;
+ virtual int IsAutoGrowHeight() const;
long GetMinTextFrameHeight() const;
long GetMaxTextFrameHeight() const;
- virtual FASTBOOL IsAutoGrowWidth() const;
+ virtual int IsAutoGrowWidth() const;
long GetMinTextFrameWidth() const;
long GetMaxTextFrameWidth() const;
@@ -394,13 +394,13 @@ public:
const Rectangle &GetGeoRect() const { return aRect; }
// Feststellen, ob TextFontwork
- virtual FASTBOOL IsFontwork() const;
+ virtual int IsFontwork() const;
// Soll die Fontwork-Kontour versteckt werden?
- FASTBOOL IsHideContour() const;
+ int IsHideContour() const;
// Textfluss innerhalb Kontur
- FASTBOOL IsContourTextFrame() const;
+ int IsContourTextFrame() const;
// Horizontale Textausrichtung
SdrTextHorzAdjust GetTextHorizontalAdjust(const SfxItemSet& rSet) const;
@@ -421,7 +421,7 @@ public:
virtual void SetPage(SdrPage* pNewPage);
virtual void SetModel(SdrModel* pNewModel);
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
// Wird zur Bestimmung des Textankerbereichs benoetigt
virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const;
@@ -435,7 +435,7 @@ public:
virtual void NbcSetLogicRect(const Rectangle& rRect);
virtual const Rectangle& GetLogicRect() const;
virtual long GetRotateAngle() const;
- virtual long GetShearAngle(FASTBOOL bVertical=FALSE) const;
+ virtual long GetShearAngle(int bVertical=sal_False) const;
virtual sal_uInt32 GetSnapPointCount() const;
virtual Point GetSnapPoint(sal_uInt32 i) const;
@@ -448,10 +448,10 @@ public:
virtual bool applySpecialDrag(SdrDragStat& rDrag);
virtual String getSpecialDragComment(const SdrDragStat& rDrag) const;
- virtual FASTBOOL BegCreate(SdrDragStat& rStat);
- virtual FASTBOOL MovCreate(SdrDragStat& rStat);
- virtual FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- virtual FASTBOOL BckCreate(SdrDragStat& rStat);
+ virtual int BegCreate(SdrDragStat& rStat);
+ virtual int MovCreate(SdrDragStat& rStat);
+ virtual int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ virtual int BckCreate(SdrDragStat& rStat);
virtual void BrkCreate(SdrDragStat& rStat);
virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const;
virtual Pointer GetCreatePointer() const;
@@ -460,13 +460,13 @@ public:
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
- virtual void NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear);
+ virtual void NbcShear(const Point& rRef, long nWink, double tn, int bVShear);
- virtual FASTBOOL HasTextEdit() const;
+ virtual int HasTextEdit() const;
virtual sal_Bool BegTextEdit(SdrOutliner& rOutl);
virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const;
virtual void EndTextEdit(SdrOutliner& rOutl);
- virtual USHORT GetOutlinerViewAnchorMode() const;
+ virtual sal_uInt16 GetOutlinerViewAnchorMode() const;
void StartTextAnimation(OutputDevice* pOutDev, const Point& rOffset, long nExtraData=0L);
void StopTextAnimation(OutputDevice* pOutDev=NULL, long nExtraData=0L);
@@ -480,10 +480,10 @@ public:
virtual void NbcReformatText();
virtual void ReformatText();
- virtual FASTBOOL CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
- FASTBOOL bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const;
+ virtual int CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
+ int bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const;
- virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const;
+ virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const;
void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; }
diff --git a/svx/inc/svx/svdouno.hxx b/svx/inc/svx/svdouno.hxx
index c30f22064674..d8f26beba9f5 100644
--- a/svx/inc/svx/svdouno.hxx
+++ b/svx/inc/svx/svdouno.hxx
@@ -63,7 +63,7 @@ class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj
String aUnoControlModelTypeName;
String aUnoControlTypeName;
- BOOL bOwnUnoControlModel;
+ sal_Bool bOwnUnoControlModel;
protected:
::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > xUnoControlModel; // kann auch von aussen gesetzt werden
@@ -76,17 +76,17 @@ private:
public:
TYPEINFO();
- SdrUnoObj(const String& rModelName, BOOL bOwnsModel = TRUE);
+ SdrUnoObj(const String& rModelName, sal_Bool bOwnsModel = sal_True);
SdrUnoObj(const String& rModelName,
const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac,
- BOOL bOwnsModel = TRUE);
+ sal_Bool bOwnsModel = sal_True);
virtual ~SdrUnoObj();
virtual void SetPage(SdrPage* pNewPage);
virtual void SetModel(SdrModel* pModel);
virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const;
- virtual UINT16 GetObjIdentifier() const;
+ virtual sal_uInt16 GetObjIdentifier() const;
virtual void operator = (const SdrObject& rObj);
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
@@ -151,7 +151,7 @@ private:
@param _out_rpContact
Upon successfull return, ->_out_rpContact contains the ViewContact.
@return
- <TRUE/> if and only if the contact was successfully retrieved. In this case,
+ <sal_True/> if and only if the contact was successfully retrieved. In this case,
->_out_rpContact contains a pointer to this contact.
A failure to retrieve the contact object fires an assertion in non-product builds.
*/
diff --git a/svx/inc/svx/svdoutl.hxx b/svx/inc/svx/svdoutl.hxx
index cc7015197b23..f06ded64e8b6 100644
--- a/svx/inc/svx/svdoutl.hxx
+++ b/svx/inc/svx/svdoutl.hxx
@@ -43,7 +43,7 @@ protected:
const SdrPage* mpVisualizedPage;
public:
- SdrOutliner( SfxItemPool* pItemPool, USHORT nMode );
+ SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode );
virtual ~SdrOutliner() ;
void SetTextObj( const SdrTextObj* pObj );
@@ -53,7 +53,7 @@ public:
void setVisualizedPage(const SdrPage* pPage) { if(pPage != mpVisualizedPage) mpVisualizedPage = pPage; }
const SdrPage* getVisualizedPage() const { return mpVisualizedPage; }
- virtual String CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor);
+ virtual String CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor);
};
#endif //_SVDOUTL_HXX
diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx
index 784598d7d544..f85596251dd0 100644
--- a/svx/inc/svx/svdpage.hxx
+++ b/svx/inc/svx/svdpage.hxx
@@ -97,8 +97,8 @@ friend class SdrEditView;
Rectangle aOutRect;
Rectangle aSnapRect;
SdrObjListKind eListKind;
- FASTBOOL bObjOrdNumsDirty;
- FASTBOOL bRectsDirty;
+ int bObjOrdNumsDirty;
+ int bRectsDirty;
protected:
virtual void RecalcRects();
@@ -113,7 +113,7 @@ public:
// !!! Diese Methode nur fuer Leute, die ganz genau wissen was sie tun !!!
// #110094# This should not be needed (!)
- void SetObjOrdNumsDirty() { bObjOrdNumsDirty=TRUE; }
+ void SetObjOrdNumsDirty() { bObjOrdNumsDirty=sal_True; }
// pModel, pPage, pUpList und pOwnerObj werden Zuweisungeoperator nicht veraendert!
void operator=(const SdrObjList& rSrcList);
void CopyObjects(const SdrObjList& rSrcList);
@@ -131,24 +131,24 @@ public:
virtual void SetModel(SdrModel* pNewModel);
// Neuberechnung der Objekt-Ordnungsnummern
void RecalcObjOrdNums();
- FASTBOOL IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; }
- virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND
+ int IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; }
+ virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND
, const SdrInsertReason* pReason=NULL
);
- virtual void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND
+ virtual void InsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND
, const SdrInsertReason* pReason=NULL
);
// aus Liste entfernen ohne delete
- virtual SdrObject* NbcRemoveObject(ULONG nObjNum);
- virtual SdrObject* RemoveObject(ULONG nObjNum);
+ virtual SdrObject* NbcRemoveObject(sal_uIntPtr nObjNum);
+ virtual SdrObject* RemoveObject(sal_uIntPtr nObjNum);
// Vorhandenes Objekt durch ein anderes ersetzen.
// Wie Remove&Insert jedoch performanter, da die Ordnungsnummern
// nicht Dirty gesetzt werden muessen.
- virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum);
- virtual SdrObject* ReplaceObject(SdrObject* pNewObj, ULONG nObjNum);
+ virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum);
+ virtual SdrObject* ReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum);
// Die Z-Order eines Objekts veraendern
- virtual SdrObject* NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum);
- virtual SdrObject* SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum);
+ virtual SdrObject* NbcSetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum);
+ virtual SdrObject* SetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum);
virtual void SetRectsDirty();
@@ -165,14 +165,14 @@ public:
// Die Vorlagenattribute der Zeichenobjekte in harte Attribute verwandeln.
void BurnInStyleSheetAttributes();
- ULONG GetObjCount() const;
- SdrObject* GetObj(ULONG nNum) const;
+ sal_uIntPtr GetObjCount() const;
+ SdrObject* GetObj(sal_uIntPtr nNum) const;
// Gelinkte Seite oder gelinktes Gruppenobjekt
- virtual FASTBOOL IsReadOnly() const;
+ virtual int IsReadOnly() const;
// Zaehlt alle Objekte inkl. Objekte in Objektgruppen, ...
- ULONG CountAllObjects() const;
+ sal_uIntPtr CountAllObjects() const;
// Alle aufgelagerten Teile (z.B. Grafiken) der Liste in den
// Speicher laden.
@@ -199,10 +199,10 @@ public:
operation is performed recursively, such that the content of
the given object contains no groups afterwards.
*/
- virtual void UnGroupObj( ULONG nObjNum );
+ virtual void UnGroupObj( sal_uIntPtr nObjNum );
/** Return whether there is an explicit, user defined, object navigation
- order. When there is one this method returns <TRUE/> and the
+ order. When there is one this method returns <sal_True/> and the
GetObjectForNavigationPosition() and
SdrObject::GetNavigationPosition() methods will return values
different from those returne by SdrObject::GetOrdNum() and
@@ -238,11 +238,11 @@ public:
the mpNavigationOrder list. This method returns immediately when no
update is necessary.
@return
- This method returns <TRUE/> when the navigation positions stored
+ This method returns <sal_True/> when the navigation positions stored
in SdrObjects are up to date.
- It returns <FALSE/> when teh navigation positions are not valid,
+ It returns <sal_False/> when teh navigation positions are not valid,
for example because no explicit navigation order has been
- defined, i.e. HasObjectNavigationOrder() would return <FALSE/>.
+ defined, i.e. HasObjectNavigationOrder() would return <sal_False/>.
*/
bool RecalcNavigationPositions (void);
@@ -264,7 +264,7 @@ private:
/// not exist then maList defines the navigation order.
::boost::scoped_ptr<WeakSdrObjectContainerType> mpNavigationOrder;
- /// This flag is <TRUE/> when the mpNavigation list has been changed but
+ /// This flag is <sal_True/> when the mpNavigation list has been changed but
/// the indices of the referenced SdrObjects still have their old values.
bool mbIsNavigationOrderDirty;
@@ -342,17 +342,17 @@ private:
SVX_DLLPRIVATE SdrPageGridFrameList(const SdrPageGridFrameList& rSrcList); // never implemented
SVX_DLLPRIVATE void operator=(const SdrPageGridFrameList& rSrcList); // never implemented
protected:
- SdrPageGridFrame* GetObject(USHORT i) const { return (SdrPageGridFrame*)(aList.GetObject(i)); }
+ SdrPageGridFrame* GetObject(sal_uInt16 i) const { return (SdrPageGridFrame*)(aList.GetObject(i)); }
public:
SdrPageGridFrameList(): aList(1024,4,4) {}
~SdrPageGridFrameList() { Clear(); }
void Clear();
- USHORT GetCount() const { return USHORT(aList.Count()); }
- void Insert(const SdrPageGridFrame& rGF, USHORT nPos=0xFFFF) { aList.Insert(new SdrPageGridFrame(rGF),nPos); }
- void Delete(USHORT nPos) { delete (SdrPageGridFrame*)aList.Remove(nPos); }
- void Move(USHORT nPos, USHORT nNewPos) { aList.Insert(aList.Remove(nPos),nNewPos); }
- SdrPageGridFrame& operator[](USHORT nPos) { return *GetObject(nPos); }
- const SdrPageGridFrame& operator[](USHORT nPos) const { return *GetObject(nPos); }
+ sal_uInt16 GetCount() const { return sal_uInt16(aList.Count()); }
+ void Insert(const SdrPageGridFrame& rGF, sal_uInt16 nPos=0xFFFF) { aList.Insert(new SdrPageGridFrame(rGF),nPos); }
+ void Delete(sal_uInt16 nPos) { delete (SdrPageGridFrame*)aList.Remove(nPos); }
+ void Move(sal_uInt16 nPos, sal_uInt16 nNewPos) { aList.Insert(aList.Remove(nPos),nNewPos); }
+ SdrPageGridFrame& operator[](sal_uInt16 nPos) { return *GetObject(nPos); }
+ const SdrPageGridFrame& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); }
};
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -430,12 +430,12 @@ public:
// and thus has to set mxUnoPage
friend class ChXChartDocument;
- INT32 nWdt; // Seitengroesse
- INT32 nHgt; // Seitengroesse
- INT32 nBordLft; // Seitenrand links
- INT32 nBordUpp; // Seitenrand oben
- INT32 nBordRgt; // Seitenrand rechts
- INT32 nBordLwr; // Seitenrand unten
+ sal_Int32 nWdt; // Seitengroesse
+ sal_Int32 nHgt; // Seitengroesse
+ sal_Int32 nBordLft; // Seitenrand links
+ sal_Int32 nBordUpp; // Seitenrand oben
+ sal_Int32 nBordRgt; // Seitenrand rechts
+ sal_Int32 nBordLwr; // Seitenrand unten
// this is a weak reference to a possible living api wrapper for this page
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxUnoPage;
@@ -455,7 +455,7 @@ protected:
::sdr::MasterPageDescriptor* mpMasterPageDescriptor;
SetOfByte aPrefVisiLayers;
- USHORT nPageNum;
+ sal_uInt16 nPageNum;
// bitfield
unsigned mbMaster : 1; // flag if this is a MasterPage
@@ -480,7 +480,7 @@ public:
virtual SdrPage* Clone(SdrModel* pNewModel) const;
bool IsMasterPage() const { return mbMaster; }
void SetInserted(bool bNew = true);
- FASTBOOL IsInserted() const { return mbInserted; }
+ int IsInserted() const { return mbInserted; }
virtual void SetChanged();
// #i68775# React on PageNum changes (from Model in most cases)
@@ -496,17 +496,17 @@ public:
virtual Size GetSize() const;
virtual void SetOrientation(Orientation eOri);
virtual Orientation GetOrientation() const;
- virtual INT32 GetWdt() const;
- virtual INT32 GetHgt() const;
- virtual void SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 Lwr);
- virtual void SetLftBorder(INT32 nBorder);
- virtual void SetUppBorder(INT32 nBorder);
- virtual void SetRgtBorder(INT32 nBorder);
- virtual void SetLwrBorder(INT32 nBorder);
- virtual INT32 GetLftBorder() const;
- virtual INT32 GetUppBorder() const;
- virtual INT32 GetRgtBorder() const;
- virtual INT32 GetLwrBorder() const;
+ virtual sal_Int32 GetWdt() const;
+ virtual sal_Int32 GetHgt() const;
+ virtual void SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 Lwr);
+ virtual void SetLftBorder(sal_Int32 nBorder);
+ virtual void SetUppBorder(sal_Int32 nBorder);
+ virtual void SetRgtBorder(sal_Int32 nBorder);
+ virtual void SetLwrBorder(sal_Int32 nBorder);
+ virtual sal_Int32 GetLftBorder() const;
+ virtual sal_Int32 GetUppBorder() const;
+ virtual sal_Int32 GetRgtBorder() const;
+ virtual sal_Int32 GetLwrBorder() const;
virtual void SetModel(SdrModel* pNewModel);
@@ -532,11 +532,11 @@ public:
// GetBitmap und GetMetafile sind noch nicht implementiert.
// Bitmap in Bildschirmaufloesung und -farbtiefe aus den Objekten der
// Page erzeugen.
- Bitmap GetBitmap(FASTBOOL bTrimBorders=TRUE) const { return GetBitmap(aPrefVisiLayers,bTrimBorders); }
- Bitmap GetBitmap(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=TRUE) const;
+ Bitmap GetBitmap(int bTrimBorders=sal_True) const { return GetBitmap(aPrefVisiLayers,bTrimBorders); }
+ Bitmap GetBitmap(const SetOfByte& rVisibleLayers, int bTrimBorders=sal_True) const;
// Metafile aus den Objekten der Page erzeugen
- GDIMetaFile GetMetaFile(FASTBOOL bTrimBorders=TRUE) { return GetMetaFile(aPrefVisiLayers,bTrimBorders); }
- GDIMetaFile GetMetaFile(const SetOfByte& rVisibleLayers, FASTBOOL bTrimBorders=TRUE);
+ GDIMetaFile GetMetaFile(int bTrimBorders=sal_True) { return GetMetaFile(aPrefVisiLayers,bTrimBorders); }
+ GDIMetaFile GetMetaFile(const SetOfByte& rVisibleLayers, int bTrimBorders=sal_True);
virtual String GetLayoutName() const;
@@ -559,7 +559,7 @@ public:
virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const;
- FASTBOOL HasTransparentObjects( BOOL bCheckForAlphaChannel = FALSE ) const;
+ int HasTransparentObjects( sal_Bool bCheckForAlphaChannel = sal_False ) const;
/** *deprecated* returns an averaged background color of this page */
// #i75566# GetBackgroundColor -> GetPageBackgroundColor
diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx
index cd7b8a6de81e..e085ccd212dc 100644
--- a/svx/inc/svx/svdpagv.hxx
+++ b/svx/inc/svx/svdpagv.hxx
@@ -128,7 +128,7 @@ private:
SVX_DLLPRIVATE SdrPageWindow& CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow);
protected:
- void ImpInvalidateHelpLineArea(USHORT nNum) const;
+ void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const;
protected:
void SetLayer(const String& rName, SetOfByte& rBS, sal_Bool bJa);
@@ -179,7 +179,7 @@ public:
void InvalidateAllWin();
// rRect bezieht sich auf die Page
- void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=FALSE);
+ void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=sal_False);
// PrePaint call forwarded from app windows
void PrePaint();
@@ -249,13 +249,13 @@ public:
const SdrHelpLineList& GetHelpLines() const { return aHelpLines; }
void SetHelpLines(const SdrHelpLineList& rHLL);
- //void SetHelpLinePos(USHORT nNum, const Point& rNewPos);
- void SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine);
- void DeleteHelpLine(USHORT nNum);
- void InsertHelpLine(const SdrHelpLine& rHL, USHORT nNum=0xFFFF);
- void MoveHelpLine(USHORT nNum, USHORT nNewNum) { aHelpLines.Move(nNum,nNewNum); }
+ //void SetHelpLinePos(sal_uInt16 nNum, const Point& rNewPos);
+ void SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine);
+ void DeleteHelpLine(sal_uInt16 nNum);
+ void InsertHelpLine(const SdrHelpLine& rHL, sal_uInt16 nNum=0xFFFF);
+ void MoveHelpLine(sal_uInt16 nNum, sal_uInt16 nNewNum) { aHelpLines.Move(nNum,nNewNum); }
- // Liefert TRUE, wenn Layer des Obj sichtbar und nicht gesperrt.
+ // Liefert sal_True, wenn Layer des Obj sichtbar und nicht gesperrt.
// Beim Gruppenobjekt muss wenigstens ein Member sichtbar sein,
// gesperrt sein darf keiner.
sal_Bool IsObjMarkable(SdrObject* pObj) const;
@@ -273,7 +273,7 @@ public:
void LeaveAllGroup();
// Feststellen, wie weit hinabgestiegen wurde (0=Root(Page))
- USHORT GetEnteredLevel() const;
+ sal_uInt16 GetEnteredLevel() const;
// Name der aktuellen Objektgruppe
String GetActualGroupName() const;
diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx
index 69f32ad327e5..32475e51b7b8 100644
--- a/svx/inc/svx/svdpntv.hxx
+++ b/svx/inc/svx/svdpntv.hxx
@@ -162,12 +162,12 @@ protected:
SdrAnimationMode eAnimationMode;
- USHORT nHitTolPix;
- USHORT nMinMovPix;
- USHORT nHitTolLog;
- USHORT nMinMovLog;
- ULONG nMasterCacheMode;
- ULONG nGraphicManagerDrawMode;
+ sal_uInt16 nHitTolPix;
+ sal_uInt16 nMinMovPix;
+ sal_uInt16 nHitTolLog;
+ sal_uInt16 nMinMovLog;
+ sal_uIntPtr nMasterCacheMode;
+ sal_uIntPtr nGraphicManagerDrawMode;
// hold an incarnation of Drawinglayer configuration options
SvtOptionsDrawinglayer maDrawinglayerOpt;
@@ -188,9 +188,9 @@ protected:
unsigned bSwapAsynchron : 1;
unsigned bPrintPreview : 1;
- // BOOL fuer die Verwaltung des anzuzeigenden Status
- // Gruppe Betreten/Verlassen. Default ist TRUE, wird aber
- // beispielsweise beim Chart auf FALSE gesetzt, da dort
+ // sal_Bool fuer die Verwaltung des anzuzeigenden Status
+ // Gruppe Betreten/Verlassen. Default ist sal_True, wird aber
+ // beispielsweise beim Chart auf sal_False gesetzt, da dort
// die Ghosted-Effekte zur Darstellug unerwuenscht sind.
unsigned bVisualizeEnteredGroup : 1;
unsigned bAnimationPause : 1;
@@ -254,8 +254,8 @@ private:
DECL_LINK(ImpComeBackHdl,Timer*);
protected:
- USHORT ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const;
- USHORT ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const;
+ sal_uInt16 ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const;
+ sal_uInt16 ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const;
// Wenn man den IdleStatus des Systems nicht abwarten will (auf const geschummelt):
void FlushComeBackTimer() const;
@@ -263,12 +263,12 @@ protected:
void ImpSetGlueVisible2(bool bOn) { if (bGlueVisible2!=(unsigned)bOn) { bGlueVisible2=bOn; if (!bGlueVisible && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } }
void ImpSetGlueVisible3(bool bOn) { if (bGlueVisible3!=(unsigned)bOn) { bGlueVisible3=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible4) GlueInvalidate(); } }
void ImpSetGlueVisible4(bool bOn) { if (bGlueVisible4!=(unsigned)bOn) { bGlueVisible4=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible3) GlueInvalidate(); } }
- BOOL ImpIsGlueVisible2() const { return bGlueVisible2; }
- BOOL ImpIsGlueVisible3() const { return bGlueVisible3; }
- BOOL ImpIsGlueVisible4() const { return bGlueVisible4; }
+ sal_Bool ImpIsGlueVisible2() const { return bGlueVisible2; }
+ sal_Bool ImpIsGlueVisible3() const { return bGlueVisible3; }
+ sal_Bool ImpIsGlueVisible4() const { return bGlueVisible4; }
public:
- BOOL ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; }
+ sal_Bool ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; }
protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
@@ -296,7 +296,7 @@ public:
// virtual void Clear(); // PageViews loeschen, Markierungen weg, ...
SdrModel* GetModel() const { return pMod; }
- virtual BOOL IsAction() const;
+ virtual sal_Bool IsAction() const;
virtual void MovAction(const Point& rPnt);
virtual void EndAction();
virtual void BckAction();
@@ -314,18 +314,18 @@ public:
// jedem MapMode(Scaling)-wechsel gerufen werden, damit ich aus meinen
// Pixelwerten logische Werte berechnen kann.
void SetActualWin(const OutputDevice* pWin);
- void SetMinMoveDistancePixel(USHORT nVal) { nMinMovPix=nVal; TheresNewMapMode(); }
- USHORT GetMinMoveDistancePixel() const { return (USHORT)nMinMovPix; }
- void SetHitTolerancePixel(USHORT nVal) { nHitTolPix=nVal; TheresNewMapMode(); }
- USHORT GetHitTolerancePixel() const { return (USHORT)nHitTolPix; }
+ void SetMinMoveDistancePixel(sal_uInt16 nVal) { nMinMovPix=nVal; TheresNewMapMode(); }
+ sal_uInt16 GetMinMoveDistancePixel() const { return (sal_uInt16)nMinMovPix; }
+ void SetHitTolerancePixel(sal_uInt16 nVal) { nHitTolPix=nVal; TheresNewMapMode(); }
+ sal_uInt16 GetHitTolerancePixel() const { return (sal_uInt16)nHitTolPix; }
// data read access on logic HitTolerance and MinMoveTolerance
- USHORT getHitTolLog() const { return nHitTolLog; }
- USHORT getMinMovLog() const { return nMinMovLog; }
+ sal_uInt16 getHitTolLog() const { return nHitTolLog; }
+ sal_uInt16 getMinMovLog() const { return nMinMovLog; }
// Flag zur Visualisierung von Gruppen abfragen/testen
- BOOL DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; }
- void SetVisualizeEnteredGroup(BOOL bNew) { bVisualizeEnteredGroup = bNew; }
+ sal_Bool DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; }
+ void SetVisualizeEnteredGroup(sal_Bool bNew) { bVisualizeEnteredGroup = bNew; }
// Am DragStatus laesst sich beispielsweise erfragen, welche
// entfernung bereits gedraggd wurde, etc.
@@ -341,8 +341,8 @@ public:
virtual void HideSdrPage();
// Iterieren ueber alle angemeldeten PageViews
-// USHORT GetPageViewCount() const { return USHORT(aPagV.Count()); }
-// SdrPageView* GetPageViewByIndex(USHORT nPvNum) const { return ((SdrPageView*)aPagV.GetObject(nPvNum)); }
+// sal_uInt16 GetPageViewCount() const { return sal_uInt16(aPagV.Count()); }
+// SdrPageView* GetPageViewByIndex(sal_uInt16 nPvNum) const { return ((SdrPageView*)aPagV.GetObject(nPvNum)); }
SdrPageView* GetSdrPageView() const { return mpPageView; }
// Pageview einer bestimmten Seite ermitteln
@@ -360,17 +360,17 @@ public:
virtual void AddWindowToPaintView(OutputDevice* pNewWin);
virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin);
- void SetLayerVisible(const String& rName, BOOL bShow=TRUE);
+ void SetLayerVisible(const String& rName, sal_Bool bShow=sal_True);
bool IsLayerVisible(const String& rName) const;
- void SetAllLayersVisible(BOOL bShow=TRUE);
+ void SetAllLayersVisible(sal_Bool bShow=sal_True);
- void SetLayerLocked(const String& rName, BOOL bLock=TRUE);
+ void SetLayerLocked(const String& rName, sal_Bool bLock=sal_True);
bool IsLayerLocked(const String& rName) const;
- void SetAllLayersLocked(BOOL bLock=TRUE);
+ void SetAllLayersLocked(sal_Bool bLock=sal_True);
- void SetLayerPrintable(const String& rName, BOOL bPrn=TRUE);
+ void SetLayerPrintable(const String& rName, sal_Bool bPrn=sal_True);
bool IsLayerPrintable(const String& rName) const;
- void SetAllLayersPrintable(BOOL bPrn=TRUE);
+ void SetAllLayersPrintable(sal_Bool bPrn=sal_True);
// PrePaint call forwarded from app windows
void PrePaint();
@@ -412,14 +412,14 @@ protected:
void ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const;
public:
- BOOL IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht
- BOOL IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht
- BOOL IsBordVisible() const { return bBordVisible; } // Seitenrandlinie malen oder nicht
- BOOL IsGridVisible() const { return bGridVisible; } // Rastergitter malen oder nicht
- BOOL IsGridFront() const { return bGridFront ; } // Rastergitter ueber die Objekte druebermalen oder dahinter
- BOOL IsHlplVisible() const { return bHlplVisible; } // Hilfslinien der Seiten malen oder nicht
- BOOL IsHlplFront() const { return bHlplFront ; } // Hilfslinie ueber die Objekte druebermalen oder dahinter
- BOOL IsGlueVisible() const { return bGlueVisible; } // Konnektoren der objekte sichtbar oder nicht
+ sal_Bool IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht
+ sal_Bool IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht
+ sal_Bool IsBordVisible() const { return bBordVisible; } // Seitenrandlinie malen oder nicht
+ sal_Bool IsGridVisible() const { return bGridVisible; } // Rastergitter malen oder nicht
+ sal_Bool IsGridFront() const { return bGridFront ; } // Rastergitter ueber die Objekte druebermalen oder dahinter
+ sal_Bool IsHlplVisible() const { return bHlplVisible; } // Hilfslinien der Seiten malen oder nicht
+ sal_Bool IsHlplFront() const { return bHlplFront ; } // Hilfslinie ueber die Objekte druebermalen oder dahinter
+ sal_Bool IsGlueVisible() const { return bGlueVisible; } // Konnektoren der objekte sichtbar oder nicht
Color GetGridColor() const;
void SetPageVisible(bool bOn = true) { bPageVisible=bOn; InvalidateAllWin(); }
void SetPageBorderVisible(bool bOn = true) { bPageBorderVisible=bOn; InvalidateAllWin(); }
@@ -450,7 +450,7 @@ public:
const Size& GetGridFine() const { return aGridFin; }
void InvalidateAllWin();
- void InvalidateAllWin(const Rectangle& rRect, BOOL bPlus1Pix=FALSE);
+ void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=sal_False);
// Wenn die View kein Invalidate() an den Fenstern durchfuehren soll, muss
// man diese beiden folgenden Methoden ueberladen und entsprechend anders
@@ -474,13 +474,13 @@ public:
// DefaultAttribute an der View: Neu erzeugte Objekte bekommen diese
// Attribute direkt nach dem Erzeugen erstmal zugewiesen.
- void SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll);
+ void SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
const SfxItemSet& GetDefaultAttr() const { return aDefaultAttr; }
- void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+ void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
SfxStyleSheet* GetDefaultStyleSheet() const { return pDefaultStyleSheet; }
- void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll);
- void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const;
+ void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll);
+ void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const;
// Aufziehen eines animierten Rechtecks fuer Applikationsspeziefische
// Verwendung. Alle Positionsangaben in logischen View-Koordinaten.
@@ -494,32 +494,32 @@ public:
sal_Bool IsEncirclement() const { return (0L != mpEncirclementOverlay); }
// use this mode as mode to draw all internal GraphicManager objects with
- ULONG GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; }
- void SetGraphicManagerDrawMode( ULONG nMode ) { nGraphicManagerDrawMode = nMode; }
+ sal_uIntPtr GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; }
+ void SetGraphicManagerDrawMode( sal_uIntPtr nMode ) { nGraphicManagerDrawMode = nMode; }
// SwapIn (z.B. von Grafiken) asynchron durchfuehren. Also nicht
// beim Paint sofort nachladen, sondern dort das Nachladen anstossen.
// Nach Abschluss des Nachladens wird das Objekt dann angezeigt.
// Hat nur z.Zt. Wirkung, wenn SwapGraphics am Model eingeschaltet ist.
// Default=FALSE. Flag ist nicht persistent.
- BOOL IsSwapAsynchron() const { return bSwapAsynchron; }
- void SetSwapAsynchron(BOOL bJa=TRUE) { bSwapAsynchron=bJa; }
- virtual BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
-
- virtual BOOL MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; }
- virtual BOOL MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; }
- virtual BOOL MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; }
- virtual BOOL Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return FALSE; }
- BOOL Cut(ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; }
- BOOL Yank(ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; }
- BOOL Paste(Window* /*pWin*/=NULL, ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; }
+ sal_Bool IsSwapAsynchron() const { return bSwapAsynchron; }
+ void SetSwapAsynchron(sal_Bool bJa=sal_True) { bSwapAsynchron=bJa; }
+ virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
+
+ virtual sal_Bool MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
+ virtual sal_Bool MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
+ virtual sal_Bool MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; }
+ virtual sal_Bool Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return sal_False; }
+ sal_Bool Cut(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; }
+ sal_Bool Yank(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; }
+ sal_Bool Paste(Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; }
/* new interface src537 */
- BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
+ sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
- BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
- SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const;
- BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+ sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
+ SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const;
+ sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
virtual void MakeVisible(const Rectangle& rRect, Window& rWin);
@@ -529,8 +529,8 @@ public:
// Animation aktivieren/deaktivieren fuer ::Paint
// wird z.Zt. ausgewertet von SdrGrafObj, wenn in dem eine Animation steckt
// Das Unterbinden der automatischen Animation wird z.B. fuer die Dia-Show benoetigt
- BOOL IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); }
- void SetAnimationEnabled( BOOL bEnable=TRUE );
+ sal_Bool IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); }
+ void SetAnimationEnabled( sal_Bool bEnable=sal_True );
// set/unset pause state for animations
bool IsAnimationPause() const { return bAnimationPause; }
@@ -543,10 +543,10 @@ public:
void SetAnimationMode( const SdrAnimationMode eMode );
SdrAnimationMode GetAnimationMode() const { return eAnimationMode; }
- // bei bShow=FALSE wird der Browser destruiert
+ // bei bShow=sal_False wird der Browser destruiert
#ifdef DBG_UTIL
- void ShowItemBrowser(BOOL bShow=TRUE);
- BOOL IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); }
+ void ShowItemBrowser(sal_Bool bShow=sal_True);
+ sal_Bool IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); }
Window* GetItemBrowser() const { return (Window*)pItemBrowser; }
#endif
@@ -555,7 +555,7 @@ public:
void VisAreaChanged(const OutputDevice* pOut=NULL);
void VisAreaChanged(const SdrPageWindow& rWindow);
- BOOL IsPrintPreview() const { return bPrintPreview; }
+ sal_Bool IsPrintPreview() const { return bPrintPreview; }
void SetPrintPreview(bool bOn = true) { bPrintPreview=bOn; }
const svtools::ColorConfig& getColorConfig() const;
diff --git a/svx/inc/svx/svdpoev.hxx b/svx/inc/svx/svdpoev.hxx
index c6628c28a790..c187a2ddb3eb 100644
--- a/svx/inc/svx/svdpoev.hxx
+++ b/svx/inc/svx/svdpoev.hxx
@@ -52,8 +52,8 @@ class SVX_DLLPUBLIC SdrPolyEditView: public SdrEditView, public IPolyPolygonEdit
friend class SdrEditView;
protected:
- BOOL bSetMarkedPointsSmoothPossible : 1;
- BOOL bSetMarkedSegmentsKindPossible : 1;
+ sal_Bool bSetMarkedPointsSmoothPossible : 1;
+ sal_Bool bSetMarkedSegmentsKindPossible : 1;
SdrPathSmoothKind eMarkedPointsSmooth;
SdrPathSegmentKind eMarkedSegmentsKind;
@@ -75,18 +75,18 @@ protected:
virtual ~SdrPolyEditView();
public:
- BOOL IsSetMarkedPointsSmoothPossible() const;
+ sal_Bool IsSetMarkedPointsSmoothPossible() const;
SdrPathSmoothKind GetMarkedPointsSmooth() const;
void SetMarkedPointsSmooth(SdrPathSmoothKind eKind);
// Ein PolySegment kann eine Strecke oder eine Bezierkurve sein.
- BOOL IsSetMarkedSegmentsKindPossible() const;
+ sal_Bool IsSetMarkedSegmentsKindPossible() const;
SdrPathSegmentKind GetMarkedSegmentsKind() const;
void SetMarkedSegmentsKind(SdrPathSegmentKind eKind);
// Moeglicherweise ist das Obj hinterher geloescht:
void DeleteMarkedPoints();
- BOOL IsDeleteMarkedPointsPossible() const;
+ sal_Bool IsDeleteMarkedPointsPossible() const;
void MoveMarkedPoints(const Size& rSiz, bool bCopy=false);
void ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
@@ -99,7 +99,7 @@ public:
// Alle markierten Polylines werden zu Polygonen, alle offenen
// Bezierkurven zu geschlossenen.
void ShutMarkedObjects();
- void CloseMarkedObjects(BOOL bToggle=FALSE, BOOL bOpen=FALSE); // , long nOpenDistance=0);
+ void CloseMarkedObjects(sal_Bool bToggle=sal_False, sal_Bool bOpen=sal_False); // , long nOpenDistance=0);
bool IsOpenCloseMarkedObjectsPossible() const;
SdrObjClosedKind GetMarkedObjectsClosedState() const;
diff --git a/svx/inc/svx/svdsnpv.hxx b/svx/inc/svx/svdsnpv.hxx
index 2d15f50a204e..4ad6d42a013c 100644
--- a/svx/inc/svx/svdsnpv.hxx
+++ b/svx/inc/svx/svdsnpv.hxx
@@ -78,7 +78,7 @@ protected:
Fraction aSnapWdtX;
Fraction aSnapWdtY;
- USHORT nMagnSizPix;
+ sal_uInt16 nMagnSizPix;
long nSnapAngle;
long nEliminatePolyPointLimitAngle;
@@ -103,7 +103,7 @@ protected:
unsigned bMoveOnlyDragging : 1; // Objekte nur verschieben bei Resize/Rotate/...
unsigned bSlantButShear : 1; // Slant anstelle von Shear anwenden
unsigned bCrookNoContortion : 1; // Objekte bei Crook nicht verzerren
- unsigned bHlplFixed : 1; // TRUE=Hilfslinien fixiert, also nicht verschiebbar
+ unsigned bHlplFixed : 1; // sal_True=Hilfslinien fixiert, also nicht verschiebbar
unsigned bEliminatePolyPoints : 1;
private:
@@ -115,7 +115,7 @@ protected:
virtual ~SdrSnapView();
public:
- virtual BOOL IsAction() const;
+ virtual sal_Bool IsAction() const;
virtual void MovAction(const Point& rPnt);
virtual void EndAction();
virtual void BckAction();
@@ -128,8 +128,8 @@ public:
void SetSnapMagnetic(const Size& rSiz) { if (rSiz!=aMagnSiz) { aMagnSiz=rSiz; } }
const Size& GetSnapMagnetic() const { return aMagnSiz; }
- void SetSnapMagneticPixel(USHORT nPix) { nMagnSizPix=nPix; }
- USHORT GetSnapMagneticPixel() const { return nMagnSizPix; }
+ void SetSnapMagneticPixel(sal_uInt16 nPix) { nMagnSizPix=nPix; }
+ sal_uInt16 GetSnapMagneticPixel() const { return nMagnSizPix; }
// RecalcLogicSnapMagnetic muss bei jedem Wechsel des OutputDevices
// sowie bei jedem Wechsel des MapModes gerufen werden!
@@ -139,48 +139,48 @@ public:
// Auf die View bezogene Koordinaten!
// Rueckgabewerte sind SDRSNAP_NOTSNAPPED,SDRSNAP_XSNAPPED,
// SDRSNAP_YSNAPPED oder SDRSNAP_XYSNAPPED
- USHORT SnapPos(Point& rPnt, const SdrPageView* pPV) const;
+ sal_uInt16 SnapPos(Point& rPnt, const SdrPageView* pPV) const;
Point GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const;
- USHORT SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const;
+ sal_uInt16 SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const;
void CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const;
// Alle Fangeinstellungen sind Persistent.
- BOOL IsSnapEnabled() const { return bSnapEnab; }
- BOOL IsGridSnap() const { return bGridSnap; } // Fang auf Rastergitter
- BOOL IsBordSnap() const { return bBordSnap; } // Fang auf Seitenraender
- BOOL IsHlplSnap() const { return bHlplSnap; } // Fang auf Hilfslinien
- BOOL IsOFrmSnap() const { return bOFrmSnap; } // Fang auf LogFram von umgebenden Zeichenobjekten
- BOOL IsOPntSnap() const { return bOPntSnap; } // Fang auf ausgepraegte Punkte von umgebenden Zeichenobjekten
- BOOL IsOConSnap() const { return bOConSnap; } // Fang auf Konnektoren der Zeichenobjekte
- void SetSnapEnabled(BOOL bOn) { bSnapEnab=bOn; }
- void SetGridSnap(BOOL bOn) { bGridSnap=bOn; }
- void SetBordSnap(BOOL bOn) { bBordSnap=bOn; }
- void SetHlplSnap(BOOL bOn) { bHlplSnap=bOn; }
- void SetOFrmSnap(BOOL bOn) { bOFrmSnap=bOn; }
- void SetOPntSnap(BOOL bOn) { bOPntSnap=bOn; }
- void SetOConSnap(BOOL bOn) { bOConSnap=bOn; }
+ sal_Bool IsSnapEnabled() const { return bSnapEnab; }
+ sal_Bool IsGridSnap() const { return bGridSnap; } // Fang auf Rastergitter
+ sal_Bool IsBordSnap() const { return bBordSnap; } // Fang auf Seitenraender
+ sal_Bool IsHlplSnap() const { return bHlplSnap; } // Fang auf Hilfslinien
+ sal_Bool IsOFrmSnap() const { return bOFrmSnap; } // Fang auf LogFram von umgebenden Zeichenobjekten
+ sal_Bool IsOPntSnap() const { return bOPntSnap; } // Fang auf ausgepraegte Punkte von umgebenden Zeichenobjekten
+ sal_Bool IsOConSnap() const { return bOConSnap; } // Fang auf Konnektoren der Zeichenobjekte
+ void SetSnapEnabled(sal_Bool bOn) { bSnapEnab=bOn; }
+ void SetGridSnap(sal_Bool bOn) { bGridSnap=bOn; }
+ void SetBordSnap(sal_Bool bOn) { bBordSnap=bOn; }
+ void SetHlplSnap(sal_Bool bOn) { bHlplSnap=bOn; }
+ void SetOFrmSnap(sal_Bool bOn) { bOFrmSnap=bOn; }
+ void SetOPntSnap(sal_Bool bOn) { bOPntSnap=bOn; }
+ void SetOConSnap(sal_Bool bOn) { bOConSnap=bOn; }
// Normalerweise werden beim Move-Dragging von Zeichenobjekten alle
// 4 Ecken des Object-SnapRects gefangen. Folgende Einstellmoeglichkeit,
// wenn man nur auf die linke obere Ecke fangen will (z.B. DialogEditor):
// Persistent, Default=FALSE.
- void SetMoveSnapOnlyTopLeft(BOOL bOn) { bMoveSnapOnlyTopLeft=bOn; }
- BOOL IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; }
+ void SetMoveSnapOnlyTopLeft(sal_Bool bOn) { bMoveSnapOnlyTopLeft=bOn; }
+ sal_Bool IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; }
// Hilfslinien fixiert (nicht verschiebbar)
// Persistent, Default=FALSE.
- BOOL IsHlplFixed() const { return bHlplFixed; }
- void SetHlplFixed(BOOL bOn) { bHlplFixed=bOn; }
+ sal_Bool IsHlplFixed() const { return bHlplFixed; }
+ void SetHlplFixed(sal_Bool bOn) { bHlplFixed=bOn; }
- BOOL IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte
- BOOL IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte
- BOOL IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte
- BOOL IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte
+ sal_Bool IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte
+ sal_Bool IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte
+ sal_Bool IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte
+ sal_Bool IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte
- void SetMoveMFrmSnap(BOOL bOn) { bMoveMFrmSnap=bOn; }
- void SetMoveOFrmSnap(BOOL bOn) { bMoveOFrmSnap=bOn; }
- void SetMoveOPntSnap(BOOL bOn) { bMoveOPntSnap=bOn; }
- void SetMoveOConSnap(BOOL bOn) { bMoveOConSnap=bOn; }
+ void SetMoveMFrmSnap(sal_Bool bOn) { bMoveMFrmSnap=bOn; }
+ void SetMoveOFrmSnap(sal_Bool bOn) { bMoveOFrmSnap=bOn; }
+ void SetMoveOPntSnap(sal_Bool bOn) { bMoveOPntSnap=bOn; }
+ void SetMoveOConSnap(sal_Bool bOn) { bMoveOConSnap=bOn; }
// #114409#-1 Migrate PageOrigin
sal_Bool BegSetPageOrg(const Point& rPnt);
@@ -189,12 +189,12 @@ public:
void BrkSetPageOrg();
sal_Bool IsSetPageOrg() const { return (0L != mpPageOriginOverlay); }
- // HitTest. Bei TRUE steht in rnHelpLineNum die Nummer der Hilfslinie und in rpPV
+ // HitTest. Bei sal_True steht in rnHelpLineNum die Nummer der Hilfslinie und in rpPV
// die zugehoerige PageView.
- sal_Bool PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, USHORT& rnHelpLineNum, SdrPageView*& rpPV) const;
+ sal_Bool PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const;
// Verschieben einer vorhandenen Hilfslinie. nHelpLineNum und pPV von PickHelpLine verwenden.
- sal_Bool BegDragHelpLine(USHORT nHelpLineNum, SdrPageView* pPV);
+ sal_Bool BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV);
// Interaktives einfuegen einer neuen Hilfslinie
sal_Bool BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind);
Pointer GetDraggedHelpLinePointer() const;
@@ -208,7 +208,7 @@ public:
// SnapAngle ist fuer Winkel im Kreis, RotateDragging, ...
// Der Winkelfang wird unterdrueckt, wenn er mit
- // durch SetAngleSnapEnabled(FALSE) ausgeschaltet ist.
+ // durch SetAngleSnapEnabled(sal_False) ausgeschaltet ist.
// Der Winkelfang ist unabhaengig vom Koordinatenfang
// und somit von der Einstellung IsSnapEnabled()
// Es sollten nur Werte angegeben werden fuer die gilt:
@@ -218,8 +218,8 @@ public:
// - Shear (Dragging)
// - Kreisbogen/-sektor/-abschnitt Winkel (Create und Dragging)
// Persistent.
- void SetAngleSnapEnabled(BOOL bOn) { bAngleSnapEnab=bOn; }
- BOOL IsAngleSnapEnabled() const { return bAngleSnapEnab; }
+ void SetAngleSnapEnabled(sal_Bool bOn) { bAngleSnapEnab=bOn; }
+ sal_Bool IsAngleSnapEnabled() const { return bAngleSnapEnab; }
void SetSnapAngle(long nWink) { nSnapAngle=nWink; }
long GetSnapAngle() const { return nSnapAngle; }
@@ -243,8 +243,8 @@ public:
// - Linie behaelt beim Draggen ihren Winkel bei und wird nur (ni)
// verlaengert bzw. verkuerzt.
// Defaultmaessig ist Ortho ausgeschaltet. Persistent.
- void SetOrtho(BOOL bOn) { bOrtho=bOn; } // unvollstaendig
- BOOL IsOrtho() const { return bOrtho; }
+ void SetOrtho(sal_Bool bOn) { bOrtho=bOn; } // unvollstaendig
+ sal_Bool IsOrtho() const { return bOrtho; }
// BigOrtho hat nur Relevanz wenn Ortho eingeschaltet ist.
// Beispiel: Ein Rechteck wird mit eingeschaltetem Ortho (also ein Quadrat)
@@ -256,23 +256,23 @@ public:
// tetem BigOrtho bekaeme man dagegen ein Quadrat der Kantenlaenge 80.
// Gleiches gilt auch fuer Resize.
// Defaultmaessig ist BigOrtho eingeschaltet. Persistent.
- void SetBigOrtho(BOOL bOn) { bBigOrtho=bOn; }
- BOOL IsBigOrtho() const { return bBigOrtho; }
+ void SetBigOrtho(sal_Bool bOn) { bBigOrtho=bOn; }
+ sal_Bool IsBigOrtho() const { return bBigOrtho; }
- // bei MoveOnlyDragging=TRUE wird bei Resize/Rotate/Shear/Mirror/Crook
+ // bei MoveOnlyDragging=sal_True wird bei Resize/Rotate/Shear/Mirror/Crook
// nur das Zentrum der markierten Objekte transformiert. Groesse, Form
// und Drehwinkel der Objekte bleiben erhalten, nur ihre Positionen
// aendern sich. Persistent. Default=FALSE. (ni)
- void SetMoveOnlyDragging(BOOL bOn) { bMoveOnlyDragging=bOn; }
- BOOL IsMoveOnlyDragging() const { return bMoveOnlyDragging; }
+ void SetMoveOnlyDragging(sal_Bool bOn) { bMoveOnlyDragging=bOn; }
+ sal_Bool IsMoveOnlyDragging() const { return bMoveOnlyDragging; }
// Slant anstelle von Shear anwenden. Persistent. Default=FALSE.
- void SetSlantButShear(BOOL bOn) { bSlantButShear=bOn; }
- BOOL IsSlantButShear() const { return bSlantButShear; }
+ void SetSlantButShear(sal_Bool bOn) { bSlantButShear=bOn; }
+ sal_Bool IsSlantButShear() const { return bSlantButShear; }
// Objekte bei Crook nicht verzerren. Persistent. Default=FALSE. (ni)
- void SetCrookNoContortion(BOOL bOn) { bCrookNoContortion=bOn; }
- BOOL IsCrookNoContortion() const { return bCrookNoContortion; }
+ void SetCrookNoContortion(sal_Bool bOn) { bCrookNoContortion=bOn; }
+ sal_Bool IsCrookNoContortion() const { return bCrookNoContortion; }
// Crook-Modus. Persistent. Default=SDRCROOK_ROTATE. (ni)
void SetCrookMode(SdrCrookMode eMode) { eCrookMode=eMode; }
@@ -281,8 +281,8 @@ public:
// Special fuer IBM: Beim Draggen eines Polygonpunkts wird dieser
// geloescht, wenn seine beiden angrenzenden Linien eh' fast eine
// durchgehende Linie sind.
- void SetEliminatePolyPoints(BOOL bOn) { bEliminatePolyPoints=bOn; }
- BOOL IsEliminatePolyPoints() const { return bEliminatePolyPoints; }
+ void SetEliminatePolyPoints(sal_Bool bOn) { bEliminatePolyPoints=bOn; }
+ sal_Bool IsEliminatePolyPoints() const { return bEliminatePolyPoints; }
void SetEliminatePolyPointLimitAngle(long nAngle) { nEliminatePolyPointLimitAngle=nAngle; }
long GetEliminatePolyPointLimitAngle() const { return nEliminatePolyPointLimitAngle; }
};
diff --git a/svx/inc/svx/svdtext.hxx b/svx/inc/svx/svdtext.hxx
index 6774236d197c..f7bc7c72fcbc 100644
--- a/svx/inc/svx/svdtext.hxx
+++ b/svx/inc/svx/svdtext.hxx
@@ -54,7 +54,7 @@ public:
virtual ~SdrText();
virtual void SetModel(SdrModel* pNewModel);
- virtual void ForceOutlinerParaObject( USHORT nOutlMode );
+ virtual void ForceOutlinerParaObject( sal_uInt16 nOutlMode );
virtual void SetOutlinerParaObject( OutlinerParaObject* pTextObject );
virtual OutlinerParaObject* GetOutlinerParaObject() const;
diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx
index 3ef31455b6e7..29fea090bf68 100644
--- a/svx/inc/svx/svdundo.hxx
+++ b/svx/inc/svx/svdundo.hxx
@@ -74,7 +74,7 @@ protected:
public:
TYPEINFO();
- virtual BOOL CanRepeat(SfxRepeatTarget& rView) const;
+ virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const;
virtual void Repeat(SfxRepeatTarget& rView);
virtual String GetRepeatComment(SfxRepeatTarget& rView) const;
@@ -111,8 +111,8 @@ public:
virtual ~SdrUndoGroup();
void Clear();
- ULONG GetActionCount() const { return aBuf.Count(); }
- SdrUndoAction* GetAction(ULONG nNum) const { return (SdrUndoAction*)(aBuf.GetObject(nNum)); }
+ sal_uIntPtr GetActionCount() const { return aBuf.Count(); }
+ SdrUndoAction* GetAction(sal_uIntPtr nNum) const { return (SdrUndoAction*)(aBuf.GetObject(nNum)); }
void AddAction(SdrUndoAction* pAct);
void push_front( SdrUndoAction* pAct );
@@ -145,9 +145,9 @@ protected:
protected:
SdrUndoObj(SdrObject& rNewObj);
- void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, FASTBOOL bRepeat=FALSE) const;
+ void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, int bRepeat=sal_False) const;
- static void GetDescriptionStringForObject( const SdrObject& _rForObject, USHORT nStrCacheID, String& rStr, FASTBOOL bRepeat = FALSE );
+ static void GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, int bRepeat = sal_False );
// #94278# new method for evtl. PageChange at UNDO/REDO
void ImpShowPageOfThisObject();
@@ -173,8 +173,8 @@ protected:
SfxStyleSheet* pUndoStyleSheet;
SfxStyleSheet* pRedoStyleSheet;
SfxStyleSheet* pRepeatStyleSheet;
- FASTBOOL bStyleSheet;
- FASTBOOL bHaveToTakeRedoSet;
+ int bStyleSheet;
+ int bHaveToTakeRedoSet;
// Bei Zuweisung von TextItems auf ein Zeichenobjekt mit Text:
OutlinerParaObject* pTextUndo;
@@ -186,7 +186,7 @@ protected:
SdrUndoGroup* pUndoGroup;
public:
- SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1=FALSE, FASTBOOL bSaveText=FALSE);
+ SdrUndoAttrObj(SdrObject& rNewObj, int bStyleSheet1=sal_False, int bSaveText=sal_False);
virtual ~SdrUndoAttrObj();
void SetRepeatAttr(const SfxItemSet& rSet);
virtual void Undo();
@@ -270,7 +270,7 @@ protected:
SdrObjList* pObjList;
SdrView* pView; // um bei ObjDel, Undo die
SdrPageView* pPageView; // Selektion widerherstellen zu koennen
- UINT32 nOrdNum;
+ sal_uInt32 nOrdNum;
// Bei einem Undo/Redo findet moeglicherweise Uebereignung des Objektes
// statt. Im Dtor wird das Obj deleted, wenn bOwner==TRUE
@@ -295,7 +295,7 @@ protected:
class SVX_DLLPUBLIC SdrUndoRemoveObj : public SdrUndoObjList
{
public:
- SdrUndoRemoveObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE)
+ SdrUndoRemoveObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False)
: SdrUndoObjList(rNewObj,bOrdNumDirect) {}
virtual void Undo();
@@ -314,7 +314,7 @@ public:
class SVX_DLLPUBLIC SdrUndoInsertObj : public SdrUndoObjList
{
public:
- SdrUndoInsertObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE)
+ SdrUndoInsertObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False)
: SdrUndoObjList(rNewObj,bOrdNumDirect) {}
virtual void Undo();
@@ -332,8 +332,8 @@ public:
class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj
{
public:
- SdrUndoDelObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE)
- : SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(TRUE); }
+ SdrUndoDelObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False)
+ : SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(sal_True); }
virtual void Undo();
virtual void Redo();
@@ -356,7 +356,7 @@ public:
class SVX_DLLPUBLIC SdrUndoNewObj : public SdrUndoInsertObj
{
public:
- SdrUndoNewObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE)
+ SdrUndoNewObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False)
: SdrUndoInsertObj(rNewObj,bOrdNumDirect) {}
virtual void Undo();
@@ -382,7 +382,7 @@ class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj
protected:
SdrObjList* pObjList;
- UINT32 nOrdNum;
+ sal_uInt32 nOrdNum;
SdrObject* pNewObj;
public:
@@ -410,7 +410,7 @@ public:
class SdrUndoCopyObj : public SdrUndoNewObj
{
public:
- SdrUndoCopyObj(SdrObject& rNewObj, FASTBOOL bOrdNumDirect=FALSE)
+ SdrUndoCopyObj(SdrObject& rNewObj, int bOrdNumDirect=sal_False)
: SdrUndoNewObj(rNewObj,bOrdNumDirect) {}
virtual String GetComment() const;
@@ -423,11 +423,11 @@ public:
class SdrUndoObjOrdNum : public SdrUndoObj
{
protected:
- UINT32 nOldOrdNum;
- UINT32 nNewOrdNum;
+ sal_uInt32 nOldOrdNum;
+ sal_uInt32 nNewOrdNum;
public:
- SdrUndoObjOrdNum(SdrObject& rNewObj, UINT32 nOldOrdNum1, UINT32 nNewOrdNum1);
+ SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1);
virtual void Undo();
virtual void Redo();
@@ -460,15 +460,15 @@ class SVX_DLLPUBLIC SdrUndoObjSetText : public SdrUndoObj
protected:
OutlinerParaObject* pOldText;
OutlinerParaObject* pNewText;
- FASTBOOL bNewTextAvailable;
- BOOL bEmptyPresObj;
+ int bNewTextAvailable;
+ sal_Bool bEmptyPresObj;
sal_Int32 mnText;
public:
SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText );
virtual ~SdrUndoObjSetText();
- FASTBOOL IsDifferent() const { return pOldText!=pNewText; }
+ int IsDifferent() const { return pOldText!=pNewText; }
void AfterSetText();
virtual void Undo();
@@ -534,11 +534,11 @@ class SdrUndoLayer : public SdrUndoAction
protected:
SdrLayer* pLayer;
SdrLayerAdmin* pLayerAdmin;
- USHORT nNum;
- FASTBOOL bItsMine;
+ sal_uInt16 nNum;
+ int bItsMine;
protected:
- SdrUndoLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
+ SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel);
virtual ~SdrUndoLayer();
};
@@ -552,7 +552,7 @@ protected:
class SdrUndoNewLayer : public SdrUndoLayer
{
public:
- SdrUndoNewLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
+ SdrUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
: SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) {}
virtual void Undo();
@@ -571,8 +571,8 @@ public:
class SdrUndoDelLayer : public SdrUndoLayer
{
public:
- SdrUndoDelLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
- : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=TRUE; }
+ SdrUndoDelLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel)
+ : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=sal_True; }
virtual void Undo();
virtual void Redo();
@@ -589,10 +589,10 @@ public:
class SdrUndoMoveLayer : public SdrUndoLayer
{
- USHORT nNeuPos;
+ sal_uInt16 nNeuPos;
public:
- SdrUndoMoveLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, USHORT nNeuPos1)
+ SdrUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1)
: SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel), nNeuPos(nNeuPos1) {}
virtual void Undo();
@@ -626,14 +626,14 @@ protected:
SdrPage& mrPage;
protected:
- void ImpInsertPage(USHORT nNum);
- void ImpRemovePage(USHORT nNum);
- void ImpMovePage(USHORT nOldNum, USHORT nNewNum);
+ void ImpInsertPage(sal_uInt16 nNum);
+ void ImpRemovePage(sal_uInt16 nNum);
+ void ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum);
protected:
SdrUndoPage(SdrPage& rNewPg);
- void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT n=0, FASTBOOL bRepeat=FALSE) const;
+ void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 n=0, int bRepeat=sal_False) const;
};
//************************************************************
@@ -647,11 +647,11 @@ protected:
class SVX_DLLPUBLIC SdrUndoPageList : public SdrUndoPage
{
protected:
- USHORT nPageNum;
+ sal_uInt16 nPageNum;
// Bei einem Undo/Redo findet moeglicherweise Uebereignung der Page
// statt. Im Dtor wird die Page deleted, wenn bItsMine==TRUE
- FASTBOOL bItsMine;
+ int bItsMine;
protected:
SdrUndoPageList(SdrPage& rNewPg);
@@ -736,11 +736,11 @@ public:
class SVX_DLLPUBLIC SdrUndoSetPageNum : public SdrUndoPage
{
protected:
- USHORT nOldPageNum;
- USHORT nNewPageNum;
+ sal_uInt16 nOldPageNum;
+ sal_uInt16 nNewPageNum;
public:
- SdrUndoSetPageNum(SdrPage& rNewPg, USHORT nOldPageNum1, USHORT nNewPageNum1)
+ SdrUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1)
: SdrUndoPage(rNewPg),nOldPageNum(nOldPageNum1),nNewPageNum(nNewPageNum1) {}
virtual void Undo();
diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx
index 66fd720db37a..c189c8daf9a2 100644
--- a/svx/inc/svx/svdview.hxx
+++ b/svx/inc/svx/svdview.hxx
@@ -122,11 +122,11 @@ struct SVX_DLLPUBLIC SdrViewEvent
SdrHdlKind eHdlKind;
SdrCreateCmd eEndCreateCmd; // auch fuer EndInsPoint
- UINT16 nMouseClicks;
- UINT16 nMouseMode;
- UINT16 nMouseCode;
- UINT16 nHlplIdx;
- UINT16 nGlueId;
+ sal_uInt16 nMouseClicks;
+ sal_uInt16 nMouseMode;
+ sal_uInt16 nMouseCode;
+ sal_uInt16 nHlplIdx;
+ sal_uInt16 nGlueId;
unsigned bMouseDown : 1;
unsigned bMouseUp : 1;
@@ -148,7 +148,7 @@ public:
~SdrViewEvent();
// nEventKind ist SDRMOUSEBUTTONDOWN, SDRMOUSEMOVE oder SDRMOUSEBUTTONUP
- void SetMouseEvent(const MouseEvent& rMEvt, USHORT nEventKind);
+ void SetMouseEvent(const MouseEvent& rMEvt, sal_uInt16 nEventKind);
};
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -210,44 +210,44 @@ public:
// pSdrView->DoMouseEvent(aVEvt);
// SetPointer(GetPreferedPointer(...))
// CaptureMouse(...)
- void EnableExtendedMouseEventDispatcher(BOOL bOn) { bNoExtendedMouseDispatcher = !bOn; }
- BOOL IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; }
+ void EnableExtendedMouseEventDispatcher(sal_Bool bOn) { bNoExtendedMouseDispatcher = !bOn; }
+ sal_Bool IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; }
- void EnableExtendedKeyInputDispatcher(BOOL bOn) { bNoExtendedKeyDispatcher=!bOn; }
- BOOL IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; }
+ void EnableExtendedKeyInputDispatcher(sal_Bool bOn) { bNoExtendedKeyDispatcher=!bOn; }
+ sal_Bool IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; }
- void EnableExtendedCommandEventDispatcher(BOOL bOn) { bNoExtendedCommandDispatcher=!bOn; }
- BOOL IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; }
+ void EnableExtendedCommandEventDispatcher(sal_Bool bOn) { bNoExtendedCommandDispatcher=!bOn; }
+ sal_Bool IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; }
- void EnableTextEditOnObjectsWithoutTextIfTextTool(BOOL bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; }
- BOOL IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; }
+ void EnableTextEditOnObjectsWithoutTextIfTextTool(sal_Bool bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; }
+ sal_Bool IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; }
void SetMasterPagePaintCaching(sal_Bool bOn);
sal_Bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; }
- BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
- virtual BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
- virtual BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
- virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
- virtual BOOL Command(const CommandEvent& rCEvt, Window* pWin);
+ sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
+ virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
+ virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
+ virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
+ virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin);
virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
- BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll=FALSE) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); }
- BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr=FALSE) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); }
+ sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll=sal_False) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); }
+ sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr=sal_False) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); }
/* new interface src537 */
- BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
+ sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
SfxStyleSheet* GetStyleSheet() const;
// unvollstaendige Implementation:
// Das OutputDevice ist notwendig, damit ich die HandleSize ermitteln kann.
// Bei NULL wird das 1. angemeldete Win verwendet.
- Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nModifier=0, BOOL bLeftDown=FALSE) const;
- SdrHitKind PickAnything(const MouseEvent& rMEvt, USHORT nMouseDownOrMoveOrUp, SdrViewEvent& rVEvt) const;
+ Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier=0, sal_Bool bLeftDown=sal_False) const;
+ SdrHitKind PickAnything(const MouseEvent& rMEvt, sal_uInt16 nMouseDownOrMoveOrUp, SdrViewEvent& rVEvt) const;
SdrHitKind PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) const;
- BOOL DoMouseEvent(const SdrViewEvent& rVEvt);
+ sal_Bool DoMouseEvent(const SdrViewEvent& rVEvt);
virtual SdrViewContext GetContext() const;
// Die Methoden beruecksichtigen den jeweiligen Kontex:
@@ -256,27 +256,27 @@ public:
// - Klebepunkt-Editmode
// - TextEdit
// - ... to be continued
- BOOL IsMarkPossible() const;
+ sal_Bool IsMarkPossible() const;
void MarkAll();
void UnmarkAll();
- BOOL IsAllMarked() const;
- BOOL IsAllMarkPrevNextPossible() const; // das geht naemlich nicht bei TextEdit!
- BOOL MarkNext(BOOL bPrev=FALSE);
- BOOL MarkNext(const Point& rPnt, BOOL bPrev=FALSE);
+ sal_Bool IsAllMarked() const;
+ sal_Bool IsAllMarkPrevNextPossible() const; // das geht naemlich nicht bei TextEdit!
+ sal_Bool MarkNext(sal_Bool bPrev=sal_False);
+ sal_Bool MarkNext(const Point& rPnt, sal_Bool bPrev=sal_False);
const Rectangle& GetMarkedRect() const;
void SetMarkedRect(const Rectangle& rRect);
virtual void DeleteMarked();
- BOOL IsDeleteMarkedPossible() const;
- BOOL IsDeletePossible() const { return IsDeleteMarkedPossible(); }
+ sal_Bool IsDeleteMarkedPossible() const;
+ sal_Bool IsDeletePossible() const { return IsDeleteMarkedPossible(); }
// Markieren von Objekten, Polygonpunkten oder Klebepunkten (je nach View-
// Kontext) durch Aufziehen eines Selektionsrahmens.
// bAddMark=TRUE: zur bestehenden Selektion hinzumarkieren (->Shift)
// bUnmark=TRUE: Bereits selektierte Objekte/Punkte/Klebepunkte die innerhalb
// des aufgezogenen Rahmens liegen werden deselektiert.
- BOOL BegMark(const Point& rPnt, BOOL bAddMark=FALSE, BOOL bUnmark=FALSE);
+ sal_Bool BegMark(const Point& rPnt, sal_Bool bAddMark=sal_False, sal_Bool bUnmark=sal_False);
// Folgende Actions sind moeglich:
// - ObjectCreating
@@ -311,28 +311,28 @@ public:
// ~~~~~~~~~~~~~~~~~~~~
// Einfache Events:
// ~~~~~~~~~~~~~~~~
-// BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin);
-// BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
-// BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
-// BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin);
-// BOOL Command(const CommandEvent& rCEvt, Window* pWin);
+// sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin);
+// sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin);
+// sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin);
+// sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin);
+// sal_Bool Command(const CommandEvent& rCEvt, Window* pWin);
//
// Exchange (Clipboard derzeit noch ohne SdrPrivateData):
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-// BOOL Cut(ULONG nFormat=SDR_ANYFORMAT);
-// BOOL Yank(ULONG nFormat=SDR_ANYFORMAT);
-// BOOL Paste(Window* pWin=NULL, ULONG nFormat=SDR_ANYFORMAT);
+// sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT);
+// sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT);
+// sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT);
//
// SfxItems:
// ~~~~~~~~~
-// BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const;
-// BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll);
+// sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
+// sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll);
// SfxStyleSheet* GetStyleSheet() const;
-// BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr);
+// sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
//
// Sonstiges:
// ~~~~~~~~~~
-// Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nTol=0) const;
+// Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nTol=0) const;
// String GetStatusText();
//
///////////////////////////////////////////////////////////////////////////////////////////////// */
diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx
index 9bdd6e005cc3..f600ec5d7bc6 100644
--- a/svx/inc/svx/svdxcgv.hxx
+++ b/svx/inc/svx/svdxcgv.hxx
@@ -56,12 +56,12 @@ class SVX_DLLPUBLIC SdrExchangeView: public SdrObjEditView
protected:
void ImpGetPasteObjList(Point& rPos, SdrObjList*& rpLst);
- void ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, UINT32 nOptions);
- BOOL ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const;
+ void ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions);
+ sal_Bool ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const;
Point GetPastePos(SdrObjList* pLst, OutputDevice* pOut=NULL);
// liefert True, wenn rPt geaendert wurde
- BOOL ImpLimitToWorkArea(Point& rPt) const;
+ sal_Bool ImpLimitToWorkArea(Point& rPt) const;
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -75,11 +75,11 @@ public:
// Alle markierten Objekte in ein Metafile stecken. Z.Zt. noch etwas
// buggee (Offset..., Fremdgrafikobjekte (SdrGrafObj), Virtuelle
// Objektkopien (SdrVirtObj) mit Ankerpos<>(0,0)).
- virtual GDIMetaFile GetMarkedObjMetaFile(BOOL bNoVDevIfOneMtfMarked=FALSE) const;
+ virtual GDIMetaFile GetMarkedObjMetaFile(sal_Bool bNoVDevIfOneMtfMarked=sal_False) const;
// Alle markierten Objekte auf eine Bitmap malen. Diese hat die Farbtiefe
// und Aufloesung des Bildschirms.
- virtual Bitmap GetMarkedObjBitmap(BOOL bNoVDevIfOneBmpMarked=FALSE) const;
+ virtual Bitmap GetMarkedObjBitmap(sal_Bool bNoVDevIfOneBmpMarked=sal_False) const;
// Alle markierten Objekte in ein neues Model kopieren. Dieses neue Model
// hat dann genau eine Page. Das Flag PageNotValid an diesem Model ist
@@ -93,8 +93,8 @@ public:
// der Default-Layer zugewiesen (Layer 0, (dokumentglobaler Standardlayer).
virtual SdrModel* GetMarkedObjModel() const;
- GDIMetaFile GetAllMarkedMetaFile(BOOL bNoVDevIfOneMtfMarked=FALSE) const { return GetMarkedObjMetaFile(bNoVDevIfOneMtfMarked); }
- Bitmap GetAllMarkedBitmap(BOOL bNoVDevIfOneBmpMarked=FALSE) const { return GetMarkedObjBitmap(bNoVDevIfOneBmpMarked); }
+ GDIMetaFile GetAllMarkedMetaFile(sal_Bool bNoVDevIfOneMtfMarked=sal_False) const { return GetMarkedObjMetaFile(bNoVDevIfOneMtfMarked); }
+ Bitmap GetAllMarkedBitmap(sal_Bool bNoVDevIfOneBmpMarked=sal_False) const { return GetMarkedObjBitmap(bNoVDevIfOneBmpMarked); }
Graphic GetAllMarkedGraphic() const;
SdrModel* GetAllMarkedModel() const { return GetMarkedObjModel(); }
@@ -117,7 +117,7 @@ public:
Point GetViewCenter(const OutputDevice* pOut=NULL) const;
// Bei allen Paste-Methoden werden die neuen Draw-Objekte markiert.
- // Wird der Parameter bAddMark auf TRUE gesetzt, so werden die neuen
+ // Wird der Parameter bAddMark auf sal_True gesetzt, so werden die neuen
// DrawObjekte zu einer bereits bestehenden Selektion "hinzumarkiert".
// Dieser Fall ist fuer Drag&Drop mit mehreren Items gedacht.
// Die Methoden mit Point-Parameter fuegen neue Objekte zentriert an
@@ -126,37 +126,37 @@ public:
// eingefuegt. Die Positionierung (rPos bzw. Zentrierung) bezieht sich
// dann nichtmehr auf die View sondern auf die Page.
// Hinweis: SdrObjList ist Basisklasse von SdrPage.
- // Die Methoden liefern TRUE, wenn die Objekte erfolgreich erzeugt und
- // eingefuegt wurden. Bei pLst=FALSE und kein TextEdit aktiv kann man
+ // Die Methoden liefern sal_True, wenn die Objekte erfolgreich erzeugt und
+ // eingefuegt wurden. Bei pLst=sal_False und kein TextEdit aktiv kann man
// sich dann auch darauf verlassen, dass diese an der View markiert sind.
// Andernfalls erfolgt die Markierung nur, wenn pLst z.Zt. auch an der
// View angezeigt wird.
// Gueltige Werte fuer nOptions sind SDRINSERT_DONTMARK und
// SDRINSERT_ADDMARK (siehe svdedtv.hxx).
- BOOL Paste(const GDIMetaFile& rMtf, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rMtf,GetPastePos(pLst,pOut),pLst,nOptions); }
- BOOL Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
- BOOL Paste(const Bitmap& rBmp, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rBmp,GetPastePos(pLst,pOut),pLst,nOptions); }
- BOOL Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
- BOOL Paste(const SdrModel& rMod, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rMod,GetPastePos(pLst,pOut),pLst,nOptions); }
- virtual BOOL Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
- BOOL Paste(const String& rStr, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rStr,GetPastePos(pLst,pOut),pLst,nOptions); }
- BOOL Paste(const String& rStr, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
- // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen
- BOOL Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rInput,rBaseURL,eFormat,GetPastePos(pLst,pOut),pLst,nOptions); }
- BOOL Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
+ sal_Bool Paste(const GDIMetaFile& rMtf, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rMtf,GetPastePos(pLst,pOut),pLst,nOptions); }
+ sal_Bool Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+ sal_Bool Paste(const Bitmap& rBmp, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rBmp,GetPastePos(pLst,pOut),pLst,nOptions); }
+ sal_Bool Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+ sal_Bool Paste(const SdrModel& rMod, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rMod,GetPastePos(pLst,pOut),pLst,nOptions); }
+ virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+ sal_Bool Paste(const String& rStr, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rStr,GetPastePos(pLst,pOut),pLst,nOptions); }
+ sal_Bool Paste(const String& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+ // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen
+ sal_Bool Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rInput,rBaseURL,eFormat,GetPastePos(pLst,pOut),pLst,nOptions); }
+ sal_Bool Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
// Feststellen, ob ein bestimmtes Format ueber Drag&Drop bzw. ueber's
// Clipboard angenommen werden kann.
- BOOL IsExchangeFormatSupported(ULONG nFormat) const;
+ sal_Bool IsExchangeFormatSupported(sal_uIntPtr nFormat) const;
- BOOL Cut( ULONG nFormat = SDR_ANYFORMAT );
- void CutMarked( ULONG nFormat=SDR_ANYFORMAT );
+ sal_Bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT );
+ void CutMarked( sal_uIntPtr nFormat=SDR_ANYFORMAT );
- BOOL Yank( ULONG nFormat = SDR_ANYFORMAT );
- void YankMarked( ULONG nFormat=SDR_ANYFORMAT );
+ sal_Bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT );
+ void YankMarked( sal_uIntPtr nFormat=SDR_ANYFORMAT );
- BOOL Paste( Window* pWin = NULL, ULONG nFormat = SDR_ANYFORMAT );
- BOOL PasteClipboard( OutputDevice* pOut = NULL, ULONG nFormat = SDR_ANYFORMAT, UINT32 nOptions = 0 );
+ sal_Bool Paste( Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT );
+ sal_Bool PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 );
};
#endif //_SVDXCGV_HXX
diff --git a/svx/inc/svx/svimbase.hxx b/svx/inc/svx/svimbase.hxx
index ba10f76b01f9..4ed98e229a32 100644
--- a/svx/inc/svx/svimbase.hxx
+++ b/svx/inc/svx/svimbase.hxx
@@ -56,14 +56,14 @@ enum SimDepthType
struct SimColor
{
- BYTE cBlue;
- BYTE cGreen;
- BYTE cRed;
+ sal_uInt8 cBlue;
+ sal_uInt8 cGreen;
+ sal_uInt8 cRed;
};
// ------------------------------------------------------------------------
-inline BOOL operator==( const SimColor& rCol1, const SimColor& rCol2 )
+inline sal_Bool operator==( const SimColor& rCol1, const SimColor& rCol2 )
{
return ( ( rCol1.cRed == rCol2.cRed ) &&
( rCol1.cGreen == rCol2.cGreen ) &&
@@ -76,7 +76,7 @@ inline BOOL operator==( const SimColor& rCol1, const SimColor& rCol2 )
struct SimPalette
{
- ULONG nColors;
+ sal_uIntPtr nColors;
SimColor aColorArray[ 256 ];
};
@@ -102,39 +102,39 @@ private:
SimPalette* pPal2;
SimPalette* pPal3;
SimPalette* pPal4;
- ULONG nWidth1;
- ULONG nWidth2;
- ULONG nWidth3;
- ULONG nWidth4;
- ULONG nHeight1;
- ULONG nHeight2;
- ULONG nHeight3;
- ULONG nHeight4;
- ULONG nAlignedWidth1;
- ULONG nAlignedWidth2;
- ULONG nAlignedWidth3;
- ULONG nAlignedWidth4;
- ULONG nWhichOrg;
+ sal_uIntPtr nWidth1;
+ sal_uIntPtr nWidth2;
+ sal_uIntPtr nWidth3;
+ sal_uIntPtr nWidth4;
+ sal_uIntPtr nHeight1;
+ sal_uIntPtr nHeight2;
+ sal_uIntPtr nHeight3;
+ sal_uIntPtr nHeight4;
+ sal_uIntPtr nAlignedWidth1;
+ sal_uIntPtr nAlignedWidth2;
+ sal_uIntPtr nAlignedWidth3;
+ sal_uIntPtr nAlignedWidth4;
+ sal_uIntPtr nWhichOrg;
SimDepthType eOrgDepth;
SimDepthType eUndoDepth;
SimDepthType eRedoDepth;
- BOOL bIsUndo;
- BOOL bIsRedo;
- BOOL bCreateUndo;
- BOOL bValid;
- BOOL bDitherAll;
-
- HPBYTE BitmapToArray24( const Bitmap& rBitmap, ULONG* pWidth,
- ULONG* pHeight, ULONG* pAlignedWidth,
+ sal_Bool bIsUndo;
+ sal_Bool bIsRedo;
+ sal_Bool bCreateUndo;
+ sal_Bool bValid;
+ sal_Bool bDitherAll;
+
+ HPBYTE BitmapToArray24( const Bitmap& rBitmap, sal_uIntPtr* pWidth,
+ sal_uIntPtr* pHeight, sal_uIntPtr* pAlignedWidth,
SfxViewFrame *pFrame = NULL );
- BOOL Array24ToBitmap( HPBYTE pArray, Bitmap &rBitmap,
- const ULONG nWidth, const ULONG nHeight,
- const ULONG nColorCount = 256,
- ULONG nLast = 0, SfxProgress* pProgress = NULL );
+ sal_Bool Array24ToBitmap( HPBYTE pArray, Bitmap &rBitmap,
+ const sal_uIntPtr nWidth, const sal_uIntPtr nHeight,
+ const sal_uIntPtr nColorCount = 256,
+ sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL );
Bitmap CreateSaveBitmap( const SimDepthType eDepth, SfxViewFrame *pFrame = NULL );
- HPBYTE CreateArray24( ULONG nWidth, ULONG nHeight );
+ HPBYTE CreateArray24( sal_uIntPtr nWidth, sal_uIntPtr nHeight );
void DeleteArray( HPBYTE pArray );
SvImageBase(const SvImageBase& rSvImageBase);
@@ -144,23 +144,23 @@ public:
SvImageBase();
SvImageBase( const Bitmap& rBitmap,
- const ULONG nColorCount = 256,
- ULONG nLast = 0, SfxProgress* pProgress = NULL );
+ const sal_uIntPtr nColorCount = 256,
+ sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL );
~SvImageBase();
- BOOL IsValid() { return bValid; }
+ sal_Bool IsValid() { return bValid; }
- ULONG GetOrgWidth() const { return nWhichOrg == 1 ? nWidth1 : nWidth2; }
- ULONG GetDestWidth() const { return nWhichOrg == 1 ? nWidth2 : nWidth1; }
+ sal_uIntPtr GetOrgWidth() const { return nWhichOrg == 1 ? nWidth1 : nWidth2; }
+ sal_uIntPtr GetDestWidth() const { return nWhichOrg == 1 ? nWidth2 : nWidth1; }
- ULONG GetOrgHeight() const { return nWhichOrg == 1 ? nHeight1 : nHeight2; }
- ULONG GetDestHeight() const { return nWhichOrg == 1 ? nHeight2 : nHeight1; }
+ sal_uIntPtr GetOrgHeight() const { return nWhichOrg == 1 ? nHeight1 : nHeight2; }
+ sal_uIntPtr GetDestHeight() const { return nWhichOrg == 1 ? nHeight2 : nHeight1; }
- ULONG GetOrgAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth1 : nAlignedWidth2; }
- ULONG GetDestAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth2 : nAlignedWidth1; }
+ sal_uIntPtr GetOrgAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth1 : nAlignedWidth2; }
+ sal_uIntPtr GetDestAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth2 : nAlignedWidth1; }
- ULONG GetOrgAlignedSize() const { return GetOrgAlignedWidth() * GetOrgHeight(); }
- ULONG GetDestAlignedSize() const { return GetDestAlignedWidth() * GetDestHeight(); }
+ sal_uIntPtr GetOrgAlignedSize() const { return GetOrgAlignedWidth() * GetOrgHeight(); }
+ sal_uIntPtr GetDestAlignedSize() const { return GetDestAlignedWidth() * GetDestHeight(); }
// Farbtiefe des Ausgangsbildes ermitteln und setzen
SimDepthType GetDepth() const { return eOrgDepth; }
@@ -174,10 +174,10 @@ public:
void SetRedoDepth(const SimDepthType eDepth) { eRedoDepth = eDepth; }
// Vor- und Ruecklauf der Bildverarbeitung
- BOOL BeginProcessing( BOOL bUndo = TRUE );
+ sal_Bool BeginProcessing( sal_Bool bUndo = sal_True );
void EndProcessing();
- BOOL BeginProcessingExt(ULONG nWidth, ULONG nHeight, BOOL bUndo = TRUE);
+ sal_Bool BeginProcessingExt(sal_uIntPtr nWidth, sal_uIntPtr nHeight, sal_Bool bUndo = sal_True);
void EndProcessingExt() { EndProcessing(); }
// Zeiger auf Arrays zur Verfuegung stellen
@@ -185,12 +185,12 @@ public:
HPBYTE GetDestPointer() { return pDestArray; }
// DIB-Erzeugung fuer Anzeige
- BOOL CreateOutBitmap( const ULONG nColorCount = 256, ULONG nLast = 0,
+ sal_Bool CreateOutBitmap( const sal_uIntPtr nColorCount = 256, sal_uIntPtr nLast = 0,
SfxProgress* pProgress = NULL );
// Undo-Verwaltung
- BOOL DoUndo( SfxProgress* pProgress = NULL );
- BOOL DoRedo( SfxProgress* pProgress = NULL );
+ sal_Bool DoUndo( SfxProgress* pProgress = NULL );
+ sal_Bool DoRedo( SfxProgress* pProgress = NULL );
// DIB-Rueckgabe fuer Anzeige
const Bitmap& GetOutBitmap() const;
@@ -207,6 +207,6 @@ public:
// - DitherBitmap -
// ----------------
-BOOL DitherBitmap( Bitmap& rBitmap, BOOL bDitherAlways = FALSE );
+sal_Bool DitherBitmap( Bitmap& rBitmap, sal_Bool bDitherAlways = sal_False );
#endif // _SVIMBASE_HXX
diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx
index e39c39f3e513..16a56f84b864 100644
--- a/svx/inc/svx/svx3ditems.hxx
+++ b/svx/inc/svx/svx3ditems.hxx
@@ -70,14 +70,14 @@ public:
class SVX_DLLPUBLIC Svx3DDoubleSidedItem : public SfxBoolItem {
public:
- Svx3DDoubleSidedItem(BOOL bVal = 0);
+ Svx3DDoubleSidedItem(sal_Bool bVal = 0);
};
// #i28528#
// Added extra Item (Bool) for chart2 to be able to show reduced line geometry
class Svx3DReducedLineGeometryItem : public SfxBoolItem {
public:
- Svx3DReducedLineGeometryItem(BOOL bVal = 0);
+ Svx3DReducedLineGeometryItem(sal_Bool bVal = 0);
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
};
@@ -87,14 +87,14 @@ public:
Svx3DNormalsKindItem(sal_uInt16 nVal = 0);
// use drawing::NormalsKind
- SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
};
class Svx3DNormalsInvertItem : public SfxBoolItem {
public:
- SVX_DLLPUBLIC Svx3DNormalsInvertItem(BOOL bVal = 0);
+ SVX_DLLPUBLIC Svx3DNormalsInvertItem(sal_Bool bVal = 0);
};
class SVX_DLLPUBLIC Svx3DTextureProjectionXItem : public SfxUInt16Item {
@@ -102,8 +102,8 @@ public:
Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0);
// use drawing::TextureProjectionMode
- SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
};
@@ -112,14 +112,14 @@ public:
Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0);
// use drawing::TextureProjectionMode
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
};
class Svx3DShadow3DItem : public SfxBoolItem {
public:
- SVX_DLLPUBLIC Svx3DShadow3DItem(BOOL bVal = 0);
+ SVX_DLLPUBLIC Svx3DShadow3DItem(sal_Bool bVal = 0);
};
class Svx3DMaterialColorItem : public SvxColorItem {
@@ -147,8 +147,8 @@ public:
Svx3DTextureKindItem(sal_uInt16 nVal = 3);
// use drawing::TextureKind
- SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
};
@@ -157,14 +157,14 @@ public:
Svx3DTextureModeItem(sal_uInt16 nVal = 2);
// use drawing:TextureMode
- SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
};
class Svx3DTextureFilterItem : public SfxBoolItem {
public:
- SVX_DLLPUBLIC Svx3DTextureFilterItem(BOOL bVal = 0);
+ SVX_DLLPUBLIC Svx3DTextureFilterItem(sal_Bool bVal = 0);
};
// Svx3D _3DSCENE_ Items
@@ -173,8 +173,8 @@ public:
Svx3DPerspectiveItem(sal_uInt16 nVal = (sal_uInt16)PR_PERSPECTIVE);
// use drawing::ProjectionMode
- SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
};
@@ -190,7 +190,7 @@ public:
class Svx3DTwoSidedLightingItem : public SfxBoolItem {
public:
- SVX_DLLPUBLIC Svx3DTwoSidedLightingItem(BOOL bVal = 0);
+ SVX_DLLPUBLIC Svx3DTwoSidedLightingItem(sal_Bool bVal = 0);
};
class SVX_DLLPUBLIC Svx3DLightcolor1Item : public SvxColorItem {
@@ -240,42 +240,42 @@ public:
class SVX_DLLPUBLIC Svx3DLightOnOff1Item : public SfxBoolItem {
public:
- Svx3DLightOnOff1Item(BOOL bVal = 1);
+ Svx3DLightOnOff1Item(sal_Bool bVal = 1);
};
class SVX_DLLPUBLIC Svx3DLightOnOff2Item : public SfxBoolItem {
public:
- Svx3DLightOnOff2Item(BOOL bVal = 0);
+ Svx3DLightOnOff2Item(sal_Bool bVal = 0);
};
class SVX_DLLPUBLIC Svx3DLightOnOff3Item : public SfxBoolItem {
public:
- Svx3DLightOnOff3Item(BOOL bVal = 0);
+ Svx3DLightOnOff3Item(sal_Bool bVal = 0);
};
class SVX_DLLPUBLIC Svx3DLightOnOff4Item : public SfxBoolItem {
public:
- Svx3DLightOnOff4Item(BOOL bVal = 0);
+ Svx3DLightOnOff4Item(sal_Bool bVal = 0);
};
class SVX_DLLPUBLIC Svx3DLightOnOff5Item : public SfxBoolItem {
public:
- Svx3DLightOnOff5Item(BOOL bVal = 0);
+ Svx3DLightOnOff5Item(sal_Bool bVal = 0);
};
class SVX_DLLPUBLIC Svx3DLightOnOff6Item : public SfxBoolItem {
public:
- Svx3DLightOnOff6Item(BOOL bVal = 0);
+ Svx3DLightOnOff6Item(sal_Bool bVal = 0);
};
class SVX_DLLPUBLIC Svx3DLightOnOff7Item : public SfxBoolItem {
public:
- Svx3DLightOnOff7Item(BOOL bVal = 0);
+ Svx3DLightOnOff7Item(sal_Bool bVal = 0);
};
class SVX_DLLPUBLIC Svx3DLightOnOff8Item : public SfxBoolItem {
public:
- Svx3DLightOnOff8Item(BOOL bVal = 0);
+ Svx3DLightOnOff8Item(sal_Bool bVal = 0);
};
class SVX_DLLPUBLIC Svx3DLightDirection1Item : public SvxB3DVectorItem {
@@ -328,8 +328,8 @@ public:
Svx3DShadeModeItem(sal_uInt16 nVal = 2);
// use drawing::ShadeMode
- SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ SVX_DLLPRIVATE virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ SVX_DLLPRIVATE virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
};
@@ -337,7 +337,7 @@ public:
// #107245# Item to replace bExtrudeSmoothed and bLatheSmoothed
class Svx3DSmoothNormalsItem : public SfxBoolItem {
public:
- Svx3DSmoothNormalsItem(BOOL bVal = 1);
+ Svx3DSmoothNormalsItem(sal_Bool bVal = 1);
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
};
@@ -345,7 +345,7 @@ public:
// #107245# Item to replace bExtrudeSmoothFrontBack and bLatheSmoothFrontBack
class Svx3DSmoothLidsItem : public SfxBoolItem {
public:
- Svx3DSmoothLidsItem(BOOL bVal = 0);
+ Svx3DSmoothLidsItem(sal_Bool bVal = 0);
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
};
@@ -353,7 +353,7 @@ public:
// #107245# Item to replace bExtrudeCharacterMode and bLatheCharacterMode
class Svx3DCharacterModeItem : public SfxBoolItem {
public:
- Svx3DCharacterModeItem(BOOL bVal = 0);
+ Svx3DCharacterModeItem(sal_Bool bVal = 0);
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
};
@@ -361,7 +361,7 @@ public:
// #107245# Item to replace bExtrudeCloseFront and bLatheCloseFront
class SVX_DLLPUBLIC Svx3DCloseFrontItem : public SfxBoolItem {
public:
- Svx3DCloseFrontItem(BOOL bVal = 1);
+ Svx3DCloseFrontItem(sal_Bool bVal = 1);
SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
};
@@ -369,7 +369,7 @@ public:
// #107245# Item to replace bExtrudeCloseBack and bLatheCloseBack
class SVX_DLLPUBLIC Svx3DCloseBackItem : public SfxBoolItem {
public:
- Svx3DCloseBackItem(BOOL bVal = 1);
+ Svx3DCloseBackItem(sal_Bool bVal = 1);
SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
};
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx
index 983a048a4ff7..56a4985db54d 100644
--- a/svx/inc/svx/svxdlg.hxx
+++ b/svx/inc/svx/svxdlg.hxx
@@ -50,7 +50,7 @@ namespace linguistic2{
}}}}
class SvxSpellWrapper; //add for SvxSpellCheckDialog
typedef SfxTabPage* (*CreateSvxDistributePage)(Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
-typedef USHORT* (*DialogGetRanges)();
+typedef sal_uInt16* (*DialogGetRanges)();
struct ExchangeData;
class INetURLObject;
@@ -84,8 +84,8 @@ class AbstractFmShowColsDialog : public VclAbstractDialog //add for FmShowColsDi
class AbstractSvxZoomDialog : public VclAbstractDialog //add for SvxZoomDialog
{
public:
- virtual void SetLimits( USHORT nMin, USHORT nMax ) = 0;
- virtual void HideButton( USHORT nBtnId )= 0;
+ virtual void SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) = 0;
+ virtual void HideButton( sal_uInt16 nBtnId )= 0;
virtual const SfxItemSet* GetOutputItemSet() const = 0 ;
};
@@ -125,7 +125,7 @@ public:
class AbstractGalleryIdDialog :public VclAbstractDialog //add for GalleryIdDialog
{
public:
- virtual ULONG GetId() const =0;
+ virtual sal_uIntPtr GetId() const =0;
};
class AbstractURLDlg :public VclAbstractDialog //add for URLDlg
@@ -141,17 +141,17 @@ public:
class AbstractSvxHlinkDlgMarkWnd :public VclAbstractDialog //add for SvxHlinkDlgMarkWnd
{
public:
- virtual BOOL MoveTo ( Point aNewPos )const = 0;
- virtual BOOL ConnectToDialog( BOOL bDoit = TRUE )const = 0;
+ virtual sal_Bool MoveTo ( Point aNewPos )const = 0;
+ virtual sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True )const = 0;
virtual void RefreshTree ( String aStrURL ) = 0;
virtual void SelectEntry ( String aStrMark ) = 0;
- virtual USHORT SetError( USHORT nError) = 0;
+ virtual sal_uInt16 SetError( sal_uInt16 nError) = 0;
// in class Window
virtual void SetSizePixel( const Size& rNewSize ) = 0;
virtual Size GetSizePixel() const = 0;
- virtual void Hide( USHORT nFlags = 0 ) = 0;
- virtual BOOL IsVisible() const = 0;
- virtual void Invalidate( USHORT nFlags = 0 ) = 0;
+ virtual void Hide( sal_uInt16 nFlags = 0 ) = 0;
+ virtual sal_Bool IsVisible() const = 0;
+ virtual void Invalidate( sal_uInt16 nFlags = 0 ) = 0;
};
class AbstractSvxSearchFormatDialog : public SfxAbstractTabDialog //for SvxSearchFormatDialog
@@ -165,16 +165,16 @@ public:
class AbstractSvxSearchSimilarityDialog :public VclAbstractDialog //add for SvxSearchSimilarityDialog
{
public:
- virtual USHORT GetOther() =0 ;
- virtual USHORT GetShorter() =0 ;
- virtual USHORT GetLonger() =0 ;
- virtual BOOL IsRelaxed() =0 ;
+ virtual sal_uInt16 GetOther() =0 ;
+ virtual sal_uInt16 GetShorter() =0 ;
+ virtual sal_uInt16 GetLonger() =0 ;
+ virtual sal_Bool IsRelaxed() =0 ;
};
class AbstractSvxJSearchOptionsDialog :public VclAbstractDialog //add for SvxJSearchOptionsDialog
{
public:
- virtual INT32 GetTransliterationFlags() const = 0;
+ virtual sal_Int32 GetTransliterationFlags() const = 0;
};
class AbstractFmInputRecordNoDialog :public VclAbstractDialog //add for FmInputRecordNoDialog
@@ -223,7 +223,7 @@ public:
class AbstractSvxMessDialog :public VclAbstractDialog //add for SvxMessDialog
{
public:
- virtual void SetButtonText( USHORT nBtnId, const String& rNewTxt ) = 0;
+ virtual void SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt ) = 0;
};
class AbstractSvxMultiPathDialog :public VclAbstractDialog //add for SvxMultiPathDialog
@@ -292,14 +292,14 @@ public:
virtual const SfxItemSet* GetOutputItemSet() const = 0;
virtual void SetPrevHdl( const Link& rLink ) = 0;
virtual void SetNextHdl( const Link& rLink ) = 0;
- virtual void EnableTravel(BOOL bNext, BOOL bPrev) = 0;
+ virtual void EnableTravel(sal_Bool bNext, sal_Bool bPrev) = 0;
virtual String GetNote() = 0;
virtual void SetNote(const String& rTxt) = 0;
virtual void ShowLastAuthor(const String& rAuthor, const String& rDate) = 0;
virtual void DontChangeAuthor() = 0;
virtual void HideAuthor() = 0;
- virtual void SetReadonlyPostIt(BOOL bDisable) = 0;
- virtual BOOL IsOkEnabled() const = 0;
+ virtual void SetReadonlyPostIt(sal_Bool bDisable) = 0;
+ virtual sal_Bool IsOkEnabled() const = 0;
virtual Window * GetWindow() = 0;
};
@@ -346,7 +346,7 @@ public:
virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent,
const SdrView* pView,
- USHORT nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog CHINA001
+ sal_uInt16 nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog CHINA001
virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent,
const SfxItemSet& rAttr,
@@ -385,19 +385,19 @@ public:
sal_uInt32 nResId) = 0;
virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, //add for SvxSearchAttributeDialog
SearchAttrItemList& rLst,
- const USHORT* pWhRanges)=0;
+ const sal_uInt16* pWhRanges)=0;
virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent, //add for SvxSearchSimilarityDialog
- BOOL bRelax,
- USHORT nOther,
- USHORT nShorter,
- USHORT nLonger ) = 0;
+ sal_Bool bRelax,
+ sal_uInt16 nOther,
+ sal_uInt16 nShorter,
+ sal_uInt16 nLonger ) = 0;
virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg
const SfxItemSet& rCoreSet,
- BOOL bEnableSelector = FALSE) = 0;
+ sal_Bool bEnableSelector = sal_False) = 0;
virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog
const SfxItemSet* pAttr,
const SdrView* pView,
- USHORT nAnchorTypes = 0) = 0;
+ sal_uInt16 nAnchorTypes = 0) = 0;
virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, //add for SchTransformTabDialog
const SfxItemSet* pAttr,
const SdrView* pSdrView,
@@ -406,7 +406,7 @@ public:
)=0;
virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent,
const SfxItemSet& rOptionsSet,
- INT32 nInitialFlags )=0;
+ sal_Int32 nInitialFlags )=0;
virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) = 0;
virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent,
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl,
@@ -426,8 +426,8 @@ public:
const String& rText, const String& rDesc,
Image* pImg = NULL ) = 0; //add for SvxMessDialog
- virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiPathDialog
- virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiFileDialog
+ virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ; //add for SvxMultiPathDialog
+ virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ; //add for SvxMultiFileDialog
virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, //add for SvxMultiFileDialog
SfxBindings* pBindings,
sal_uInt32 nResId)=0;
@@ -441,14 +441,14 @@ public:
RECT_POINT eLightSource, sal_uInt32 nResId )=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia
const Graphic& rGraphic,
- USHORT nCount,
+ sal_uInt16 nCount,
sal_uInt32 nResId)=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize
const Graphic& rGraphic,
- BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId)=0;
+ sal_uInt8 nGreyThreshold, sal_Bool bInvert, sal_uInt32 nResId)=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic
const Graphic& rGraphic,
- USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId)=0;
+ sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges, sal_uInt32 nResId)=0;
virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog
const SfxItemSet* pAttr,
SdrModel* pModel,
@@ -456,7 +456,7 @@ public:
virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
SdrModel* pModel,
const SdrObject* pObj = NULL,
- BOOL bHasObj = TRUE )=0;
+ sal_Bool bHasObj = sal_True )=0;
virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0;
virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog
const SfxItemSet& rAttr,
@@ -470,16 +470,16 @@ public:
)=0;
virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog
const SfxItemSet& rCoreSet,
- BOOL bPrevNext = FALSE, BOOL bRedline = FALSE )=0;
+ sal_Bool bPrevNext = sal_False, sal_Bool bRedline = sal_False )=0;
virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage ) = 0;
virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc() = 0; // add for SvxDistributePage
- virtual DialogGetRanges GetDialogGetRangesFunc( USHORT nId ) = 0; //add for SvxPostItDialog
+ virtual DialogGetRanges GetDialogGetRangesFunc( sal_uInt16 nId ) = 0; //add for SvxPostItDialog
virtual AbstractScriptSelectorDialog*
CreateScriptSelectorDialog(
Window* pParent,
- BOOL bShowSlots,
+ sal_Bool bShowSlots,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame
) = 0;
diff --git a/svx/inc/svx/svxgrahicitem.hxx b/svx/inc/svx/svxgrahicitem.hxx
index fdd757b1a91b..70064c21c4fe 100644
--- a/svx/inc/svx/svxgrahicitem.hxx
+++ b/svx/inc/svx/svxgrahicitem.hxx
@@ -40,7 +40,7 @@ class SVX_DLLPUBLIC SvxGraphicItem: public SfxPoolItem
public:
TYPEINFO();
SvxGraphicItem();
- SvxGraphicItem( USHORT nWhich ,const Graphic& rGraphic);
+ SvxGraphicItem( sal_uInt16 nWhich ,const Graphic& rGraphic);
SvxGraphicItem( const SvxGraphicItem& );
diff --git a/svx/inc/svx/swframeexample.hxx b/svx/inc/svx/swframeexample.hxx
index 843ff2a487af..4068980b05b5 100644
--- a/svx/inc/svx/swframeexample.hxx
+++ b/svx/inc/svx/swframeexample.hxx
@@ -65,7 +65,7 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public Window
short nWrap;
short nAnchor;
- BOOL bTrans;
+ sal_Bool bTrans;
Point aRelPos;
@@ -83,7 +83,7 @@ public:
SvxSwFrameExample(Window* pParent, const ResId& rResID);
~SvxSwFrameExample();
- inline void SetWrap(USHORT nW) { nWrap = nW; }
+ inline void SetWrap(sal_uInt16 nW) { nWrap = nW; }
inline void SetHAlign(short nH) { nHAlign = nH; }
inline void SetHoriRel(short nR) { nHRel = nR; }
@@ -91,7 +91,7 @@ public:
inline void SetVAlign(short nV) { nVAlign = nV; }
inline void SetVertRel(short nR) { nVRel = nR; }
- inline void SetTransparent(BOOL bT) { bTrans = bT; }
+ inline void SetTransparent(sal_Bool bT) { bTrans = bT; }
inline void SetAnchor(short nA) { nAnchor = nA; }
void SetRelPos(const Point& rP);
diff --git a/svx/inc/svx/sxcaitm.hxx b/svx/inc/svx/sxcaitm.hxx
index 647d6bc0d807..1cf8f2cd1802 100644
--- a/svx/inc/svx/sxcaitm.hxx
+++ b/svx/inc/svx/sxcaitm.hxx
@@ -36,12 +36,12 @@
//------------------------------------
// class SdrCaptionFixedAngleItem
-// TRUE=Winkel durch SdrCaptionAngleItem vorgegeben
-// FALSE=Freier Winkel
+// sal_True=Winkel durch SdrCaptionAngleItem vorgegeben
+// sal_False=Freier Winkel
//------------------------------------
class SdrCaptionFixedAngleItem: public SdrOnOffItem {
public:
- SdrCaptionFixedAngleItem(BOOL bFix=TRUE): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {}
+ SdrCaptionFixedAngleItem(sal_Bool bFix=sal_True): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {}
SdrCaptionFixedAngleItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,rIn) {}
};
diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx
index adf69962b8a3..13379ab9fcbb 100644
--- a/svx/inc/svx/sxcecitm.hxx
+++ b/svx/inc/svx/sxcecitm.hxx
@@ -41,26 +41,26 @@ enum SdrCaptionEscDir {SDRCAPT_ESCHORIZONTAL,SDRCAPT_ESCVERTICAL,SDRCAPT_ESCBEST
class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem {
public:
TYPEINFO();
- SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< USHORT >(eDir)) {}
+ SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< sal_uInt16 >(eDir)) {}
SdrCaptionEscDirItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONESCDIR,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 3; }
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const; // { return 3; }
SdrCaptionEscDir GetValue() const { return (SdrCaptionEscDir)SfxEnumItem::GetValue(); }
- virtual String GetValueTextByPos(USHORT nPos) const;
+ virtual String GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
//------------------------------------
// class SdrCaptionEscIsRelItem
-// TRUE=Linienaustrittsposition relativ
-// FALSE=Linienaustrittsposition absolut
+// sal_True=Linienaustrittsposition relativ
+// sal_False=Linienaustrittsposition absolut
//------------------------------------
class SdrCaptionEscIsRelItem: public SdrYesNoItem {
public:
- SdrCaptionEscIsRelItem(BOOL bRel=TRUE): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {}
+ SdrCaptionEscIsRelItem(sal_Bool bRel=sal_True): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {}
SdrCaptionEscIsRelItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONESCISREL,rIn) {}
};
diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx
index e5c7ac2d1724..6134fe6ad5d4 100644
--- a/svx/inc/svx/sxcikitm.hxx
+++ b/svx/inc/svx/sxcikitm.hxx
@@ -38,17 +38,17 @@ enum SdrCircKind {SDRCIRC_FULL,
class SdrCircKindItem: public SfxEnumItem {
public:
TYPEINFO();
- SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< USHORT >(eKind)) {}
+ SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {}
SdrCircKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CIRCKIND,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 4; }
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const; // { return 4; }
SdrCircKind GetValue() const { return (SdrCircKind)SfxEnumItem::GetValue(); }
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(USHORT nPos) const;
+ virtual String GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sxcllitm.hxx b/svx/inc/svx/sxcllitm.hxx
index 65011beff599..2563897b4ae1 100644
--- a/svx/inc/svx/sxcllitm.hxx
+++ b/svx/inc/svx/sxcllitm.hxx
@@ -51,7 +51,7 @@ public:
//------------------------------------
class SdrCaptionFitLineLenItem: public SdrYesNoItem {
public:
- SdrCaptionFitLineLenItem(BOOL bBestFit=TRUE): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {}
+ SdrCaptionFitLineLenItem(sal_Bool bBestFit=sal_True): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {}
SdrCaptionFitLineLenItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,rIn) {}
};
diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx
index 7cc2cefc8a55..bf2f049a976b 100644
--- a/svx/inc/svx/sxctitm.hxx
+++ b/svx/inc/svx/sxctitm.hxx
@@ -39,13 +39,13 @@ enum SdrCaptionType {SDRCAPT_TYPE1,SDRCAPT_TYPE2,SDRCAPT_TYPE3,SDRCAPT_TYPE4};
class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem {
public:
TYPEINFO();
- SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< USHORT >(eStyle)) {}
+ SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< sal_uInt16 >(eStyle)) {}
SdrCaptionTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONTYPE,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 4; }
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const; // { return 4; }
SdrCaptionType GetValue() const { return (SdrCaptionType)SfxEnumItem::GetValue(); }
- virtual String GetValueTextByPos(USHORT nPos) const;
+ virtual String GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx
index 1a881af22b01..936a7c75f888 100644
--- a/svx/inc/svx/sxekitm.hxx
+++ b/svx/inc/svx/sxekitm.hxx
@@ -43,15 +43,15 @@ enum SdrEdgeKind {SDREDGE_ORTHOLINES,
class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem {
public:
TYPEINFO();
- SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< USHORT >(eStyle)) {}
+ SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< sal_uInt16 >(eStyle)) {}
SdrEdgeKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_EDGEKIND,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 5; }
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const; // { return 5; }
SdrEdgeKind GetValue() const { return (SdrEdgeKind)SfxEnumItem::GetValue(); }
- 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 String GetValueTextByPos(USHORT nPos) const;
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
+ virtual String GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx
index 514b6ec9a713..e40010bb1ad4 100644
--- a/svx/inc/svx/sxfiitm.hxx
+++ b/svx/inc/svx/sxfiitm.hxx
@@ -38,13 +38,13 @@ class SdrFractionItem: public SfxPoolItem {
Fraction nValue;
public:
TYPEINFO_VISIBILITY( SVX_DLLPUBLIC );
- SdrFractionItem(USHORT nId=0): SfxPoolItem(nId) {}
- SdrFractionItem(USHORT nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {}
- SdrFractionItem(USHORT nId, SvStream& rIn);
+ SdrFractionItem(sal_uInt16 nId=0): SfxPoolItem(nId) {}
+ SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {}
+ SdrFractionItem(sal_uInt16 nId, SvStream& rIn);
virtual int operator==(const SfxPoolItem&) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, String &rText, const IntlWrapper * = 0) const;
- virtual SfxPoolItem* Create(SvStream&, USHORT nVer) const;
- virtual SvStream& Store(SvStream&, USHORT nItemVers) const;
+ virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const;
+ virtual SvStream& Store(SvStream&, sal_uInt16 nItemVers) const;
virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const;
const Fraction& GetValue() const { return nValue; }
void SetValue(const Fraction& rVal) { nValue = rVal; }
diff --git a/svx/inc/svx/sxlayitm.hxx b/svx/inc/svx/sxlayitm.hxx
index ed476ade709e..fa346dee0e9c 100644
--- a/svx/inc/svx/sxlayitm.hxx
+++ b/svx/inc/svx/sxlayitm.hxx
@@ -37,7 +37,7 @@
//------------------------------
class SdrLayerIdItem: public SfxUInt16Item {
public:
- SdrLayerIdItem(USHORT nId=0): SfxUInt16Item(SDRATTR_LAYERID,nId) {}
+ SdrLayerIdItem(sal_uInt16 nId=0): SfxUInt16Item(SDRATTR_LAYERID,nId) {}
SdrLayerIdItem(SvStream& rIn): SfxUInt16Item(SDRATTR_LAYERID,rIn) {}
SdrLayerID GetValue() const { return (SdrLayerID)SfxUInt16Item::GetValue(); }
};
diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx
index 2e1a7fd74b5a..3cf0dcbe9351 100644
--- a/svx/inc/svx/sxmkitm.hxx
+++ b/svx/inc/svx/sxmkitm.hxx
@@ -38,17 +38,17 @@ enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i.
class SdrMeasureKindItem: public SfxEnumItem {
public:
TYPEINFO();
- SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< USHORT >(eKind)) {}
+ SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {}
SdrMeasureKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREKIND,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 2; }
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const; // { return 2; }
SdrMeasureKind GetValue() const { return (SdrMeasureKind)SfxEnumItem::GetValue(); }
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(USHORT nPos) const;
+ virtual String GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx
index f056c4cc732e..383ee89a23ba 100644
--- a/svx/inc/svx/sxmtpitm.hxx
+++ b/svx/inc/svx/sxmtpitm.hxx
@@ -40,17 +40,17 @@ enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_BR
class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem {
public:
TYPEINFO();
- SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< USHORT >(ePos)) {}
+ SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {}
SdrMeasureTextHPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTHPOS,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 4; }
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const; // { return 4; }
SdrMeasureTextHPos GetValue() const { return (SdrMeasureTextHPos)SfxEnumItem::GetValue(); }
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(USHORT nPos) const;
+ virtual String GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
@@ -60,17 +60,17 @@ public:
class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem {
public:
TYPEINFO();
- SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< USHORT >(ePos)) {}
+ SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {}
SdrMeasureTextVPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTVPOS,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 5; }
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const; // { return 5; }
SdrMeasureTextVPos GetValue() const { return (SdrMeasureTextVPos)SfxEnumItem::GetValue(); }
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(USHORT nPos) const;
+ virtual String GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx
index d8c65975c92a..aeb9dfeec955 100644
--- a/svx/inc/svx/sxmuitm.hxx
+++ b/svx/inc/svx/sxmuitm.hxx
@@ -37,17 +37,17 @@
class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem {
public:
TYPEINFO();
- SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< USHORT >(eUnit)) {}
+ SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< sal_uInt16 >(eUnit)) {}
SdrMeasureUnitItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREUNIT,rIn) {}
virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const; // { return 14; }
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const; // { return 14; }
FieldUnit GetValue() const { return (FieldUnit)SfxEnumItem::GetValue(); }
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- virtual String GetValueTextByPos(USHORT nPos) const;
+ virtual String GetValueTextByPos(sal_uInt16 nPos) const;
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const;
};
diff --git a/svx/inc/svx/sxsiitm.hxx b/svx/inc/svx/sxsiitm.hxx
index e3f11e57bc3a..ccc284f3ecbe 100644
--- a/svx/inc/svx/sxsiitm.hxx
+++ b/svx/inc/svx/sxsiitm.hxx
@@ -34,11 +34,11 @@
class SdrScaleItem: public SdrFractionItem {
public:
TYPEINFO();
- SdrScaleItem(USHORT nId=0): SdrFractionItem(nId,Fraction(1,1)) {}
- SdrScaleItem(USHORT nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {}
- SdrScaleItem(USHORT nId, SvStream& rIn): SdrFractionItem(nId,rIn) {}
+ SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId,Fraction(1,1)) {}
+ SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {}
+ SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {}
virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, String &rText, const IntlWrapper * = 0) const;
- virtual SfxPoolItem* Create(SvStream&, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const;
virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const;
};
diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx
index a197e110f8ab..dc22f238b97e 100644
--- a/svx/inc/svx/tabarea.hxx
+++ b/svx/inc/svx/tabarea.hxx
@@ -62,7 +62,7 @@ enum PageType
// define ----------------------------------------------------------------
-typedef USHORT ChangeType; // auch in tab_line.hxx (mitpflegen !!!)
+typedef sal_uInt16 ChangeType; // auch in tab_line.hxx (mitpflegen !!!)
#define CT_NONE ( (ChangeType) 0x0000 )
#define CT_MODIFIED ( (ChangeType) 0x0001 )
diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx
index dd4d6033960c..86febb53f9f4 100644
--- a/svx/inc/svx/tabline.hxx
+++ b/svx/inc/svx/tabline.hxx
@@ -45,7 +45,7 @@
class SvxBrushItem;
// define ----------------------------------------------------------------
-typedef USHORT ChangeType; // auch in tab_area.hxx (mitpflegen !!!)
+typedef sal_uInt16 ChangeType; // auch in tab_area.hxx (mitpflegen !!!)
#define CT_NONE ( (ChangeType) 0x0000 )
#define CT_MODIFIED ( (ChangeType) 0x0001 )
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index 0fb270351df9..813fa08e0374 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -186,12 +186,12 @@ class SVX_DLLPUBLIC SvxStyleToolBoxControl : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxStyleToolBoxControl();
virtual Window* CreateItemWindow( Window *pParent );
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
DECL_LINK( VisibilityNotification, void* );
@@ -213,11 +213,11 @@ private:
SfxStyleControllerItem_Impl* pBoundItems [MAX_FAMILIES];
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xBoundItems[MAX_FAMILIES];
SfxTemplateItem* pFamilyState[MAX_FAMILIES];
- USHORT nActFamily; // Id in der ToolBox = Position - 1
- USHORT nActFilter; // FilterIdx
- USHORT nAppFilter; // Filter, den die App gesetzt hat
+ sal_uInt16 nActFamily; // Id in der ToolBox = Position - 1
+ sal_uInt16 nActFilter; // FilterIdx
+ sal_uInt16 nAppFilter; // Filter, den die App gesetzt hat
String aCurSel;
- BOOL bListening;
+ sal_Bool bListening;
Impl* pImpl;
SVX_DLLPRIVATE void Update();
@@ -226,7 +226,7 @@ private:
friend class SfxStyleControllerItem_Impl;
- SVX_DLLPRIVATE void SetFamilyState ( USHORT nIdx, const SfxTemplateItem* pItem );
+ SVX_DLLPRIVATE void SetFamilyState ( sal_uInt16 nIdx, const SfxTemplateItem* pItem );
SVX_DLLPRIVATE SfxStyleFamily GetActFamily ();
};
@@ -239,9 +239,9 @@ class SVX_DLLPUBLIC SvxFontNameToolBoxControl : public SfxToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFontNameToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFontNameToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
- virtual void StateChanged ( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged ( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual Window* CreateItemWindow ( Window *pParent );
};
@@ -264,7 +264,7 @@ class SVX_DLLPUBLIC SvxFontHeightToolBoxControl : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFontHeightToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFontHeightToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxFontHeightToolBoxControl();
// new controller API
@@ -289,10 +289,10 @@ class SVX_DLLPUBLIC SvxFontColorToolBoxControl : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFontColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFontColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxFontColorToolBoxControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
@@ -316,14 +316,14 @@ class SVX_DLLPUBLIC SvxFontColorExtToolBoxControl : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFontColorExtToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFontColorExtToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxFontColorExtToolBoxControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
- virtual void Select( BOOL bMod1 = FALSE );
+ virtual void Select( sal_Bool bMod1 = sal_False );
};
@@ -339,10 +339,10 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl
::svx::ToolboxButtonColorUpdater* pBtnUpdater;
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxColorToolBoxControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
@@ -359,11 +359,11 @@ class SVX_DLLPUBLIC SvxFrameToolBoxControl : public SfxToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFrameToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFrameToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
};
@@ -379,11 +379,11 @@ class SVX_DLLPUBLIC SvxFrameLineStyleToolBoxControl : public SfxToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFrameLineStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFrameLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
};
@@ -399,12 +399,12 @@ class SVX_DLLPUBLIC SvxFrameLineColorToolBoxControl : public SfxToolBoxControl
::svx::ToolboxButtonColorUpdater* pBtnUpdater;
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFrameLineColorToolBoxControl( USHORT nSlotId,
- USHORT nId,
+ SvxFrameLineColorToolBoxControl( sal_uInt16 nSlotId,
+ sal_uInt16 nId,
ToolBox& rTbx );
~SvxFrameLineColorToolBoxControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
@@ -420,13 +420,13 @@ private:
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxReloadControllerItem( USHORT nSlotId,
- USHORT nId,
+ SvxReloadControllerItem( sal_uInt16 nSlotId,
+ sal_uInt16 nId,
ToolBox& rTbx );
~SvxReloadControllerItem();
protected:
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
};
@@ -437,10 +437,10 @@ private:
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxSimpleUndoRedoController( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxSimpleUndoRedoController();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
};
diff --git a/svx/inc/svx/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx
index 669b03e87c73..85504738eafa 100644
--- a/svx/inc/svx/tbxalign.hxx
+++ b/svx/inc/svx/tbxalign.hxx
@@ -44,7 +44,7 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxTbxCtlAlign( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxTbxCtlAlign() {}
private:
rtl::OUString m_aSubTbName;
diff --git a/svx/inc/svx/tbxcolorupdate.hxx b/svx/inc/svx/tbxcolorupdate.hxx
index 892a03257e5b..fbeeb1899105 100644
--- a/svx/inc/svx/tbxcolorupdate.hxx
+++ b/svx/inc/svx/tbxcolorupdate.hxx
@@ -56,10 +56,10 @@ namespace svx
class SVX_DLLPUBLIC ToolboxButtonColorUpdater
{
public:
- ToolboxButtonColorUpdater( USHORT nSlotId,
- USHORT nTbxBtnId,
+ ToolboxButtonColorUpdater( sal_uInt16 nSlotId,
+ sal_uInt16 nTbxBtnId,
ToolBox* ptrTbx,
- USHORT nMode = 0 );
+ sal_uInt16 nMode = 0 );
~ToolboxButtonColorUpdater();
void Update( const Color& rColor );
@@ -68,14 +68,14 @@ namespace svx
void DrawChar(VirtualDevice&, const Color&);
private:
- USHORT mnDrawMode;
- USHORT mnBtnId;
- USHORT mnSlotId;
+ sal_uInt16 mnDrawMode;
+ sal_uInt16 mnBtnId;
+ sal_uInt16 mnSlotId;
ToolBox* mpTbx;
Color maCurColor;
Rectangle maUpdRect;
Size maBmpSize;
- BOOL mbWasHiContrastMode;
+ sal_Bool mbWasHiContrastMode;
};
//........................................................................
diff --git a/svx/inc/svx/tbxctl.hxx b/svx/inc/svx/tbxctl.hxx
index 39bfc09cf8b1..301fb401a789 100644
--- a/svx/inc/svx/tbxctl.hxx
+++ b/svx/inc/svx/tbxctl.hxx
@@ -47,13 +47,13 @@ protected:
using SfxToolBoxControl::Select;
public:
- SvxTbxCtlDraw( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxTbxCtlDraw() {}
SFX_DECL_TOOLBOX_CONTROL();
- virtual void Select( BOOL bMod1 = FALSE );
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void Select( sal_Bool bMod1 = sal_False );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
};
diff --git a/svx/inc/svx/tbxcustomshapes.hxx b/svx/inc/svx/tbxcustomshapes.hxx
index 21aa3ea871ed..114ccf4814b1 100644
--- a/svx/inc/svx/tbxcustomshapes.hxx
+++ b/svx/inc/svx/tbxcustomshapes.hxx
@@ -40,15 +40,15 @@ class SVX_DLLPUBLIC SvxTbxCtlCustomShapes : public SfxToolBoxControl
{
public:
using SfxToolBoxControl::Select;
- virtual void Select( BOOL bMod1 = FALSE );
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void Select( sal_Bool bMod1 = sal_False );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
SFX_DECL_TOOLBOX_CONTROL();
- SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxTbxCtlCustomShapes() {}
//interface XSubToolbarController:
diff --git a/svx/inc/svx/tbxdraw.hxx b/svx/inc/svx/tbxdraw.hxx
index 8f071f38792b..295f9e4539d4 100644
--- a/svx/inc/svx/tbxdraw.hxx
+++ b/svx/inc/svx/tbxdraw.hxx
@@ -49,17 +49,17 @@ protected:
using SfxPopupWindow::StateChanged;
public:
- SvxPopupWindowTbxMgr( USHORT nId,
+ SvxPopupWindowTbxMgr( sal_uInt16 nId,
SfxToolBoxControl* pTbxCtl,
ResId aRIdWin,
ResId aRIdTbx );
- SvxPopupWindowTbxMgr( USHORT nId,
+ SvxPopupWindowTbxMgr( sal_uInt16 nId,
WindowAlign eAlign,
ResId aRIdWin,
ResId aRIdTbx );
~SvxPopupWindowTbxMgr();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState);
virtual SfxPopupWindow* Clone() const;
virtual void PopupModeEnd();
@@ -67,7 +67,7 @@ public:
void StartSelection();
// toolbox click or execute may chage the default selection in the tools toolbox
- virtual void UserEvent( ULONG nEvent, void* pEventData );
+ virtual void UserEvent( sal_uIntPtr nEvent, void* pEventData );
};
diff --git a/svx/inc/svx/txencbox.hxx b/svx/inc/svx/txencbox.hxx
index e24716f8c953..cf661739169b 100644
--- a/svx/inc/svx/txencbox.hxx
+++ b/svx/inc/svx/txencbox.hxx
@@ -42,7 +42,7 @@ class SVX_DLLPUBLIC SvxTextEncodingBox : public ListBox
private:
const SvxTextEncodingTable* m_pEncTable;
- SVX_DLLPRIVATE USHORT EncodingToPos_Impl( rtl_TextEncoding nEnc ) const;
+ SVX_DLLPRIVATE sal_uInt16 EncodingToPos_Impl( rtl_TextEncoding nEnc ) const;
public:
SvxTextEncodingBox( Window* pParent, const ResId& rResId );
@@ -57,14 +57,14 @@ public:
with RTL_TEXTENCODING_INFO_MIME </p>
@param bExcludeImportSubsets
- If <TRUE/>, some specific encodings are not listed, as they are a
+ If <sal_True/>, some specific encodings are not listed, as they are a
subset of another encoding. This is the case for
RTL_TEXTENCODING_GB_2312, RTL_TEXTENCODING_GBK,
RTL_TEXTENCODING_MS_936, which are covered by
RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
- <TRUE/> whenever the box is used in import dialogs. */
+ <sal_True/> whenever the box is used in import dialogs. */
void FillFromTextEncodingTable(
- sal_Bool bExcludeImportSubsets = FALSE,
+ sal_Bool bExcludeImportSubsets = sal_False,
sal_uInt32 nExcludeInfoFlags = 0,
sal_uInt32 nButIncludeInfoFlags = 0
);
@@ -78,14 +78,14 @@ public:
with RTL_TEXTENCODING_INFO_MIME </p>
@param bExcludeImportSubsets
- If <TRUE/>, some specific encodings are not listed, as they are a
+ If <sal_True/>, some specific encodings are not listed, as they are a
subset of another encoding. This is the case for
RTL_TEXTENCODING_GB_2312, RTL_TEXTENCODING_GBK,
RTL_TEXTENCODING_MS_936, which are covered by
RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
- <TRUE/> whenever the box is used in import dialogs. */
+ <sal_True/> whenever the box is used in import dialogs. */
void FillFromDbTextEncodingMap(
- sal_Bool bExcludeImportSubsets = FALSE,
+ sal_Bool bExcludeImportSubsets = sal_False,
sal_uInt32 nExcludeInfoFlags = 0,
sal_uInt32 nButIncludeInfoFlags = 0
);
@@ -99,22 +99,22 @@ public:
{ return m_pEncTable; }
void InsertTextEncoding( const rtl_TextEncoding nEnc,
- USHORT nPos = LISTBOX_APPEND );
+ sal_uInt16 nPos = LISTBOX_APPEND );
void InsertTextEncoding( const rtl_TextEncoding nEnc,
const String& rEntry,
- USHORT nPos = LISTBOX_APPEND );
+ sal_uInt16 nPos = LISTBOX_APPEND );
void RemoveTextEncoding( const rtl_TextEncoding nEnc );
void SelectTextEncoding( const rtl_TextEncoding nEnc,
- BOOL bSelect = TRUE );
+ sal_Bool bSelect = sal_True );
rtl_TextEncoding GetSelectTextEncoding() const;
const String& GetSelectTextString() const;
- BOOL IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const;
+ sal_Bool IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const;
};
#endif
diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx
index 34cb60371582..92b04c659f19 100644
--- a/svx/inc/svx/unoprov.hxx
+++ b/svx/inc/svx/unoprov.hxx
@@ -43,15 +43,15 @@ class SfxItemPool;
struct UHashMapEntry
{
::rtl::OUString aIdentifier;
- UINT32 nId;
+ sal_uInt32 nId;
- UHashMapEntry(const sal_Char * value, sal_Int32 length, UINT32 _nId) : aIdentifier(value,length,RTL_TEXTENCODING_ASCII_US), nId(_nId) { }
+ UHashMapEntry(const sal_Char * value, sal_Int32 length, sal_uInt32 _nId) : aIdentifier(value,length,RTL_TEXTENCODING_ASCII_US), nId(_nId) { }
};
DECLARE_LIST( UHashMapEntryList, UHashMapEntry* )
#define HASHARRAYSIZE 0x10
-#define UHASHMAP_NOTFOUND sal::static_int_cast< UINT32 >(~0)
+#define UHASHMAP_NOTFOUND sal::static_int_cast< sal_uInt32 >(~0)
class UHashMap
{
@@ -62,7 +62,7 @@ public:
UHashMap( UHashMapEntry* pMap );
~UHashMap() {};
- UINT32 getId( const ::rtl::OUString& rCompareString );
+ sal_uInt32 getId( const ::rtl::OUString& rCompareString );
};
/***********************************************************************
@@ -103,12 +103,12 @@ class SVX_DLLPUBLIC SvxUnoPropertyMapProvider
{
SfxItemPropertyMapEntry* aMapArr[SVXMAP_END];
SvxItemPropertySet* aSetArr[SVXMAP_END];
-// void Sort(USHORT nId);
+// void Sort(sal_uInt16 nId);
public:
SvxUnoPropertyMapProvider();
~SvxUnoPropertyMapProvider();
- const SfxItemPropertyMapEntry* GetMap(UINT16 nPropertyId);
- const SvxItemPropertySet* GetPropertySet(UINT16 nPropertyId, SfxItemPool& rPool);
+ const SfxItemPropertyMapEntry* GetMap(sal_uInt16 nPropertyId);
+ const SvxItemPropertySet* GetPropertySet(sal_uInt16 nPropertyId, SfxItemPool& rPool);
};
/***********************************************************************
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index 6b749c05be61..13154829eb4a 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.hxx
@@ -193,7 +193,7 @@ public:
const SvxItemPropertySet& GetPropertySet() { return *mpPropSet; }
SdrObject* GetSdrObject() const {return mpObj.get();}
void SetShapeType( const ::rtl::OUString& ShapeType ) { maShapeType = ShapeType; }
- ::com::sun::star::uno::Any GetBitmap( BOOL bMetaFile = FALSE ) const throw ();
+ ::com::sun::star::uno::Any GetBitmap( sal_Bool bMetaFile = sal_False ) const throw ();
static SvxShape* GetShapeForSdrObj( SdrObject* pObj ) throw ();
::svx::PropertyChangeNotifier& getShapePropertyChangeNotifier();
diff --git a/svx/inc/svx/unoshtxt.hxx b/svx/inc/svx/unoshtxt.hxx
index c06d3955b442..29cb220e9e88 100644
--- a/svx/inc/svx/unoshtxt.hxx
+++ b/svx/inc/svx/unoshtxt.hxx
@@ -83,7 +83,7 @@ public:
// static sal_Bool hasLevels( const SdrObject* pObject );
// the SvxViewForwarder interface
- virtual BOOL IsValid() const;
+ virtual sal_Bool IsValid() const;
virtual Rectangle GetVisArea() const;
virtual Point LogicToPixel( const Point&, const MapMode& ) const;
virtual Point PixelToLogic( const Point&, const MapMode& ) const;
diff --git a/svx/inc/svx/verttexttbxctrl.hxx b/svx/inc/svx/verttexttbxctrl.hxx
index 8c350e31918b..175704f83749 100644
--- a/svx/inc/svx/verttexttbxctrl.hxx
+++ b/svx/inc/svx/verttexttbxctrl.hxx
@@ -37,10 +37,10 @@ class SvxVertCTLTextTbxCtrl : public SfxToolBoxControl
{
sal_Bool bCheckVertical; //determines whether vertical mode or CTL mode has to be checked
public:
- SvxVertCTLTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxVertCTLTextTbxCtrl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
void SetVert(sal_Bool bSet) {bCheckVertical = bSet;}
@@ -52,7 +52,7 @@ class SVX_DLLPUBLIC SvxCTLTextTbxCtrl : public SvxVertCTLTextTbxCtrl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxCTLTextTbxCtrl(USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
};
/* -----------------------------12.09.2002 11:50------------------------------
@@ -61,7 +61,7 @@ class SVX_DLLPUBLIC SvxVertTextTbxCtrl : public SvxVertCTLTextTbxCtrl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxVertTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
};
#endif
diff --git a/svx/inc/svx/view3d.hxx b/svx/inc/svx/view3d.hxx
index ec17badd0052..776d6d672da7 100644
--- a/svx/inc/svx/view3d.hxx
+++ b/svx/inc/svx/view3d.hxx
@@ -74,17 +74,17 @@ protected:
// Migrate selections
Impl3DMirrorConstructOverlay* mpMirrorOverlay;
- BOOL bDoubleSided;
+ sal_Bool bDoubleSided;
void InitView();
- void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
- void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
+ void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
+ void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat);
void ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj);
void ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj);
void InitScene(E3dScene* pScene, double fW, double fH, double fCamZ);
- void ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D, BOOL& rGroupSelected) const;
+ void ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D, sal_Bool& rGroupSelected) const;
void BreakSingle3DObj(E3dObject* pObj);
public:
@@ -97,7 +97,7 @@ public:
// Zugriff auf die Default-Attribute
E3dDefaultAttributes& Get3DDefaultAttributes() { return a3DDefaultAttr; }
- virtual BOOL BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL);
+ virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL);
virtual void CheckPossibilities();
// Event setzen/rausruecken
@@ -111,21 +111,21 @@ public:
// Bei Paste muss - falls in eine Scene eingefuegt wird - die
// Objekte der Szene eingefuegt werden, die Szene selbst aber nicht
using SdrView::Paste;
- virtual BOOL Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0);
+ virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
// #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...)
- BOOL ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset);
+ sal_Bool ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset);
- BOOL HasMarkedScene();
+ sal_Bool HasMarkedScene();
E3dScene* GetMarkedScene();
- BOOL IsConvertTo3DObjPossible() const;
- void ConvertMarkedObjTo3D(BOOL bExtrude=TRUE, basegfx::B2DPoint aPnt1 = basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0, 1.0));
+ sal_Bool IsConvertTo3DObjPossible() const;
+ void ConvertMarkedObjTo3D(sal_Bool bExtrude=sal_True, basegfx::B2DPoint aPnt1 = basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0, 1.0));
// Nachtraeglichhe Korrekturmoeglichkeit um alle Extrudes in einer
// bestimmten Tiefensortierung anzulegen
void DoDepthArrange(E3dScene* pScene, double fDepth);
- void ConvertMarkedToPolyObj(BOOL bLineToArea);
+ void ConvertMarkedToPolyObj(sal_Bool bLineToArea);
E3dScene* SetCurrent3DObj(E3dObject* p3DObj);
void Start3DCreation();
@@ -133,7 +133,7 @@ public:
sal_Bool Is3DRotationCreationActive() const { return (0L != mpMirrorOverlay); }
virtual void MovAction(const Point& rPnt);
- void End3DCreation(BOOL bUseDefaultValuesForMirrorAxes=FALSE);
+ void End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes=sal_False);
void ResetCreationActive();
double GetDefaultCamPosZ();
@@ -256,22 +256,22 @@ public:
long GetVDefaultSegments() const { return nVDefaultSegments; }
void SetVDefaultSegments(long nSegs) { nVDefaultSegments = nSegs; }
- BOOL IsBreak3DObjPossible() const;
+ sal_Bool IsBreak3DObjPossible() const;
void Break3DObj();
- BOOL DoubleSided () const
+ sal_Bool DoubleSided () const
{
return bDoubleSided;
}
- BOOL &DoubleSided ()
+ sal_Bool &DoubleSided ()
{
return bDoubleSided;
}
void MergeScenes();
- SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, BOOL bOnly3DAttr=FALSE) const;
- void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, BOOL bOnly3DAttr=FALSE);
+ SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False) const;
+ void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False);
};
#endif // _E3D_VIEW3D_HXX
diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx
index fe79fc2641e0..febb15fe28ca 100644
--- a/svx/inc/svx/viewlayoutitem.hxx
+++ b/svx/inc/svx/viewlayoutitem.hxx
@@ -42,7 +42,7 @@ class SVX_DLLPUBLIC SvxViewLayoutItem: public SfxUInt16Item
public:
TYPEINFO();
- SvxViewLayoutItem( USHORT nColumns = 0, bool bBookMode = false, USHORT nWhich = SID_ATTR_VIEWLAYOUT );
+ SvxViewLayoutItem( sal_uInt16 nColumns = 0, bool bBookMode = false, sal_uInt16 nWhich = SID_ATTR_VIEWLAYOUT );
SvxViewLayoutItem( const SvxViewLayoutItem& );
~SvxViewLayoutItem();
@@ -52,10 +52,10 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rStrm, USHORT nVersion ) const; // leer
- virtual SvStream& Store( SvStream& rStrm , 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 SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; // leer
+ virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; // leer
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // leer
};
//------------------------------------------------------------------------
diff --git a/svx/inc/svx/viewpt3d.hxx b/svx/inc/svx/viewpt3d.hxx
index a26f559b23b2..2a766e81e1a9 100644
--- a/svx/inc/svx/viewpt3d.hxx
+++ b/svx/inc/svx/viewpt3d.hxx
@@ -78,7 +78,7 @@ class SVX_DLLPUBLIC Viewport3D
basegfx::B3DPoint aViewPoint; // Beobachterstandpunkt in Weltkoordinaten;
// wird mit der Transformation berechnet
- BOOL bTfValid; // Flag, ob Transformation gueltig ist
+ sal_Bool bTfValid; // Flag, ob Transformation gueltig ist
double fWRatio; // Device/View-Seitenverhaeltnisse
double fHRatio;
@@ -105,11 +105,11 @@ class SVX_DLLPUBLIC Viewport3D
double GetFarClipDist() const { return fFarClipDist; }
void SetProjection(ProjectionType ePrj)
- { eProjection = ePrj; bTfValid = FALSE; }
+ { eProjection = ePrj; bTfValid = sal_False; }
ProjectionType GetProjection() const { return(eProjection); }
void SetAspectMapping(AspectMapType eAsp)
- { eAspectMapping = eAsp; bTfValid = FALSE; }
+ { eAspectMapping = eAsp; bTfValid = sal_False; }
AspectMapType GetAspectMapping() { return eAspectMapping; }
void SetViewWindow(double fX, double fY, double fW, double fH);
diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx
index f3b2d98c138d..89104131a16a 100644
--- a/svx/inc/svx/xbitmap.hxx
+++ b/svx/inc/svx/xbitmap.hxx
@@ -50,22 +50,22 @@ protected:
XBitmapType eType;
XBitmapStyle eStyle;
GraphicObject aGraphicObject;
- USHORT* pPixelArray;
+ sal_uInt16* pPixelArray;
Size aArraySize;
Color aPixelColor;
Color aBckgrColor;
- BOOL bGraphicDirty;
+ sal_Bool bGraphicDirty;
public:
XOBitmap();
XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eStyle = XBITMAP_TILE );
XOBitmap( const Bitmap& rBitmap, XBitmapStyle eStyle = XBITMAP_TILE );
#if defined HP9000 || defined SINIX
- XOBitmap( const USHORT* pArray, const Color& aPixelColor,
+ XOBitmap( const sal_uInt16* pArray, const Color& aPixelColor,
const Color& aBckgrColor, const Size& rSize = aXOBitmapDefaultSize,
XBitmapStyle eStyle = XBITMAP_TILE );
#else
- XOBitmap( const USHORT* pArray, const Color& aPixelColor,
+ XOBitmap( const sal_uInt16* pArray, const Color& aPixelColor,
const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ),
XBitmapStyle eStyle = XBITMAP_TILE );
#endif
@@ -78,20 +78,20 @@ public:
void Bitmap2Array();
void Array2Bitmap();
- void SetGraphicObject( const GraphicObject& rObj ) { aGraphicObject = rObj; bGraphicDirty = FALSE; }
- void SetBitmap( const Bitmap& rBmp ) { aGraphicObject = GraphicObject( Graphic( rBmp ) ); bGraphicDirty = FALSE; }
+ void SetGraphicObject( const GraphicObject& rObj ) { aGraphicObject = rObj; bGraphicDirty = sal_False; }
+ void SetBitmap( const Bitmap& rBmp ) { aGraphicObject = GraphicObject( Graphic( rBmp ) ); bGraphicDirty = sal_False; }
void SetBitmapType( XBitmapType eNewType ) { eType = eNewType; }
void SetBitmapStyle( XBitmapStyle eNewStyle ) { eStyle = eNewStyle; }
- void SetPixelArray( const USHORT* pArray );
- void SetPixelSize( const Size& rSize ) { aArraySize = rSize; bGraphicDirty = TRUE; }
- void SetPixelColor( const Color& rColor ) { aPixelColor = rColor; bGraphicDirty = TRUE; }
- void SetBackgroundColor( const Color& rColor ) { aBckgrColor = rColor; bGraphicDirty = TRUE; }
+ void SetPixelArray( const sal_uInt16* pArray );
+ void SetPixelSize( const Size& rSize ) { aArraySize = rSize; bGraphicDirty = sal_True; }
+ void SetPixelColor( const Color& rColor ) { aPixelColor = rColor; bGraphicDirty = sal_True; }
+ void SetBackgroundColor( const Color& rColor ) { aBckgrColor = rColor; bGraphicDirty = sal_True; }
XBitmapType GetBitmapType() const { return eType; }
XBitmapStyle GetBitmapStyle() const { return eStyle; }
const GraphicObject& GetGraphicObject() const;
Bitmap GetBitmap() const;
- USHORT* GetPixelArray() const { return pPixelArray; }
+ sal_uInt16* GetPixelArray() const { return pPixelArray; }
Color GetPixelColor() const { return aPixelColor; }
Color GetBackgroundColor() const { return aBckgrColor; }
};
diff --git a/svx/inc/svx/xbtmpit.hxx b/svx/inc/svx/xbtmpit.hxx
index 5b0a214b67ed..f835507c3a4c 100644
--- a/svx/inc/svx/xbtmpit.hxx
+++ b/svx/inc/svx/xbtmpit.hxx
@@ -50,16 +50,16 @@ public:
XFillBitmapItem( SfxItemPool* pPool, const XOBitmap& rTheBitmap );
XFillBitmapItem( SfxItemPool* pPool );
XFillBitmapItem( const XFillBitmapItem& rItem );
- XFillBitmapItem( SvStream& rIn, USHORT nVer = 0 );
+ XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer = 0 );
virtual int operator==( const SfxPoolItem& rItem ) const;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
- virtual SvStream& Store( SvStream& rOut, USHORT nItemVersion ) const;
- virtual USHORT GetVersion( USHORT nFileFormatVersion ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
+ virtual SvStream& Store( SvStream& rOut, sal_uInt16 nItemVersion ) 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
@@ -69,7 +69,7 @@ public:
const XOBitmap& GetBitmapValue( const XBitmapTable* pTable = 0 ) const; // GetValue -> GetBitmapValue
void SetBitmapValue( const XOBitmap& rNew ) { aXOBitmap = rNew; Detach(); } // SetValue -> SetBitmapValue
- static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+ static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
XFillBitmapItem* checkForUniqueItem( SdrModel* pModel ) const;
};
diff --git a/svx/inc/svx/xcolit.hxx b/svx/inc/svx/xcolit.hxx
index d1827a37ad8c..d2bc3f410a97 100644
--- a/svx/inc/svx/xcolit.hxx
+++ b/svx/inc/svx/xcolit.hxx
@@ -45,19 +45,19 @@ class SVX_DLLPUBLIC XColorItem : public NameOrIndex
public:
TYPEINFO();
XColorItem() {}
- XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor);
+ XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor);
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- XColorItem(USHORT nWhich, const String& rName, const Color& rTheColor);
- XColorItem(USHORT nWhich, SvStream& rIn);
+ XColorItem(sal_uInt16 nWhich, const String& rName, const Color& rTheColor);
+ XColorItem(sal_uInt16 nWhich, SvStream& rIn);
XColorItem(const XColorItem& rItem);
virtual int operator==(const SfxPoolItem& rItem) const;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
const Color& GetColorValue(const XColorTable* pTable = 0) const;
void SetColorValue(const Color& rNew) { aColor = rNew; Detach(); }
diff --git a/svx/inc/svx/xdash.hxx b/svx/inc/svx/xdash.hxx
index 3005c2a1b752..79621f11b628 100644
--- a/svx/inc/svx/xdash.hxx
+++ b/svx/inc/svx/xdash.hxx
@@ -41,32 +41,32 @@ class SVX_DLLPUBLIC XDash
{
protected:
XDashStyle eDash;
- USHORT nDots;
- ULONG nDotLen;
- USHORT nDashes;
- ULONG nDashLen;
- ULONG nDistance;
+ sal_uInt16 nDots;
+ sal_uIntPtr nDotLen;
+ sal_uInt16 nDashes;
+ sal_uIntPtr nDashLen;
+ sal_uIntPtr nDistance;
public:
XDash(XDashStyle eDash = XDASH_RECT,
- USHORT nDots = 1, ULONG nDotLen = 20,
- USHORT nDashes = 1, ULONG nDashLen = 20, ULONG nDistance = 20);
+ sal_uInt16 nDots = 1, sal_uIntPtr nDotLen = 20,
+ sal_uInt16 nDashes = 1, sal_uIntPtr nDashLen = 20, sal_uIntPtr nDistance = 20);
bool operator==(const XDash& rDash) const;
void SetDashStyle(XDashStyle eNewStyle) { eDash = eNewStyle; }
- void SetDots(USHORT nNewDots) { nDots = nNewDots; }
- void SetDotLen(ULONG nNewDotLen) { nDotLen = nNewDotLen; }
- void SetDashes(USHORT nNewDashes) { nDashes = nNewDashes; }
- void SetDashLen(ULONG nNewDashLen) { nDashLen = nNewDashLen; }
- void SetDistance(ULONG nNewDistance) { nDistance = nNewDistance; }
+ void SetDots(sal_uInt16 nNewDots) { nDots = nNewDots; }
+ void SetDotLen(sal_uIntPtr nNewDotLen) { nDotLen = nNewDotLen; }
+ void SetDashes(sal_uInt16 nNewDashes) { nDashes = nNewDashes; }
+ void SetDashLen(sal_uIntPtr nNewDashLen) { nDashLen = nNewDashLen; }
+ void SetDistance(sal_uIntPtr nNewDistance) { nDistance = nNewDistance; }
XDashStyle GetDashStyle() const { return eDash; }
- USHORT GetDots() const { return nDots; }
- ULONG GetDotLen() const { return nDotLen; }
- USHORT GetDashes() const { return nDashes; }
- ULONG GetDashLen() const { return nDashLen; }
- ULONG GetDistance() const { return nDistance; }
+ sal_uInt16 GetDots() const { return nDots; }
+ sal_uIntPtr GetDotLen() const { return nDotLen; }
+ sal_uInt16 GetDashes() const { return nDashes; }
+ sal_uIntPtr GetDashLen() const { return nDashLen; }
+ sal_uIntPtr GetDistance() const { return nDistance; }
// XDash is translated into an array of doubles which describe the lengths of the
// dashes, dots and empty passages. It returns the complete length of the full DashDot
diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx
index 40ddb71dd717..df954983f3d2 100644
--- a/svx/inc/svx/xfillit0.hxx
+++ b/svx/inc/svx/xfillit0.hxx
@@ -46,16 +46,16 @@ public:
XFillStyleItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- virtual USHORT GetValueCount() const;
+ virtual sal_uInt16 GetValueCount() const;
XFillStyle GetValue() const { return (XFillStyle) SfxEnumItem::GetValue(); }
};
diff --git a/svx/inc/svx/xflasit.hxx b/svx/inc/svx/xflasit.hxx
index 2c3df96a8ec2..f13308b613b6 100644
--- a/svx/inc/svx/xflasit.hxx
+++ b/svx/inc/svx/xflasit.hxx
@@ -47,8 +47,8 @@ public:
XFillAttrSetItem(const XFillAttrSetItem& rAttr,
SfxItemPool* pItemPool);
virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const;
- virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVersion ) const;
- virtual SvStream& Store( SvStream& rStream, USHORT nItemVersion ) const;
+ virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVersion ) const;
+ virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const;
};
#endif
diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx
index 8d94d3ec23cd..265443a8c9ac 100644
--- a/svx/inc/svx/xflbckit.hxx
+++ b/svx/inc/svx/xflbckit.hxx
@@ -42,12 +42,12 @@ class SVX_DLLPUBLIC XFillBackgroundItem : public SfxBoolItem
public:
TYPEINFO();
- XFillBackgroundItem( BOOL bFill = FALSE );
+ XFillBackgroundItem( sal_Bool bFill = sal_False );
SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx
index d06d0f6622e4..bb49400742b8 100644
--- a/svx/inc/svx/xflbmpit.hxx
+++ b/svx/inc/svx/xflbmpit.hxx
@@ -45,14 +45,14 @@ public:
SVX_DLLPRIVATE XFillBmpPosItem( SvStream& rIn );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- SVX_DLLPRIVATE virtual USHORT GetValueCount() const;
+ SVX_DLLPRIVATE virtual sal_uInt16 GetValueCount() const;
SVX_DLLPRIVATE RECT_POINT GetValue() const { return (RECT_POINT) SfxEnumItem::GetValue(); }
};
diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx
index adf1c25ca109..4779a76522b3 100644
--- a/svx/inc/svx/xflbmsli.hxx
+++ b/svx/inc/svx/xflbmsli.hxx
@@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpSizeLogItem : public SfxBoolItem
{
public:
TYPEINFO();
- XFillBmpSizeLogItem( BOOL bLog = TRUE );
+ XFillBmpSizeLogItem( sal_Bool bLog = sal_True );
SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx
index d4de1a3d81c2..84ba0703d01a 100644
--- a/svx/inc/svx/xflbmsxy.hxx
+++ b/svx/inc/svx/xflbmsxy.hxx
@@ -45,7 +45,7 @@ public:
SVX_DLLPRIVATE XFillBmpSizeXItem( SvStream& rIn );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
@@ -55,7 +55,7 @@ public:
// Dieses Item nimmt sowohl metrische als auch
// Prozentwerte ( sind negativ ) auf; das muessen
// wir hier beruecksichtigen
- SVX_DLLPRIVATE virtual FASTBOOL HasMetrics() const;
+ SVX_DLLPRIVATE virtual int HasMetrics() const;
};
/*************************************************************************
@@ -72,7 +72,7 @@ public:
SVX_DLLPRIVATE XFillBmpSizeYItem( SvStream& rIn );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
@@ -82,7 +82,7 @@ public:
// Dieses Item nimmt sowohl metrische als auch
// Prozentwerte ( sind negativ ) auf; das muessen
// wir hier beruecksichtigen
- SVX_DLLPRIVATE virtual FASTBOOL HasMetrics() const;
+ SVX_DLLPRIVATE virtual int HasMetrics() const;
};
#endif
diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx
index 75477624e690..9625bab80d96 100644
--- a/svx/inc/svx/xflbmtit.hxx
+++ b/svx/inc/svx/xflbmtit.hxx
@@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpTileItem : public SfxBoolItem
{
public:
TYPEINFO();
- XFillBmpTileItem( BOOL bTile = TRUE );
+ XFillBmpTileItem( sal_Bool bTile = sal_True );
XFillBmpTileItem( SvStream& rIn );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx
index 498704376eaf..19d04ea79e9f 100644
--- a/svx/inc/svx/xflboxy.hxx
+++ b/svx/inc/svx/xflboxy.hxx
@@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetXItem : public SfxUInt16Item
{
public:
TYPEINFO();
- XFillBmpPosOffsetXItem( USHORT nOffPosX = 0 );
+ XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 );
SVX_DLLPRIVATE XFillBmpPosOffsetXItem( SvStream& rIn );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
@@ -64,11 +64,11 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item
{
public:
TYPEINFO();
- XFillBmpPosOffsetYItem( USHORT nOffPosY = 0 );
+ XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 );
SVX_DLLPRIVATE XFillBmpPosOffsetYItem( SvStream& rIn );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx
index 1f5c79df977b..b5cc2ead7d27 100644
--- a/svx/inc/svx/xflbstit.hxx
+++ b/svx/inc/svx/xflbstit.hxx
@@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpStretchItem : public SfxBoolItem
{
public:
TYPEINFO();
- XFillBmpStretchItem( BOOL bStretch = TRUE );
+ XFillBmpStretchItem( sal_Bool bStretch = sal_True );
XFillBmpStretchItem( SvStream& rIn );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx
index 35d401eb9c6a..2ca52a3e5e75 100644
--- a/svx/inc/svx/xflbtoxy.hxx
+++ b/svx/inc/svx/xflbtoxy.hxx
@@ -41,11 +41,11 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetXItem : public SfxUInt16Item
{
public:
TYPEINFO();
- XFillBmpTileOffsetXItem( USHORT nOffX = 0 );
+ XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 );
SVX_DLLPRIVATE XFillBmpTileOffsetXItem( SvStream& rIn );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
@@ -64,11 +64,11 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item
{
public:
TYPEINFO();
- XFillBmpTileOffsetYItem( USHORT nOffX = 0 );
+ XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 );
SVX_DLLPRIVATE XFillBmpTileOffsetYItem( SvStream& rIn );
SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflclit.hxx b/svx/inc/svx/xflclit.hxx
index a3b03b48d30b..367814bb4f0c 100644
--- a/svx/inc/svx/xflclit.hxx
+++ b/svx/inc/svx/xflclit.hxx
@@ -43,15 +43,15 @@ class SVX_DLLPUBLIC XFillColorItem : public XColorItem
public:
TYPEINFO();
XFillColorItem() {}
- XFillColorItem(INT32 nIndex, const Color& rTheColor);
+ XFillColorItem(sal_Int32 nIndex, const Color& rTheColor);
XFillColorItem(const String& rName, const Color& rTheColor);
XFillColorItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xflftrit.hxx b/svx/inc/svx/xflftrit.hxx
index c501a153b66a..9862cf7fa92e 100644
--- a/svx/inc/svx/xflftrit.hxx
+++ b/svx/inc/svx/xflftrit.hxx
@@ -41,31 +41,31 @@ private:
long nDummy1;
long nDummy2;
- BOOL bEnabled;
+ sal_Bool bEnabled;
public:
TYPEINFO();
XFillFloatTransparenceItem();
- XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable = TRUE );
- XFillFloatTransparenceItem(const String& rName, const XGradient& rGradient, BOOL bEnable = TRUE );
- XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, BOOL bEnable = TRUE );
+ XFillFloatTransparenceItem( sal_Int32 nIndex, const XGradient& rGradient, sal_Bool bEnable = sal_True );
+ XFillFloatTransparenceItem(const String& rName, const XGradient& rGradient, sal_Bool bEnable = sal_True );
+ XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, sal_Bool bEnable = sal_True );
XFillFloatTransparenceItem(SfxItemPool* pPool );
XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem );
virtual int operator==( const SfxPoolItem& rItem ) const;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual USHORT GetVersion( USHORT 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 sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric, String &rText, const IntlWrapper * pIntlWrapper = 0 ) const;
- BOOL IsEnabled() const { return bEnabled; }
- void SetEnabled( BOOL bEnable ) { bEnabled = bEnable; }
+ sal_Bool IsEnabled() const { return bEnabled; }
+ void SetEnabled( sal_Bool bEnable ) { bEnabled = bEnable; }
- static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+ static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
XFillFloatTransparenceItem* checkForUniqueItem( SdrModel* pModel ) const;
};
diff --git a/svx/inc/svx/xflgrit.hxx b/svx/inc/svx/xflgrit.hxx
index 4725a2d7383f..30c918d59e21 100644
--- a/svx/inc/svx/xflgrit.hxx
+++ b/svx/inc/svx/xflgrit.hxx
@@ -44,21 +44,21 @@ class SVX_DLLPUBLIC XFillGradientItem : public NameOrIndex
public:
TYPEINFO();
XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {}
- XFillGradientItem(INT32 nIndex, const XGradient& rTheGradient);
+ XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient);
XFillGradientItem(const UniString& rName, const XGradient& rTheGradient);
XFillGradientItem(SfxItemPool* pPool, const XGradient& rTheGradient);
XFillGradientItem(SfxItemPool* pPool );
XFillGradientItem(const XFillGradientItem& rItem);
- XFillGradientItem(SvStream& rIn, USHORT nVer = 0);
+ XFillGradientItem(SvStream& rIn, sal_uInt16 nVer = 0);
virtual int operator==(const SfxPoolItem& rItem) const;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const;
- virtual USHORT GetVersion( USHORT nFileFormatVersion ) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
@@ -66,7 +66,7 @@ public:
const XGradient& GetGradientValue(const XGradientTable* pTable = 0) const; // GetValue -> GetGradientValue
void SetGradientValue(const XGradient& rNew) { aGradient = rNew; Detach(); } // SetValue -> SetGradientValue
- static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+ static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
XFillGradientItem* checkForUniqueItem( SdrModel* pModel ) const;
};
diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx
index 01dadc6405f9..f2754ca62cfc 100644
--- a/svx/inc/svx/xflhtit.hxx
+++ b/svx/inc/svx/xflhtit.hxx
@@ -44,7 +44,7 @@ class SVX_DLLPUBLIC XFillHatchItem : public NameOrIndex
public:
TYPEINFO();
XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1) {}
- XFillHatchItem(INT32 nIndex, const XHatch& rTheHatch);
+ XFillHatchItem(sal_Int32 nIndex, const XHatch& rTheHatch);
XFillHatchItem(const String& rName, const XHatch& rTheHatch);
XFillHatchItem(SfxItemPool* pPool, const XHatch& rTheHatch);
XFillHatchItem(SfxItemPool* pPool );
@@ -53,22 +53,22 @@ public:
virtual int operator==(const SfxPoolItem& rItem) const;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual SvStream& Store(SvStream& rOut, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- virtual FASTBOOL HasMetrics() const;
- virtual FASTBOOL ScaleMetrics(long nMul, long nDiv);
+ virtual int HasMetrics() const;
+ virtual int ScaleMetrics(long nMul, long nDiv);
const XHatch& GetHatchValue(const XHatchTable* pTable = 0) const; // GetValue -> GetHatchValue
void SetHatchValue(const XHatch& rNew) { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue
- static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+ static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
XFillHatchItem* checkForUniqueItem( SdrModel* pModel ) const;
};
diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx
index ee44a24e791c..9f2bab545579 100644
--- a/svx/inc/svx/xfltrit.hxx
+++ b/svx/inc/svx/xfltrit.hxx
@@ -41,10 +41,10 @@ class SVX_DLLPUBLIC XFillTransparenceItem: public SfxUInt16Item
{
public:
TYPEINFO();
- XFillTransparenceItem(USHORT nFillTransparence = 0);
+ XFillTransparenceItem(sal_uInt16 nFillTransparence = 0);
XFillTransparenceItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx
index 575121c5eaf1..e73033dee160 100644
--- a/svx/inc/svx/xftadit.hxx
+++ b/svx/inc/svx/xftadit.hxx
@@ -44,12 +44,12 @@ public:
XFormTextAdjustItem(XFormTextAdjust = XFT_CENTER);
XFormTextAdjustItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const;
XFormTextAdjust GetValue() const { return (XFormTextAdjust) SfxEnumItem::GetValue(); }
// #FontWork#
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
#endif
diff --git a/svx/inc/svx/xftdiit.hxx b/svx/inc/svx/xftdiit.hxx
index a549c74648b5..d0ba783761ea 100644
--- a/svx/inc/svx/xftdiit.hxx
+++ b/svx/inc/svx/xftdiit.hxx
@@ -44,7 +44,7 @@ public:
XFormTextDistanceItem(long nDist = 0);
XFormTextDistanceItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
};
#endif
diff --git a/svx/inc/svx/xftmrit.hxx b/svx/inc/svx/xftmrit.hxx
index b920bc7fc8f0..742268f5e333 100644
--- a/svx/inc/svx/xftmrit.hxx
+++ b/svx/inc/svx/xftmrit.hxx
@@ -41,10 +41,10 @@ class SVX_DLLPUBLIC XFormTextMirrorItem : public SfxBoolItem
{
public:
TYPEINFO();
- XFormTextMirrorItem(BOOL bMirror = FALSE);
+ XFormTextMirrorItem(sal_Bool bMirror = sal_False);
XFormTextMirrorItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
};
#endif
diff --git a/svx/inc/svx/xftouit.hxx b/svx/inc/svx/xftouit.hxx
index 6a46c1f0cabf..11382718f5d9 100644
--- a/svx/inc/svx/xftouit.hxx
+++ b/svx/inc/svx/xftouit.hxx
@@ -40,10 +40,10 @@ class SVX_DLLPUBLIC XFormTextOutlineItem : public SfxBoolItem
{
public:
TYPEINFO();
- XFormTextOutlineItem(BOOL bOutline = FALSE);
+ XFormTextOutlineItem(sal_Bool bOutline = sal_False);
XFormTextOutlineItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
};
#endif
diff --git a/svx/inc/svx/xftsfit.hxx b/svx/inc/svx/xftsfit.hxx
index 40fc477a86bf..22feb75be0f7 100644
--- a/svx/inc/svx/xftsfit.hxx
+++ b/svx/inc/svx/xftsfit.hxx
@@ -43,12 +43,12 @@ public:
XFormTextStdFormItem(XFormTextStdForm = XFTFORM_NONE);
XFormTextStdFormItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const;
XFormTextStdForm GetValue() const { return (XFormTextStdForm) SfxEnumItem::GetValue(); }
// #FontWork#
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
#endif
diff --git a/svx/inc/svx/xftshcit.hxx b/svx/inc/svx/xftshcit.hxx
index bccac9df40bb..fc473db4bb47 100644
--- a/svx/inc/svx/xftshcit.hxx
+++ b/svx/inc/svx/xftshcit.hxx
@@ -42,12 +42,12 @@ class SVX_DLLPUBLIC XFormTextShadowColorItem : public XColorItem
public:
TYPEINFO();
XFormTextShadowColorItem() {}
- XFormTextShadowColorItem(INT32 nIndex, const Color& rTheColor);
+ XFormTextShadowColorItem(sal_Int32 nIndex, const Color& rTheColor);
XFormTextShadowColorItem(const String& rName, const Color& rTheColor);
XFormTextShadowColorItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
};
#endif
diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx
index a63aab17dbc2..6bd8c12c02cf 100644
--- a/svx/inc/svx/xftshit.hxx
+++ b/svx/inc/svx/xftshit.hxx
@@ -44,12 +44,12 @@ public:
XFormTextShadowItem(XFormTextShadow = XFTSHADOW_NONE);
XFormTextShadowItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const;
XFormTextShadow GetValue() const { return (XFormTextShadow) SfxEnumItem::GetValue(); }
// #FontWork#
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
#endif
diff --git a/svx/inc/svx/xftshtit.hxx b/svx/inc/svx/xftshtit.hxx
index 97789eeed5f2..9a959c246e0e 100644
--- a/svx/inc/svx/xftshtit.hxx
+++ b/svx/inc/svx/xftshtit.hxx
@@ -40,10 +40,10 @@ class XFormTextShadowTranspItem: public SfxUInt16Item
{
public:
TYPEINFO();
- XFormTextShadowTranspItem(USHORT nShdwTransparence = 0);
+ XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0);
XFormTextShadowTranspItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
};
#endif
diff --git a/svx/inc/svx/xftshxy.hxx b/svx/inc/svx/xftshxy.hxx
index a9918da33577..cc43565834b3 100644
--- a/svx/inc/svx/xftshxy.hxx
+++ b/svx/inc/svx/xftshxy.hxx
@@ -44,7 +44,7 @@ public:
XFormTextShadowXValItem(long nVal = 0);
XFormTextShadowXValItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
};
/*************************************************************************
@@ -60,7 +60,7 @@ public:
XFormTextShadowYValItem(long nVal = 0);
XFormTextShadowYValItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
};
#endif
diff --git a/svx/inc/svx/xftstit.hxx b/svx/inc/svx/xftstit.hxx
index 78d3dac329c6..e55a8f8ccaa4 100644
--- a/svx/inc/svx/xftstit.hxx
+++ b/svx/inc/svx/xftstit.hxx
@@ -44,7 +44,7 @@ public:
XFormTextStartItem(long nStart = 0);
XFormTextStartItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
};
#endif
diff --git a/svx/inc/svx/xgrad.hxx b/svx/inc/svx/xgrad.hxx
index b7bf350d3ddb..313c2c2dd6c1 100644
--- a/svx/inc/svx/xgrad.hxx
+++ b/svx/inc/svx/xgrad.hxx
@@ -43,20 +43,20 @@ protected:
Color aStartColor;
Color aEndColor;
long nAngle;
- USHORT nBorder;
- USHORT nOfsX;
- USHORT nOfsY;
- USHORT nIntensStart;
- USHORT nIntensEnd;
- USHORT nStepCount;
+ sal_uInt16 nBorder;
+ sal_uInt16 nOfsX;
+ sal_uInt16 nOfsY;
+ sal_uInt16 nIntensStart;
+ sal_uInt16 nIntensEnd;
+ sal_uInt16 nStepCount;
public:
XGradient();
XGradient( const Color& rStart, const Color& rEnd,
XGradientStyle eStyle = XGRAD_LINEAR, long nAngle = 0,
- USHORT nXOfs = 50, USHORT nYOfs = 50, USHORT nBorder = 0,
- USHORT nStartIntens = 100, USHORT nEndIntens = 100,
- USHORT nSteps = 0 );
+ sal_uInt16 nXOfs = 50, sal_uInt16 nYOfs = 50, sal_uInt16 nBorder = 0,
+ sal_uInt16 nStartIntens = 100, sal_uInt16 nEndIntens = 100,
+ sal_uInt16 nSteps = 0 );
bool operator==(const XGradient& rGradient) const;
@@ -64,23 +64,23 @@ public:
void SetStartColor(const Color& rColor) { aStartColor = rColor; }
void SetEndColor(const Color& rColor) { aEndColor = rColor; }
void SetAngle(long nNewAngle) { nAngle = nNewAngle; }
- void SetBorder(USHORT nNewBorder) { nBorder = nNewBorder; }
- void SetXOffset(USHORT nNewOffset) { nOfsX = nNewOffset; }
- void SetYOffset(USHORT nNewOffset) { nOfsY = nNewOffset; }
- void SetStartIntens(USHORT nNewIntens) { nIntensStart = nNewIntens; }
- void SetEndIntens(USHORT nNewIntens) { nIntensEnd = nNewIntens; }
- void SetSteps(USHORT nSteps) { nStepCount = nSteps; }
+ void SetBorder(sal_uInt16 nNewBorder) { nBorder = nNewBorder; }
+ void SetXOffset(sal_uInt16 nNewOffset) { nOfsX = nNewOffset; }
+ void SetYOffset(sal_uInt16 nNewOffset) { nOfsY = nNewOffset; }
+ void SetStartIntens(sal_uInt16 nNewIntens) { nIntensStart = nNewIntens; }
+ void SetEndIntens(sal_uInt16 nNewIntens) { nIntensEnd = nNewIntens; }
+ void SetSteps(sal_uInt16 nSteps) { nStepCount = nSteps; }
XGradientStyle GetGradientStyle() const { return eStyle; }
Color GetStartColor() const { return aStartColor; }
Color GetEndColor() const { return aEndColor; }
long GetAngle() const { return nAngle; }
- USHORT GetBorder() const { return nBorder; }
- USHORT GetXOffset() const { return nOfsX; }
- USHORT GetYOffset() const { return nOfsY; }
- USHORT GetStartIntens() const { return nIntensStart; }
- USHORT GetEndIntens() const { return nIntensEnd; }
- USHORT GetSteps() const { return nStepCount; }
+ sal_uInt16 GetBorder() const { return nBorder; }
+ sal_uInt16 GetXOffset() const { return nOfsX; }
+ sal_uInt16 GetYOffset() const { return nOfsY; }
+ sal_uInt16 GetStartIntens() const { return nIntensStart; }
+ sal_uInt16 GetEndIntens() const { return nIntensEnd; }
+ sal_uInt16 GetSteps() const { return nStepCount; }
};
#endif
diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx
index c08590d7840a..69f0941b3972 100644
--- a/svx/inc/svx/xgrscit.hxx
+++ b/svx/inc/svx/xgrscit.hxx
@@ -41,10 +41,10 @@ class SVX_DLLPUBLIC XGradientStepCountItem: public SfxUInt16Item
{
public:
TYPEINFO();
- XGradientStepCountItem( USHORT nStepCount = 0 );
+ XGradientStepCountItem( sal_uInt16 nStepCount = 0 );
XGradientStepCountItem( SvStream& rIn );
virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx
index 6f82da63e0b9..aa68537d2173 100644
--- a/svx/inc/svx/xit.hxx
+++ b/svx/inc/svx/xit.hxx
@@ -44,14 +44,14 @@ class SfxItemPool;
class NameOrIndex;
class XPropertyList;
-typedef BOOL (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 );
+typedef sal_Bool (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 );
//-------------------
// class NameOrIndex
//-------------------
class SVX_DLLPUBLIC NameOrIndex : public SfxStringItem
{
- INT32 nPalIndex;
+ sal_Int32 nPalIndex;
protected:
void Detach() { nPalIndex = -1; }
@@ -59,30 +59,30 @@ protected:
public:
TYPEINFO();
NameOrIndex() { nPalIndex = -1; }
- NameOrIndex(USHORT nWhich, INT32 nIndex);
- NameOrIndex(USHORT nWhich,
+ NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex);
+ NameOrIndex(sal_uInt16 nWhich,
const String& rName= String());
- NameOrIndex(USHORT nWhich, SvStream& rIn);
+ NameOrIndex(sal_uInt16 nWhich, SvStream& rIn);
NameOrIndex(const NameOrIndex& rNameOrIndex);
~NameOrIndex() {};
virtual int operator==(const SfxPoolItem& rItem) const;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const;
String GetName() const { return GetValue(); }
void SetName(const String& rName) { SetValue(rName); }
- INT32 GetIndex() const { return nPalIndex; }
- void SetIndex(INT32 nIndex) { nPalIndex = nIndex; }
- BOOL IsIndex() const { return (nPalIndex >= 0); }
+ sal_Int32 GetIndex() const { return nPalIndex; }
+ void SetIndex(sal_Int32 nIndex) { nPalIndex = nIndex; }
+ sal_Bool IsIndex() const { return (nPalIndex >= 0); }
/** this static checks if the given NameOrIndex item has a unique name for its value.
The returned String is a unique name for an item with this value in both given pools.
Argument pPool2 can be null.
If returned string equals NameOrIndex->GetName(), the name was already unique.
*/
- static String CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, USHORT nPrefixResId, XPropertyList* pDefaults = NULL );
+ static String CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, XPropertyList* pDefaults = NULL );
};
#endif
diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx
index e21b45d426dd..a30af2c1a86a 100644
--- a/svx/inc/svx/xlineit0.hxx
+++ b/svx/inc/svx/xlineit0.hxx
@@ -42,16 +42,16 @@ public:
XLineStyleItem(XLineStyle = XLINE_SOLID);
XLineStyleItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- virtual USHORT GetValueCount() const;
+ virtual sal_uInt16 GetValueCount() const;
XLineStyle GetValue() const { return (XLineStyle) SfxEnumItem::GetValue(); }
};
diff --git a/svx/inc/svx/xlinjoit.hxx b/svx/inc/svx/xlinjoit.hxx
index ced38d815614..97a8d4142bd6 100644
--- a/svx/inc/svx/xlinjoit.hxx
+++ b/svx/inc/svx/xlinjoit.hxx
@@ -43,17 +43,17 @@ public:
XLineJointItem( XLineJoint eLineJoint = XLINEJOINT_ROUND );
XLineJointItem( SvStream& rIn );
- virtual USHORT GetVersion( USHORT nFileFormatVersion ) const;
+ virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const;
+ virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- virtual USHORT GetValueCount() const;
+ virtual sal_uInt16 GetValueCount() const;
XLineJoint GetValue() const { return (XLineJoint) SfxEnumItem::GetValue(); }
};
diff --git a/svx/inc/svx/xlnasit.hxx b/svx/inc/svx/xlnasit.hxx
index d2eb6594c585..2b1da62d6d88 100644
--- a/svx/inc/svx/xlnasit.hxx
+++ b/svx/inc/svx/xlnasit.hxx
@@ -48,8 +48,8 @@ public:
XLineAttrSetItem(const XLineAttrSetItem& rAttr,
SfxItemPool* pItemPool);
virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const;
- virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVersion ) const;
- virtual SvStream& Store( SvStream& rStream, USHORT nItemVersion ) const;
+ virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVersion ) const;
+ virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const;
};
#endif
diff --git a/svx/inc/svx/xlnclit.hxx b/svx/inc/svx/xlnclit.hxx
index 71af958c588b..ba34121c756b 100644
--- a/svx/inc/svx/xlnclit.hxx
+++ b/svx/inc/svx/xlnclit.hxx
@@ -39,15 +39,15 @@ class SVX_DLLPUBLIC XLineColorItem : public XColorItem
public:
TYPEINFO();
XLineColorItem() {}
- XLineColorItem(INT32 nIndex, const Color& rTheColor);
+ XLineColorItem(sal_Int32 nIndex, const Color& rTheColor);
XLineColorItem(const String& rName, const Color& rTheColor);
XLineColorItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx
index 70f8e33aac83..783c2922df06 100644
--- a/svx/inc/svx/xlndsit.hxx
+++ b/svx/inc/svx/xlndsit.hxx
@@ -47,7 +47,7 @@ class SVX_DLLPUBLIC XLineDashItem : public NameOrIndex
public:
TYPEINFO();
XLineDashItem() : NameOrIndex(XATTR_LINEDASH, -1) {}
- XLineDashItem(INT32 nIndex, const XDash& rTheDash);
+ XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash);
XLineDashItem(const String& rName, const XDash& rTheDash);
XLineDashItem(SfxItemPool* pPool, const XDash& rTheDash);
XLineDashItem(SfxItemPool* pPool );
@@ -56,23 +56,23 @@ public:
virtual int operator==(const SfxPoolItem& rItem) const;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual SvStream& Store(SvStream& rOut, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- virtual FASTBOOL HasMetrics() const;
- virtual FASTBOOL ScaleMetrics(long nMul, long nDiv);
+ virtual int HasMetrics() const;
+ virtual int ScaleMetrics(long nMul, long nDiv);
const XDash& GetDashValue(const XDashTable* pTable = 0) const; // GetValue -> GetDashValue
void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue
- static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
+ static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
XLineDashItem* checkForUniqueItem( SdrModel* pModel ) const;
};
diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx
index c40253a2f4a5..43dafb8e08f5 100644
--- a/svx/inc/svx/xlnedcit.hxx
+++ b/svx/inc/svx/xlnedcit.hxx
@@ -38,13 +38,13 @@ class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem
{
public:
TYPEINFO();
- XLineEndCenterItem(BOOL bEndCenter = FALSE);
+ XLineEndCenterItem(sal_Bool bEndCenter = sal_False);
XLineEndCenterItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnedit.hxx b/svx/inc/svx/xlnedit.hxx
index 99609e6e55df..1a999f903794 100644
--- a/svx/inc/svx/xlnedit.hxx
+++ b/svx/inc/svx/xlnedit.hxx
@@ -43,7 +43,7 @@ class SVX_DLLPUBLIC XLineEndItem : public NameOrIndex
public:
TYPEINFO();
- XLineEndItem(INT32 nIndex = -1);
+ XLineEndItem(sal_Int32 nIndex = -1);
XLineEndItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineEndItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineEndItem(SfxItemPool* pPool );
@@ -52,11 +52,11 @@ public:
virtual int operator==(const SfxPoolItem& rItem) const;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual SvStream& Store(SvStream& rOut, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx
index 1ca29d361178..dcfebeaa997f 100644
--- a/svx/inc/svx/xlnedwit.hxx
+++ b/svx/inc/svx/xlnedwit.hxx
@@ -44,10 +44,10 @@ public:
XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT);
XLineEndWidthItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx
index df544c9b0d8e..e3f5ddaf97ed 100644
--- a/svx/inc/svx/xlnstcit.hxx
+++ b/svx/inc/svx/xlnstcit.hxx
@@ -38,13 +38,13 @@ class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem
{
public:
TYPEINFO();
- XLineStartCenterItem(BOOL bStartCenter = FALSE);
+ XLineStartCenterItem(sal_Bool bStartCenter = sal_False);
XLineStartCenterItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnstit.hxx b/svx/inc/svx/xlnstit.hxx
index f360dd3205e4..26f8d092e0ab 100644
--- a/svx/inc/svx/xlnstit.hxx
+++ b/svx/inc/svx/xlnstit.hxx
@@ -43,7 +43,7 @@ class SVX_DLLPUBLIC XLineStartItem : public NameOrIndex
public:
TYPEINFO();
- XLineStartItem(INT32 nIndex = -1);
+ XLineStartItem(sal_Int32 nIndex = -1);
XLineStartItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineStartItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon);
XLineStartItem(SfxItemPool* pPool );
@@ -52,11 +52,11 @@ public:
virtual int operator==(const SfxPoolItem& rItem) const;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual SvStream& Store(SvStream& rOut, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx
index 86b5aa579325..7675ac4ce821 100644
--- a/svx/inc/svx/xlnstwit.hxx
+++ b/svx/inc/svx/xlnstwit.hxx
@@ -43,10 +43,10 @@ public:
XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT);
XLineStartWidthItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx
index a79a1c0daba2..91c8e8d87bb9 100644
--- a/svx/inc/svx/xlntrit.hxx
+++ b/svx/inc/svx/xlntrit.hxx
@@ -41,10 +41,10 @@ class SVX_DLLPUBLIC XLineTransparenceItem: public SfxUInt16Item
{
public:
TYPEINFO();
- XLineTransparenceItem(USHORT nLineTransparence = 0);
+ XLineTransparenceItem(sal_uInt16 nLineTransparence = 0);
XLineTransparenceItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx
index 4649a515c69a..143b786923ff 100644
--- a/svx/inc/svx/xlnwtit.hxx
+++ b/svx/inc/svx/xlnwtit.hxx
@@ -41,10 +41,10 @@ public:
XLineWidthItem(long nWidth = 0);
XLineWidthItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
diff --git a/svx/inc/svx/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx
index e17c78cd5ccb..5c7812775afa 100644
--- a/svx/inc/svx/xmlgrhlp.hxx
+++ b/svx/inc/svx/xmlgrhlp.hxx
@@ -85,7 +85,7 @@ private:
SVX_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > ImplGetGraphicStorage( const ::rtl::OUString& rPictureStorageName );
SVX_DLLPRIVATE SvxGraphicHelperStream_Impl ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName,
const ::rtl::OUString& rPictureStreamName,
- BOOL bTruncate );
+ sal_Bool bTruncate );
SVX_DLLPRIVATE String ImplGetGraphicMimeType( const String& rFileName ) const;
SVX_DLLPRIVATE Graphic ImplReadGraphic( const ::rtl::OUString& rPictureStorageName,
const ::rtl::OUString& rPictureStreamName );
@@ -99,7 +99,7 @@ protected:
~SvXMLGraphicHelper();
void Init( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& xXMLStorage,
SvXMLGraphicHelperMode eCreateMode,
- BOOL bDirect );
+ sal_Bool bDirect );
virtual void SAL_CALL disposing();
@@ -108,7 +108,7 @@ public:
static SvXMLGraphicHelper* Create( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& rXMLStorage,
SvXMLGraphicHelperMode eCreateMode,
- BOOL bDirect = TRUE );
+ sal_Bool bDirect = sal_True );
static SvXMLGraphicHelper* Create( SvXMLGraphicHelperMode eCreateMode );
static void Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper );
@@ -136,7 +136,7 @@ namespace svx
You should call dispose after you no longer need this component.
- uses eCreateMode == GRAPHICHELPER_MODE_READ, bDirect == TRUE in
+ uses eCreateMode == GRAPHICHELPER_MODE_READ, bDirect == sal_True in
SvXMLGraphicHelper
*/
SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvXMLGraphicImportHelper_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception );
@@ -152,7 +152,7 @@ SVX_DLLPUBLIC ::rtl::OUString SAL_CALL SvXMLGraphicImportHelper_getImplementatio
To write the Pictures stream, you have to call dispose at this component.
Make sure you call dipose before you commit the parent storage.
- uses eCreateMode == GRAPHICHELPER_MODE_WRITE, bDirect == TRUE in
+ uses eCreateMode == GRAPHICHELPER_MODE_WRITE, bDirect == sal_True in
SvXMLGraphicHelper
*/
SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvXMLGraphicExportHelper_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception );
diff --git a/svx/inc/svx/xmlsecctrl.hxx b/svx/inc/svx/xmlsecctrl.hxx
index aa1a38f183bd..47ee75e6bac1 100644
--- a/svx/inc/svx/xmlsecctrl.hxx
+++ b/svx/inc/svx/xmlsecctrl.hxx
@@ -46,10 +46,10 @@ private:
public:
SFX_DECL_STATUSBAR_CONTROL();
- XmlSecStatusBarControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb );
+ XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb );
~XmlSecStatusBarControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt );
virtual void Command( const CommandEvent& rCEvt );
static long GetDefItemWidth( StatusBar& _rStatusBar );
diff --git a/svx/inc/svx/xoutbmp.hxx b/svx/inc/svx/xoutbmp.hxx
index 726eb2f83d9c..1d0fca8de220 100644
--- a/svx/inc/svx/xoutbmp.hxx
+++ b/svx/inc/svx/xoutbmp.hxx
@@ -67,24 +67,24 @@ public:
static BitmapEx CreateQuickDrawBitmapEx( const Graphic& rGraphic, const OutputDevice& rCompDev,
const MapMode& rMapMode, const Size& rLogSize,
const Point& rPoint, const Size& rSize );
- static Graphic MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorFlags );
- static Animation MirrorAnimation( const Animation& rAnimation, BOOL bHMirr, BOOL bVMirr );
- static USHORT WriteGraphic( const Graphic& rGraphic, String& rFileName,
- const String& rFilterName, const ULONG nFlags = 0L,
+ static Graphic MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags );
+ static Animation MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr );
+ static sal_uInt16 WriteGraphic( const Graphic& rGraphic, String& rFileName,
+ const String& rFilterName, const sal_uIntPtr nFlags = 0L,
const Size* pMtfSize_100TH_MM = NULL );
static void DrawQuickDrawBitmapEx( OutputDevice* pOutDev, const Point& rPt,
const Size& rSize, const BitmapEx& rBmpEx );
static void DrawTiledBitmapEx( OutputDevice* pOutDev, const Point& rStartPt, const Size& rGrfSize,
const Rectangle& rTileRect, const BitmapEx& rBmpEx );
- static USHORT ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
- GraphicFilter& rFilter, const USHORT nFormat,
+ static sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
+ GraphicFilter& rFilter, const sal_uInt16 nFormat,
const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL );
- static Bitmap DetectEdges( const Bitmap& rBmp, const BYTE cThreshold );
+ static Bitmap DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold );
- static Polygon GetCountour( const Bitmap& rBmp, const ULONG nContourFlags,
- const BYTE cEdgeDetectThreshold = 50,
+ static Polygon GetCountour( const Bitmap& rBmp, const sal_uIntPtr nContourFlags,
+ const sal_uInt8 cEdgeDetectThreshold = 50,
const Rectangle* pWorkRect = NULL );
};
@@ -92,6 +92,6 @@ public:
// - DitherBitmap -
// ----------------
-SVX_DLLPUBLIC BOOL DitherBitmap( Bitmap& rBitmap );
+SVX_DLLPUBLIC sal_Bool DitherBitmap( Bitmap& rBitmap );
#endif // _XOUTBMP_HXX
diff --git a/svx/inc/svx/xpoly.hxx b/svx/inc/svx/xpoly.hxx
index 28b7e3dcdd3e..a645494f8ae4 100644
--- a/svx/inc/svx/xpoly.hxx
+++ b/svx/inc/svx/xpoly.hxx
@@ -75,59 +75,59 @@ protected:
void CheckReference();
// Hilfsfunktionen fuer Bezierkonvertierung
- void SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT);
+ void SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT);
void GenBezArc(const Point& rCenter, long nRx, long nRy,
- long nXHdl, long nYHdl, USHORT nStart, USHORT nEnd,
- USHORT nQuad, USHORT nFirst);
- BOOL CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2);
+ long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd,
+ sal_uInt16 nQuad, sal_uInt16 nFirst);
+ sal_Bool CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2);
public:
- XPolygon( USHORT nSize=16, USHORT nResize=16 );
+ XPolygon( sal_uInt16 nSize=16, sal_uInt16 nResize=16 );
XPolygon( const XPolygon& rXPoly );
XPolygon( const Polygon& rPoly );
XPolygon( const Rectangle& rRect, long nRx = 0, long nRy = 0 );
XPolygon( const Point& rCenter, long nRx, long nRy,
- USHORT nStartAngle = 0, USHORT nEndAngle = 3600,
- BOOL bClose = TRUE );
+ sal_uInt16 nStartAngle = 0, sal_uInt16 nEndAngle = 3600,
+ sal_Bool bClose = sal_True );
~XPolygon();
- void SetSize( USHORT nSize );
- USHORT GetSize() const;
+ void SetSize( sal_uInt16 nSize );
+ sal_uInt16 GetSize() const;
- void SetPointCount( USHORT nPoints );
- USHORT GetPointCount() const;
+ void SetPointCount( sal_uInt16 nPoints );
+ sal_uInt16 GetPointCount() const;
- void Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags );
- void Insert( USHORT nPos, const XPolygon& rXPoly );
- void Insert( USHORT nPos, const Polygon& rPoly );
- void Remove( USHORT nPos, USHORT nCount );
+ void Insert( sal_uInt16 nPos, const Point& rPt, XPolyFlags eFlags );
+ void Insert( sal_uInt16 nPos, const XPolygon& rXPoly );
+ void Insert( sal_uInt16 nPos, const Polygon& rPoly );
+ void Remove( sal_uInt16 nPos, sal_uInt16 nCount );
void Move( long nHorzMove, long nVertMove );
Rectangle GetBoundRect() const;
- const Point& operator[]( USHORT nPos ) const;
- Point& operator[]( USHORT nPos );
+ const Point& operator[]( sal_uInt16 nPos ) const;
+ Point& operator[]( sal_uInt16 nPos );
XPolygon& operator=( const XPolygon& rXPoly );
- BOOL operator==( const XPolygon& rXPoly ) const;
- BOOL operator!=( const XPolygon& rXPoly ) const;
+ sal_Bool operator==( const XPolygon& rXPoly ) const;
+ sal_Bool operator!=( const XPolygon& rXPoly ) const;
- XPolyFlags GetFlags( USHORT nPos ) const;
- void SetFlags( USHORT nPos, XPolyFlags eFlags );
- BOOL IsControl(USHORT nPos) const;
- BOOL IsSmooth(USHORT nPos) const;
+ XPolyFlags GetFlags( sal_uInt16 nPos ) const;
+ void SetFlags( sal_uInt16 nPos, XPolyFlags eFlags );
+ sal_Bool IsControl(sal_uInt16 nPos) const;
+ sal_Bool IsSmooth(sal_uInt16 nPos) const;
// Abstand zwischen zwei Punkten
- double CalcDistance(USHORT nP1, USHORT nP2);
+ double CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2);
// Bezierkonvertierungen
- void CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt);
- void CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext);
- void PointsToBezier(USHORT nFirst);
+ void CalcSmoothJoin(sal_uInt16 nCenter, sal_uInt16 nDrag, sal_uInt16 nPnt);
+ void CalcTangent(sal_uInt16 nCenter, sal_uInt16 nPrev, sal_uInt16 nNext);
+ void PointsToBezier(sal_uInt16 nFirst);
// Transformationen
void Translate(const Point& rTrans);
void Rotate(const Point& rCenter, double fSin, double fCos);
- void Rotate(const Point& rCenter, USHORT nAngle);
+ void Rotate(const Point& rCenter, sal_uInt16 nAngle);
void Scale(double fSx, double fSy);
void SlantX(long nYRef, double fSin, double fCos);
void SlantY(long nXRef, double fSin, double fCos);
@@ -160,7 +160,7 @@ protected:
void CheckReference();
public:
- XPolyPolygon( USHORT nInitSize = 16, USHORT nResize = 16 );
+ XPolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 );
XPolyPolygon( const XPolygon& rXPoly );
XPolyPolygon( const XPolyPolygon& rXPolyPoly );
XPolyPolygon( const PolyPolygon& rPolyPoly);
@@ -168,31 +168,31 @@ public:
~XPolyPolygon();
void Insert( const XPolygon& rXPoly,
- USHORT nPos = XPOLYPOLY_APPEND );
+ sal_uInt16 nPos = XPOLYPOLY_APPEND );
void Insert( const XPolyPolygon& rXPoly,
- USHORT nPos=XPOLYPOLY_APPEND );
- XPolygon Remove( USHORT nPos );
- XPolygon Replace( const XPolygon& rXPoly, USHORT nPos );
- const XPolygon& GetObject( USHORT nPos ) const;
+ sal_uInt16 nPos=XPOLYPOLY_APPEND );
+ XPolygon Remove( sal_uInt16 nPos );
+ XPolygon Replace( const XPolygon& rXPoly, sal_uInt16 nPos );
+ const XPolygon& GetObject( sal_uInt16 nPos ) const;
void Clear();
- USHORT Count() const;
+ sal_uInt16 Count() const;
void Move( long nHorzMove, long nVertMove );
Rectangle GetBoundRect() const;
- const XPolygon& operator[]( USHORT nPos ) const
+ const XPolygon& operator[]( sal_uInt16 nPos ) const
{ return GetObject( nPos ); }
- XPolygon& operator[]( USHORT nPos );
+ XPolygon& operator[]( sal_uInt16 nPos );
XPolyPolygon& operator=( const XPolyPolygon& rXPolyPoly );
- BOOL operator==( const XPolyPolygon& rXPolyPoly ) const;
- BOOL operator!=( const XPolyPolygon& rXPolyPoly ) const;
+ sal_Bool operator==( const XPolyPolygon& rXPolyPoly ) const;
+ sal_Bool operator!=( const XPolyPolygon& rXPolyPoly ) const;
// Transformationen
void Translate(const Point& rTrans);
void Rotate(const Point& rCenter, double fSin, double fCos);
- void Rotate(const Point& rCenter, USHORT nAngle);
+ void Rotate(const Point& rCenter, sal_uInt16 nAngle);
void Scale(double fSx, double fSy);
void SlantX(long nYRef, double fSin, double fCos);
void SlantY(long nXRef, double fSin, double fCos);
diff --git a/svx/inc/svx/xsflclit.hxx b/svx/inc/svx/xsflclit.hxx
index 1c8b33cc278d..d9379ced1e68 100644
--- a/svx/inc/svx/xsflclit.hxx
+++ b/svx/inc/svx/xsflclit.hxx
@@ -38,19 +38,19 @@ class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem
public:
TYPEINFO();
SVX_DLLPRIVATE XSecondaryFillColorItem() {}
- SVX_DLLPRIVATE XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor);
+ SVX_DLLPRIVATE XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor);
XSecondaryFillColorItem(const String& rName, const Color& rTheColor);
SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn);
SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
String &rText, const IntlWrapper * = 0 ) const;
- SVX_DLLPRIVATE virtual USHORT GetVersion( USHORT nFileFormatVersion ) const;
+ SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const;
};
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 7ef8e659b08f..721b84a19955 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -216,14 +216,14 @@ protected:
Table aTable;
Table* pBmpTable;
- BOOL bTableDirty;
- BOOL bBitmapsDirty;
- BOOL bOwnPool;
+ sal_Bool bTableDirty;
+ sal_Bool bBitmapsDirty;
+ sal_Bool bOwnPool;
XPropertyTable( const String& rPath,
XOutdevItemPool* pXPool = NULL,
- USHORT nInitSize = 16,
- USHORT nReSize = 16 );
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16 );
XPropertyTable( SvStream& rIn );
void Clear();
@@ -232,10 +232,10 @@ public:
long Count() const;
- BOOL Insert(long nIndex, XPropertyEntry* pEntry);
+ sal_Bool Insert(long nIndex, XPropertyEntry* pEntry);
XPropertyEntry* Replace(long nIndex, XPropertyEntry* pEntry);
- XPropertyEntry* Remove(long nIndex, USHORT nDummy);
- XPropertyEntry* Get( long nIndex, USHORT nDummy ) const;
+ XPropertyEntry* Remove(long nIndex, sal_uInt16 nDummy);
+ XPropertyEntry* Get( long nIndex, sal_uInt16 nDummy ) const;
long Get(const String& rName);
Bitmap* GetBitmap( long nIndex ) const;
@@ -244,15 +244,15 @@ public:
void SetName( const String& rString );
const String& GetPath() const { return aPath; }
void SetPath( const String& rString ) { aPath = rString; }
- BOOL IsDirty() const { return bTableDirty && bBitmapsDirty; }
- void SetDirty( BOOL bDirty = TRUE )
+ sal_Bool IsDirty() const { return bTableDirty && bBitmapsDirty; }
+ void SetDirty( sal_Bool bDirty = sal_True )
{ bTableDirty = bDirty; bBitmapsDirty = bDirty; }
- virtual BOOL Load() = 0;
- virtual BOOL Save() = 0;
- virtual BOOL Create() = 0;
- virtual BOOL CreateBitmapsForUI() = 0;
- virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ) = 0;
+ virtual sal_Bool Load() = 0;
+ virtual sal_Bool Save() = 0;
+ virtual sal_Bool Create() = 0;
+ virtual sal_Bool CreateBitmapsForUI() = 0;
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0;
};
// --------------------
@@ -269,14 +269,14 @@ protected:
List aList;
List* pBmpList;
- BOOL bListDirty;
- BOOL bBitmapsDirty;
- BOOL bOwnPool;
+ sal_Bool bListDirty;
+ sal_Bool bBitmapsDirty;
+ sal_Bool bOwnPool;
XPropertyList( const String& rPath,
XOutdevItemPool* pXPool = NULL,
- USHORT nInitSize = 16,
- USHORT nReSize = 16 );
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16 );
XPropertyList( SvStream& rIn );
void Clear();
@@ -287,8 +287,8 @@ public:
void Insert( XPropertyEntry* pEntry, long nIndex = LIST_APPEND );
XPropertyEntry* Replace( XPropertyEntry* pEntry, long nIndex );
- XPropertyEntry* Remove( long nIndex, USHORT nDummy );
- XPropertyEntry* Get( long nIndex, USHORT nDummy ) const;
+ XPropertyEntry* Remove( long nIndex, sal_uInt16 nDummy );
+ XPropertyEntry* Get( long nIndex, sal_uInt16 nDummy ) const;
long Get(const String& rName);
Bitmap* GetBitmap( long nIndex ) const;
@@ -297,15 +297,15 @@ public:
void SetName( const String& rString );
const String& GetPath() const { return aPath; }
void SetPath( const String& rString ) { aPath = rString; }
- BOOL IsDirty() const { return bListDirty && bBitmapsDirty; }
- void SetDirty( BOOL bDirty = TRUE )
+ sal_Bool IsDirty() const { return bListDirty && bBitmapsDirty; }
+ void SetDirty( sal_Bool bDirty = sal_True )
{ bListDirty = bDirty; bBitmapsDirty = bDirty; }
- virtual BOOL Load() = 0;
- virtual BOOL Save() = 0;
- virtual BOOL Create() = 0;
- virtual BOOL CreateBitmapsForUI() = 0;
- virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ) = 0;
+ virtual sal_Bool Load() = 0;
+ virtual sal_Bool Save() = 0;
+ virtual sal_Bool Create() = 0;
+ virtual sal_Bool CreateBitmapsForUI() = 0;
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0;
};
// ------------------
@@ -317,8 +317,8 @@ class SVX_DLLPUBLIC XColorTable : public XPropertyTable
public:
XColorTable( const String& rPath,
XOutdevItemPool* pXPool = NULL,
- USHORT nInitSize = 16,
- USHORT nReSize = 16 );
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16 );
virtual ~XColorTable();
using XPropertyTable::Replace;
@@ -328,11 +328,11 @@ public:
using XPropertyTable::Get;
XColorEntry* GetColor(long nIndex) const;
- virtual BOOL Load();
- virtual BOOL Save();
- virtual BOOL Create();
- virtual BOOL CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+ virtual sal_Bool Load();
+ virtual sal_Bool Save();
+ virtual sal_Bool Create();
+ virtual sal_Bool CreateBitmapsForUI();
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
static XColorTable* GetStdColorTable();
};
@@ -346,8 +346,8 @@ class XColorList : public XPropertyList
public:
XColorList( const String& rPath,
XOutdevItemPool* pXPool = NULL,
- USHORT nInitSize = 16,
- USHORT nReSize = 16 );
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16 );
virtual ~XColorList();
using XPropertyList::Replace;
@@ -357,11 +357,11 @@ public:
using XPropertyList::Get;
XColorEntry* GetColor(long nIndex) const;
- virtual BOOL Load();
- virtual BOOL Save();
- virtual BOOL Create();
- virtual BOOL CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+ virtual sal_Bool Load();
+ virtual sal_Bool Save();
+ virtual sal_Bool Create();
+ virtual sal_Bool CreateBitmapsForUI();
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
};
// --------------------
@@ -373,8 +373,8 @@ class XLineEndTable : public XPropertyTable
public:
XLineEndTable( const String& rPath,
XOutdevItemPool* pXPool = NULL,
- USHORT nInitSize = 16,
- USHORT nReSize = 16 );
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16 );
virtual ~XLineEndTable();
using XPropertyTable::Replace;
@@ -384,11 +384,11 @@ public:
using XPropertyTable::Get;
XLineEndEntry* GetLineEnd(long nIndex) const;
- virtual BOOL Load();
- virtual BOOL Save();
- virtual BOOL Create();
- virtual BOOL CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+ virtual sal_Bool Load();
+ virtual sal_Bool Save();
+ virtual sal_Bool Create();
+ virtual sal_Bool CreateBitmapsForUI();
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
};
// -------------------
@@ -415,11 +415,11 @@ public:
using XPropertyList::Get;
XLineEndEntry* GetLineEnd(long nIndex) const;
- virtual BOOL Load();
- virtual BOOL Save();
- virtual BOOL Create();
- virtual BOOL CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE);
+ virtual sal_Bool Load();
+ virtual sal_Bool Save();
+ virtual sal_Bool Create();
+ virtual sal_Bool CreateBitmapsForUI();
+ virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
};
// --------------------
@@ -431,8 +431,8 @@ class XDashTable : public XPropertyTable
public:
XDashTable( const String& rPath,
XOutdevItemPool* pXPool = NULL,
- USHORT nInitSize = 16,
- USHORT nReSize = 16 );
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16 );
virtual ~XDashTable();
using XPropertyTable::Replace;
@@ -442,11 +442,11 @@ public:
using XPropertyTable::Get;
XDashEntry* GetDash(long nIndex) const;
- virtual BOOL Load();
- virtual BOOL Save();
- virtual BOOL Create();
- virtual BOOL CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+ virtual sal_Bool Load();
+ virtual sal_Bool Save();
+ virtual sal_Bool Create();
+ virtual sal_Bool CreateBitmapsForUI();
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
};
// -------------------
@@ -473,11 +473,11 @@ public:
using XPropertyList::Get;
XDashEntry* GetDash(long nIndex) const;
- virtual BOOL Load();
- virtual BOOL Save();
- virtual BOOL Create();
- virtual BOOL CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE);
+ virtual sal_Bool Load();
+ virtual sal_Bool Save();
+ virtual sal_Bool Create();
+ virtual sal_Bool CreateBitmapsForUI();
+ virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
};
// --------------------
@@ -489,8 +489,8 @@ class XHatchTable : public XPropertyTable
public:
XHatchTable( const String& rPath,
XOutdevItemPool* pXPool = NULL,
- USHORT nInitSize = 16,
- USHORT nReSize = 16 );
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16 );
virtual ~XHatchTable();
using XPropertyTable::Replace;
@@ -500,11 +500,11 @@ public:
using XPropertyTable::Get;
XHatchEntry* GetHatch(long nIndex) const;
- virtual BOOL Load();
- virtual BOOL Save();
- virtual BOOL Create();
- virtual BOOL CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+ virtual sal_Bool Load();
+ virtual sal_Bool Save();
+ virtual sal_Bool Create();
+ virtual sal_Bool CreateBitmapsForUI();
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
};
// -------------------
@@ -531,11 +531,11 @@ public:
using XPropertyList::Get;
XHatchEntry* GetHatch(long nIndex) const;
- virtual BOOL Load();
- virtual BOOL Save();
- virtual BOOL Create();
- virtual BOOL CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE);
+ virtual sal_Bool Load();
+ virtual sal_Bool Save();
+ virtual sal_Bool Create();
+ virtual sal_Bool CreateBitmapsForUI();
+ virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
};
// ---------------------
@@ -547,8 +547,8 @@ class XGradientTable : public XPropertyTable
public:
XGradientTable( const String& rPath,
XOutdevItemPool* pXPool = NULL,
- USHORT nInitSize = 16,
- USHORT nReSize = 16 );
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16 );
virtual ~XGradientTable();
using XPropertyTable::Replace;
@@ -558,11 +558,11 @@ public:
using XPropertyTable::Get;
XGradientEntry* GetGradient(long nIndex) const;
- virtual BOOL Load();
- virtual BOOL Save();
- virtual BOOL Create();
- virtual BOOL CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+ virtual sal_Bool Load();
+ virtual sal_Bool Save();
+ virtual sal_Bool Create();
+ virtual sal_Bool CreateBitmapsForUI();
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
};
// -------------------
@@ -589,11 +589,11 @@ public:
using XPropertyList::Get;
XGradientEntry* GetGradient(long nIndex) const;
- virtual BOOL Load();
- virtual BOOL Save();
- virtual BOOL Create();
- virtual BOOL CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE);
+ virtual sal_Bool Load();
+ virtual sal_Bool Save();
+ virtual sal_Bool Create();
+ virtual sal_Bool CreateBitmapsForUI();
+ virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
};
// ---------------------
@@ -605,8 +605,8 @@ class XBitmapTable : public XPropertyTable
public:
XBitmapTable( const String& rPath,
XOutdevItemPool* pXPool = NULL,
- USHORT nInitSize = 16,
- USHORT nReSize = 16 );
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16 );
virtual ~XBitmapTable();
using XPropertyTable::Replace;
@@ -616,11 +616,11 @@ public:
using XPropertyTable::Get;
XBitmapEntry* GetBitmap(long nIndex) const;
- virtual BOOL Load();
- virtual BOOL Save();
- virtual BOOL Create();
- virtual BOOL CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+ virtual sal_Bool Load();
+ virtual sal_Bool Save();
+ virtual sal_Bool Create();
+ virtual sal_Bool CreateBitmapsForUI();
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
};
// -------------------
@@ -632,8 +632,8 @@ class SVX_DLLPUBLIC XBitmapList : public XPropertyList
public:
XBitmapList( const String& rPath,
XOutdevItemPool* pXPool = NULL,
- USHORT nInitSize = 16,
- USHORT nReSize = 16 );
+ sal_uInt16 nInitSize = 16,
+ sal_uInt16 nReSize = 16 );
virtual ~XBitmapList();
using XPropertyList::Replace;
@@ -643,11 +643,11 @@ public:
using XPropertyList::Get;
XBitmapEntry* GetBitmap(long nIndex) const;
- virtual BOOL Load();
- virtual BOOL Save();
- virtual BOOL Create();
- virtual BOOL CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE );
+ virtual sal_Bool Load();
+ virtual sal_Bool Save();
+ virtual sal_Bool Create();
+ virtual sal_Bool CreateBitmapsForUI();
+ virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
};
#endif // _XTABLE_HXX
diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx
index dc7013853de4..73ed4878cee7 100644
--- a/svx/inc/svx/xtextit0.hxx
+++ b/svx/inc/svx/xtextit0.hxx
@@ -45,12 +45,12 @@ public:
XFormTextStyleItem(XFormTextStyle = XFT_NONE);
XFormTextStyleItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
- virtual USHORT GetValueCount() const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
+ virtual sal_uInt16 GetValueCount() const;
XFormTextStyle GetValue() const { return (XFormTextStyle) SfxEnumItem::GetValue(); }
// #FontWork#
- 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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
/*************************************************************************
@@ -63,10 +63,10 @@ class SVX_DLLPUBLIC XFormTextHideFormItem : public SfxBoolItem
{
public:
TYPEINFO();
- XFormTextHideFormItem(BOOL bHide = FALSE);
+ XFormTextHideFormItem(sal_Bool bHide = sal_False);
XFormTextHideFormItem(SvStream& rIn);
virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
- virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const;
+ virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const;
};
#endif
diff --git a/svx/inc/svx/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx
index 7788bb1023f1..24b1c8607dab 100644
--- a/svx/inc/svx/zoom_def.hxx
+++ b/svx/inc/svx/zoom_def.hxx
@@ -1,8 +1,8 @@
#ifndef _SVX_ZOOM_DEF_HXX
#define _SVX_ZOOM_DEF_HXX
-#define ZOOMBTN_OPTIMAL ((USHORT)0x0001)
-#define ZOOMBTN_PAGEWIDTH ((USHORT)0x0002)
-#define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004)
+#define ZOOMBTN_OPTIMAL ((sal_uInt16)0x0001)
+#define ZOOMBTN_PAGEWIDTH ((sal_uInt16)0x0002)
+#define ZOOMBTN_WHOLEPAGE ((sal_uInt16)0x0004)
#endif
diff --git a/svx/inc/svx/zoomctrl.hxx b/svx/inc/svx/zoomctrl.hxx
index ea3ecdb33025..0d790b23f155 100644
--- a/svx/inc/svx/zoomctrl.hxx
+++ b/svx/inc/svx/zoomctrl.hxx
@@ -37,20 +37,20 @@
class SVX_DLLPUBLIC SvxZoomStatusBarControl : public SfxStatusBarControl
{
private:
- USHORT nZoom;
- USHORT nValueSet;
+ sal_uInt16 nZoom;
+ sal_uInt16 nValueSet;
public:
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt );
virtual void Command( const CommandEvent& rCEvt );
SFX_DECL_STATUSBAR_CONTROL();
- SvxZoomStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb );
+ SvxZoomStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb );
- static ULONG GetDefItemWidth(const StatusBar& rStb);
+ static sal_uIntPtr GetDefItemWidth(const StatusBar& rStb);
};
diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx
index a1a0eeebffbe..4904aeb40a97 100644
--- a/svx/inc/svx/zoomitem.hxx
+++ b/svx/inc/svx/zoomitem.hxx
@@ -48,20 +48,20 @@ enum SvxZoomType
class SVX_DLLPUBLIC SvxZoomItem: public SfxUInt16Item
{
- USHORT nValueSet; // erlaubte Werte (siehe #defines unten)
+ sal_uInt16 nValueSet; // erlaubte Werte (siehe #defines unten)
SvxZoomType eType;
public:
TYPEINFO();
SvxZoomItem( SvxZoomType eZoomType = SVX_ZOOM_PERCENT,
- USHORT nVal = 0, USHORT nWhich = SID_ATTR_ZOOM );
+ sal_uInt16 nVal = 0, sal_uInt16 nWhich = SID_ATTR_ZOOM );
SvxZoomItem( const SvxZoomItem& );
~SvxZoomItem();
- void SetValueSet( USHORT nValues ) { nValueSet = nValues; }
- USHORT GetValueSet() const { return nValueSet; }
- FASTBOOL IsValueAllowed( USHORT nValue ) const
+ void SetValueSet( sal_uInt16 nValues ) { nValueSet = nValues; }
+ sal_uInt16 GetValueSet() const { return nValueSet; }
+ int IsValueAllowed( sal_uInt16 nValue ) const
{ return nValue == ( nValue & nValueSet ); }
SvxZoomType GetType() const { return eType; }
@@ -69,11 +69,11 @@ public:
{ eType = eNewType; }
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rStrm, USHORT nVersion ) const;
- virtual SvStream& Store( SvStream& rStrm , USHORT nItemVersion ) const;
+ virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const;
+ virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const;
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 sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
};
//------------------------------------------------------------------------
diff --git a/svx/inc/svx/zoomsliderctrl.hxx b/svx/inc/svx/zoomsliderctrl.hxx
index eef8ec40ccac..46032056fc30 100644
--- a/svx/inc/svx/zoomsliderctrl.hxx
+++ b/svx/inc/svx/zoomsliderctrl.hxx
@@ -42,20 +42,20 @@ private:
struct SvxZoomSliderControl_Impl;
SvxZoomSliderControl_Impl* mpImpl;
- USHORT Offset2Zoom( long nOffset ) const;
- long Zoom2Offset( USHORT nZoom ) const;
+ sal_uInt16 Offset2Zoom( long nOffset ) const;
+ long Zoom2Offset( sal_uInt16 nZoom ) const;
public:
SFX_DECL_STATUSBAR_CONTROL();
- SvxZoomSliderControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb );
+ SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb );
~SvxZoomSliderControl();
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual void Paint( const UserDrawEvent& rEvt );
- virtual BOOL MouseButtonDown( const MouseEvent & );
- virtual BOOL MouseMove( const MouseEvent & rEvt );
+ virtual sal_Bool MouseButtonDown( const MouseEvent & );
+ virtual sal_Bool MouseMove( const MouseEvent & rEvt );
};
#endif
diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx
index 163e1c8ec155..93b1dedb1170 100644
--- a/svx/inc/svx/zoomslideritem.hxx
+++ b/svx/inc/svx/zoomslideritem.hxx
@@ -39,28 +39,28 @@
class SVX_DLLPUBLIC SvxZoomSliderItem: public SfxUInt16Item
{
com::sun::star::uno::Sequence < sal_Int32 > maValues;
- USHORT mnMinZoom;
- USHORT mnMaxZoom;
+ sal_uInt16 mnMinZoom;
+ sal_uInt16 mnMaxZoom;
public:
TYPEINFO();
- SvxZoomSliderItem( USHORT nCurrentZoom = 100, USHORT nMinZoom = 20, USHORT nMaxZoom = 600, USHORT nWhich = SID_ATTR_ZOOMSLIDER );
+ SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, sal_uInt16 nWhich = SID_ATTR_ZOOMSLIDER );
SvxZoomSliderItem( const SvxZoomSliderItem& );
~SvxZoomSliderItem();
void AddSnappingPoint( sal_Int32 nNew );
const com::sun::star::uno::Sequence < sal_Int32 >& GetSnappingPoints() const;
- USHORT GetMinZoom() const {return mnMinZoom;}
- USHORT GetMaxZoom() const {return mnMaxZoom;}
+ sal_uInt16 GetMinZoom() const {return mnMinZoom;}
+ sal_uInt16 GetMaxZoom() const {return mnMaxZoom;}
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create( SvStream& rStrm, USHORT nVersion ) const; // leer
- virtual SvStream& Store( SvStream& rStrm , 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 SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; // leer
+ virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; // leer
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // leer
};
//------------------------------------------------------------------------
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
index aec07042e1fc..21c47230df48 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -139,8 +139,8 @@ private:
FindTextFieldControl* m_pFindTextFieldControl;
- USHORT m_nDownSearchId; // item position of findbar
- USHORT m_nUpSearchId; // item position of findbar
+ sal_uInt16 m_nDownSearchId; // item position of findbar
+ sal_uInt16 m_nUpSearchId; // item position of findbar
};
diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx
index a0af47a95cdd..7b7f85110558 100644
--- a/svx/inc/xpolyimp.hxx
+++ b/svx/inc/xpolyimp.hxx
@@ -44,15 +44,15 @@ class ImpXPolygon
{
public:
Point* pPointAry;
- BYTE* pFlagAry;
+ sal_uInt8* pFlagAry;
Point* pOldPointAry;
- BOOL bDeleteOldPoints;
- USHORT nSize;
- USHORT nResize;
- USHORT nPoints;
- USHORT nRefCount;
+ sal_Bool bDeleteOldPoints;
+ sal_uInt16 nSize;
+ sal_uInt16 nResize;
+ sal_uInt16 nPoints;
+ sal_uInt16 nRefCount;
- ImpXPolygon( USHORT nInitSize = 16, USHORT nResize=16 );
+ ImpXPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize=16 );
ImpXPolygon( const ImpXPolygon& rImpXPoly );
~ImpXPolygon();
@@ -64,13 +64,13 @@ public:
if ( bDeleteOldPoints )
{
delete[] (char*)pOldPointAry;
- bDeleteOldPoints = FALSE;
+ bDeleteOldPoints = sal_False;
}
}
- void Resize( USHORT nNewSize, BOOL bDeletePoints = TRUE );
- void InsertSpace( USHORT nPos, USHORT nCount );
- void Remove( USHORT nPos, USHORT nCount );
+ void Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints = sal_True );
+ void InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount );
+ void Remove( sal_uInt16 nPos, sal_uInt16 nCount );
};
@@ -89,9 +89,9 @@ class ImpXPolyPolygon
{
public:
XPolygonList aXPolyList;
- USHORT nRefCount;
+ sal_uInt16 nRefCount;
- ImpXPolyPolygon( USHORT nInitSize = 16, USHORT nResize = 16 ) :
+ ImpXPolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 ) :
aXPolyList( 1024, nInitSize, nResize )
{ nRefCount = 1; }
ImpXPolyPolygon( const ImpXPolyPolygon& rImpXPolyPoly );
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index 1c342f5dbfba..92633a105323 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -105,23 +105,23 @@ namespace accessibility
SfxBroadcaster& GetBroadcaster() const { return *(const_cast<AccessibleEmptyEditSource_Impl*>(this)); }
// SvxTextForwarder
- USHORT GetParagraphCount() const { return 1; }
- USHORT GetTextLen( USHORT /*nParagraph*/ ) const { return 0; }
+ sal_uInt16 GetParagraphCount() const { return 1; }
+ sal_uInt16 GetTextLen( sal_uInt16 /*nParagraph*/ ) const { return 0; }
String GetText( const ESelection& /*rSel*/ ) const { return String(); }
- SfxItemSet GetAttribs( const ESelection& /*rSel*/, BOOL /*bOnlyHardAttrib*/ = 0 ) const
+ SfxItemSet GetAttribs( const ESelection& /*rSel*/, sal_Bool /*bOnlyHardAttrib*/ = 0 ) const
{
// AW: Very dangerous: The former implementation used a SfxItemPool created on the
// fly which of course was deleted again ASAP. Thus, the returned SfxItemSet was using
// a deleted Pool by design.
return SfxItemSet(SdrObject::GetGlobalDrawObjectItemPool());
}
- SfxItemSet GetParaAttribs( USHORT /*nPara*/ ) const { return GetAttribs(ESelection()); }
- void SetParaAttribs( USHORT /*nPara*/, const SfxItemSet& /*rSet*/ ) {}
+ SfxItemSet GetParaAttribs( sal_uInt16 /*nPara*/ ) const { return GetAttribs(ESelection()); }
+ void SetParaAttribs( sal_uInt16 /*nPara*/, const SfxItemSet& /*rSet*/ ) {}
void RemoveAttribs( const ESelection& /*rSelection*/, sal_Bool /*bRemoveParaAttribs*/, sal_uInt16 /*nWhich*/ ){}
- void GetPortions( USHORT /*nPara*/, SvUShorts& /*rList*/ ) const {}
+ void GetPortions( sal_uInt16 /*nPara*/, SvUShorts& /*rList*/ ) const {}
- USHORT GetItemState( const ESelection& /*rSel*/, USHORT /*nWhich*/ ) const { return 0; }
- USHORT GetItemState( USHORT /*nPara*/, USHORT /*nWhich*/ ) const { return 0; }
+ sal_uInt16 GetItemState( const ESelection& /*rSel*/, sal_uInt16 /*nWhich*/ ) const { return 0; }
+ sal_uInt16 GetItemState( sal_uInt16 /*nPara*/, sal_uInt16 /*nWhich*/ ) const { return 0; }
SfxItemPool* GetPool() const { return NULL; }
@@ -133,35 +133,35 @@ namespace accessibility
const SfxItemSet * GetEmptyItemSetPtr() { return 0; }
void AppendParagraph() {}
- xub_StrLen AppendTextPortion( USHORT /*nPara*/, const String & /*rText*/, const SfxItemSet & /*rSet*/ ) { return 0; }
+ xub_StrLen AppendTextPortion( sal_uInt16 /*nPara*/, const String & /*rText*/, const SfxItemSet & /*rSet*/ ) { return 0; }
//XTextCopy
void CopyText(const SvxTextForwarder& ){}
- XubString CalcFieldValue( const SvxFieldItem& /*rField*/, USHORT /*nPara*/, USHORT /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ )
+ XubString CalcFieldValue( const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ )
{
return XubString();
}
- void FieldClicked( const SvxFieldItem&, USHORT, xub_StrLen ) {;}
+ void FieldClicked( const SvxFieldItem&, sal_uInt16, xub_StrLen ) {;}
- BOOL IsValid() const { return sal_True; }
+ sal_Bool IsValid() const { return sal_True; }
void SetNotifyHdl( const Link& ) {}
- LanguageType GetLanguage( USHORT, USHORT ) const { return LANGUAGE_DONTKNOW; }
- USHORT GetFieldCount( USHORT ) const { return 0; }
- EFieldInfo GetFieldInfo( USHORT, USHORT ) const { return EFieldInfo(); }
- EBulletInfo GetBulletInfo( USHORT ) const { return EBulletInfo(); }
- Rectangle GetCharBounds( USHORT, USHORT ) const { return Rectangle(); }
- Rectangle GetParaBounds( USHORT ) const { return Rectangle(); }
+ LanguageType GetLanguage( sal_uInt16, sal_uInt16 ) const { return LANGUAGE_DONTKNOW; }
+ sal_uInt16 GetFieldCount( sal_uInt16 ) const { return 0; }
+ EFieldInfo GetFieldInfo( sal_uInt16, sal_uInt16 ) const { return EFieldInfo(); }
+ EBulletInfo GetBulletInfo( sal_uInt16 ) const { return EBulletInfo(); }
+ Rectangle GetCharBounds( sal_uInt16, sal_uInt16 ) const { return Rectangle(); }
+ Rectangle GetParaBounds( sal_uInt16 ) const { return Rectangle(); }
MapMode GetMapMode() const { return MapMode(); }
OutputDevice* GetRefDevice() const { return NULL; }
- sal_Bool GetIndexAtPoint( const Point&, USHORT&, USHORT& ) const { return sal_False; }
- sal_Bool GetWordIndices( USHORT, USHORT, USHORT&, USHORT& ) const { return sal_False; }
- sal_Bool GetAttributeRun( USHORT&, USHORT&, USHORT, USHORT ) const { return sal_False; }
- USHORT GetLineCount( USHORT nPara ) const { return nPara == 0 ? 1 : 0; }
- USHORT GetLineLen( USHORT, USHORT ) const { return 0; }
- void GetLineBoundaries( /*out*/USHORT & rStart, /*out*/USHORT & rEnd, USHORT /*nParagraph*/, USHORT /*nLine*/ ) const { rStart = rEnd = 0; }
- USHORT GetLineNumberAtIndex( USHORT /*nPara*/, USHORT /*nIndex*/ ) const { return 0; }
+ sal_Bool GetIndexAtPoint( const Point&, sal_uInt16&, sal_uInt16& ) const { return sal_False; }
+ sal_Bool GetWordIndices( sal_uInt16, sal_uInt16, sal_uInt16&, sal_uInt16& ) const { return sal_False; }
+ sal_Bool GetAttributeRun( sal_uInt16&, sal_uInt16&, sal_uInt16, sal_uInt16 ) const { return sal_False; }
+ sal_uInt16 GetLineCount( sal_uInt16 nPara ) const { return nPara == 0 ? 1 : 0; }
+ sal_uInt16 GetLineLen( sal_uInt16, sal_uInt16 ) const { return 0; }
+ void GetLineBoundaries( /*out*/sal_uInt16 & rStart, /*out*/sal_uInt16 & rEnd, sal_uInt16 /*nParagraph*/, sal_uInt16 /*nLine*/ ) const { rStart = rEnd = 0; }
+ sal_uInt16 GetLineNumberAtIndex( sal_uInt16 /*nPara*/, sal_uInt16 /*nIndex*/ ) const { return 0; }
// the following two methods would, strictly speaking, require
// a switch to a real EditSource, too. Fortunately, the
@@ -173,9 +173,9 @@ namespace accessibility
// shapes).
sal_Bool Delete( const ESelection& ) { return sal_False; }
sal_Bool InsertText( const String&, const ESelection& ) { return sal_False; }
- sal_Bool QuickFormatDoc( BOOL ) { return sal_True; }
- sal_Int16 GetDepth( USHORT ) const { return -1; }
- sal_Bool SetDepth( USHORT, sal_Int16 ) { return sal_True; }
+ sal_Bool QuickFormatDoc( sal_Bool ) { return sal_True; }
+ sal_Int16 GetDepth( sal_uInt16 ) const { return -1; }
+ sal_Bool SetDepth( sal_uInt16, sal_Int16 ) { return sal_True; }
Rectangle GetVisArea() const { return Rectangle(); }
Point LogicToPixel( const Point& rPoint, const MapMode& /*rMapMode*/ ) const { return rPoint; }
diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx
index 82c522e1b0ff..76d9ae56dfba 100644
--- a/svx/source/accessibility/AccessibleFrameSelector.cxx
+++ b/svx/source/accessibility/AccessibleFrameSelector.cxx
@@ -179,7 +179,7 @@ sal_Int32 AccFrameSelector::getAccessibleIndexInParent( )
Window* pTabPage = mpFrameSel->GetParent();
sal_Int32 nChildren = pTabPage->GetChildCount();
for( nIdx = 0; nIdx < nChildren; ++nIdx )
- if( pTabPage->GetChild( static_cast< USHORT >( nIdx ) ) == mpFrameSel )
+ if( pTabPage->GetChild( static_cast< sal_uInt16 >( nIdx ) ) == mpFrameSel )
break;
}
else
@@ -619,7 +619,7 @@ void AccFrameSelector::NotifyFocusListeners(sal_Bool bGetFocus)
aEvent.FocusFlags = 0;
if(bGetFocus)
{
- USHORT nFocusFlags = mpFrameSel->GetGetFocusFlags();
+ sal_uInt16 nFocusFlags = mpFrameSel->GetGetFocusFlags();
if(nFocusFlags&GETFOCUS_TAB)
aEvent.FocusFlags |= AwtFocusChangeReason::TAB;
if(nFocusFlags&GETFOCUS_CURSOR)
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index 25bed87a23ad..4b3d2eab45fd 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -576,7 +576,7 @@ namespace accessibility
DBG_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): Parent has focus!");
}
- USHORT nMaxValidParaIndex( static_cast< USHORT >( GetTextForwarder().GetParagraphCount() ) - 1 );
+ sal_uInt16 nMaxValidParaIndex( static_cast< sal_uInt16 >( GetTextForwarder().GetParagraphCount() ) - 1 );
// notify all affected paragraphs (TODO: may be suboptimal,
// since some paragraphs might stay selected)
@@ -861,7 +861,7 @@ namespace accessibility
DBG_ASSERT(nCurrPara >= 0 && nCurrPara <= USHRT_MAX,
"AccessibleTextHelper_Impl::UpdateVisibleChildren: index value overflow");
- aTmpBB = rCacheTF.GetParaBounds( static_cast< USHORT >( nCurrPara ) );
+ aTmpBB = rCacheTF.GetParaBounds( static_cast< sal_uInt16 >( nCurrPara ) );
// convert to screen coordinates
aParaBB = ::accessibility::AccessibleEditableTextPara::LogicToPixel( aTmpBB, rCacheTF.GetMapMode(), rCacheVF );
@@ -1723,7 +1723,7 @@ namespace accessibility
DBG_ASSERT(nChild >= 0 && nChild <= USHRT_MAX,
"AccessibleTextHelper_Impl::getAccessibleAt: index value overflow");
- Rectangle aParaBounds( rCacheTF.GetParaBounds( static_cast< USHORT > (nChild) ) );
+ Rectangle aParaBounds( rCacheTF.GetParaBounds( static_cast< sal_uInt16 > (nChild) ) );
if( aParaBounds.IsInside( aLogPoint ) )
return getAccessibleChild( nChild - mnFirstVisibleChild + GetStartIndex() );
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index c1509eacc843..c0e49e4f78b1 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -100,9 +100,9 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtualAcc::
ensureAlive();
uno::Reference< accessibility::XAccessible > xRet;
- const USHORT nItemId = sal::static_int_cast<USHORT>(mpParent->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) ));
+ const sal_uInt16 nItemId = sal::static_int_cast<sal_uInt16>(mpParent->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) ));
- if( USHORT(-1) != nItemId )
+ if( sal_uInt16(-1) != nItemId )
{
if ( !m_pTable )
m_pTable = new SvxShowCharSetAcc(this);
@@ -249,7 +249,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::disposing()
// - SvxShowCharSetItem -
// ----------------
-SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,USHORT _nPos ) :
+SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,sal_uInt16 _nPos ) :
mrParent( rParent )
,mnId( _nPos )
,m_pItem(NULL)
@@ -333,7 +333,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetAcc, OAccessibleSelectionHelper,
sal_Bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (RuntimeException)
{
return m_pParent && m_pParent->getCharSetControl()->IsSelected(
- sal::static_int_cast<USHORT>(nAccessibleChildIndex));
+ sal::static_int_cast<sal_uInt16>(nAccessibleChildIndex));
}
// -----------------------------------------------------------------------------
// select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx)
@@ -385,7 +385,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAcce
OExternalLockGuard aGuard( this );
ensureAlive();
uno::Reference< accessibility::XAccessible > xRet;
- SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( static_cast< USHORT >( i ) );
+ SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( static_cast< sal_uInt16 >( i ) );
if( pItem )
{
@@ -483,10 +483,10 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAcce
ensureAlive();
uno::Reference< accessibility::XAccessible > xRet;
- const USHORT nItemId = sal::static_int_cast<USHORT>(
+ const sal_uInt16 nItemId = sal::static_int_cast<sal_uInt16>(
m_pParent->getCharSetControl()->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) ));
- if( USHORT(-1) != nItemId )
+ if( sal_uInt16(-1) != nItemId )
{
SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( nItemId );
xRet = pItem->GetAccessible();
@@ -590,7 +590,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_In
OExternalLockGuard aGuard( this );
ensureAlive();
::svx::SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem(
- sal::static_int_cast<USHORT>(getAccessibleIndex(nRow,nColumn) ));
+ sal::static_int_cast<sal_uInt16>(getAccessibleIndex(nRow,nColumn) ));
if ( !pItem )
throw IndexOutOfBoundsException();
return pItem->GetAccessible();
@@ -622,14 +622,14 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex )
{
OExternalLockGuard aGuard( this );
ensureAlive();
- return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<USHORT>(nChildIndex));
+ return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex));
}
// -----------------------------------------------------------------------------
sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException)
{
OExternalLockGuard aGuard( this );
ensureAlive();
- return m_pParent->getCharSetControl()->GetColumnPos(sal::static_int_cast<USHORT>(nChildIndex));
+ return m_pParent->getCharSetControl()->GetColumnPos(sal::static_int_cast<sal_uInt16>(nChildIndex));
}
// -----------------------------------------------------------------------------
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
index 5a24cb1fd75d..0af22d94334b 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
@@ -239,7 +239,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
if ( rText.getLength() )
{
// generating vcl/font
- USHORT nScriptType = i18n::ScriptType::LATIN;
+ sal_uInt16 nScriptType = i18n::ScriptType::LATIN;
Reference< i18n::XBreakIterator > xBI( EnhancedCustomShapeFontWork::GetBreakIterator() );
if ( xBI.is() )
{
@@ -254,7 +254,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
nScriptType = i18n::ScriptType::LATIN;
}
}
- UINT16 nFntItm = EE_CHAR_FONTINFO;
+ sal_uInt16 nFntItm = EE_CHAR_FONTINFO;
if ( nScriptType == i18n::ScriptType::COMPLEX )
nFntItm = EE_CHAR_FONTINFO_CTL;
else if ( nScriptType == i18n::ScriptType::ASIAN )
@@ -300,7 +300,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
{
FWCharacterData aCharacterData;
rtl::OUString aCharText( (sal_Unicode)rText[ i ] );
- if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, aCharText, 0, 0, STRING_LEN, TRUE, nWidth, pDXArry ) )
+ if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, aCharText, 0, 0, STRING_LEN, sal_True, nWidth, pDXArry ) )
{
sal_Int32 nTextWidth = aVirDev.GetTextWidth( aCharText, 0, STRING_LEN );
std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterData.vOutlines.begin();
@@ -358,7 +358,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
aVirDev.SetFont( aFont );
}
FWCharacterData aCharacterData;
- if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, 0, STRING_LEN, TRUE, nWidth, pDXArry ) )
+ if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, 0, STRING_LEN, sal_True, nWidth, pDXArry ) )
{
aParagraphIter->vCharacters.push_back( aCharacterData );
}
@@ -368,7 +368,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F
for ( i = 0; i < rText.getLength(); i++ )
{
FWCharacterData aCharacterData;
- if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, i, 1, TRUE, nWidth, pDXArry ) )
+ if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, i, 1, sal_True, nWidth, pDXArry ) )
{
std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterData.vOutlines.begin();
std::vector< PolyPolygon >::iterator aOutlineIEnd = aCharacterData.vOutlines.end();
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index 4cec80db354d..f0879be033ee 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -53,7 +53,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlCustomShapes, SfxBoolItem);
|*
\************************************************************************/
-SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
m_aSubTbxResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/" ) )
{
@@ -113,7 +113,7 @@ SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBo
|*
\************************************************************************/
-void SvxTbxCtlCustomShapes::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxTbxCtlCustomShapes::StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState )
{
SfxToolBoxControl::StateChanged( nSID, eState, pState );
@@ -146,7 +146,7 @@ SfxPopupWindow* SvxTbxCtlCustomShapes::CreatePopupWindow()
// -----------------------------------------------------------------------
-void SvxTbxCtlCustomShapes::Select( BOOL /*bMod1*/ )
+void SvxTbxCtlCustomShapes::Select( sal_Bool /*bMod1*/ )
{
if ( m_aCommand.getLength() > 0 )
{
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx
index 6e021ce20d3d..22dcdcc3a1be 100644
--- a/svx/source/dialog/SpellDialogChildWindow.cxx
+++ b/svx/source/dialog/SpellDialogChildWindow.cxx
@@ -38,7 +38,7 @@ namespace svx {
-----------------------------------------------------------------------*/
SpellDialogChildWindow::SpellDialogChildWindow (
Window* _pParent,
- USHORT nId,
+ sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* /*pInfo*/)
: SfxChildWindow (_pParent, nId)
@@ -52,7 +52,7 @@ SpellDialogChildWindow::SpellDialogChildWindow (
this );
pWindow = m_pAbstractSpellDialog->GetWindow();
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
- SetHideNotDelete (TRUE);
+ SetHideNotDelete (sal_True);
}
/*-------------------------------------------------------------------------
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index d010109d34b3..9c2a5fc9a3bb 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -61,7 +61,7 @@
( pMinG[i] <= nG ) && ( pMaxG[i] >= nG ) && \
( pMinB[i] <= nB ) && ( pMaxB[i] >= nB ) ) \
{ \
- aCol = pDstCols[i]; bReplace = TRUE; break; \
+ aCol = pDstCols[i]; bReplace = sal_True; break; \
} \
} \
}
@@ -186,16 +186,16 @@ void MaskSet::onEditColor()
class MaskData
{
SvxBmpMask* pMask;
- BOOL bIsReady;
- BOOL bExecState;
+ sal_Bool bIsReady;
+ sal_Bool bExecState;
SfxBindings& rBindings;
public:
MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind );
- BOOL IsCbxReady() const { return bIsReady; }
- void SetExecState( BOOL bState ) { bExecState = bState; }
- BOOL IsExecReady() const { return bExecState; }
+ sal_Bool IsCbxReady() const { return bIsReady; }
+ void SetExecState( sal_Bool bState ) { bExecState = bState; }
+ sal_Bool IsExecReady() const { return bExecState; }
DECL_LINK( PipetteHdl, ToolBox* pTbx );
DECL_LINK( CbxHdl, CheckBox* pCbx );
@@ -209,8 +209,8 @@ public:
MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) :
pMask ( pBmpMask ),
- bIsReady ( FALSE ),
- bExecState ( FALSE ),
+ bIsReady ( sal_False ),
+ bExecState ( sal_False ),
rBindings ( rBind )
{
@@ -257,7 +257,7 @@ IMPL_LINK( MaskData, CbxHdl, CheckBox*, pCbx )
pSet->SelectItem( 1 );
pSet->Select();
- pMask->aTbxPipette.CheckItem( TBI_PIPETTE, TRUE );
+ pMask->aTbxPipette.CheckItem( TBI_PIPETTE, sal_True );
PipetteHdl( &( pMask->aTbxPipette ) );
}
@@ -343,7 +343,7 @@ IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb )
IMPL_LINK( MaskData, ExecHdl, PushButton*, EMPTYARG )
{
- SfxBoolItem aBItem( SID_BMPMASK_EXEC, TRUE );
+ SfxBoolItem aBItem( SID_BMPMASK_EXEC, sal_True );
rBindings.GetDispatcher()->Execute( SID_BMPMASK_EXEC, OWN_CALLMODE, &aBItem, 0L );
return 0L;
@@ -367,7 +367,7 @@ void ColorWindow::Paint( const Rectangle &/*Rect*/ )
//-------------------------------------------------------------------------
-SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( USHORT nId_, SvxBmpMask& rMask,
+SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( sal_uInt16 nId_, SvxBmpMask& rMask,
SfxBindings& rBindings ) :
SfxControllerItem ( nId_, rBindings ),
rBmpMask ( rMask)
@@ -376,7 +376,7 @@ SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( USHORT nId_, SvxBmpMask& rMask,
//-------------------------------------------------------------------------
-void SvxBmpMaskSelectItem::StateChanged( USHORT nSID, SfxItemState /*eState*/,
+void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
const SfxPoolItem* pItem )
{
if ( ( nSID == SID_BMPMASK_EXEC ) && pItem )
@@ -391,7 +391,7 @@ void SvxBmpMaskSelectItem::StateChanged( USHORT nSID, SfxItemState /*eState*/,
//-------------------------------------------------------------------------
-SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, USHORT nId,
+SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo ) :
SfxChildWindow( pParent_, nId )
@@ -555,9 +555,9 @@ void SvxBmpMask::onSelect( MaskSet* pSet )
//-------------------------------------------------------------------------
-BOOL SvxBmpMask::Close()
+sal_Bool SvxBmpMask::Close()
{
- SfxBoolItem aItem2( SID_BMPMASK_PIPETTE, FALSE );
+ SfxBoolItem aItem2( SID_BMPMASK_PIPETTE, sal_False );
GetBindings().GetDispatcher()->Execute( SID_BMPMASK_PIPETTE, OWN_CALLMODE, &aItem2, 0L );
return SfxDockingWindow::Close();
@@ -565,7 +565,7 @@ BOOL SvxBmpMask::Close()
//-------------------------------------------------------------------------
-BOOL SvxBmpMask::NeedsColorTable() const
+sal_Bool SvxBmpMask::NeedsColorTable() const
{
return ( aLbColor1.GetEntryCount() == 0 );
}
@@ -615,36 +615,36 @@ void SvxBmpMask::PipetteClicked()
{
if( pQSet1->GetSelectItemId() == 1 )
{
- aCbx1.Check( TRUE );
+ aCbx1.Check( sal_True );
pData->CbxHdl( &aCbx1 );
pQSet1->SetItemColor( 1, aPipetteColor );
}
else if( pQSet2->GetSelectItemId() == 1 )
{
- aCbx2.Check( TRUE );
+ aCbx2.Check( sal_True );
pData->CbxHdl( &aCbx2 );
pQSet2->SetItemColor( 1, aPipetteColor );
}
else if( pQSet3->GetSelectItemId() == 1 )
{
- aCbx3.Check( TRUE );
+ aCbx3.Check( sal_True );
pData->CbxHdl( &aCbx3 );
pQSet3->SetItemColor( 1, aPipetteColor );
}
else if( pQSet4->GetSelectItemId() == 1 )
{
- aCbx4.Check( TRUE );
+ aCbx4.Check( sal_True );
pData->CbxHdl( &aCbx4 );
pQSet4->SetItemColor( 1, aPipetteColor );
}
- aTbxPipette.CheckItem( TBI_PIPETTE, FALSE );
+ aTbxPipette.CheckItem( TBI_PIPETTE, sal_False );
pData->PipetteHdl( &aTbxPipette );
}
//-------------------------------------------------------------------------
-void SvxBmpMask::SetExecState( BOOL bEnable )
+void SvxBmpMask::SetExecState( sal_Bool bEnable )
{
pData->SetExecState( bEnable );
@@ -656,36 +656,36 @@ void SvxBmpMask::SetExecState( BOOL bEnable )
//-------------------------------------------------------------------------
-USHORT SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, ULONG* pTols )
+sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, sal_uIntPtr* pTols )
{
- USHORT nCount = 0;
+ sal_uInt16 nCount = 0;
if ( aCbx1.IsChecked() )
{
pSrcCols[nCount] = pQSet1->GetItemColor( 1 );
pDstCols[nCount] = aLbColor1.GetSelectEntryColor();
- pTols[nCount++] = static_cast<ULONG>(aSp1.GetValue());
+ pTols[nCount++] = static_cast<sal_uIntPtr>(aSp1.GetValue());
}
if ( aCbx2.IsChecked() )
{
pSrcCols[nCount] = pQSet2->GetItemColor( 1 );
pDstCols[nCount] = aLbColor2.GetSelectEntryColor();
- pTols[nCount++] = static_cast<ULONG>(aSp2.GetValue());
+ pTols[nCount++] = static_cast<sal_uIntPtr>(aSp2.GetValue());
}
if ( aCbx3.IsChecked() )
{
pSrcCols[nCount] = pQSet3->GetItemColor( 1 );
pDstCols[nCount] = aLbColor3.GetSelectEntryColor();
- pTols[nCount++] = static_cast<ULONG>(aSp3.GetValue());
+ pTols[nCount++] = static_cast<sal_uIntPtr>(aSp3.GetValue());
}
if ( aCbx4.IsChecked() )
{
pSrcCols[nCount] = pQSet4->GetItemColor( 1 );
pDstCols[nCount] = aLbColor4.GetSelectEntryColor();
- pTols[nCount++] = static_cast<ULONG>(aSp4.GetValue());
+ pTols[nCount++] = static_cast<sal_uIntPtr>(aSp4.GetValue());
}
return nCount;
@@ -698,8 +698,8 @@ Bitmap SvxBmpMask::ImpMask( const Bitmap& rBitmap )
Bitmap aBitmap( rBitmap );
Color pSrcCols[4];
Color pDstCols[4];
- ULONG pTols[4];
- const USHORT nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
+ sal_uIntPtr pTols[4];
+ const sal_uInt16 nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
EnterWait();
aBitmap.Replace( pSrcCols, pDstCols, nCount, pTols );
@@ -740,11 +740,11 @@ Animation SvxBmpMask::ImpMask( const Animation& rAnimation )
Animation aAnimation( rAnimation );
Color pSrcCols[4];
Color pDstCols[4];
- ULONG pTols[4];
+ sal_uIntPtr pTols[4];
InitColorArrays( pSrcCols, pDstCols, pTols );
- USHORT nAnimationCount = aAnimation.Count();
+ sal_uInt16 nAnimationCount = aAnimation.Count();
- for( USHORT i = 0; i < nAnimationCount; i++ )
+ for( sal_uInt16 i = 0; i < nAnimationCount; i++ )
{
AnimationBitmap aAnimBmp( aAnimation.Get( i ) );
aAnimBmp.aBmpEx = Mask( aAnimBmp.aBmpEx ).GetBitmapEx();
@@ -761,9 +761,9 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
GDIMetaFile aMtf;
Color pSrcCols[4];
Color pDstCols[4];
- ULONG pTols[4];
- USHORT nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
- BOOL pTrans[4];
+ sal_uIntPtr pTols[4];
+ sal_uInt16 nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
+ sal_Bool pTrans[4];
// Falls keine Farben ausgewaehlt, kopieren wir nur das Mtf
if( !nCount )
@@ -782,8 +782,8 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
long* pMaxG = new long[nCount];
long* pMinB = new long[nCount];
long* pMaxB = new long[nCount];
- USHORT i;
- BOOL bReplace;
+ sal_uInt16 i;
+ sal_Bool bReplace;
aMtf.SetPrefSize( rMtf.GetPrefSize() );
aMtf.SetPrefMapMode( rMtf.GetPrefMapMode() );
@@ -809,11 +809,11 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf )
}
// Actions untersuchen und Farben ggf. ersetzen
- for( ULONG nAct = 0UL, nActCount = rMtf.GetActionCount(); nAct < nActCount; nAct++ )
+ for( sal_uIntPtr nAct = 0UL, nActCount = rMtf.GetActionCount(); nAct < nActCount; nAct++ )
{
MetaAction* pAction = rMtf.GetAction( nAct );
- bReplace = FALSE;
+ bReplace = sal_False;
switch( pAction->GetType() )
{
@@ -1040,9 +1040,9 @@ BitmapEx SvxBmpMask::ImpReplaceTransparency( const BitmapEx& rBmpEx, const Color
Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Color& rColor )
{
Animation aAnimation( rAnim );
- USHORT nAnimationCount = aAnimation.Count();
+ sal_uInt16 nAnimationCount = aAnimation.Count();
- for( USHORT i = 0; i < nAnimationCount; i++ )
+ for( sal_uInt16 i = 0; i < nAnimationCount; i++ )
{
AnimationBitmap aAnimBmp( aAnimation.Get( i ) );
aAnimBmp.aBmpEx = ImpReplaceTransparency( aAnimBmp.aBmpEx, rColor );
@@ -1060,9 +1060,9 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C
GDIMetaFile aMtf;
const MapMode& rPrefMap = rMtf.GetPrefMapMode();
const Size& rPrefSize = rMtf.GetPrefSize();
- const ULONG nActionCount = rMtf.GetActionCount();
+ const sal_uIntPtr nActionCount = rMtf.GetActionCount();
- aVDev.EnableOutput( FALSE );
+ aVDev.EnableOutput( sal_False );
aMtf.Record( &aVDev );
aMtf.SetPrefSize( rPrefSize );
aMtf.SetPrefMapMode( rPrefMap );
@@ -1072,7 +1072,7 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C
// Actions nacheinander abspielen; zuerst
// den gesamten Bereich auf die Ersatzfarbe setzen
aVDev.DrawRect( Rectangle( rPrefMap.GetOrigin(), rPrefSize ) );
- for ( ULONG i = 0; i < nActionCount; i++ )
+ for ( sal_uIntPtr i = 0; i < nActionCount; i++ )
{
MetaAction* pAct = rMtf.GetAction( i );
@@ -1123,13 +1123,13 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
{
Color pSrcCols[4];
Color pDstCols[4];
- ULONG pTols[4];
- USHORT nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
+ sal_uIntPtr pTols[4];
+ sal_uInt16 nCount = InitColorArrays( pSrcCols, pDstCols, pTols );
if( nCount )
{
// erstmal alle Transparent-Farben setzen
- for( USHORT i = 0; i < nCount; i++ )
+ for( sal_uInt16 i = 0; i < nCount; i++ )
{
// Haben wir eine Transparenzfarbe?
if( pDstCols[i] == TRANSP_COL )
@@ -1194,7 +1194,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic )
//-------------------------------------------------------------------------
-BOOL SvxBmpMask::IsEyedropping() const
+sal_Bool SvxBmpMask::IsEyedropping() const
{
return aTbxPipette.IsItemChecked( TBI_PIPETTE );
}
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 26dc3137aa52..cff80865e1c8 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -96,7 +96,7 @@ SFX_IMPL_FLOATINGWINDOW( SvxContourDlgChildWindow, SID_CONTOUR_DLG );
|*
\************************************************************************/
-SvxContourDlgItem::SvxContourDlgItem( USHORT _nId, SvxSuperContourDlg& rContourDlg, SfxBindings& rBindings ) :
+SvxContourDlgItem::SvxContourDlgItem( sal_uInt16 _nId, SvxSuperContourDlg& rContourDlg, SfxBindings& rBindings ) :
SfxControllerItem ( _nId, rBindings ),
rDlg ( rContourDlg )
{
@@ -109,7 +109,7 @@ SvxContourDlgItem::SvxContourDlgItem( USHORT _nId, SvxSuperContourDlg& rContourD
|*
\************************************************************************/
-void SvxContourDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem )
+void SvxContourDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem )
{
if ( pItem && ( SID_CONTOUR_EXEC == nSID ) )
{
@@ -131,7 +131,7 @@ void SvxContourDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, cons
|*
\************************************************************************/
-SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, USHORT nId,
+SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, sal_uInt16 nId,
SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
SfxChildWindow( _pParent, nId )
{
@@ -152,7 +152,7 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, USHORT nId
|*
\************************************************************************/
-void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, BOOL bGraphicLinked,
+void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, sal_Bool bGraphicLinked,
const PolyPolygon* pPolyPoly, void* pEditingObj )
{
if ( SfxViewFrame::Current() &&
@@ -192,10 +192,10 @@ SvxContourDlg::~SvxContourDlg()
PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
const Rectangle* pRect,
- const ULONG nFlags )
+ const sal_uIntPtr nFlags )
{
Bitmap aBmp;
- ULONG nContourFlags = XOUTBMP_CONTOUR_HORZ;
+ sal_uIntPtr nContourFlags = XOUTBMP_CONTOUR_HORZ;
if ( rGraphic.GetType() == GRAPHIC_BITMAP )
{
@@ -206,14 +206,14 @@ PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
PolyPolygon aAnimPolyPoly;
const Animation aAnim( rGraphic.GetAnimation() );
const Size& rSizePix = aAnim.GetDisplaySizePixel();
- const USHORT nCount = aAnim.Count();
+ const sal_uInt16 nCount = aAnim.Count();
if ( aVDev.SetOutputSizePixel( rSizePix ) )
{
aVDev.SetLineColor( Color( COL_BLACK ) );
aVDev.SetFillColor( Color( COL_BLACK ) );
- for( USHORT i = 0; i < nCount; i++ )
+ for( sal_uInt16 i = 0; i < nCount; i++ )
{
const AnimationBitmap& rStepBmp = aAnim.Get( i );
@@ -291,7 +291,7 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic
double fScaleY;
Size aOrgSize;
Point aNewPoint;
- BOOL bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
+ sal_Bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
if ( bPixelMap )
aOrgSize = pOutDev->PixelToLogic( aGrfSize, aDispMap );
@@ -303,11 +303,11 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic
fScaleX = (double) rDisplaySize.Width() / aOrgSize.Width();
fScaleY = (double) rDisplaySize.Height() / aOrgSize.Height();
- for ( USHORT j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ )
+ for ( sal_uInt16 j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ )
{
Polygon& rPoly = rContour[ j ];
- for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
+ for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
{
if ( bPixelMap )
aNewPoint = pOutDev->PixelToLogic( rPoly[ i ], aDispMap );
@@ -328,7 +328,7 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic
|*
\************************************************************************/
-void SvxContourDlg::SetExecState( BOOL bEnable )
+void SvxContourDlg::SetExecState( sal_Bool bEnable )
{
pSuperClass->SetExecState( bEnable );
}
@@ -338,7 +338,7 @@ void SvxContourDlg::SetGraphic( const Graphic& rGraphic )
pSuperClass->SetGraphic( rGraphic );
}
-void SvxContourDlg::SetGraphicLinked( BOOL bGraphicLinked )
+void SvxContourDlg::SetGraphicLinked( sal_Bool bGraphicLinked )
{
pSuperClass->SetGraphicLinked( bGraphicLinked );
}
@@ -348,7 +348,7 @@ const Graphic& SvxContourDlg::GetGraphic() const
return pSuperClass->GetGraphic();
}
-BOOL SvxContourDlg::IsGraphicChanged() const
+sal_Bool SvxContourDlg::IsGraphicChanged() const
{
return pSuperClass->IsGraphicChanged();
}
@@ -360,7 +360,7 @@ void SvxContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
PolyPolygon SvxContourDlg::GetPolyPolygon()
{
- return pSuperClass->GetPolyPolygon( TRUE );
+ return pSuperClass->GetPolyPolygon( sal_True );
}
void SvxContourDlg::SetEditingObject( void* pObj )
@@ -373,7 +373,7 @@ const void* SvxContourDlg::GetEditingObject() const
return pSuperClass->GetEditingObject();
}
-void SvxContourDlg::Update( const Graphic& rGraphic, BOOL bGraphicLinked,
+void SvxContourDlg::Update( const Graphic& rGraphic, sal_Bool bGraphicLinked,
const PolyPolygon* pPolyPoly, void* pEditingObj )
{
pSuperClass->UpdateGraphic( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj );
@@ -396,8 +396,8 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow
aContourWnd ( this, ResId( CTL_CONTOUR, *rResId.GetResMgr() ) ),
aStbStatus ( this, WB_BORDER | WB_3DLOOK | WB_LEFT ),
nGrfChanged ( 0UL ),
- bExecState ( FALSE ),
- bGraphicLinked ( FALSE ),
+ bExecState ( sal_False ),
+ bGraphicLinked ( sal_False ),
maImageList ( SVX_RES( CD_IMAPDLG ) ),
maImageListH ( SVX_RES( CDH_IMAPDLG ) )
{
@@ -494,9 +494,9 @@ void SvxSuperContourDlg::Resize()
|*
\************************************************************************/
-BOOL SvxSuperContourDlg::Close()
+sal_Bool SvxSuperContourDlg::Close()
{
- BOOL bRet = TRUE;
+ sal_Bool bRet = sal_True;
if ( aTbx1.IsItemEnabled( TBI_APPLY ) )
{
@@ -506,15 +506,15 @@ BOOL SvxSuperContourDlg::Close()
if ( nRet == RET_YES )
{
- SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, TRUE );
+ SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, sal_True );
GetBindings().GetDispatcher()->Execute(
SID_CONTOUR_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
}
else if ( nRet == RET_CANCEL )
- bRet = FALSE;
+ bRet = sal_False;
}
- return( bRet ? SfxFloatingWindow::Close() : FALSE );
+ return( bRet ? SfxFloatingWindow::Close() : sal_False );
}
@@ -524,7 +524,7 @@ BOOL SvxSuperContourDlg::Close()
|*
\************************************************************************/
-void SvxSuperContourDlg::SetExecState( BOOL bEnable )
+void SvxSuperContourDlg::SetExecState( sal_Bool bEnable )
{
bExecState = bEnable;
}
@@ -559,13 +559,13 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
const MapMode aMap100( MAP_100TH_MM );
const MapMode aGrfMap( aGraphic.GetPrefMapMode() );
OutputDevice* pOutDev = Application::GetDefaultDevice();
- BOOL bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
+ sal_Bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
- for ( USHORT j = 0, nPolyCount = aPolyPoly.Count(); j < nPolyCount; j++ )
+ for ( sal_uInt16 j = 0, nPolyCount = aPolyPoly.Count(); j < nPolyCount; j++ )
{
Polygon& rPoly = aPolyPoly[ j ];
- for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
+ for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
{
Point& rPt = rPoly[ i ];
@@ -587,7 +587,7 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
|*
\************************************************************************/
-PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic )
+PolyPolygon SvxSuperContourDlg::GetPolyPolygon( sal_Bool bRescaleToGraphic )
{
PolyPolygon aRetPolyPoly( aContourWnd.GetPolyPolygon() );
@@ -596,13 +596,13 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic )
const MapMode aMap100( MAP_100TH_MM );
const MapMode aGrfMap( aGraphic.GetPrefMapMode() );
OutputDevice* pOutDev = Application::GetDefaultDevice();
- BOOL bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
+ sal_Bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
- for ( USHORT j = 0, nPolyCount = aRetPolyPoly.Count(); j < nPolyCount; j++ )
+ for ( sal_uInt16 j = 0, nPolyCount = aRetPolyPoly.Count(); j < nPolyCount; j++ )
{
Polygon& rPoly = aRetPolyPoly[ j ];
- for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
+ for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
{
Point& rPt = rPoly[ i ];
@@ -624,7 +624,7 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic )
|*
\************************************************************************/
-void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, BOOL _bGraphicLinked,
+void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, sal_Bool _bGraphicLinked,
const PolyPolygon* pPolyPoly, void* pEditingObj )
{
aUpdateGraphic = rGraphic;
@@ -646,7 +646,7 @@ void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, BOOL _bGraphicL
|*
\************************************************************************/
-BOOL SvxSuperContourDlg::IsUndoPossible() const
+sal_Bool SvxSuperContourDlg::IsUndoPossible() const
{
return aUndoGraphic.GetType() != GRAPHIC_NONE;
}
@@ -658,7 +658,7 @@ BOOL SvxSuperContourDlg::IsUndoPossible() const
|*
\************************************************************************/
-BOOL SvxSuperContourDlg::IsRedoPossible() const
+sal_Bool SvxSuperContourDlg::IsRedoPossible() const
{
return aRedoGraphic.GetType() != GRAPHIC_NONE;
}
@@ -684,7 +684,7 @@ void SvxSuperContourDlg::DoAutoCreate()
void SvxSuperContourDlg::ReducePoints( const long nTol )
{
- PolyPolygon aPolyPoly( GetPolyPolygon( FALSE ) );
+ PolyPolygon aPolyPoly( GetPolyPolygon( sal_False ) );
if ( aPolyPoly.Count() )
{
@@ -693,13 +693,13 @@ void SvxSuperContourDlg::ReducePoints( const long nTol )
Polygon& rPoly = aPolyPoly[ 0 ];
OutputDevice* pOutDev = Application::GetDefaultDevice();
Point aPtPix;
- const USHORT nSize = rPoly.GetSize();
- USHORT nCounter = 0;
+ const sal_uInt16 nSize = rPoly.GetSize();
+ sal_uInt16 nCounter = 0;
if ( nSize )
aPtPix = pOutDev->LogicToPixel( rPoly[ 0 ], aMapMode );
- for( USHORT i = 1; i < nSize; i++ )
+ for( sal_uInt16 i = 1; i < nSize; i++ )
{
const Point& rNewPt = rPoly[ i ];
const Point aNewPtPix( pOutDev->LogicToPixel( rNewPt, aMapMode ) );
@@ -729,13 +729,13 @@ void SvxSuperContourDlg::ReducePoints( const long nTol )
IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
{
- USHORT nNewItemId = pTbx->GetCurItemId();
+ sal_uInt16 nNewItemId = pTbx->GetCurItemId();
switch( pTbx->GetCurItemId() )
{
case( TBI_APPLY ):
{
- SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, TRUE );
+ SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, sal_True );
GetBindings().GetDispatcher()->Execute(
SID_CONTOUR_EXEC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
}
@@ -748,32 +748,32 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
QueryBox aQBox( this, WB_YES_NO | WB_DEF_NO, String( CONT_RESID( STR_CONTOURDLG_WORKPLACE ) ) );
if ( !aContourWnd.IsContourChanged() || ( aQBox.Execute() == RET_YES ) )
- aContourWnd.SetWorkplaceMode( TRUE );
+ aContourWnd.SetWorkplaceMode( sal_True );
else
- aTbx1.CheckItem( TBI_WORKPLACE, FALSE );
+ aTbx1.CheckItem( TBI_WORKPLACE, sal_False );
}
else
- aContourWnd.SetWorkplaceMode( FALSE );
+ aContourWnd.SetWorkplaceMode( sal_False );
}
break;
case( TBI_SELECT ):
{
- pTbx->CheckItem( nNewItemId, TRUE );
- aContourWnd.SetEditMode( TRUE );
+ pTbx->CheckItem( nNewItemId, sal_True );
+ aContourWnd.SetEditMode( sal_True );
}
break;
case( TBI_RECT ):
{
- pTbx->CheckItem( nNewItemId, TRUE );
+ pTbx->CheckItem( nNewItemId, sal_True );
aContourWnd.SetObjKind( OBJ_RECT );
}
break;
case( TBI_CIRCLE ):
{
- pTbx->CheckItem( nNewItemId, TRUE );
+ pTbx->CheckItem( nNewItemId, sal_True );
aContourWnd.SetObjKind( OBJ_CIRC );
}
@@ -781,14 +781,14 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
case( TBI_POLY ):
{
- pTbx->CheckItem( nNewItemId, TRUE );
+ pTbx->CheckItem( nNewItemId, sal_True );
aContourWnd.SetObjKind( OBJ_POLY );
}
break;
case( TBI_FREEPOLY ):
{
- pTbx->CheckItem( nNewItemId, TRUE );
+ pTbx->CheckItem( nNewItemId, sal_True );
aContourWnd.SetObjKind( OBJ_FREEFILL );
}
break;
@@ -815,7 +815,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
aRedoGraphic = aGraphic;
aGraphic = aUndoGraphic;
aUndoGraphic = Graphic();
- aContourWnd.SetGraphic( aGraphic, FALSE );
+ aContourWnd.SetGraphic( aGraphic, sal_False );
}
break;
@@ -825,7 +825,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
aUndoGraphic = aGraphic;
aGraphic = aRedoGraphic;
aRedoGraphic = Graphic();
- aContourWnd.SetGraphic( aGraphic, FALSE );
+ aContourWnd.SetGraphic( aGraphic, sal_False );
}
break;
@@ -835,7 +835,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
case( TBI_PIPETTE ):
{
- BOOL bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
+ sal_Bool bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
if ( !bPipette )
aStbStatus.Invalidate();
@@ -845,7 +845,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx )
if ( aQBox.Execute() != RET_YES )
{
- aTbx1.CheckItem( TBI_PIPETTE, bPipette = FALSE );
+ aTbx1.CheckItem( TBI_PIPETTE, bPipette = sal_False );
aStbStatus.Invalidate();
}
}
@@ -930,7 +930,7 @@ IMPL_LINK( SvxSuperContourDlg, UpdateHdl, Timer*, EMPTYARG )
aUpdateGraphic = Graphic();
aUpdatePolyPoly = PolyPolygon();
- bUpdateGraphicLinked = FALSE;
+ bUpdateGraphicLinked = sal_False;
aContourWnd.GetSdrModel()->SetChanged( sal_False );
}
@@ -953,7 +953,7 @@ IMPL_LINK( SvxSuperContourDlg, CreateHdl, Timer*, EMPTYARG )
const Rectangle aWorkRect = aContourWnd.LogicToPixel( aContourWnd.GetWorkRect(), MapMode( MAP_100TH_MM ) );
const Graphic& rGraphic = aContourWnd.GetGraphic();
- const BOOL bValid = aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom();
+ const sal_Bool bValid = aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom();
EnterWait();
SetPolyPolygon( CreateAutoContour( rGraphic, bValid ? &aWorkRect : NULL ) );
@@ -973,12 +973,12 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
{
const SdrObject* pObj = pWnd->GetSelectedSdrObject();
const SdrView* pView = pWnd->GetSdrView();
- const BOOL bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
- const BOOL bDrawEnabled = !( bPolyEdit && aTbx1.IsItemChecked( TBI_POLYEDIT ) );
- const BOOL bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
- const BOOL bWorkplace = aTbx1.IsItemChecked( TBI_WORKPLACE );
- const BOOL bDontHide = !( bPipette || bWorkplace );
- const BOOL bBitmap = pWnd->GetGraphic().GetType() == GRAPHIC_BITMAP;
+ const sal_Bool bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
+ const sal_Bool bDrawEnabled = !( bPolyEdit && aTbx1.IsItemChecked( TBI_POLYEDIT ) );
+ const sal_Bool bPipette = aTbx1.IsItemChecked( TBI_PIPETTE );
+ const sal_Bool bWorkplace = aTbx1.IsItemChecked( TBI_WORKPLACE );
+ const sal_Bool bDontHide = !( bPipette || bWorkplace );
+ const sal_Bool bBitmap = pWnd->GetGraphic().GetType() == GRAPHIC_BITMAP;
aTbx1.EnableItem( TBI_APPLY, bDontHide && bExecState && pWnd->IsChanged() );
@@ -1003,7 +1003,7 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
if ( bPolyEdit )
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
switch( pWnd->GetPolyEditMode() )
{
@@ -1014,13 +1014,13 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
break;
}
- aTbx1.CheckItem( nId, TRUE );
+ aTbx1.CheckItem( nId, sal_True );
}
else
{
- aTbx1.CheckItem( TBI_POLYEDIT, FALSE );
- aTbx1.CheckItem( TBI_POLYMOVE, TRUE );
- aTbx1.CheckItem( TBI_POLYINSERT, FALSE );
+ aTbx1.CheckItem( TBI_POLYEDIT, sal_False );
+ aTbx1.CheckItem( TBI_POLYMOVE, sal_True );
+ aTbx1.CheckItem( TBI_POLYINSERT, sal_False );
pWnd->SetPolyEditMode( 0 );
}
@@ -1087,7 +1087,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd )
if( !!aMask )
{
QueryBox aQBox( this, WB_YES_NO | WB_DEF_YES, String( CONT_RESID( STR_CONTOURDLG_NEWPIPETTE ) ) );
- BOOL bNewContour;
+ sal_Bool bNewContour;
aRedoGraphic = Graphic();
aUndoGraphic = aGraphic;
@@ -1105,8 +1105,8 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd )
LeaveWait();
}
- aTbx1.CheckItem( TBI_PIPETTE, FALSE );
- pWnd->SetPipetteMode( FALSE );
+ aTbx1.CheckItem( TBI_PIPETTE, sal_False );
+ pWnd->SetPipetteMode( sal_False );
aStbStatus.Invalidate();
return 0L;
@@ -1121,9 +1121,9 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd )
IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd )
{
- aTbx1.CheckItem( TBI_WORKPLACE, FALSE );
- aTbx1.CheckItem( TBI_SELECT, TRUE );
- pWnd->SetWorkplaceMode( FALSE );
+ aTbx1.CheckItem( TBI_WORKPLACE, sal_False );
+ aTbx1.CheckItem( TBI_SELECT, sal_True );
+ pWnd->SetWorkplaceMode( sal_False );
return 0L;
}
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index 41d7026e7e8f..b86121412ab7 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -81,11 +81,11 @@ SvxShowCharSet::SvxShowCharSet( Window* pParent, const ResId& rResId ) :
SetStyle( GetStyle() | WB_CLIPCHILDREN );
aVscrollSB.SetScrollHdl( LINK( this, SvxShowCharSet, VscrollHdl ) );
- aVscrollSB.EnableDrag( TRUE );
+ aVscrollSB.EnableDrag( sal_True );
// other settings like aVscroll depend on selected font => see SetFont
- bDrag = FALSE;
- InitSettings( TRUE, TRUE );
+ bDrag = sal_False;
+ InitSettings( sal_True, sal_True );
}
// -----------------------------------------------------------------------
@@ -93,7 +93,7 @@ SvxShowCharSet::SvxShowCharSet( Window* pParent, const ResId& rResId ) :
void SvxShowCharSet::GetFocus()
{
Control::GetFocus();
- SelectIndex( nSelectedIndex, TRUE );
+ SelectIndex( nSelectedIndex, sal_True );
}
// -----------------------------------------------------------------------
@@ -101,7 +101,7 @@ void SvxShowCharSet::GetFocus()
void SvxShowCharSet::LoseFocus()
{
Control::LoseFocus();
- SelectIndex( nSelectedIndex, FALSE );
+ SelectIndex( nSelectedIndex, sal_False );
}
// -----------------------------------------------------------------------
@@ -109,9 +109,9 @@ void SvxShowCharSet::LoseFocus()
void SvxShowCharSet::StateChanged( StateChangedType nType )
{
if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
- InitSettings( TRUE, FALSE );
+ InitSettings( sal_True, sal_False );
else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
- InitSettings( FALSE, TRUE );
+ InitSettings( sal_False, sal_True );
Control::StateChanged( nType );
}
@@ -122,7 +122,7 @@ void SvxShowCharSet::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS )
&& ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
- InitSettings( TRUE, TRUE );
+ InitSettings( sal_True, sal_True );
else
Control::DataChanged( rDCEvt );
}
@@ -136,7 +136,7 @@ void SvxShowCharSet::MouseButtonDown( const MouseEvent& rMEvt )
if ( rMEvt.GetClicks() == 1 )
{
GrabFocus();
- bDrag = TRUE;
+ bDrag = sal_True;
CaptureMouse();
int nIndex = PixelToMapIndex( rMEvt.GetPosPixel() );
@@ -158,7 +158,7 @@ void SvxShowCharSet::MouseButtonUp( const MouseEvent& rMEvt )
if ( Rectangle(Point(), GetOutputSize()).IsInside(rMEvt.GetPosPixel()))
aSelectHdl.Call( this );
ReleaseMouse();
- bDrag = FALSE;
+ bDrag = sal_False;
}
}
@@ -195,14 +195,14 @@ void SvxShowCharSet::Command( const CommandEvent& rCEvt )
// -----------------------------------------------------------------------------
-USHORT SvxShowCharSet::GetRowPos(USHORT _nPos) const
+sal_uInt16 SvxShowCharSet::GetRowPos(sal_uInt16 _nPos) const
{
return _nPos / COLUMN_COUNT ;
}
// -----------------------------------------------------------------------------
-USHORT SvxShowCharSet::GetColumnPos(USHORT _nPos) const
+sal_uInt16 SvxShowCharSet::GetColumnPos(sal_uInt16 _nPos) const
{
return _nPos % COLUMN_COUNT ;
}
@@ -221,9 +221,9 @@ int SvxShowCharSet::FirstInView( void ) const
int SvxShowCharSet::LastInView( void ) const
{
- ULONG nIndex = FirstInView();
+ sal_uIntPtr nIndex = FirstInView();
nIndex += ROW_COUNT * COLUMN_COUNT - 1;
- ULONG nCompare = sal::static_int_cast<ULONG>( maFontCharMap.GetCharCount() - 1 );
+ sal_uIntPtr nCompare = sal::static_int_cast<sal_uIntPtr>( maFontCharMap.GetCharCount() - 1 );
if( nIndex > nCompare )
nIndex = nCompare;
return nIndex;
@@ -310,7 +310,7 @@ void SvxShowCharSet::KeyInput( const KeyEvent& rKEvt )
if ( tmpSelected >= 0 )
{
- SelectIndex( tmpSelected, TRUE );
+ SelectIndex( tmpSelected, sal_True );
aPreSelectHdl.Call( this );
}
}
@@ -440,7 +440,7 @@ void SvxShowCharSet::DrawChars_Impl( int n1, int n2 )
// -----------------------------------------------------------------------
-void SvxShowCharSet::InitSettings( BOOL bForeground, BOOL bBackground )
+void SvxShowCharSet::InitSettings( sal_Bool bForeground, sal_Bool bBackground )
{
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
@@ -486,12 +486,12 @@ void SvxShowCharSet::SetFont( const Font& rFont )
aFont.SetAlign( ALIGN_TOP );
int nFontHeight = (aOrigSize.Height() - 5) * 2 / (3 * ROW_COUNT);
aFont.SetSize( PixelToLogic( Size( 0, nFontHeight ) ) );
- aFont.SetTransparent( TRUE );
+ aFont.SetTransparent( sal_True );
Control::SetFont( aFont );
GetFontCharMap( maFontCharMap );
// hide scrollbar when there is nothing to scroll
- BOOL bNeedVscroll = (maFontCharMap.GetCharCount() > ROW_COUNT*COLUMN_COUNT);
+ sal_Bool bNeedVscroll = (maFontCharMap.GetCharCount() > ROW_COUNT*COLUMN_COUNT);
nX = (aOrigSize.Width() - (bNeedVscroll ? SBWIDTH : 0)) / COLUMN_COUNT;
nY = aOrigSize.Height() / ROW_COUNT;
@@ -522,7 +522,7 @@ void SvxShowCharSet::SetFont( const Font& rFont )
// -----------------------------------------------------------------------
-void SvxShowCharSet::SelectIndex( int nNewIndex, BOOL bFocus )
+void SvxShowCharSet::SelectIndex( int nNewIndex, sal_Bool bFocus )
{
if( nNewIndex < 0 )
{
@@ -607,7 +607,7 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, BOOL bFocus )
// -----------------------------------------------------------------------
-void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, BOOL bFocus )
+void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, sal_Bool bFocus )
{
// get next available char of current font
sal_UCS4 cNext = maFontCharMap.GetNextChar( cNew - 1 );
@@ -678,7 +678,7 @@ void SvxShowCharSet::ReleaseAccessible()
if ( aFind == m_aItems.end() )
{
OSL_ENSURE(m_pAccessible,"Who wants to create a child of my table without a parent?");
- aFind = m_aItems.insert(ItemsMap::value_type(_nPos,new ::svx::SvxShowCharSetItem(*this,m_pAccessible->getTable(),sal::static_int_cast< USHORT >(_nPos)))).first;
+ aFind = m_aItems.insert(ItemsMap::value_type(_nPos,new ::svx::SvxShowCharSetItem(*this,m_pAccessible->getTable(),sal::static_int_cast< sal_uInt16 >(_nPos)))).first;
rtl::OUStringBuffer buf;
buf.appendUtf32( maFontCharMap.GetCharFromIndex( _nPos ) );
aFind->second->maText = buf.makeStringAndClear();
diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx
index 80096ce70f32..0a54e3464730 100644
--- a/svx/source/dialog/checklbx.cxx
+++ b/svx/source/dialog/checklbx.cxx
@@ -88,17 +88,17 @@ void SvxCheckListBox::Init_Impl()
// -----------------------------------------------------------------------
-void SvxCheckListBox::InsertEntry( const String& rStr, USHORT nPos,
+void SvxCheckListBox::InsertEntry( const String& rStr, sal_uInt16 nPos,
void* pUserData,
SvLBoxButtonKind eButtonKind )
{
- SvTreeListBox::InsertEntry( rStr, NULL, FALSE, nPos, pUserData,
+ SvTreeListBox::InsertEntry( rStr, NULL, sal_False, nPos, pUserData,
eButtonKind );
}
// -----------------------------------------------------------------------
-void SvxCheckListBox::RemoveEntry( USHORT nPos )
+void SvxCheckListBox::RemoveEntry( sal_uInt16 nPos )
{
if ( nPos < GetEntryCount() )
SvTreeListBox::GetModel()->Remove( GetEntry( nPos ) );
@@ -106,7 +106,7 @@ void SvxCheckListBox::RemoveEntry( USHORT nPos )
// -----------------------------------------------------------------------
-void SvxCheckListBox::SelectEntryPos( USHORT nPos, BOOL bSelect )
+void SvxCheckListBox::SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect )
{
if ( nPos < GetEntryCount() )
Select( GetEntry( nPos ), bSelect );
@@ -114,18 +114,18 @@ void SvxCheckListBox::SelectEntryPos( USHORT nPos, BOOL bSelect )
// -----------------------------------------------------------------------
-USHORT SvxCheckListBox::GetSelectEntryPos() const
+sal_uInt16 SvxCheckListBox::GetSelectEntryPos() const
{
SvLBoxEntry* pEntry = GetCurEntry();
if ( pEntry )
- return (USHORT)GetModel()->GetAbsPos( pEntry );
+ return (sal_uInt16)GetModel()->GetAbsPos( pEntry );
return LISTBOX_ENTRY_NOTFOUND;
}
// -----------------------------------------------------------------------
-String SvxCheckListBox::GetText( USHORT nPos ) const
+String SvxCheckListBox::GetText( sal_uInt16 nPos ) const
{
SvLBoxEntry* pEntry = GetEntry( nPos );
@@ -136,12 +136,12 @@ String SvxCheckListBox::GetText( USHORT nPos ) const
// -----------------------------------------------------------------------
-USHORT SvxCheckListBox::GetCheckedEntryCount() const
+sal_uInt16 SvxCheckListBox::GetCheckedEntryCount() const
{
- USHORT nCheckCount = 0;
- USHORT nCount = (USHORT)GetEntryCount();
+ sal_uInt16 nCheckCount = 0;
+ sal_uInt16 nCount = (sal_uInt16)GetEntryCount();
- for ( USHORT i = 0; i < nCount; ++i )
+ for ( sal_uInt16 i = 0; i < nCount; ++i )
{
if ( IsChecked( i ) )
nCheckCount++;
@@ -151,7 +151,7 @@ USHORT SvxCheckListBox::GetCheckedEntryCount() const
// -----------------------------------------------------------------------
-void SvxCheckListBox::CheckEntryPos( USHORT nPos, BOOL bCheck )
+void SvxCheckListBox::CheckEntryPos( sal_uInt16 nPos, sal_Bool bCheck )
{
if ( nPos < GetEntryCount() )
SetCheckButtonState(
@@ -161,17 +161,17 @@ void SvxCheckListBox::CheckEntryPos( USHORT nPos, BOOL bCheck )
// -----------------------------------------------------------------------
-BOOL SvxCheckListBox::IsChecked( USHORT nPos ) const
+sal_Bool SvxCheckListBox::IsChecked( sal_uInt16 nPos ) const
{
if ( nPos < GetEntryCount() )
return (GetCheckButtonState( GetEntry( nPos ) ) == SV_BUTTON_CHECKED);
else
- return FALSE;
+ return sal_False;
}
// -----------------------------------------------------------------------
-void* SvxCheckListBox::SetEntryData ( USHORT nPos, void* pNewData )
+void* SvxCheckListBox::SetEntryData ( sal_uInt16 nPos, void* pNewData )
{
void* pOld = NULL;
@@ -185,7 +185,7 @@ void* SvxCheckListBox::SetEntryData ( USHORT nPos, void* pNewData )
// -----------------------------------------------------------------------
-void* SvxCheckListBox::GetEntryData( USHORT nPos ) const
+void* SvxCheckListBox::GetEntryData( sal_uInt16 nPos ) const
{
if ( nPos < GetEntryCount() )
return GetEntry( nPos )->GetUserData();
@@ -217,13 +217,13 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt )
if ( pEntry )
{
- BOOL bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
+ sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
SvLBoxItem* pItem = GetItem( pEntry, aPnt.X() );
if ( pItem && pItem->IsA() == SV_ITEM_ID_LBOXBUTTON )
{
SvTreeListBox::MouseButtonDown( rMEvt );
- Select( pEntry, TRUE );
+ Select( pEntry, sal_True );
return;
}
else
@@ -258,7 +258,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt )
if ( pEntry )
{
- BOOL bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
+ sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED );
ToggleCheckButton( pEntry );
if ( bCheck != ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) )
CheckButtonHdl();
@@ -270,7 +270,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt )
// -----------------------------------------------------------------------
-SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, BOOL bChildsOnDemand, ULONG nPos, void* pUserData, SvLBoxButtonKind eButtonKind )
+SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind )
{
return SvTreeListBox::InsertEntry( rText, pParent, bChildsOnDemand, nPos, pUserData, eButtonKind );
}
diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx
index 84670ee32418..81091d7d7e98 100644
--- a/svx/source/dialog/connctrl.cxx
+++ b/svx/source/dialog/connctrl.cxx
@@ -88,33 +88,33 @@ void SvxXConnectionPreview::Construct()
DBG_ASSERT( pView, "Keine gueltige View Uebergeben!" );
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
- ULONG nMarkCount = rMarkList.GetMarkCount();
+ sal_uIntPtr nMarkCount = rMarkList.GetMarkCount();
if( nMarkCount >= 1 )
{
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
- for( USHORT i = 0; i < nMarkCount && !bFound; i++ )
+ for( sal_uInt16 i = 0; i < nMarkCount && !bFound; i++ )
{
pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
- UINT32 nInv = pObj->GetObjInventor();
- UINT16 nId = pObj->GetObjIdentifier();
+ sal_uInt32 nInv = pObj->GetObjInventor();
+ sal_uInt16 nId = pObj->GetObjIdentifier();
if( nInv == SdrInventor && nId == OBJ_EDGE )
{
- bFound = TRUE;
+ bFound = sal_True;
SdrEdgeObj* pTmpEdgeObj = (SdrEdgeObj*) pObj;
pEdgeObj = (SdrEdgeObj*) pTmpEdgeObj->Clone();
- SdrObjConnection& rConn1 = (SdrObjConnection&)pEdgeObj->GetConnection( TRUE );
- SdrObjConnection& rConn2 = (SdrObjConnection&)pEdgeObj->GetConnection( FALSE );
+ SdrObjConnection& rConn1 = (SdrObjConnection&)pEdgeObj->GetConnection( sal_True );
+ SdrObjConnection& rConn2 = (SdrObjConnection&)pEdgeObj->GetConnection( sal_False );
- rConn1 = pTmpEdgeObj->GetConnection( TRUE );
- rConn2 = pTmpEdgeObj->GetConnection( FALSE );
+ rConn1 = pTmpEdgeObj->GetConnection( sal_True );
+ rConn2 = pTmpEdgeObj->GetConnection( sal_False );
- SdrObject* pTmpObj1 = pTmpEdgeObj->GetConnectedNode( TRUE );
- SdrObject* pTmpObj2 = pTmpEdgeObj->GetConnectedNode( FALSE );
+ SdrObject* pTmpObj1 = pTmpEdgeObj->GetConnectedNode( sal_True );
+ SdrObject* pTmpObj2 = pTmpEdgeObj->GetConnectedNode( sal_False );
// #110094#
// potential memory leak here (!). Create SdrObjList only when there is
@@ -128,13 +128,13 @@ void SvxXConnectionPreview::Construct()
{
SdrObject* pObj1 = pTmpObj1->Clone();
pObjList->InsertObject( pObj1 );
- pEdgeObj->ConnectToNode( TRUE, pObj1 );
+ pEdgeObj->ConnectToNode( sal_True, pObj1 );
}
if( pTmpObj2 )
{
SdrObject* pObj2 = pTmpObj2->Clone();
pObjList->InsertObject( pObj2 );
- pEdgeObj->ConnectToNode( FALSE, pObj2 );
+ pEdgeObj->ConnectToNode( sal_False, pObj2 );
}
pObjList->InsertObject( pEdgeObj );
}
@@ -210,7 +210,7 @@ void SvxXConnectionPreview::Construct()
Fraction aFrac2( aSize.Height(), aRect.GetHeight() );
Fraction aMaxFrac( aFrac1 > aFrac2 ? aFrac1 : aFrac2 );
Fraction aMinFrac( aFrac1 <= aFrac2 ? aFrac1 : aFrac2 );
- BOOL bChange = (BOOL) ( (double)aMinFrac > 1.0 );
+ sal_Bool bChange = (sal_Bool) ( (double)aMinFrac > 1.0 );
aMapMode.SetScaleX( aMinFrac );
aMapMode.SetScaleY( aMinFrac );
@@ -297,7 +297,7 @@ void SvxXConnectionPreview::SetAttributes( const SfxItemSet& rInAttrs )
|*
*************************************************************************/
-USHORT SvxXConnectionPreview::GetLineDeltaAnz()
+sal_uInt16 SvxXConnectionPreview::GetLineDeltaAnz()
{
const SfxItemSet& rSet = pEdgeObj->GetMergedItemSet();
sal_uInt16 nCount(0);
@@ -316,9 +316,9 @@ USHORT SvxXConnectionPreview::GetLineDeltaAnz()
void SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt )
{
- BOOL bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift();
- BOOL bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
- BOOL bCtrl = rMEvt.IsMod1();
+ sal_Bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift();
+ sal_Bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
+ sal_Bool bCtrl = rMEvt.IsMod1();
if( bZoomIn || bZoomOut )
{
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index 0017966f1eaf..4993d15839e4 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -61,17 +61,17 @@ class SvxSuperContourDlg : public SvxContourDlg
MetricField aMtfTolerance;
ContourWindow aContourWnd;
StatusBar aStbStatus;
- ULONG nGrfChanged;
- BOOL bExecState;
- BOOL bPipetteMode;
- BOOL bWorkplaceMode;
- BOOL bUpdateGraphicLinked;
- BOOL bGraphicLinked;
+ sal_uIntPtr nGrfChanged;
+ sal_Bool bExecState;
+ sal_Bool bPipetteMode;
+ sal_Bool bWorkplaceMode;
+ sal_Bool bUpdateGraphicLinked;
+ sal_Bool bGraphicLinked;
ImageList maImageList;
ImageList maImageListH;
virtual void Resize();
- virtual BOOL Close();
+ virtual sal_Bool Close();
void DoAutoCreate();
void ReducePoints( const long nTol = 8 );
@@ -93,23 +93,23 @@ public:
Window* pParent, const ResId& rResId );
~SvxSuperContourDlg();
- void SetExecState( BOOL bEnable );
+ void SetExecState( sal_Bool bEnable );
void SetGraphic( const Graphic& rGraphic );
- void SetGraphicLinked( BOOL bLinked ) { bGraphicLinked = bLinked; }
+ void SetGraphicLinked( sal_Bool bLinked ) { bGraphicLinked = bLinked; }
const Graphic& GetGraphic() const { return aGraphic; }
- BOOL IsGraphicChanged() const { return nGrfChanged > 0UL; }
+ sal_Bool IsGraphicChanged() const { return nGrfChanged > 0UL; }
void SetPolyPolygon( const PolyPolygon& rPolyPoly );
- PolyPolygon GetPolyPolygon( BOOL bRescaleToGraphic = TRUE );
+ PolyPolygon GetPolyPolygon( sal_Bool bRescaleToGraphic = sal_True );
void SetEditingObject( void* pObj ) { pCheckObj = pObj; }
const void* GetEditingObject() const { return pCheckObj; }
- BOOL IsUndoPossible() const;
- BOOL IsRedoPossible() const;
+ sal_Bool IsUndoPossible() const;
+ sal_Bool IsRedoPossible() const;
- void UpdateGraphic( const Graphic& rGraphic, BOOL bGraphicLinked,
+ void UpdateGraphic( const Graphic& rGraphic, sal_Bool bGraphicLinked,
const PolyPolygon* pPolyPoly = NULL,
void* pEditingObj = NULL );
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx
index 5019be9f9472..a7f98ea124de 100644
--- a/svx/source/dialog/contwnd.cxx
+++ b/svx/source/dialog/contwnd.cxx
@@ -53,9 +53,9 @@
ContourWindow::ContourWindow( Window* pParent, const ResId& rResId ) :
GraphCtrl ( pParent, rResId ),
aWorkRect ( 0, 0, 0, 0 ),
- bPipetteMode ( FALSE ),
- bWorkplaceMode ( FALSE ),
- bClickValid ( FALSE )
+ bPipetteMode ( sal_False ),
+ bWorkplaceMode ( sal_False ),
+ bClickValid ( sal_False )
{
SetWinStyle( WB_SDRMODE );
}
@@ -81,7 +81,7 @@ ContourWindow::~ContourWindow()
void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly )
{
SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
- const USHORT nPolyCount = rPolyPoly.Count();
+ const sal_uInt16 nPolyCount = rPolyPoly.Count();
// zuerst alle Zeichenobjekte loeschen
aPolyPoly = rPolyPoly;
@@ -93,7 +93,7 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly )
pPage->Clear();
- for ( USHORT i = 0; i < nPolyCount; i++ )
+ for ( sal_uInt16 i = 0; i < nPolyCount; i++ )
{
basegfx::B2DPolyPolygon aPolyPolygon;
aPolyPolygon.append(aPolyPoly[ i ].getB2DPolygon());
@@ -169,7 +169,7 @@ void ContourWindow::InitSdrModel()
aSet.Put( XFillColorItem( String(), TRANSCOL ) );
aSet.Put( XFillTransparenceItem( 50 ) );
pView->SetAttributes( aSet );
- pView->SetFrameDragSingles( TRUE );
+ pView->SetFrameDragSingles( sal_True );
}
@@ -192,10 +192,10 @@ void ContourWindow::SdrObjCreated( const SdrObject& )
|*
\************************************************************************/
-BOOL ContourWindow::IsContourChanged() const
+sal_Bool ContourWindow::IsContourChanged() const
{
SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if ( pPage && pPage->GetObjCount() )
bRet = ( (SdrPathObj*) pPage->GetObj( 0 ) )->GetPathPoly().count() && pModel->IsChanged();
@@ -219,7 +219,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt )
SetPolyPolygon( PolyPolygon() );
aWorkRect = Rectangle( aLogPt, aLogPt );
Paint( Rectangle( Point(), GetGraphicSize() ) );
- SetEditMode( TRUE );
+ SetEditMode( sal_True );
}
if ( !bPipetteMode )
@@ -235,7 +235,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt )
void ContourWindow::MouseMove( const MouseEvent& rMEvt )
{
- bClickValid = FALSE;
+ bClickValid = sal_False;
if ( bPipetteMode )
{
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index 0e32da5767cb..94addbe0b51f 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -45,9 +45,9 @@ class ContourWindow : public GraphCtrl
Link aPipetteLink;
Link aPipetteClickLink;
Link aWorkplaceClickLink;
- BOOL bPipetteMode;
- BOOL bWorkplaceMode;
- BOOL bClickValid;
+ sal_Bool bPipetteMode;
+ sal_Bool bWorkplaceMode;
+ sal_Bool bClickValid;
protected:
@@ -68,15 +68,15 @@ public:
void SetPolyPolygon( const PolyPolygon& rPolyPoly );
const PolyPolygon& GetPolyPolygon();
- void SetPipetteMode( const BOOL bPipette ) { bPipetteMode = bPipette; }
- BOOL IsPipetteMode() const { return bPipetteMode; }
+ void SetPipetteMode( const sal_Bool bPipette ) { bPipetteMode = bPipette; }
+ sal_Bool IsPipetteMode() const { return bPipetteMode; }
const Color& GetPipetteColor() const { return aPipetteColor; }
- BOOL IsClickValid() const { return bClickValid; }
- BOOL IsContourChanged() const;
+ sal_Bool IsClickValid() const { return bClickValid; }
+ sal_Bool IsContourChanged() const;
- void SetWorkplaceMode( const BOOL bWorkplace ) { bWorkplaceMode = bWorkplace; }
- BOOL IsWorkplaceMode() const { return bWorkplaceMode; }
+ void SetWorkplaceMode( const sal_Bool bWorkplace ) { bWorkplaceMode = bWorkplace; }
+ sal_Bool IsWorkplaceMode() const { return bWorkplaceMode; }
const Rectangle& GetWorkRect() const { return aWorkRect; }
void SetPipetteHdl( const Link& rLink ) { aPipetteLink = rLink; }
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 503814823467..08a8e3b22edb 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -46,7 +46,7 @@
// Local Defines and Function
//----------------------------------------------------------------------------
-inline void EnableDisable( Window& rWin, BOOL bEnable )
+inline void EnableDisable( Window& rWin, sal_Bool bEnable )
{
if (bEnable)
rWin.Enable();
@@ -67,7 +67,7 @@ static long nStaticTabs[]=
RedlinData::RedlinData()
{
- bDisabled=FALSE;
+ bDisabled=sal_False;
pData=NULL;
}
RedlinData::~RedlinData()
@@ -112,7 +112,7 @@ DBG_NAME(SvLBoxColorString);
#*
#************************************************************************/
-SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,USHORT nFlags,const XubString& rStr,
+SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,sal_uInt16 nFlags,const XubString& rStr,
const Color& rCol)
: SvLBoxString( pEntry, nFlags, rStr )
@@ -202,7 +202,7 @@ SvLBoxItem* SvLBoxColorString::Create() const
#************************************************************************/
void SvLBoxColorString::Paint( const Point& rPos, SvLBox& rDev,
- USHORT nFlags, SvLBoxEntry* pEntry )
+ sal_uInt16 nFlags, SvLBoxEntry* pEntry )
{
Color aColor=rDev.GetTextColor();
Color a2Color=aColor;
@@ -221,10 +221,10 @@ void SvLBoxColorString::Paint( const Point& rPos, SvLBox& rDev,
SvxRedlinTable::SvxRedlinTable( Window* pParent,WinBits nBits ):
SvxSimpleTable(pParent,nBits )
{
- bAuthor=FALSE;
- bDate=FALSE;
- bIsCalc=FALSE;
- bComment=FALSE;
+ bAuthor=sal_False;
+ bDate=sal_False;
+ bIsCalc=sal_False;
+ bComment=sal_False;
nDatePos=WRITER_DATE;
pCommentSearcher=NULL;
SetNodeDefaultImages();
@@ -233,10 +233,10 @@ SvxRedlinTable::SvxRedlinTable( Window* pParent,WinBits nBits ):
SvxRedlinTable::SvxRedlinTable( Window* pParent,const ResId& rResId):
SvxSimpleTable(pParent,rResId)
{
- bAuthor=FALSE;
- bDate=FALSE;
- bIsCalc=FALSE;
- bComment=FALSE;
+ bAuthor=sal_False;
+ bDate=sal_False;
+ bIsCalc=sal_False;
+ bComment=sal_False;
nDatePos=WRITER_DATE;
pCommentSearcher=NULL;
SetNodeDefaultImages();
@@ -289,7 +289,7 @@ StringCompare SvxRedlinTable::ColCompare(SvLBoxEntry* pLeft,SvLBoxEntry* pRight)
return eCompare;
}
-void SvxRedlinTable::SetCalcView(BOOL bFlag)
+void SvxRedlinTable::SetCalcView(sal_Bool bFlag)
{
bIsCalc=bFlag;
if(bFlag)
@@ -306,7 +306,7 @@ void SvxRedlinTable::SetCalcView(BOOL bFlag)
void SvxRedlinTable::UpdateFilterTest()
{
Date aDateMax;
- USHORT nYEAR=aDateMax.GetYear()+100;
+ sal_uInt16 nYEAR=aDateMax.GetYear()+100;
aDateMax.SetYear(nYEAR);
Date aDateMin(1,1,1989);
Time aTMin(0);
@@ -347,12 +347,12 @@ void SvxRedlinTable::UpdateFilterTest()
}
-void SvxRedlinTable::SetFilterDate(BOOL bFlag)
+void SvxRedlinTable::SetFilterDate(sal_Bool bFlag)
{
bDate=bFlag;
}
-void SvxRedlinTable::SetDateTimeMode(USHORT nMode)
+void SvxRedlinTable::SetDateTimeMode(sal_uInt16 nMode)
{
nDaTiMode=nMode;
}
@@ -377,7 +377,7 @@ void SvxRedlinTable::SetLastTime(const Time& aTime)
aDaTiLast.SetTime(aTime.GetTime());
}
-void SvxRedlinTable::SetFilterAuthor(BOOL bFlag)
+void SvxRedlinTable::SetFilterAuthor(sal_Bool bFlag)
{
bAuthor=bFlag;
}
@@ -387,7 +387,7 @@ void SvxRedlinTable::SetAuthor(const String &aString)
aAuthor=aString;
}
-void SvxRedlinTable::SetFilterComment(BOOL bFlag)
+void SvxRedlinTable::SetFilterComment(sal_Bool bFlag)
{
bComment=bFlag;
}
@@ -402,18 +402,18 @@ void SvxRedlinTable::SetCommentParams( const utl::SearchParam* pSearchPara )
}
}
-BOOL SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserData)
+sal_Bool SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserData)
{
- BOOL nTheFlag=TRUE;
+ sal_Bool nTheFlag=sal_True;
String aString=rString.GetToken(WRITER_AUTHOR,'\t');
if(pUserData==NULL)
{
if(bAuthor)
{
if(aAuthor.CompareTo(aString)==COMPARE_EQUAL)
- nTheFlag=TRUE;
+ nTheFlag=sal_True;
else
- nTheFlag=FALSE;
+ nTheFlag=sal_False;
}
}
else
@@ -424,18 +424,18 @@ BOOL SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserD
return nTheFlag;
}
-BOOL SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserData)
+sal_Bool SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserData)
{
- BOOL nTheFlag=TRUE;
+ sal_Bool nTheFlag=sal_True;
String aString=rString.GetToken(CALC_AUTHOR,'\t');
if(pUserData==NULL)
{
if(bAuthor)
{
if(aAuthor.CompareTo(aString)==COMPARE_EQUAL)
- nTheFlag=TRUE;
+ nTheFlag=sal_True;
else
- nTheFlag=FALSE;
+ nTheFlag=sal_False;
}
}
else
@@ -446,7 +446,7 @@ BOOL SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserDat
return nTheFlag;
}
-BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,
+sal_Bool SvxRedlinTable::IsValidEntry(const String* pAuthorStr,
const DateTime *pDateTime,const String* pCommentStr)
{
bool nTheFlag=true;
@@ -475,15 +475,15 @@ BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,
return nTheFlag;
}
-BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDateTime)
+sal_Bool SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDateTime)
{
- BOOL nTheFlag=TRUE;
+ sal_Bool nTheFlag=sal_True;
if(bAuthor)
{
if(aAuthor.CompareTo(*pAuthorStr)==COMPARE_EQUAL)
- nTheFlag=TRUE;
+ nTheFlag=sal_True;
else
- nTheFlag=FALSE;
+ nTheFlag=sal_False;
}
if(bDate && nTheFlag)
{
@@ -499,7 +499,7 @@ BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDate
return nTheFlag;
}
-BOOL SvxRedlinTable::IsValidComment(const String* pCommentStr)
+sal_Bool SvxRedlinTable::IsValidComment(const String* pCommentStr)
{
bool nTheFlag=true;
@@ -514,7 +514,7 @@ BOOL SvxRedlinTable::IsValidComment(const String* pCommentStr)
}
SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserData,
- SvLBoxEntry* pParent,ULONG nPos)
+ SvLBoxEntry* pParent,sal_uIntPtr nPos)
{
aEntryColor=GetTextColor();
if(pUserData!=NULL)
@@ -536,12 +536,12 @@ SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserDat
else
aCurEntry.Erase();
- return SvTreeListBox::InsertEntry( aFirstStr, pParent, FALSE, nPos, pUserData );
+ return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData );
}
SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserData,const Color& aColor,
- SvLBoxEntry* pParent,ULONG nPos)
+ SvLBoxEntry* pParent,sal_uIntPtr nPos)
{
aEntryColor=aColor;
@@ -558,7 +558,7 @@ SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserDat
else
aCurEntry.Erase();
- return SvTreeListBox::InsertEntry( aFirstStr, pParent, FALSE, nPos, pUserData );
+ return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData );
}
SvLBoxEntry* SvxRedlinTable::CreateEntry() const
@@ -589,11 +589,11 @@ void SvxRedlinTable::InitEntry( SvLBoxEntry* pEntry, const XubString& rStr,
XubString aToken;
xub_Unicode* pCurToken = (xub_Unicode*)aCurEntry.GetBuffer();
- USHORT nCurTokenLen;
+ sal_uInt16 nCurTokenLen;
xub_Unicode* pNextToken = (xub_Unicode*)GetToken( pCurToken, nCurTokenLen );
- USHORT nCount = TabCount(); nCount--;
+ sal_uInt16 nCount = TabCount(); nCount--;
- for( USHORT nToken = 0; nToken < nCount; nToken++ )
+ for( sal_uInt16 nToken = 0; nToken < nCount; nToken++ )
{
if( pCurToken && nCurTokenLen )
// aToken.Assign( pCurToken, nCurTokenLen );
@@ -718,32 +718,32 @@ void SvxTPView::InsertCalcHeader()
aViewData.InsertHeaderEntry(aString);
}
-void SvxTPView::EnableAccept(BOOL nFlag)
+void SvxTPView::EnableAccept(sal_Bool nFlag)
{
PbAccept.Enable(nFlag);
}
-void SvxTPView::EnableAcceptAll(BOOL nFlag)
+void SvxTPView::EnableAcceptAll(sal_Bool nFlag)
{
PbAcceptAll.Enable(nFlag);
}
-void SvxTPView::EnableReject(BOOL nFlag)
+void SvxTPView::EnableReject(sal_Bool nFlag)
{
PbReject.Enable(nFlag);
}
-void SvxTPView::EnableRejectAll(BOOL nFlag)
+void SvxTPView::EnableRejectAll(sal_Bool nFlag)
{
PbRejectAll.Enable(nFlag);
}
-void SvxTPView::ShowUndo(BOOL nFlag)
+void SvxTPView::ShowUndo(sal_Bool nFlag)
{
PbUndo.Show(nFlag);
}
-void SvxTPView::EnableUndo(BOOL nFlag)
+void SvxTPView::EnableUndo(sal_Bool nFlag)
{
PbUndo.Enable(nFlag);
}
@@ -753,7 +753,7 @@ Size SvxTPView::GetMinSizePixel()
Size aSize=aMinSize;
if(PbUndo.IsVisible())
{
- ULONG nSize=PbUndo.GetSizePixel().Width()
+ sal_uIntPtr nSize=PbUndo.GetSizePixel().Width()
+PbUndo.GetPosPixel().X()
+PbAccept.GetPosPixel().X();
@@ -824,7 +824,7 @@ SvxTPFilter::SvxTPFilter( Window * pParent)
aEdComment ( this, SVX_RES( ED_COMMENT) ),
aActionStr ( SVX_RES( STR_ACTION) ),
aStrMyName ( SVX_RES( STR_FILTER) ),
- bModified (FALSE)
+ bModified (sal_False)
{
Image aImgTimeHC( SVX_RES( IMG_TIME_H ) );
FreeResource();
@@ -832,8 +832,8 @@ SvxTPFilter::SvxTPFilter( Window * pParent)
aIbClock.SetModeImage( aImgTimeHC, BMP_COLOR_HIGHCONTRAST );
aIbClock2.SetModeImage( aImgTimeHC, BMP_COLOR_HIGHCONTRAST );
- aDfDate.SetShowDateCentury( TRUE );
- aDfDate2.SetShowDateCentury( TRUE );
+ aDfDate.SetShowDateCentury( sal_True );
+ aDfDate2.SetShowDateCentury( sal_True );
aRangeStr=aCbRange.GetText();
aLbDate.SelectEntryPos(0);
@@ -873,7 +873,7 @@ SvxTPFilter::SvxTPFilter( Window * pParent)
aTfDate2.SetTime(aTime);
HideRange();
ShowAction();
- bModified=FALSE;
+ bModified=sal_False;
}
void SvxTPFilter::SetRedlinTable(SvxRedlinTable* pTable)
@@ -886,7 +886,7 @@ String SvxTPFilter::GetMyName() const
return aStrMyName;
}
-void SvxTPFilter::DisableRange(BOOL bFlag)
+void SvxTPFilter::DisableRange(sal_Bool bFlag)
{
if(bFlag)
{
@@ -902,43 +902,43 @@ void SvxTPFilter::DisableRange(BOOL bFlag)
}
}
-void SvxTPFilter::ShowDateFields(USHORT nKind)
+void SvxTPFilter::ShowDateFields(sal_uInt16 nKind)
{
String aEmpty;
switch(nKind)
{
case FLT_DATE_BEFORE:
- EnableDateLine1(TRUE);
- EnableDateLine2(FALSE);
+ EnableDateLine1(sal_True);
+ EnableDateLine2(sal_False);
break;
case FLT_DATE_SINCE:
- EnableDateLine1(TRUE);
- EnableDateLine2(FALSE);
+ EnableDateLine1(sal_True);
+ EnableDateLine2(sal_False);
break;
case FLT_DATE_EQUAL:
- EnableDateLine1(TRUE);
+ EnableDateLine1(sal_True);
aTfDate.Disable();
aTfDate.SetText(aEmpty);
- EnableDateLine2(FALSE);
+ EnableDateLine2(sal_False);
break;
case FLT_DATE_NOTEQUAL:
- EnableDateLine1(TRUE);
+ EnableDateLine1(sal_True);
aTfDate.Disable();
aTfDate.SetText(aEmpty);
- EnableDateLine2(FALSE);
+ EnableDateLine2(sal_False);
break;
case FLT_DATE_BETWEEN:
- EnableDateLine1(TRUE);
- EnableDateLine2(TRUE);
+ EnableDateLine1(sal_True);
+ EnableDateLine2(sal_True);
break;
case FLT_DATE_SAVE:
- EnableDateLine1(FALSE);
- EnableDateLine2(FALSE);
+ EnableDateLine1(sal_False);
+ EnableDateLine2(sal_False);
break;
}
}
-void SvxTPFilter::EnableDateLine1(BOOL bFlag)
+void SvxTPFilter::EnableDateLine1(sal_Bool bFlag)
{
if(bFlag && aCbDate.IsChecked())
{
@@ -953,7 +953,7 @@ void SvxTPFilter::EnableDateLine1(BOOL bFlag)
aIbClock.Disable();
}
}
-void SvxTPFilter::EnableDateLine2(BOOL bFlag)
+void SvxTPFilter::EnableDateLine2(sal_Bool bFlag)
{
String aEmpty;
if(bFlag && aCbDate.IsChecked())
@@ -1015,22 +1015,22 @@ void SvxTPFilter::SetLastTime(const Time &aTime)
aTfDate2.SetTime(aTime);
}
-void SvxTPFilter::SetDateMode(USHORT nMode)
+void SvxTPFilter::SetDateMode(sal_uInt16 nMode)
{
aLbDate.SelectEntryPos(nMode);
SelDateHdl(&aLbDate);
}
-USHORT SvxTPFilter::GetDateMode()
+sal_uInt16 SvxTPFilter::GetDateMode()
{
- return (USHORT) aLbDate.GetSelectEntryPos();
+ return (sal_uInt16) aLbDate.GetSelectEntryPos();
}
void SvxTPFilter::ClearAuthors()
{
aLbAuthor.Clear();
}
-void SvxTPFilter::InsertAuthor( const String& rString, USHORT nPos)
+void SvxTPFilter::InsertAuthor( const String& rString, sal_uInt16 nPos)
{
aLbAuthor.InsertEntry(rString,nPos);
}
@@ -1040,17 +1040,17 @@ String SvxTPFilter::GetSelectedAuthor() const
return aLbAuthor.GetSelectEntry();
}
-USHORT SvxTPFilter::GetSelectedAuthorPos()
+sal_uInt16 SvxTPFilter::GetSelectedAuthorPos()
{
- return (USHORT) aLbAuthor.GetSelectEntryPos();
+ return (sal_uInt16) aLbAuthor.GetSelectEntryPos();
}
-void SvxTPFilter::SelectedAuthorPos(USHORT nPos)
+void SvxTPFilter::SelectedAuthorPos(sal_uInt16 nPos)
{
aLbAuthor.SelectEntryPos(nPos);
}
-USHORT SvxTPFilter::SelectAuthor(const String& aString)
+sal_uInt16 SvxTPFilter::SelectAuthor(const String& aString)
{
aLbAuthor.SelectEntry(aString);
return aLbAuthor.GetSelectEntryPos();
@@ -1071,7 +1071,7 @@ void SvxTPFilter::SetFocusToRange()
aEdRange.GrabFocus();
}
-void SvxTPFilter::HideRange(BOOL bHide)
+void SvxTPFilter::HideRange(sal_Bool bHide)
{
if(bHide)
{
@@ -1081,7 +1081,7 @@ void SvxTPFilter::HideRange(BOOL bHide)
}
else
{
- ShowAction(FALSE);
+ ShowAction(sal_False);
aCbRange.SetText(aRangeStr);
aCbRange.Show();
aEdRange.Show();
@@ -1089,7 +1089,7 @@ void SvxTPFilter::HideRange(BOOL bHide)
}
}
-void SvxTPFilter::HideClocks(BOOL bHide)
+void SvxTPFilter::HideClocks(sal_Bool bHide)
{
if(bHide)
{
@@ -1112,66 +1112,66 @@ String SvxTPFilter::GetComment()const
return aEdComment.GetText();
}
-BOOL SvxTPFilter::IsDate()
+sal_Bool SvxTPFilter::IsDate()
{
return aCbDate.IsChecked();
}
-BOOL SvxTPFilter::IsAuthor()
+sal_Bool SvxTPFilter::IsAuthor()
{
return aCbAuthor.IsChecked();
}
-BOOL SvxTPFilter::IsRange()
+sal_Bool SvxTPFilter::IsRange()
{
return aCbRange.IsChecked();
}
-BOOL SvxTPFilter::IsAction()
+sal_Bool SvxTPFilter::IsAction()
{
return aCbRange.IsChecked();
}
-BOOL SvxTPFilter::IsComment()
+sal_Bool SvxTPFilter::IsComment()
{
return aCbComment.IsChecked();
}
-void SvxTPFilter::CheckDate(BOOL bFlag)
+void SvxTPFilter::CheckDate(sal_Bool bFlag)
{
aCbDate.Check(bFlag);
RowEnableHdl(&aCbDate);
- bModified=FALSE;
+ bModified=sal_False;
}
-void SvxTPFilter::CheckAuthor(BOOL bFlag)
+void SvxTPFilter::CheckAuthor(sal_Bool bFlag)
{
aCbAuthor.Check(bFlag);
RowEnableHdl(&aCbAuthor);
- bModified=FALSE;
+ bModified=sal_False;
}
-void SvxTPFilter::CheckRange(BOOL bFlag)
+void SvxTPFilter::CheckRange(sal_Bool bFlag)
{
aCbRange.Check(bFlag);
RowEnableHdl(&aCbRange);
- bModified=FALSE;
+ bModified=sal_False;
}
-void SvxTPFilter::CheckAction(BOOL bFlag)
+void SvxTPFilter::CheckAction(sal_Bool bFlag)
{
aCbRange.Check(bFlag);
RowEnableHdl(&aCbRange);
- bModified=FALSE;
+ bModified=sal_False;
}
-void SvxTPFilter::CheckComment(BOOL bFlag)
+void SvxTPFilter::CheckComment(sal_Bool bFlag)
{
aCbComment.Check(bFlag);
RowEnableHdl(&aCbComment);
- bModified=FALSE;
+ bModified=sal_False;
}
-void SvxTPFilter::ShowAction(BOOL bShow)
+void SvxTPFilter::ShowAction(sal_Bool bShow)
{
if(!bShow)
{
@@ -1197,7 +1197,7 @@ ListBox* SvxTPFilter::GetLbAction()
IMPL_LINK( SvxTPFilter, SelDateHdl, ListBox*, pLb )
{
- ShowDateFields((USHORT)aLbDate.GetSelectEntryPos());
+ ShowDateFields((sal_uInt16)aLbDate.GetSelectEntryPos());
ModifyHdl(pLb);
return 0;
}
@@ -1208,8 +1208,8 @@ IMPL_LINK( SvxTPFilter, RowEnableHdl, CheckBox*, pCB )
{
aLbDate.Enable(aCbDate.IsChecked());
aLbDate.Invalidate();
- EnableDateLine1(FALSE);
- EnableDateLine2(FALSE);
+ EnableDateLine1(sal_False);
+ EnableDateLine2(sal_False);
if(aCbDate.IsChecked()) SelDateHdl(&aLbDate);
}
else if(pCB==&aCbAuthor)
@@ -1278,7 +1278,7 @@ IMPL_LINK( SvxTPFilter, ModifyHdl, void*, pCtr)
aModifyComLink.Call(this);
}
- bModified=TRUE;
+ bModified=sal_True;
aModifyLink.Call(this);
}
return 0;
@@ -1302,7 +1302,7 @@ void SvxTPFilter::DeactivatePage()
pRedlinTable->SetFilterComment(IsComment());
utl::SearchParam aSearchParam( aEdComment.GetText(),
- utl::SearchParam::SRCH_REGEXP,FALSE,FALSE,FALSE );
+ utl::SearchParam::SRCH_REGEXP,sal_False,FALSE,sal_False );
pRedlinTable->SetCommentParams(&aSearchParam);
@@ -1311,7 +1311,7 @@ void SvxTPFilter::DeactivatePage()
aReadyLink.Call(this);
}
- bModified=FALSE;
+ bModified=sal_False;
TabPage::DeactivatePage();
}
@@ -1454,17 +1454,17 @@ void SvxAcceptChgCtr::Resize()
{
aMinSize=pTPView->GetMinSizePixel();
Size aSize=GetOutputSizePixel();
- BOOL bFlag=FALSE;
+ sal_Bool bFlag=sal_False;
if(aMinSize.Height()>aSize.Height())
{
aSize.Height()=aMinSize.Height();
- bFlag=TRUE;
+ bFlag=sal_True;
}
if(aMinSize.Width()>aSize.Width())
{
aSize.Width()=aMinSize.Width();
- bFlag=TRUE;
+ bFlag=sal_True;
}
if(bFlag)
@@ -1496,12 +1496,12 @@ void SvxAcceptChgCtr::ShowViewPage()
aTCAccept.SetCurPageId(TP_VIEW);
}
-BOOL SvxAcceptChgCtr::IsFilterPageVisible()
+sal_Bool SvxAcceptChgCtr::IsFilterPageVisible()
{
return (aTCAccept.GetCurPageId()==TP_FILTER);
}
-BOOL SvxAcceptChgCtr::IsViewPageVisible()
+sal_Bool SvxAcceptChgCtr::IsViewPageVisible()
{
return (aTCAccept.GetCurPageId()==TP_VIEW);
}
diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx
index 68c7d970fecb..4a4088c47253 100644
--- a/svx/source/dialog/databaseregistrationui.cxx
+++ b/svx/source/dialog/databaseregistrationui.cxx
@@ -50,9 +50,9 @@
namespace svx
{
- USHORT administrateDatabaseRegistration( Window* _parentWindow )
+ sal_uInt16 administrateDatabaseRegistration( Window* _parentWindow )
{
- USHORT nResult = RET_CANCEL;
+ sal_uInt16 nResult = RET_CANCEL;
SfxItemSet aRegistrationItems( SFX_APP()->GetPool(), SID_SB_DB_REGISTER, SID_SB_DB_REGISTER, 0 );
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 56873298382f..7d3d6d05912c 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -83,7 +83,7 @@ Bitmap& SvxRectCtl::GetRectBitmap( void )
}
SvxRectCtl::SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt,
- USHORT nBorder, USHORT nCircle, CTL_STYLE eStyle ) :
+ sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle ) :
Control( pParent, rResId ),
@@ -156,7 +156,7 @@ void SvxRectCtl::Resize_Impl()
break;
}
Reset();
- InitSettings( TRUE, TRUE );
+ InitSettings( sal_True, sal_True );
}
// -----------------------------------------------------------------------
@@ -189,18 +189,18 @@ void SvxRectCtl::InitRectBitmap( void )
aColorAry2[6] = rStyles.GetDialogColor();
#ifdef DBG_UTIL
- static BOOL bModify = FALSE;
- BOOL& rModify = bModify;
+ static sal_Bool bModify = sal_False;
+ sal_Bool& rModify = bModify;
if( rModify )
{
static int n = 0;
- static UINT8 r = 0xFF;
- static UINT8 g = 0x00;
- static UINT8 b = 0xFF;
+ static sal_uInt8 r = 0xFF;
+ static sal_uInt8 g = 0x00;
+ static sal_uInt8 b = 0xFF;
int& rn = n;
- UINT8& rr = r;
- UINT8& rg = g;
- UINT8& rb = b;
+ sal_uInt8& rr = r;
+ sal_uInt8& rg = g;
+ sal_uInt8& rb = b;
aColorAry2[ rn ] = Color( rr, rg, rb );
}
#endif
@@ -210,7 +210,7 @@ void SvxRectCtl::InitRectBitmap( void )
// -----------------------------------------------------------------------
-void SvxRectCtl::InitSettings( BOOL bForeground, BOOL bBackground )
+void SvxRectCtl::InitSettings( sal_Bool bForeground, sal_Bool bBackground )
{
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
@@ -282,7 +282,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
if(!IsCompletelyDisabled())
{
RECT_POINT eNewRP = eRP;
- BOOL bUseMM = (eCS != CS_SHADOW) && (eCS != CS_ANGLE);
+ sal_Bool bUseMM = (eCS != CS_SHADOW) && (eCS != CS_ANGLE);
switch( rKeyEvt.GetKeyCode().GetCode() )
{
@@ -367,9 +367,9 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt )
void SvxRectCtl::StateChanged( StateChangedType nType )
{
if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
- InitSettings( TRUE, FALSE );
+ InitSettings( sal_True, sal_False );
else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
- InitSettings( FALSE, TRUE );
+ InitSettings( sal_False, sal_True );
Window::StateChanged( nType );
}
@@ -379,7 +379,7 @@ void SvxRectCtl::StateChanged( StateChangedType nType )
void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
- InitSettings( TRUE, TRUE );
+ InitSettings( sal_True, sal_True );
else
Window::DataChanged( rDCEvt );
}
@@ -464,8 +464,8 @@ void SvxRectCtl::Paint( const Rectangle& )
Point aBtnPnt2( 11,0 );
Point aBtnPnt3( 22,0 );
- BOOL bNoHorz = (m_nState & CS_NOHORZ) != 0;
- BOOL bNoVert = (m_nState & CS_NOVERT) != 0;
+ sal_Bool bNoHorz = (m_nState & CS_NOHORZ) != 0;
+ sal_Bool bNoVert = (m_nState & CS_NOVERT) != 0;
Bitmap& rBitmap = GetRectBitmap();
@@ -698,7 +698,7 @@ void SvxRectCtl::SetState( CTL_STATE nState )
( (SvxTabPage*) GetParent() )->PointChanged( this, eRP );
}
-UINT8 SvxRectCtl::GetNumOfChilds( void ) const
+sal_uInt8 SvxRectCtl::GetNumOfChilds( void ) const
{
return ( eCS == CS_ANGLE )? 8 : 9;
}
@@ -801,12 +801,12 @@ SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId, Size _aSize ) :
void SvxAngleCtl::Initialize()
{
- bPositive = TRUE;
+ bPositive = sal_True;
// aFont.SetName( "Helvetica" );
aFont.SetSize( aFontSize );
aFont.SetWeight( WEIGHT_NORMAL );
- aFont.SetTransparent( FALSE );
+ aFont.SetTransparent( sal_False );
SetFont( aFont );
}
@@ -873,10 +873,10 @@ void SvxAngleCtl::Paint( const Rectangle& )
|*
\************************************************************************/
-SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, USHORT nNumber ) :
+SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, sal_uInt16 nNumber ) :
Control ( pParent, rResId ),
nLines ( nNumber ),
- bPaintable ( TRUE )
+ bPaintable ( sal_True )
{
// SetMapMode( MAP_100TH_MM );
aRectSize = GetOutputSize();
@@ -886,8 +886,8 @@ SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, USHORT nNumber )
SetLineColor( Application::GetSettings().GetStyleSettings().GetShadowColor() );
nSquares = nLines * nLines;
- pPixel = new USHORT[ nSquares ];
- rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT));
+ pPixel = new sal_uInt16[ nSquares ];
+ rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16));
}
/*************************************************************************
@@ -907,7 +907,7 @@ SvxPixelCtl::~SvxPixelCtl( )
|*
\************************************************************************/
-void SvxPixelCtl::ChangePixel( USHORT nPixel )
+void SvxPixelCtl::ChangePixel( sal_uInt16 nPixel )
{
if( *( pPixel + nPixel) == 0 )
*( pPixel + nPixel) = 1; // koennte erweitert werden auf mehrere Farben
@@ -925,10 +925,10 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
{
Point aPt = PixelToLogic( rMEvt.GetPosPixel() );
Point aPtTl, aPtBr;
- USHORT nX, nY;
+ sal_uInt16 nX, nY;
- nX = (USHORT) ( aPt.X() * nLines / aRectSize.Width() );
- nY = (USHORT) ( aPt.Y() * nLines / aRectSize.Height() );
+ nX = (sal_uInt16) ( aPt.X() * nLines / aRectSize.Width() );
+ nY = (sal_uInt16) ( aPt.Y() * nLines / aRectSize.Height() );
ChangePixel( nX + nY * nLines );
@@ -951,7 +951,7 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
void SvxPixelCtl::Paint( const Rectangle& )
{
- USHORT i, j, nTmp;
+ sal_uInt16 i, j, nTmp;
Point aPtTl, aPtBr;
if( bPaintable )
@@ -961,16 +961,16 @@ void SvxPixelCtl::Paint( const Rectangle& )
for( i = 1; i < nLines; i++)
{
// horizontal
- nTmp = (USHORT) ( aRectSize.Height() * i / nLines );
+ nTmp = (sal_uInt16) ( aRectSize.Height() * i / nLines );
DrawLine( Point( 0, nTmp ), Point( aRectSize.Width(), nTmp ) );
// vertikal
- nTmp = (USHORT) ( aRectSize.Width() * i / nLines );
+ nTmp = (sal_uInt16) ( aRectSize.Width() * i / nLines );
DrawLine( Point( nTmp, 0 ), Point( nTmp, aRectSize.Height() ) );
}
// Rechtecke (Quadrate) zeichnen
Control::SetLineColor();
- USHORT nLastPixel = *pPixel ? 0 : 1;
+ sal_uInt16 nLastPixel = *pPixel ? 0 : 1;
for( i = 0; i < nLines; i++)
{
@@ -1014,9 +1014,9 @@ void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp )
aPixelColor = rXBmp.GetPixelColor();
aBackgroundColor = rXBmp.GetBackgroundColor();
- USHORT* pArray = rXBmp.GetPixelArray();
+ sal_uInt16* pArray = rXBmp.GetPixelArray();
- for( USHORT i = 0; i < nSquares; i++ )
+ for( sal_uInt16 i = 0; i < nSquares; i++ )
*( pPixel + i ) = *( pArray + i );
}
}
@@ -1027,7 +1027,7 @@ void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp )
|*
\************************************************************************/
-USHORT SvxPixelCtl::GetBitmapPixel( const USHORT nPixel )
+sal_uInt16 SvxPixelCtl::GetBitmapPixel( const sal_uInt16 nPixel )
{
return( *( pPixel + nPixel ) );
}
@@ -1041,7 +1041,7 @@ USHORT SvxPixelCtl::GetBitmapPixel( const USHORT nPixel )
void SvxPixelCtl::Reset()
{
// clear pixel area
- rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT));
+ rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16));
Invalidate();
}
@@ -1090,14 +1090,14 @@ void ColorLB::Fill( const XColorTable* pColorTab )
{
long nCount = pColorTab->Count();
XColorEntry* pEntry;
- SetUpdateMode( FALSE );
+ SetUpdateMode( sal_False );
for( long i = 0; i < nCount; i++ )
{
pEntry = pColorTab->GetColor( i );
InsertEntry( pEntry->GetColor(), pEntry->GetName() );
}
- SetUpdateMode( TRUE );
+ SetUpdateMode( sal_True );
}
/************************************************************************/
@@ -1109,7 +1109,7 @@ void ColorLB::Append( XColorEntry* pEntry, Bitmap* )
/************************************************************************/
-void ColorLB::Modify( XColorEntry* pEntry, USHORT nPos, Bitmap* )
+void ColorLB::Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap* )
{
RemoveEntry( nPos );
InsertEntry( pEntry->GetColor(), pEntry->GetName(), nPos );
@@ -1125,14 +1125,14 @@ void FillAttrLB::Fill( const XColorTable* pColorTab )
{
long nCount = pColorTab->Count();
XColorEntry* pEntry;
- SetUpdateMode( FALSE );
+ SetUpdateMode( sal_False );
for( long i = 0; i < nCount; i++ )
{
pEntry = pColorTab->GetColor( i );
InsertEntry( pEntry->GetColor(), pEntry->GetName() );
}
- SetUpdateMode( TRUE );
+ SetUpdateMode( sal_True );
}
/*************************************************************************
@@ -1141,7 +1141,7 @@ void FillAttrLB::Fill( const XColorTable* pColorTab )
|*
\************************************************************************/
-HatchingLB::HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
+HatchingLB::HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ )
: ListBox( pParent, Id ),
mpList ( NULL ),
mbUserDraw( bUserDraw )
@@ -1149,7 +1149,7 @@ HatchingLB::HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
EnableUserDraw( mbUserDraw );
}
-HatchingLB::HatchingLB( Window* pParent, WinBits aWB, BOOL bUserDraw /*= TRUE*/ )
+HatchingLB::HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw /*= sal_True*/ )
: ListBox( pParent, aWB ),
mpList ( NULL ),
mbUserDraw( bUserDraw )
@@ -1163,7 +1163,7 @@ void HatchingLB::Fill( const XHatchList* pList )
XHatchEntry* pEntry;
long nCount = pList->Count();
- SetUpdateMode( FALSE );
+ SetUpdateMode( sal_False );
if( mbUserDraw )
{
@@ -1183,7 +1183,7 @@ void HatchingLB::Fill( const XHatchList* pList )
}
}
- SetUpdateMode( TRUE );
+ SetUpdateMode( sal_True );
}
void HatchingLB::UserDraw( const UserDrawEvent& rUDEvt )
@@ -1199,7 +1199,7 @@ void HatchingLB::UserDraw( const UserDrawEvent& rUDEvt )
{
OutputDevice* pDevice = rUDEvt.GetDevice();
- ULONG nOldDrawMode = pDevice->GetDrawMode();
+ sal_uIntPtr nOldDrawMode = pDevice->GetDrawMode();
pDevice->SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
XHatch& rXHatch = mpList->GetHatch( rUDEvt.GetItemId() )->GetHatch();
@@ -1236,7 +1236,7 @@ void HatchingLB::Append( XHatchEntry* pEntry, Bitmap* pBmp )
/************************************************************************/
-void HatchingLB::Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void HatchingLB::Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
{
RemoveEntry( nPos );
@@ -1249,11 +1249,11 @@ void HatchingLB::Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp )
/************************************************************************/
void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr,
- const XHatch& rHatch, USHORT nDist )
+ const XHatch& rHatch, sal_uInt16 nDist )
{
long nCount = pList->Count();
XHatchEntry* pEntry;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
String aStr;
long i;
@@ -1264,10 +1264,10 @@ void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr,
aStr = pEntry->GetName();
if( rStr == aStr && rHatch == pEntry->GetHatch() )
- bFound = TRUE;
+ bFound = sal_True;
}
if( bFound )
- SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
+ SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
}
/*************************************************************************
@@ -1280,7 +1280,7 @@ void FillAttrLB::Fill( const XHatchList* pList )
{
long nCount = pList->Count();
XHatchEntry* pEntry;
- ListBox::SetUpdateMode( FALSE );
+ ListBox::SetUpdateMode( sal_False );
for( long i = 0; i < nCount; i++ )
{
@@ -1291,7 +1291,7 @@ void FillAttrLB::Fill( const XHatchList* pList )
else
InsertEntry( pEntry->GetName() );
}
- ListBox::SetUpdateMode( TRUE );
+ ListBox::SetUpdateMode( sal_True );
}
/*************************************************************************
@@ -1300,7 +1300,7 @@ void FillAttrLB::Fill( const XHatchList* pList )
|*
\************************************************************************/
-GradientLB::GradientLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
+GradientLB::GradientLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ )
: ListBox( pParent, Id ),
mpList(NULL),
mbUserDraw( bUserDraw )
@@ -1308,7 +1308,7 @@ GradientLB::GradientLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
EnableUserDraw( mbUserDraw);
}
-GradientLB::GradientLB( Window* pParent, WinBits aWB, BOOL bUserDraw /*= TRUE*/ )
+GradientLB::GradientLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw /*= sal_True*/ )
: ListBox( pParent, aWB ),
mpList(NULL),
mbUserDraw( bUserDraw )
@@ -1322,7 +1322,7 @@ void GradientLB::Fill( const XGradientList* pList )
XGradientEntry* pEntry;
long nCount = pList->Count();
- SetUpdateMode( FALSE );
+ SetUpdateMode( sal_False );
if( mbUserDraw )
{
@@ -1342,7 +1342,7 @@ void GradientLB::Fill( const XGradientList* pList )
}
}
- SetUpdateMode( TRUE );
+ SetUpdateMode( sal_True );
}
void GradientLB::UserDraw( const UserDrawEvent& rUDEvt )
@@ -1360,7 +1360,7 @@ void GradientLB::UserDraw( const UserDrawEvent& rUDEvt )
XGradient& rXGrad = mpList->GetGradient( rUDEvt.GetItemId() )->GetGradient();
Gradient aGradient( (GradientStyle) rXGrad.GetGradientStyle(), rXGrad.GetStartColor(), rXGrad.GetEndColor() );
- aGradient.SetAngle( (USHORT)rXGrad.GetAngle() );
+ aGradient.SetAngle( (sal_uInt16)rXGrad.GetAngle() );
aGradient.SetBorder( rXGrad.GetBorder() );
aGradient.SetOfsX( rXGrad.GetXOffset() );
aGradient.SetOfsY( rXGrad.GetYOffset() );
@@ -1374,14 +1374,14 @@ void GradientLB::UserDraw( const UserDrawEvent& rUDEvt )
{
long nWidth = pDevice->GetOutputSize().Width();
- pWin->EnableRTL( FALSE );
+ pWin->EnableRTL( sal_False );
Rectangle aMirrorRect( Point( nWidth - aRect.Left() - aRect.GetWidth(), aRect.Top() ),
aRect.GetSize() );
pDevice->DrawGradient( aMirrorRect, aGradient );
- pWin->EnableRTL( TRUE );
+ pWin->EnableRTL( sal_True );
}
else
pDevice->DrawGradient( aRect, aGradient );
@@ -1408,7 +1408,7 @@ void GradientLB::Append( XGradientEntry* pEntry, Bitmap* pBmp )
/************************************************************************/
-void GradientLB::Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void GradientLB::Modify( XGradientEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
{
RemoveEntry( nPos );
@@ -1421,11 +1421,11 @@ void GradientLB::Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp )
/************************************************************************/
void GradientLB::SelectEntryByList( const XGradientList* pList, const String& rStr,
- const XGradient& rGradient, USHORT nDist )
+ const XGradient& rGradient, sal_uInt16 nDist )
{
long nCount = pList->Count();
XGradientEntry* pEntry;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
String aStr;
long i;
@@ -1436,10 +1436,10 @@ void GradientLB::SelectEntryByList( const XGradientList* pList, const String& rS
aStr = pEntry->GetName();
if( rStr == aStr && rGradient == pEntry->GetGradient() )
- bFound = TRUE;
+ bFound = sal_True;
}
if( bFound )
- SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
+ SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
}
/*************************************************************************
@@ -1452,7 +1452,7 @@ void FillAttrLB::Fill( const XGradientList* pList )
{
long nCount = pList->Count();
XGradientEntry* pEntry;
- ListBox::SetUpdateMode( FALSE );
+ ListBox::SetUpdateMode( sal_False );
for( long i = 0; i < nCount; i++ )
{
@@ -1463,7 +1463,7 @@ void FillAttrLB::Fill( const XGradientList* pList )
else
InsertEntry( pEntry->GetName() );
}
- ListBox::SetUpdateMode( TRUE );
+ ListBox::SetUpdateMode( sal_True );
}
/*************************************************************************
@@ -1472,7 +1472,7 @@ void FillAttrLB::Fill( const XGradientList* pList )
|*
\************************************************************************/
-BitmapLB::BitmapLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ )
+BitmapLB::BitmapLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ )
: ListBox( pParent, Id ),
mpList( NULL ),
mbUserDraw( bUserDraw )
@@ -1511,7 +1511,7 @@ void BitmapLB::Fill( const XBitmapList* pList )
XBitmapEntry* pEntry;
long nCount = pList->Count();
- SetUpdateMode( FALSE );
+ SetUpdateMode( sal_False );
if( mbUserDraw )
{
@@ -1531,7 +1531,7 @@ void BitmapLB::Fill( const XBitmapList* pList )
}
}
- SetUpdateMode( TRUE );
+ SetUpdateMode( sal_True );
}
void BitmapLB::UserDraw( const UserDrawEvent& rUDEvt )
@@ -1596,7 +1596,7 @@ void BitmapLB::Append( XBitmapEntry* pEntry, Bitmap* pBmp )
/************************************************************************/
-void BitmapLB::Modify( XBitmapEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void BitmapLB::Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
{
RemoveEntry( nPos );
@@ -1618,7 +1618,7 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr,
{
long nCount = pList->Count();
XBitmapEntry* pEntry;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
long i;
for( i = 0; i < nCount && !bFound; i++ )
@@ -1630,11 +1630,11 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr,
if( rStr == aStr )
{
- bFound = TRUE;
+ bFound = sal_True;
}
}
if( bFound )
- SelectEntryPos( (USHORT) ( i - 1 ) );
+ SelectEntryPos( (sal_uInt16) ( i - 1 ) );
}
/*************************************************************************
@@ -1685,7 +1685,7 @@ void FillAttrLB::Fill( const XBitmapList* pList )
{
long nCount = pList->Count();
XBitmapEntry* pEntry;
- ListBox::SetUpdateMode( FALSE );
+ ListBox::SetUpdateMode( sal_False );
for( long i = 0; i < nCount; i++ )
{
@@ -1696,7 +1696,7 @@ void FillAttrLB::Fill( const XBitmapList* pList )
ListBox::InsertEntry( pEntry->GetName(), aVD.GetBitmap( Point( 0, 2 ), Size( 32, 12 ) ) );
}
- ListBox::SetUpdateMode( TRUE );
+ ListBox::SetUpdateMode( sal_True );
}
/************************************************************************/
@@ -1706,7 +1706,7 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr
{
long nCount = pList->Count();
XBitmapEntry* pEntry;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
long i;
for( i = 0; i < nCount && !bFound; i++ )
@@ -1718,14 +1718,14 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr
if( rStr == aStr )
{
- bFound = TRUE;
+ bFound = sal_True;
}
/*
if( rStr == aStr && rBmp == aBmp )
- bFound = TRUE; */
+ bFound = sal_True; */
}
if( bFound )
- SelectEntryPos( (USHORT) ( i - 1 ) );
+ SelectEntryPos( (sal_uInt16) ( i - 1 ) );
}
/*************************************************************************
@@ -1736,13 +1736,13 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr
void FillTypeLB::Fill()
{
- SetUpdateMode( FALSE );
+ SetUpdateMode( sal_False );
InsertEntry( String( SVX_RES( RID_SVXSTR_INVISIBLE ) ) );
InsertEntry( String( SVX_RES( RID_SVXSTR_COLOR ) ) );
InsertEntry( String( SVX_RES( RID_SVXSTR_GRADIENT ) ) );
InsertEntry( String( SVX_RES( RID_SVXSTR_HATCH ) ) );
InsertEntry( String( SVX_RES( RID_SVXSTR_BITMAP ) ) );
- SetUpdateMode( TRUE );
+ SetUpdateMode( sal_True );
}
/*************************************************************************
@@ -1755,7 +1755,7 @@ void LineLB::Fill( const XDashList* pList )
{
long nCount = pList->Count();
XDashEntry* pEntry;
- SetUpdateMode( FALSE );
+ SetUpdateMode( sal_False );
for( long i = 0; i < nCount; i++ )
{
@@ -1769,7 +1769,7 @@ void LineLB::Fill( const XDashList* pList )
else
InsertEntry( pEntry->GetName() );
}
- SetUpdateMode( TRUE );
+ SetUpdateMode( sal_True );
}
void LineLB::FillStyles()
@@ -1808,7 +1808,7 @@ void LineLB::Append( XDashEntry* pEntry, Bitmap* pBmp )
/************************************************************************/
-void LineLB::Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp )
+void LineLB::Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp )
{
RemoveEntry( nPos );
@@ -1821,11 +1821,11 @@ void LineLB::Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp )
/************************************************************************/
void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr,
- const XDash& rDash, USHORT nDist )
+ const XDash& rDash, sal_uInt16 nDist )
{
long nCount = pList->Count();
XDashEntry* pEntry;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
String aStr;
XDash aDash;
@@ -1838,10 +1838,10 @@ void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr,
aDash = pEntry->GetDash();
if( rStr == aStr && rDash == aDash )
- bFound = TRUE;
+ bFound = sal_True;
}
if( bFound )
- SelectEntryPos( (USHORT) ( i - 1 + nDist ) );
+ SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) );
}
/*************************************************************************
@@ -1850,12 +1850,12 @@ void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr,
|*
\************************************************************************/
-void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart )
+void LineEndLB::Fill( const XLineEndList* pList, sal_Bool bStart )
{
long nCount = pList->Count();
XLineEndEntry* pEntry;
VirtualDevice aVD;
- SetUpdateMode( FALSE );
+ SetUpdateMode( sal_False );
for( long i = 0; i < nCount; i++ )
{
@@ -1864,7 +1864,7 @@ void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart )
if( pBitmap )
{
Size aBmpSize( pBitmap->GetSizePixel() );
- aVD.SetOutputSizePixel( aBmpSize, FALSE );
+ aVD.SetOutputSizePixel( aBmpSize, sal_False );
aVD.DrawBitmap( Point(), *pBitmap );
InsertEntry( pEntry->GetName(),
aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ),
@@ -1875,20 +1875,20 @@ void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart )
else
InsertEntry( pEntry->GetName() );
}
- SetUpdateMode( TRUE );
+ SetUpdateMode( sal_True );
}
/************************************************************************/
void LineEndLB::Append( XLineEndEntry* pEntry, Bitmap* pBmp,
- BOOL bStart )
+ sal_Bool bStart )
{
if( pBmp )
{
VirtualDevice aVD;
Size aBmpSize( pBmp->GetSizePixel() );
- aVD.SetOutputSizePixel( aBmpSize, FALSE );
+ aVD.SetOutputSizePixel( aBmpSize, sal_False );
aVD.DrawBitmap( Point(), *pBmp );
InsertEntry( pEntry->GetName(),
aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ),
@@ -1900,8 +1900,8 @@ void LineEndLB::Append( XLineEndEntry* pEntry, Bitmap* pBmp,
/************************************************************************/
-void LineEndLB::Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp,
- BOOL bStart )
+void LineEndLB::Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp,
+ sal_Bool bStart )
{
RemoveEntry( nPos );
@@ -1910,7 +1910,7 @@ void LineEndLB::Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp,
VirtualDevice aVD;
Size aBmpSize( pBmp->GetSizePixel() );
- aVD.SetOutputSizePixel( aBmpSize, FALSE );
+ aVD.SetOutputSizePixel( aBmpSize, sal_False );
aVD.DrawBitmap( Point(), *pBmp );
InsertEntry( pEntry->GetName(),
aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ),
@@ -2055,7 +2055,7 @@ SvxXLinePreview::SvxXLinePreview( Window* pParent, const ResId& rResId )
mbWithSymbol( sal_False )
{
const Size aOutputSize(GetOutputSize());
- InitSettings( TRUE, TRUE );
+ InitSettings( sal_True, sal_True );
const sal_Int32 nDistance(500L);
const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance));
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 1b77364b6c7e..da320eea50d7 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -898,7 +898,7 @@ void SaveProgressDialog::end()
//===============================================
RecovDocListEntry::RecovDocListEntry( SvLBoxEntry* pEntry,
- USHORT nFlags,
+ sal_uInt16 nFlags,
const String& sText )
: SvLBoxString( pEntry, nFlags, sText )
{
@@ -907,14 +907,14 @@ RecovDocListEntry::RecovDocListEntry( SvLBoxEntry* pEntry,
//===============================================
void RecovDocListEntry::Paint(const Point& aPos ,
SvLBox& aDevice,
- USHORT /*nFlags */,
+ sal_uInt16 /*nFlags */,
SvLBoxEntry* pEntry )
{
const Image* pImg = 0;
const String* pTxt = 0;
RecovDocList* pList = static_cast< RecovDocList* >(&aDevice);
- BOOL bHC = aDevice.GetSettings().GetStyleSettings().GetHighContrastMode();
+ sal_Bool bHC = aDevice.GetSettings().GetStyleSettings().GetHighContrastMode();
TURLInfo* pInfo = (TURLInfo*)pEntry->GetUserData();
switch(pInfo->RecoveryState)
@@ -1086,7 +1086,7 @@ RecoveryDialog::RecoveryDialog(Window* pParent,
m_aFileListLB.SetBackground( rStyleSettings.GetDialogColor() );
- m_aNextBtn.Enable(TRUE);
+ m_aNextBtn.Enable(sal_True);
m_aNextBtn.SetClickHdl( LINK( this, RecoveryDialog, NextButtonHdl ) );
m_aCancelBtn.SetClickHdl( LINK( this, RecoveryDialog, CancelButtonHdl ) );
@@ -1131,8 +1131,8 @@ short RecoveryDialog::execute()
// Dialog was started first time ...
// wait for user decision ("start" or "cancel" recovery)
// This decision will be made inside the NextBtn handler.
- m_aNextBtn.Enable(TRUE);
- m_aCancelBtn.Enable(TRUE);
+ m_aNextBtn.Enable(sal_True);
+ m_aCancelBtn.Enable(sal_True);
m_bWaitForUser = sal_True;
while(m_bWaitForUser)
Application::Yield();
@@ -1150,8 +1150,8 @@ short RecoveryDialog::execute()
// do it asynchronous (to allow repaints)
// and wait for this asynchronous operation.
m_aDescrFT.SetText( m_aTitleRecoveryInProgress );
- m_aNextBtn.Enable(FALSE);
- m_aCancelBtn.Enable(FALSE);
+ m_aNextBtn.Enable(sal_False);
+ m_aCancelBtn.Enable(sal_False);
m_pCore->setProgressHandler(m_xProgress);
m_pCore->setUpdateListener(this);
m_pCore->doRecovery();
@@ -1173,15 +1173,15 @@ short RecoveryDialog::execute()
{
m_aDescrFT.SetText(m_aRecoveryOnlyFinishDescr);
m_aNextBtn.SetText(m_aRecoveryOnlyFinish);
- m_aNextBtn.Enable(TRUE);
- m_aCancelBtn.Enable(FALSE);
+ m_aNextBtn.Enable(sal_True);
+ m_aCancelBtn.Enable(sal_False);
}
else
{
m_aDescrFT.SetText(m_aTitleRecoveryReport);
m_aNextBtn.SetText(m_aNextStr);
- m_aNextBtn.Enable(TRUE);
- m_aCancelBtn.Enable(TRUE);
+ m_aNextBtn.Enable(sal_True);
+ m_aCancelBtn.Enable(sal_True);
}
m_bWaitForUser = sal_True;
@@ -1358,8 +1358,8 @@ void RecoveryDialog::start()
//===============================================
void RecoveryDialog::updateItems()
{
- ULONG c = m_aFileListLB.GetEntryCount();
- ULONG i = 0;
+ sal_uIntPtr c = m_aFileListLB.GetEntryCount();
+ sal_uIntPtr i = 0;
for ( i=0; i<c; ++i )
{
SvLBoxEntry* pEntry = m_aFileListLB.GetEntry(i);
@@ -1382,8 +1382,8 @@ void RecoveryDialog::updateItems()
//===============================================
void RecoveryDialog::stepNext(TURLInfo* pItem)
{
- ULONG c = m_aFileListLB.GetEntryCount();
- ULONG i = 0;
+ sal_uIntPtr c = m_aFileListLB.GetEntryCount();
+ sal_uIntPtr i = 0;
for (i=0; i<c; ++i)
{
SvLBoxEntry* pEntry = m_aFileListLB.GetEntry(i);
@@ -1533,7 +1533,7 @@ void BrokenRecoveryDialog::impl_refresh()
m_bExecutionNeeded = sal_True;
- USHORT nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage );
+ sal_uInt16 nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage );
m_aFileListLB.SetEntryData( nPos, (void*)&rInfo );
}
m_sSavePath = ::rtl::OUString();
@@ -1697,13 +1697,13 @@ void BrokenRecoveryDialog::impl_askForSavePath()
ExtTextEngine* pTextEngine = GetTextEngine();
DBG_ASSERT( pTextEngine, "no text engine" );
- ULONG i, nParaCount = pTextEngine->GetParagraphCount();
- USHORT nLineCount = 0;
+ sal_uIntPtr i, nParaCount = pTextEngine->GetParagraphCount();
+ sal_uInt16 nLineCount = 0;
for ( i = 0; i < nParaCount; ++i )
nLineCount = nLineCount + pTextEngine->GetLineCount(i);
- USHORT nVisCols = 0, nVisLines = 0;
+ sal_uInt16 nVisCols = 0, nVisLines = 0;
GetMaxVisColumnsAndLines( nVisCols, nVisLines );
GetVScrollBar()->Show( nLineCount > nVisLines );
@@ -1950,14 +1950,14 @@ void BrokenRecoveryDialog::impl_askForSavePath()
default:
#ifdef WNT
case 0:
- maSystemBtn.Check( TRUE );
+ maSystemBtn.Check( sal_True );
break;
#endif
case 1:
- maDirectBtn.Check( TRUE );
+ maDirectBtn.Check( sal_True );
break;
case 2:
- maManualBtn.Check( TRUE );
+ maManualBtn.Check( sal_True );
break;
}
@@ -2019,7 +2019,7 @@ void BrokenRecoveryDialog::impl_askForSavePath()
GetTextEngine()->SetFont( aFont );
// no blinking cursor and a little left margin
- EnableCursor( FALSE );
+ EnableCursor( sal_False );
SetLeftMargin( 4 );
}
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index e8088e53282f..b1e7757c07f9 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -72,7 +72,7 @@ namespace
// -----------------------------------------------------------------------
void initFont(Font& _rFont)
{
- _rFont.SetTransparent(TRUE);
+ _rFont.SetTransparent(sal_True);
_rFont.SetAlign(ALIGN_BASELINE);
}
// -----------------------------------------------------------------------
@@ -98,7 +98,7 @@ namespace
void setFont( const SvxFont& rNewFont, SvxFont& rImplFont )
{
rImplFont = rNewFont;
- rImplFont.SetTransparent( TRUE );
+ rImplFont.SetTransparent( sal_True );
rImplFont.SetAlign( ALIGN_BASELINE );
}
@@ -114,7 +114,7 @@ class FontPrevWin_Impl
SvxFont aFont;
Printer* pPrinter;
- BOOL bDelPrinter;
+ sal_Bool bDelPrinter;
Reference < XBreakIterator > xBreak;
SvULongs aTextWidth;
@@ -133,9 +133,9 @@ class FontPrevWin_Impl
long n100PercentFontWidth; // initial -1 -> not set yet
long n100PercentFontWidthCJK;
long n100PercentFontWidthCTL;
- UINT16 nFontWidthScale;
+ sal_uInt16 nFontWidthScale;
- BOOL bSelection : 1,
+ sal_Bool bSelection : 1,
bGetSelection : 1,
bUseResText : 1,
bTwoLines : 1,
@@ -147,13 +147,13 @@ class FontPrevWin_Impl
void _CheckScript();
public:
inline FontPrevWin_Impl() :
- pPrinter( NULL ), bDelPrinter( FALSE ),
+ pPrinter( NULL ), bDelPrinter( sal_False ),
pColor( NULL ), pBackColor( 0 ),
cStartBracket( 0 ), cEndBracket( 0 ), nFontWidthScale( 100 ),
- bSelection( FALSE ), bGetSelection( FALSE ), bUseResText( FALSE ),
- bTwoLines( FALSE ),
- bIsCJKUI( FALSE ), bIsCTLUI( FALSE ),
- bUseFontNameAsText( FALSE ), bTextInited( FALSE )
+ bSelection( sal_False ), bGetSelection( sal_False ), bUseResText( sal_False ),
+ bTwoLines( sal_False ),
+ bIsCJKUI( sal_False ), bIsCTLUI( sal_False ),
+ bUseFontNameAsText( sal_False ), bTextInited( sal_False )
{
Invalidate100PercentFontWidth();
}
@@ -170,9 +170,9 @@ public:
Size CalcTextSize( OutputDevice* pWin, OutputDevice* pPrt, SvxFont &rFont );
void DrawPrev( OutputDevice* pWin, Printer* pPrt, Point &rPt, SvxFont &rFont );
- BOOL SetFontWidthScale( UINT16 nScaleInPercent );
+ sal_Bool SetFontWidthScale( sal_uInt16 nScaleInPercent );
inline void Invalidate100PercentFontWidth();
- inline BOOL Is100PercentFontWidthValid() const;
+ inline sal_Bool Is100PercentFontWidthValid() const;
void ScaleFontWidth( const OutputDevice& rOutDev );
// scales rNonCJKFont and aCJKFont depending on nFontWidthScale and
// sets the 100%-Font-Widths
@@ -189,7 +189,7 @@ inline void FontPrevWin_Impl::Invalidate100PercentFontWidth()
n100PercentFontWidth = n100PercentFontWidthCJK = n100PercentFontWidthCTL = -1;
}
-inline BOOL FontPrevWin_Impl::Is100PercentFontWidthValid() const
+inline sal_Bool FontPrevWin_Impl::Is100PercentFontWidthValid() const
{
DBG_ASSERT( ( n100PercentFontWidth == -1 && n100PercentFontWidthCJK == -1 ) ||
( n100PercentFontWidth != -1 && n100PercentFontWidthCJK != -1 ) ||
@@ -228,8 +228,8 @@ void FontPrevWin_Impl::_CheckScript()
}
if( xBreak.is() )
{
- USHORT nScript = xBreak->getScriptType( aText, 0 );
- USHORT nChg = 0;
+ sal_uInt16 nScript = xBreak->getScriptType( aText, 0 );
+ sal_uInt16 nChg = 0;
if( com::sun::star::i18n::ScriptType::WEAK == nScript )
{
nChg = (xub_StrLen)xBreak->endOfScript( aText, nChg, nScript );
@@ -262,13 +262,13 @@ void FontPrevWin_Impl::_CheckScript()
aScriptChg.push_back( nChg );
}
aScriptType.Insert( nScript, nCnt );
- aTextWidth.Insert( ULONG(0), nCnt++ );
+ aTextWidth.Insert( sal_uIntPtr(0), nCnt++ );
if( nChg < aText.Len() )
nScript = xBreak->getScriptType( aText, nChg );
else
break;
- } while( TRUE );
+ } while( sal_True );
}
}
@@ -285,8 +285,8 @@ void FontPrevWin_Impl::_CheckScript()
Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter,
SvxFont &rFont )
{
- USHORT nScript;
- USHORT nIdx = 0;
+ sal_uInt16 nScript;
+ sal_uInt16 nIdx = 0;
xub_StrLen nStart = 0;
xub_StrLen nEnd;
size_t nCnt = aScriptChg.size();
@@ -310,7 +310,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter
do
{
SvxFont& rFnt = (nScript==com::sun::star::i18n::ScriptType::ASIAN) ? aCJKFont : ((nScript==com::sun::star::i18n::ScriptType::COMPLEX) ? aCTLFont : rFont);
- ULONG nWidth = rFnt.GetTxtSize( _pPrinter, aText, nStart, nEnd-nStart ).
+ sal_uIntPtr nWidth = rFnt.GetTxtSize( _pPrinter, aText, nStart, nEnd-nStart ).
Width();
aTextWidth[ nIdx++ ] = nWidth;
nTxtWidth += nWidth;
@@ -335,7 +335,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter
else
break;
}
- while( TRUE );
+ while( sal_True );
nHeight -= nAscent;
nCJKHeight -= nCJKAscent;
nCTLHeight -= nCTLAscent;
@@ -364,8 +364,8 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter,
Point &rPt, SvxFont &rFont )
{
Font aOldFont = _pPrinter->GetFont();
- USHORT nScript;
- USHORT nIdx = 0;
+ sal_uInt16 nScript;
+ sal_uInt16 nIdx = 0;
xub_StrLen nStart = 0;
xub_StrLen nEnd;
size_t nCnt = aScriptChg.size();
@@ -396,21 +396,21 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter,
else
break;
}
- while( TRUE );
+ while( sal_True );
_pPrinter->SetFont( aOldFont );
}
// -----------------------------------------------------------------------
-BOOL FontPrevWin_Impl::SetFontWidthScale( UINT16 nScale )
+sal_Bool FontPrevWin_Impl::SetFontWidthScale( sal_uInt16 nScale )
{
if( nFontWidthScale != nScale )
{
nFontWidthScale = nScale;
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
@@ -432,7 +432,7 @@ void FontPrevWin_Impl::ScaleFontWidth( const OutputDevice& rOutDev )
// class SvxFontPrevWindow -----------------------------------------------
-void SvxFontPrevWindow::InitSettings( BOOL bForeground, BOOL bBackground )
+void SvxFontPrevWindow::InitSettings( sal_Bool bForeground, sal_Bool bBackground )
{
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
@@ -471,13 +471,13 @@ SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) :
if ( !pImpl->pPrinter )
{
pImpl->pPrinter = new Printer;
- pImpl->bDelPrinter = TRUE;
+ pImpl->bDelPrinter = sal_True;
}
SetMapMode( MapMode( MAP_TWIP ) );
initFont(pImpl->aFont);
initFont(pImpl->aCJKFont);
initFont(pImpl->aCTLFont);
- InitSettings( TRUE, TRUE );
+ InitSettings( sal_True, sal_True );
SetBorderStyle( WINDOW_BORDER_MONO );
LanguageType eLanguage = Application::GetSettings().GetUILanguage();
@@ -528,9 +528,9 @@ SvxFont& SvxFontPrevWindow::GetCJKFont()
void SvxFontPrevWindow::StateChanged( StateChangedType nType )
{
if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
- InitSettings( TRUE, FALSE );
+ InitSettings( sal_True, sal_False );
else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
- InitSettings( FALSE, TRUE );
+ InitSettings( sal_False, sal_True );
Window::StateChanged( nType );
}
@@ -540,7 +540,7 @@ void SvxFontPrevWindow::StateChanged( StateChangedType nType )
void SvxFontPrevWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
- InitSettings( TRUE, TRUE );
+ InitSettings( sal_True, sal_True );
else
Window::DataChanged( rDCEvt );
}
@@ -561,14 +561,14 @@ const SvxFont& SvxFontPrevWindow::GetFont() const
void SvxFontPrevWindow::SetPreviewText( const ::rtl::OUString& rString )
{
pImpl->aText = rString;
- pImpl->bTextInited = TRUE;
+ pImpl->bTextInited = sal_True;
}
// -----------------------------------------------------------------------
void SvxFontPrevWindow::SetFontNameAsPreviewText()
{
- pImpl->bUseFontNameAsText = TRUE;
+ pImpl->bUseFontNameAsText = sal_True;
}
// -----------------------------------------------------------------------
@@ -640,7 +640,7 @@ void SvxFontPrevWindow::SetBackColor(const Color &rColor)
// -----------------------------------------------------------------------
-void SvxFontPrevWindow::UseResourceText( BOOL bUse )
+void SvxFontPrevWindow::UseResourceText( sal_Bool bUse )
{
pImpl->bUseResText = bUse;
}
@@ -663,7 +663,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& )
if ( pSh && !pImpl->bGetSelection && !pImpl->bUseFontNameAsText )
{
pImpl->aText = pSh->GetSelectionText();
- pImpl->bGetSelection = TRUE;
+ pImpl->bGetSelection = sal_True;
pImpl->bSelection = pImpl->aText.Len() != 0;
}
@@ -806,14 +806,14 @@ void SvxFontPrevWindow::Paint( const Rectangle& )
/* -----------------------------04.12.00 16:26--------------------------------
---------------------------------------------------------------------------*/
-BOOL SvxFontPrevWindow::IsTwoLines() const
+sal_Bool SvxFontPrevWindow::IsTwoLines() const
{
return pImpl->bTwoLines;
}
/* -----------------------------04.12.00 16:26--------------------------------
---------------------------------------------------------------------------*/
-void SvxFontPrevWindow::SetTwoLines(BOOL bSet)
+void SvxFontPrevWindow::SetTwoLines(sal_Bool bSet)
{
pImpl->bTwoLines = bSet;}
@@ -828,7 +828,7 @@ void SvxFontPrevWindow::SetBrackets(sal_Unicode cStart, sal_Unicode cEnd)
// -----------------------------------------------------------------------
-void SvxFontPrevWindow::SetFontWidthScale( UINT16 n )
+void SvxFontPrevWindow::SetFontWidthScale( sal_uInt16 n )
{
if( pImpl->SetFontWidthScale( n ) )
Invalidate();
diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx
index c62cea74c69a..ae2eb6c04098 100644
--- a/svx/source/dialog/fontwork.cxx
+++ b/svx/source/dialog/fontwork.cxx
@@ -60,7 +60,7 @@ SFX_IMPL_DOCKINGWINDOW( SvxFontWorkChildWindow, SID_FONTWORK );
SvxFontWorkControllerItem::SvxFontWorkControllerItem
(
- USHORT _nId,
+ sal_uInt16 _nId,
SvxFontWorkDialog& rDlg,
SfxBindings& rBindings
) :
@@ -77,7 +77,7 @@ SvxFontWorkControllerItem::SvxFontWorkControllerItem
|*
\************************************************************************/
-void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eState*/,
+void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*eState*/,
const SfxPoolItem* pItem )
{
switch ( GetId() )
@@ -190,7 +190,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS
SvxFontWorkChildWindow::SvxFontWorkChildWindow
(
Window* _pParent,
- USHORT nId,
+ sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo
) :
@@ -293,10 +293,10 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
// System-Metrik setzen
const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
- SetFieldUnit( aMtrFldDistance, eDlgUnit, TRUE );
- SetFieldUnit( aMtrFldTextStart, eDlgUnit, TRUE );
- SetFieldUnit( aMtrFldShadowX, eDlgUnit, TRUE );
- SetFieldUnit( aMtrFldShadowY, eDlgUnit, TRUE );
+ SetFieldUnit( aMtrFldDistance, eDlgUnit, sal_True );
+ SetFieldUnit( aMtrFldTextStart, eDlgUnit, sal_True );
+ SetFieldUnit( aMtrFldShadowX, eDlgUnit, sal_True );
+ SetFieldUnit( aMtrFldShadowY, eDlgUnit, sal_True );
if( eDlgUnit == FUNIT_MM )
{
aMtrFldDistance.SetSpinSize( 50 );
@@ -334,7 +334,7 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx,
SvxFontWorkDialog::~SvxFontWorkDialog()
{
- for (USHORT i = 0; i < CONTROLLER_COUNT; i++)
+ for (sal_uInt16 i = 0; i < CONTROLLER_COUNT; i++)
DELETEZ(pCtrlItems[i]);
}
@@ -404,7 +404,7 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem)
{
if ( pItem )
{
- USHORT nId = TBI_STYLE_OFF;
+ sal_uInt16 nId = TBI_STYLE_OFF;
switch ( pItem->GetValue() )
{
@@ -419,16 +419,16 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem)
// Make sure that there is allways exactly one checked toolbox item.
if ( pItem->GetValue() == XFT_NONE )
{
- aTbxStyle.CheckItem(TBI_STYLE_ROTATE, FALSE);
- aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, FALSE);
- aTbxStyle.CheckItem(TBI_STYLE_SLANTX, FALSE);
- aTbxStyle.CheckItem(TBI_STYLE_SLANTY, FALSE);
+ aTbxStyle.CheckItem(TBI_STYLE_ROTATE, sal_False);
+ aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, sal_False);
+ aTbxStyle.CheckItem(TBI_STYLE_SLANTX, sal_False);
+ aTbxStyle.CheckItem(TBI_STYLE_SLANTY, sal_False);
- aTbxStyle.CheckItem(TBI_STYLE_OFF, TRUE);
+ aTbxStyle.CheckItem(TBI_STYLE_OFF, sal_True);
}
else
{
- aTbxStyle.CheckItem(TBI_STYLE_OFF, FALSE);
+ aTbxStyle.CheckItem(TBI_STYLE_OFF, sal_False);
aTbxStyle.CheckItem(nId);
}
@@ -448,7 +448,7 @@ void SvxFontWorkDialog::SetAdjust_Impl(const XFormTextAdjustItem* pItem)
{
if ( pItem )
{
- USHORT nId;
+ sal_uInt16 nId;
aTbxAdjust.Enable();
aMtrFldDistance.Enable();
@@ -537,7 +537,7 @@ void SvxFontWorkDialog::SetStdForm_Impl(const XFormTextStdFormItem* pItem)
if ( pItem->GetValue() != XFTFORM_NONE )
aFormSet.SelectItem(
- sal::static_int_cast< USHORT >(pItem->GetValue()));
+ sal::static_int_cast< sal_uInt16 >(pItem->GetValue()));
}
else
aFormSet.Disable();
@@ -574,11 +574,11 @@ void SvxFontWorkDialog::SetOutline_Impl(const XFormTextOutlineItem* pItem)
\************************************************************************/
void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem,
- BOOL bRestoreValues)
+ sal_Bool bRestoreValues)
{
if ( pItem )
{
- USHORT nId;
+ sal_uInt16 nId;
aTbxShadow.Enable();
@@ -709,7 +709,7 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem)
if ( pItem && !aMtrFldShadowX.HasChildPathFocus() )
{
// #i19251#
- // INT32 nValue = pItem->GetValue();
+ // sal_Int32 nValue = pItem->GetValue();
// #i19251#
// The two involved fields/items are used double and contain/give different
@@ -764,7 +764,7 @@ void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem)
IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG )
{
- USHORT nId = aTbxStyle.GetCurItemId();
+ sal_uInt16 nId = aTbxStyle.GetCurItemId();
// Execute this block when a different toolbox item has been clicked or
// when the off item has been clicked. The later is necessary to
@@ -796,7 +796,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG )
{
- USHORT nId = aTbxAdjust.GetCurItemId();
+ sal_uInt16 nId = aTbxAdjust.GetCurItemId();
if ( nId == TBI_ADJUST_MIRROR )
{
@@ -827,7 +827,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG )
{
- USHORT nId = aTbxShadow.GetCurItemId();
+ sal_uInt16 nId = aTbxShadow.GetCurItemId();
if ( nId == TBI_SHOWFORM )
{
@@ -860,7 +860,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG )
XFormTextShadowItem aItem(eShadow);
GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHADOW, SFX_CALLMODE_RECORD, &aItem, 0L );
- SetShadow_Impl(&aItem, TRUE);
+ SetShadow_Impl(&aItem, sal_True);
}
return 0;
}
@@ -888,16 +888,16 @@ IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG )
const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit();
if( eDlgUnit != aMtrFldDistance.GetUnit() )
{
- SetFieldUnit( aMtrFldDistance, eDlgUnit, TRUE );
- SetFieldUnit( aMtrFldTextStart, eDlgUnit, TRUE );
+ SetFieldUnit( aMtrFldDistance, eDlgUnit, sal_True );
+ SetFieldUnit( aMtrFldTextStart, eDlgUnit, sal_True );
aMtrFldDistance.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
aMtrFldTextStart.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
}
if( eDlgUnit != aMtrFldShadowX.GetUnit() &&
aTbxShadow.IsItemChecked( TBI_SHADOW_NORMAL ) )
{
- SetFieldUnit( aMtrFldShadowX, eDlgUnit, TRUE );
- SetFieldUnit( aMtrFldShadowY, eDlgUnit, TRUE );
+ SetFieldUnit( aMtrFldShadowX, eDlgUnit, sal_True );
+ SetFieldUnit( aMtrFldShadowY, eDlgUnit, sal_True );
aMtrFldShadowX.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
aMtrFldShadowY.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 );
}
@@ -984,7 +984,7 @@ void SvxFontWorkDialog::SetColorTable(const XColorTable* pTable)
|*
\************************************************************************/
-void SvxFontWorkDialog::SetActive(BOOL /*bActivate*/)
+void SvxFontWorkDialog::SetActive(sal_Bool /*bActivate*/)
{
}
@@ -1005,7 +1005,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
Rectangle aRect;
XFormTextAdjust eAdjust = XFT_AUTOSIZE;
-//-/ rOldObj.TakeAttributes(aAttr, TRUE, FALSE);
+//-/ rOldObj.TakeAttributes(aAttr, sal_True, sal_False);
aAttr.Put(rOldObj.GetMergedItemSet());
const XFormTextStdFormItem& rOldForm = (const XFormTextStdFormItem&)
@@ -1088,8 +1088,8 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
basegfx::B2DPolyPolygon aPolyPolygon;
basegfx::B2DPolygon aLine;
long nR = aRect.GetWidth() / 2;
- basegfx::B2DPolygon aTopArc(XPolygon(aCenter, -nR, nR, 50, 1750, FALSE).getB2DPolygon());
- basegfx::B2DPolygon aBottomArc(XPolygon(aCenter, -nR, nR, 1850, 3550, FALSE).getB2DPolygon());
+ basegfx::B2DPolygon aTopArc(XPolygon(aCenter, -nR, nR, 50, 1750, sal_False).getB2DPolygon());
+ basegfx::B2DPolygon aBottomArc(XPolygon(aCenter, -nR, nR, 1850, 3550, sal_False).getB2DPolygon());
// Polygone schliessen
aTopArc.setClosed(true);
@@ -1119,7 +1119,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
if ( eForm == XFTFORM_BUTTON4 )
{
- basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 950, 2650, FALSE).getB2DPolygon());
+ basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 950, 2650, sal_False).getB2DPolygon());
aNewArc.setClosed(true);
aPolyPolygon.append(aNewArc);
eAdjust = XFT_CENTER;
@@ -1142,7 +1142,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
if ( eForm == XFTFORM_BUTTON4 )
{
- basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 2750, 850, FALSE).getB2DPolygon());
+ basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 2750, 850, sal_False).getB2DPolygon());
aNewArc.setClosed(true);
aPolyPolygon.append(aNewArc);
}
@@ -1176,7 +1176,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
rView.BegUndo( SVX_RESSTR( RID_SVXSTR_FONTWORK_UNDOCREATE ) );
OutlinerParaObject* pPara = rOldObj.GetOutlinerParaObject();
- BOOL bHide = TRUE;
+ sal_Bool bHide = sal_True;
if ( pPara != NULL )
{
@@ -1184,9 +1184,9 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV,
pNewObj->SetOutlinerParaObject(pPara);
}
else
- bHide = FALSE;
+ bHide = sal_False;
- rView.ReplaceObjectAtView(&rOldObj, rPV, pNewObj, TRUE);
+ rView.ReplaceObjectAtView(&rOldObj, rPV, pNewObj, sal_True);
pNewObj->SetLayer(rOldObj.GetLayer());
aAttr.Put(XFormTextHideFormItem(bHide));
aAttr.Put(XFormTextAdjustItem(eAdjust));
@@ -1229,8 +1229,8 @@ void SvxFontWorkDialog::ApplyImageList()
ResMgr* _pMgr = &DIALOG_MGR();
- USHORT nBitmapResId = bHighContrast ? RID_SVXBMP_FONTWORK_FORM1_H : RID_SVXBMP_FONTWORK_FORM1;
- USHORT nTextResId = RID_SVXSTR_FONTWORK_FORM1;
+ sal_uInt16 nBitmapResId = bHighContrast ? RID_SVXBMP_FONTWORK_FORM1_H : RID_SVXBMP_FONTWORK_FORM1;
+ sal_uInt16 nTextResId = RID_SVXSTR_FONTWORK_FORM1;
bool bInit = aFormSet.GetItemCount() == 0;
@@ -1244,7 +1244,7 @@ void SvxFontWorkDialog::ApplyImageList()
*/
}
- USHORT i;
+ sal_uInt16 i;
for( i = 1; i < 13; i++, nTextResId++, nBitmapResId++ )
{
if( bInit )
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx
index 8d9ebac5a5aa..45ceac57c564 100644
--- a/svx/source/dialog/framelink.cxx
+++ b/svx/source/dialog/framelink.cxx
@@ -748,7 +748,7 @@ inline Point lclToMapUnit( long nSubXPos, long nSubYPos )
/** Returns a polygon constructed from a vector of points. */
inline Polygon lclCreatePolygon( const PointVec& rPoints )
{
- return Polygon( static_cast< USHORT >( rPoints.size() ), &rPoints[ 0 ] );
+ return Polygon( static_cast< sal_uInt16 >( rPoints.size() ), &rPoints[ 0 ] );
}
/** Returns a polygon constructed from the four passed points. */
@@ -1230,9 +1230,9 @@ void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWid
{
maColor = rBorder.GetColor();
- USHORT nPrim = rBorder.GetOutWidth();
- USHORT nDist = rBorder.GetDistance();
- USHORT nSecn = rBorder.GetInWidth();
+ sal_uInt16 nPrim = rBorder.GetOutWidth();
+ sal_uInt16 nDist = rBorder.GetDistance();
+ sal_uInt16 nSecn = rBorder.GetInWidth();
if( !nSecn ) // no or single frame border
{
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index 16bc17976aa4..d25473f32570 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -111,7 +111,7 @@ FrameSelFlags lclGetFlagFromType( FrameBorderType eBorder )
}
/** Converts an SvxBorderLine line width (in twips) to a pixel line width. */
-inline sal_uInt16 lclGetPixel( USHORT nWidth )
+inline sal_uInt16 lclGetPixel( sal_uInt16 nWidth )
{
// convert all core styles expect 0 to a visible UI style (at least 1 pixel), map 1pt to 1pixel
return nWidth ? std::min< sal_uInt16 >( std::max< sal_uInt16 >( (nWidth + 5) / 20, 1 ), FRAMESEL_GEOM_WIDTH ) : 0;
@@ -219,7 +219,7 @@ void FrameBorder::SetKeyboardNeighbors(
meKeyBottom = eBottom;
}
-FrameBorderType FrameBorder::GetKeyboardNeighbor( USHORT nKeyCode ) const
+FrameBorderType FrameBorder::GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const
{
FrameBorderType eBorder = FRAMEBORDER_NONE;
switch( nKeyCode )
@@ -426,7 +426,7 @@ void FrameSelectorImpl::InitBorderGeometry()
aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Bottom() - nDiagFocusOffsY ) );
aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Bottom() + mnFocusOffs ) );
aFocusVec.push_back( Point( aRect.Right() - nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs ) );
- maTLBR.AddFocusPolygon( Polygon( static_cast< USHORT >( aFocusVec.size() ), &aFocusVec[ 0 ] ) );
+ maTLBR.AddFocusPolygon( Polygon( static_cast< sal_uInt16 >( aFocusVec.size() ), &aFocusVec[ 0 ] ) );
aFocusVec.clear();
aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Top() + nDiagFocusOffsY ) );
@@ -435,7 +435,7 @@ void FrameSelectorImpl::InitBorderGeometry()
aFocusVec.push_back( Point( aRect.Left() - mnFocusOffs, aRect.Bottom() - nDiagFocusOffsY ) );
aFocusVec.push_back( Point( aRect.Left() - mnFocusOffs, aRect.Bottom() + mnFocusOffs ) );
aFocusVec.push_back( Point( aRect.Left() + nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs ) );
- maBLTR.AddFocusPolygon( Polygon( static_cast< USHORT >( aFocusVec.size() ), &aFocusVec[ 0 ] ) );
+ maBLTR.AddFocusPolygon( Polygon( static_cast< sal_uInt16 >( aFocusVec.size() ), &aFocusVec[ 0 ] ) );
}
}
@@ -577,7 +577,7 @@ void FrameSelectorImpl::DrawArrows( const FrameBorder& rBorder )
long nTLPos = 0;
long nBRPos = mnCtrlSize - mnArrowSize;
Point aPos1, aPos2;
- USHORT nImgId1 = 0, nImgId2 = 0;
+ sal_uInt16 nImgId1 = 0, nImgId2 = 0;
switch( rBorder.GetType() )
{
case FRAMEBORDER_LEFT:
@@ -606,7 +606,7 @@ void FrameSelectorImpl::DrawArrows( const FrameBorder& rBorder )
}
// Arrow or marker? Do not draw arrows into disabled control.
- USHORT nSelectAdd = (mrFrameSel.IsEnabled() && rBorder.IsSelected()) ? 0 : 8;
+ sal_uInt16 nSelectAdd = (mrFrameSel.IsEnabled() && rBorder.IsSelected()) ? 0 : 8;
maVirDev.DrawImage( aPos1, maILArrows.GetImage( nImgId1 + nSelectAdd ) );
maVirDev.DrawImage( aPos2, maILArrows.GetImage( nImgId2 + nSelectAdd ) );
}
@@ -680,7 +680,7 @@ void FrameSelectorImpl::DrawAllTrackingRects()
aPPoly.Insert( Polygon( Rectangle( maVirDevPos, maVirDev.GetOutputSizePixel() ) ) );
aPPoly.Optimize( POLY_OPTIMIZE_CLOSE );
- for( USHORT nIdx = 0, nCount = aPPoly.Count(); nIdx < nCount; ++nIdx )
+ for( sal_uInt16 nIdx = 0, nCount = aPPoly.Count(); nIdx < nCount; ++nIdx )
mrFrameSel.InvertTracking( aPPoly.GetObject( nIdx ), SHOWTRACK_SMALL | SHOWTRACK_WINDOW );
}
@@ -862,7 +862,7 @@ void FrameSelector::HideAllBorders()
mxImpl->SetBorderState( **aIt, FRAMESTATE_HIDE );
}
-bool FrameSelector::GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnSecn ) const
+bool FrameSelector::GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSecn ) const
{
VisFrameBorderCIter aIt( mxImpl->maEnabBorders );
if( !aIt.Is() )
@@ -941,7 +941,7 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect )
mxImpl->SelectBorder( **aIt, bSelect );
}
-void FrameSelector::SetStyleToSelection( USHORT nPrim, USHORT nDist, USHORT nSecn )
+void FrameSelector::SetStyleToSelection( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSecn )
{
mxImpl->maCurrStyle.SetOutWidth( nPrim );
mxImpl->maCurrStyle.SetDistance( nDist );
@@ -1111,7 +1111,7 @@ void FrameSelector::KeyInput( const KeyEvent& rKEvt )
KeyCode aKeyCode = rKEvt.GetKeyCode();
if( !aKeyCode.GetModifier() )
{
- USHORT nCode = aKeyCode.GetCode();
+ sal_uInt16 nCode = aKeyCode.GetCode();
switch( nCode )
{
case KEY_SPACE:
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 7c0794d8bb6e..8e37aa1f33a8 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -84,8 +84,8 @@ GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) :
aMap100 ( MAP_100TH_MM ),
eObjKind ( OBJ_NONE ),
nPolyEdit ( 0 ),
- bEditMode ( FALSE ),
- bSdrMode ( FALSE ),
+ bEditMode ( sal_False ),
+ bSdrMode ( sal_False ),
mpAccContext ( NULL ),
pModel ( NULL ),
pView ( NULL )
@@ -97,7 +97,7 @@ GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) :
SetWinStyle( nWinBits );
- EnableRTL( FALSE );
+ EnableRTL( sal_False );
}
@@ -113,9 +113,9 @@ GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) :
nWinStyle ( 0 ),
eObjKind ( OBJ_NONE ),
nPolyEdit ( 0 ),
- bEditMode ( FALSE ),
- bSdrMode ( FALSE ),
- bAnim ( FALSE ),
+ bEditMode ( sal_False ),
+ bSdrMode ( sal_False ),
+ bAnim ( sal_False ),
mpAccContext ( NULL ),
pModel ( NULL ),
pView ( NULL )
@@ -124,7 +124,7 @@ GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) :
aUpdateTimer.SetTimeout( 500 );
aUpdateTimer.SetTimeoutHdl( LINK( this, GraphCtrl, UpdateHdl ) );
aUpdateTimer.Start();
- EnableRTL( FALSE );
+ EnableRTL( sal_False );
}
@@ -207,12 +207,12 @@ void GraphCtrl::InitSdrModel()
// View anlegen
pView = new GraphCtrlView( pModel, this );
pView->SetWorkArea( Rectangle( Point(), aGraphSize ) );
- pView->EnableExtendedMouseEventDispatcher( TRUE );
+ pView->EnableExtendedMouseEventDispatcher( sal_True );
pView->ShowSdrPage(pView->GetModel()->GetPage(0));
// pView->ShowSdrPage(pView->GetModel()->GetPage(0));
- pView->SetFrameDragSingles( TRUE );
+ pView->SetFrameDragSingles( sal_True );
pView->SetMarkedPointsSmooth( SDRPATHSMOOTH_SYMMETRIC );
- pView->SetEditMode( TRUE );
+ pView->SetEditMode( sal_True );
// #i72889# set neeeded flags
pView->SetPagePaintingAllowed(false);
@@ -231,7 +231,7 @@ void GraphCtrl::InitSdrModel()
|*
\************************************************************************/
-void GraphCtrl::SetGraphic( const Graphic& rGraphic, BOOL bNewModel )
+void GraphCtrl::SetGraphic( const Graphic& rGraphic, sal_Bool bNewModel )
{
// Bitmaps dithern wir ggf. fuer die Anzeige
if ( !bAnim && ( rGraphic.GetType() == GRAPHIC_BITMAP ) )
@@ -402,7 +402,7 @@ void GraphCtrl::MarkListHasChanged()
void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
{
KeyCode aCode( rKEvt.GetKeyCode() );
- BOOL bProc = FALSE;
+ sal_Bool bProc = sal_False;
switch ( aCode.GetCode() )
{
@@ -412,7 +412,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
if ( bSdrMode )
{
pView->DeleteMarked();
- bProc = TRUE;
+ bProc = sal_True;
if( !pView->AreObjectsMarked() )
((Dialog*)GetParent())->GrabFocusToFirstControl();
}
@@ -445,7 +445,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
{
((Dialog*)GetParent())->GrabFocusToFirstControl();
}
- bProc = TRUE;
+ bProc = sal_True;
}
}
break;
@@ -466,7 +466,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
pView->UnmarkAllObj();
pView->MarkNextObj (bForward);
}
- bProc = TRUE;
+ bProc = sal_True;
}
else if(aCode.IsMod1())
{
@@ -489,7 +489,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
{
// #97016# mark last object
pView->UnmarkAllObj();
- pView->MarkNextObj(FALSE);
+ pView->MarkNextObj(sal_False);
bProc = true;
}
@@ -501,7 +501,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
if ( aCode.IsMod1() )
{
pView->UnmarkAllObj();
- pView->MarkNextObj(TRUE);
+ pView->MarkNextObj(sal_True);
bProc = true;
}
@@ -616,14 +616,14 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
if(pView->IsDragObj())
{
- FASTBOOL bWasNoSnap = rDragStat.IsNoSnap();
- BOOL bWasSnapEnabled = pView->IsSnapEnabled();
+ int bWasNoSnap = rDragStat.IsNoSnap();
+ sal_Bool bWasSnapEnabled = pView->IsSnapEnabled();
// switch snapping off
if(!bWasNoSnap)
- ((SdrDragStat&)rDragStat).SetNoSnap(TRUE);
+ ((SdrDragStat&)rDragStat).SetNoSnap(sal_True);
if(bWasSnapEnabled)
- pView->SetSnapEnabled(FALSE);
+ pView->SetSnapEnabled(sal_False);
pView->MovAction(aEndPoint);
pView->EndDragObj();
@@ -696,7 +696,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
}
}
- bProc = TRUE;
+ bProc = sal_True;
}
}
}
@@ -848,17 +848,17 @@ SdrObject* GraphCtrl::GetSelectedSdrObject() const
|*
\************************************************************************/
-void GraphCtrl::SetEditMode( const BOOL _bEditMode )
+void GraphCtrl::SetEditMode( const sal_Bool _bEditMode )
{
if ( bSdrMode )
{
bEditMode = _bEditMode;
pView->SetEditMode( bEditMode );
eObjKind = OBJ_NONE;
- pView->SetCurrentObj( sal::static_int_cast< UINT16 >( eObjKind ) );
+ pView->SetCurrentObj( sal::static_int_cast< sal_uInt16 >( eObjKind ) );
}
else
- bEditMode = FALSE;
+ bEditMode = sal_False;
}
@@ -868,7 +868,7 @@ void GraphCtrl::SetEditMode( const BOOL _bEditMode )
|*
\************************************************************************/
-void GraphCtrl::SetPolyEditMode( const USHORT _nPolyEdit )
+void GraphCtrl::SetPolyEditMode( const sal_uInt16 _nPolyEdit )
{
if ( bSdrMode && ( _nPolyEdit != nPolyEdit ) )
{
@@ -890,10 +890,10 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind )
{
if ( bSdrMode )
{
- bEditMode = FALSE;
+ bEditMode = sal_False;
pView->SetEditMode( bEditMode );
eObjKind = _eObjKind;
- pView->SetCurrentObj( sal::static_int_cast< UINT16 >( eObjKind ) );
+ pView->SetCurrentObj( sal::static_int_cast< sal_uInt16 >( eObjKind ) );
}
else
eObjKind = OBJ_NONE;
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 99d8d507f13c..53cead9f00cf 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -46,10 +46,10 @@
// - SvxGraphicFilter -
// --------------------
-ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject )
+sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject )
{
const Graphic& rGraphic = rFilterObject.GetGraphic();
- ULONG nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE;
+ sal_uIntPtr nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE;
if( rGraphic.GetType() == GRAPHIC_BITMAP )
{
@@ -63,7 +63,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
case( SID_GRFFILTER_INVERT ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -81,14 +81,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_SMOOTH ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -106,14 +106,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_SHARPEN ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -131,14 +131,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_REMOVENOISE ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -156,14 +156,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_SOBEL ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -181,17 +181,17 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_MOSAIC ):
{
- //CHINA001 GraphicFilterMosaic aDlg( pWindow, rGraphic, 4, 4, FALSE );
+ //CHINA001 GraphicFilterMosaic aDlg( pWindow, rGraphic, 4, 4, sal_False );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, FALSE, RID_SVX_GRFFILTER_DLG_MOSAIC);
+ AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, sal_False, RID_SVX_GRFFILTER_DLG_MOSAIC);
DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); //CHINA001 aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -233,7 +233,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
case( SID_GRFFILTER_POPART ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -251,7 +251,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
@@ -272,11 +272,11 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
case( SID_GRFFILTER_SOLARIZE ):
{
- //CHINA001 GraphicFilterSolarize aDlg( pWindow, rGraphic, 128, FALSE );
+ //CHINA001 GraphicFilterSolarize aDlg( pWindow, rGraphic, 128, sal_False );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterSolarize( pWindow, rGraphic, 128, FALSE, RID_SVX_GRFFILTER_DLG_SOLARIZE );
+ AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterSolarize( pWindow, rGraphic, 128, sal_False, RID_SVX_GRFFILTER_DLG_SOLARIZE );
DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); //CHINA001 aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -483,7 +483,7 @@ IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, p )
// ----------------
GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
- USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges ) :
+ sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges ) :
GraphicFilterDialog( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ),
maFtWidth ( this, SVX_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ),
maMtrWidth ( this, SVX_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ),
@@ -556,7 +556,7 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
// ------------------
GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
- BYTE cGreyThreshold, BOOL bInvert ) :
+ sal_uInt8 cGreyThreshold, sal_Bool bInvert ) :
GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ),
maFtThreshold ( this, SVX_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ),
maMtrThreshold ( this, SVX_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ),
@@ -620,7 +620,7 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
// ----------------------
GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
- USHORT nSepiaPercent ) :
+ sal_uInt16 nSepiaPercent ) :
GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ),
maFtSepia ( this, SVX_RES( DLG_FILTERSEPIA_FT_SEPIA ) ),
maMtrSepia ( this, SVX_RES( DLG_FILTERSEPIA_MTR_SEPIA ) )
@@ -670,7 +670,7 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
// -----------------------
GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraphic,
- USHORT nPosterCount ) :
+ sal_uInt16 nPosterCount ) :
GraphicFilterDialog ( pParent, SVX_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ),
maFtPoster ( this, SVX_RES( DLG_FILTERPOSTER_FT_POSTER ) ),
maNumPoster ( this, SVX_RES( DLG_FILTERPOSTER_NUM_POSTER ) )
@@ -696,7 +696,7 @@ Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic,
double fScaleX, double fScaleY )
{
Graphic aRet;
- const USHORT nPosterCount = GetPosterColorCount();
+ const sal_uInt16 nPosterCount = GetPosterColorCount();
if( rGraphic.IsAnimated() )
{
@@ -756,7 +756,7 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic,
double fScaleX, double fScaleY )
{
Graphic aRet;
- USHORT nAzim, nElev;
+ sal_uInt16 nAzim, nElev;
switch( maCtlLight.GetActualRP() )
{
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 2da5df325dfa..67e34801ca34 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -71,7 +71,7 @@ static const long MINBODY = 56; // 1mm in twips rounded
static const long DEF_DIST_WRITER = 500; // 5mm (Writer)
static const long DEF_DIST_CALC = 250; // 2,5mm (Calc)
-static USHORT pRanges[] =
+static sal_uInt16 pRanges[] =
{
SID_ATTR_BRUSH, SID_ATTR_BRUSH,
SID_ATTR_BORDER_OUTER, SID_ATTR_BORDER_OUTER,
@@ -96,7 +96,7 @@ static USHORT pRanges[] =
// gibt den Bereich der Which-Werte zurueck
-USHORT* SvxHeaderPage::GetRanges()
+sal_uInt16* SvxHeaderPage::GetRanges()
{
return pRanges;
}
@@ -110,7 +110,7 @@ SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet& rSet )
//------------------------------------------------------------------------
-USHORT* SvxFooterPage::GetRanges()
+sal_uInt16* SvxFooterPage::GetRanges()
{
return pRanges;
}
@@ -142,7 +142,7 @@ SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) :
// -----------------------------------------------------------------------
-SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, USHORT nSetId ) :
+SvxHFPage::SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rAttr, sal_uInt16 nSetId ) :
SfxTabPage( pParent, SVX_RES( nResId ), rAttr ),
@@ -164,12 +164,12 @@ SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, U
nId ( nSetId ),
pBBSet ( NULL ),
- bDisableQueryBox ( FALSE ),
- bEnableBackgroundSelector ( TRUE )
+ bDisableQueryBox ( sal_False ),
+ bEnableBackgroundSelector ( sal_True )
{
InitHandler();
- aBspWin.EnableRTL( FALSE );
+ aBspWin.EnableRTL( sal_False );
// diese Page braucht ExchangeSupport
SetExchangeSupport();
@@ -193,20 +193,20 @@ SvxHFPage::~SvxHFPage()
// -----------------------------------------------------------------------
-BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet )
{
- const USHORT nWSize = GetWhich( SID_ATTR_PAGE_SIZE );
- const USHORT nWLRSpace = GetWhich( SID_ATTR_LRSPACE );
- const USHORT nWULSpace = GetWhich( SID_ATTR_ULSPACE );
- const USHORT nWOn = GetWhich( SID_ATTR_PAGE_ON );
- const USHORT nWDynamic = GetWhich( SID_ATTR_PAGE_DYNAMIC );
- const USHORT nWDynSpacing = GetWhich( SID_ATTR_HDFT_DYNAMIC_SPACING );
- const USHORT nWShared = GetWhich( SID_ATTR_PAGE_SHARED );
- const USHORT nWBrush = GetWhich( SID_ATTR_BRUSH );
- const USHORT nWBox = GetWhich( SID_ATTR_BORDER_OUTER );
- const USHORT nWBoxInfo = GetWhich( SID_ATTR_BORDER_INNER );
- const USHORT nWShadow = GetWhich( SID_ATTR_BORDER_SHADOW );
- const USHORT aWhichTab[] = { nWSize, nWSize,
+ const sal_uInt16 nWSize = GetWhich( SID_ATTR_PAGE_SIZE );
+ const sal_uInt16 nWLRSpace = GetWhich( SID_ATTR_LRSPACE );
+ const sal_uInt16 nWULSpace = GetWhich( SID_ATTR_ULSPACE );
+ const sal_uInt16 nWOn = GetWhich( SID_ATTR_PAGE_ON );
+ const sal_uInt16 nWDynamic = GetWhich( SID_ATTR_PAGE_DYNAMIC );
+ const sal_uInt16 nWDynSpacing = GetWhich( SID_ATTR_HDFT_DYNAMIC_SPACING );
+ const sal_uInt16 nWShared = GetWhich( SID_ATTR_PAGE_SHARED );
+ const sal_uInt16 nWBrush = GetWhich( SID_ATTR_BRUSH );
+ const sal_uInt16 nWBox = GetWhich( SID_ATTR_BORDER_OUTER );
+ const sal_uInt16 nWBoxInfo = GetWhich( SID_ATTR_BORDER_INNER );
+ const sal_uInt16 nWShadow = GetWhich( SID_ATTR_BORDER_SHADOW );
+ const sal_uInt16 aWhichTab[] = { nWSize, nWSize,
nWLRSpace, nWLRSpace,
nWULSpace, nWULSpace,
nWOn, nWOn,
@@ -252,15 +252,15 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
// Raender
SvxLRSpaceItem aLR( nWLRSpace );
- aLR.SetLeft( (USHORT)GetCoreValue( aLMEdit, eUnit ) );
- aLR.SetRight( (USHORT)GetCoreValue( aRMEdit, eUnit ) );
+ aLR.SetLeft( (sal_uInt16)GetCoreValue( aLMEdit, eUnit ) );
+ aLR.SetRight( (sal_uInt16)GetCoreValue( aRMEdit, eUnit ) );
aSet.Put( aLR );
SvxULSpaceItem aUL( nWULSpace );
if ( nId == SID_ATTR_PAGE_HEADERSET )
- aUL.SetLower( (USHORT)nDist );
+ aUL.SetLower( (sal_uInt16)nDist );
else
- aUL.SetUpper( (USHORT)nDist );
+ aUL.SetUpper( (sal_uInt16)nDist );
aSet.Put( aUL );
// Hintergrund und Umrandung?
@@ -272,7 +272,7 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
const SfxPoolItem* pItem;
if ( SFX_ITEM_SET ==
- GetItemSet().GetItemState( GetWhich( nId ), FALSE, &pItem ) )
+ GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) )
{
_pSet = &( (SvxSetItem*)pItem )->GetItemSet();
@@ -291,7 +291,7 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet )
SvxSetItem aSetItem( GetWhich( nId ), aSet );
rSet.Put( aSetItem );
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------
@@ -308,7 +308,7 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
//
const SvxSetItem* pSetItem = 0;
- if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), FALSE,
+ if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), sal_False,
(const SfxPoolItem**)&pSetItem ) )
{
const SfxItemSet& rHeaderSet = pSetItem->GetItemSet();
@@ -372,9 +372,9 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
if ( !pSetItem )
{
- aTurnOnBox.Check( FALSE );
- aHeightDynBtn.Check( TRUE );
- aCntSharedBox.Check( TRUE );
+ aTurnOnBox.Check( sal_False );
+ aHeightDynBtn.Check( sal_True );
+ aCntSharedBox.Check( sal_True );
}
TurnOnHdl(0);
@@ -388,10 +388,10 @@ void SvxHFPage::Reset( const SfxItemSet& rSet )
aCntSharedBox.SaveValue();
RangeHdl( 0 );
- USHORT nHtmlMode = 0;
+ sal_uInt16 nHtmlMode = 0;
const SfxPoolItem* pItem = 0;
SfxObjectShell* pShell;
- if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, FALSE, &pItem) ||
+ if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem) ||
( 0 != (pShell = SfxObjectShell::Current()) &&
0 != (pItem = pShell->GetItem(SID_HTML_MODE))))
{
@@ -444,7 +444,7 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox )
aRMLbl.Enable();
aRMEdit.Enable();
- USHORT nUsage = aBspWin.GetUsage();
+ sal_uInt16 nUsage = aBspWin.GetUsage();
if( nUsage == SVX_PAGE_RIGHT || nUsage == SVX_PAGE_LEFT )
aCntSharedBox.Disable();
@@ -454,16 +454,16 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox )
}
else
{
- BOOL bDelete = TRUE;
+ sal_Bool bDelete = sal_True;
- if ( !bDisableQueryBox && pBox && aTurnOnBox.GetSavedValue() == TRUE )
+ if ( !bDisableQueryBox && pBox && aTurnOnBox.GetSavedValue() == sal_True )
bDelete = ( QueryBox( this, SVX_RES( RID_SVXQBX_DELETE_HEADFOOT ) ).Execute() == RET_YES );
if ( bDelete )
{
aDistFT.Disable();
aDistEdit.Disable();
- aDynSpacingCB.Enable(FALSE);
+ aDynSpacingCB.Enable(sal_False);
aHeightFT.Disable();
aHeightEdit.Disable();
aHeightDynBtn.Disable();
@@ -522,10 +522,10 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
if ( !pBBSet )
{
// nur die n"otigen Items f"uer Umrandung und Hintergrund benutzen
- USHORT nBrush = GetWhich( SID_ATTR_BRUSH );
- USHORT nOuter = GetWhich( SID_ATTR_BORDER_OUTER );
- USHORT nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False );
- USHORT nShadow = GetWhich( SID_ATTR_BORDER_SHADOW );
+ sal_uInt16 nBrush = GetWhich( SID_ATTR_BRUSH );
+ sal_uInt16 nOuter = GetWhich( SID_ATTR_BORDER_OUTER );
+ sal_uInt16 nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False );
+ sal_uInt16 nShadow = GetWhich( SID_ATTR_BORDER_SHADOW );
// einen leeren Set erzeugenc
pBBSet = new SfxItemSet( *GetItemSet().GetPool(), nBrush, nBrush,
@@ -534,12 +534,12 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
const SfxPoolItem* pItem;
if ( SFX_ITEM_SET ==
- GetItemSet().GetItemState( GetWhich( nId ), FALSE, &pItem ) )
+ GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) )
// wenn es schon einen gesetzen Set gibt, dann diesen benutzen
pBBSet->Put( ( (SvxSetItem*)pItem)->GetItemSet() );
if ( SFX_ITEM_SET ==
- GetItemSet().GetItemState( nInner, FALSE, &pItem ) )
+ GetItemSet().GetItemState( nInner, sal_False, &pItem ) )
// das gesetze InfoItem wird immer ben"otigt
pBBSet->Put( *pItem );
}
@@ -565,7 +565,7 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG )
//----------------------------------------------------------------
- USHORT nWhich = GetWhich( SID_ATTR_BRUSH );
+ sal_uInt16 nWhich = GetWhich( SID_ATTR_BRUSH );
if ( pBBSet->GetItemState( nWhich ) == SFX_ITEM_SET )
{
@@ -628,12 +628,12 @@ void SvxHFPage::UpdateExample()
void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
{
- USHORT nWhich = GetWhich( SID_ATTR_PAGE_HEADERSET );
+ sal_uInt16 nWhich = GetWhich( SID_ATTR_PAGE_HEADERSET );
- if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET )
+ if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
{
const SvxSetItem& rSetItem =
- (const SvxSetItem&)rSet.Get( nWhich, FALSE );
+ (const SvxSetItem&)rSet.Get( nWhich, sal_False );
const SfxItemSet& rTmpSet = rSetItem.GetItemSet();
const SfxBoolItem& rOn =
(const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) );
@@ -660,10 +660,10 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet )
nWhich = GetWhich( SID_ATTR_PAGE_FOOTERSET );
- if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET )
+ if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET )
{
const SvxSetItem& rSetItem =
- (const SvxSetItem&)rSet.Get( nWhich, FALSE );
+ (const SvxSetItem&)rSet.Get( nWhich, sal_False );
const SfxItemSet& rTmpSet = rSetItem.GetItemSet();
const SfxBoolItem& rOn =
(const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) );
@@ -750,7 +750,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
aBspWin.SetBottom( 0 );
}
- USHORT nUsage = SVX_PAGE_ALL;
+ sal_uInt16 nUsage = SVX_PAGE_ALL;
pItem = GetItem( rSet, SID_ATTR_PAGE );
if ( pItem )
@@ -776,7 +776,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
const SvxSetItem* pSetItem = 0;
if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_HEADERSET ),
- FALSE,
+ sal_False,
(const SfxPoolItem**)&pSetItem ) )
{
const SfxItemSet& rHeaderSet = pSetItem->GetItemSet();
@@ -797,7 +797,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
aBspWin.SetHdDist( nDist );
aBspWin.SetHdLeft( rLR.GetLeft() );
aBspWin.SetHdRight( rLR.GetRight() );
- aBspWin.SetHeader( TRUE );
+ aBspWin.SetHeader( sal_True );
}
else
pSetItem = 0;
@@ -805,7 +805,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
if ( !pSetItem )
{
- aBspWin.SetHeader( FALSE );
+ aBspWin.SetHeader( sal_False );
if ( SID_ATTR_PAGE_HEADERSET == nId )
aCntSharedBox.Disable();
@@ -813,7 +813,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
pSetItem = 0;
if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_FOOTERSET ),
- FALSE,
+ sal_False,
(const SfxPoolItem**)&pSetItem ) )
{
const SfxItemSet& rFooterSet = pSetItem->GetItemSet();
@@ -834,7 +834,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
aBspWin.SetFtDist( nDist );
aBspWin.SetFtLeft( rLR.GetLeft() );
aBspWin.SetFtRight( rLR.GetRight() );
- aBspWin.SetFooter( TRUE );
+ aBspWin.SetFooter( sal_True );
}
else
pSetItem = 0;
@@ -842,7 +842,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
if ( !pSetItem )
{
- aBspWin.SetFooter( FALSE );
+ aBspWin.SetFooter( sal_False );
if ( SID_ATTR_PAGE_FOOTERSET == nId )
aCntSharedBox.Disable();
@@ -852,7 +852,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
if ( pItem && pItem->ISA(SfxBoolItem) )
{
- aBspWin.SetTable( TRUE );
+ aBspWin.SetTable( sal_True );
aBspWin.SetHorz( ( (SfxBoolItem*)pItem )->GetValue() );
}
@@ -860,7 +860,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet )
if ( pItem && pItem->ISA(SfxBoolItem) )
{
- aBspWin.SetTable( TRUE );
+ aBspWin.SetTable( sal_True );
aBspWin.SetVert( ( (SfxBoolItem*)pItem )->GetValue() );
}
ResetBackground_Impl( rSet );
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index dcca52044531..3b15bc245779 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -57,7 +57,7 @@ struct MyStruct
SfxWorkWindow* pWorkWin;
};
-SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId,
+SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo ) :
SfxChildWindow( _pParent, nId ),
@@ -71,7 +71,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId,
mpDlg = pFact->CreateSvxHpLinkDlg( _pParent, pBindings, SID_HYPERLINK_DIALOG );
DBG_ASSERT(mpDlg, "Dialogdiet fail!");//CHINA001
pWindow = mpDlg->GetWindow();
- ((MyStruct*)pImp)->bVisible = FALSE;
+ ((MyStruct*)pImp)->bVisible = sal_False;
Window* pTopWindow = 0;
if ( pInfo->aSize.Width() != 0 && pInfo->aSize.Height() != 0 &&
@@ -92,7 +92,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId,
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
- SetHideNotDelete( TRUE );
+ SetHideNotDelete( sal_True );
}
SfxChildWinInfo SvxHlinkDlgWrapper::GetInfo() const
diff --git a/svx/source/dialog/hyprdlg.hxx b/svx/source/dialog/hyprdlg.hxx
index 51897af95da8..d29a4f5969e1 100644
--- a/svx/source/dialog/hyprdlg.hxx
+++ b/svx/source/dialog/hyprdlg.hxx
@@ -96,17 +96,17 @@ private:
String sSearchTitle;
PopupMenu aLinkPopup;
PopupMenu *pTargetMenu;
- BOOL bNoDoc;
- BOOL bSend;
- BOOL bHasOldName;
+ sal_Bool bNoDoc;
+ sal_Bool bSend;
+ sal_Bool bHasOldName;
long nMaxWidth;
long nMinWidth;
long nMaxHeight;
- BOOL bHtmlMode;
+ sal_Bool bHtmlMode;
SfxImageManager* mpManager;
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
// DockingWindow
@@ -114,7 +114,7 @@ private:
virtual void Resizing(Size& rSize);
// Drag&Drop
- BOOL GetDragData(USHORT nItem, ULONG nDDFormatId, String& rBuffer);
+ sal_Bool GetDragData(sal_uInt16 nItem, sal_uIntPtr nDDFormatId, String& rBuffer);
DECL_LINK(TBClickHdl, ToolBox *);
DECL_LINK(TBSelectHdl, ToolBox *);
@@ -127,9 +127,9 @@ private:
void OpenDoc( const String& rURL, SfxViewFrame* pViewFrame );
void EnableLink();
- void SendToApp(USHORT nType);
+ void SendToApp(sal_uInt16 nType);
void AddToHistory(const String& rName, const String& rURL);
- void TargetMenu(const String& rSelEntry, BOOL bExecute);
+ void TargetMenu(const String& rSelEntry, sal_Bool bExecute);
String GetSelTarget();
void SetImages();
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
index b8f150736ea1..dc7b438db0af 100644
--- a/svx/source/dialog/hyprlink.cxx
+++ b/svx/source/dialog/hyprlink.cxx
@@ -117,10 +117,10 @@ SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) :
aLinkPopup ( SVX_RES( RID_SVXMN_HYPERLINK ) ),
pTargetMenu ( NULL ),
- bNoDoc ( TRUE ),
- bSend ( FALSE ),
- bHasOldName ( FALSE ),
- bHtmlMode ( FALSE )
+ bNoDoc ( sal_True ),
+ bSend ( sal_False ),
+ bHasOldName ( sal_False ),
+ bHtmlMode ( sal_False )
{
FreeResource();
@@ -234,14 +234,14 @@ void SvxHyperlinkDlg::Resize()
if (nNewUrlWidth && nNewNameWidth) // Flackern reduzieren
{
- SetUpdateMode(FALSE);
+ SetUpdateMode(sal_False);
// Comboboxen resizen
aUrlCB.DoResize(nNewUrlWidth);
aNameCB.DoResize(nNewNameWidth);
RecalcItems(); // Alle Elemente neu anordnen
- SetUpdateMode(TRUE);
+ SetUpdateMode(sal_True);
}
}
}
@@ -265,16 +265,16 @@ void SvxHyperlinkDlg::Resizing(Size& rSize)
Beschreibung: Im Dokument selektierten Hyperlink in Leiste anzeigen
--------------------------------------------------------------------*/
-void SvxHyperlinkDlg::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxHyperlinkDlg::StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState )
{
if ( nSID == SID_HYPERLINK_DIALOG )
{
if( eState != SFX_ITEM_DISABLED)
{
- EnableItem( BTN_OPENDIALOG, TRUE );
+ EnableItem( BTN_OPENDIALOG, sal_True );
- BOOL bItem = FALSE;
+ sal_Bool bItem = sal_False;
if ( pState && eState == SFX_ITEM_AVAILABLE )
bItem = ((SfxBoolItem*)pState)->GetValue();
SetItemState ( BTN_OPENDIALOG, bItem ? STATE_CHECK : STATE_NOCHECK );
@@ -282,16 +282,16 @@ void SvxHyperlinkDlg::StateChanged( USHORT nSID, SfxItemState eState,
else
{
SetItemState ( BTN_OPENDIALOG, STATE_NOCHECK );
- EnableItem( BTN_OPENDIALOG, FALSE );
+ EnableItem( BTN_OPENDIALOG, sal_False );
}
}
if (nSID == SID_HYPERLINK_SETLINK)
{
if (eState == SFX_ITEM_DISABLED)
- bNoDoc = TRUE;
+ bNoDoc = sal_True;
else
- bNoDoc = FALSE;
+ bNoDoc = sal_False;
EnableItem(BTN_TARGET, !bNoDoc);
EnableLink();
}
@@ -302,15 +302,15 @@ void SvxHyperlinkDlg::StateChanged( USHORT nSID, SfxItemState eState,
{
const SvxHyperlinkItem& rHLnkItem = *((const SvxHyperlinkItem*)pState);
- USHORT nNamePos = aNameCB.GetEntryPos(aNameCB.GetText());
- USHORT nUrlPos = aUrlCB.GetEntryPos(aUrlCB.GetText());
- USHORT nNotFound = COMBOBOX_ENTRY_NOTFOUND;
+ sal_uInt16 nNamePos = aNameCB.GetEntryPos(aNameCB.GetText());
+ sal_uInt16 nUrlPos = aUrlCB.GetEntryPos(aUrlCB.GetText());
+ sal_uInt16 nNotFound = COMBOBOX_ENTRY_NOTFOUND;
if (!bHasOldName &&
(nNamePos == nNotFound || nUrlPos == nNotFound))
{
sOldName = aNameCB.GetText();
- bHasOldName = TRUE;
+ bHasOldName = sal_True;
}
if (rHLnkItem.GetName().Len())
{
@@ -328,7 +328,7 @@ void SvxHyperlinkDlg::StateChanged( USHORT nSID, SfxItemState eState,
aUrlCB.SetText(aUrlCB.GetEntry(0));
}
- TargetMenu(rHLnkItem.GetTargetFrame(), FALSE);
+ TargetMenu(rHLnkItem.GetTargetFrame(), sal_False);
bHtmlMode = (rHLnkItem.GetInsertMode() & HLINK_HTMLMODE) != 0;
}
else
@@ -360,7 +360,7 @@ IMPL_LINK( SvxHyperlinkDlg, TBClickHdl, ToolBox *, pBox )
break;
}
- return TRUE;
+ return sal_True;
}
/*--------------------------------------------------------------------
@@ -391,7 +391,7 @@ IMPL_LINK( SvxHyperlinkDlg, TBSelectHdl, ToolBox *, pBox )
break;
}
- return TRUE;
+ return sal_True;
}
IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox )
@@ -419,7 +419,7 @@ IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox )
sal_uInt16 nCount = aSearchConfig.Count();
String sFound;
- for (USHORT i = 0; i < nCount; i++)
+ for (sal_uInt16 i = 0; i < nCount; i++)
{
const SvxSearchEngineData& rData = aSearchConfig.GetData(i);
//check if it's the configured default search engine
@@ -439,9 +439,9 @@ IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox )
pMenu->InsertItem( i + 1, rData.sEngineName);
}
}
- pBox->SetItemDown(BTN_INET_SEARCH, TRUE, TRUE);
+ pBox->SetItemDown(BTN_INET_SEARCH, sal_True, sal_True);
pMenu->Execute( this, GetItemRect( BTN_INET_SEARCH ), FLOATWIN_POPUPMODE_DOWN );
- pBox->SetItemDown(BTN_INET_SEARCH, FALSE, TRUE);
+ pBox->SetItemDown(BTN_INET_SEARCH, sal_False, sal_True);
EndSelection();
delete pMenu;
}
@@ -450,24 +450,24 @@ IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox )
case BTN_TARGET:
{
// Target Frame einstellen
- TargetMenu(GetSelTarget(), TRUE);
+ TargetMenu(GetSelTarget(), sal_True);
EndSelection();
}
break;
}
- return TRUE;
+ return sal_True;
}
/*--------------------------------------------------------------------
Beschreibung:
--------------------------------------------------------------------*/
-void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
+void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, sal_Bool bExecute)
{
if (pTargetMenu && !bExecute)
{
- for (USHORT i = 1; i <= pTargetMenu->GetItemCount(); i++)
+ for (sal_uInt16 i = 1; i <= pTargetMenu->GetItemCount(); i++)
{
if (pTargetMenu->GetItemText(i) == rSelEntry)
{
@@ -484,10 +484,10 @@ void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
TargetList aList;
pVwFrm->GetTopFrame().GetTargetList(aList);
- USHORT nCount = (USHORT)aList.Count();
+ sal_uInt16 nCount = (sal_uInt16)aList.Count();
if( nCount )
{
- BOOL bChecked = FALSE;
+ sal_Bool bChecked = sal_False;
if (pTargetMenu != NULL)
delete pTargetMenu;
@@ -495,7 +495,7 @@ void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
pTargetMenu = new PopupMenu;
pTargetMenu->SetMenuFlags( pTargetMenu->GetMenuFlags() |
MENU_FLAG_NOAUTOMNEMONICS );
- USHORT i;
+ sal_uInt16 i;
for ( i = 0; i < nCount; i++ )
{
String sEntry(*aList.GetObject(i));
@@ -504,7 +504,7 @@ void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
if (sEntry == rSelEntry)
{
pTargetMenu->CheckItem(i + 1);
- bChecked = TRUE;
+ bChecked = sal_True;
}
}
for ( i = nCount; i; i-- )
@@ -515,7 +515,7 @@ void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
if (bExecute)
{
- USHORT nEntry = pTargetMenu->Execute(
+ sal_uInt16 nEntry = pTargetMenu->Execute(
this, GetItemRect( BTN_TARGET ), FLOATWIN_POPUPMODE_DOWN );
if ( nEntry )
pTargetMenu->CheckItem( nEntry );
@@ -540,7 +540,7 @@ IMPL_LINK( SvxHyperlinkDlg, LinkPopupSelectHdl, Menu *, pMenu )
break;
}
- return TRUE;
+ return sal_True;
}
/*--------------------------------------------------------------------
@@ -601,7 +601,7 @@ IMPL_LINK( SvxHyperlinkDlg, SearchPopupSelectHdl, Menu *, pMenu )
if ((nTok = sText.GetTokenCount(cToken)) > 1)
{
- for (USHORT i = 0; i < nTok; i++)
+ for (sal_uInt16 i = 0; i < nTok; i++)
{
sURL += sText.GetToken(i, cToken);
if(i < nTok -1)
@@ -620,7 +620,7 @@ IMPL_LINK( SvxHyperlinkDlg, SearchPopupSelectHdl, Menu *, pMenu )
pViewFrame = pViewFrame->GetTopViewFrame();
OpenDoc( sURL, pViewFrame );
- return TRUE;
+ return sal_True;
}
/*--------------------------------------------------------------------
@@ -635,7 +635,7 @@ IMPL_LINK( SvxHyperlinkDlg, BookmarkFoundHdl, String *, pUrl )
ComboModifyHdl(&aUrlCB);
}
- return TRUE;
+ return sal_True;
}
/*--------------------------------------------------------------------
Beschreibung: Link-Button enablen/disablen
@@ -643,7 +643,7 @@ IMPL_LINK( SvxHyperlinkDlg, BookmarkFoundHdl, String *, pUrl )
void SvxHyperlinkDlg::EnableLink()
{
- BOOL bEnable = aUrlCB.GetText().Len() != 0;
+ sal_Bool bEnable = aUrlCB.GetText().Len() != 0;
EnableItem(BTN_LINK, (!bNoDoc) & bEnable);
}
@@ -652,10 +652,10 @@ void SvxHyperlinkDlg::EnableLink()
Beschreibung: URL im Dokument einfuegen
--------------------------------------------------------------------*/
-void SvxHyperlinkDlg::SendToApp(USHORT nType)
+void SvxHyperlinkDlg::SendToApp(sal_uInt16 nType)
{
- BOOL bIsFile = FALSE;
- bSend = TRUE;
+ sal_Bool bIsFile = sal_False;
+ bSend = sal_True;
String sURL( aUrlCB.GetText() );
if ( !sURL.Len() )
@@ -667,13 +667,13 @@ void SvxHyperlinkDlg::SendToApp(USHORT nType)
INetURLObject::DECODE_UNAMBIGUOUS ) );
sURL = aObj.GetMainURL( INetURLObject::NO_DECODE );
if ( aObj.GetProtocol() == INET_PROT_FILE )
- bIsFile = TRUE;
+ bIsFile = sal_True;
if ( bIsFile )
{
EnterWait();
- SfxMedium aMedium( sURL, STREAM_STD_READ, TRUE );
- if ( aMedium.Exists( FALSE ) == FALSE )
+ SfxMedium aMedium( sURL, STREAM_STD_READ, sal_True );
+ if ( aMedium.Exists( sal_False ) == sal_False )
{
LeaveWait();
QueryBox aBox( this, SVX_RES( RID_SVXQB_DONTEXIST ) );
@@ -716,7 +716,7 @@ String SvxHyperlinkDlg::GetSelTarget()
if (pTargetMenu != NULL)
{
- for (USHORT i = 1; i <= pTargetMenu->GetItemCount(); i++)
+ for (sal_uInt16 i = 1; i <= pTargetMenu->GetItemCount(); i++)
{
if (pTargetMenu->IsItemChecked(i))
{
@@ -740,7 +740,7 @@ void SvxHyperlinkDlg::AddToHistory(const String& rName, const String& rURL)
if (bHasOldName && sOldName.Len())
{
sName = sOldName;
- bHasOldName = FALSE;
+ bHasOldName = sal_False;
}
if (!sName.Len())
@@ -748,9 +748,9 @@ void SvxHyperlinkDlg::AddToHistory(const String& rName, const String& rURL)
if (rURL.Len())
{
- USHORT nNamePos = aNameCB.GetEntryPos(sName);
- USHORT nUrlPos = aUrlCB.GetEntryPos(rURL);
- USHORT nPos = COMBOBOX_ENTRY_NOTFOUND;
+ sal_uInt16 nNamePos = aNameCB.GetEntryPos(sName);
+ sal_uInt16 nUrlPos = aUrlCB.GetEntryPos(rURL);
+ sal_uInt16 nPos = COMBOBOX_ENTRY_NOTFOUND;
if (nNamePos != COMBOBOX_ENTRY_NOTFOUND)
nPos = nNamePos;
@@ -777,7 +777,7 @@ void SvxHyperlinkDlg::AddToHistory(const String& rName, const String& rURL)
IMPL_LINK( SvxHyperlinkDlg, ComboSelectHdl, ComboBox *, pCombo )
{
- USHORT nPos = pCombo->GetEntryPos(pCombo->GetText());
+ sal_uInt16 nPos = pCombo->GetEntryPos(pCombo->GetText());
if (nPos != COMBOBOX_ENTRY_NOTFOUND)
{
@@ -785,10 +785,10 @@ IMPL_LINK( SvxHyperlinkDlg, ComboSelectHdl, ComboBox *, pCombo )
aUrlCB.SetText(aUrlCB.GetEntry(nPos));
EnableLink();
- EnableItem(BTN_INSERT_BOOKMARK, TRUE);
- EnableItem(BTN_INET_SEARCH, TRUE);
+ EnableItem(BTN_INSERT_BOOKMARK, sal_True);
+ EnableItem(BTN_INET_SEARCH, sal_True);
}
- return TRUE;
+ return sal_True;
}
/*--------------------------------------------------------------------
@@ -797,10 +797,10 @@ IMPL_LINK( SvxHyperlinkDlg, ComboSelectHdl, ComboBox *, pCombo )
IMPL_LINK( SvxHyperlinkDlg, ComboModifyHdl, ComboBox *, pCombo )
{
- BOOL bEnable = TRUE;
+ sal_Bool bEnable = sal_True;
if (!pCombo->GetText().Len())
- bEnable = FALSE;
+ bEnable = sal_False;
if (pCombo == &aNameCB)
{
@@ -811,14 +811,14 @@ IMPL_LINK( SvxHyperlinkDlg, ComboModifyHdl, ComboBox *, pCombo )
EnableLink();
if (aUrlCB.GetText().Len())
- bEnable = TRUE;
+ bEnable = sal_True;
else
- bEnable = FALSE;
+ bEnable = sal_False;
if (IsItemEnabled(BTN_INSERT_BOOKMARK) != bEnable)
EnableItem(BTN_INSERT_BOOKMARK, bEnable);
- return TRUE;
+ return sal_True;
}
// --------------------------------------------------------------------
@@ -867,12 +867,12 @@ HyperCombo::HyperCombo( SvxHyperlinkDlg* pDialog, const ResId& rResId ) :
long HyperCombo::Notify( NotifyEvent& rNEvt )
{
long nHandled = 0;
- static BOOL bLocked = FALSE;
+ static sal_Bool bLocked = sal_False;
if (bLocked) // Keine weiteren RETURNs annehmen (nicht Reentrant!)
return nHandled;
- bLocked = TRUE;
+ bLocked = sal_True;
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
@@ -891,7 +891,7 @@ long HyperCombo::Notify( NotifyEvent& rNEvt )
if (!nHandled)
nHandled = ComboBox::Notify( rNEvt );
- bLocked = FALSE;
+ bLocked = sal_False;
return nHandled;
}
@@ -952,10 +952,10 @@ void SvxHyperlinkDlg::OpenDoc( const String& rURL, SfxViewFrame* pViewFrame )
{
SfxStringItem aName( SID_FILE_NAME, rURL );
SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii("private:user") );
- SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, TRUE );
- SfxBoolItem aSilent( SID_SILENT, TRUE );
- SfxBoolItem aReadOnly( SID_DOC_READONLY, TRUE );
- SfxBoolItem aExternal( SID_BROWSE, TRUE );
+ SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True );
+ SfxBoolItem aSilent( SID_SILENT, sal_True );
+ SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True );
+ SfxBoolItem aExternal( SID_BROWSE, sal_True );
SfxDispatcher* pDisp = SfxViewFrame::Current() ? SfxViewFrame::Current()->GetDispatcher() : NULL;
if ( pViewFrame )
@@ -977,7 +977,7 @@ SFX_IMPL_CHILDWINDOW(SvxHyperlinkDlgWrapper, SID_HYPERLINK_INSERT)
Beschreibung: Wrapper fuer Hyperlinkleiste
--------------------------------------------------------------------*/
-SvxHyperlinkDlgWrapper::SvxHyperlinkDlgWrapper( Window* _pParent, USHORT nId,
+SvxHyperlinkDlgWrapper::SvxHyperlinkDlgWrapper( Window* _pParent, sal_uInt16 nId,
SfxBindings* _pBindings, SfxChildWinInfo* /*pInfo*/ ) :
SfxChildWindow( _pParent, nId )
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index df396bf99f41..9cd43f0f5195 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -120,7 +120,7 @@ inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode cS
|*
\************************************************************************/
-SvxIMapDlgItem::SvxIMapDlgItem( USHORT _nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) :
+SvxIMapDlgItem::SvxIMapDlgItem( sal_uInt16 _nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) :
SfxControllerItem ( _nId, rBindings ),
rIMap ( rIMapDlg )
{
@@ -132,7 +132,7 @@ SvxIMapDlgItem::SvxIMapDlgItem( USHORT _nId, SvxIMapDlg& rIMapDlg, SfxBindings&
|*
\************************************************************************/
-void SvxIMapDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/,
+void SvxIMapDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/,
const SfxPoolItem* pItem )
{
if ( ( nSID == SID_IMAP_EXEC ) && pItem )
@@ -152,7 +152,7 @@ void SvxIMapDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/,
|*
\************************************************************************/
-SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( Window* _pParent, USHORT nId,
+SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( Window* _pParent, sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo ) :
SfxChildWindow( _pParent, nId )
@@ -232,7 +232,7 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
aTbxIMapDlg1.SetOutStyle( aMiscOptions.GetToolboxStyle() );
aTbxIMapDlg1.SetSizePixel( aTbxIMapDlg1.CalcWindowSizePixel() );
aTbxIMapDlg1.SetSelectHdl( LINK( this, SvxIMapDlg, TbxClickHdl ) );
- aTbxIMapDlg1.CheckItem( TBI_SELECT, TRUE );
+ aTbxIMapDlg1.CheckItem( TBI_SELECT, sal_True );
TbxClickHdl( &aTbxIMapDlg1 );
SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() );
@@ -247,16 +247,16 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW,
aEdtText.Disable();
maFtTarget.Disable();
maCbbTarget.Disable();
- pOwnData->bExecState = FALSE;
+ pOwnData->bExecState = sal_False;
Resize();
pOwnData->aTimer.SetTimeout( 100 );
pOwnData->aTimer.SetTimeoutHdl( LINK( this, SvxIMapDlg, UpdateHdl ) );
- aTbxIMapDlg1.EnableItem( TBI_ACTIVE, FALSE );
- aTbxIMapDlg1.EnableItem( TBI_MACRO, FALSE );
- aTbxIMapDlg1.EnableItem( TBI_PROPERTY, FALSE );
+ aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_False );
+ aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_False );
+ aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False );
}
@@ -312,9 +312,9 @@ void SvxIMapDlg::Resize()
|*
\************************************************************************/
-BOOL SvxIMapDlg::Close()
+sal_Bool SvxIMapDlg::Close()
{
- BOOL bRet = TRUE;
+ sal_Bool bRet = sal_True;
if ( aTbxIMapDlg1.IsItemEnabled( TBI_APPLY ) )
{
@@ -324,12 +324,12 @@ BOOL SvxIMapDlg::Close()
if( nRet == RET_YES )
{
- SfxBoolItem aBoolItem( SID_IMAP_EXEC, TRUE );
+ SfxBoolItem aBoolItem( SID_IMAP_EXEC, sal_True );
GetBindings().GetDispatcher()->Execute(
SID_IMAP_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
}
else if( nRet == RET_CANCEL )
- bRet = FALSE;
+ bRet = sal_False;
}
else if( pIMapWnd->IsChanged() )
{
@@ -340,10 +340,10 @@ BOOL SvxIMapDlg::Close()
if( nRet == RET_YES )
bRet = DoSave();
else if( nRet == RET_CANCEL )
- bRet = FALSE;
+ bRet = sal_False;
}
- return( bRet ? SfxModelessDialog::Close() : FALSE );
+ return( bRet ? SfxModelessDialog::Close() : sal_False );
}
@@ -353,7 +353,7 @@ BOOL SvxIMapDlg::Close()
|*
\************************************************************************/
-void SvxIMapDlg::SetExecState( BOOL bEnable )
+void SvxIMapDlg::SetExecState( sal_Bool bEnable )
{
pOwnData->bExecState = bEnable;
}
@@ -480,14 +480,14 @@ void SvxIMapDlg::KeyInput( const KeyEvent& rKEvt )
IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
{
- USHORT nNewItemId = pTbx->GetCurItemId();
+ sal_uInt16 nNewItemId = pTbx->GetCurItemId();
switch( pTbx->GetCurItemId() )
{
case( TBI_APPLY ):
{
URLLoseFocusHdl( NULL );
- SfxBoolItem aBoolItem( SID_IMAP_EXEC, TRUE );
+ SfxBoolItem aBoolItem( SID_IMAP_EXEC, sal_True );
GetBindings().GetDispatcher()->Execute(
SID_IMAP_EXEC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L );
}
@@ -503,8 +503,8 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
case( TBI_SELECT ):
{
- pTbx->CheckItem( nNewItemId, TRUE );
- pIMapWnd->SetEditMode( TRUE );
+ pTbx->CheckItem( nNewItemId, sal_True );
+ pIMapWnd->SetEditMode( sal_True );
if( pTbx->IsKeyEvent() )
{
if((pTbx->GetKeyModifier() & KEY_MOD1) != 0)
@@ -517,7 +517,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
case( TBI_RECT ):
{
- pTbx->CheckItem( nNewItemId, TRUE );
+ pTbx->CheckItem( nNewItemId, sal_True );
pIMapWnd->SetObjKind( OBJ_RECT );
if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) )
{
@@ -529,7 +529,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
case( TBI_CIRCLE ):
{
- pTbx->CheckItem( nNewItemId, TRUE );
+ pTbx->CheckItem( nNewItemId, sal_True );
pIMapWnd->SetObjKind( OBJ_CIRC );
if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) )
{
@@ -541,7 +541,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
case( TBI_POLY ):
{
- pTbx->CheckItem( nNewItemId, TRUE );
+ pTbx->CheckItem( nNewItemId, sal_True );
pIMapWnd->SetObjKind( OBJ_POLY );
if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) )
{
@@ -553,7 +553,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
case( TBI_FREEPOLY ):
{
- pTbx->CheckItem( nNewItemId, TRUE );
+ pTbx->CheckItem( nNewItemId, sal_True );
pIMapWnd->SetObjKind( OBJ_FREEFILL );
if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) )
{
@@ -566,7 +566,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
case( TBI_ACTIVE ):
{
URLLoseFocusHdl( NULL );
- BOOL bNewState = !pTbx->IsItemChecked( TBI_ACTIVE );
+ sal_Bool bNewState = !pTbx->IsItemChecked( TBI_ACTIVE );
pTbx->CheckItem( TBI_ACTIVE, bNewState );
pIMapWnd->SetCurrentObjState( !bNewState );
}
@@ -674,7 +674,7 @@ void SvxIMapDlg::DoOpen()
|*
\************************************************************************/
-BOOL SvxIMapDlg::DoSave()
+sal_Bool SvxIMapDlg::DoSave()
{
::sfx2::FileDialogHelper aDlg(
com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 );
@@ -684,7 +684,7 @@ BOOL SvxIMapDlg::DoSave()
const String aNCSAFilter( DEFINE_CONST_UNICODE( IMAP_NCSA_FILTER ) );
SdrModel* pModel = pIMapWnd->GetSdrModel();
const sal_Bool bChanged = pModel->IsChanged();
- BOOL bRet = false;
+ sal_Bool bRet = false;
aDlg.AddFilter( aCERNFilter, DEFINE_CONST_UNICODE( IMAP_CERN_TYPE ) );
aDlg.AddFilter( aNCSAFilter, DEFINE_CONST_UNICODE( IMAP_NCSA_TYPE ) );
@@ -697,7 +697,7 @@ BOOL SvxIMapDlg::DoSave()
{
const String aFilter( aDlg.GetCurrentFilter() );
String aExt;
- ULONG nFormat;
+ sal_uIntPtr nFormat;
if ( aFilter == aBinFilter )
{
@@ -716,7 +716,7 @@ BOOL SvxIMapDlg::DoSave()
}
else
{
- return FALSE;
+ return sal_False;
}
INetURLObject aURL( aDlg.GetPath() );
@@ -740,7 +740,7 @@ BOOL SvxIMapDlg::DoSave()
delete pOStm;
pModel->SetChanged( bChanged );
- bRet = TRUE;
+ bRet = sal_True;
}
}
}
@@ -776,10 +776,10 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
if ( !rInfo.bOneMarked )
{
- aTbxIMapDlg1.CheckItem( TBI_ACTIVE, FALSE );
- aTbxIMapDlg1.EnableItem( TBI_ACTIVE, FALSE );
- aTbxIMapDlg1.EnableItem( TBI_MACRO, FALSE );
- aTbxIMapDlg1.EnableItem( TBI_PROPERTY, FALSE );
+ aTbxIMapDlg1.CheckItem( TBI_ACTIVE, sal_False );
+ aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_False );
+ aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_False );
+ aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False );
aStbStatus.SetItemText( 1, aStr );
aFtURL.Disable();
@@ -794,10 +794,10 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
}
else
{
- aTbxIMapDlg1.EnableItem( TBI_ACTIVE, TRUE );
+ aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_True );
aTbxIMapDlg1.CheckItem( TBI_ACTIVE, !rInfo.bActivated );
- aTbxIMapDlg1.EnableItem( TBI_MACRO, TRUE );
- aTbxIMapDlg1.EnableItem( TBI_PROPERTY, TRUE );
+ aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_True );
+ aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_True );
aFtURL.Enable();
maURLBox.Enable();
@@ -949,8 +949,8 @@ IMPL_LINK( SvxIMapDlg, UpdateHdl, Timer*, EMPTYARG )
SetEditingObject( pOwnData->pUpdateEditingObject );
// Nach Wechsel => default Selektion
- aTbxIMapDlg1.CheckItem( TBI_SELECT, TRUE );
- pIMapWnd->SetEditMode( TRUE );
+ aTbxIMapDlg1.CheckItem( TBI_SELECT, sal_True );
+ pIMapWnd->SetEditMode( sal_True );
}
// die in der Update-Methode kopierte Liste wieder loeschen
@@ -976,8 +976,8 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
const SdrObject* pObj = pWnd->GetSelectedSdrObject();
const SdrModel* pModel = pWnd->GetSdrModel();
const SdrView* pView = pWnd->GetSdrView();
- const BOOL bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
- const BOOL bDrawEnabled = !( bPolyEdit && aTbxIMapDlg1.IsItemChecked( TBI_POLYEDIT ) );
+ const sal_Bool bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj );
+ const sal_Bool bDrawEnabled = !( bPolyEdit && aTbxIMapDlg1.IsItemChecked( TBI_POLYEDIT ) );
aTbxIMapDlg1.EnableItem( TBI_APPLY, pOwnData->bExecState && pWnd->IsChanged() );
@@ -999,7 +999,7 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
if ( bPolyEdit )
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
switch( pWnd->GetPolyEditMode() )
{
@@ -1010,13 +1010,13 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
break;
}
- aTbxIMapDlg1.CheckItem( nId, TRUE );
+ aTbxIMapDlg1.CheckItem( nId, sal_True );
}
else
{
- aTbxIMapDlg1.CheckItem( TBI_POLYEDIT, FALSE );
- aTbxIMapDlg1.CheckItem( TBI_POLYMOVE, TRUE );
- aTbxIMapDlg1.CheckItem( TBI_POLYINSERT, FALSE );
+ aTbxIMapDlg1.CheckItem( TBI_POLYEDIT, sal_False );
+ aTbxIMapDlg1.CheckItem( TBI_POLYMOVE, sal_True );
+ aTbxIMapDlg1.CheckItem( TBI_POLYINSERT, sal_False );
pWnd->SetPolyEditMode( 0 );
}
diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx
index 7a6a16a45bd6..fd496a609f90 100644
--- a/svx/source/dialog/imapimp.hxx
+++ b/svx/source/dialog/imapimp.hxx
@@ -47,7 +47,7 @@ public:
ImageMap aUpdateImageMap;
TargetList aUpdateTargetList;
void* pUpdateEditingObject;
- BOOL bExecState;
+ sal_Bool bExecState;
IMapOwnData( SvxIMapDlg* pIMapDlg ) : pIMap ( pIMapDlg ) {}
};
diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx
index 4442cb76bad4..ff152a152d51 100644
--- a/svx/source/dialog/imapwnd.cxx
+++ b/svx/source/dialog/imapwnd.cxx
@@ -110,7 +110,7 @@ IMapWindow::~IMapWindow()
void IMapWindow::SetImageMap( const ImageMap& rImageMap )
{
- ReplaceImageMap( rImageMap, FALSE );
+ ReplaceImageMap( rImageMap, sal_False );
}
/*************************************************************************
@@ -119,7 +119,7 @@ void IMapWindow::SetImageMap( const ImageMap& rImageMap )
|*
\************************************************************************/
-void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGraphic*/ )
+void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, sal_Bool /*bScaleToGraphic*/ )
{
SdrPage* pPage = 0;
aIMap = rImageMap;
@@ -143,9 +143,9 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGrap
}
// create new drawing objects
- const USHORT nCount(rImageMap.GetIMapObjectCount());
+ const sal_uInt16 nCount(rImageMap.GetIMapObjectCount());
- for ( USHORT i(nCount); i > 0; i-- )
+ for ( sal_uInt16 i(nCount); i > 0; i-- )
{
SdrObject* pNewObj = CreateObj( rImageMap.GetIMapObject( i - 1 ) );
@@ -162,11 +162,11 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGrap
|*
\************************************************************************/
-BOOL IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo )
+sal_Bool IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo )
{
const SdrObject* pSdrObj = GetSelectedSdrObject();
IMapObject* pIMapObj;
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if ( pSdrObj && ( ( pIMapObj = GetIMapObj( pSdrObj ) ) != NULL ) )
{
@@ -174,9 +174,9 @@ BOOL IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo )
pIMapObj->SetAltText( rNewInfo.aMarkAltText );
pIMapObj->SetTarget( rNewInfo.aMarkTarget );
pModel->SetChanged( sal_True );
- UpdateInfo( FALSE );
+ UpdateInfo( sal_False );
- bRet = TRUE;
+ bRet = sal_True;
}
return bRet;
@@ -251,7 +251,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
case( IMAP_OBJ_RECTANGLE ):
{
IMapRectangleObject* pIMapRectObj = (IMapRectangleObject*) pIMapObj;
- Rectangle aDrawRect( pIMapRectObj->GetRectangle( FALSE ) );
+ Rectangle aDrawRect( pIMapRectObj->GetRectangle( sal_False ) );
// auf Zeichenflaeche clippen
aDrawRect.Intersection( aClipRect );
@@ -264,8 +264,8 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
case( IMAP_OBJ_CIRCLE ):
{
IMapCircleObject* pIMapCircleObj = (IMapCircleObject*) pIMapObj;
- const Point aCenter( pIMapCircleObj->GetCenter( FALSE ) );
- const long nRadius = pIMapCircleObj->GetRadius( FALSE );
+ const Point aCenter( pIMapCircleObj->GetCenter( sal_False ) );
+ const long nRadius = pIMapCircleObj->GetRadius( sal_False );
const Point aOffset( nRadius, nRadius );
Rectangle aCircle( aCenter - aOffset, aCenter + aOffset );
@@ -294,7 +294,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj )
}
else
{
- const Polygon& rPoly = pIMapPolyObj->GetPolygon( FALSE );
+ const Polygon& rPoly = pIMapPolyObj->GetPolygon( sal_False );
Polygon aDrawPoly( rPoly );
// auf Zeichenflaeche clippen
@@ -356,7 +356,7 @@ void IMapWindow::InitSdrModel()
aSet.Put( XFillColorItem( String(), TRANSCOL ) );
aSet.Put( XFillTransparenceItem( 50 ) );
pView->SetAttributes( aSet );
- pView->SetFrameDragSingles( TRUE );
+ pView->SetFrameDragSingles( sal_True );
}
/*************************************************************************
@@ -373,7 +373,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
{
SdrRectObj* pRectObj = (SdrRectObj*) &rObj;
IMapRectangleObject* pObj = new IMapRectangleObject( pRectObj->GetLogicRect(),
- String(), String(), String(), String(), String(), TRUE, FALSE );
+ String(), String(), String(), String(), String(), sal_True, sal_False );
pRectObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
}
@@ -382,11 +382,11 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
case( OBJ_CIRC ):
{
SdrCircObj* pCircObj = (SdrCircObj*) &rObj;
- SdrPathObj* pPathObj = (SdrPathObj*) pCircObj->ConvertToPolyObj( FALSE, FALSE );
+ SdrPathObj* pPathObj = (SdrPathObj*) pCircObj->ConvertToPolyObj( sal_False, sal_False );
Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
delete pPathObj;
- IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), String(), String(), String(), String(), String(), TRUE, FALSE );
+ IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), String(), String(), String(), String(), String(), sal_True, sal_False );
pObj->SetExtraEllipse( aPoly.GetBoundRect() );
pCircObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
}
@@ -403,7 +403,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj )
if ( rXPolyPoly.count() )
{
Polygon aPoly(rXPolyPoly.getB2DPolygon(0L));
- IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, String(), String(), String(), String(), String(), TRUE, FALSE );
+ IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, String(), String(), String(), String(), String(), sal_True, sal_False );
pPathObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) );
}
}
@@ -431,7 +431,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
String aDesc;
String aTarget;
IMapObjectPtr pIMapObj = pUserData->GetObject();
- BOOL bActive = TRUE;
+ sal_Bool bActive = sal_True;
if ( pIMapObj.get() )
{
@@ -447,17 +447,17 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
case( OBJ_RECT ):
{
pUserData->ReplaceObject( IMapObjectPtr(new IMapRectangleObject( ( (const SdrRectObj&) rObj ).GetLogicRect(),
- aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE ) ) );
+ aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False ) ) );
}
break;
case( OBJ_CIRC ):
{
const SdrCircObj& rCircObj = (const SdrCircObj&) rObj;
- SdrPathObj* pPathObj = (SdrPathObj*) rCircObj.ConvertToPolyObj( FALSE, FALSE );
+ SdrPathObj* pPathObj = (SdrPathObj*) rCircObj.ConvertToPolyObj( sal_False, sal_False );
Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L));
- IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE );
+ IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False );
pObj->SetExtraEllipse( aPoly.GetBoundRect() );
// wurde von uns nur temporaer angelegt
@@ -477,7 +477,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
if ( rXPolyPoly.count() )
{
Polygon aPoly(rPathObj.GetPathPoly().getB2DPolygon(0L));
- IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE );
+ IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False );
pUserData->ReplaceObject( IMapObjectPtr(pObj) );
}
}
@@ -498,7 +498,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj )
void IMapWindow::MouseButtonUp(const MouseEvent& rMEvt)
{
GraphCtrl::MouseButtonUp( rMEvt );
- UpdateInfo( TRUE );
+ UpdateInfo( sal_True );
}
/*************************************************************************
@@ -510,7 +510,7 @@ void IMapWindow::MouseButtonUp(const MouseEvent& rMEvt)
void IMapWindow::MarkListHasChanged()
{
GraphCtrl::MarkListHasChanged();
- UpdateInfo( FALSE );
+ UpdateInfo( sal_False );
}
/*************************************************************************
@@ -527,7 +527,7 @@ SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const
if ( Rectangle( Point(), GetGraphicSize() ).IsInside( aPt ) )
{
SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
- ULONG nCount;
+ sal_uIntPtr nCount;
if ( pPage && ( ( nCount = pPage->GetObjCount() ) > 0 ) )
{
@@ -579,11 +579,11 @@ SdrObject* IMapWindow::GetSdrObj( const IMapObject* pIMapObj ) const
{
SdrObject* pSdrObj = NULL;
SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 );
- ULONG nCount;
+ sal_uIntPtr nCount;
if ( pPage && ( ( nCount = pPage->GetObjCount() ) > 0 ) )
{
- for ( ULONG i = 0; i < nCount; i++ )
+ for ( sal_uIntPtr i = 0; i < nCount; i++ )
{
SdrObject* pTestObj = pPage->GetObj( i );
@@ -612,21 +612,21 @@ void IMapWindow::Command(const CommandEvent& rCEvt)
{
PopupMenu aMenu( SVX_RES( RID_SVXMN_IMAP ) );
const SdrMarkList& rMarkList = pView->GetMarkedObjectList();
- ULONG nMarked = rMarkList.GetMarkCount();
+ sal_uIntPtr nMarked = rMarkList.GetMarkCount();
- aMenu.EnableItem( MN_URL, FALSE );
- aMenu.EnableItem( MN_ACTIVATE, FALSE );
- aMenu.EnableItem( MN_MACRO, FALSE );
+ aMenu.EnableItem( MN_URL, sal_False );
+ aMenu.EnableItem( MN_ACTIVATE, sal_False );
+ aMenu.EnableItem( MN_MACRO, sal_False );
aMenu.EnableItem( MN_MARK_ALL, pModel->GetPage( 0 )->GetObjCount() != pView->GetMarkedObjectCount() );
if ( !nMarked )
{
- aMenu.EnableItem( MN_POSITION, FALSE );
- aMenu.EnableItem( MN_FRAME_TO_TOP, FALSE );
- aMenu.EnableItem( MN_MOREFRONT, FALSE );
- aMenu.EnableItem( MN_MOREBACK, FALSE );
- aMenu.EnableItem( MN_FRAME_TO_BOTTOM, FALSE );
- aMenu.EnableItem( MN_DELETE1, FALSE );
+ aMenu.EnableItem( MN_POSITION, sal_False );
+ aMenu.EnableItem( MN_FRAME_TO_TOP, sal_False );
+ aMenu.EnableItem( MN_MOREFRONT, sal_False );
+ aMenu.EnableItem( MN_MOREBACK, sal_False );
+ aMenu.EnableItem( MN_FRAME_TO_BOTTOM, sal_False );
+ aMenu.EnableItem( MN_DELETE1, sal_False );
}
else
{
@@ -634,18 +634,18 @@ void IMapWindow::Command(const CommandEvent& rCEvt)
{
SdrObject* pSdrObj = GetSelectedSdrObject();
- aMenu.EnableItem( MN_URL, TRUE );
- aMenu.EnableItem( MN_ACTIVATE, TRUE );
- aMenu.EnableItem( MN_MACRO, TRUE );
+ aMenu.EnableItem( MN_URL, sal_True );
+ aMenu.EnableItem( MN_ACTIVATE, sal_True );
+ aMenu.EnableItem( MN_MACRO, sal_True );
aMenu.CheckItem( MN_ACTIVATE, GetIMapObj( pSdrObj )->IsActive() );
}
- aMenu.EnableItem( MN_POSITION, TRUE );
- aMenu.EnableItem( MN_FRAME_TO_TOP, TRUE );
- aMenu.EnableItem( MN_MOREFRONT, TRUE );
- aMenu.EnableItem( MN_MOREBACK, TRUE );
- aMenu.EnableItem( MN_FRAME_TO_BOTTOM, TRUE );
- aMenu.EnableItem( MN_DELETE1, TRUE );
+ aMenu.EnableItem( MN_POSITION, sal_True );
+ aMenu.EnableItem( MN_FRAME_TO_TOP, sal_True );
+ aMenu.EnableItem( MN_MOREFRONT, sal_True );
+ aMenu.EnableItem( MN_MOREBACK, sal_True );
+ aMenu.EnableItem( MN_FRAME_TO_BOTTOM, sal_True );
+ aMenu.EnableItem( MN_DELETE1, sal_True );
}
aMenu.SetSelectHdl( LINK( this, IMapWindow, MenuSelectHdl ) );
@@ -691,7 +691,7 @@ sal_Int8 IMapWindow::ExecuteDrop( const ExecuteDropEvent& rEvt )
pModel->SetChanged( sal_True );
pView->UnmarkAll();
pView->MarkObj( pSdrObj, pView->GetSdrPageView() );
- UpdateInfo( TRUE );
+ UpdateInfo( sal_True );
nRet = rEvt.mnAction;
}
}
@@ -742,7 +742,7 @@ void IMapWindow::RequestHelp( const HelpEvent& rHEvt )
|*
\************************************************************************/
-void IMapWindow::SetCurrentObjState( BOOL bActive )
+void IMapWindow::SetCurrentObjState( sal_Bool bActive )
{
SdrObject* pObj = GetSelectedSdrObject();
@@ -765,7 +765,7 @@ void IMapWindow::SetCurrentObjState( BOOL bActive )
aSet.Put( XLineColorItem( String(), Color( COL_BLACK ) ) );
}
- pView->SetAttributes( aSet, FALSE );
+ pView->SetAttributes( aSet, sal_False );
}
}
@@ -775,7 +775,7 @@ void IMapWindow::SetCurrentObjState( BOOL bActive )
|*
\************************************************************************/
-void IMapWindow::UpdateInfo( BOOL bNewObj )
+void IMapWindow::UpdateInfo( sal_Bool bNewObj )
{
if ( aInfoLink.IsSet() )
{
@@ -786,7 +786,7 @@ void IMapWindow::UpdateInfo( BOOL bNewObj )
if ( pIMapObj )
{
- aInfo.bOneMarked = TRUE;
+ aInfo.bOneMarked = sal_True;
aInfo.aMarkURL = pIMapObj->GetURL();
aInfo.aMarkAltText = pIMapObj->GetAltText();
aInfo.aMarkTarget = pIMapObj->GetTarget();
@@ -796,8 +796,8 @@ void IMapWindow::UpdateInfo( BOOL bNewObj )
else
{
aInfo.aMarkURL = aInfo.aMarkAltText = aInfo.aMarkTarget = String();
- aInfo.bOneMarked = FALSE;
- aInfo.bActivated = FALSE;
+ aInfo.bOneMarked = sal_False;
+ aInfo.bActivated = sal_False;
}
aInfoLink.Call( this );
@@ -836,7 +836,7 @@ void IMapWindow::DoMacroAssign()
const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet();
pIMapObj->SetMacroTable( ((const SvxMacroItem& )pOutSet->Get( SID_ATTR_MACROITEM )).GetMacroTable() );
pModel->SetChanged( sal_True );
- UpdateInfo( FALSE );
+ UpdateInfo( sal_False );
}
delete pMacroDlg;
@@ -880,7 +880,7 @@ void IMapWindow::DoPropertyDialog()
pIMapObj->SetTarget( aDlg->GetTarget() );
pIMapObj->SetName( aDlg->GetName() );
pModel->SetChanged( sal_True );
- UpdateInfo( TRUE );
+ UpdateInfo( sal_True );
}
delete aDlg; //add by CHINA001
}
@@ -897,7 +897,7 @@ IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu )
{
if (pMenu)
{
- USHORT nId = pMenu->GetCurItemId();
+ sal_uInt16 nId = pMenu->GetCurItemId();
switch(nId)
{
@@ -911,11 +911,11 @@ IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu )
case( MN_ACTIVATE ):
{
- const BOOL bNewState = !pMenu->IsItemChecked( MN_ACTIVATE );
+ const sal_Bool bNewState = !pMenu->IsItemChecked( MN_ACTIVATE );
pMenu->CheckItem( MN_ACTIVATE, bNewState );
SetCurrentObjState( bNewState );
- UpdateInfo( FALSE );
+ UpdateInfo( sal_False );
}
case( MN_FRAME_TO_TOP ):
@@ -1048,7 +1048,7 @@ void IMapWindow::SelectFirstObject()
{
GrabFocus();
pView->UnmarkAllObj();
- pView->MarkNextObj(TRUE);
+ pView->MarkNextObj(sal_True);
}
}
@@ -1057,7 +1057,7 @@ void IMapWindow::StartPolyEdit()
GrabFocus();
if( !pView->AreObjectsMarked() )
- pView->MarkNextObj(TRUE);
+ pView->MarkNextObj(sal_True);
const SdrHdlList& rHdlList = pView->GetHdlList();
SdrHdl* pHdl = rHdlList.GetFocusHdl();
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 1138eb47e68a..bbc6a2c1ed6d 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -51,9 +51,9 @@ struct NotifyInfo
String aMarkURL;
String aMarkAltText;
String aMarkTarget;
- BOOL bNewObj;
- BOOL bOneMarked;
- BOOL bActivated;
+ sal_Bool bNewObj;
+ sal_Bool bOneMarked;
+ sal_Bool bActivated;
};
@@ -61,8 +61,8 @@ struct NotifyPosSize
{
Size aPictureSize;
Point aMousePos;
- BOOL bPictureSize;
- BOOL bMousePos;
+ sal_Bool bPictureSize;
+ sal_Bool bMousePos;
};
@@ -74,10 +74,10 @@ struct NotifyPosSize
#define SVD_IMAP_USERDATA 0x0001
-const UINT32 IMapInventor = UINT32('I') * 0x00000001+
- UINT32('M') * 0x00000100+
- UINT32('A') * 0x00010000+
- UINT32('P') * 0x01000000;
+const sal_uInt32 IMapInventor = sal_uInt32('I') * 0x00000001+
+ sal_uInt32('M') * 0x00000100+
+ sal_uInt32('A') * 0x00010000+
+ sal_uInt32('P') * 0x01000000;
typedef boost::shared_ptr< IMapObject > IMapObjectPtr;
@@ -181,7 +181,7 @@ protected:
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
void CreateImageMap();
- void ReplaceImageMap( const ImageMap& rNewImageMap, BOOL bScaleToGraphic );
+ void ReplaceImageMap( const ImageMap& rNewImageMap, sal_Bool bScaleToGraphic );
void ClearTargetList();
@@ -190,19 +190,19 @@ protected:
SdrObject* GetSdrObj( const IMapObject* pIMapObj ) const;
SdrObject* GetHitSdrObj( const Point& rPosPixel ) const;
- void UpdateInfo( BOOL bNewObj );
+ void UpdateInfo( sal_Bool bNewObj );
public:
IMapWindow( Window* pParent, const ResId& rResId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame );
~IMapWindow();
- BOOL ReplaceActualIMapInfo( const NotifyInfo& rNewInfo );
+ sal_Bool ReplaceActualIMapInfo( const NotifyInfo& rNewInfo );
void SetImageMap( const ImageMap& rImageMap );
const ImageMap& GetImageMap();
- void SetCurrentObjState( BOOL bActive );
+ void SetCurrentObjState( sal_Bool bActive );
void DoMacroAssign();
void DoPropertyDialog();
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index c06212d02dea..cdc4cfc0b9b8 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -54,7 +54,7 @@ using namespace ::com::sun::star::uno;
// -----------------------------------------------------------------------
-String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg )
+String GetDicInfoStr( const String& rName, const sal_uInt16 nLang, sal_Bool bNeg )
{
INetURLObject aURLObj;
aURLObj.SetSmartProtocol( INET_PROT_FILE );
@@ -84,14 +84,14 @@ String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg )
// misc local helper functions
//========================================================================
-static Sequence< INT16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq )
+static Sequence< sal_Int16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq )
{
const Locale *pLocale = rSeq.getConstArray();
- INT32 nCount = rSeq.getLength();
+ sal_Int32 nCount = rSeq.getLength();
- Sequence< INT16 > aLangs( nCount );
- INT16 *pLang = aLangs.getArray();
- for (INT32 i = 0; i < nCount; ++i)
+ Sequence< sal_Int16 > aLangs( nCount );
+ sal_Int16 *pLang = aLangs.getArray();
+ for (sal_Int32 i = 0; i < nCount; ++i)
{
pLang[i] = SvxLocaleToLanguage( pLocale[i] );
@@ -101,13 +101,13 @@ static Sequence< INT16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq )
}
-static BOOL lcl_SeqHasLang( const Sequence< INT16 > & rLangSeq, INT16 nLang )
+static sal_Bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nLang )
{
- INT32 i = -1;
- INT32 nLen = rLangSeq.getLength();
+ sal_Int32 i = -1;
+ sal_Int32 nLen = rLangSeq.getLength();
if (nLen)
{
- const INT16 *pLang = rLangSeq.getConstArray();
+ const sal_Int16 *pLang = rLangSeq.getConstArray();
for (i = 0; i < nLen; ++i)
{
if (nLang == pLang[i])
@@ -121,20 +121,20 @@ static BOOL lcl_SeqHasLang( const Sequence< INT16 > & rLangSeq, INT16 nLang )
// class SvxLanguageBox
//========================================================================
-USHORT TypeToPos_Impl( LanguageType eType, const ListBox& rLb )
+sal_uInt16 TypeToPos_Impl( LanguageType eType, const ListBox& rLb )
{
- USHORT nPos = LISTBOX_ENTRY_NOTFOUND;
- USHORT nCount = rLb.GetEntryCount();
+ sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND;
+ sal_uInt16 nCount = rLb.GetEntryCount();
- for ( USHORT i=0; nPos == LISTBOX_ENTRY_NOTFOUND && i<nCount; i++ )
- if ( eType == LanguageType((ULONG)rLb.GetEntryData(i)) )
+ for ( sal_uInt16 i=0; nPos == LISTBOX_ENTRY_NOTFOUND && i<nCount; i++ )
+ if ( eType == LanguageType((sal_uIntPtr)rLb.GetEntryData(i)) )
nPos = i;
return nPos;
}
//-----------------------------------------------------------------------
-SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck ) :
+SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, sal_Bool bCheck ) :
ListBox( pParent, nWinStyle ),
m_pSpellUsedLang( NULL ),
m_bWithCheckmark( bCheck )
@@ -142,7 +142,7 @@ SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck
Init();
}
//------------------------------------------------------------------------
-SvxLanguageBox::SvxLanguageBox( Window* pParent, const ResId& rResId, BOOL bCheck ) :
+SvxLanguageBox::SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool bCheck ) :
ListBox( pParent, rResId ),
m_pSpellUsedLang( NULL ),
m_bWithCheckmark( bCheck )
@@ -158,8 +158,8 @@ void SvxLanguageBox::Init()
m_aCheckedImageHC = Image( SVX_RES( RID_SVXIMG_CHECKED_H ) );
m_aAllString = String( SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ) );
m_nLangList = LANG_LIST_EMPTY;
- m_bHasLangNone = FALSE;
- m_bLangNoneIsLangAll = FALSE;
+ m_bHasLangNone = sal_False;
+ m_bLangNoneIsLangAll = sal_False;
// display entries sorted
SetStyle( GetStyle() | WB_SORT );
@@ -172,12 +172,12 @@ void SvxLanguageBox::Init()
{
LanguageType nLangType = aLangTable.GetTypeAtIndex( i );
- BOOL bInsert = TRUE;
+ sal_Bool bInsert = sal_True;
if ((LANGUAGE_DONTKNOW == nLangType) ||
(LANGUAGE_SYSTEM == nLangType) ||
(LANGUAGE_USER1 <= nLangType && nLangType <= LANGUAGE_USER9))
{
- bInsert = FALSE;
+ bInsert = sal_False;
}
if ( bInsert )
@@ -196,9 +196,9 @@ SvxLanguageBox::~SvxLanguageBox()
//------------------------------------------------------------------------
-USHORT SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, USHORT nPos, bool bChecked )
+sal_uInt16 SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, sal_uInt16 nPos, bool bChecked )
{
- USHORT nRet = 0;
+ sal_uInt16 nRet = 0;
if( !bChecked )
nRet = InsertEntry( rEntry, m_aNotCheckedImage, nPos );
else if( GetSettings().GetStyleSettings().GetHighContrastMode() )
@@ -210,8 +210,8 @@ USHORT SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, USHORT nPos, bo
//------------------------------------------------------------------------
-void SvxLanguageBox::SetLanguageList( INT16 nLangList,
- BOOL bHasLangNone, BOOL bLangNoneIsLangAll, BOOL bCheckSpellAvail )
+void SvxLanguageBox::SetLanguageList( sal_Int16 nLangList,
+ sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll, sal_Bool bCheckSpellAvail )
{
Clear();
@@ -222,12 +222,12 @@ void SvxLanguageBox::SetLanguageList( INT16 nLangList,
if ( LANG_LIST_EMPTY != nLangList )
{
- Sequence< INT16 > aSpellAvailLang;
- Sequence< INT16 > aHyphAvailLang;
- Sequence< INT16 > aThesAvailLang;
- Sequence< INT16 > aSpellUsedLang;
- Sequence< INT16 > aHyphUsedLang;
- Sequence< INT16 > aThesUsedLang;
+ Sequence< sal_Int16 > aSpellAvailLang;
+ Sequence< sal_Int16 > aHyphAvailLang;
+ Sequence< sal_Int16 > aThesAvailLang;
+ Sequence< sal_Int16 > aSpellUsedLang;
+ Sequence< sal_Int16 > aHyphUsedLang;
+ Sequence< sal_Int16 > aThesUsedLang;
Reference< XAvailableLocales > xAvail( LinguMgr::GetLngSvcMgr(), UNO_QUERY );
if (xAvail.is())
{
@@ -334,14 +334,14 @@ void SvxLanguageBox::SetLanguageList( INT16 nLangList,
//------------------------------------------------------------------------
-USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, USHORT nPos )
+sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, sal_uInt16 nPos )
{
return ImplInsertLanguage( nLangType, nPos, ::com::sun::star::i18n::ScriptType::WEAK );
}
//------------------------------------------------------------------------
-USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT nPos, sal_Int16 nType )
+sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_uInt16 nPos, sal_Int16 nType )
{
LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
// For obsolete and to be replaced languages check whether an entry of the
@@ -349,7 +349,7 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT
// string as would be returned by SvtLanguageTable::GetString().
if (nLang != nLangType)
{
- USHORT nAt = TypeToPos_Impl( nLang, *this );
+ sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
if ( nAt != LISTBOX_ENTRY_NOTFOUND )
return nAt;
}
@@ -368,7 +368,7 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT
aStrEntry = ApplyLreOrRleEmbedding( aStrEntry );
- USHORT nAt = 0;
+ sal_uInt16 nAt = 0;
if ( m_bWithCheckmark )
{
sal_Bool bFound = sal_False;
@@ -377,31 +377,31 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT
{
Reference< XSpellChecker1 > xSpell( SvxGetSpellChecker(), UNO_QUERY );
if ( xSpell.is() )
- m_pSpellUsedLang = new Sequence< INT16 >( xSpell->getLanguages() );
+ m_pSpellUsedLang = new Sequence< sal_Int16 >( xSpell->getLanguages() );
}
bFound = m_pSpellUsedLang ?
- lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : FALSE;
+ lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : sal_False;
nAt = ImplInsertImgEntry( aStrEntry, nPos, bFound );
}
else
nAt = InsertEntry( aStrEntry, nPos );
- SetEntryData( nAt, (void*)(ULONG)nLangType );
+ SetEntryData( nAt, (void*)(sal_uIntPtr)nLangType );
return nAt;
}
//------------------------------------------------------------------------
-USHORT SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, USHORT nPos )
+sal_uInt16 SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos )
{
return ImplInsertLanguage( LANGUAGE_SYSTEM, nPos, nType );
}
//------------------------------------------------------------------------
-USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
- BOOL bCheckEntry, USHORT nPos )
+sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
+ sal_Bool bCheckEntry, sal_uInt16 nPos )
{
LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType);
// For obsolete and to be replaced languages check whether an entry of the
@@ -409,7 +409,7 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
// string as would be returned by SvtLanguageTable::GetString().
if (nLang != nLangType)
{
- USHORT nAt = TypeToPos_Impl( nLang, *this );
+ sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
if ( nAt != LISTBOX_ENTRY_NOTFOUND )
return nAt;
}
@@ -418,8 +418,8 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll)
aStrEntry = m_aAllString;
- USHORT nAt = ImplInsertImgEntry( aStrEntry, nPos, bCheckEntry );
- SetEntryData( nAt, (void*)(ULONG)nLang );
+ sal_uInt16 nAt = ImplInsertImgEntry( aStrEntry, nPos, bCheckEntry );
+ SetEntryData( nAt, (void*)(sal_uIntPtr)nLang );
return nAt;
}
@@ -428,7 +428,7 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType )
{
- USHORT nAt = TypeToPos_Impl( eLangType, *this );
+ sal_uInt16 nAt = TypeToPos_Impl( eLangType, *this );
if ( nAt != LISTBOX_ENTRY_NOTFOUND )
RemoveEntry( nAt );
@@ -438,23 +438,23 @@ void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType )
LanguageType SvxLanguageBox::GetSelectLanguage() const
{
- USHORT nPos = GetSelectEntryPos();
+ sal_uInt16 nPos = GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
- return LanguageType( (ULONG)GetEntryData(nPos) );
+ return LanguageType( (sal_uIntPtr)GetEntryData(nPos) );
else
return LanguageType( LANGUAGE_DONTKNOW );
}
//------------------------------------------------------------------------
-void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, BOOL bSelect )
+void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, sal_Bool bSelect )
{
// If the core uses a LangID of an imported MS document and wants to select
// a language that is replaced, we need to select the replacement instead.
LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType);
- USHORT nAt = TypeToPos_Impl( nLang, *this );
+ sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
if ( nAt != LISTBOX_ENTRY_NOTFOUND )
SelectEntryPos( nAt, bSelect );
@@ -462,17 +462,17 @@ void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, BOOL bSelect
//------------------------------------------------------------------------
-BOOL SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) const
+sal_Bool SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) const
{
// Same here, work on the replacement if applicable.
LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType);
- USHORT nAt = TypeToPos_Impl( nLang, *this );
+ sal_uInt16 nAt = TypeToPos_Impl( nLang, *this );
if ( nAt != LISTBOX_ENTRY_NOTFOUND )
return IsEntryPosSelected( nAt );
else
- return FALSE;
+ return sal_False;
}
#if ENABLE_LAYOUT
@@ -484,7 +484,7 @@ SvxLanguageBox::~SvxLanguageBox ()
{
}
-SvxLanguageBox::SvxLanguageBox( Context* pParent, const char* pFile, BOOL bCheck )
+SvxLanguageBox::SvxLanguageBox( Context* pParent, const char* pFile, sal_Bool bCheck )
: ListBox ( pParent, pFile, bCheck )
{
}
diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx
index 13f29089b784..df93370dda8e 100644
--- a/svx/source/dialog/measctrl.cxx
+++ b/svx/source/dialog/measctrl.cxx
@@ -133,9 +133,9 @@ void SvxXMeasurePreview::SetAttributes( const SfxItemSet& rInAttrs )
void SvxXMeasurePreview::MouseButtonDown( const MouseEvent& rMEvt )
{
- BOOL bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift();
- BOOL bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
- BOOL bCtrl = rMEvt.IsMod1();
+ sal_Bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift();
+ sal_Bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
+ sal_Bool bCtrl = rMEvt.IsMod1();
if( bZoomIn || bZoomOut )
{
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index f281580b93db..d1774dcb4870 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -214,7 +214,7 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
aFtBezAngle ( this, SVX_RES( FT_BEZ_ANGLE ) ),
aMtrFldBezAngle ( this, SVX_RES( MTR_FLD_BEZ_ANGLE ) ),
- bAttrModified( FALSE )
+ bAttrModified( sal_False )
{
// diese Page braucht ExchangeSupport
SetExchangeSupport();
@@ -227,11 +227,11 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) :
long nFirst, nLast, nMin, nMax;
lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
- SetFieldUnit( aMtrFldDrawX, eFUnit, TRUE );
+ SetFieldUnit( aMtrFldDrawX, eFUnit, sal_True );
lcl_SetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
lcl_GetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
- SetFieldUnit( aMtrFldDrawY, eFUnit, TRUE );
+ SetFieldUnit( aMtrFldDrawY, eFUnit, sal_True );
lcl_SetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
@@ -259,7 +259,7 @@ SfxTabPage* SvxGridTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
//------------------------------------------------------------------------
-BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet )
+sal_Bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet )
{
if ( bAttrModified )
{
@@ -274,8 +274,8 @@ BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet )
long nX =GetCoreValue( aMtrFldDrawX, eUnit );
long nY = GetCoreValue( aMtrFldDrawY, eUnit );
- aGridItem.nFldDrawX = (UINT32) nX;
- aGridItem.nFldDrawY = (UINT32) nY;
+ aGridItem.nFldDrawX = (sal_uInt32) nX;
+ aGridItem.nFldDrawY = (sal_uInt32) nY;
aGridItem.nFldDivisionX = static_cast<long>(aNumFldDivisionX.GetValue());
aGridItem.nFldDivisionY = static_cast<long>(aNumFldDivisionY.GetValue());
@@ -290,7 +290,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
{
const SfxPoolItem* pAttr = 0;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , FALSE,
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False,
(const SfxPoolItem**)&pAttr ))
{
const SvxGridItem* pGridAttr = (SvxGridItem*)pAttr;
@@ -303,8 +303,8 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
SetMetricValue( aMtrFldDrawX , pGridAttr->nFldDrawX, eUnit );
SetMetricValue( aMtrFldDrawY , pGridAttr->nFldDrawY, eUnit );
-// UINT32 nFineX = pGridAttr->nFldDivisionX;
-// UINT32 nFineY = pGridAttr->nFldDivisionY;
+// sal_uInt32 nFineX = pGridAttr->nFldDivisionX;
+// sal_uInt32 nFineY = pGridAttr->nFldDivisionY;
// aNumFldDivisionX.SetValue( nFineX ? (pGridAttr->nFldDrawX / nFineX - 1) : 0 );
// aNumFldDivisionY.SetValue( nFineY ? (pGridAttr->nFldDrawY / nFineY - 1) : 0 );
aNumFldDivisionX.SetValue( pGridAttr->nFldDivisionX );
@@ -312,7 +312,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
}
ChangeGridsnapHdl_Impl( &aCbxUseGridsnap );
- bAttrModified = FALSE;
+ bAttrModified = sal_False;
}
// -----------------------------------------------------------------------
@@ -320,7 +320,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
{
const SfxPoolItem* pAttr = NULL;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , FALSE,
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False,
(const SfxPoolItem**)&pAttr ))
{
const SvxGridItem* pGridAttr = (SvxGridItem*) pAttr;
@@ -331,9 +331,9 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
// Metrik ggfs. aendern (da TabPage im Dialog liegt,
// wo die Metrik eingestellt werden kann
- //USHORT nWhich = GetWhich( SID_ATTR_METRIC );
+ //sal_uInt16 nWhich = GetWhich( SID_ATTR_METRIC );
//if( rSet.GetItemState( GetWhich( SID_ATTR_METRIC ) ) >= SFX_ITEM_AVAILABLE )
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , FALSE,
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , sal_False,
(const SfxPoolItem**)&pAttr ))
{
const SfxUInt16Item* pItem = (SfxUInt16Item*) pAttr;
@@ -347,14 +347,14 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet )
long nVal = static_cast<long>(aMtrFldDrawX.Denormalize( aMtrFldDrawX.GetValue( FUNIT_TWIP ) ));
lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
- SetFieldUnit( aMtrFldDrawX, eFUnit, TRUE );
+ SetFieldUnit( aMtrFldDrawX, eFUnit, sal_True );
lcl_SetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax);
aMtrFldDrawX.SetValue( aMtrFldDrawX.Normalize( nVal ), FUNIT_TWIP );
nVal = static_cast<long>(aMtrFldDrawY.Denormalize( aMtrFldDrawY.GetValue( FUNIT_TWIP ) ));
lcl_GetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
- SetFieldUnit( aMtrFldDrawY, eFUnit, TRUE );
+ SetFieldUnit( aMtrFldDrawY, eFUnit, sal_True );
lcl_SetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax);
aMtrFldDrawY.SetValue( aMtrFldDrawY.Normalize( nVal ), FUNIT_TWIP );
@@ -372,7 +372,7 @@ int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet )
//------------------------------------------------------------------------
IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField )
{
- bAttrModified = TRUE;
+ bAttrModified = sal_True;
if( aCbxSynchronize.IsChecked() )
{
if(pField == &aMtrFldDrawX)
@@ -398,7 +398,7 @@ IMPL_LINK( SvxGridTabPage, ClickRotateHdl_Impl, void *, EMPTYARG )
IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField )
{
- bAttrModified = TRUE;
+ bAttrModified = sal_True;
if( aCbxSynchronize.IsChecked() )
{
if(&aNumFldDivisionX == pField)
@@ -412,7 +412,7 @@ IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField )
IMPL_LINK( SvxGridTabPage, ChangeGridsnapHdl_Impl, void *, EMPTYARG )
{
- bAttrModified = TRUE;
+ bAttrModified = sal_True;
return 0;
}
diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx
index 0fd6bc5474da..01f88c99d3c7 100644
--- a/svx/source/dialog/pagectrl.cxx
+++ b/svx/source/dialog/pagectrl.cxx
@@ -45,7 +45,7 @@ struct PageWindow_Impl
{
SvxBoxItem* pBorder;
Bitmap aBitmap;
- FASTBOOL bBitmap;
+ int bBitmap;
sal_Bool bResetBackground;
sal_Bool bFrameDirection;
sal_Int32 nFrameDirection;
@@ -53,7 +53,7 @@ struct PageWindow_Impl
PageWindow_Impl() :
pBorder(0),
- bBitmap(FALSE),
+ bBitmap(sal_False),
bResetBackground(sal_False),
bFrameDirection(sal_False),
nFrameDirection(0) {}
@@ -91,11 +91,11 @@ SvxPageWindow::SvxPageWindow( Window* pParent, const ResId& rId ) :
nFtHeight ( 0 ),
aFtColor ( COL_TRANSPARENT ),
pFtBorder ( 0 ),
- bFooter ( FALSE ),
- bHeader ( FALSE ),
- bTable ( FALSE ),
- bHorz ( FALSE ),
- bVert ( FALSE ),
+ bFooter ( sal_False ),
+ bHeader ( sal_False ),
+ bTable ( sal_False ),
+ bHorz ( sal_False ),
+ bVert ( sal_False ),
eUsage ( SVX_PAGE_ALL )
{
@@ -159,23 +159,23 @@ void __EXPORT SvxPageWindow::Paint( const Rectangle& )
aSz = PixelToLogic( GetSizePixel() );
nYPos = ( aSz.Height() - aSize.Height() ) / 2;
long nXPos = ( aSz.Width() - aSize.Width() ) / 2;
- DrawPage( Point( nXPos, nYPos ), TRUE, TRUE );
+ DrawPage( Point( nXPos, nYPos ), sal_True, sal_True );
}
else
// Hochformat
- DrawPage( Point( ( aSz.Width() - aSize.Width() ) / 2, nYPos ), TRUE, TRUE );
+ DrawPage( Point( ( aSz.Width() - aSize.Width() ) / 2, nYPos ), sal_True, sal_True );
}
else
{
// Linke und rechte Seite unterschiedlich -> ggf. zwei Seiten malen
- DrawPage( Point( 0, nYPos ), FALSE, (BOOL)( eUsage & SVX_PAGE_LEFT ) );
- DrawPage( Point( aSize.Width() + aSize.Width() / 8, nYPos ), TRUE,
- (BOOL)( eUsage & SVX_PAGE_RIGHT ) );
+ DrawPage( Point( 0, nYPos ), sal_False, (sal_Bool)( eUsage & SVX_PAGE_LEFT ) );
+ DrawPage( Point( aSize.Width() + aSize.Width() / 8, nYPos ), sal_True,
+ (sal_Bool)( eUsage & SVX_PAGE_RIGHT ) );
}
}
// -----------------------------------------------------------------------
-void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL bEnabled )
+void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const sal_Bool bEnabled )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
const Color& rFieldColor = rStyleSettings.GetFieldColor();
@@ -311,12 +311,12 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL
break;
}
sText.Append(cArrow);
- for(USHORT i = 0; i < sText.Len(); i++)
+ for(sal_uInt16 i = 0; i < sText.Len(); i++)
{
String sDraw(sText.GetChar(i));
long nHDiff = 0;
long nCharWidth = GetTextWidth(sDraw);
- BOOL bHorizontal = 0 == aMove.Y();
+ sal_Bool bHorizontal = 0 == aMove.Y();
if(!bHorizontal)
{
nHDiff = (nAWidth - nCharWidth)/2;
@@ -348,14 +348,14 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL
long _nTop = bVert ? aRect.Top() + ((nH - nTH) / 2) : aRect.Top();
Rectangle aCellRect( Point( _nLeft, _nTop ), Size( CELL_WIDTH, CELL_HEIGHT ) );
- for ( USHORT i = 0; i < 3; ++i )
+ for ( sal_uInt16 i = 0; i < 3; ++i )
{
aCellRect.Left() = _nLeft;
aCellRect.Right() = _nLeft + CELL_WIDTH;
if ( i > 0 )
aCellRect.Move( 0, CELL_HEIGHT );
- for ( USHORT j = 0; j < 3; ++j )
+ for ( sal_uInt16 j = 0; j < 3; ++j )
{
if ( j > 0 )
aCellRect.Move( CELL_WIDTH, 0 );
@@ -380,10 +380,10 @@ void SvxPageWindow::SetBitmap( Bitmap* pBmp )
if ( pBmp )
{
pImpl->aBitmap = *pBmp;
- pImpl->bBitmap = TRUE;
+ pImpl->bBitmap = sal_True;
}
else
- pImpl->bBitmap = FALSE;
+ pImpl->bBitmap = sal_False;
}
// -----------------------------------------------------------------------
diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx
index ef0dbb6b0931..2e9283b1c15d 100644
--- a/svx/source/dialog/paraprev.cxx
+++ b/svx/source/dialog/paraprev.cxx
@@ -71,14 +71,14 @@ SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, const ResId& rId ) :
void SvxParaPrevWindow::Paint( const Rectangle& )
{
- DrawParagraph( TRUE );
+ DrawParagraph( sal_True );
}
// -----------------------------------------------------------------------
#define DEF_MARGIN 120
-void SvxParaPrevWindow::DrawParagraph( BOOL bAll )
+void SvxParaPrevWindow::DrawParagraph( sal_Bool bAll )
{
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
const Color& rWinColor = rStyleSettings.GetWindowColor();
@@ -97,7 +97,7 @@ void SvxParaPrevWindow::DrawParagraph( BOOL bAll )
aPnt.X() = DEF_MARGIN / 2;
SetFillColor( aGrayColor );
- for ( USHORT i = 0; i < 9; ++i )
+ for ( sal_uInt16 i = 0; i < 9; ++i )
{
if ( 3 == i )
{
diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx
index bb689c3fb8fa..2a107d9e23af 100644
--- a/svx/source/dialog/passwd.cxx
+++ b/svx/source/dialog/passwd.cxx
@@ -45,7 +45,7 @@
IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG )
{
- BOOL bOK = TRUE;
+ sal_Bool bOK = sal_True;
short nRet = RET_OK;
String aEmpty;
@@ -55,7 +55,7 @@ IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG )
aNewPasswdED.SetText( aEmpty );
aRepeatPasswdED.SetText( aEmpty );
aNewPasswdED.GrabFocus();
- bOK = FALSE;
+ bOK = sal_False;
}
if ( bOK && aCheckPasswordHdl.IsSet() && !aCheckPasswordHdl.Call( this ) )
@@ -63,7 +63,7 @@ IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG )
ErrorBox( this, WB_OK, aOldPasswdErrStr ).Execute();
aOldPasswdED.SetText( aEmpty );
aOldPasswdED.GrabFocus();
- bOK = FALSE;
+ bOK = sal_False;
}
if ( bOK )
@@ -93,7 +93,7 @@ IMPL_LINK( SvxPasswordDialog, EditModifyHdl, Edit *, EMPTYARG )
// -----------------------------------------------------------------------
-SvxPasswordDialog::SvxPasswordDialog( Window* pParent, BOOL bAllowEmptyPasswords, BOOL bDisableOldPassword ) :
+SvxPasswordDialog::SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPasswords, sal_Bool bDisableOldPassword ) :
SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_PASSWORD ) ),
aOldFL ( this, SVX_RES( FL_OLD_PASSWD ) ),
aOldPasswdFT ( this, SVX_RES( FT_OLD_PASSWD ) ),
diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx
index 1224de5ba6ea..2b94fde81edb 100644
--- a/svx/source/dialog/relfld.cxx
+++ b/svx/source/dialog/relfld.cxx
@@ -38,9 +38,9 @@
SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nWinSize ) :
MetricField( pParent, nWinSize )
{
- bNegativeEnabled = FALSE;
- bRelativeMode = FALSE;
- bRelative = FALSE;
+ bNegativeEnabled = sal_False;
+ bRelativeMode = sal_False;
+ bRelative = sal_False;
SetDecimalDigits( 2 );
SetMin( 0 );
@@ -52,9 +52,9 @@ SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nWinSize ) :
SvxRelativeField::SvxRelativeField( Window* pParent, const ResId& rResId ) :
MetricField( pParent, rResId )
{
- bNegativeEnabled = FALSE;
- bRelativeMode = FALSE;
- bRelative = FALSE;
+ bNegativeEnabled = sal_False;
+ bRelativeMode = sal_False;
+ bRelative = sal_False;
SetDecimalDigits( 2 );
SetMin( 0 );
@@ -70,7 +70,7 @@ void SvxRelativeField::Modify()
if ( bRelativeMode )
{
String aStr = GetText();
- BOOL bNewMode = bRelative;
+ sal_Bool bNewMode = bRelative;
if ( bRelative )
{
@@ -81,7 +81,7 @@ void SvxRelativeField::Modify()
if( ( ( *pStr < sal_Unicode( '0' ) ) || ( *pStr > sal_Unicode( '9' ) ) ) &&
( *pStr != sal_Unicode( '%' ) ) )
{
- bNewMode = FALSE;
+ bNewMode = sal_False;
break;
}
pStr++;
@@ -92,7 +92,7 @@ void SvxRelativeField::Modify()
xub_StrLen nPos = aStr.Search( sal_Unicode( '%' ) );
if ( nPos != STRING_NOTFOUND )
- bNewMode = TRUE;
+ bNewMode = sal_True;
}
if ( bNewMode != bRelative )
@@ -104,10 +104,10 @@ void SvxRelativeField::Modify()
// -----------------------------------------------------------------------
-void SvxRelativeField::EnableRelativeMode( USHORT nMin,
- USHORT nMax, USHORT nStep )
+void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin,
+ sal_uInt16 nMax, sal_uInt16 nStep )
{
- bRelativeMode = TRUE;
+ bRelativeMode = sal_True;
nRelMin = nMin;
nRelMax = nMax;
nRelStep = nStep;
@@ -116,14 +116,14 @@ void SvxRelativeField::EnableRelativeMode( USHORT nMin,
// -----------------------------------------------------------------------
-void SvxRelativeField::SetRelative( BOOL bNewRelative )
+void SvxRelativeField::SetRelative( sal_Bool bNewRelative )
{
Selection aSelection = GetSelection();
String aStr = GetText();
if ( bNewRelative )
{
- bRelative = TRUE;
+ bRelative = sal_True;
SetDecimalDigits( 0 );
SetMin( nRelMin );
SetMax( nRelMax );
@@ -132,7 +132,7 @@ void SvxRelativeField::SetRelative( BOOL bNewRelative )
}
else
{
- bRelative = FALSE;
+ bRelative = sal_False;
SetDecimalDigits( 2 );
SetMin( bNegativeEnabled ? -9999 : 0 );
SetMax( 9999 );
diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx
index 23d62d4de85e..dfb2141bdfe8 100644
--- a/svx/source/dialog/rlrcitem.cxx
+++ b/svx/source/dialog/rlrcitem.cxx
@@ -49,7 +49,7 @@
// class SvxRulerItem ----------------------------------------------------
-SvxRulerItem::SvxRulerItem(USHORT _nId, SvxRuler &rRul, SfxBindings &rBindings)
+SvxRulerItem::SvxRulerItem(sal_uInt16 _nId, SvxRuler &rRul, SfxBindings &rBindings)
: SfxControllerItem(_nId, rBindings),
rRuler(rRul)
{
@@ -57,7 +57,7 @@ SvxRulerItem::SvxRulerItem(USHORT _nId, SvxRuler &rRul, SfxBindings &rBindings)
// -----------------------------------------------------------------------
-void SvxRulerItem::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState)
{
// SFX_ITEM_DONTCARE => pState == -1 => PTR_CAST buff
diff --git a/svx/source/dialog/rlrcitem.hxx b/svx/source/dialog/rlrcitem.hxx
index c8595a92495e..dccb5d97a2ec 100644
--- a/svx/source/dialog/rlrcitem.hxx
+++ b/svx/source/dialog/rlrcitem.hxx
@@ -39,11 +39,11 @@ private:
SvxRuler& rRuler;
protected:
- virtual void StateChanged( USHORT,
+ virtual void StateChanged( sal_uInt16,
SfxItemState, const SfxPoolItem* pState );
public:
- SvxRulerItem( USHORT nId, SvxRuler&, SfxBindings& );
+ SvxRulerItem( sal_uInt16 nId, SvxRuler&, SfxBindings& );
};
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index d281802ac40e..a85fc023eca5 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -78,7 +78,7 @@ static const sal_Char cRubies[] = "Rubies";
/* -----------------------------09.01.01 17:24--------------------------------
---------------------------------------------------------------------------*/
-SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, USHORT nId,
+SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, sal_uInt16 nId,
SfxBindings* pBindings, SfxChildWinInfo* pInfo) :
SfxChildWindow(_pParent, nId)
{
@@ -241,7 +241,7 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW,
aHelpPB(this, ResId(PB_HELP,*rResId.GetResMgr() )),
nLastPos(0),
nCurrentEdit(0),
- bModified(FALSE),
+ bModified(sal_False),
pBindings(pBind)
{
xImpl = pImpl = new SvxRubyData_Impl;
@@ -268,7 +268,7 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW,
Link aEditLk(LINK(this, SvxRubyDialog, EditModifyHdl_Impl));
Link aScrollLk(LINK(this, SvxRubyDialog, EditScrollHdl_Impl));
Link aJumpLk(LINK(this, SvxRubyDialog, EditJumpHdl_Impl));
- for(USHORT i = 0; i < 8; i++)
+ for(sal_uInt16 i = 0; i < 8; i++)
{
aEditArr[i]->SetModifyHdl(aEditLk);
aEditArr[i]->SetJumpHdl(aJumpLk);
@@ -292,7 +292,7 @@ SvxRubyDialog::~SvxRubyDialog()
---------------------------------------------------------------------------*/
void SvxRubyDialog::ClearCharStyleList()
{
- for(USHORT i = 0; i < aCharStyleLB.GetEntryCount(); i++)
+ for(sal_uInt16 i = 0; i < aCharStyleLB.GetEntryCount(); i++)
{
void* pData = aCharStyleLB.GetEntryData(i);
delete (OUString*)pData;
@@ -302,12 +302,12 @@ void SvxRubyDialog::ClearCharStyleList()
/* -----------------------------09.01.01 17:17--------------------------------
---------------------------------------------------------------------------*/
-BOOL SvxRubyDialog::Close()
+sal_Bool SvxRubyDialog::Close()
{
pBindings->GetDispatcher()->Execute( SID_RUBY_DIALOG,
SFX_CALLMODE_ASYNCHRON |
SFX_CALLMODE_RECORD);
- return TRUE;
+ return sal_True;
}
/* -----------------------------29.01.01 15:26--------------------------------
@@ -372,7 +372,7 @@ void SvxRubyDialog::Activate()
}
if(sName.getLength())
{
- USHORT nPos = aCharStyleLB.InsertEntry(sName);
+ sal_uInt16 nPos = aCharStyleLB.InsertEntry(sName);
aCharStyleLB.SetEntryData( nPos, new OUString(sCoreName) );
}
@@ -407,7 +407,7 @@ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight)
{
OUString sLeft, sRight;
const Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues();
- BOOL bEnable = aRubyValues.getLength() > nPos;
+ sal_Bool bEnable = aRubyValues.getLength() > nPos;
if(bEnable)
{
const Sequence<PropertyValue> aProps = aRubyValues.getConstArray()[nPos];
@@ -421,7 +421,7 @@ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight)
}
}
else if(!nPos)
- bEnable = TRUE;
+ bEnable = sal_True;
rLeft.Enable(bEnable);
rRight.Enable(bEnable);
rLeft.SetText(sLeft);
@@ -441,7 +441,7 @@ void SvxRubyDialog::GetText()
{
Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues();
DBG_ASSERT(aRubyValues.getLength() > (i / 2 + nTempLastPos), "wrong index" );
- SetModified(TRUE);
+ SetModified(sal_True);
Sequence<PropertyValue> &rProps = aRubyValues.getArray()[i / 2 + nTempLastPos];
PropertyValue* pProps = rProps.getArray();
for(sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++)
@@ -463,7 +463,7 @@ void SvxRubyDialog::Update()
aScrollSB.SetRange( Range(0, nLen > 4 ? nLen - 4 : 0));
aScrollSB.SetThumbPos(0);
SetLastPos(0);
- SetModified(FALSE);
+ SetModified(sal_False);
sal_Int16 nAdjust = -1;
sal_Int16 nPosition = -1;
@@ -521,7 +521,7 @@ void SvxRubyDialog::Update()
sCharStyleName = C2U(cRubies);
if(sCharStyleName.getLength())
{
- for(USHORT i = 0; i < aCharStyleLB.GetEntryCount(); i++)
+ for(sal_uInt16 i = 0; i < aCharStyleLB.GetEntryCount(); i++)
{
const OUString* pCoreName = (const OUString*)aCharStyleLB.GetEntryData(i);
if(pCoreName && sCharStyleName == *pCoreName)
@@ -642,7 +642,7 @@ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox)
if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyAdjust)))
pProps[nProp].Value <<= nAdjust;
}
- SetModified(TRUE);
+ SetModified(sal_True);
}
aPreviewWin.Invalidate();
return 0;
@@ -665,7 +665,7 @@ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox)
if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyIsAbove)))
pProps[nProp].Value.setValue(&bAbove, rType);
}
- SetModified(TRUE);
+ SetModified(sal_True);
}
aPreviewWin.Invalidate();
return 0;
@@ -691,7 +691,7 @@ IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG )
pProps[nProp].Value <<= sStyleName;
}
}
- SetModified(TRUE);
+ SetModified(sal_True);
}
return 0;
}
@@ -700,7 +700,7 @@ IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG )
---------------------------------------------------------------------------*/
IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, Edit*, pEdit)
{
- for(USHORT i = 0; i < 8; i++)
+ for(sal_uInt16 i = 0; i < 8; i++)
{
if(pEdit == aEditArr[i])
{
@@ -746,8 +746,8 @@ IMPL_LINK(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32*, pParam)
---------------------------------------------------------------------------*/
IMPL_LINK(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32*, pParam)
{
- USHORT nIndex = USHRT_MAX;
- for(USHORT i = 0; i < 8; i++)
+ sal_uInt16 nIndex = USHRT_MAX;
+ for(sal_uInt16 i = 0; i < 8; i++)
{
if(aEditArr[i]->HasFocus())
nIndex = i;
@@ -866,7 +866,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ )
long nRubyWidth = GetTextWidth(sRubyText);
SetFont(aSaveFont);
- USHORT nAdjust = rParentDlg.aAdjustLB.GetSelectEntryPos();
+ sal_uInt16 nAdjust = rParentDlg.aAdjustLB.GetSelectEntryPos();
//use center if no adjustment is available
if(nAdjust > 4)
nAdjust = 1;
@@ -882,7 +882,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ )
long nYBase = aWinSize.Height() * 3 / 4 - nTextHeight / 2;
//use above also if no selection is set
- BOOL bAbove = rParentDlg.aPositionLB.GetSelectEntryPos() != 1;
+ sal_Bool bAbove = rParentDlg.aPositionLB.GetSelectEntryPos() != 1;
if(!bAbove)
{
long nTmp = nYRuby;
@@ -969,8 +969,8 @@ long RubyEdit::PreNotify( NotifyEvent& rNEvt )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
const KeyCode& rKeyCode = pKEvt->GetKeyCode();
- USHORT nMod = rKeyCode.GetModifier();
- USHORT nCode = rKeyCode.GetCode();
+ sal_uInt16 nMod = rKeyCode.GetModifier();
+ sal_uInt16 nCode = rKeyCode.GetCode();
if( nCode == KEY_TAB && (!nMod || KEY_SHIFT == nMod))
{
sal_Int32 nParam = KEY_SHIFT == nMod ? -1 : 1;
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index 331c38d6bdd6..fa6936e7581e 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -63,7 +63,7 @@ String SvxLongLRSpaceItem::GetValueText() const
#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L))
#define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L))
-sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -77,7 +77,7 @@ sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
aLeftRightMargin.Left = bConvert ? TWIP_TO_MM100( lLeft ) : lLeft;
aLeftRightMargin.Right = bConvert ? TWIP_TO_MM100( lRight ) : lRight;
rVal <<= aLeftRightMargin;
- return TRUE;
+ return sal_True;
}
case MID_LEFT: nVal = lLeft; break;
@@ -89,11 +89,11 @@ sal_Bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
nVal = TWIP_TO_MM100( nVal );
rVal <<= nVal;
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------
-sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -150,7 +150,7 @@ SfxPoolItem* SvxLongLRSpaceItem::Clone(SfxItemPool *) const
//------------------------------------------------------------------------
-SvxLongLRSpaceItem::SvxLongLRSpaceItem(long lL, long lR, USHORT nId)
+SvxLongLRSpaceItem::SvxLongLRSpaceItem(long lL, long lR, sal_uInt16 nId)
: SfxPoolItem(nId),
lLeft(lL),
lRight(lR)
@@ -189,7 +189,7 @@ String SvxLongULSpaceItem::GetValueText() const
return String();
}
-sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -203,7 +203,7 @@ sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
aUpperLowerMargin.Upper = bConvert ? TWIP_TO_MM100( lLeft ) : lLeft;
aUpperLowerMargin.Lower = bConvert ? TWIP_TO_MM100( lRight ) : lRight;
rVal <<= aUpperLowerMargin;
- return TRUE;
+ return sal_True;
}
case MID_UPPER: nVal = lLeft; break;
@@ -215,11 +215,11 @@ sal_Bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
nVal = TWIP_TO_MM100( nVal );
rVal <<= nVal;
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------
-sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -275,7 +275,7 @@ SfxPoolItem* SvxLongULSpaceItem::Clone(SfxItemPool *) const
//------------------------------------------------------------------------
-SvxLongULSpaceItem::SvxLongULSpaceItem(long lL, long lR, USHORT nId)
+SvxLongULSpaceItem::SvxLongULSpaceItem(long lL, long lR, sal_uInt16 nId)
: SfxPoolItem(nId),
lLeft(lL),
lRight(lR)
@@ -307,7 +307,7 @@ int SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const
lHeight == ((const SvxPagePosSizeItem &)rCmp).lHeight;
}
-sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
@@ -322,7 +322,7 @@ sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
aPagePosSize.Width = lWidth;
aPagePosSize.Height = lHeight;
rVal <<= aPagePosSize;
- return TRUE;
+ return sal_True;
}
case MID_X: nVal = aPos.X(); break;
@@ -334,10 +334,10 @@ sal_Bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE
}
rVal <<= nVal;
- return TRUE;
+ return sal_True;
}
-sal_Bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
@@ -432,7 +432,7 @@ SvxPagePosSizeItem::SvxPagePosSizeItem()
void SvxColumnItem::DeleteAndDestroyColumns()
{
- for( USHORT i = aColumns.Count(); i>0; )
+ for( sal_uInt16 i = aColumns.Count(); i>0; )
{
SvxColumnDescription *pTmp = (SvxColumnDescription *)aColumns[--i];
aColumns.Remove( i );
@@ -450,19 +450,19 @@ int SvxColumnItem::operator==(const SfxPoolItem& rCmp) const
nRight != ((const SvxColumnItem&)rCmp).nRight ||
bTable != ((const SvxColumnItem&)rCmp).bTable ||
Count() != ((const SvxColumnItem&)rCmp).Count())
- return FALSE;
+ return sal_False;
- const USHORT nCount = ((const SvxColumnItem&)rCmp).Count();
- for(USHORT i = 0; i < nCount;++i) {
+ const sal_uInt16 nCount = ((const SvxColumnItem&)rCmp).Count();
+ for(sal_uInt16 i = 0; i < nCount;++i) {
#if OSL_DEBUG_LEVEL > 1
SvxColumnDescription *p1, *p2;
p1 = (SvxColumnDescription *)aColumns[i];
p2 = (SvxColumnDescription *)((const SvxColumnItem&)rCmp).aColumns[i];
#endif
if( (*this)[i] != ((const SvxColumnItem&)rCmp)[i] )
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------
@@ -494,30 +494,30 @@ SfxPoolItem* SvxColumnItem::Clone( SfxItemPool * ) const
//------------------------------------------------------------------------
-SvxColumnItem::SvxColumnItem( USHORT nAct ) :
+SvxColumnItem::SvxColumnItem( sal_uInt16 nAct ) :
SfxPoolItem( SID_RULER_BORDERS ),
nLeft ( 0 ),
nRight ( 0 ),
nActColumn ( nAct ),
- bTable ( FALSE ),
- bOrtho (TRUE )
+ bTable ( sal_False ),
+ bOrtho (sal_True )
{
}
//------------------------------------------------------------------------
-SvxColumnItem::SvxColumnItem( USHORT nActCol, USHORT left, USHORT right ) :
+SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, sal_uInt16 left, sal_uInt16 right ) :
SfxPoolItem( SID_RULER_BORDERS ),
nLeft ( left ),
nRight ( right ),
nActColumn ( nActCol ),
- bTable ( TRUE ),
- bOrtho ( TRUE )
+ bTable ( sal_True ),
+ bOrtho ( sal_True )
{
}
@@ -527,7 +527,7 @@ SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) :
SfxPoolItem( rCopy ),
- aColumns ( (BYTE)rCopy.Count() ),
+ aColumns ( (sal_uInt8)rCopy.Count() ),
nLeft ( rCopy.nLeft ),
nRight ( rCopy.nRight ),
nActColumn( rCopy.nActColumn ),
@@ -535,9 +535,9 @@ SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) :
bOrtho ( rCopy.bOrtho )
{
- const USHORT nCount = rCopy.Count();
+ const sal_uInt16 nCount = rCopy.Count();
- for ( USHORT i = 0; i < nCount; ++i )
+ for ( sal_uInt16 i = 0; i < nCount; ++i )
Append( rCopy[i] );
}
@@ -557,37 +557,37 @@ const SvxColumnItem &SvxColumnItem::operator=(const SvxColumnItem &rCopy)
bTable = rCopy.bTable;
nActColumn = rCopy.nActColumn;
DeleteAndDestroyColumns();
- const USHORT nCount = rCopy.Count();
- for(USHORT i = 0; i < nCount;++i)
+ const sal_uInt16 nCount = rCopy.Count();
+ for(sal_uInt16 i = 0; i < nCount;++i)
Insert(rCopy[i], i);
return *this;
}
//------------------------------------------------------------------------
-BOOL SvxColumnItem::CalcOrtho() const
+sal_Bool SvxColumnItem::CalcOrtho() const
{
- const USHORT nCount = Count();
+ const sal_uInt16 nCount = Count();
DBG_ASSERT(nCount >= 2, "keine Spalten");
if(nCount < 2)
- return FALSE;
+ return sal_False;
long nColWidth = (*this)[0].GetWidth();
- for(USHORT i = 1; i < nCount; ++i) {
+ for(sal_uInt16 i = 1; i < nCount; ++i) {
if( (*this)[i].GetWidth() != nColWidth)
- return FALSE;
+ return sal_False;
}
//!! Breite Trenner
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------
long SvxColumnItem::GetVisibleRight() const
{
- USHORT nIdx = 0;
+ sal_uInt16 nIdx = 0;
- for ( USHORT i = 0; i < nActColumn; ++i )
+ for ( sal_uInt16 i = 0; i < nActColumn; ++i )
{
if ( (*this)[i].bVisible )
++nIdx;
@@ -595,7 +595,7 @@ long SvxColumnItem::GetVisibleRight() const
return (*this)[nIdx].nEnd;
}
-sal_Bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -615,7 +615,7 @@ sal_Bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember
return sal_True;
}
-sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
sal_Int32 nVal = 0;
@@ -627,9 +627,9 @@ sal_Bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe
}
case MID_RIGHT: rVal >>= nRight; break;
case MID_LEFT: rVal >>= nLeft; break;
- case MID_ORTHO: rVal >>= nVal; bOrtho = (BOOL) nVal; break;
- case MID_ACTUAL: rVal >>= nVal; nActColumn = (USHORT) nVal; break;
- case MID_TABLE: rVal >>= nVal; bTable = (BOOL) nVal; break;
+ case MID_ORTHO: rVal >>= nVal; bOrtho = (sal_Bool) nVal; break;
+ case MID_ACTUAL: rVal >>= nVal; nActColumn = (sal_uInt16) nVal; break;
+ case MID_TABLE: rVal >>= nVal; bTable = (sal_Bool) nVal; break;
default: DBG_ERROR("Wrong MemberId!"); return sal_False;
}
@@ -678,7 +678,7 @@ SfxPoolItem* SvxObjectItem::Clone(SfxItemPool *) const
//------------------------------------------------------------------------
SvxObjectItem::SvxObjectItem( long nSX, long nEX,
- long nSY, long nEY, BOOL limits ) :
+ long nSY, long nEY, sal_Bool limits ) :
SfxPoolItem( SID_RULER_OBJECT ),
@@ -706,7 +706,7 @@ SvxObjectItem::SvxObjectItem( const SvxObjectItem& rCopy ) :
{
}
-sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -721,13 +721,13 @@ sal_Bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember
return sal_False;
}
- return TRUE;
+ return sal_True;
}
-sal_Bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
switch ( nMemberId )
{
case MID_START_X : bRet = (rVal >>= nStartX); break;
diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx
index 10734e8495f6..7d15a0e2c65e 100644
--- a/svx/source/dialog/sendreportw32.cxx
+++ b/svx/source/dialog/sendreportw32.cxx
@@ -79,7 +79,7 @@ static LONG RegWriteValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName,
if ( ERROR_SUCCESS == lResult )
{
- lResult = RegSetValueEx( hKey, lpValueName, NULL, dwType, (CONST BYTE *)lpData, cbData );
+ lResult = RegSetValueEx( hKey, lpValueName, NULL, dwType, (CONST sal_uInt8 *)lpData, cbData );
RegCloseKey( hKey );
}
@@ -123,14 +123,14 @@ namespace svx{
sizeof(szBuffer) ) )
maEMailAddrED.SetText( (sal_Unicode *)szBuffer );
- DWORD fAllowContact = FALSE;
+ DWORD fAllowContact = sal_False;
RegReadValue(
HKEY_CURRENT_USER,
TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"),
TEXT("AllowContact"),
&fAllowContact,
sizeof(fAllowContact) );
- maContactCB.Check( (BOOL)fAllowContact );
+ maContactCB.Check( (sal_Bool)fAllowContact );
DWORD uInternetConnection = 0;
RegReadValue(
@@ -235,7 +235,7 @@ namespace svx{
szBuffer,
NULL,
NULL,
- FALSE,
+ sal_False,
0,
NULL, NULL, &StartupInfo, &ProcessInfo )
)
diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx
index 0545161e858d..199464a0966c 100644
--- a/svx/source/dialog/simptabl.cxx
+++ b/svx/source/dialog/simptabl.cxx
@@ -54,11 +54,11 @@ SvxSimpTblContainer::SvxSimpTblContainer( Window* pParent, const ResId& rResId):
long SvxSimpTblContainer::PreNotify( NotifyEvent& rNEvt )
{
- long nResult = TRUE;
+ long nResult = sal_True;
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
const KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
- USHORT nKey = aKeyCode.GetCode();
+ sal_uInt16 nKey = aKeyCode.GetCode();
if ( nKey == KEY_TAB )
GetParent()->Notify( rNEvt );
else if ( m_pTable->IsFocusOnCellEnabled() && ( nKey == KEY_LEFT || nKey == KEY_RIGHT ) )
@@ -80,10 +80,10 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,WinBits nBits ):
aPrivContainer(pParent,nBits|WB_DIALOGCONTROL),
aHeaderBar(pParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP),
nHeaderItemId(1),
- bResizeFlag(FALSE),
- bPaintFlag(TRUE)
+ bResizeFlag(sal_False),
+ bPaintFlag(sal_True)
{
- bSortDirection=TRUE;
+ bSortDirection=sal_True;
nSortCol=0xFFFF;
nOldPos=0;
@@ -111,11 +111,11 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,const ResId& rResId):
aPrivContainer(pParent,rResId),
aHeaderBar(pParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP),
nHeaderItemId(1),
- bResizeFlag(TRUE),
- bPaintFlag(TRUE)
+ bResizeFlag(sal_True),
+ bPaintFlag(sal_True)
{
- bSortDirection=TRUE;
+ bSortDirection=sal_True;
nOldPos=0;
nSortCol=0xFFFF;
@@ -198,18 +198,18 @@ void SvxSimpleTable::SetTabs()
{
SvHeaderTabListBox::SetTabs();
- USHORT nPrivTabCount = TabCount();
+ sal_uInt16 nPrivTabCount = TabCount();
if ( nPrivTabCount )
{
if ( nPrivTabCount > aHeaderBar.GetItemCount() )
nPrivTabCount = aHeaderBar.GetItemCount();
- USHORT i, nNewSize = static_cast< USHORT >( GetTab(0) ), nPos = 0;
+ sal_uInt16 i, nNewSize = static_cast< sal_uInt16 >( GetTab(0) ), nPos = 0;
for ( i = 1; i < nPrivTabCount; ++i )
{
- nNewSize = static_cast< USHORT >( GetTab(i) ) - nPos;
+ nNewSize = static_cast< sal_uInt16 >( GetTab(i) ) - nPos;
aHeaderBar.SetItemSize( i, nNewSize );
- nPos = (USHORT)GetTab(i);
+ nPos = (sal_uInt16)GetTab(i);
}
aHeaderBar.SetItemSize( i, HEADERBAR_FULLSIZE ); // because no tab for last entry
@@ -225,9 +225,9 @@ void SvxSimpleTable::Paint( const Rectangle& rRect )
{
SvHeaderTabListBox::Paint(rRect );
- USHORT nPrivTabCount = TabCount();
- USHORT nPos = 0;
- USHORT nNewSize = ( nPrivTabCount > 0 ) ? (USHORT)GetTab(0) : 0;
+ sal_uInt16 nPrivTabCount = TabCount();
+ sal_uInt16 nPos = 0;
+ sal_uInt16 nNewSize = ( nPrivTabCount > 0 ) ? (sal_uInt16)GetTab(0) : 0;
long nOffset=-GetXOffset();
nOldPos=nOffset;
@@ -240,16 +240,16 @@ void SvxSimpleTable::Paint( const Rectangle& rRect )
if(nPrivTabCount>aHeaderBar.GetItemCount())
nPrivTabCount=aHeaderBar.GetItemCount();
- for(USHORT i=1;i<nPrivTabCount;i++)
+ for(sal_uInt16 i=1;i<nPrivTabCount;i++)
{
- nNewSize = static_cast< USHORT >( GetTab(i) ) - nPos;
+ nNewSize = static_cast< sal_uInt16 >( GetTab(i) ) - nPos;
aHeaderBar.SetItemSize( i, nNewSize );
- nPos= static_cast< USHORT >( GetTab(i) );
+ nPos= static_cast< sal_uInt16 >( GetTab(i) );
}
}
- bPaintFlag=TRUE;
+ bPaintFlag=sal_True;
}
-void SvxSimpleTable::InsertHeaderEntry(const XubString& rText,USHORT nCol,
+void SvxSimpleTable::InsertHeaderEntry(const XubString& rText,sal_uInt16 nCol,
HeaderBarItemBits nBits)
{
xub_StrLen nEnd = rText.Search( sal_Unicode( '\t' ) );
@@ -290,7 +290,7 @@ void SvxSimpleTable::HideTable()
aPrivContainer.Hide();
}
-BOOL SvxSimpleTable::IsVisible() const
+sal_Bool SvxSimpleTable::IsVisible() const
{
return aPrivContainer.IsVisible();
}
@@ -305,7 +305,7 @@ void SvxSimpleTable::DisableTable()
aPrivContainer.Disable();
}
-BOOL SvxSimpleTable::IsEnabled() const
+sal_Bool SvxSimpleTable::IsEnabled() const
{
return aPrivContainer.IsEnabled();
}
@@ -359,12 +359,12 @@ void SvxSimpleTable::SetOutputSizePixel(const Size& rNewSize )
UpdateViewSize();
}
-USHORT SvxSimpleTable::GetSelectedCol()
+sal_uInt16 SvxSimpleTable::GetSelectedCol()
{
return (aHeaderBar.GetCurItemId()-1);
}
-void SvxSimpleTable::SortByCol(USHORT nCol,BOOL bDir)
+void SvxSimpleTable::SortByCol(sal_uInt16 nCol,sal_Bool bDir)
{
bSortDirection=bDir;
if(nSortCol!=0xFFFF)
@@ -393,7 +393,7 @@ void SvxSimpleTable::SortByCol(USHORT nCol,BOOL bDir)
void SvxSimpleTable::HBarClick()
{
- USHORT nId=aHeaderBar.GetCurItemId();
+ sal_uInt16 nId=aHeaderBar.GetCurItemId();
if (aHeaderBar.GetItemBits(nId) & HIB_CLICKABLE)
{
@@ -441,24 +441,24 @@ void SvxSimpleTable::HBarDrag()
void SvxSimpleTable::HBarEndDrag()
{
HideTracking();
- USHORT nPrivTabCount=TabCount();
- USHORT nPos=0;
- USHORT nNewSize=0;
+ sal_uInt16 nPrivTabCount=TabCount();
+ sal_uInt16 nPos=0;
+ sal_uInt16 nNewSize=0;
if(nPrivTabCount)
{
if(nPrivTabCount>aHeaderBar.GetItemCount())
nPrivTabCount=aHeaderBar.GetItemCount();
- //for(USHORT i=1;i<=nPrivTabCount;i++)
- for(USHORT i=1;i<nPrivTabCount;i++)
+ //for(sal_uInt16 i=1;i<=nPrivTabCount;i++)
+ for(sal_uInt16 i=1;i<nPrivTabCount;i++)
{
- nNewSize = static_cast< USHORT >( aHeaderBar.GetItemSize(i) ) + nPos;
+ nNewSize = static_cast< sal_uInt16 >( aHeaderBar.GetItemSize(i) ) + nPos;
SetTab( i, nNewSize, MAP_PIXEL );
nPos = nNewSize;
}
}
- bPaintFlag=FALSE;
+ bPaintFlag=sal_False;
Invalidate();
Update();
}
@@ -520,14 +520,14 @@ IMPL_LINK( SvxSimpleTable, HeaderBarDblClick, HeaderBar*, pCtr)
return 0;
}
-SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvLBoxEntry* pEntry, USHORT nPos ) const
+SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvLBoxEntry* pEntry, sal_uInt16 nPos ) const
{
DBG_ASSERT(pEntry,"GetEntryText:Invalid Entry");
SvLBoxItem* pItem = NULL;
if( pEntry )
{
- USHORT nCount = pEntry->ItemCount();
+ sal_uInt16 nCount = pEntry->ItemCount();
nPos++;
@@ -551,8 +551,8 @@ StringCompare SvxSimpleTable::ColCompare(SvLBoxEntry* pLeft,SvLBoxEntry* pRight)
if(pLeftItem != NULL && pRightItem != NULL)
{
- USHORT nLeftKind=pLeftItem->IsA();
- USHORT nRightKind=pRightItem->IsA();
+ sal_uInt16 nLeftKind=pLeftItem->IsA();
+ sal_uInt16 nRightKind=pRightItem->IsA();
if(nRightKind == SV_ITEM_ID_LBOXSTRING &&
nLeftKind == SV_ITEM_ID_LBOXSTRING )
diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx
index 479888463a5c..fe60ac939811 100644
--- a/svx/source/dialog/srchctrl.cxx
+++ b/svx/source/dialog/srchctrl.cxx
@@ -47,7 +47,7 @@
SvxSearchController::SvxSearchController
(
- USHORT _nId,
+ sal_uInt16 _nId,
SfxBindings& rBind,
SvxSearchDialog& rDlg
) :
@@ -59,7 +59,7 @@ SvxSearchController::SvxSearchController
// -----------------------------------------------------------------------
-void SvxSearchController::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState )
{
if ( SFX_ITEM_AVAILABLE == eState )
@@ -74,7 +74,7 @@ void SvxSearchController::StateChanged( USHORT nSID, SfxItemState eState,
else if ( SID_SEARCH_OPTIONS == nSID )
{
DBG_ASSERT( pState->ISA(SfxUInt16Item), "wrong item type" );
- USHORT nFlags = (USHORT)( (SfxUInt16Item*)pState )->GetValue();
+ sal_uInt16 nFlags = (sal_uInt16)( (SfxUInt16Item*)pState )->GetValue();
rSrchDlg.EnableControls_Impl( nFlags );
}
else if ( SID_SEARCH_ITEM == nSID )
diff --git a/svx/source/dialog/srchctrl.hxx b/svx/source/dialog/srchctrl.hxx
index 107280743ba6..6320ddeb8420 100644
--- a/svx/source/dialog/srchctrl.hxx
+++ b/svx/source/dialog/srchctrl.hxx
@@ -40,10 +40,10 @@ class SvxSearchController : public SfxControllerItem
SvxSearchDialog& rSrchDlg;
protected:
- virtual void StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState );
public:
- SvxSearchController( USHORT nId, SfxBindings& rBnd, SvxSearchDialog& rDlg );
+ SvxSearchController( sal_uInt16 nId, SfxBindings& rBnd, SvxSearchDialog& rDlg );
};
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 9f6d606dc759..ef74f059fdbd 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -119,11 +119,11 @@ struct SearchDlg_Impl
FixedText aSearchFormats;
FixedText aReplaceFormats;
- BOOL bMultiLineEdit : 1,
+ sal_Bool bMultiLineEdit : 1,
bSaveToModule : 1,
bFocusOnSearch : 1,
bDeltaCalculated : 1;
- USHORT* pRanges;
+ sal_uInt16* pRanges;
Timer aSelectionTimer;
uno::Reference< frame::XDispatch > xCommand1Dispatch;
@@ -138,10 +138,10 @@ struct SearchDlg_Impl
#endif /* !ENABLE_LAYOUT */
aSearchFormats ( pParent, SVX_RES( FT_SEARCH_FORMATS ) ),
aReplaceFormats ( pParent, SVX_RES( FT_REPLACE_FORMATS ) ),
- bMultiLineEdit ( FALSE ),
- bSaveToModule ( TRUE ),
- bFocusOnSearch ( TRUE ),
- bDeltaCalculated( FALSE ),
+ bMultiLineEdit ( sal_False ),
+ bSaveToModule ( sal_True ),
+ bFocusOnSearch ( sal_True ),
+ bDeltaCalculated( sal_False ),
pRanges ( NULL )
{
aCommand1URL.Complete = aCommand1URL.Main = rtl::OUString::createFromAscii("vnd.sun.search:SearchViaComponent1");
@@ -156,14 +156,14 @@ struct SearchDlg_Impl
// -----------------------------------------------------------------------
-void ListToStrArr_Impl( USHORT nId, SvStringsDtor& rStrLst, ComboBox& rCBox )
+void ListToStrArr_Impl( sal_uInt16 nId, SvStringsDtor& rStrLst, ComboBox& rCBox )
{
SfxStringListItem* pSrchItem =
(SfxStringListItem*)SFX_APP()->GetItem( nId );
List* pLst = pSrchItem ? pSrchItem->GetList() : 0;
if ( pLst )
- for ( USHORT i = 0; i < pLst->Count(); ++i )
+ for ( sal_uInt16 i = 0; i < pLst->Count(); ++i )
{
String* pTmp = new String( *(String*)( pLst->GetObject(i) ) );
rStrLst.Insert( pTmp, rStrLst.Count() );
@@ -173,12 +173,12 @@ void ListToStrArr_Impl( USHORT nId, SvStringsDtor& rStrLst, ComboBox& rCBox )
// -----------------------------------------------------------------------
-void StrArrToList_Impl( USHORT nId, const SvStringsDtor& rStrLst )
+void StrArrToList_Impl( sal_uInt16 nId, const SvStringsDtor& rStrLst )
{
DBG_ASSERT( rStrLst.Count(), "vorher abpruefen!!" );
List aLst;
- for ( USHORT i = 0; i < rStrLst.Count(); ++i )
+ for ( sal_uInt16 i = 0; i < rStrLst.Count(); ++i )
aLst.Insert( rStrLst[ i ], LIST_APPEND );
SFX_APP()->PutItem( SfxStringListItem( nId, &aLst ) );
@@ -188,13 +188,13 @@ void StrArrToList_Impl( USHORT nId, const SvStringsDtor& rStrLst )
SearchAttrItemList::SearchAttrItemList( const SearchAttrItemList& rList ) :
- SrchAttrItemList( (BYTE)rList.Count() )
+ SrchAttrItemList( (sal_uInt8)rList.Count() )
{
SrchAttrItemList::Insert( &rList, 0 );
SearchAttrItem* _pData = (SearchAttrItem*)GetData();
- for ( USHORT i = Count(); i; --i, ++_pData )
+ for ( sal_uInt16 i = Count(); i; --i, ++_pData )
if ( !IsInvalidItem( _pData->pItem ) )
_pData->pItem = _pData->pItem->Clone();
}
@@ -217,9 +217,9 @@ void SearchAttrItemList::Put( const SfxItemSet& rSet )
SfxItemIter aIter( rSet );
SearchAttrItem aItem;
const SfxPoolItem* pItem = aIter.GetCurItem();
- USHORT nWhich;
+ sal_uInt16 nWhich;
- while ( TRUE )
+ while ( sal_True )
{
// nur testen, ob vorhanden ist ?
if( IsInvalidItem( pItem ) )
@@ -249,7 +249,7 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet )
SfxItemPool* pPool = rSet.GetPool();
SearchAttrItem* _pData = (SearchAttrItem*)GetData();
- for ( USHORT i = Count(); i; --i, ++_pData )
+ for ( sal_uInt16 i = Count(); i; --i, ++_pData )
if ( IsInvalidItem( _pData->pItem ) )
rSet.InvalidateItem( pPool->GetWhich( _pData->nSlot ) );
else
@@ -263,7 +263,7 @@ void SearchAttrItemList::Clear()
{
SearchAttrItem* _pData = (SearchAttrItem*)GetData();
- for ( USHORT i = Count(); i; --i, ++_pData )
+ for ( sal_uInt16 i = Count(); i; --i, ++_pData )
if ( !IsInvalidItem( _pData->pItem ) )
delete _pData->pItem;
SrchAttrItemList::Remove( 0, Count() );
@@ -272,13 +272,13 @@ void SearchAttrItemList::Clear()
// -----------------------------------------------------------------------
// l"oscht die Pointer auf die Items
-void SearchAttrItemList::Remove( USHORT nPos, USHORT nLen )
+void SearchAttrItemList::Remove( sal_uInt16 nPos, sal_uInt16 nLen )
{
if ( nPos + nLen > Count() )
nLen = Count() - nPos;
SearchAttrItem* _pData = (SearchAttrItem*)GetData() + nPos;
- for ( USHORT n = nLen; n; --n, ++_pData )
+ for ( sal_uInt16 n = nLen; n; --n, ++_pData )
if ( !IsInvalidItem( _pData->pItem ) )
delete _pData->pItem;
@@ -341,13 +341,13 @@ void SearchAttrItemList::Remove( USHORT nPos, USHORT nLen )
aColumnsBtn ( this, SVX_RES( RB_CALC_COLUMNS ) ), \
aAllSheetsCB ( this, SVX_RES( CB_ALL_SHEETS ) ), \
rBindings ( rBind ), \
- bWriter ( FALSE ), \
- bSearch ( TRUE ), \
- bFormat ( FALSE ), \
+ bWriter ( sal_False ), \
+ bSearch ( sal_True ), \
+ bFormat ( sal_False ), \
nOptions ( USHRT_MAX ), \
- bSet ( FALSE ), \
- bReadOnly ( FALSE ), \
- bConstruct ( TRUE ), \
+ bSet ( sal_False ), \
+ bReadOnly ( sal_False ), \
+ bConstruct ( sal_True ), \
nModifyFlag ( 0 ), \
aCalcStr ( THIS_SVX_RES( STR_WORDCALC ) ), \
pImpl ( NULL ), \
@@ -486,7 +486,7 @@ void SvxSearchDialog::Construct_Impl()
SvtCJKOptions aCJKOptions;
if(!aCJKOptions.IsJapaneseFindEnabled())
{
- aJapOptionsCB.Check( FALSE );
+ aJapOptionsCB.Check( sal_False );
aJapOptionsCB.Hide();
aJapOptionsBtn.Hide();
}
@@ -616,7 +616,7 @@ void SvxSearchDialog::Construct_Impl()
// -----------------------------------------------------------------------
-BOOL SvxSearchDialog::Close()
+sal_Bool SvxSearchDialog::Close()
{
// remember strings speichern
if ( aSearchStrings.Count() )
@@ -641,12 +641,12 @@ BOOL SvxSearchDialog::Close()
rBindings.GetDispatcher()->Execute( FID_SEARCH_OFF, SFX_CALLMODE_SLOT, ppArgs );
rBindings.Execute( SID_SEARCH_DLG );
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------
-INT32 SvxSearchDialog::GetTransliterationFlags() const
+sal_Int32 SvxSearchDialog::GetTransliterationFlags() const
{
if (!aMatchCaseCB.IsChecked())
nTransliterationFlags |= TransliterationModules_IGNORE_CASE;
@@ -661,10 +661,10 @@ INT32 SvxSearchDialog::GetTransliterationFlags() const
// -----------------------------------------------------------------------
-void SvxSearchDialog::ApplyTransliterationFlags_Impl( INT32 nSettings )
+void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings )
{
nTransliterationFlags = nSettings;
- BOOL bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE);
+ sal_Bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE);
aMatchCaseCB .Check(!bVal );
bVal = 0 != (nSettings & TransliterationModules_IGNORE_WIDTH);
aJapMatchFullHalfWidthCB.Check( !bVal );
@@ -688,9 +688,9 @@ void SvxSearchDialog::Activate()
void SvxSearchDialog::InitControls_Impl()
{
// CaseSensitives AutoComplete
- aSearchLB.EnableAutocomplete( TRUE, TRUE );
+ aSearchLB.EnableAutocomplete( sal_True, sal_True );
aSearchLB.Show();
- aReplaceLB.EnableAutocomplete( TRUE, TRUE );
+ aReplaceLB.EnableAutocomplete( sal_True, sal_True );
aReplaceLB.Show();
aFormatBtn.Disable();
@@ -790,9 +790,9 @@ void SvxSearchDialog::CalculateDelta_Impl()
if ( pImpl->bDeltaCalculated )
return;
else
- pImpl->bDeltaCalculated = TRUE;
+ pImpl->bDeltaCalculated = sal_True;
- ULONG nDelta = 187, nOffset = 0;
+ sal_uIntPtr nDelta = 187, nOffset = 0;
SvtCJKOptions aCJKOptions;
pMoreBtn->AddWindow( &aOptionsFL );
@@ -931,7 +931,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
DBG_ASSERT( pSearchItem, "SearchItem == 0" );
bWriter = ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_WRITER );
- pImpl->bMultiLineEdit = FALSE;
+ pImpl->bMultiLineEdit = sal_False;
if ( !pImpl->bMultiLineEdit )
{
@@ -979,7 +979,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
CalculateDelta_Impl();
- FASTBOOL bDraw = FALSE;
+ int bDraw = sal_False;
if ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC )
{
Link aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl );
@@ -1037,7 +1037,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
aFormatBtn.Hide();
aNoFormatBtn.Hide();
aAttributeBtn.Hide();
- bDraw = TRUE;
+ bDraw = sal_True;
}
else
{
@@ -1063,7 +1063,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
aAttributeBtn.Show();
*/
}
-// pMoreBtn->SetState( FALSE );
+// pMoreBtn->SetState( sal_False );
// pMoreBtn->Hide();
}
@@ -1076,25 +1076,25 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
// "Ahnlichkeitssuche?
if ( ( nModifyFlag & MODIFY_SIMILARITY ) == 0 )
aSimilarityBox.Check( pSearchItem->IsLevenshtein() );
- bSet = TRUE;
+ bSet = sal_True;
- pImpl->bSaveToModule = FALSE;
+ pImpl->bSaveToModule = sal_False;
FlagHdl_Impl( &aSimilarityBox );
FlagHdl_Impl( &aJapOptionsCB );
- pImpl->bSaveToModule = TRUE;
+ pImpl->bSaveToModule = sal_True;
- FASTBOOL bDisableSearch = FALSE;
+ int bDisableSearch = sal_False;
SfxViewShell* pViewShell = SfxViewShell::Current();
if ( pViewShell )
{
- BOOL bText = !bSearchPattern;
+ sal_Bool bText = !bSearchPattern;
if ( pViewShell->HasSelection( bText ) )
EnableControl_Impl( &aSelectionBtn );
else
{
- aSelectionBtn.Check( FALSE );
+ aSelectionBtn.Check( sal_False );
aSelectionBtn.Disable();
}
}
@@ -1142,14 +1142,14 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
}
else
{
- FASTBOOL bSetSearch = ( ( nModifyFlag & MODIFY_SEARCH ) == 0 );
- FASTBOOL bSetReplace = ( ( nModifyFlag & MODIFY_REPLACE ) == 0 );
+ int bSetSearch = ( ( nModifyFlag & MODIFY_SEARCH ) == 0 );
+ int bSetReplace = ( ( nModifyFlag & MODIFY_REPLACE ) == 0 );
if ( pSearchItem->GetSearchString().Len() && bSetSearch )
aSearchLB.SetText( pSearchItem->GetSearchString() );
else if ( aSearchStrings.Count() )
{
- FASTBOOL bAttributes =
+ int bAttributes =
( ( pSearchList && pSearchList->Count() ) ||
( pReplaceList && pReplaceList->Count() ) );
@@ -1232,9 +1232,9 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern )
if ( aLayoutBtn.IsChecked() )
{
- pImpl->bSaveToModule = FALSE;
+ pImpl->bSaveToModule = sal_False;
TemplateHdl_Impl( &aLayoutBtn );
- pImpl->bSaveToModule = TRUE;
+ pImpl->bSaveToModule = sal_True;
}
}
@@ -1249,8 +1249,8 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
if ( !pImpl->pRanges && pSSet )
{
sal_sSize nCnt = 0;
- const USHORT* pPtr = pSSet->GetRanges();
- const USHORT* pTmp = pPtr;
+ const sal_uInt16* pPtr = pSSet->GetRanges();
+ const sal_uInt16* pTmp = pPtr;
while( *pPtr )
{
@@ -1258,8 +1258,8 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
pPtr += 2;
}
nCnt = pPtr - pTmp + 1;
- pImpl->pRanges = new USHORT[nCnt];
- memcpy( pImpl->pRanges, pTmp, sizeof(USHORT) * nCnt );
+ pImpl->pRanges = new sal_uInt16[nCnt];
+ memcpy( pImpl->pRanges, pTmp, sizeof(sal_uInt16) * nCnt );
}
// sorge daf"ur, das die Texte der Attribute richtig stehen
@@ -1275,12 +1275,12 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
pSearchList->Put( *pSSet );
if ( !pImpl->bMultiLineEdit )
- aSearchAttrText.SetText( BuildAttrText_Impl( aDesc, TRUE ) );
+ aSearchAttrText.SetText( BuildAttrText_Impl( aDesc, sal_True ) );
else
- pImpl->aSearchFormats.SetText( BuildAttrText_Impl( aDesc, TRUE ) );
+ pImpl->aSearchFormats.SetText( BuildAttrText_Impl( aDesc, sal_True ) );
if ( aDesc.Len() )
- bFormat |= TRUE;
+ bFormat |= sal_True;
}
}
@@ -1294,12 +1294,12 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
pReplaceList->Put( *pRSet );
if ( !pImpl->bMultiLineEdit )
- aReplaceAttrText.SetText( BuildAttrText_Impl( aDesc, FALSE ) );
+ aReplaceAttrText.SetText( BuildAttrText_Impl( aDesc, sal_False ) );
else
- pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( aDesc, FALSE ) );
+ pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( aDesc, sal_False ) );
if ( aDesc.Len() )
- bFormat |= TRUE;
+ bFormat |= sal_True;
}
}
}
@@ -1311,23 +1311,23 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
if ( pCtrl && !bSet )
SetModifyFlag_Impl( pCtrl );
else
- bSet = FALSE;
+ bSet = sal_False;
if ( pCtrl == &aSimilarityBox )
{
- BOOL bIsChecked = aSimilarityBox.IsChecked();
+ sal_Bool bIsChecked = aSimilarityBox.IsChecked();
if ( bIsChecked )
{
aSimilarityBtn.Enable();
- aRegExpBtn.Check( FALSE );
+ aRegExpBtn.Check( sal_False );
aRegExpBtn.Disable();
EnableControl_Impl( &aWordBtn );
if ( aLayoutBtn.IsChecked() )
{
EnableControl_Impl( &aMatchCaseCB );
- aLayoutBtn.Check( FALSE );
+ aLayoutBtn.Check( sal_False );
}
aRegExpBtn.Disable();
aLayoutBtn.Disable();
@@ -1365,11 +1365,11 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
{
if ( aLayoutBtn.IsChecked() && !bFormat )
{
- aWordBtn.Check( FALSE );
+ aWordBtn.Check( sal_False );
aWordBtn.Disable();
- aRegExpBtn.Check( FALSE );
+ aRegExpBtn.Check( sal_False );
aRegExpBtn.Disable();
- aMatchCaseCB.Check( FALSE );
+ aMatchCaseCB.Check( sal_False );
aMatchCaseCB.Disable();
aNotesBtn.Disable();
@@ -1389,7 +1389,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
if ( aRegExpBtn.IsChecked() )
{
- aWordBtn.Check( FALSE );
+ aWordBtn.Check( sal_False );
aWordBtn.Disable();
aSimilarityBox.Disable();
aSimilarityBtn.Disable();
@@ -1401,7 +1401,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
}
// Such-String vorhanden? dann Buttons enablen
- bSet = TRUE;
+ bSet = sal_True;
ModifyHdl_Impl( &aSearchLB );
}
}
@@ -1412,14 +1412,14 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
aSearchAllBtn.Disable();
else
{
- bSet = TRUE;
+ bSet = sal_True;
ModifyHdl_Impl( &aSearchLB );
}
}
if ( &aJapOptionsCB == pCtrl )
{
- BOOL bEnableJapOpt = aJapOptionsCB.IsChecked();
+ sal_Bool bEnableJapOpt = aJapOptionsCB.IsChecked();
aMatchCaseCB .Enable(!bEnableJapOpt );
aJapMatchFullHalfWidthCB.Enable(!bEnableJapOpt );
aJapOptionsBtn .Enable( bEnableJapOpt );
@@ -1434,7 +1434,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl )
IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
{
- FASTBOOL bInclusive = ( aLayoutBtn.GetText() == aLayoutStr );
+ int bInclusive = ( aLayoutBtn.GetText() == aLayoutStr );
if ( ( pBtn == &aSearchBtn ) ||
( pBtn == &aSearchAllBtn ) ||
@@ -1452,22 +1452,22 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
pSearchItem->SetReplaceString( aReplaceLB.GetText() );
if ( pBtn == &aReplaceBtn )
- Remember_Impl( aReplaceLB.GetText(), FALSE );
+ Remember_Impl( aReplaceLB.GetText(), sal_False );
else
{
- Remember_Impl( aSearchLB.GetText(), TRUE );
+ Remember_Impl( aSearchLB.GetText(), sal_True );
if ( pBtn == &aReplaceAllBtn )
- Remember_Impl( aReplaceLB.GetText(), FALSE );
+ Remember_Impl( aReplaceLB.GetText(), sal_False );
}
}
- pSearchItem->SetRegExp( FALSE );
- pSearchItem->SetLevenshtein( FALSE );
+ pSearchItem->SetRegExp( sal_False );
+ pSearchItem->SetLevenshtein( sal_False );
if (GetCheckBoxValue( aRegExpBtn ))
- pSearchItem->SetRegExp( TRUE );
+ pSearchItem->SetRegExp( sal_True );
else if (GetCheckBoxValue( aSimilarityBox ))
- pSearchItem->SetLevenshtein( TRUE );
+ pSearchItem->SetLevenshtein( sal_True );
pSearchItem->SetWordOnly( GetCheckBoxValue( aWordBtn ) );
pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) );
@@ -1476,7 +1476,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
pSearchItem->SetSelection( GetCheckBoxValue( aSelectionBtn ) );
pSearchItem->SetUseAsianOptions( GetCheckBoxValue( aJapOptionsCB ) );
- INT32 nFlags = GetTransliterationFlags();
+ sal_Int32 nFlags = GetTransliterationFlags();
if( !pSearchItem->IsUseAsianOptions())
nFlags &= (TransliterationModules_IGNORE_CASE |
TransliterationModules_IGNORE_WIDTH );
@@ -1520,11 +1520,11 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
String aStr( aSearchLB.GetText() );
if ( aStr.Len() )
- Remember_Impl( aStr, TRUE );
+ Remember_Impl( aStr, sal_True );
aStr = aReplaceLB.GetText();
if ( aStr.Len() )
- Remember_Impl( aStr, FALSE );
+ Remember_Impl( aStr, sal_False );
}
SaveToModule_Impl();
Close();
@@ -1570,7 +1570,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn )
int nRet = aDlg->Execute(); //CHINA001 int nRet = aDlg.Execute();
if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true
{
- INT32 nFlags = aDlg->GetTransliterationFlags(); //CHINA001 INT32 nFlags = aDlg.GetTransliterationFlags();
+ sal_Int32 nFlags = aDlg->GetTransliterationFlags(); //CHINA001 sal_Int32 nFlags = aDlg.GetTransliterationFlags();
pSearchItem->SetTransliterationFlags( nFlags );
ApplyTransliterationFlags_Impl( nFlags );
}
@@ -1607,7 +1607,7 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd )
if ( !bSet )
SetModifyFlag_Impl( pEd );
else
- bSet = FALSE;
+ bSet = sal_False;
if ( pEd == &aSearchLB || pEd == &aReplaceLB )
{
@@ -1657,7 +1657,7 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG )
{
if ( !pFamilyController )
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
// Vorlagen-Controller enablen
switch ( pSearchItem->GetFamily() )
@@ -1724,13 +1724,13 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG )
if ( !pImpl->bMultiLineEdit )
{
- aSearchAttrText.SetText( BuildAttrText_Impl( sDesc, TRUE ) );
- aReplaceAttrText.SetText( BuildAttrText_Impl( sDesc, FALSE ) );
+ aSearchAttrText.SetText( BuildAttrText_Impl( sDesc, sal_True ) );
+ aReplaceAttrText.SetText( BuildAttrText_Impl( sDesc, sal_False ) );
}
else
{
- pImpl->aSearchFormats.SetText( BuildAttrText_Impl( sDesc, TRUE ) );
- pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( sDesc, FALSE ) );
+ pImpl->aSearchFormats.SetText( BuildAttrText_Impl( sDesc, sal_True ) );
+ pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( sDesc, sal_False ) );
}
EnableControl_Impl( &aFormatBtn );
@@ -1739,16 +1739,16 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG )
FocusHdl_Impl( bSearch ? &aSearchLB : &aReplaceLB );
}
- bSet = TRUE;
- pImpl->bSaveToModule = FALSE;
+ bSet = sal_True;
+ pImpl->bSaveToModule = sal_False;
FlagHdl_Impl( &aLayoutBtn );
- pImpl->bSaveToModule = TRUE;
+ pImpl->bSaveToModule = sal_True;
return 0;
}
// -----------------------------------------------------------------------
-void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch )
+void SvxSearchDialog::Remember_Impl( const String &rStr,sal_Bool _bSearch )
{
if ( !rStr.Len() )
return;
@@ -1757,7 +1757,7 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch )
ComboBox* pListBox = _bSearch ? &aSearchLB : &aReplaceLB;
// identische Strings ignorieren
- for ( USHORT i = 0; i < pArr->Count(); ++i )
+ for ( sal_uInt16 i = 0; i < pArr->Count(); ++i )
{
if ( COMPARE_EQUAL == (*pArr)[i]->CompareTo( rStr ) )
return;
@@ -1769,7 +1769,7 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch )
if ( pArr->Count() >= REMEMBER_SIZE )
{
pInsStr = (*pArr)[REMEMBER_SIZE - 1];
- pListBox->RemoveEntry( USHORT(REMEMBER_SIZE - 1) );
+ pListBox->RemoveEntry( sal_uInt16(REMEMBER_SIZE - 1) );
pArr->Remove( REMEMBER_SIZE - 1 );
*pInsStr = rStr;
}
@@ -1784,14 +1784,14 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch )
void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool )
{
-// SetUpdateMode( FALSE );
+// SetUpdateMode( sal_False );
String aOldSrch( aSearchTmplLB .GetSelectEntry() );
String aOldRepl( aReplaceTmplLB.GetSelectEntry() );
aSearchTmplLB .Clear();
aReplaceTmplLB.Clear();
rPool.SetSearchMask( pSearchItem->GetFamily(), SFXSTYLEBIT_ALL );
- aSearchTmplLB.SetUpdateMode( FALSE );
- aReplaceTmplLB.SetUpdateMode( FALSE );
+ aSearchTmplLB.SetUpdateMode( sal_False );
+ aReplaceTmplLB.SetUpdateMode( sal_False );
SfxStyleSheetBase* pBase = rPool.First();
while ( pBase )
@@ -1801,8 +1801,8 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool )
aReplaceTmplLB.InsertEntry( pBase->GetName() );
pBase = rPool.Next();
}
- aSearchTmplLB.SetUpdateMode( TRUE );
- aReplaceTmplLB.SetUpdateMode( TRUE );
+ aSearchTmplLB.SetUpdateMode( sal_True );
+ aReplaceTmplLB.SetUpdateMode( sal_True );
aSearchTmplLB.SelectEntryPos(0);
if ( aOldSrch.Len() )
@@ -1820,12 +1820,12 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool )
EnableControl_Impl( &aReplaceAllBtn );
}
// FlagHdl_Impl(0);
-// SetUpdateMode( TRUE );
+// SetUpdateMode( sal_True );
}
// -----------------------------------------------------------------------
-void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags )
+void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags )
{
if ( nFlags == nOptions )
return;
@@ -1842,19 +1842,19 @@ void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags )
}
else if ( !IsVisible() )
Show();
- FASTBOOL bNoSearch = TRUE;
+ int bNoSearch = sal_True;
sal_Bool bEnableSearch = ( SEARCH_OPTIONS_SEARCH & nOptions ) != 0;
aSearchBtn.Enable(bEnableSearch);
if( bEnableSearch )
- bNoSearch = FALSE;
+ bNoSearch = sal_False;
if ( ( SEARCH_OPTIONS_SEARCH_ALL & nOptions ) != 0 )
{
aSearchAllBtn.Enable();
- bNoSearch = FALSE;
+ bNoSearch = sal_False;
}
else
aSearchAllBtn.Disable();
@@ -1864,7 +1864,7 @@ void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags )
aReplaceText.Enable();
aReplaceLB.Enable();
aReplaceTmplLB.Enable();
- bNoSearch = FALSE;
+ bNoSearch = sal_False;
}
else
{
@@ -1876,7 +1876,7 @@ void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags )
if ( ( SEARCH_OPTIONS_REPLACE_ALL & nOptions ) != 0 )
{
aReplaceAllBtn.Enable();
- bNoSearch = FALSE;
+ bNoSearch = sal_False;
}
else
aReplaceAllBtn.Disable();
@@ -1933,7 +1933,7 @@ void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags )
pMoreBtn->Enable();
else
{
- pMoreBtn->SetState( FALSE );
+ pMoreBtn->SetState( sal_False );
pMoreBtn->Disable();
}
*/
@@ -2072,9 +2072,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
if ( pCtrl == &aSearchLB || pCtrl == &pImpl->aSearchFormats )
{
if ( pCtrl->HasChildPathFocus() )
- pImpl->bFocusOnSearch = TRUE;
+ pImpl->bFocusOnSearch = sal_True;
pCtrl = &aSearchLB;
- bSearch = TRUE;
+ bSearch = sal_True;
if( nTxtLen )
EnableControl_Impl( &aNoFormatBtn );
@@ -2084,9 +2084,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
}
else
{
- pImpl->bFocusOnSearch = FALSE;
+ pImpl->bFocusOnSearch = sal_False;
pCtrl = &aReplaceLB;
- bSearch = FALSE;
+ bSearch = sal_False;
if ( ( !pImpl->bMultiLineEdit && aReplaceAttrText.GetText().Len() ) ||
( pImpl->bMultiLineEdit && pImpl->aReplaceFormats.GetText().Len() ) )
@@ -2095,7 +2095,7 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl )
aNoFormatBtn.Disable();
aAttributeBtn.Disable();
}
- bSet = TRUE;
+ bSet = sal_True;
aSearchLB.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
@@ -2125,14 +2125,14 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
return 0;
sal_sSize nCnt = 0;
- const USHORT* pPtr = pImpl->pRanges;
- const USHORT* pTmp = pPtr;
+ const sal_uInt16* pPtr = pImpl->pRanges;
+ const sal_uInt16* pTmp = pPtr;
while( *pTmp )
pTmp++;
nCnt = pTmp - pPtr + 7;
- USHORT* pWhRanges = new USHORT[nCnt];
- USHORT nPos = 0;
+ sal_uInt16* pWhRanges = new sal_uInt16[nCnt];
+ sal_uInt16 nPos = 0;
while( *pPtr )
{
@@ -2142,7 +2142,7 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
pWhRanges[nPos++] = SID_ATTR_PARA_MODEL;
pWhRanges[nPos++] = SID_ATTR_PARA_MODEL;
- USHORT nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH);
+ sal_uInt16 nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH);
pWhRanges[nPos++] = nBrushWhich;
pWhRanges[nPos++] = nBrushWhich;
pWhRanges[nPos++] = SID_PARA_BACKGRND_DESTINATION;
@@ -2188,10 +2188,10 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
SearchAttrItem* pAItem;
const SfxPoolItem* pItem;
- for( USHORT n = 0; n < pList->Count(); ++n )
+ for( sal_uInt16 n = 0; n < pList->Count(); ++n )
if( !IsInvalidItem( (pAItem = &pList->GetObject(n))->pItem ) &&
SFX_ITEM_SET == aOutSet.GetItemState(
- pAItem->pItem->Which(), FALSE, &pItem ) )
+ pAItem->pItem->Which(), sal_False, &pItem ) )
{
delete pAItem->pItem;
pAItem->pItem = pItem->Clone();
@@ -2214,8 +2214,8 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG )
IMPL_LINK( SvxSearchDialog, NoFormatHdl_Impl, Button *, EMPTYARG )
{
aLayoutBtn.SetText( aStylesStr );
- bFormat = FALSE;
- aLayoutBtn.Check( FALSE );
+ bFormat = sal_False;
+ aLayoutBtn.Check( sal_False );
if ( bSearch )
{
@@ -2233,9 +2233,9 @@ IMPL_LINK( SvxSearchDialog, NoFormatHdl_Impl, Button *, EMPTYARG )
pImpl->aReplaceFormats.SetText( String() );
pReplaceList->Clear();
}
- pImpl->bSaveToModule = FALSE;
+ pImpl->bSaveToModule = sal_False;
TemplateHdl_Impl( &aLayoutBtn );
- pImpl->bSaveToModule = TRUE;
+ pImpl->bSaveToModule = sal_True;
aNoFormatBtn.Disable();
return 0;
}
@@ -2272,7 +2272,7 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer )
EnableControl_Impl( &aSelectionBtn );
else
{
- aSelectionBtn.Check( FALSE );
+ aSelectionBtn.Check( sal_False );
aSelectionBtn.Disable();
}
}
@@ -2314,7 +2314,7 @@ void SvxSearchDialog::GetReplaceItems( SfxItemSet& rSet )
// -----------------------------------------------------------------------
String& SvxSearchDialog::BuildAttrText_Impl( String& rStr,
- BOOL bSrchFlag ) const
+ sal_Bool bSrchFlag ) const
{
if ( rStr.Len() )
rStr.Erase();
@@ -2352,7 +2352,7 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr,
ResStringArray aAttrNames( SVX_RES( RID_ATTR_NAMES ) );
- for ( USHORT i = 0; i < pList->Count(); ++i )
+ for ( sal_uInt16 i = 0; i < pList->Count(); ++i )
{
const SearchAttrItem& rItem = pList->GetObject(i);
@@ -2390,7 +2390,7 @@ void SvxSearchDialog::PaintAttrText_Impl()
BuildAttrText_Impl( aDesc, bSearch );
if ( !bFormat && aDesc.Len() )
- bFormat = TRUE;
+ bFormat = sal_True;
if ( bSearch )
{
@@ -2464,15 +2464,15 @@ void SvxSearchDialog::SaveToModule_Impl()
{
pSearchItem->SetSearchString ( aSearchLB.GetText() );
pSearchItem->SetReplaceString( aReplaceLB.GetText() );
- Remember_Impl( aSearchLB.GetText(), TRUE );
+ Remember_Impl( aSearchLB.GetText(), sal_True );
}
- pSearchItem->SetRegExp( FALSE );
- pSearchItem->SetLevenshtein( FALSE );
+ pSearchItem->SetRegExp( sal_False );
+ pSearchItem->SetLevenshtein( sal_False );
if (GetCheckBoxValue( aRegExpBtn ))
- pSearchItem->SetRegExp( TRUE );
+ pSearchItem->SetRegExp( sal_True );
else if (GetCheckBoxValue( aSimilarityBox ))
- pSearchItem->SetLevenshtein( TRUE );
+ pSearchItem->SetLevenshtein( sal_True );
pSearchItem->SetWordOnly( GetCheckBoxValue( aWordBtn ) );
pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) );
@@ -2481,7 +2481,7 @@ void SvxSearchDialog::SaveToModule_Impl()
pSearchItem->SetSelection( GetCheckBoxValue( aSelectionBtn ) );
pSearchItem->SetUseAsianOptions( GetCheckBoxValue( aJapOptionsCB ) );
- INT32 nFlags = GetTransliterationFlags();
+ sal_Int32 nFlags = GetTransliterationFlags();
if( !pSearchItem->IsUseAsianOptions())
nFlags &= (TransliterationModules_IGNORE_CASE |
TransliterationModules_IGNORE_WIDTH );
@@ -2508,7 +2508,7 @@ SFX_IMPL_CHILDWINDOW(SvxSearchDialogWrapper, SID_SEARCH_DLG);
// -----------------------------------------------------------------------
-SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, USHORT nId,
+SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo )
: SfxChildWindow( _pParent, nId )
@@ -2522,7 +2522,7 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, USHORT nId,
pBindings->Update( SID_SEARCH_SEARCHSET );
pBindings->Update( SID_SEARCH_REPLACESET );
eChildAlignment = SFX_ALIGN_NOALIGNMENT;
- dialog->bConstruct = FALSE;
+ dialog->bConstruct = sal_False;
}
SvxSearchDialogWrapper::~SvxSearchDialogWrapper ()
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 482dc467d66c..dd4b03147445 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -121,7 +121,7 @@ static const sal_Unicode aBulletTypes[] =
static Font& lcl_GetDefaultBulletFont()
{
- static BOOL bInit = 0;
+ static sal_Bool bInit = 0;
static Font aDefBulletFont( UniString::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( "StarSymbol" ) ),
String(), Size( 0, 14 ) );
@@ -131,8 +131,8 @@ static Font& lcl_GetDefaultBulletFont()
aDefBulletFont.SetFamily( FAMILY_DONTKNOW );
aDefBulletFont.SetPitch( PITCH_DONTKNOW );
aDefBulletFont.SetWeight( WEIGHT_DONTKNOW );
- aDefBulletFont.SetTransparent( TRUE );
- bInit = TRUE;
+ aDefBulletFont.SetTransparent( sal_True );
+ bInit = sal_True;
}
return aDefBulletFont;
}
@@ -158,7 +158,7 @@ static void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType,
}
void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
{
- static USHORT __READONLY_DATA aLinesArr[] =
+ static sal_uInt16 __READONLY_DATA aLinesArr[] =
{
15, 10,
20, 30,
@@ -178,7 +178,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
OutputDevice* pDev = rUDEvt.GetDevice();
Rectangle aRect = rUDEvt.GetRect();
- USHORT nItemId = rUDEvt.GetItemId();
+ sal_uInt16 nItemId = rUDEvt.GetItemId();
long nRectWidth = aRect.GetWidth();
long nRectHeight = aRect.GetHeight();
Size aRectSize(nRectWidth, aRect.GetHeight());
@@ -227,7 +227,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
{
Point aStart(aBLPos.X() + nRectWidth *25 / 100,0);
Point aEnd(aBLPos.X() + nRectWidth * 9 / 10,0);
- for( USHORT i = 11; i < 100; i += 33)
+ for( sal_uInt16 i = 11; i < 100; i += 33)
{
aStart.Y() = aEnd.Y() = aBLPos.Y() + nRectHeight * i / 100;
pVDev->DrawLine(aStart, aEnd);
@@ -245,9 +245,9 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
NUM_PAGETYPE_BULLET == nPageType )
{
Point aStart(aBLPos.X() + nRectWidth / 9,0);
- for( USHORT i = 0; i < 3; i++ )
+ for( sal_uInt16 i = 0; i < 3; i++ )
{
- USHORT nY = 11 + i * 33;
+ sal_uInt16 nY = 11 + i * 33;
aStart.Y() = aBLPos.Y() + nRectHeight * nY / 100;
String sText;
if(nPageType == NUM_PAGETYPE_BULLET)
@@ -400,7 +400,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
#ifdef DBG_UTIL
catch(Exception&)
{
- static sal_Bool bAssert = FALSE;
+ static sal_Bool bAssert = sal_False;
if(!bAssert)
{
DBG_ERROR("exception in ::UserDraw");
@@ -427,13 +427,13 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
/* */
/**************************************************************************/
-SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nType ) :
+SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType ) :
ValueSet( pParent, rResId ),
aLineColor ( COL_LIGHTGRAY ),
nPageType ( nType ),
- bHTMLMode ( FALSE ),
+ bHTMLMode ( sal_False ),
pVDev ( NULL )
{
SetColCount( 4 );
@@ -441,7 +441,7 @@ SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nTy
SetStyle( GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER );
if(NUM_PAGETYPE_BULLET == nType)
{
- for ( USHORT i = 0; i < 8; i++ )
+ for ( sal_uInt16 i = 0; i < 8; i++ )
{
InsertItem( i + 1, i );
SetItemText( i + 1, SVX_RESSTR( RID_SVXSTR_BULLET_DESCRIPTIONS + i ) );
@@ -470,7 +470,7 @@ void SvxNumValueSet::SetNumberingSettings(
aLocale = rLocale;
if(aNum.getLength() > 8)
SetStyle( GetStyle()|WB_VSCROLL);
- for ( USHORT i = 0; i < aNum.getLength(); i++ )
+ for ( sal_uInt16 i = 0; i < aNum.getLength(); i++ )
{
InsertItem( i + 1, i );
if( i < 8 )
@@ -502,7 +502,7 @@ SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId/*, co
SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP ),
// rStrList ( rStrNames ),
- bGrfNotFound( FALSE )
+ bGrfNotFound( sal_False )
{
GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS);
@@ -531,7 +531,7 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
Rectangle aRect = rUDEvt.GetRect();
OutputDevice* pDev = rUDEvt.GetDevice();
- USHORT nItemId = rUDEvt.GetItemId();
+ sal_uInt16 nItemId = rUDEvt.GetItemId();
Point aBLPos = aRect.TopLeft();
int nRectHeight = aRect.GetHeight();
@@ -541,14 +541,14 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - 1,
&aGraphic, NULL))
{
- bGrfNotFound = TRUE;
+ bGrfNotFound = sal_True;
}
else
{
Point aPos(aBLPos.X() + 5, 0);
- for( USHORT i = 0; i < 3; i++ )
+ for( sal_uInt16 i = 0; i < 3; i++ )
{
- USHORT nY = 11 + i * 33;
+ sal_uInt16 nY = 11 + i * 33;
aPos.Y() = aBLPos.Y() + nRectHeight * nY / 100;
aGraphic.Draw( pDev, aPos, aSize );
}
@@ -564,7 +564,7 @@ IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG)
// nur, wenn eine Grafik nicht da war, muss formatiert werden
if(bGrfNotFound)
{
- bGrfNotFound = FALSE;
+ bGrfNotFound = sal_False;
Format();
}
Invalidate();
diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx
index 6d6d2cb126db..8a77fcfc6ef3 100644
--- a/svx/source/dialog/svxgrahicitem.cxx
+++ b/svx/source/dialog/svxgrahicitem.cxx
@@ -29,7 +29,7 @@
#include "precompiled_svx.hxx"
#include "svx/svxgrahicitem.hxx"
TYPEINIT1(SvxGraphicItem,SfxPoolItem);
-SvxGraphicItem::SvxGraphicItem( USHORT _nWhich, const Graphic& rGraphic )
+SvxGraphicItem::SvxGraphicItem( sal_uInt16 _nWhich, const Graphic& rGraphic )
: SfxPoolItem( _nWhich ), aGraphic( rGraphic )
{
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 0e79ff530e7c..71868d8cc031 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -56,7 +56,7 @@
#include <vcl/svapp.hxx>
#endif
#ifndef RULER_TAB_RTL
-#define RULER_TAB_RTL ((USHORT)0x0010)
+#define RULER_TAB_RTL ((sal_uInt16)0x0010)
#endif
#include <comphelper/uieventslogger.hxx>
@@ -112,7 +112,7 @@ void Debug_Impl(Window *pWin, SvxColumnItem& rColItem)
aTmp += String(ToMM(pWin, rColItem.GetLeft()));
aTmp += " ColRight: ";
aTmp += String(ToMM(pWin, rColItem.GetRight()));
- for(USHORT i = 0; i < rColItem.Count(); ++i) {
+ for(sal_uInt16 i = 0; i < rColItem.Count(); ++i) {
aTmp += " Start: ";
aTmp += String(ToMM(pWin, rColItem[i].nStart));
aTmp += " End: ";
@@ -146,7 +146,7 @@ void DebugTabStops_Impl(const SvxTabStopItem& rTabs)
String aTmp("Tabs: ");
// Def Tabs loeschen
- for(USHORT i = 0; i < rTabs.Count(); ++i)
+ for(sal_uInt16 i = 0; i < rTabs.Count(); ++i)
{
aTmp += String(rTabs[i].GetTabPos() / 56);
aTmp += " : ";
@@ -210,7 +210,7 @@ void RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const Stri
}
String sContent(String::CreateFromAscii(pDescription));
sContent += rText;
- USHORT nPos = pDebugWindow->GetLBox().InsertEntry(sContent);
+ sal_uInt16 nPos = pDebugWindow->GetLBox().InsertEntry(sContent);
pDebugWindow->GetLBox().SelectEntryPos(nPos);
pDebugWindow->GrabFocus();
}
@@ -228,9 +228,9 @@ void RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const Stri
#endif
struct SvxRuler_Impl {
- USHORT *pPercBuf;
- USHORT *pBlockBuf;
- USHORT nPercSize;
+ sal_uInt16 *pPercBuf;
+ sal_uInt16 *pBlockBuf;
+ sal_uInt16 nPercSize;
long nTotalDist;
long lOldWinPos;
long lMaxLeftLogic;
@@ -239,16 +239,16 @@ struct SvxRuler_Impl {
long lLastRMargin;
SvxProtectItem aProtectItem;
SfxBoolItem* pTextRTLItem;
- USHORT nControlerItems;
- USHORT nIdx;
- USHORT nColLeftPix, nColRightPix; // Pixelwerte fuer linken / rechten Rand
+ sal_uInt16 nControlerItems;
+ sal_uInt16 nIdx;
+ sal_uInt16 nColLeftPix, nColRightPix; // Pixelwerte fuer linken / rechten Rand
// bei Spalten; gepuffert, um Umrechenfehler
// zu vermeiden.
// Muesste vielleicht fuer weitere Werte
// aufgebohrt werden
- BOOL bIsTableRows : 1; // pColumnItem contains table rows instead of columns
+ sal_Bool bIsTableRows : 1; // pColumnItem contains table rows instead of columns
//#i24363# tab stops relative to indent
- BOOL bIsTabsRelativeToIndent : 1; // Tab stops relative to paragraph indent?
+ sal_Bool bIsTabsRelativeToIndent : 1; // Tab stops relative to paragraph indent?
SvxRuler_Impl() :
pPercBuf(0), pBlockBuf(0),
nPercSize(0), nTotalDist(0),
@@ -260,8 +260,8 @@ struct SvxRuler_Impl {
nIdx(0),
nColLeftPix(0), nColRightPix(0),
- bIsTableRows(FALSE),
- bIsTabsRelativeToIndent(TRUE)
+ bIsTableRows(sal_False),
+ bIsTabsRelativeToIndent(sal_True)
{
}
~SvxRuler_Impl()
@@ -270,22 +270,22 @@ struct SvxRuler_Impl {
delete[] pPercBuf; delete[] pBlockBuf; pPercBuf = 0;
delete pTextRTLItem;
}
- void SetPercSize(USHORT nSize);
+ void SetPercSize(sal_uInt16 nSize);
};
-void SvxRuler_Impl::SetPercSize(USHORT nSize)
+void SvxRuler_Impl::SetPercSize(sal_uInt16 nSize)
{
if(nSize > nPercSize)
{
delete[] pPercBuf;
delete[] pBlockBuf;
- pPercBuf = new USHORT[nPercSize = nSize];
- pBlockBuf = new USHORT[nPercSize = nSize];
+ pPercBuf = new sal_uInt16[nPercSize = nSize];
+ pBlockBuf = new sal_uInt16[nPercSize = nSize];
}
- size_t nSize2 = sizeof(USHORT) * nPercSize;
+ size_t nSize2 = sizeof(sal_uInt16) * nPercSize;
memset(pPercBuf, 0, nSize2);
memset(pBlockBuf, 0, nSize2);
}
@@ -321,7 +321,7 @@ SvxRuler::SvxRuler
Window* pParent, // StarView Parent
Window* pWin, // Ausgabefenster; wird fuer Umrechnung logische
// Einheiten <-> Pixel verwendet
- USHORT flags, // Anzeige Flags, siehe ruler.hxx
+ sal_uInt16 flags, // Anzeige Flags, siehe ruler.hxx
SfxBindings &rBindings, // zugeordnete Bindings
WinBits nWinStyle // StarView WinBits
)
@@ -338,7 +338,7 @@ SvxRuler::SvxRuler
pObjectItem(0),
pEditWin(pWin),
pRuler_Imp(new SvxRuler_Impl),
- bAppSetNullOffset(FALSE), //Wird der 0-Offset des Lineals
+ bAppSetNullOffset(sal_False), //Wird der 0-Offset des Lineals
//durch die appl. gesetzt?
lLogicNullOffset(0),
lAppNullOffset(LONG_MAX),
@@ -360,9 +360,9 @@ SvxRuler::SvxRuler
nDragOffset(0),
nMaxLeft(0),
nMaxRight(0),
- bValid(FALSE),
- bListening(FALSE),
- bActive(TRUE)
+ bValid(sal_False),
+ bListening(sal_False),
+ bActive(sal_True)
/*
[Beschreibung]
@@ -377,18 +377,18 @@ SvxRuler::SvxRuler
rBindings.EnterRegistrations();
// Unterstuetzte Items anlegen
- USHORT i = 0;
+ sal_uInt16 i = 0;
// Seitenraender
pCtrlItem[i++] = new SvxRulerItem(SID_RULER_LR_MIN_MAX, *this, rBindings);
if((nWinStyle & WB_VSCROLL) == WB_VSCROLL)
{
- bHorz = FALSE;
+ bHorz = sal_False;
pCtrlItem[i++] = new SvxRulerItem(SID_ATTR_LONG_ULSPACE, *this, rBindings);
}
else
{
- bHorz = TRUE;
+ bHorz = sal_True;
pCtrlItem[i++] = new SvxRulerItem(SID_ATTR_LONG_LRSPACE, *this, rBindings);
}
@@ -397,7 +397,7 @@ SvxRuler::SvxRuler
if((nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS)
{
- USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
+ sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
pCtrlItem[i++] = new SvxRulerItem(nTabStopId, *this, rBindings);
SetExtraType(RULER_EXTRA_TAB, nDefTabType);
}
@@ -418,7 +418,7 @@ SvxRuler::SvxRuler
pIndents[INDENT_RIGHT_MARGIN].nStyle = RULER_INDENT_BOTTOM;
pIndents[INDENT_LEFT_BORDER].nStyle = RULER_INDENT_BORDER;
pIndents[INDENT_RIGHT_BORDER].nStyle = RULER_INDENT_BORDER;
- for(USHORT nIn = 0; nIn < 7; nIn++)
+ for(sal_uInt16 nIn = 0; nIn < 7; nIn++)
pIndents[nIn].nPos = 0;
}
@@ -436,7 +436,7 @@ SvxRuler::SvxRuler
pObjectBorders = new RulerBorder[OBJECT_BORDER_COUNT];
size_t nSize = sizeof( RulerBorder ) * OBJECT_BORDER_COUNT;
memset(pObjectBorders, 0, nSize);
- for(USHORT nBorder = 0; nBorder < OBJECT_BORDER_COUNT; ++nBorder)
+ for(sal_uInt16 nBorder = 0; nBorder < OBJECT_BORDER_COUNT; ++nBorder)
{
pObjectBorders[nBorder].nPos = 0;
pObjectBorders[nBorder].nWidth = 0;
@@ -472,7 +472,7 @@ __EXPORT SvxRuler::~SvxRuler()
pBindings->EnterRegistrations();
- for(USHORT i = 0; i < CTRL_ITEM_COUNT && pCtrlItem[i]; ++i)
+ for(sal_uInt16 i = 0; i < CTRL_ITEM_COUNT && pCtrlItem[i]; ++i)
delete pCtrlItem[i];
delete[] pCtrlItem;
@@ -588,7 +588,7 @@ long SvxRuler::PixelAdjust(long nVal, long nValOld) const
}
-inline USHORT SvxRuler::GetObjectBordersOff(USHORT nIdx) const
+inline sal_uInt16 SvxRuler::GetObjectBordersOff(sal_uInt16 nIdx) const
{
return bHorz? nIdx: nIdx + 2;
}
@@ -606,7 +606,7 @@ void SvxRuler::UpdateFrame()
*/
{
- const USHORT nMarginStyle =
+ const sal_uInt16 nMarginStyle =
( pRuler_Imp->aProtectItem.IsSizeProtected() ||
pRuler_Imp->aProtectItem.IsPosProtected() ) ?
0 : RULER_MARGIN_SIZEABLE;
@@ -634,7 +634,7 @@ void SvxRuler::UpdateFrame()
else
lRight = pLRSpaceItem->GetRight();
- ULONG aWidth=
+ sal_uIntPtr aWidth=
ConvertHPosPixel(pPagePosItem->GetWidth() - lRight -
lLogicNullOffset + lAppNullOffset);
SetMargin2( aWidth, nMarginStyle );
@@ -671,8 +671,8 @@ void SvxRuler::UpdateFrame()
}
if(pColumnItem)
{
- pRuler_Imp->nColLeftPix = (USHORT) ConvertSizePixel(pColumnItem->GetLeft());
- pRuler_Imp->nColRightPix = (USHORT) ConvertSizePixel(pColumnItem->GetRight());
+ pRuler_Imp->nColLeftPix = (sal_uInt16) ConvertSizePixel(pColumnItem->GetLeft());
+ pRuler_Imp->nColRightPix = (sal_uInt16) ConvertSizePixel(pColumnItem->GetRight());
}
}
@@ -698,9 +698,9 @@ void SvxRuler::StartListening_Impl()
{
if(!bListening)
{
- bValid = FALSE;
+ bValid = sal_False;
StartListening(*pBindings);
- bListening = TRUE;
+ bListening = sal_True;
}
}
@@ -794,7 +794,7 @@ void SvxRuler::UpdateTextRTL(const SfxBoolItem* pItem)
void SvxRuler::Update
(
const SvxColumnItem *pItem, // neuer Wert
- USHORT nSID //Slot Id to identify NULL items
+ sal_uInt16 nSID //Slot Id to identify NULL items
)
/*
@@ -824,7 +824,7 @@ void SvxRuler::Update
//must not delete it
{
delete pColumnItem; pColumnItem = 0;
- pRuler_Imp->bIsTableRows = FALSE;
+ pRuler_Imp->bIsTableRows = sal_False;
}
StartListening_Impl();
}
@@ -847,8 +847,8 @@ void SvxRuler::UpdateColumns()
nBorderCount = pColumnItem->Count();
pBorders = new RulerBorder[nBorderCount];
}
- USHORT _nFlags = RULER_BORDER_VARIABLE;
- BOOL bProtectColumns =
+ sal_uInt16 _nFlags = RULER_BORDER_VARIABLE;
+ sal_Bool bProtectColumns =
pRuler_Imp->aProtectItem.IsSizeProtected() ||
pRuler_Imp->aProtectItem.IsPosProtected();
if( !bProtectColumns )
@@ -859,10 +859,10 @@ void SvxRuler::UpdateColumns()
if ( !bProtectColumns )
_nFlags |= RULER_BORDER_SIZEABLE;
- USHORT nBorders = pColumnItem->Count();
+ sal_uInt16 nBorders = pColumnItem->Count();
if(!pRuler_Imp->bIsTableRows)
--nBorders;
- for(USHORT i = 0; i < nBorders; ++i)
+ for(sal_uInt16 i = 0; i < nBorders; ++i)
{
pBorders[i].nStyle = _nFlags;
if(!(*pColumnItem)[i].bVisible)
@@ -922,7 +922,7 @@ void SvxRuler::UpdateObject()
pObjectBorders[3].nPos =
ConvertPosPixel(pObjectItem->GetEndY() - nMargin + lAppNullOffset);
- const USHORT nOff = GetObjectBordersOff(0);
+ const sal_uInt16 nOff = GetObjectBordersOff(0);
SetBorders(2, pObjectBorders + nOff);
}
else
@@ -953,7 +953,7 @@ void SvxRuler::UpdatePara()
// Abhaengigkeit zu PagePosItem
if(pParaItem && pPagePosItem && !pObjectItem)
{
- BOOL bRTLText = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+ sal_Bool bRTLText = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
// Erstzeileneinzug, ist negativ zum linken Absatzrand
long nLeftFrameMargin = GetLeftFrameMargin();
long nRightFrameMargin = GetRightFrameMargin();
@@ -1180,7 +1180,7 @@ long SvxRuler::GetDefTabDist() const
}
-USHORT ToSvTab_Impl(SvxTabAdjust eAdj)
+sal_uInt16 ToSvTab_Impl(SvxTabAdjust eAdj)
/*
[Beschreibung]
@@ -1202,7 +1202,7 @@ USHORT ToSvTab_Impl(SvxTabAdjust eAdj)
}
-SvxTabAdjust ToAttrTab_Impl(USHORT eAdj)
+SvxTabAdjust ToAttrTab_Impl(sal_uInt16 eAdj)
{
switch(eAdj) {
case RULER_TAB_LEFT: return SVX_TAB_ADJUST_LEFT ;
@@ -1231,7 +1231,7 @@ void SvxRuler::UpdateTabs()
{
// Puffer fuer DefaultTabStop
// Abstand letzter Tab <-> Rechter Absatzrand / DefaultTabDist
- BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+ sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
long nLeftFrameMargin = GetLeftFrameMargin();
long nRightFrameMargin = GetRightFrameMargin();
@@ -1250,10 +1250,10 @@ void SvxRuler::UpdateTabs()
long nDefTabDist = ConvertHPosPixel(lDefTabDist);
if( !nDefTabDist )
nDefTabDist = 1;
- const USHORT nDefTabBuf = lPosPixel > lRightIndent ||
+ const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent ||
lLastTab > lRightIndent
? 0
- : (USHORT)( (lRightIndent - lPosPixel) / nDefTabDist );
+ : (sal_uInt16)( (lRightIndent - lPosPixel) / nDefTabDist );
if(pTabStopItem->Count() + TAB_GAP + nDefTabBuf > nTabBufSize)
{
@@ -1264,7 +1264,7 @@ void SvxRuler::UpdateTabs()
}
nTabCount = 0;
- USHORT j;
+ sal_uInt16 j;
//#i24363# tab stops relative to indent
const long lRightPixMargin = ConvertSizePixel(nRightFrameMargin - nParaItemTxtLeft );
const long lParaIndentPix = ConvertSizePixel(lParaIndent);
@@ -1409,7 +1409,7 @@ void SvxRuler::SetNullOffsetLogic
)
{
lAppNullOffset = lLogicNullOffset - lVal;
- bAppSetNullOffset = TRUE;
+ bAppSetNullOffset = sal_True;
Ruler::SetNullOffset(ConvertSizePixel(lVal));
Update();
}
@@ -1474,7 +1474,7 @@ inline void SvxRuler::SetFrameLeft(long l)
*/
{
- BOOL bProtectColumns =
+ sal_Bool bProtectColumns =
pRuler_Imp->aProtectItem.IsSizeProtected() ||
pRuler_Imp->aProtectItem.IsPosProtected();
if(bAppSetNullOffset)
@@ -1583,9 +1583,9 @@ long SvxRuler::GetRightFrameMargin() const
{
if(pColumnItem)
{
- if(!IsActLastColumn( TRUE ))
+ if(!IsActLastColumn( sal_True ))
{
- long nRet = (*pColumnItem)[GetActRightColumn( TRUE )].nEnd;
+ long nRet = (*pColumnItem)[GetActRightColumn( sal_True )].nEnd;
if(pColumnItem->IsTable() && pParaBorderItem)
nRet -= pParaBorderItem->GetRight();
return nRet;
@@ -1603,7 +1603,7 @@ long SvxRuler::GetRightFrameMargin() const
l += pULSpaceItem->GetLower();
if(pParaBorderItem &&
- (!pColumnItem || pColumnItem->IsTable()||IsActLastColumn( TRUE )))
+ (!pColumnItem || pColumnItem->IsTable()||IsActLastColumn( sal_True )))
l += pParaBorderItem->GetRight();
if(bHorz)
@@ -1617,7 +1617,7 @@ long SvxRuler::GetRightFrameMargin() const
SVXRULER_SUPPORT_NEGATIVE_MARGINS )
#define TAB_FLAG ( pColumnItem && pColumnItem->IsTable() )
-long SvxRuler::GetCorrectedDragPos( BOOL bLeft, BOOL bRight )
+long SvxRuler::GetCorrectedDragPos( sal_Bool bLeft, sal_Bool bRight )
/*
[Beschreibung]
@@ -1631,7 +1631,7 @@ long SvxRuler::GetCorrectedDragPos( BOOL bLeft, BOOL bRight )
const long lNullPix = Ruler::GetNullOffset();
long lDragPos = GetDragPos() + lNullPix;
ADD_DEBUG_TEXT("lDragPos: ", String::CreateFromInt32(lDragPos))
- BOOL bHoriRows = bHorz && pRuler_Imp->bIsTableRows;
+ sal_Bool bHoriRows = bHorz && pRuler_Imp->bIsTableRows;
if((bLeft || (bHoriRows)) && lDragPos < nMaxLeft)
lDragPos = nMaxLeft;
else if((bRight||bHoriRows) && lDragPos > nMaxRight)
@@ -1643,7 +1643,7 @@ ADD_DEBUG_TEXT("lDragPos: ", String::CreateFromInt32(lDragPos))
void ModifyTabs_Impl
(
- USHORT nCount, // Anzahl Tabs
+ sal_uInt16 nCount, // Anzahl Tabs
RulerTab *pTabs, // Tab-Puffer
long lDiff // zu addierende Differenz
)
@@ -1656,7 +1656,7 @@ void ModifyTabs_Impl
*/
{
if( pTabs )
- for(USHORT i = 0; i < nCount; ++i) pTabs[i].nPos += lDiff;
+ for(sal_uInt16 i = 0; i < nCount; ++i) pTabs[i].nPos += lDiff;
}
@@ -1670,7 +1670,7 @@ void SvxRuler::DragMargin1()
*/
{
- const long lDragPos = GetCorrectedDragPos( !TAB_FLAG || !NEG_FLAG, TRUE );
+ const long lDragPos = GetCorrectedDragPos( !TAB_FLAG || !NEG_FLAG, sal_True );
DrawLine_Impl(lTabPos, ( TAB_FLAG && NEG_FLAG ) ? 3 : 7, bHorz);
if(pColumnItem&&
(//nDragType & DRAG_OBJECT_SIZE_LINEAR ||
@@ -1682,11 +1682,11 @@ void SvxRuler::AdjustMargin1(long lDiff)
{
const long nOld = bAppSetNullOffset? GetMargin1(): GetNullOffset();
const long lDragPos = lDiff;
- BOOL bProtectColumns =
+ sal_Bool bProtectColumns =
pRuler_Imp->aProtectItem.IsSizeProtected() ||
pRuler_Imp->aProtectItem.IsPosProtected();
- const USHORT nMarginStyle =
+ const sal_uInt16 nMarginStyle =
bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE;
if(!bAppSetNullOffset)
@@ -1711,7 +1711,7 @@ void SvxRuler::AdjustMargin1(long lDiff)
}
if(pColumnItem)
{
- for(USHORT i = 0; i < pColumnItem->Count()-1; ++i)
+ for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i)
pBorders[i].nPos -= _lDiff;
SetBorders(pColumnItem->Count()-1, pBorders);
if(pColumnItem->IsFirstAct())
@@ -1760,7 +1760,7 @@ void SvxRuler::AdjustMargin1(long lDiff)
if(pColumnItem)
{
- for(USHORT i = 0; i < pColumnItem->Count()-1; ++i)
+ for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i)
pBorders[i].nPos += _lDiff;
SetBorders(pColumnItem->Count()-1, pBorders);
if(pColumnItem->IsFirstAct())
@@ -1802,7 +1802,7 @@ void SvxRuler::DragMargin2()
*/
{
- const long lDragPos = GetCorrectedDragPos( TRUE, !TAB_FLAG || !NEG_FLAG);
+ const long lDragPos = GetCorrectedDragPos( sal_True, !TAB_FLAG || !NEG_FLAG);
DrawLine_Impl(lTabPos, ( TAB_FLAG && NEG_FLAG ) ? 5 : 7, bHorz);
long lDiff = lDragPos - GetMargin2();
@@ -1811,10 +1811,10 @@ void SvxRuler::DragMargin2()
nDragType & DRAG_OBJECT_SIZE_PROPORTIONAL))
DragBorders();
- BOOL bProtectColumns =
+ sal_Bool bProtectColumns =
pRuler_Imp->aProtectItem.IsSizeProtected() ||
pRuler_Imp->aProtectItem.IsPosProtected();
- const USHORT nMarginStyle =
+ const sal_uInt16 nMarginStyle =
bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE;
SetMargin2( lDragPos, nMarginStyle );
@@ -1836,7 +1836,7 @@ void SvxRuler::DragIndents()
*/
{
const long lDragPos = NEG_FLAG ? GetDragPos() : GetCorrectedDragPos();
- const USHORT nIdx = GetDragAryPos()+INDENT_GAP;
+ const sal_uInt16 nIdx = GetDragAryPos()+INDENT_GAP;
const long lDiff = pIndents[nIdx].nPos - lDragPos;
if((nIdx == INDENT_FIRST_LINE ||
@@ -1852,7 +1852,7 @@ void SvxRuler::DragIndents()
}
-void SvxRuler::DrawLine_Impl(long &_lTabPos, int nNew, BOOL Hori)
+void SvxRuler::DrawLine_Impl(long &_lTabPos, int nNew, sal_Bool Hori)
/*
[Beschreibung]
@@ -1922,9 +1922,9 @@ void SvxRuler::DragTabs()
*/
{
- long lDragPos = GetCorrectedDragPos(TRUE, FALSE);
+ long lDragPos = GetCorrectedDragPos(sal_True, sal_False);
- USHORT nIdx = GetDragAryPos()+TAB_GAP;
+ sal_uInt16 nIdx = GetDragAryPos()+TAB_GAP;
DrawLine_Impl(lTabPos, 7, bHorz);
long nDiff = lDragPos - pTabs[nIdx].nPos;
@@ -1932,7 +1932,7 @@ void SvxRuler::DragTabs()
if(nDragType & DRAG_OBJECT_SIZE_LINEAR)
{
- for(USHORT i = nIdx; i < nTabCount; ++i)
+ for(sal_uInt16 i = nIdx; i < nTabCount; ++i)
{
pTabs[i].nPos += nDiff;
// auf Maximum begrenzen
@@ -1946,7 +1946,7 @@ void SvxRuler::DragTabs()
{
pRuler_Imp->nTotalDist -= nDiff;
pTabs[nIdx].nPos = lDragPos;
- for(USHORT i = nIdx+1; i < nTabCount; ++i)
+ for(sal_uInt16 i = nIdx+1; i < nTabCount; ++i)
{
if(pTabs[i].nStyle & RULER_TAB_DEFAULT)
// bei den DefaultTabs kann abgebrochen werden
@@ -1972,28 +1972,28 @@ void SvxRuler::DragTabs()
-void SvxRuler::SetActive(BOOL bOn)
+void SvxRuler::SetActive(sal_Bool bOn)
{
if(bOn)
{
Activate();
-/* pBindings->Invalidate( SID_RULER_LR_MIN_MAX, TRUE, TRUE );
+/* pBindings->Invalidate( SID_RULER_LR_MIN_MAX, sal_True, sal_True );
pBindings->Update( SID_RULER_LR_MIN_MAX );
- pBindings->Invalidate( SID_ATTR_LONG_ULSPACE, TRUE, TRUE );
+ pBindings->Invalidate( SID_ATTR_LONG_ULSPACE, sal_True, sal_True );
pBindings->Update( SID_ATTR_LONG_ULSPACE );
- pBindings->Invalidate( SID_ATTR_LONG_LRSPACE, TRUE, TRUE );
+ pBindings->Invalidate( SID_ATTR_LONG_LRSPACE, sal_True, sal_True );
pBindings->Update( SID_ATTR_LONG_LRSPACE );
- pBindings->Invalidate( SID_RULER_PAGE_POS, TRUE, TRUE );
+ pBindings->Invalidate( SID_RULER_PAGE_POS, sal_True, sal_True );
pBindings->Update( SID_RULER_PAGE_POS );
- pBindings->Invalidate( SID_ATTR_TABSTOP, TRUE, TRUE );
+ pBindings->Invalidate( SID_ATTR_TABSTOP, sal_True, sal_True );
pBindings->Update( SID_ATTR_TABSTOP );
- pBindings->Invalidate( SID_ATTR_PARA_LRSPACE, TRUE, TRUE );
+ pBindings->Invalidate( SID_ATTR_PARA_LRSPACE, sal_True, sal_True );
pBindings->Update( SID_ATTR_PARA_LRSPACE );
- pBindings->Invalidate( SID_RULER_BORDERS, TRUE, TRUE );
+ pBindings->Invalidate( SID_RULER_BORDERS, sal_True, sal_True );
pBindings->Update( SID_RULER_BORDERS );
- pBindings->Invalidate( SID_RULER_OBJECT, TRUE, TRUE );
+ pBindings->Invalidate( SID_RULER_OBJECT, sal_True, sal_True );
pBindings->Update( SID_RULER_OBJECT );
- pBindings->Invalidate( SID_RULER_PROTECT, TRUE, TRUE );
+ pBindings->Invalidate( SID_RULER_PROTECT, sal_True, sal_True );
pBindings->Update( SID_RULER_PROTECT );*/
}
else
@@ -2002,10 +2002,10 @@ void SvxRuler::SetActive(BOOL bOn)
{
pBindings->EnterRegistrations();
if(bOn)
- for(USHORT i=0;i<pRuler_Imp->nControlerItems;i++)
+ for(sal_uInt16 i=0;i<pRuler_Imp->nControlerItems;i++)
pCtrlItem[i]->ReBind();
else
- for(USHORT j=0;j<pRuler_Imp->nControlerItems;j++)
+ for(sal_uInt16 j=0;j<pRuler_Imp->nControlerItems;j++)
pCtrlItem[j]->UnBind();
pBindings->LeaveRegistrations();
}
@@ -2041,7 +2041,7 @@ void SvxRuler::UpdateParaContents_Impl
pIndents[INDENT_LEFT_MARGIN].nPos += l;
if ( pTabs )
{
- for(USHORT i = 0; i < nTabCount+TAB_GAP;++i)
+ for(sal_uInt16 i = 0; i < nTabCount+TAB_GAP;++i)
pTabs[i].nPos += l;
SetTabs(nTabCount, pTabs+TAB_GAP);
}
@@ -2062,7 +2062,7 @@ void SvxRuler::DragBorders()
*/
{
- BOOL bLeftIndentsCorrected = FALSE, bRightIndentsCorrected = FALSE;
+ sal_Bool bLeftIndentsCorrected = sal_False, bRightIndentsCorrected = sal_False;
int nIdx;
if(GetDragType()==RULER_TYPE_BORDER)
@@ -2073,7 +2073,7 @@ void SvxRuler::DragBorders()
else
nIdx=0;
- USHORT nDragSize = GetDragSize();
+ sal_uInt16 nDragSize = GetDragSize();
long lDiff = 0;
// the drag position has to be corrected to be able to prevent borders from passing each other
@@ -2104,13 +2104,13 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi
if(i == GetActRightColumn())
{
UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_RIGHT);
- bRightIndentsCorrected = TRUE;
+ bRightIndentsCorrected = sal_True;
}
// LAR, EZE der Spalte aktualisieren
else if(i == GetActLeftColumn())
{
UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_LEFT);
- bLeftIndentsCorrected = TRUE;
+ bLeftIndentsCorrected = sal_True;
}
}
}
@@ -2176,13 +2176,13 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi
if(i == GetActRightColumn())
{
UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_RIGHT);
- bRightIndentsCorrected = TRUE;
+ bRightIndentsCorrected = sal_True;
}
// LAR, EZE der Spalte aktualisieren
else if(i == GetActLeftColumn())
{
UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_LEFT);
- bLeftIndentsCorrected = TRUE;
+ bLeftIndentsCorrected = sal_True;
}
}
}
@@ -2289,7 +2289,7 @@ void SvxRuler::DragObjectBorder()
if(RULER_DRAGSIZE_MOVE == GetDragSize())
{
const long lPos = GetCorrectedDragPos();
- const USHORT nIdx = GetDragAryPos();
+ const sal_uInt16 nIdx = GetDragAryPos();
pObjectBorders[GetObjectBordersOff(nIdx)].nPos = lPos;
SetBorders(2, pObjectBorders + GetObjectBordersOff(0));
DrawLine_Impl(lTabPos, 7, bHorz);
@@ -2307,7 +2307,7 @@ void SvxRuler::ApplyMargins()
*/
{
const SfxPoolItem *pItem = 0;
- USHORT nId = SID_ATTR_LONG_LRSPACE;
+ sal_uInt16 nId = SID_ATTR_LONG_LRSPACE;
if(bHorz)
{
const long lOldNull = lLogicNullOffset;
@@ -2372,9 +2372,9 @@ void SvxRuler::ApplyIndents()
*/
{
long nNewTxtLeft;
- if(pColumnItem&&!IsActFirstColumn( TRUE ))
+ if(pColumnItem&&!IsActFirstColumn( sal_True ))
{
- long nLeftCol=GetActLeftColumn( TRUE );
+ long nLeftCol=GetActLeftColumn( sal_True );
nNewTxtLeft =
PixelHAdjust(
ConvertHPosLogic(
@@ -2389,7 +2389,7 @@ void SvxRuler::ApplyIndents()
ConvertHPosLogic(pIndents[INDENT_LEFT_MARGIN].nPos),
pParaItem->GetTxtLeft());
- BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+ sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
long nNewFirstLineOffset;
if(bRTL)
@@ -2427,11 +2427,11 @@ void SvxRuler::ApplyIndents()
sal::static_int_cast< short >(nNewFirstLineOffset));
pParaItem->SetTxtLeft(nNewTxtLeft);
- if(pColumnItem && ((!bRTL && !IsActLastColumn( TRUE ))|| (bRTL && !IsActFirstColumn())))
+ if(pColumnItem && ((!bRTL && !IsActLastColumn( sal_True ))|| (bRTL && !IsActFirstColumn())))
{
if(bRTL)
{
- long nActBorder = pBorders[GetActLeftColumn( TRUE )].nPos;
+ long nActBorder = pBorders[GetActLeftColumn( sal_True )].nPos;
long nRightMargin = pIndents[INDENT_RIGHT_MARGIN].nPos;
long nConvert = ConvertHPosLogic( nRightMargin - nActBorder );
pParaItem->SetRight( PixelHAdjust( nConvert - lAppNullOffset, pParaItem->GetRight() ) );
@@ -2441,7 +2441,7 @@ void SvxRuler::ApplyIndents()
pParaItem->SetRight(
PixelHAdjust(
ConvertHPosLogic(
- pBorders[GetActRightColumn( TRUE )].nPos -
+ pBorders[GetActRightColumn( sal_True )].nPos -
pIndents[INDENT_RIGHT_MARGIN].nPos) -
lAppNullOffset,
pParaItem->GetRight()));
@@ -2466,7 +2466,7 @@ void SvxRuler::ApplyIndents()
lAppNullOffset, pParaItem->GetRight()));
}
}
- USHORT nParaId = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL;
+ sal_uInt16 nParaId = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL;
pBindings->GetDispatcher()->Execute( nParaId, SFX_CALLMODE_RECORD, pParaItem, 0L );
UpdateTabs();
}
@@ -2480,8 +2480,8 @@ void SvxRuler::ApplyTabs()
*/
{
- BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
- const USHORT nCoreIdx = GetDragAryPos();
+ sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+ const sal_uInt16 nCoreIdx = GetDragAryPos();
if(IsDragDelete())
{
pTabStopItem->Remove(nCoreIdx);
@@ -2491,7 +2491,7 @@ void SvxRuler::ApplyTabs()
{
SvxTabStopItem *pItem = new SvxTabStopItem(pTabStopItem->Which());
//remove default tab stops
- for ( USHORT i = 0; i < pItem->Count(); )
+ for ( sal_uInt16 i = 0; i < pItem->Count(); )
{
if ( SVX_TAB_ADJUST_DEFAULT == (*pItem)[i].GetAdjustment() )
{
@@ -2501,7 +2501,7 @@ void SvxRuler::ApplyTabs()
++i;
}
- USHORT j;
+ sal_uInt16 j;
for(j = 0; j < nCoreIdx; ++j)
{
pItem->Insert((*pTabStopItem)[j]);
@@ -2555,7 +2555,7 @@ void SvxRuler::ApplyTabs()
pTabStopItem->Remove(nCoreIdx);
pTabStopItem->Insert(aTabStop);
}
- USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
+ sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
pBindings->GetDispatcher()->Execute( nTabStopId, SFX_CALLMODE_RECORD, pTabStopItem, 0L );
UpdateTabs();
}
@@ -2584,7 +2584,7 @@ void SvxRuler::ApplyBorders()
lAppNullOffset, pColumnItem->GetRight() ) );
}
}
- for(USHORT i = 0; i < pColumnItem->Count()-1; ++i)
+ for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i)
{
long& nEnd = (*pColumnItem)[i].nEnd;
nEnd = PIXEL_H_ADJUST(
@@ -2605,8 +2605,8 @@ void SvxRuler::ApplyBorders()
Debug_Impl(pEditWin,*pColumnItem);
#endif // DEBUGLIN
SfxBoolItem aFlag(SID_RULER_ACT_LINE_ONLY,
- nDragType & DRAG_OBJECT_ACTLINE_ONLY? TRUE: FALSE);
- USHORT nColId = pRuler_Imp->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) :
+ nDragType & DRAG_OBJECT_ACTLINE_ONLY? TRUE: sal_False);
+ sal_uInt16 nColId = pRuler_Imp->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) :
(bHorz ? SID_RULER_BORDERS : SID_RULER_BORDERS_VERTICAL);
pBindings->GetDispatcher()->Execute( nColId, SFX_CALLMODE_RECORD, pColumnItem, &aFlag, 0L );
}
@@ -2663,8 +2663,8 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
long lPos;
long lWidth=0;
- USHORT nStart;
- USHORT nIdx=GetDragAryPos();
+ sal_uInt16 nStart;
+ sal_uInt16 nIdx=GetDragAryPos();
lWidth=0;
long lActWidth=0;
long lActBorderSum;
@@ -2696,8 +2696,8 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
//because the height of the table changes while dragging
if(pRuler_Imp->bIsTableRows && RULER_TYPE_BORDER == eType)
{
- USHORT nStartBorder;
- USHORT nEndBorder;
+ sal_uInt16 nStartBorder;
+ sal_uInt16 nEndBorder;
if(bHorz)
{
nStartBorder = nIdx + 1;
@@ -2715,7 +2715,7 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
pRuler_Imp->nTotalDist = lWidth;
lPos = lOrigLPos = pBorders[nIdx].nPos;
- for(USHORT i = nStartBorder; i < nEndBorder; ++i)
+ for(sal_uInt16 i = nStartBorder; i < nEndBorder; ++i)
{
if(bHorz)
{
@@ -2724,16 +2724,16 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
}
else
lActWidth = pBorders[i].nPos;
- pRuler_Imp->pPercBuf[i] = (USHORT)((lActWidth * 1000)
+ pRuler_Imp->pPercBuf[i] = (sal_uInt16)((lActWidth * 1000)
/ pRuler_Imp->nTotalDist);
- pRuler_Imp->pBlockBuf[i] = (USHORT)lActBorderSum;
+ pRuler_Imp->pBlockBuf[i] = (sal_uInt16)lActBorderSum;
lActBorderSum += pBorders[i].nWidth;
}
}
else
{
lPos = lOrigLPos;
- for(USHORT ii = nStart; ii < pColumnItem->Count() - 1; ++ii)
+ for(sal_uInt16 ii = nStart; ii < pColumnItem->Count() - 1; ++ii)
{
lWidth += pBorders[ii].nPos - lPos;
lPos = pBorders[ii].nPos + pBorders[ii].nWidth;
@@ -2743,13 +2743,13 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
pRuler_Imp->nTotalDist = lWidth;
lPos = lOrigLPos;
- for(USHORT i = nStart; i < pColumnItem->Count() - 1; ++i)
+ for(sal_uInt16 i = nStart; i < pColumnItem->Count() - 1; ++i)
{
lActWidth += pBorders[i].nPos - lPos;
lPos = pBorders[i].nPos + pBorders[i].nWidth;
- pRuler_Imp->pPercBuf[i] = (USHORT)((lActWidth * 1000)
+ pRuler_Imp->pPercBuf[i] = (sal_uInt16)((lActWidth * 1000)
/ pRuler_Imp->nTotalDist);
- pRuler_Imp->pBlockBuf[i] = (USHORT)lActBorderSum;
+ pRuler_Imp->pBlockBuf[i] = (sal_uInt16)lActBorderSum;
lActBorderSum += pBorders[i].nWidth;
}
}
@@ -2757,14 +2757,14 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType)
break;
case RULER_TYPE_TAB:
{
- const USHORT nIdx = GetDragAryPos()+TAB_GAP;
+ const sal_uInt16 nIdx = GetDragAryPos()+TAB_GAP;
pRuler_Imp->nTotalDist -= pTabs[nIdx].nPos;
pRuler_Imp->SetPercSize(nTabCount);
- for(USHORT n=0;n<=nIdx;pRuler_Imp->pPercBuf[n++]=0) ;
- for(USHORT i = nIdx+1; i < nTabCount; ++i)
+ for(sal_uInt16 n=0;n<=nIdx;pRuler_Imp->pPercBuf[n++]=0) ;
+ for(sal_uInt16 i = nIdx+1; i < nTabCount; ++i)
{
const long nDelta = pTabs[i].nPos - pTabs[nIdx].nPos;
- pRuler_Imp->pPercBuf[i] = (USHORT)((nDelta * 1000) / pRuler_Imp->nTotalDist);
+ pRuler_Imp->pPercBuf[i] = (sal_uInt16)((nDelta * 1000) / pRuler_Imp->nTotalDist);
}
break;
}
@@ -2787,7 +2787,7 @@ void SvxRuler::EvalModifier()
*/
{
- USHORT nModifier = GetDragModifier();
+ sal_uInt16 nModifier = GetDragModifier();
if(pRuler_Imp->bIsTableRows)
{
//rows can only be moved in one way, additionally current column is possible
@@ -2844,11 +2844,11 @@ void __EXPORT SvxRuler::Click()
pBindings->Update( SID_RULER_PROTECT );
pBindings->Update( SID_ATTR_PARA_LRSPACE_VERTICAL );
}
- BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+ sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
if(pTabStopItem &&
(nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS)
{
- BOOL bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
+ sal_Bool bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
if( bContentProtected ) return;
const long lPos = GetClickPos();
if((bRTL && lPos < Min(GetFirstLineIndent(), GetLeftIndent()) && lPos > GetRightIndent()) ||
@@ -2877,7 +2877,7 @@ void __EXPORT SvxRuler::Click()
}
-BOOL SvxRuler::CalcLimits
+sal_Bool SvxRuler::CalcLimits
(
long &nMax1, // zu setzenden Minimalwert
long &nMax2, // zu setzenden Maximalwert
@@ -2893,7 +2893,7 @@ BOOL SvxRuler::CalcLimits
{
nMax1 = LONG_MIN;
nMax2 = LONG_MAX;
- return FALSE;
+ return sal_False;
}
@@ -2908,7 +2908,7 @@ void SvxRuler::CalcMinMax()
*/
{
- BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+ sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
const long lNullPix = ConvertPosPixel(lLogicNullOffset);
pRuler_Imp->lMaxLeftLogic=pRuler_Imp->lMaxRightLogic=-1;
switch(GetDragType())
@@ -3081,7 +3081,7 @@ void SvxRuler::CalcMinMax()
}
case RULER_TYPE_BORDER:
{ // Tabelle, Spalten (Modifier)
- const USHORT nIdx = GetDragAryPos();
+ const sal_uInt16 nIdx = GetDragAryPos();
switch(GetDragSize())
{
case RULER_DRAGSIZE_1 :
@@ -3122,13 +3122,13 @@ void SvxRuler::CalcMinMax()
{
//nIdx contains the position of the currently moved item
//next visible separator on the left
- USHORT nLeftCol=GetActLeftColumn(FALSE, nIdx);
+ sal_uInt16 nLeftCol=GetActLeftColumn(sal_False, nIdx);
//next visible separator on the right
- USHORT nRightCol=GetActRightColumn(FALSE, nIdx);
+ sal_uInt16 nRightCol=GetActRightColumn(sal_False, nIdx);
//next separator on the left - regardless if visible or not
- USHORT nActLeftCol=GetActLeftColumn();
+ sal_uInt16 nActLeftCol=GetActLeftColumn();
//next separator on the right - regardless if visible or not
- USHORT nActRightCol=GetActRightColumn();
+ sal_uInt16 nActRightCol=GetActRightColumn();
if(pColumnItem->IsTable())
{
if(nDragType & DRAG_OBJECT_ACTLINE_ONLY)
@@ -3248,8 +3248,8 @@ void SvxRuler::CalcMinMax()
else
{
nMaxRight = lNullPix + pBorders[nRightCol].nPos;
- USHORT nNotHiddenRightCol =
- GetActRightColumn(TRUE, nIdx);
+ sal_uInt16 nNotHiddenRightCol =
+ GetActRightColumn(sal_True, nIdx);
if( nActLeftCol == nIdx )
{
@@ -3283,7 +3283,7 @@ void SvxRuler::CalcMinMax()
{
if(pObjectItem->HasLimits())
{
- if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? FALSE: TRUE))
+ if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? FALSE: sal_True))
{
nMaxLeft = ConvertPosPixel(nMaxLeft);
nMaxRight = ConvertPosPixel(nMaxRight);
@@ -3331,7 +3331,7 @@ void SvxRuler::CalcMinMax()
}
case RULER_TYPE_INDENT:
{
- const USHORT nIdx = GetDragAryPos();
+ const sal_uInt16 nIdx = GetDragAryPos();
switch(nIdx) {
case INDENT_FIRST_LINE - INDENT_GAP:
case INDENT_LEFT_MARGIN - INDENT_GAP:
@@ -3386,8 +3386,8 @@ void SvxRuler::CalcMinMax()
nMaxRight = lNullPix + Min(GetFirstLineIndent(), GetLeftIndent()) - lMinFrame;
if(pColumnItem)
{
- USHORT nRightCol=GetActRightColumn( TRUE );
- if(!IsActLastColumn( TRUE ))
+ sal_uInt16 nRightCol=GetActRightColumn( sal_True );
+ if(!IsActLastColumn( sal_True ))
nMaxRight += pBorders[nRightCol].nPos;
else
nMaxRight += GetMargin2();
@@ -3403,8 +3403,8 @@ void SvxRuler::CalcMinMax()
nMaxRight = lNullPix;
if(pColumnItem)
{
- USHORT nRightCol=GetActRightColumn( TRUE );
- if(!IsActLastColumn( TRUE ))
+ sal_uInt16 nRightCol=GetActRightColumn( sal_True );
+ if(!IsActLastColumn( sal_True ))
nMaxRight += pBorders[nRightCol].nPos;
else
nMaxRight += GetMargin2();
@@ -3464,9 +3464,9 @@ long __EXPORT SvxRuler::StartDrag()
{
lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/StartDrag"));
- BOOL bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
+ sal_Bool bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected();
if(!bValid)
- return FALSE;
+ return sal_False;
pRuler_Imp->lLastLMargin=GetMargin1();
pRuler_Imp->lLastRMargin=GetMargin2();
@@ -3486,7 +3486,7 @@ long __EXPORT SvxRuler::StartDrag()
nDragType = DRAG_OBJECT;
}
else
- bOk = FALSE;
+ bOk = sal_False;
break;
case RULER_TYPE_BORDER: // Tabelle, Spalten (Modifier)
if(pColumnItem)
@@ -3501,8 +3501,8 @@ long __EXPORT SvxRuler::StartDrag()
break;
case RULER_TYPE_INDENT: { // Absatzeinzuege (Modifier)
if( bContentProtected )
- return FALSE;
- USHORT nIndent = INDENT_LEFT_MARGIN;
+ return sal_False;
+ sal_uInt16 nIndent = INDENT_LEFT_MARGIN;
if((nIndent) == GetDragAryPos() + INDENT_GAP) { // Linker Absatzeinzug
pIndents[0] = pIndents[INDENT_FIRST_LINE];
pIndents[0].nStyle |= RULER_STYLE_DONTKNOW;
@@ -3515,7 +3515,7 @@ long __EXPORT SvxRuler::StartDrag()
break;
}
case RULER_TYPE_TAB: // Tabs (Modifier)
- if( bContentProtected ) return FALSE;
+ if( bContentProtected ) return sal_False;
EvalModifier();
pTabs[0] = pTabs[GetDragAryPos()+1];
pTabs[0].nStyle |= RULER_STYLE_DONTKNOW;
@@ -3584,7 +3584,7 @@ void __EXPORT SvxRuler::EndDrag()
*/
{
lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/EndDrag"));
- const BOOL bUndo = IsDragCanceled();
+ const sal_Bool bUndo = IsDragCanceled();
const long lPos = GetDragPos();
DrawLine_Impl(lTabPos, 6, bHorz);
lTabPos=-1;
@@ -3635,7 +3635,7 @@ void __EXPORT SvxRuler::EndDrag()
nDragType = NONE;
Ruler::EndDrag();
if(bUndo)
- for(USHORT i=0;i<pRuler_Imp->nControlerItems;i++)
+ for(sal_uInt16 i=0;i<pRuler_Imp->nControlerItems;i++)
{
pCtrlItem[i]->ClearCache();
pCtrlItem[i]->GetBindings().Invalidate(pCtrlItem[i]->GetId());
@@ -3685,8 +3685,8 @@ void __EXPORT SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint)
((SfxSimpleHint&) rHint ).GetId() == SFX_HINT_UPDATEDONE ) {
Update();
EndListening(*pBindings);
- bValid = TRUE;
- bListening = FALSE;
+ bValid = sal_True;
+ bListening = sal_False;
}
}
@@ -3723,7 +3723,7 @@ IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu )
aTabStop.GetAdjustment() = ToAttrTab_Impl(pMenu->GetCurItemId()-1);
pTabStopItem->Remove(pRuler_Imp->nIdx);
pTabStopItem->Insert(aTabStop);
- USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
+ sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
pBindings->GetDispatcher()->Execute( nTabStopId, SFX_CALLMODE_RECORD, pTabStopItem, 0L );
UpdateTabs();
pRuler_Imp->nIdx = 0;
@@ -3745,7 +3745,7 @@ void SvxRuler::Command( const CommandEvent& rCEvt )
if ( COMMAND_CONTEXTMENU == rCEvt.GetCommand() )
{
CancelDrag();
- BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
+ sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue();
if ( pTabs &&
RULER_TYPE_TAB ==
GetType( rCEvt.GetMousePosPixel(), &pRuler_Imp->nIdx ) &&
@@ -3759,10 +3759,10 @@ void SvxRuler::Command( const CommandEvent& rCEvt )
aDev.SetBackground(Wallpaper(Color(COL_WHITE)));
const Point aPt(aSz.Width() / 2, aSz.Height() / 2);
- for ( USHORT i = RULER_TAB_LEFT; i < RULER_TAB_DEFAULT; ++i )
+ for ( sal_uInt16 i = RULER_TAB_LEFT; i < RULER_TAB_DEFAULT; ++i )
{
- USHORT nStyle = bRTL ? i|RULER_TAB_RTL : i;
- nStyle |= (USHORT)(bHorz ? WB_HORZ : WB_VERT);
+ sal_uInt16 nStyle = bRTL ? i|RULER_TAB_RTL : i;
+ nStyle |= (sal_uInt16)(bHorz ? WB_HORZ : WB_VERT);
DrawTab(&aDev, aPt, nStyle);
aMenu.InsertItem(i+1,
String(ResId(RID_SVXSTR_RULER_START+i, DIALOG_MGR())),
@@ -3777,13 +3777,13 @@ void SvxRuler::Command( const CommandEvent& rCEvt )
PopupMenu aMenu(ResId(RID_SVXMN_RULER, DIALOG_MGR()));
aMenu.SetSelectHdl(LINK(this, SvxRuler, MenuSelect));
FieldUnit eUnit = GetUnit();
- const USHORT nCount = aMenu.GetItemCount();
+ const sal_uInt16 nCount = aMenu.GetItemCount();
- BOOL bReduceMetric = 0 != (nFlags &SVXRULER_SUPPORT_REDUCED_METRIC);
- for ( USHORT i = nCount; i; --i )
+ sal_Bool bReduceMetric = 0 != (nFlags &SVXRULER_SUPPORT_REDUCED_METRIC);
+ for ( sal_uInt16 i = nCount; i; --i )
{
- const USHORT nId = aMenu.GetItemId(i - 1);
- aMenu.CheckItem(nId, nId == (USHORT)eUnit);
+ const sal_uInt16 nId = aMenu.GetItemId(i - 1);
+ aMenu.CheckItem(nId, nId == (sal_uInt16)eUnit);
if(bReduceMetric &&
(nId == FUNIT_M ||
nId == FUNIT_KM ||
@@ -3799,14 +3799,14 @@ void SvxRuler::Command( const CommandEvent& rCEvt )
}
-USHORT SvxRuler::GetActRightColumn(
- BOOL bForceDontConsiderHidden, USHORT nAct ) const
+sal_uInt16 SvxRuler::GetActRightColumn(
+ sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct ) const
{
if( nAct == USHRT_MAX )
nAct = pColumnItem->GetActColumn();
else nAct++; //Damit man die ActDrag uebergeben kann
- BOOL bConsiderHidden = !bForceDontConsiderHidden &&
+ sal_Bool bConsiderHidden = !bForceDontConsiderHidden &&
!( nDragType & DRAG_OBJECT_ACTLINE_ONLY );
while( nAct < pColumnItem->Count() - 1 )
@@ -3821,15 +3821,15 @@ USHORT SvxRuler::GetActRightColumn(
-USHORT SvxRuler::GetActLeftColumn(
- BOOL bForceDontConsiderHidden, USHORT nAct ) const
+sal_uInt16 SvxRuler::GetActLeftColumn(
+ sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct ) const
{
if(nAct==USHRT_MAX)
nAct=pColumnItem->GetActColumn();
- USHORT nLOffs=1;
+ sal_uInt16 nLOffs=1;
- BOOL bConsiderHidden = !bForceDontConsiderHidden &&
+ sal_Bool bConsiderHidden = !bForceDontConsiderHidden &&
!( nDragType & DRAG_OBJECT_ACTLINE_ONLY );
while(nAct>=nLOffs)
@@ -3843,19 +3843,19 @@ USHORT SvxRuler::GetActLeftColumn(
}
-BOOL SvxRuler::IsActLastColumn(
- BOOL bForceDontConsiderHidden, USHORT nAct) const
+sal_Bool SvxRuler::IsActLastColumn(
+ sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct) const
{
return GetActRightColumn(bForceDontConsiderHidden, nAct)==USHRT_MAX;
}
-BOOL SvxRuler::IsActFirstColumn(
- BOOL bForceDontConsiderHidden, USHORT nAct) const
+sal_Bool SvxRuler::IsActFirstColumn(
+ sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct) const
{
return GetActLeftColumn(bForceDontConsiderHidden, nAct)==USHRT_MAX;
}
-long SvxRuler::CalcPropMaxRight(USHORT nCol) const
+long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const
{
if(!(nDragType & DRAG_OBJECT_SIZE_LINEAR))
@@ -3869,7 +3869,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
long lMinSpace=USHRT_MAX;
long lOldPos;
long lColumns=0;
- USHORT nStart;
+ sal_uInt16 nStart;
if(!pColumnItem->IsTable())
{
if(nCol==USHRT_MAX)
@@ -3884,7 +3884,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
lFences=pBorders[nCol].nWidth;
}
- for(USHORT i = nStart; i < nBorderCount-1; ++i)
+ for(sal_uInt16 i = nStart; i < nBorderCount-1; ++i)
{
long lWidth=pBorders[i].nPos-lOldPos;
lColumns+=lWidth;
@@ -3900,7 +3900,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
}
else
{
- USHORT nActCol;
+ sal_uInt16 nActCol;
if(nCol==USHRT_MAX) //CalcMinMax fuer LeftMargin
{
lOldPos=GetMargin1();
@@ -3914,7 +3914,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
lFences=0;
while(nActCol<nBorderCount||nActCol==USHRT_MAX)
{
- USHORT nRight;
+ sal_uInt16 nRight;
if(nActCol==USHRT_MAX)
{
nRight=0;
@@ -3922,7 +3922,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
nRight++;
}
else
- nRight=GetActRightColumn(FALSE, nActCol);
+ nRight=GetActRightColumn(sal_False, nActCol);
long lWidth;
if(nRight!=USHRT_MAX)
{
@@ -3946,19 +3946,19 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
{
if(pColumnItem->IsTable())
{
- USHORT nVisCols=0;
- for(USHORT i=GetActRightColumn(FALSE, nCol);i<nBorderCount;)
+ sal_uInt16 nVisCols=0;
+ for(sal_uInt16 i=GetActRightColumn(sal_False, nCol);i<nBorderCount;)
{
if((*pColumnItem)[i].bVisible)
nVisCols++;
- i=GetActRightColumn(FALSE, i);
+ i=GetActRightColumn(sal_False, i);
}
return GetMargin2()-GetMargin1()-(nVisCols+1)*lMinFrame;
}
else
{
long lWidth=0;
- for(USHORT i=nCol;i<nBorderCount-1;i++)
+ for(sal_uInt16 i=nCol;i<nBorderCount-1;i++)
{
lWidth+=lMinFrame+pBorders[i].nWidth;
}
@@ -3969,7 +3969,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const
/*-- 29.11.2007 08:24:23---------------------------------------------------
//#i24363# tab stops relative to indent
-----------------------------------------------------------------------*/
-void SvxRuler::SetTabsRelativeToIndent( BOOL bRel )
+void SvxRuler::SetTabsRelativeToIndent( sal_Bool bRel )
{
pRuler_Imp->bIsTabsRelativeToIndent = bRel;
}
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index 8ba911fb90c0..b030a27c952a 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -57,7 +57,7 @@ SvxSwFrameExample::SvxSwFrameExample( Window *pParent, const ResId& rResID ) :
nVRel (RelOrientation::PRINT_AREA),
nWrap (WrapTextMode_NONE),
nAnchor (TextContentAnchorType_AT_PAGE),
- bTrans (FALSE),
+ bTrans (sal_False),
aRelPos (Point(0,0))
{
InitColors_Impl();
@@ -73,7 +73,7 @@ void SvxSwFrameExample::InitColors_Impl( void )
const StyleSettings& rSettings = GetSettings().GetStyleSettings();
m_aBgCol = Color( rSettings.GetWindowColor() ); // old: COL_WHITE
- BOOL bHC = rSettings.GetHighContrastMode();
+ sal_Bool bHC = rSettings.GetHighContrastMode();
m_aFrameColor = Color( COL_LIGHTGREEN );
m_aAlignColor = Color( COL_LIGHTRED );
@@ -104,19 +104,19 @@ void SvxSwFrameExample::InitAllRects_Impl()
// aPage.SetSize(Size(aSz.Width() - 3, aSz.Height() - 3));
aPage.SetSize( GetOutputSizePixel() );
- ULONG nOutWPix = aPage.GetWidth();
- ULONG nOutHPix = aPage.GetHeight();
+ sal_uIntPtr nOutWPix = aPage.GetWidth();
+ sal_uIntPtr nOutHPix = aPage.GetHeight();
// PrintArea
- ULONG nLBorder;
- ULONG nRBorder;
- ULONG nTBorder;
- ULONG nBBorder;
+ sal_uIntPtr nLBorder;
+ sal_uIntPtr nRBorder;
+ sal_uIntPtr nTBorder;
+ sal_uIntPtr nBBorder;
- ULONG nLTxtBorder;
- ULONG nRTxtBorder;
- ULONG nTTxtBorder;
- ULONG nBTxtBorder;
+ sal_uIntPtr nLTxtBorder;
+ sal_uIntPtr nRTxtBorder;
+ sal_uIntPtr nTTxtBorder;
+ sal_uIntPtr nBTxtBorder;
if (nAnchor != TextContentAnchorType_AS_CHARACTER)
{
@@ -153,7 +153,7 @@ void SvxSwFrameExample::InitAllRects_Impl()
aTextLine.Move(0, nTTxtBorder);
// Rechteck um Absatz incl. Raender
- USHORT nLines = (USHORT)((aPagePrtArea.GetHeight() / 2 - nTTxtBorder - nBTxtBorder)
+ sal_uInt16 nLines = (sal_uInt16)((aPagePrtArea.GetHeight() / 2 - nTTxtBorder - nBTxtBorder)
/ (aTextLine.GetHeight() + 2));
aPara = aPagePrtArea;
aPara.SetSize(Size(aPara.GetWidth(),
@@ -201,8 +201,8 @@ void SvxSwFrameExample::InitAllRects_Impl()
// Groesse des zu positionierenden Rahmens
if (nAnchor != TextContentAnchorType_AS_CHARACTER)
{
- ULONG nLFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nLBorder : nLTxtBorder;
- ULONG nRFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nRBorder : nRTxtBorder;
+ sal_uIntPtr nLFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nLBorder : nLTxtBorder;
+ sal_uIntPtr nRFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nRBorder : nRTxtBorder;
switch (nHRel)
{
@@ -225,7 +225,7 @@ void SvxSwFrameExample::InitAllRects_Impl()
}
else
{
- ULONG nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(C2S(DEMOTEXT));
+ sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(C2S(DEMOTEXT));
aFrmSize = Size(nFreeWidth / 2, (aTextLine.GetHeight() + 2) * 3);
aDrawObj.SetSize(Size(Max(5L, (long)nFreeWidth / 3L), Max(5L, aFrmSize.Height() * 3L)));
@@ -459,9 +459,9 @@ Rectangle SvxSwFrameExample::DrawInnerFrame_Impl(const Rectangle &rRect, const C
// Testabsatz zeichnen
Rectangle aTxt(aTextLine);
sal_Int32 nStep = aTxt.GetHeight() + 2;
- USHORT nLines = (USHORT)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2));
+ sal_uInt16 nLines = (sal_uInt16)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2));
- for (USHORT i = 0; i < nLines; i++)
+ for (sal_uInt16 i = 0; i < nLines; i++)
{
if (i == nLines - 1)
aTxt.SetSize(Size(aTxt.GetWidth() / 2, aTxt.GetHeight()));
@@ -619,7 +619,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
const long nTxtLineHeight = aTextLine.GetHeight();
Rectangle aTxt(aTextLine);
sal_Int32 nStep;
- USHORT nLines;
+ sal_uInt16 nLines;
if (nAnchor == TextContentAnchorType_AT_FRAME)
{
@@ -629,13 +629,13 @@ void SvxSwFrameExample::Paint(const Rectangle&)
aTxt.Bottom() = aTxt.Top() + aTextLine.GetHeight() - 1;
nStep = aTxt.GetHeight() + 2;
- nLines = (USHORT)(((aFrameAtFrame.GetHeight() - 2 * FLYINFLY_BORDER) * 2 / 3)
+ nLines = (sal_uInt16)(((aFrameAtFrame.GetHeight() - 2 * FLYINFLY_BORDER) * 2 / 3)
/ (aTxt.GetHeight() + 2));
}
else
{
nStep = aTxt.GetHeight() + 2;
- nLines = (USHORT)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2));
+ nLines = (sal_uInt16)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2));
}
if (nAnchor != TextContentAnchorType_AS_CHARACTER)
@@ -650,7 +650,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
( nHRel == RelOrientation::CHAR || nVRel == RelOrientation::CHAR ||
nVRel == RelOrientation::TEXT_LINE );
- for (USHORT i = 0; i < nLines; ++i)
+ for (sal_uInt16 i = 0; i < nLines; ++i)
{
if (i == (nLines - 1))
aTxt.SetSize(Size(aTxt.GetWidth() / 2, aTxt.GetHeight()));
@@ -685,7 +685,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
if (nAnchor != TextContentAnchorType_AT_FRAME && aTxt.Bottom() > aParaPrtArea.Bottom())
{
// Text wurde durch Rahmen verdraengt, daher Para-Hoehe anpassen
- ULONG nDiff = aTxt.Bottom() - aParaPrtArea.Bottom();
+ sal_uIntPtr nDiff = aTxt.Bottom() - aParaPrtArea.Bottom();
aParaPrtArea.Bottom() += nDiff;
aPara.Bottom() += nDiff;
@@ -707,7 +707,7 @@ void SvxSwFrameExample::Paint(const Rectangle&)
DrawRect_Impl(aRect, m_aTransColor, m_aAlignColor);
// Frame anzeigen
- BOOL bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? TRUE : bTrans;
+ sal_Bool bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? sal_True : bTrans;
DrawRect_Impl( aFrmRect, bDontFill? m_aTransColor : m_aBgCol, m_aFrameColor );
}
diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx
index 03b2746ae3fd..5da8843489be 100644
--- a/svx/source/dialog/swframeposstrings.cxx
+++ b/svx/source/dialog/swframeposstrings.cxx
@@ -43,7 +43,7 @@ public:
SvxSwFramePosString_Impl::SvxSwFramePosString_Impl() :
Resource(SVX_RES(RID_SVXSW_FRAMEPOSITIONS))
{
- for(USHORT i = 0; i < SvxSwFramePosString::STR_MAX; i++)
+ for(sal_uInt16 i = 0; i < SvxSwFramePosString::STR_MAX; i++)
{
//string ids have to start at 1
aStrings[i] = String(SVX_RES(i + 1));
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index 751184e929c7..132ca585a87f 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -57,12 +57,12 @@ SvxTextEncodingBox::~SvxTextEncodingBox()
//------------------------------------------------------------------------
-USHORT SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
+sal_uInt16 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
{
- USHORT nCount = GetEntryCount();
- for ( USHORT i=0; i<nCount; i++ )
+ sal_uInt16 nCount = GetEntryCount();
+ for ( sal_uInt16 i=0; i<nCount; i++ )
{
- if ( nEnc == rtl_TextEncoding( (ULONG)GetEntryData(i) ) )
+ if ( nEnc == rtl_TextEncoding( (sal_uIntPtr)GetEntryData(i) ) )
return i;
}
return LISTBOX_ENTRY_NOTFOUND;
@@ -79,12 +79,12 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
sal_uInt32 nCount = m_pEncTable->Count();
for ( sal_uInt32 j=0; j<nCount; j++ )
{
- BOOL bInsert = TRUE;
+ sal_Bool bInsert = sal_True;
rtl_TextEncoding nEnc = rtl_TextEncoding( m_pEncTable->GetValue( j ) );
if ( nExcludeInfoFlags )
{
if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) )
- bInsert = FALSE;
+ bInsert = sal_False;
else
{
if ( (aInfo.Flags & nExcludeInfoFlags) == 0 )
@@ -92,10 +92,10 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) &&
((nEnc == RTL_TEXTENCODING_UCS2) ||
nEnc == RTL_TEXTENCODING_UCS4) )
- bInsert = FALSE; // InfoFlags don't work for Unicode :-(
+ bInsert = sal_False; // InfoFlags don't work for Unicode :-(
}
else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 )
- bInsert = FALSE;
+ bInsert = sal_False;
}
}
if ( bInsert )
@@ -108,7 +108,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
case RTL_TEXTENCODING_GB_2312 :
case RTL_TEXTENCODING_GBK :
case RTL_TEXTENCODING_MS_936 :
- bInsert = FALSE;
+ bInsert = sal_False;
break;
}
}
@@ -129,14 +129,14 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
svxform::ODataAccessCharsetHelper aCSH;
::std::vector< rtl_TextEncoding > aEncs;
sal_Int32 nCount = aCSH.getSupportedTextEncodings( aEncs );
- for ( USHORT j=0; j<nCount; j++ )
+ for ( sal_uInt16 j=0; j<nCount; j++ )
{
- BOOL bInsert = TRUE;
+ sal_Bool bInsert = sal_True;
rtl_TextEncoding nEnc = rtl_TextEncoding( aEncs[j] );
if ( nExcludeInfoFlags )
{
if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) )
- bInsert = FALSE;
+ bInsert = sal_False;
else
{
if ( (aInfo.Flags & nExcludeInfoFlags) == 0 )
@@ -144,10 +144,10 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) &&
((nEnc == RTL_TEXTENCODING_UCS2) ||
nEnc == RTL_TEXTENCODING_UCS4) )
- bInsert = FALSE; // InfoFlags don't work for Unicode :-(
+ bInsert = sal_False; // InfoFlags don't work for Unicode :-(
}
else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 )
- bInsert = FALSE;
+ bInsert = sal_False;
}
}
if ( bInsert )
@@ -160,7 +160,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
case RTL_TEXTENCODING_GB_2312 :
case RTL_TEXTENCODING_GBK :
case RTL_TEXTENCODING_MS_936 :
- bInsert = FALSE;
+ bInsert = sal_False;
break;
}
}
@@ -185,15 +185,15 @@ void SvxTextEncodingBox::FillWithMimeAndSelectBest()
//------------------------------------------------------------------------
void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc,
- const String& rEntry, USHORT nPos )
+ const String& rEntry, sal_uInt16 nPos )
{
- USHORT nAt = InsertEntry( rEntry, nPos );
- SetEntryData( nAt, (void*)(ULONG)nEnc );
+ sal_uInt16 nAt = InsertEntry( rEntry, nPos );
+ SetEntryData( nAt, (void*)(sal_uIntPtr)nEnc );
}
//------------------------------------------------------------------------
-void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, USHORT nPos )
+void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uInt16 nPos )
{
const String& rEntry = m_pEncTable->GetTextString( nEnc );
if ( rEntry.Len() )
@@ -212,7 +212,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, USHORT
void SvxTextEncodingBox::RemoveTextEncoding( const rtl_TextEncoding nEnc )
{
- USHORT nAt = EncodingToPos_Impl( nEnc );
+ sal_uInt16 nAt = EncodingToPos_Impl( nEnc );
if ( nAt != LISTBOX_ENTRY_NOTFOUND )
RemoveEntry( nAt );
@@ -222,19 +222,19 @@ void SvxTextEncodingBox::RemoveTextEncoding( const rtl_TextEncoding nEnc )
rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const
{
- USHORT nPos = GetSelectEntryPos();
+ sal_uInt16 nPos = GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
- return rtl_TextEncoding( (ULONG)GetEntryData(nPos) );
+ return rtl_TextEncoding( (sal_uIntPtr)GetEntryData(nPos) );
else
return RTL_TEXTENCODING_DONTKNOW;
}
//------------------------------------------------------------------------
-void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, BOOL bSelect )
+void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, sal_Bool bSelect )
{
- USHORT nAt = EncodingToPos_Impl( nEnc );
+ sal_uInt16 nAt = EncodingToPos_Impl( nEnc );
if ( nAt != LISTBOX_ENTRY_NOTFOUND )
SelectEntryPos( nAt, bSelect );
@@ -242,13 +242,13 @@ void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, BOOL b
//------------------------------------------------------------------------
-BOOL SvxTextEncodingBox::IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const
+sal_Bool SvxTextEncodingBox::IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const
{
- USHORT nAt = EncodingToPos_Impl( nEnc );
+ sal_uInt16 nAt = EncodingToPos_Impl( nEnc );
if ( nAt != LISTBOX_ENTRY_NOTFOUND )
return IsEntryPosSelected( nAt );
else
- return FALSE;
+ return sal_False;
}
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index b78d464d4897..6329ca2a3203 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -87,7 +87,7 @@ void E3dCubeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
|*
\************************************************************************/
-UINT16 E3dCubeObj::GetObjIdentifier() const
+sal_uInt16 E3dCubeObj::GetObjIdentifier() const
{
return E3D_CUBEOBJ_ID;
}
@@ -98,7 +98,7 @@ UINT16 E3dCubeObj::GetObjIdentifier() const
|*
\************************************************************************/
-SdrObject *E3dCubeObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dCubeObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
{
return NULL;
}
@@ -147,7 +147,7 @@ void E3dCubeObj::SetCubeSize(const basegfx::B3DVector& rNew)
}
}
-void E3dCubeObj::SetPosIsCenter(BOOL bNew)
+void E3dCubeObj::SetPosIsCenter(sal_Bool bNew)
{
if(bPosIsCenter != bNew)
{
@@ -156,7 +156,7 @@ void E3dCubeObj::SetPosIsCenter(BOOL bNew)
}
}
-void E3dCubeObj::SetSideFlags(UINT16 nNew)
+void E3dCubeObj::SetSideFlags(sal_uInt16 nNew)
{
if(nSideFlags != nNew)
{
diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx
index fd44db7b02d9..6fadec8cc9dc 100644
--- a/svx/source/engine3d/dragmt3d.cxx
+++ b/svx/source/engine3d/dragmt3d.cxx
@@ -57,11 +57,11 @@ E3dDragMethod::E3dDragMethod (
SdrDragView &_rView,
const SdrMarkList& rMark,
E3dDragConstraint eConstr,
- BOOL bFull)
+ sal_Bool bFull)
: SdrDragMethod(_rView),
meConstraint(eConstr),
mbMoveFull(bFull),
- mbMovedAtAll(FALSE)
+ mbMovedAtAll(sal_False)
{
// Fuer alle in der selektion befindlichen 3D-Objekte
// eine Unit anlegen
@@ -175,7 +175,7 @@ bool E3dDragMethod::BeginSdrDrag()
Show();
}
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -218,7 +218,7 @@ bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/)
getSdrDragView().EndUndo();
}
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -321,7 +321,7 @@ TYPEINIT1(E3dDragRotate, E3dDragMethod);
E3dDragRotate::E3dDragRotate(SdrDragView &_rView,
const SdrMarkList& rMark,
E3dDragConstraint eConstr,
- BOOL bFull)
+ sal_Bool bFull)
: E3dDragMethod(_rView, rMark, eConstr, bFull)
{
// Zentrum aller selektierten Objekte in Augkoordinaten holen
@@ -421,7 +421,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt)
}
long nSnap = 0;
- if(!getSdrDragView().IsRotateAllowed(FALSE))
+ if(!getSdrDragView().IsRotateAllowed(sal_False))
nSnap = 90;
if(nSnap != 0)
@@ -514,7 +514,7 @@ E3dDragMove::E3dDragMove(SdrDragView &_rView,
const SdrMarkList& rMark,
SdrHdlKind eDrgHdl,
E3dDragConstraint eConstr,
- BOOL bFull)
+ sal_Bool bFull)
: E3dDragMethod(_rView, rMark, eConstr, bFull),
meWhatDragHdl(eDrgHdl)
{
diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx
index 6c9a541b8c7c..97658f4dcd68 100644
--- a/svx/source/engine3d/e3dundo.cxx
+++ b/svx/source/engine3d/e3dundo.cxx
@@ -52,9 +52,9 @@ E3dUndoAction::~E3dUndoAction ()
|* Repeat gibt es nicht
|*
\************************************************************************/
-BOOL E3dUndoAction::CanRepeat(SfxRepeatTarget&) const
+sal_Bool E3dUndoAction::CanRepeat(SfxRepeatTarget&) const
{
- return FALSE;
+ return sal_False;
}
/************************************************************************/
@@ -116,7 +116,7 @@ E3dAttributesUndoAction::E3dAttributesUndoAction( SdrModel &rModel,
E3dObject* pInObject,
const SfxItemSet& rNewSet,
const SfxItemSet& rOldSet,
- BOOL bUseSubObj)
+ sal_Bool bUseSubObj)
: SdrUndoAction( rModel ),
pObject ( pInObject ),
pView ( p3dView ),
@@ -164,9 +164,9 @@ void E3dAttributesUndoAction::Redo()
|* Mehrfaches Undo nicht moeglich
|*
\************************************************************************/
-BOOL E3dAttributesUndoAction::CanRepeat(SfxRepeatTarget& /*rView*/) const
+sal_Bool E3dAttributesUndoAction::CanRepeat(SfxRepeatTarget& /*rView*/) const
{
- return FALSE;
+ return sal_False;
}
/*************************************************************************
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index e1e90d88c22f..ea33f2089ed0 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -236,7 +236,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
aImgLightOn ( SVX_RES( RID_SVXIMAGE_LIGHT_ON ) ),
aImgLightOff ( SVX_RES( RID_SVXIMAGE_LIGHT_OFF ) ),
- bUpdate ( FALSE ),
+ bUpdate ( sal_False ),
eViewType ( VIEWTYPE_GEO ),
pModel ( NULL ),
@@ -253,7 +253,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
// pPool ( NULL ),
mpImpl ( new Svx3DWinImpl() ),
mpRemember2DAttributes(NULL),
- bOnly3DChanged ( FALSE )
+ bOnly3DChanged ( sal_False )
{
SETHCIMAGE( aBtnGeo, BMP_GEO_H );
SETHCIMAGE( aBtnRepresentation, BMP_REPRESENTATION_H );
@@ -410,7 +410,7 @@ __EXPORT Svx3DWin::Svx3DWin( SfxBindings* pInBindings,
SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
if (pDispatcher != NULL)
{
- SfxBoolItem aItem( SID_3D_INIT, TRUE );
+ SfxBoolItem aItem( SID_3D_INIT, sal_True );
pDispatcher->Execute(
SID_3D_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
}
@@ -487,18 +487,18 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
while(nWhich)
{
- SfxItemState eState = rAttrs.GetItemState(nWhich, FALSE);
+ SfxItemState eState = rAttrs.GetItemState(nWhich, sal_False);
if(SFX_ITEM_DONTCARE == eState)
mpRemember2DAttributes->InvalidateItem(nWhich);
else if(SFX_ITEM_SET == eState)
- mpRemember2DAttributes->Put(rAttrs.Get(nWhich, FALSE));
+ mpRemember2DAttributes->Put(rAttrs.Get(nWhich, sal_False));
nWhich = aIter.NextWhich();
}
// construct field values
const SfxPoolItem* pItem;
- //BOOL bUpdate = FALSE;
+ //sal_Bool bUpdate = sal_False;
// evtl. PoolUnit ermitteln
if( !mpImpl->pPool )
@@ -511,16 +511,16 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
// Segmentanzahl aenderbar ? und andere Stati
- SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, FALSE, &pItem );
+ SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, sal_False, &pItem );
if( SFX_ITEM_SET == eState )
{
- UINT32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue();
- //BOOL bLathe = (BOOL) ( nState & 1 );
- BOOL bExtrude = (BOOL) ( nState & 2 );
- BOOL bSphere = (BOOL) ( nState & 4 );
- BOOL bCube = (BOOL) ( nState & 8 );
+ sal_uInt32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue();
+ //sal_Bool bLathe = (sal_Bool) ( nState & 1 );
+ sal_Bool bExtrude = (sal_Bool) ( nState & 2 );
+ sal_Bool bSphere = (sal_Bool) ( nState & 4 );
+ sal_Bool bCube = (sal_Bool) ( nState & 8 );
- BOOL bChart = (BOOL) ( nState & 32 ); // Chart
+ sal_Bool bChart = (sal_Bool) ( nState & 32 ); // Chart
if( !bChart )
{
@@ -558,41 +558,41 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
else
{
// Geometrie
- aFtHorizontal.Enable( FALSE );
- aNumHorizontal.Enable( FALSE );
+ aFtHorizontal.Enable( sal_False );
+ aNumHorizontal.Enable( sal_False );
aNumHorizontal.SetEmptyFieldValue();
- aFtVertical.Enable( FALSE );
- aNumVertical.Enable( FALSE );
+ aFtVertical.Enable( sal_False );
+ aNumVertical.Enable( sal_False );
aNumVertical.SetEmptyFieldValue();
- aFLSegments.Enable( FALSE );
- aFtEndAngle.Enable( FALSE );
- aMtrEndAngle.Enable( FALSE );
+ aFLSegments.Enable( sal_False );
+ aFtEndAngle.Enable( sal_False );
+ aMtrEndAngle.Enable( sal_False );
aMtrEndAngle.SetEmptyFieldValue();
- aFtDepth.Enable( FALSE );
- aMtrDepth.Enable( FALSE );
+ aFtDepth.Enable( sal_False );
+ aMtrDepth.Enable( sal_False );
aMtrDepth.SetEmptyFieldValue();
// Darstellung
- aBtnShadow3d.Enable( FALSE );
- aFtSlant.Enable( FALSE );
- aMtrSlant.Enable( FALSE );
- aFLShadow.Enable( FALSE );
+ aBtnShadow3d.Enable( sal_False );
+ aFtSlant.Enable( sal_False );
+ aMtrSlant.Enable( sal_False );
+ aFLShadow.Enable( sal_False );
- aFtDistance.Enable( FALSE );
- aMtrDistance.Enable( FALSE );
+ aFtDistance.Enable( sal_False );
+ aMtrDistance.Enable( sal_False );
aMtrDistance.SetEmptyFieldValue();
- aFtFocalLeng.Enable( FALSE );
- aMtrFocalLength.Enable( FALSE );
+ aFtFocalLeng.Enable( sal_False );
+ aMtrFocalLength.Enable( sal_False );
aMtrFocalLength.SetEmptyFieldValue();
- aFLCamera.Enable( FALSE );
+ aFLCamera.Enable( sal_False );
// Unterer Bereich
- aBtnConvertTo3D.Enable( FALSE );
- aBtnLatheObject.Enable( FALSE );
+ aBtnConvertTo3D.Enable( sal_False );
+ aBtnLatheObject.Enable( sal_False );
}
}
// Bitmapfuellung ? -> Status
- BOOL bBitmap(FALSE);
+ sal_Bool bBitmap(sal_False);
eState = rAttrs.GetItemState(XATTR_FILLSTYLE);
if(eState != SFX_ITEM_DONTCARE)
{
@@ -632,8 +632,8 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
{
aNumHorizontal.SetValue( nValue );
// evtl. am Ende...
- // aCtlLightPreview.GetSvx3DLightControl().SetHorizontalSegments( (UINT16)nValue );
- bUpdate = TRUE;
+ // aCtlLightPreview.GetSvx3DLightControl().SetHorizontalSegments( (sal_uInt16)nValue );
+ bUpdate = sal_True;
}
else if( aNumHorizontal.IsEmptyFieldValue() )
aNumHorizontal.SetValue( nValue );
@@ -643,7 +643,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aNumHorizontal.IsEmptyFieldValue() )
{
aNumHorizontal.SetEmptyFieldValue();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
}
@@ -654,13 +654,13 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_VERT_SEGS);
if( eState != SFX_ITEM_DONTCARE )
{
- UINT32 nValue = ((const Svx3DVerticalSegmentsItem&)rAttrs.Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue();
- if( nValue != (UINT32) aNumVertical.GetValue() )
+ sal_uInt32 nValue = ((const Svx3DVerticalSegmentsItem&)rAttrs.Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue();
+ if( nValue != (sal_uInt32) aNumVertical.GetValue() )
{
aNumVertical.SetValue( nValue );
// evtl. am Ende...
- //aCtlLightPreview.GetSvx3DLightControl().SetVerticalSegments( (UINT16)nValue );
- bUpdate = TRUE;
+ //aCtlLightPreview.GetSvx3DLightControl().SetVerticalSegments( (sal_uInt16)nValue );
+ bUpdate = sal_True;
}
else if( aNumVertical.IsEmptyFieldValue() )
aNumVertical.SetValue( nValue );
@@ -670,7 +670,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aNumVertical.IsEmptyFieldValue() )
{
aNumVertical.SetEmptyFieldValue();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
}
@@ -681,15 +681,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DEPTH);
if( eState != SFX_ITEM_DONTCARE )
{
- UINT32 nValue = ((const Svx3DDepthItem&)rAttrs.Get(SDRATTR_3DOBJ_DEPTH)).GetValue();
- UINT32 nValue2 = GetCoreValue( aMtrDepth, ePoolUnit );
+ sal_uInt32 nValue = ((const Svx3DDepthItem&)rAttrs.Get(SDRATTR_3DOBJ_DEPTH)).GetValue();
+ sal_uInt32 nValue2 = GetCoreValue( aMtrDepth, ePoolUnit );
if( nValue != nValue2 )
{
if( eFUnit != aMtrDepth.GetUnit() )
SetFieldUnit( aMtrDepth, eFUnit );
SetMetricValue( aMtrDepth, nValue, ePoolUnit );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
else if( aMtrDepth.IsEmptyFieldValue() )
aMtrDepth.SetValue( aMtrDepth.GetValue() );
@@ -699,7 +699,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrDepth.IsEmptyFieldValue() )
{
aMtrDepth.SetEmptyFieldValue();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
}
@@ -708,11 +708,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DOUBLE_SIDED);
if( eState != SFX_ITEM_DONTCARE )
{
- BOOL bValue = ((const Svx3DDoubleSidedItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue();
+ sal_Bool bValue = ((const Svx3DDoubleSidedItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue();
if( bValue != aBtnDoubleSided.IsChecked() )
{
aBtnDoubleSided.Check( bValue );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
else if( aBtnDoubleSided.GetState() == STATE_DONTKNOW )
aBtnDoubleSided.Check( bValue );
@@ -722,7 +722,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnDoubleSided.GetState() != STATE_DONTKNOW )
{
aBtnDoubleSided.SetState( STATE_DONTKNOW );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
@@ -732,11 +732,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_PERCENT_DIAGONAL);
if( eState != SFX_ITEM_DONTCARE )
{
- UINT16 nValue = ((const Svx3DPercentDiagonalItem&)rAttrs.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue();
+ sal_uInt16 nValue = ((const Svx3DPercentDiagonalItem&)rAttrs.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue();
if( nValue != aMtrPercentDiagonal.GetValue() )
{
aMtrPercentDiagonal.SetValue( nValue );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
else if( aMtrPercentDiagonal.IsEmptyFieldValue() )
aMtrPercentDiagonal.SetValue( nValue );
@@ -746,7 +746,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrPercentDiagonal.IsEmptyFieldValue() )
{
aMtrPercentDiagonal.SetEmptyFieldValue();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
}
@@ -757,11 +757,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_BACKSCALE);
if( eState != SFX_ITEM_DONTCARE )
{
- UINT16 nValue = ((const Svx3DBackscaleItem&)rAttrs.Get(SDRATTR_3DOBJ_BACKSCALE)).GetValue();
+ sal_uInt16 nValue = ((const Svx3DBackscaleItem&)rAttrs.Get(SDRATTR_3DOBJ_BACKSCALE)).GetValue();
if( nValue != aMtrBackscale.GetValue() )
{
aMtrBackscale.SetValue( nValue );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
else if( aMtrBackscale.IsEmptyFieldValue() )
aMtrBackscale.SetValue( nValue );
@@ -771,7 +771,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrBackscale.IsEmptyFieldValue() )
{
aMtrBackscale.SetEmptyFieldValue();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
}
@@ -782,11 +782,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_END_ANGLE);
if( eState != SFX_ITEM_DONTCARE )
{
- INT32 nValue = ((const Svx3DEndAngleItem&)rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue();
+ sal_Int32 nValue = ((const Svx3DEndAngleItem&)rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue();
if( nValue != aMtrEndAngle.GetValue() )
{
aMtrEndAngle.SetValue( nValue );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -794,7 +794,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrEndAngle.IsEmptyFieldValue() )
{
aMtrEndAngle.SetEmptyFieldValue();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
}
@@ -803,7 +803,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_KIND);
if( eState != SFX_ITEM_DONTCARE )
{
- UINT16 nValue = ((const Svx3DNormalsKindItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue();
+ sal_uInt16 nValue = ((const Svx3DNormalsKindItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue();
if( ( !aBtnNormalsObj.IsChecked() && nValue == 0 ) ||
( !aBtnNormalsFlat.IsChecked() && nValue == 1 ) ||
@@ -812,7 +812,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
aBtnNormalsObj.Check( nValue == 0 );
aBtnNormalsFlat.Check( nValue == 1 );
aBtnNormalsSphere.Check( nValue == 2 );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -821,10 +821,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
aBtnNormalsFlat.IsChecked() ||
aBtnNormalsSphere.IsChecked() )
{
- aBtnNormalsObj.Check( FALSE );
- aBtnNormalsFlat.Check( FALSE );
- aBtnNormalsSphere.Check( FALSE );
- bUpdate = TRUE;
+ aBtnNormalsObj.Check( sal_False );
+ aBtnNormalsFlat.Check( sal_False );
+ aBtnNormalsSphere.Check( sal_False );
+ bUpdate = sal_True;
}
}
@@ -832,11 +832,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_INVERT);
if( eState != SFX_ITEM_DONTCARE )
{
- BOOL bValue = ((const Svx3DNormalsInvertItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue();
+ sal_Bool bValue = ((const Svx3DNormalsInvertItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue();
if( bValue != aBtnNormalsInvert.IsChecked() )
{
aBtnNormalsInvert.Check( bValue );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
else if( aBtnNormalsInvert.GetState() == STATE_DONTKNOW )
aBtnNormalsInvert.Check( bValue );
@@ -846,7 +846,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnNormalsInvert.GetState() != STATE_DONTKNOW )
{
aBtnNormalsInvert.SetState( STATE_DONTKNOW );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
@@ -854,11 +854,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING);
if( eState != SFX_ITEM_DONTCARE )
{
- BOOL bValue = ((const Svx3DTwoSidedLightingItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue();
+ sal_Bool bValue = ((const Svx3DTwoSidedLightingItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue();
if( bValue != aBtnTwoSidedLighting.IsChecked() )
{
aBtnTwoSidedLighting.Check( bValue );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
else if( aBtnTwoSidedLighting.GetState() == STATE_DONTKNOW )
aBtnTwoSidedLighting.Check( bValue );
@@ -868,7 +868,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnTwoSidedLighting.GetState() != STATE_DONTKNOW )
{
aBtnTwoSidedLighting.SetState( STATE_DONTKNOW );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
@@ -877,11 +877,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADE_MODE);
if( eState != SFX_ITEM_DONTCARE )
{
- UINT16 nValue = ((const Svx3DShadeModeItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue();
+ sal_uInt16 nValue = ((const Svx3DShadeModeItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue();
if( nValue != aLbShademode.GetSelectEntryPos() )
{
aLbShademode.SelectEntryPos( nValue );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -889,7 +889,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbShademode.GetSelectEntryCount() != 0 )
{
aLbShademode.SetNoSelection();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
@@ -897,13 +897,13 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_SHADOW_3D);
if( eState != SFX_ITEM_DONTCARE )
{
- BOOL bValue = ((const Svx3DShadow3DItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue();
+ sal_Bool bValue = ((const Svx3DShadow3DItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue();
if( bValue != aBtnShadow3d.IsChecked() )
{
aBtnShadow3d.Check( bValue );
aFtSlant.Enable( bValue );
aMtrSlant.Enable( bValue );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
else if( aBtnShadow3d.GetState() == STATE_DONTKNOW )
aBtnShadow3d.Check( bValue );
@@ -913,7 +913,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnShadow3d.GetState() != STATE_DONTKNOW )
{
aBtnShadow3d.SetState( STATE_DONTKNOW );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
@@ -921,11 +921,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADOW_SLANT);
if( eState != SFX_ITEM_DONTCARE )
{
- UINT16 nValue = ((const Svx3DShadowSlantItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue();
+ sal_uInt16 nValue = ((const Svx3DShadowSlantItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue();
if( nValue != aMtrSlant.GetValue() )
{
aMtrSlant.SetValue( nValue );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -933,7 +933,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrSlant.IsEmptyFieldValue() )
{
aMtrSlant.SetEmptyFieldValue();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
@@ -941,15 +941,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_DISTANCE);
if( eState != SFX_ITEM_DONTCARE )
{
- UINT32 nValue = ((const Svx3DDistanceItem&)rAttrs.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue();
- UINT32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
+ sal_uInt32 nValue = ((const Svx3DDistanceItem&)rAttrs.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue();
+ sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
if( nValue != nValue2 )
{
if( eFUnit != aMtrDistance.GetUnit() )
SetFieldUnit( aMtrDistance, eFUnit );
SetMetricValue( aMtrDistance, nValue, ePoolUnit );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -957,7 +957,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrDepth.IsEmptyFieldValue() )
{
aMtrDepth.SetEmptyFieldValue();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
@@ -965,15 +965,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_FOCAL_LENGTH);
if( eState != SFX_ITEM_DONTCARE )
{
- UINT32 nValue = ((const Svx3DFocalLengthItem&)rAttrs.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
- UINT32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
+ sal_uInt32 nValue = ((const Svx3DFocalLengthItem&)rAttrs.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue();
+ sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
if( nValue != nValue2 )
{
if( eFUnit != aMtrFocalLength.GetUnit() )
SetFieldUnit( aMtrFocalLength, eFUnit );
SetMetricValue( aMtrFocalLength, nValue, ePoolUnit );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -981,7 +981,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrFocalLength.IsEmptyFieldValue() )
{
aMtrFocalLength.SetEmptyFieldValue();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
@@ -997,7 +997,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1005,7 +1005,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight1.GetSelectEntryCount() != 0 )
{
aLbLight1.SetNoSelection();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 1 (an/aus)
@@ -1017,7 +1017,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight1 )) )
{
SetUILightState( aBtnLight1, bOn );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
if( aBtnLight1.GetState() == STATE_DONTKNOW )
aBtnLight1.Check( aBtnLight1.IsChecked() );
@@ -1027,14 +1027,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight1.GetState() != STATE_DONTKNOW )
{
aBtnLight1.SetState( STATE_DONTKNOW );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 1 (Richtung)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_1);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
// Licht 2 (Farbe)
@@ -1046,7 +1046,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1054,7 +1054,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight2.GetSelectEntryCount() != 0 )
{
aLbLight2.SetNoSelection();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 2 (an/aus)
@@ -1066,7 +1066,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight2 )) )
{
SetUILightState( aBtnLight2, bOn );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
if( aBtnLight2.GetState() == STATE_DONTKNOW )
aBtnLight2.Check( aBtnLight2.IsChecked() );
@@ -1076,14 +1076,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight2.GetState() != STATE_DONTKNOW )
{
aBtnLight2.SetState( STATE_DONTKNOW );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 2 (Richtung)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_2);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
// Licht 3 (Farbe)
@@ -1095,7 +1095,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1103,7 +1103,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight3.GetSelectEntryCount() != 0 )
{
aLbLight3.SetNoSelection();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 3 (an/aus)
@@ -1115,7 +1115,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight3)) )
{
SetUILightState( aBtnLight3, bOn );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
if( aBtnLight3.GetState() == STATE_DONTKNOW )
aBtnLight3.Check( aBtnLight3.IsChecked() );
@@ -1125,14 +1125,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight3.GetState() != STATE_DONTKNOW )
{
aBtnLight3.SetState( STATE_DONTKNOW );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 3 (Richtung)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_3);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
// Licht 4 (Farbe)
@@ -1144,7 +1144,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1152,7 +1152,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight4.GetSelectEntryCount() != 0 )
{
aLbLight4.SetNoSelection();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 4 (an/aus)
@@ -1164,7 +1164,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight4 )) )
{
SetUILightState( aBtnLight4, bOn );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
if( aBtnLight4.GetState() == STATE_DONTKNOW )
aBtnLight4.Check( aBtnLight4.IsChecked() );
@@ -1174,14 +1174,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight4.GetState() != STATE_DONTKNOW )
{
aBtnLight4.SetState( STATE_DONTKNOW );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 4 (Richtung)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_4);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
// Licht 5 (Farbe)
@@ -1193,7 +1193,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1201,7 +1201,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight5.GetSelectEntryCount() != 0 )
{
aLbLight5.SetNoSelection();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 5 (an/aus)
@@ -1213,7 +1213,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight5 )) )
{
SetUILightState( aBtnLight5, bOn );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
if( aBtnLight5.GetState() == STATE_DONTKNOW )
aBtnLight5.Check( aBtnLight5.IsChecked() );
@@ -1223,14 +1223,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight5.GetState() != STATE_DONTKNOW )
{
aBtnLight5.SetState( STATE_DONTKNOW );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 5 (Richtung)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_5);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
// Licht 6 (Farbe)
@@ -1242,7 +1242,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1250,7 +1250,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight6.GetSelectEntryCount() != 0 )
{
aLbLight6.SetNoSelection();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 6 (an/aus)
@@ -1262,7 +1262,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight6 )) )
{
SetUILightState( aBtnLight6, bOn );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
if( aBtnLight6.GetState() == STATE_DONTKNOW )
aBtnLight6.Check( aBtnLight6.IsChecked() );
@@ -1272,14 +1272,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight6.GetState() != STATE_DONTKNOW )
{
aBtnLight6.SetState( STATE_DONTKNOW );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 6 (Richtung)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_6);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
// Licht 7 (Farbe)
@@ -1291,7 +1291,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1299,7 +1299,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight7.GetSelectEntryCount() != 0 )
{
aLbLight7.SetNoSelection();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 7 (an/aus)
@@ -1311,7 +1311,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight7 )) )
{
SetUILightState( aBtnLight7 , bOn );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
if( aBtnLight7.GetState() == STATE_DONTKNOW )
aBtnLight7.Check( aBtnLight7.IsChecked() );
@@ -1321,14 +1321,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight7.GetState() != STATE_DONTKNOW )
{
aBtnLight7.SetState( STATE_DONTKNOW );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 7 (Richtung)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_7);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
// Licht 8 (Farbe)
@@ -1340,7 +1340,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1348,7 +1348,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbLight8.GetSelectEntryCount() != 0 )
{
aLbLight8.SetNoSelection();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 8 (an/aus)
@@ -1360,7 +1360,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( !bOn && GetUILightState( aBtnLight8 )) )
{
SetUILightState( aBtnLight8, bOn );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
if( aBtnLight8.GetState() == STATE_DONTKNOW )
aBtnLight8.Check( aBtnLight8.IsChecked() );
@@ -1370,14 +1370,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnLight8.GetState() != STATE_DONTKNOW )
{
aBtnLight8.SetState( STATE_DONTKNOW );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
// Licht 8 (Richtung)
eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_8);
if( eState != SFX_ITEM_DONTCARE )
{
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
// Umgebungslicht
@@ -1389,7 +1389,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1397,7 +1397,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbAmbientlight.GetSelectEntryCount() != 0 )
{
aLbAmbientlight.SetNoSelection();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
@@ -1409,14 +1409,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_KIND);
if( eState != SFX_ITEM_DONTCARE )
{
- UINT16 nValue = ((const Svx3DTextureKindItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue();
+ sal_uInt16 nValue = ((const Svx3DTextureKindItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue();
if( ( !aBtnTexLuminance.IsChecked() && nValue == 1 ) ||
( !aBtnTexColor.IsChecked() && nValue == 3 ) )
{
aBtnTexLuminance.Check( nValue == 1 );
aBtnTexColor.Check( nValue == 3 );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1424,9 +1424,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnTexLuminance.IsChecked() ||
aBtnTexColor.IsChecked() )
{
- aBtnTexLuminance.Check( FALSE );
- aBtnTexColor.Check( FALSE );
- bUpdate = TRUE;
+ aBtnTexLuminance.Check( sal_False );
+ aBtnTexColor.Check( sal_False );
+ bUpdate = sal_True;
}
}
@@ -1434,7 +1434,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_MODE);
if( eState != SFX_ITEM_DONTCARE )
{
- UINT16 nValue = ((const Svx3DTextureModeItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue();
+ sal_uInt16 nValue = ((const Svx3DTextureModeItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue();
if( ( !aBtnTexReplace.IsChecked() && nValue == 1 ) ||
( !aBtnTexModulate.IsChecked() && nValue == 2 ) )
@@ -1442,7 +1442,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
aBtnTexReplace.Check( nValue == 1 );
aBtnTexModulate.Check( nValue == 2 );
//aBtnTexBlend.Check( nValue == 2 );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1450,10 +1450,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnTexReplace.IsChecked() ||
aBtnTexModulate.IsChecked() )
{
- aBtnTexReplace.Check( FALSE );
- aBtnTexModulate.Check( FALSE );
- //aBtnTexBlend.Check( FALSE );
- bUpdate = TRUE;
+ aBtnTexReplace.Check( sal_False );
+ aBtnTexModulate.Check( sal_False );
+ //aBtnTexBlend.Check( sal_False );
+ bUpdate = sal_True;
}
}
@@ -1461,7 +1461,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_X);
if( eState != SFX_ITEM_DONTCARE )
{
- UINT16 nValue = ((const Svx3DTextureProjectionXItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue();
+ sal_uInt16 nValue = ((const Svx3DTextureProjectionXItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue();
if( ( !aBtnTexObjectX.IsChecked() && nValue == 0 ) ||
( !aBtnTexParallelX.IsChecked() && nValue == 1 ) ||
@@ -1470,7 +1470,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
aBtnTexObjectX.Check( nValue == 0 );
aBtnTexParallelX.Check( nValue == 1 );
aBtnTexCircleX.Check( nValue == 2 );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1479,10 +1479,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
aBtnTexParallelX.IsChecked() ||
aBtnTexCircleX.IsChecked() )
{
- aBtnTexObjectX.Check( FALSE );
- aBtnTexParallelX.Check( FALSE );
- aBtnTexCircleX.Check( FALSE );
- bUpdate = TRUE;
+ aBtnTexObjectX.Check( sal_False );
+ aBtnTexParallelX.Check( sal_False );
+ aBtnTexCircleX.Check( sal_False );
+ bUpdate = sal_True;
}
}
@@ -1490,7 +1490,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_Y);
if( eState != SFX_ITEM_DONTCARE )
{
- UINT16 nValue = ((const Svx3DTextureProjectionYItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue();
+ sal_uInt16 nValue = ((const Svx3DTextureProjectionYItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue();
if( ( !aBtnTexObjectY.IsChecked() && nValue == 0 ) ||
( !aBtnTexParallelY.IsChecked() && nValue == 1 ) ||
@@ -1499,7 +1499,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
aBtnTexObjectY.Check( nValue == 0 );
aBtnTexParallelY.Check( nValue == 1 );
aBtnTexCircleY.Check( nValue == 2 );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1508,10 +1508,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
aBtnTexParallelY.IsChecked() ||
aBtnTexCircleY.IsChecked() )
{
- aBtnTexObjectY.Check( FALSE );
- aBtnTexParallelY.Check( FALSE );
- aBtnTexCircleY.Check( FALSE );
- bUpdate = TRUE;
+ aBtnTexObjectY.Check( sal_False );
+ aBtnTexParallelY.Check( sal_False );
+ aBtnTexCircleY.Check( sal_False );
+ bUpdate = sal_True;
}
}
@@ -1519,11 +1519,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_FILTER);
if( eState != SFX_ITEM_DONTCARE )
{
- BOOL bValue = ((const Svx3DTextureFilterItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue();
+ sal_Bool bValue = ((const Svx3DTextureFilterItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue();
if( bValue != aBtnTexFilter.IsChecked() )
{
aBtnTexFilter.Check( bValue );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
if( aBtnTexFilter.GetState() == STATE_DONTKNOW )
aBtnTexFilter.Check( bValue );
@@ -1533,7 +1533,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnTexFilter.GetState() != STATE_DONTKNOW )
{
aBtnTexFilter.SetState( STATE_DONTKNOW );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
}
@@ -1551,7 +1551,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1559,7 +1559,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbMatColor.GetSelectEntryCount() != 0 )
{
aLbMatColor.SetNoSelection();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
@@ -1572,7 +1572,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1580,7 +1580,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbMatEmission.GetSelectEntryCount() != 0 )
{
aLbMatEmission.SetNoSelection();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
@@ -1593,7 +1593,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aColor != pLb->GetSelectEntryColor() )
{
LBSelectColor( pLb, aColor );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1601,7 +1601,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aLbMatSpecular.GetSelectEntryCount() != 0 )
{
aLbMatSpecular.SetNoSelection();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
@@ -1609,11 +1609,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY);
if( eState != SFX_ITEM_DONTCARE )
{
- UINT16 nValue = ((const Svx3DMaterialSpecularIntensityItem&)rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue();
+ sal_uInt16 nValue = ((const Svx3DMaterialSpecularIntensityItem&)rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue();
if( nValue != aMtrMatSpecularIntensity.GetValue() )
{
aMtrMatSpecularIntensity.SetValue( nValue );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
else
@@ -1621,7 +1621,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() )
{
aMtrMatSpecularIntensity.SetEmptyFieldValue();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
@@ -1636,7 +1636,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
( aBtnPerspective.IsChecked() && ePT == PR_PARALLEL ) )
{
aBtnPerspective.Check( ePT == PR_PERSPECTIVE );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
if( aBtnPerspective.GetState() == STATE_DONTKNOW )
aBtnPerspective.Check( ePT == PR_PERSPECTIVE );
@@ -1646,7 +1646,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
if( aBtnPerspective.GetState() != STATE_DONTKNOW )
{
aBtnPerspective.SetState( STATE_DONTKNOW );
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
}
@@ -1656,7 +1656,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
// diese und entscheide
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
if( bUpdate || bOnly3DChanged )
@@ -1666,12 +1666,12 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
// set LineStyle hard to XLINE_NONE when it's not set so that
// the default (XLINE_SOLID) is not used for 3d preview
- if(SFX_ITEM_SET != aSet.GetItemState(XATTR_LINESTYLE, FALSE))
+ if(SFX_ITEM_SET != aSet.GetItemState(XATTR_LINESTYLE, sal_False))
aSet.Put(XLineStyleItem(XLINE_NONE));
// set FillColor hard to WHITE when it's SFX_ITEM_DONTCARE so that
// the default (Blue7) is not used for 3d preview
- if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, FALSE))
+ if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, sal_False))
aSet.Put(XFillColorItem(String(), Color(COL_WHITE)));
aCtlPreview.Set3DAttributes(aSet);
@@ -1719,11 +1719,11 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
while(nWhich)
{
- SfxItemState eState = mpRemember2DAttributes->GetItemState(nWhich, FALSE);
+ SfxItemState eState = mpRemember2DAttributes->GetItemState(nWhich, sal_False);
if(SFX_ITEM_DONTCARE == eState)
rAttrs.InvalidateItem(nWhich);
else if(SFX_ITEM_SET == eState)
- rAttrs.Put(mpRemember2DAttributes->Get(nWhich, FALSE));
+ rAttrs.Put(mpRemember2DAttributes->Get(nWhich, sal_False));
nWhich = aIter.NextWhich();
}
@@ -1733,7 +1733,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
// Perspektive
if( aBtnPerspective.GetState() != STATE_DONTKNOW )
{
- UINT16 nValue;
+ sal_uInt16 nValue;
if( aBtnPerspective.IsChecked() )
nValue = PR_PERSPECTIVE;
else
@@ -1767,7 +1767,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
// Anzahl Segmente (vertikal)
if( !aNumVertical.IsEmptyFieldValue() )
{
- UINT32 nValue = static_cast<UINT32>(aNumVertical.GetValue());
+ sal_uInt32 nValue = static_cast<sal_uInt32>(aNumVertical.GetValue());
rAttrs.Put(Svx3DVerticalSegmentsItem(nValue));
}
else
@@ -1776,7 +1776,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
// Tiefe
if( !aMtrDepth.IsEmptyFieldValue() )
{
- UINT32 nValue = GetCoreValue( aMtrDepth, ePoolUnit );
+ sal_uInt32 nValue = GetCoreValue( aMtrDepth, ePoolUnit );
rAttrs.Put(Svx3DDepthItem(nValue));
}
else
@@ -1786,7 +1786,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
TriState eState = aBtnDoubleSided.GetState();
if( eState != STATE_DONTKNOW )
{
- BOOL bValue = STATE_CHECK == eState;
+ sal_Bool bValue = STATE_CHECK == eState;
rAttrs.Put(Svx3DDoubleSidedItem(bValue));
}
else
@@ -1795,7 +1795,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
// Kantenrundung
if( !aMtrPercentDiagonal.IsEmptyFieldValue() )
{
- UINT16 nValue = (UINT16) aMtrPercentDiagonal.GetValue();
+ sal_uInt16 nValue = (sal_uInt16) aMtrPercentDiagonal.GetValue();
rAttrs.Put(Svx3DPercentDiagonalItem(nValue));
}
else
@@ -1804,7 +1804,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
// Tiefenskalierung
if( !aMtrBackscale.IsEmptyFieldValue() )
{
- UINT16 nValue = (UINT16)aMtrBackscale.GetValue();
+ sal_uInt16 nValue = (sal_uInt16)aMtrBackscale.GetValue();
rAttrs.Put(Svx3DBackscaleItem(nValue));
}
else
@@ -1813,14 +1813,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
// Endwinkel
if( !aMtrEndAngle.IsEmptyFieldValue() )
{
- UINT16 nValue = (UINT16)aMtrEndAngle.GetValue();
+ sal_uInt16 nValue = (sal_uInt16)aMtrEndAngle.GetValue();
rAttrs.Put(Svx3DEndAngleItem(nValue));
}
else
rAttrs.InvalidateItem(SDRATTR_3DOBJ_END_ANGLE);
// Normalentyp
- UINT16 nValue = 99;
+ sal_uInt16 nValue = 99;
if( aBtnNormalsObj.IsChecked() )
nValue = 0;
else if( aBtnNormalsFlat.IsChecked() )
@@ -1837,7 +1837,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnNormalsInvert.GetState();
if( eState != STATE_DONTKNOW )
{
- BOOL bValue = STATE_CHECK == eState;
+ sal_Bool bValue = STATE_CHECK == eState;
rAttrs.Put(Svx3DNormalsInvertItem(bValue));
}
else
@@ -1847,7 +1847,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnTwoSidedLighting.GetState();
if( eState != STATE_DONTKNOW )
{
- BOOL bValue = STATE_CHECK == eState;
+ sal_Bool bValue = STATE_CHECK == eState;
rAttrs.Put(Svx3DTwoSidedLightingItem(bValue));
}
else
@@ -1867,7 +1867,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnShadow3d.GetState();
if( eState != STATE_DONTKNOW )
{
- BOOL bValue = STATE_CHECK == eState;
+ sal_Bool bValue = STATE_CHECK == eState;
rAttrs.Put(Svx3DShadow3DItem(bValue));
rAttrs.Put(SdrShadowItem(bValue));
}
@@ -1880,7 +1880,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
// Neigung (Schatten)
if( !aMtrSlant.IsEmptyFieldValue() )
{
- UINT16 nValue2 = (UINT16) aMtrSlant.GetValue();
+ sal_uInt16 nValue2 = (sal_uInt16) aMtrSlant.GetValue();
rAttrs.Put(Svx3DShadowSlantItem(nValue2));
}
else
@@ -1889,7 +1889,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
// Distanz
if( !aMtrDistance.IsEmptyFieldValue() )
{
- UINT32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
+ sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit );
rAttrs.Put(Svx3DDistanceItem(nValue2));
}
else
@@ -1898,7 +1898,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
// Brennweite
if( !aMtrFocalLength.IsEmptyFieldValue() )
{
- UINT32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
+ sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit );
rAttrs.Put(Svx3DFocalLengthItem(nValue2));
}
else
@@ -1922,7 +1922,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight1.GetState();
if( eState != STATE_DONTKNOW )
{
- BOOL bValue = GetUILightState( aBtnLight1 );
+ sal_Bool bValue = GetUILightState( aBtnLight1 );
rAttrs.Put(Svx3DLightOnOff1Item(bValue));
// Licht 1 (Richtung)
@@ -1947,7 +1947,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight2.GetState();
if( eState != STATE_DONTKNOW )
{
- BOOL bValue = GetUILightState( aBtnLight2 );
+ sal_Bool bValue = GetUILightState( aBtnLight2 );
rAttrs.Put(Svx3DLightOnOff2Item(bValue));
// Licht 2 (Richtung)
@@ -1971,7 +1971,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight3.GetState();
if( eState != STATE_DONTKNOW )
{
- BOOL bValue = GetUILightState( aBtnLight3 );
+ sal_Bool bValue = GetUILightState( aBtnLight3 );
rAttrs.Put(Svx3DLightOnOff3Item(bValue));
// Licht 3 (Richtung)
@@ -1995,7 +1995,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight4.GetState();
if( eState != STATE_DONTKNOW )
{
- BOOL bValue = GetUILightState( aBtnLight4 );
+ sal_Bool bValue = GetUILightState( aBtnLight4 );
rAttrs.Put(Svx3DLightOnOff4Item(bValue));
// Licht 4 (Richtung)
@@ -2019,7 +2019,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight5.GetState();
if( eState != STATE_DONTKNOW )
{
- BOOL bValue = GetUILightState( aBtnLight5 );
+ sal_Bool bValue = GetUILightState( aBtnLight5 );
rAttrs.Put(Svx3DLightOnOff5Item(bValue));
// Licht 5 (Richtung)
@@ -2043,7 +2043,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight6.GetState();
if( eState != STATE_DONTKNOW )
{
- BOOL bValue = GetUILightState( aBtnLight6 );
+ sal_Bool bValue = GetUILightState( aBtnLight6 );
rAttrs.Put(Svx3DLightOnOff6Item(bValue));
// Licht 6 (Richtung)
@@ -2067,7 +2067,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight7.GetState();
if( eState != STATE_DONTKNOW )
{
- BOOL bValue = GetUILightState( aBtnLight7 );
+ sal_Bool bValue = GetUILightState( aBtnLight7 );
rAttrs.Put(Svx3DLightOnOff7Item(bValue));
// Licht 7 (Richtung)
@@ -2091,7 +2091,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnLight8.GetState();
if( eState != STATE_DONTKNOW )
{
- BOOL bValue = GetUILightState( aBtnLight8 );
+ sal_Bool bValue = GetUILightState( aBtnLight8 );
rAttrs.Put(Svx3DLightOnOff8Item(bValue));
// Licht 8 (Richtung)
@@ -2173,7 +2173,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
eState = aBtnTexFilter.GetState();
if( eState != STATE_DONTKNOW )
{
- BOOL bValue = STATE_CHECK == eState;
+ sal_Bool bValue = STATE_CHECK == eState;
rAttrs.Put(Svx3DTextureFilterItem(bValue));
}
else
@@ -2213,7 +2213,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs )
// Glanzpunkt Intensitaet
if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() )
{
- UINT16 nValue2 = (UINT16) aMtrMatSpecularIntensity.GetValue();
+ sal_uInt16 nValue2 = (sal_uInt16) aMtrMatSpecularIntensity.GetValue();
rAttrs.Put(Svx3DMaterialSpecularIntensityItem(nValue2));
}
else
@@ -2324,7 +2324,7 @@ IMPL_LINK( Svx3DWin, ClickUpdateHdl, void *, EMPTYARG )
SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
if (pDispatcher != NULL)
{
- SfxBoolItem aItem( SID_3D_STATE, TRUE );
+ SfxBoolItem aItem( SID_3D_STATE, sal_True );
pDispatcher->Execute(
SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
}
@@ -2343,7 +2343,7 @@ IMPL_LINK( Svx3DWin, ClickAssignHdl, void *, EMPTYARG )
SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
if (pDispatcher != NULL)
{
- SfxBoolItem aItem( SID_3D_ASSIGN, TRUE );
+ SfxBoolItem aItem( SID_3D_ASSIGN, sal_True );
pDispatcher->Execute(
SID_3D_ASSIGN, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
}
@@ -2359,7 +2359,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn )
if( pBtn )
{
// Da das permanente Updaten der Preview zu teuer waere
- BOOL bUpdatePreview = aBtnLight.IsChecked();
+ sal_Bool bUpdatePreview = aBtnLight.IsChecked();
aBtnGeo.Check( &aBtnGeo == pBtn );
aBtnRepresentation.Check( &aBtnRepresentation == pBtn );
@@ -2623,11 +2623,11 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn )
// -----------------------------------------------------------------------
IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
{
- BOOL bUpdatePreview = FALSE;
+ sal_Bool bUpdatePreview = sal_False;
if( pBtn )
{
- USHORT nSId = 0;
+ sal_uInt16 nSId = 0;
if( pBtn == &aBtnConvertTo3D )
{
@@ -2645,7 +2645,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
aBtnNormalsObj.Check( pBtn == &aBtnNormalsObj );
aBtnNormalsFlat.Check( pBtn == &aBtnNormalsFlat );
aBtnNormalsSphere.Check( pBtn == &aBtnNormalsSphere );
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
else if( pBtn == &aBtnLight1 ||
pBtn == &aBtnLight2 ||
@@ -2670,51 +2670,51 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
if( pBtn != &aBtnLight1 && aBtnLight1.IsChecked() )
{
- aBtnLight1.Check( FALSE );
+ aBtnLight1.Check( sal_False );
aLbLight1.Hide();
}
if( pBtn != &aBtnLight2 && aBtnLight2.IsChecked() )
{
- aBtnLight2.Check( FALSE );
+ aBtnLight2.Check( sal_False );
aLbLight2.Hide();
}
if( pBtn != &aBtnLight3 && aBtnLight3.IsChecked() )
{
- aBtnLight3.Check( FALSE );
+ aBtnLight3.Check( sal_False );
aLbLight3.Hide();
}
if( pBtn != &aBtnLight4 && aBtnLight4.IsChecked() )
{
- aBtnLight4.Check( FALSE );
+ aBtnLight4.Check( sal_False );
aLbLight4.Hide();
}
if( pBtn != &aBtnLight5 && aBtnLight5.IsChecked() )
{
- aBtnLight5.Check( FALSE );
+ aBtnLight5.Check( sal_False );
aLbLight5.Hide();
}
if( pBtn != &aBtnLight6 && aBtnLight6.IsChecked() )
{
- aBtnLight6.Check( FALSE );
+ aBtnLight6.Check( sal_False );
aLbLight6.Hide();
}
if( pBtn != &aBtnLight7 && aBtnLight7.IsChecked() )
{
- aBtnLight7.Check( FALSE );
+ aBtnLight7.Check( sal_False );
aLbLight7.Hide();
}
if( pBtn != &aBtnLight8 && aBtnLight8.IsChecked() )
{
- aBtnLight8.Check( FALSE );
+ aBtnLight8.Check( sal_False );
aLbLight8.Hide();
}
}
- BOOL bEnable = GetUILightState( *(ImageButton*)pBtn );
+ sal_Bool bEnable = GetUILightState( *(ImageButton*)pBtn );
aBtnLightColor.Enable( bEnable );
pLb->Enable( bEnable );
ClickLightHdl( pBtn );
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
// Texturen
else if( pBtn == &aBtnTexLuminance ||
@@ -2722,7 +2722,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
{
aBtnTexLuminance.Check( pBtn == &aBtnTexLuminance );
aBtnTexColor.Check( pBtn == &aBtnTexColor );
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
else if( pBtn == &aBtnTexReplace ||
pBtn == &aBtnTexModulate )// ||
@@ -2731,7 +2731,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
aBtnTexReplace.Check( pBtn == &aBtnTexReplace );
aBtnTexModulate.Check( pBtn == &aBtnTexModulate );
//aBtnTexBlend.Check( pBtn == &aBtnTexBlend );
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
else if( pBtn == &aBtnTexParallelX ||
pBtn == &aBtnTexCircleX ||
@@ -2740,7 +2740,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
aBtnTexParallelX.Check( pBtn == &aBtnTexParallelX );
aBtnTexCircleX.Check( pBtn == &aBtnTexCircleX );
aBtnTexObjectX.Check( pBtn == &aBtnTexObjectX );
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
else if( pBtn == &aBtnTexParallelY ||
pBtn == &aBtnTexCircleY ||
@@ -2749,20 +2749,20 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
aBtnTexParallelY.Check( pBtn == &aBtnTexParallelY );
aBtnTexCircleY.Check( pBtn == &aBtnTexCircleY );
aBtnTexObjectY.Check( pBtn == &aBtnTexObjectY );
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
else if( pBtn == &aBtnShadow3d )
{
pBtn->Check( !pBtn->IsChecked() );
aFtSlant.Enable( pBtn->IsChecked() );
aMtrSlant.Enable( pBtn->IsChecked() );
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
// Sonstige (keine Gruppen)
else if( pBtn != NULL )
{
pBtn->Check( !pBtn->IsChecked() );
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
if( nSId > 0 )
@@ -2770,12 +2770,12 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn )
SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
if (pDispatcher != NULL)
{
- SfxBoolItem aItem( nSId, TRUE );
+ SfxBoolItem aItem( nSId, sal_True );
pDispatcher->Execute(
nSId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
}
}
- else if( bUpdatePreview == TRUE )
+ else if( bUpdatePreview == sal_True )
UpdatePreview();
}
return( 0L );
@@ -2817,7 +2817,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
if( p )
{
Color aColor;
- BOOL bUpdatePreview = FALSE;
+ sal_Bool bUpdatePreview = sal_False;
// Material
if( p == &aLbMatFavorites )
@@ -2825,9 +2825,9 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
Color aColObj( COL_WHITE );
Color aColEmis( COL_BLACK );
Color aColSpec( COL_WHITE );
- USHORT nSpecIntens = 20;
+ sal_uInt16 nSpecIntens = 20;
- USHORT nPos = aLbMatFavorites.GetSelectEntryPos();
+ sal_uInt16 nPos = aLbMatFavorites.GetSelectEntryPos();
switch( nPos )
{
case 1: // Metall
@@ -2880,19 +2880,19 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
LBSelectColor( &aLbMatSpecular, aColSpec );
aMtrMatSpecularIntensity.SetValue( nSpecIntens );
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
else if( p == &aLbMatColor ||
p == &aLbMatEmission ||
p == &aLbMatSpecular )
{
aLbMatFavorites.SelectEntryPos( 0 );
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
// Beleuchtung
else if( p == &aLbAmbientlight )
{
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
else if( p == &aLbLight1 ||
p == &aLbLight2 ||
@@ -2903,12 +2903,12 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p )
p == &aLbLight7 ||
p == &aLbLight8 )
{
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
else if( p == &aLbShademode )
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
- if( bUpdatePreview == TRUE )
+ if( bUpdatePreview == sal_True )
UpdatePreview();
}
return( 0L );
@@ -2919,27 +2919,27 @@ IMPL_LINK( Svx3DWin, ModifyHdl, void*, pField )
{
if( pField )
{
- BOOL bUpdatePreview = FALSE;
+ sal_Bool bUpdatePreview = sal_False;
// Material
if( pField == &aMtrMatSpecularIntensity )
{
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
else if( pField == &aNumHorizontal )
{
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
else if( pField == &aNumVertical )
{
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
else if( pField == &aMtrSlant )
{
- bUpdatePreview = TRUE;
+ bUpdatePreview = sal_True;
}
- if( bUpdatePreview == TRUE )
+ if( bUpdatePreview == sal_True )
UpdatePreview();
}
return( 0L );
@@ -2952,7 +2952,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn )
if( pBtn )
{
- USHORT nLightSource = GetLightSource( pBtn );
+ sal_uInt16 nLightSource = GetLightSource( pBtn );
ColorLB* pLb = GetLbByButton( pBtn );
Color aColor( pLb->GetSelectEntryColor() );
SfxItemSet aLightItemSet(aCtlLightPreview.GetSvx3DLightControl().Get3DAttributes());
@@ -2982,7 +2982,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn )
// -----------------------------------------------------------------------
IMPL_LINK( Svx3DWin, DoubleClickHdl, void*, EMPTYARG )
{
- //USHORT nItemId = aCtlFavorites.GetSelectItemId();
+ //sal_uInt16 nItemId = aCtlFavorites.GetSelectItemId();
//SfxItemSet* pSet = (SfxItemSet*) pFavorSetList->GetObject( nItemId - 1 );
//Update( *pSet );
@@ -3028,45 +3028,45 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG )
// Zustand: Keine Lampe selektiert
if( aBtnLight1.IsChecked() )
{
- aBtnLight1.Check( FALSE );
- aLbLight1.Enable( FALSE );
+ aBtnLight1.Check( sal_False );
+ aLbLight1.Enable( sal_False );
}
else if( aBtnLight2.IsChecked() )
{
- aBtnLight2.Check( FALSE );
- aLbLight2.Enable( FALSE );
+ aBtnLight2.Check( sal_False );
+ aLbLight2.Enable( sal_False );
}
else if( aBtnLight3.IsChecked() )
{
- aBtnLight3.Check( FALSE );
- aLbLight3.Enable( FALSE );
+ aBtnLight3.Check( sal_False );
+ aLbLight3.Enable( sal_False );
}
else if( aBtnLight4.IsChecked() )
{
- aBtnLight4.Check( FALSE );
- aLbLight4.Enable( FALSE );
+ aBtnLight4.Check( sal_False );
+ aLbLight4.Enable( sal_False );
}
else if( aBtnLight5.IsChecked() )
{
- aBtnLight5.Check( FALSE );
- aLbLight5.Enable( FALSE );
+ aBtnLight5.Check( sal_False );
+ aLbLight5.Enable( sal_False );
}
else if( aBtnLight6.IsChecked() )
{
- aBtnLight6.Check( FALSE );
- aLbLight6.Enable( FALSE );
+ aBtnLight6.Check( sal_False );
+ aLbLight6.Enable( sal_False );
}
else if( aBtnLight7.IsChecked() )
{
- aBtnLight7.Check( FALSE );
- aLbLight7.Enable( FALSE );
+ aBtnLight7.Check( sal_False );
+ aLbLight7.Enable( sal_False );
}
else if( aBtnLight8.IsChecked() )
{
- aBtnLight8.Check( FALSE );
- aLbLight8.Enable( FALSE );
+ aBtnLight8.Check( sal_False );
+ aLbLight8.Enable( sal_False );
}
- aBtnLightColor.Enable( FALSE );
+ aBtnLightColor.Enable( sal_False );
}
return( 0L );
@@ -3074,11 +3074,11 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG )
// -----------------------------------------------------------------------
// Methode um sicherzustellen, dass die LB auch mit einer Farbe gesetzt ist
-// Liefert TRUE zurueck, falls Farbe hinzugefuegt wurde
+// Liefert sal_True zurueck, falls Farbe hinzugefuegt wurde
// -----------------------------------------------------------------------
-BOOL Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
+sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
pLb->SetNoSelection();
pLb->SelectEntry( rColor );
@@ -3086,17 +3086,17 @@ BOOL Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor )
{
String aStr(SVX_RES(RID_SVXFLOAT3D_FIX_R));
- aStr += String::CreateFromInt32((INT32)rColor.GetRed());
+ aStr += String::CreateFromInt32((sal_Int32)rColor.GetRed());
aStr += sal_Unicode(' ');
aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_G));
- aStr += String::CreateFromInt32((INT32)rColor.GetGreen());
+ aStr += String::CreateFromInt32((sal_Int32)rColor.GetGreen());
aStr += sal_Unicode(' ');
aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_B));
- aStr += String::CreateFromInt32((INT32)rColor.GetBlue());
+ aStr += String::CreateFromInt32((sal_Int32)rColor.GetBlue());
- USHORT nPos = pLb->InsertEntry( rColor, aStr );
+ sal_uInt16 nPos = pLb->InsertEntry( rColor, aStr );
pLb->SelectEntryPos( nPos );
- bRet = TRUE;
+ bRet = sal_True;
}
return( bRet );
}
@@ -3113,12 +3113,12 @@ void Svx3DWin::UpdatePreview()
SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
if (pDispatcher != NULL)
{
- SfxBoolItem aItem( SID_3D_STATE, TRUE );
+ SfxBoolItem aItem( SID_3D_STATE, sal_True );
pDispatcher->Execute(
SID_3D_STATE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
}
// Flag zuruecksetzen
- bOnly3DChanged = FALSE;
+ bOnly3DChanged = sal_False;
}
// ItemSet besorgen
@@ -3173,9 +3173,9 @@ void Svx3DWin::InitColorLB( const SdrModel* pDoc )
}
// -----------------------------------------------------------------------
-USHORT Svx3DWin::GetLightSource( const PushButton* pBtn )
+sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn )
{
- USHORT nLight = 8;
+ sal_uInt16 nLight = 8;
if( pBtn == NULL )
{
@@ -3270,7 +3270,7 @@ ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn )
|*
\************************************************************************/
__EXPORT Svx3DChildWindow::Svx3DChildWindow( Window* _pParent,
- USHORT nId,
+ sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo ) :
SfxChildWindow( _pParent, nId )
@@ -3288,7 +3288,7 @@ __EXPORT Svx3DChildWindow::Svx3DChildWindow( Window* _pParent,
|* ControllerItem fuer 3DStatus
|*
\************************************************************************/
-Svx3DCtrlItem::Svx3DCtrlItem( USHORT _nId,
+Svx3DCtrlItem::Svx3DCtrlItem( sal_uInt16 _nId,
Svx3DWin* pWin,
SfxBindings* _pBindings) :
SfxControllerItem( _nId, *_pBindings ),
@@ -3297,7 +3297,7 @@ Svx3DCtrlItem::Svx3DCtrlItem( USHORT _nId,
}
// -----------------------------------------------------------------------
-void __EXPORT Svx3DCtrlItem::StateChanged( USHORT /*nSId*/,
+void __EXPORT Svx3DCtrlItem::StateChanged( sal_uInt16 /*nSId*/,
SfxItemState /*eState*/, const SfxPoolItem* /*pItem*/ )
{
}
@@ -3308,22 +3308,22 @@ void __EXPORT Svx3DCtrlItem::StateChanged( USHORT /*nSId*/,
|*
\************************************************************************/
-SvxConvertTo3DItem::SvxConvertTo3DItem(UINT16 _nId, SfxBindings* _pBindings)
+SvxConvertTo3DItem::SvxConvertTo3DItem(sal_uInt16 _nId, SfxBindings* _pBindings)
: SfxControllerItem(_nId, *_pBindings),
- bState(FALSE)
+ bState(sal_False)
{
}
-void SvxConvertTo3DItem::StateChanged(UINT16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/)
+void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/)
{
- BOOL bNewState = (eState != SFX_ITEM_DISABLED);
+ sal_Bool bNewState = (eState != SFX_ITEM_DISABLED);
if(bNewState != bState)
{
bState = bNewState;
SfxDispatcher* pDispatcher = LocalGetDispatcher(&GetBindings());
if (pDispatcher != NULL)
{
- SfxBoolItem aItem( SID_3D_STATE, TRUE );
+ SfxBoolItem aItem( SID_3D_STATE, sal_True );
pDispatcher->Execute(
SID_3D_STATE, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD, &aItem, 0L);
}
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 4d88dce0fb4d..284394cc202c 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -130,7 +130,7 @@ void E3dLatheObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
|*
\************************************************************************/
-UINT16 E3dLatheObj::GetObjIdentifier() const
+sal_uInt16 E3dLatheObj::GetObjIdentifier() const
{
return E3D_LATHEOBJ_ID;
}
@@ -158,7 +158,7 @@ void E3dLatheObj::operator=(const SdrObject& rObj)
|*
\************************************************************************/
-SdrObject *E3dLatheObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dLatheObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
{
return NULL;
}
@@ -248,9 +248,9 @@ void E3dLatheObj::TakeObjNamePlural(XubString& rName) const
|*
\************************************************************************/
-BOOL E3dLatheObj::IsBreakObjPossible()
+sal_Bool E3dLatheObj::IsBreakObjPossible()
{
- return TRUE;
+ return sal_True;
}
SdrAttrObj* E3dLatheObj::GetBreakObj()
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index c9ceb1ef78a6..64f43790513d 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -117,7 +117,7 @@ E3dObjList::~E3dObjList()
{
}
-void E3dObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason)
+void E3dObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason)
{
// Owner holen
DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Einfuegen 3DObject in Parent != 3DObject");
@@ -136,7 +136,7 @@ void E3dObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRea
}
}
-void E3dObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason)
+void E3dObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason)
{
OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "Insert 3DObject in non-3D Parent");
//E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj());
@@ -151,7 +151,7 @@ void E3dObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason
}
}
-SdrObject* E3dObjList::NbcRemoveObject(ULONG nObjNum)
+SdrObject* E3dObjList::NbcRemoveObject(sal_uIntPtr nObjNum)
{
DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Entfernen 3DObject aus Parent != 3DObject");
//E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj());
@@ -168,7 +168,7 @@ SdrObject* E3dObjList::NbcRemoveObject(ULONG nObjNum)
return pRetval;
}
-SdrObject* E3dObjList::RemoveObject(ULONG nObjNum)
+SdrObject* E3dObjList::RemoveObject(sal_uIntPtr nObjNum)
{
OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "3DObject is removed from non-3D Parent");
//E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj());
@@ -256,9 +256,9 @@ void E3dObject::SetSelected(bool bNew)
|*
\************************************************************************/
-BOOL E3dObject::IsBreakObjPossible()
+sal_Bool E3dObject::IsBreakObjPossible()
{
- return FALSE;
+ return sal_False;
}
SdrAttrObj* E3dObject::GetBreakObj()
@@ -294,7 +294,7 @@ void E3dObject::SetRectsDirty(sal_Bool bNotMyself)
|*
\************************************************************************/
-UINT32 E3dObject::GetObjInventor() const
+sal_uInt32 E3dObject::GetObjInventor() const
{
return E3dInventor;
}
@@ -305,7 +305,7 @@ UINT32 E3dObject::GetObjInventor() const
|*
\************************************************************************/
-UINT16 E3dObject::GetObjIdentifier() const
+sal_uInt16 E3dObject::GetObjIdentifier() const
{
return E3D_OBJECT_ID;
}
@@ -318,19 +318,19 @@ UINT16 E3dObject::GetObjIdentifier() const
void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bResizeFreeAllowed = TRUE;
- rInfo.bResizePropAllowed = TRUE;
- rInfo.bRotateFreeAllowed = TRUE;
- rInfo.bRotate90Allowed = TRUE;
- rInfo.bMirrorFreeAllowed = FALSE;
- rInfo.bMirror45Allowed = FALSE;
- rInfo.bMirror90Allowed = FALSE;
- rInfo.bShearAllowed = FALSE;
- rInfo.bEdgeRadiusAllowed = FALSE;
- rInfo.bCanConvToPath = FALSE;
+ rInfo.bResizeFreeAllowed = sal_True;
+ rInfo.bResizePropAllowed = sal_True;
+ rInfo.bRotateFreeAllowed = sal_True;
+ rInfo.bRotate90Allowed = sal_True;
+ rInfo.bMirrorFreeAllowed = sal_False;
+ rInfo.bMirror45Allowed = sal_False;
+ rInfo.bMirror90Allowed = sal_False;
+ rInfo.bShearAllowed = sal_False;
+ rInfo.bEdgeRadiusAllowed = sal_False;
+ rInfo.bCanConvToPath = sal_False;
// no transparence for 3d objects
- rInfo.bTransparenceAllowed = FALSE;
+ rInfo.bTransparenceAllowed = sal_False;
// gradient depends on fillstyle
// BM *** check if SetItem is NULL ***
@@ -344,10 +344,10 @@ void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
// also bei Durchdringugnen auch gegeneinander geschnitten werden
// muessten. Auch die Texturkoorinaten waeren ein ungeloestes
// Problem.
- rInfo.bCanConvToPoly = FALSE;
- rInfo.bCanConvToContour = FALSE;
- rInfo.bCanConvToPathLineToArea = FALSE;
- rInfo.bCanConvToPolyLineToArea = FALSE;
+ rInfo.bCanConvToPoly = sal_False;
+ rInfo.bCanConvToContour = sal_False;
+ rInfo.bCanConvToPathLineToArea = sal_False;
+ rInfo.bCanConvToPolyLineToArea = sal_False;
}
/*************************************************************************
@@ -951,7 +951,7 @@ void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
// Also derzeit sind die Klebepunkte relativ zum aOutRect der Szene definiert. Vor dem Drehen
// werden die Klebepunkte relativ zur Seite definiert. Sie nehmen an der Drehung der Szene noch nicht Teil
// dafuer gibt es den
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
// SendRepaintBroadcast();
double fWinkelInRad = nWink/100 * F_PI180;
@@ -963,7 +963,7 @@ void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
SetRectsDirty(); // Veranlasst eine Neuberechnung aller BoundRects
NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotiert die Klebepunkte (die haben noch Koordinaten relativ
// zum Urpsung des Blattes
- SetGlueReallyAbsolute(FALSE); // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
+ SetGlueReallyAbsolute(sal_False); // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert)
}
/*************************************************************************/
@@ -1127,7 +1127,7 @@ void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const
|*
\************************************************************************/
-UINT16 E3dCompoundObject::GetObjIdentifier() const
+sal_uInt16 E3dCompoundObject::GetObjIdentifier() const
{
return E3D_COMPOUNDOBJ_ID;
}
@@ -1207,7 +1207,7 @@ void E3dCompoundObject::operator=(const SdrObject& rObj)
|*
\************************************************************************/
-void E3dCompoundObject::SetCreateNormals(BOOL bNew)
+void E3dCompoundObject::SetCreateNormals(sal_Bool bNew)
{
if(bCreateNormals != bNew)
{
@@ -1216,7 +1216,7 @@ void E3dCompoundObject::SetCreateNormals(BOOL bNew)
}
}
-void E3dCompoundObject::SetCreateTexture(BOOL bNew)
+void E3dCompoundObject::SetCreateTexture(sal_Bool bNew)
{
if(bCreateTexture != bNew)
{
diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx
index 493e5260cd7e..be9edd9bf60f 100644
--- a/svx/source/engine3d/objfac3d.cxx
+++ b/svx/source/engine3d/objfac3d.cxx
@@ -44,14 +44,14 @@
|*
\************************************************************************/
-static BOOL bInit = FALSE;
+static sal_Bool bInit = sal_False;
E3dObjFactory::E3dObjFactory()
{
if ( !bInit )
{
SdrObjFactory::InsertMakeObjectHdl(LINK(this, E3dObjFactory, MakeObject));
- bInit = TRUE;
+ bInit = sal_True;
}
}
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index 0ec26903d2c0..7086aace6659 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -54,7 +54,7 @@ sdr::contact::ViewContact* E3dPolygonObj::CreateObjectSpecificViewContact()
E3dPolygonObj::E3dPolygonObj(
E3dDefaultAttributes& rDefault,
const basegfx::B3DPolyPolygon& rPolyPoly3D,
- BOOL bLinOnly)
+ sal_Bool bLinOnly)
: E3dCompoundObject(rDefault),
bLineOnly(bLinOnly)
{
@@ -78,7 +78,7 @@ E3dPolygonObj::E3dPolygonObj(
E3dDefaultAttributes& rDefault,
const basegfx::B3DPolyPolygon& rPolyPoly3D,
const basegfx::B3DPolyPolygon& rPolyNormals3D,
- BOOL bLinOnly)
+ sal_Bool bLinOnly)
: E3dCompoundObject(rDefault),
bLineOnly(bLinOnly)
{
@@ -101,7 +101,7 @@ E3dPolygonObj::E3dPolygonObj(
const basegfx::B3DPolyPolygon& rPolyPoly3D,
const basegfx::B3DPolyPolygon& rPolyNormals3D,
const basegfx::B2DPolyPolygon& rPolyTexture2D,
- BOOL bLinOnly)
+ sal_Bool bLinOnly)
: E3dCompoundObject(rDefault),
bLineOnly(bLinOnly)
{
@@ -188,7 +188,7 @@ void E3dPolygonObj::CreateDefaultTexture()
// Entscheiden, welche Koordinaten als Source fuer das
// Mapping benutzt werden sollen
- UINT16 nSourceMode = 0;
+ sal_uInt16 nSourceMode = 0;
// Groessten Freiheitsgrad ermitteln
if(!(aNormal.getX() > aNormal.getY() && aNormal.getX() > aNormal.getZ()))
@@ -265,7 +265,7 @@ E3dPolygonObj::~E3dPolygonObj()
|*
\************************************************************************/
-UINT16 E3dPolygonObj::GetObjIdentifier() const
+sal_uInt16 E3dPolygonObj::GetObjIdentifier() const
{
return E3D_POLYGONOBJ_ID;
}
@@ -318,7 +318,7 @@ void E3dPolygonObj::SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyText
|*
\************************************************************************/
-SdrObject *E3dPolygonObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dPolygonObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
{
return NULL;
}
@@ -349,7 +349,7 @@ void E3dPolygonObj::operator=(const SdrObject& rObj)
|*
\************************************************************************/
-void E3dPolygonObj::SetLineOnly(BOOL bNew)
+void E3dPolygonObj::SetLineOnly(sal_Bool bNew)
{
if(bNew != bLineOnly)
{
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 316c353ad7bb..2c1d4ea0480f 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -117,7 +117,7 @@ void E3dSphereObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault)
|*
\************************************************************************/
-UINT16 E3dSphereObj::GetObjIdentifier() const
+sal_uInt16 E3dSphereObj::GetObjIdentifier() const
{
return E3D_SPHEREOBJ_ID;
}
@@ -128,7 +128,7 @@ UINT16 E3dSphereObj::GetObjIdentifier() const
|*
\************************************************************************/
-SdrObject *E3dSphereObj::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject *E3dSphereObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
{
return NULL;
}
diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx
index 68ce67febc25..ef108bb902ae 100644
--- a/svx/source/engine3d/svx3ditems.cxx
+++ b/svx/source/engine3d/svx3ditems.cxx
@@ -66,7 +66,7 @@ Svx3DEndAngleItem::Svx3DEndAngleItem(sal_uInt32 nVal)
: SfxUInt32Item(SDRATTR_3DOBJ_END_ANGLE, nVal)
{}
-Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(BOOL bVal)
+Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_DOUBLE_SIDED, bVal)
{}
@@ -74,7 +74,7 @@ Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(BOOL bVal)
// #i28528#
// Added extra Item (Bool) for chart2 to be able to show reduced line geometry
-Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(BOOL bVal)
+Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY, bVal)
{}
@@ -102,7 +102,7 @@ Svx3DNormalsKindItem::Svx3DNormalsKindItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DOBJ_NORMALS_KIND, nVal)
{}
-Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(BOOL bVal)
+Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, bVal)
{}
@@ -114,7 +114,7 @@ Svx3DTextureProjectionYItem::Svx3DTextureProjectionYItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_Y, nVal)
{}
-Svx3DShadow3DItem::Svx3DShadow3DItem(BOOL bVal)
+Svx3DShadow3DItem::Svx3DShadow3DItem(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_SHADOW_3D, bVal)
{}
@@ -142,7 +142,7 @@ Svx3DTextureModeItem::Svx3DTextureModeItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_MODE, nVal)
{}
-Svx3DTextureFilterItem::Svx3DTextureFilterItem(BOOL bVal)
+Svx3DTextureFilterItem::Svx3DTextureFilterItem(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_TEXTURE_FILTER, bVal)
{}
@@ -158,7 +158,7 @@ Svx3DFocalLengthItem::Svx3DFocalLengthItem(sal_uInt32 nVal)
: SfxUInt32Item(SDRATTR_3DSCENE_FOCAL_LENGTH, nVal)
{}
-Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(BOOL bVal)
+Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, bVal)
{}
@@ -198,35 +198,35 @@ Svx3DAmbientcolorItem::Svx3DAmbientcolorItem(const Color& rCol)
: SvxColorItem(rCol, SDRATTR_3DSCENE_AMBIENTCOLOR)
{}
-Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(BOOL bVal)
+Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_1, bVal)
{}
-Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(BOOL bVal)
+Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_2, bVal)
{}
-Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(BOOL bVal)
+Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_3, bVal)
{}
-Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(BOOL bVal)
+Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_4, bVal)
{}
-Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(BOOL bVal)
+Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_5, bVal)
{}
-Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(BOOL bVal)
+Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_6, bVal)
{}
-Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(BOOL bVal)
+Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_7, bVal)
{}
-Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(BOOL bVal)
+Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_8, bVal)
{}
@@ -273,7 +273,7 @@ Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal)
//////////////////////////////////////////////////////////////////////////////
// #107245#
-Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(BOOL bVal)
+Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal)
{}
@@ -298,7 +298,7 @@ SfxPoolItem* Svx3DSmoothNormalsItem::Create(SvStream& rIn, sal_uInt16 nItemVersi
//////////////////////////////////////////////////////////////////////////////
// #107245#
-Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(BOOL bVal)
+Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal)
{}
@@ -323,7 +323,7 @@ SfxPoolItem* Svx3DSmoothLidsItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
//////////////////////////////////////////////////////////////////////////////
// #107245#
-Svx3DCharacterModeItem::Svx3DCharacterModeItem(BOOL bVal)
+Svx3DCharacterModeItem::Svx3DCharacterModeItem(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal)
{}
@@ -348,7 +348,7 @@ SfxPoolItem* Svx3DCharacterModeItem::Create(SvStream& rIn, sal_uInt16 nItemVersi
//////////////////////////////////////////////////////////////////////////////
// #107245#
-Svx3DCloseFrontItem::Svx3DCloseFrontItem(BOOL bVal)
+Svx3DCloseFrontItem::Svx3DCloseFrontItem(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal)
{}
@@ -373,7 +373,7 @@ SfxPoolItem* Svx3DCloseFrontItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
//////////////////////////////////////////////////////////////////////////////
// #107245#
-Svx3DCloseBackItem::Svx3DCloseBackItem(BOOL bVal)
+Svx3DCloseBackItem::Svx3DCloseBackItem(sal_Bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal)
{}
@@ -398,13 +398,13 @@ SfxPoolItem* Svx3DCloseBackItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
//////////////////////////////////////////////////////////////////////////////
// Svx3DNormalsKindItem: use drawing::NormalsKind
-sal_Bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::NormalsKind)GetValue();
return sal_True;
}
-sal_Bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::NormalsKind eVar;
if(!(rVal >>= eVar))
@@ -419,13 +419,13 @@ SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const
}
// Svx3DTextureProjectionXItem: use drawing::TextureProjectionMode
-sal_Bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::TextureProjectionMode)GetValue();
return sal_True;
}
-sal_Bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::TextureProjectionMode eVar;
if(!(rVal >>= eVar))
@@ -440,13 +440,13 @@ SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const
}
// Svx3DTextureProjectionYItem: use drawing::TextureProjectionMode
-sal_Bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::TextureProjectionMode)GetValue();
return sal_True;
}
-sal_Bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::TextureProjectionMode eVar;
if(!(rVal >>= eVar))
@@ -461,13 +461,13 @@ SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const
}
// Svx3DTextureKindItem: use drawing::TextureKind
-sal_Bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::TextureKind)GetValue();
return sal_True;
}
-sal_Bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::TextureKind eVar;
if(!(rVal >>= eVar))
@@ -482,13 +482,13 @@ SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const
}
// Svx3DTextureModeItem: use drawing:TextureMode
-sal_Bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::TextureMode)GetValue();
return sal_True;
}
-sal_Bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::TextureMode eVar;
if(!(rVal >>= eVar))
@@ -503,13 +503,13 @@ SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const
}
// Svx3DPerspectiveItem: use drawing::ProjectionMode
-sal_Bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::ProjectionMode)GetValue();
return sal_True;
}
-sal_Bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::ProjectionMode eVar;
if(!(rVal >>= eVar))
@@ -524,13 +524,13 @@ SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const
}
// Svx3DShadeModeItem: use drawing::ShadeMode
-sal_Bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::ShadeMode)GetValue();
return sal_True;
}
-sal_Bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::ShadeMode eVar;
if(!(rVal >>= eVar))
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index c69abb362754..9d54fe3882e3 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -254,7 +254,7 @@ E3dView::E3dView(SdrModel* pModel, OutputDevice* pOut) :
void E3dView::DrawMarkedObj(OutputDevice& rOut) const
{
// Existieren 3D-Objekte, deren Szenen nicht selektiert sind?
- BOOL bSpecialHandling = FALSE;
+ sal_Bool bSpecialHandling = sal_False;
E3dScene *pScene = NULL;
long nCnt = GetMarkedObjectCount();
@@ -266,14 +266,14 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
// zugehoerige Szene
pScene = ((E3dCompoundObject*)pObj)->GetScene();
if(pScene && !IsObjMarked(pScene))
- bSpecialHandling = TRUE;
+ bSpecialHandling = sal_True;
}
// Alle SelectionFlags zuruecksetzen
if(pObj && pObj->ISA(E3dObject))
{
pScene = ((E3dObject*)pObj)->GetScene();
if(pScene)
- pScene->SetSelected(FALSE);
+ pScene->SetSelected(sal_False);
}
}
@@ -290,7 +290,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
// zugehoerige Szene
pScene = ((E3dCompoundObject*)pObj)->GetScene();
if(pScene)
- pScene->SetSelected(FALSE);
+ pScene->SetSelected(sal_False);
}
}
@@ -304,7 +304,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
{
// Objekt markieren
E3dObject* p3DObj = (E3dObject*)pObj;
- p3DObj->SetSelected(TRUE);
+ p3DObj->SetSelected(sal_True);
pScene = p3DObj->GetScene();
pM = GetSdrMarkByIndex(nObjs);
}
@@ -315,9 +315,9 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
// code from parent
SortMarkedObjects();
- pScene->SetDrawOnlySelected(TRUE);
+ pScene->SetDrawOnlySelected(sal_True);
pScene->SingleObjectPainter(rOut); // #110094#-17
- pScene->SetDrawOnlySelected(FALSE);
+ pScene->SetDrawOnlySelected(sal_False);
}
// SelectionFlag zuruecksetzen
@@ -329,7 +329,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const
// zugehoerige Szene
pScene = ((E3dCompoundObject*)pObj)->GetScene();
if(pScene)
- pScene->SetSelected(FALSE);
+ pScene->SetSelected(sal_False);
}
}
}
@@ -424,7 +424,7 @@ SdrModel* E3dView::GetMarkedObjModel() const
if(pScene && !IsObjMarked(pScene) && GetSdrPageView())
{
- ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), FALSE, TRUE);
+ ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), sal_False, sal_True);
}
}
}
@@ -473,9 +473,9 @@ SdrModel* E3dView::GetMarkedObjModel() const
|*
\************************************************************************/
-BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
{
- BOOL bRetval = FALSE;
+ sal_Bool bRetval = sal_False;
// Liste holen
Point aPos(rPos);
@@ -483,7 +483,7 @@ BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, U
ImpGetPasteObjList(aPos, pDstList);
if(!pDstList)
- return FALSE;
+ return sal_False;
// Owner der Liste holen
SdrObject* pOwner = pDstList->GetOwnerObj();
@@ -526,9 +526,9 @@ BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, U
}
// #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...)
-BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point /*aOffset*/)
+sal_Bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point /*aOffset*/)
{
- BOOL bRetval(FALSE);
+ sal_Bool bRetval(sal_False);
if(pSrcScene && pDstScene)
{
@@ -623,7 +623,7 @@ BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs
pNewCompoundObj->NbcSetLayer(pCompoundObj->GetLayer());
pNewCompoundObj->NbcSetStyleSheet(pCompoundObj->GetStyleSheet(), sal_True);
pDstScene->Insert3DObj(pNewCompoundObj);
- bRetval = TRUE;
+ bRetval = sal_True;
// Undo anlegen
if( GetModel()->IsUndoEnabled() )
@@ -642,11 +642,11 @@ BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs
|*
\************************************************************************/
-BOOL E3dView::IsConvertTo3DObjPossible() const
+sal_Bool E3dView::IsConvertTo3DObjPossible() const
{
- BOOL bAny3D(FALSE);
- BOOL bGroupSelected(FALSE);
- BOOL bRetval(TRUE);
+ sal_Bool bAny3D(sal_False);
+ sal_Bool bGroupSelected(sal_False);
+ sal_Bool bRetval(sal_True);
for(sal_uInt32 a=0;!bAny3D && a<GetMarkedObjectCount();a++)
{
@@ -659,20 +659,20 @@ BOOL E3dView::IsConvertTo3DObjPossible() const
bRetval = !bAny3D
&& (
- IsConvertToPolyObjPossible(FALSE)
- || IsConvertToPathObjPossible(FALSE)
+ IsConvertToPolyObjPossible(sal_False)
+ || IsConvertToPathObjPossible(sal_False)
|| IsImportMtfPossible());
return bRetval;
}
-void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D,
- BOOL& rGroupSelected) const
+void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D,
+ sal_Bool& rGroupSelected) const
{
if(pObj)
{
if(pObj->ISA(E3dObject))
{
- rAny3D = TRUE;
+ rAny3D = sal_True;
}
else
{
@@ -684,7 +684,7 @@ void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D,
SdrObject* pNewObj = aIter.Next();
ImpIsConvertTo3DPossible(pNewObj, rAny3D, rGroupSelected);
}
- rGroupSelected = TRUE;
+ rGroupSelected = sal_True;
}
}
}
@@ -744,7 +744,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj)
}
}
-void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
+void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
{
// Einzelnes PathObject, dieses umwanden
SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj);
@@ -753,9 +753,9 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO
{
E3dDefaultAttributes aDefault = Get3DDefaultAttributes();
if(bExtrude)
- aDefault.SetDefaultExtrudeCharacterMode(TRUE);
+ aDefault.SetDefaultExtrudeCharacterMode(sal_True);
else
- aDefault.SetDefaultLatheCharacterMode(TRUE);
+ aDefault.SetDefaultLatheCharacterMode(sal_True);
// ItemSet des Ursprungsobjektes holen
SfxItemSet aSet(pObj->GetMergedItemSet());
@@ -771,10 +771,10 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO
// Das SdrPathObj ist nicht gefuellt, lasse die
// vordere und hintere Flaeche weg. Ausserdem ist
// eine beidseitige Darstellung notwendig.
- aDefault.SetDefaultExtrudeCloseFront(FALSE);
- aDefault.SetDefaultExtrudeCloseBack(FALSE);
+ aDefault.SetDefaultExtrudeCloseFront(sal_False);
+ aDefault.SetDefaultExtrudeCloseBack(sal_False);
- aSet.Put(Svx3DDoubleSidedItem(TRUE));
+ aSet.Put(Svx3DDoubleSidedItem(sal_True));
// Fuellattribut setzen
aSet.Put(XFillStyleItem(XFILL_SOLID));
@@ -813,7 +813,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO
}
}
-void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
+void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat)
{
if(pObj)
{
@@ -831,7 +831,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude
ImpChangeSomeAttributesFor3DConversion(pObj);
// convert completely to path objects
- SdrObject* pNewObj1 = pObj->ConvertToPolyObj(FALSE, FALSE);
+ SdrObject* pNewObj1 = pObj->ConvertToPolyObj(sal_False, sal_False);
if(pNewObj1)
{
@@ -849,7 +849,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude
ImpChangeSomeAttributesFor3DConversion2(pNewObj1);
// convert completely to path objects
- SdrObject* pNewObj2 = pObj->ConvertToContourObj(pNewObj1, TRUE);
+ SdrObject* pNewObj2 = pObj->ConvertToContourObj(pNewObj1, sal_True);
if(pNewObj2)
{
@@ -884,7 +884,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude
|*
\************************************************************************/
-void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2)
+void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2)
{
if(AreObjectsMarked())
{
@@ -951,7 +951,7 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg
// SnapRect Ausdehnung mittels Spiegelung an der Rotationsachse
// erweitern
- for(UINT32 a=0;a<GetMarkedObjectCount();a++)
+ for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++)
{
SdrMark* pMark = GetSdrMarkByIndex(a);
SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -991,7 +991,7 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg
// Ueber die Selektion gehen und in 3D wandeln, komplett mit
// Umwandeln in SdrPathObject, auch Schriften
- for(UINT32 a=0;a<GetMarkedObjectCount();a++)
+ for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++)
{
SdrMark* pMark = GetSdrMarkByIndex(a);
SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -1021,8 +1021,8 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg
// und alle alten Objekte weghauen
SdrObject* pRepObj = GetMarkedObjectByIndex(0);
SdrPageView* pPV = GetSdrPageViewOfMarkedByIndex(0);
- MarkObj(pRepObj, pPV, TRUE);
- ReplaceObjectAtView(pRepObj, *pPV, pScene, FALSE);
+ MarkObj(pRepObj, pPV, sal_True);
+ ReplaceObjectAtView(pRepObj, *pPV, pScene, sal_False);
DeleteMarked();
MarkObj(pScene, pPV);
@@ -1109,7 +1109,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
SdrObjListIter aIter(*pSubList, IM_FLAT);
E3dDepthLayer* pBaseLayer = NULL;
E3dDepthLayer* pLayer = NULL;
- INT32 nNumLayers = 0;
+ sal_Int32 nNumLayers = 0;
while(aIter.IsMore())
{
@@ -1156,12 +1156,12 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
if(aCompareColor == aLocalColor)
{
- bOverlap = FALSE;
+ bOverlap = sal_False;
}
}
else if(eLocalFillStyle == XFILL_NONE)
{
- bOverlap = FALSE;
+ bOverlap = sal_False;
}
}
}
@@ -1246,7 +1246,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth)
|*
\************************************************************************/
-BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
+sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
SdrHdl* pHdl, short nMinMov,
SdrDragMethod* pForcedMeth)
{
@@ -1257,25 +1257,25 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
}
else
{
- BOOL bOwnActionNecessary;
+ sal_Bool bOwnActionNecessary;
if (pHdl == NULL)
{
- bOwnActionNecessary = TRUE;
+ bOwnActionNecessary = sal_True;
}
else if (pHdl->IsVertexHdl() || pHdl->IsCornerHdl())
{
- bOwnActionNecessary = TRUE;
+ bOwnActionNecessary = sal_True;
}
else
{
- bOwnActionNecessary = FALSE;
+ bOwnActionNecessary = sal_False;
}
if(bOwnActionNecessary && GetMarkedObjectCount() >= 1)
{
E3dDragConstraint eConstraint = E3DDRAG_CONSTR_XYZ;
- BOOL bThereAreRootScenes = FALSE;
- BOOL bThereAre3DObjects = FALSE;
+ sal_Bool bThereAreRootScenes = sal_False;
+ sal_Bool bThereAre3DObjects = sal_False;
long nCnt = GetMarkedObjectCount();
for(long nObjs = 0;nObjs < nCnt;nObjs++)
{
@@ -1283,9 +1283,9 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
if(pObj)
{
if(pObj->ISA(E3dScene) && ((E3dScene*)pObj)->GetScene() == pObj)
- bThereAreRootScenes = TRUE;
+ bThereAreRootScenes = sal_True;
if(pObj->ISA(E3dObject))
- bThereAre3DObjects = TRUE;
+ bThereAre3DObjects = sal_True;
}
}
if( bThereAre3DObjects )
@@ -1361,7 +1361,7 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut,
|*
\************************************************************************/
-BOOL E3dView::HasMarkedScene()
+sal_Bool E3dView::HasMarkedScene()
{
return (GetMarkedScene() != NULL);
}
@@ -1374,9 +1374,9 @@ BOOL E3dView::HasMarkedScene()
E3dScene* E3dView::GetMarkedScene()
{
- ULONG nCnt = GetMarkedObjectCount();
+ sal_uIntPtr nCnt = GetMarkedObjectCount();
- for ( ULONG i = 0; i < nCnt; i++ )
+ for ( sal_uIntPtr i = 0; i < nCnt; i++ )
if ( GetMarkedObjectByIndex(i)->ISA(E3dScene) )
return (E3dScene*) GetMarkedObjectByIndex(i);
@@ -1422,7 +1422,7 @@ void E3dView::InitScene(E3dScene* pScene, double fW, double fH, double fCamZ)
{
Camera3D aCam(pScene->GetCamera());
- aCam.SetAutoAdjustProjection(FALSE);
+ aCam.SetAutoAdjustProjection(sal_False);
aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH);
basegfx::B3DPoint aLookAt;
@@ -1586,14 +1586,14 @@ void E3dView::MovAction(const Point& rPnt)
/*************************************************************************
|*
|* Schluss. Objekt und evtl. Unterobjekte ueber ImpCreate3DLathe erstellen
-|* [FG] Mit dem Parameterwert TRUE (SDefault: FALSE) wird einfach ein
+|* [FG] Mit dem Parameterwert sal_True (SDefault: sal_False) wird einfach ein
|* Rotationskoerper erzeugt, ohne den Benutzer die Lage der
|* Achse fetlegen zu lassen. Es reicht dieser Aufruf, falls
|* ein Objekt selektiert ist. (keine Initialisierung noetig)
|*
\************************************************************************/
-void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes)
+void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes)
{
ResetCreationActive();
@@ -1610,7 +1610,7 @@ void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes)
basegfx::B2DPoint aPnt1(aRect.Left(), -aRect.Top());
basegfx::B2DPoint aPnt2(aRect.Left(), -aRect.Bottom());
- ConvertMarkedObjTo3D(FALSE, aPnt1, aPnt2);
+ ConvertMarkedObjTo3D(sal_False, aPnt1, aPnt2);
}
else
{
@@ -1623,7 +1623,7 @@ void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes)
basegfx::B2DPoint aPnt1(aMirrorRef1.X(), -aMirrorRef1.Y());
basegfx::B2DPoint aPnt2(aMirrorRef2.X(), -aMirrorRef2.Y());
- ConvertMarkedObjTo3D(FALSE, aPnt1, aPnt2);
+ ConvertMarkedObjTo3D(sal_False, aPnt1, aPnt2);
}
}
}
@@ -1675,7 +1675,7 @@ void E3dView::InitView ()
nVDefaultSegments = 12;
aDefaultLightColor = RGB_Color(COL_WHITE);
aDefaultAmbientColor = RGB_Color(COL_BLACK);
- bDoubleSided = FALSE;
+ bDoubleSided = sal_False;
mpMirrorOverlay = 0L;
}
@@ -1685,13 +1685,13 @@ void E3dView::InitView ()
|*
\************************************************************************/
-BOOL E3dView::IsBreak3DObjPossible() const
+sal_Bool E3dView::IsBreak3DObjPossible() const
{
- ULONG nCount = GetMarkedObjectCount();
+ sal_uIntPtr nCount = GetMarkedObjectCount();
if (nCount > 0)
{
- ULONG i = 0;
+ sal_uIntPtr i = 0;
while (i < nCount)
{
@@ -1700,11 +1700,11 @@ BOOL E3dView::IsBreak3DObjPossible() const
if (pObj && pObj->ISA(E3dObject))
{
if(!(((E3dObject*)pObj)->IsBreakObjPossible()))
- return FALSE;
+ return sal_False;
}
else
{
- return FALSE;
+ return sal_False;
}
i++;
@@ -1712,10 +1712,10 @@ BOOL E3dView::IsBreak3DObjPossible() const
}
else
{
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -1729,10 +1729,10 @@ void E3dView::Break3DObj()
if(IsBreak3DObjPossible())
{
// ALLE selektierten Objekte werden gewandelt
- UINT32 nCount = GetMarkedObjectCount();
+ sal_uInt32 nCount = GetMarkedObjectCount();
BegUndo(String(SVX_RESSTR(RID_SVX_3D_UNDO_BREAK_LATHE)));
- for(UINT32 a=0;a<nCount;a++)
+ for(sal_uInt32 a=0;a<nCount;a++)
{
E3dObject* pObj = (E3dObject*)GetMarkedObjectByIndex(a);
BreakSingle3DObj(pObj);
@@ -1775,11 +1775,11 @@ void E3dView::BreakSingle3DObj(E3dObject* pObj)
void E3dView::MergeScenes ()
{
- ULONG nCount = GetMarkedObjectCount();
+ sal_uIntPtr nCount = GetMarkedObjectCount();
if (nCount > 0)
{
- ULONG nObj = 0;
+ sal_uIntPtr nObj = 0;
SdrObject *pObj = GetMarkedObjectByIndex(nObj);
E3dScene *pScene = new E3dPolyScene(Get3DDefaultAttributes());
basegfx::B3DRange aBoundVol;
@@ -1898,29 +1898,29 @@ void E3dView::CheckPossibilities()
// Weitere Flags bewerten
if(bGroupPossible || bUnGroupPossible || bGrpEnterPossible)
{
- INT32 nMarkCnt = GetMarkedObjectCount();
- BOOL bCoumpound = FALSE;
- BOOL b3DObject = FALSE;
- for(INT32 nObjs = 0L; (nObjs < nMarkCnt) && !bCoumpound; nObjs++)
+ sal_Int32 nMarkCnt = GetMarkedObjectCount();
+ sal_Bool bCoumpound = sal_False;
+ sal_Bool b3DObject = sal_False;
+ for(sal_Int32 nObjs = 0L; (nObjs < nMarkCnt) && !bCoumpound; nObjs++)
{
SdrObject *pObj = GetMarkedObjectByIndex(nObjs);
if(pObj && pObj->ISA(E3dCompoundObject))
- bCoumpound = TRUE;
+ bCoumpound = sal_True;
if(pObj && pObj->ISA(E3dObject))
- b3DObject = TRUE;
+ b3DObject = sal_True;
}
// Bisher: Es sind ZWEI oder mehr beliebiger Objekte selektiert.
// Nachsehen, ob CompoundObjects beteiligt sind. Falls ja,
// das Gruppieren verbieten.
if(bGroupPossible && bCoumpound)
- bGroupPossible = FALSE;
+ bGroupPossible = sal_False;
if(bUnGroupPossible && b3DObject)
- bUnGroupPossible = FALSE;
+ bUnGroupPossible = sal_False;
if(bGrpEnterPossible && bCoumpound)
- bGrpEnterPossible = FALSE;
+ bGrpEnterPossible = sal_False;
}
}
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 121696d8ed6b..6dd4dd816450 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -58,7 +58,7 @@
|*
\************************************************************************/
-void E3dView::ConvertMarkedToPolyObj(BOOL bLineToArea)
+void E3dView::ConvertMarkedToPolyObj(sal_Bool bLineToArea)
{
SdrObject* pNewObj = NULL;
@@ -68,7 +68,7 @@ void E3dView::ConvertMarkedToPolyObj(BOOL bLineToArea)
if (pObj && pObj->ISA(E3dPolyScene))
{
- BOOL bBezier = FALSE;
+ sal_Bool bBezier = sal_False;
pNewObj = ((E3dPolyScene*) pObj)->ConvertToPolyObj(bBezier, bLineToArea);
if (pNewObj)
@@ -118,7 +118,7 @@ void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask)
}
}
-SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, BOOL /*bOnly3DAttr*/) const
+SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/) const
{
// ItemSet mit entspr. Bereich anlegen
SfxItemSet aSet(
@@ -137,7 +137,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, BOOL /*bOnly3DAttr*/) co
else
{
// get attributes from all selected objects
- MergeAttrFromMarked(aSet, FALSE);
+ MergeAttrFromMarked(aSet, sal_False);
// calc flags for SID_ATTR_3D_INTERN
const SdrMarkList& rMarkList = GetMarkedObjectList();
@@ -179,7 +179,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, BOOL /*bOnly3DAttr*/) co
|*
\************************************************************************/
-void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, BOOL bReplaceAll)
+void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, sal_Bool bReplaceAll)
{
sal_uInt32 nSelectedItems(0L);
diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx
index 0a6e36219ed3..9b5b6eae07f4 100644
--- a/svx/source/fmcomp/dbaexchange.cxx
+++ b/svx/source/fmcomp/dbaexchange.cxx
@@ -391,7 +391,7 @@ namespace svx
{
Any aContent = makeAny( m_aDescriptor.createPropertyValueSequence() );
_pContainer->CopyAny(
- sal::static_int_cast< USHORT >( getDescriptorFormatId() ),
+ sal::static_int_cast< sal_uInt16 >( getDescriptorFormatId() ),
aContent );
}
}
@@ -497,7 +497,7 @@ namespace svx
// -----------------------------------------------------------------------------
sal_Bool ODataAccessObjectTransferable::GetData( const DataFlavor& rFlavor )
{
- ULONG nFormat = SotExchange::GetFormat(rFlavor);
+ sal_uIntPtr nFormat = SotExchange::GetFormat(rFlavor);
switch (nFormat)
{
case SOT_FORMATSTR_ID_DBACCESS_TABLE:
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 618c2135652a..b974fe3ff5f3 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -988,7 +988,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe
if ( eInspectorAction != eNone )
{
FmInterfaceItem aIFaceItem( SID_FM_SHOW_PROPERTY_BROWSER, xColumnToInspect );
- SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? FALSE : TRUE );
+ SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? sal_False : sal_True );
pCurrentFrame->GetBindings().GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SFX_CALLMODE_ASYNCHRON,
&aIFaceItem, &aShowItem, 0L );
@@ -1061,7 +1061,7 @@ void FmGridControl::Command(const CommandEvent& _rEvt)
if ( 1 == GetSelectColumnCount() || IsDesignMode() )
{
sal_uInt16 nSelId = GetColumnId(
- sal::static_int_cast< USHORT >( FirstSelectedColumn() ) );
+ sal::static_int_cast< sal_uInt16 >( FirstSelectedColumn() ) );
::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, sal_False ) );
Point aRelativePos( pMyHeader->ScreenToOutputPixel( OutputToScreenPixel( aColRect.TopCenter() ) ) );
@@ -1273,7 +1273,7 @@ void FmGridControl::DeleteSelectedRows()
// now delete the row
Sequence <sal_Int32> aDeletedRows;
- SetUpdateMode( FALSE );
+ SetUpdateMode( sal_False );
try
{
aDeletedRows = xDeleteThem->deleteRows(aBookmarks);
@@ -1281,7 +1281,7 @@ void FmGridControl::DeleteSelectedRows()
catch(SQLException&)
{
}
- SetUpdateMode( TRUE );
+ SetUpdateMode( sal_True );
// how many rows are deleted?
sal_Int32 nDeletedRows = 0;
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 7fb9d8330cf6..374000f68068 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -898,7 +898,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor
{
sal_Int16 nWheelBehavior = MouseWheelBehavior::SCROLL_FOCUS_ONLY;
OSL_VERIFY( xModel->getPropertyValue( FM_PROP_MOUSE_WHEEL_BEHAVIOR ) >>= nWheelBehavior );
- USHORT nVclSetting = MOUSE_WHEEL_FOCUS_ONLY;
+ sal_uInt16 nVclSetting = MOUSE_WHEEL_FOCUS_ONLY;
switch ( nWheelBehavior )
{
case MouseWheelBehavior::SCROLL_DISABLED: nVclSetting = MOUSE_WHEEL_DISABLE; break;
@@ -913,7 +913,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor
MouseSettings aMouseSettings = aSettings.GetMouseSettings();
aMouseSettings.SetWheelBehavior( nVclSetting );
aSettings.SetMouseSettings( aMouseSettings );
- m_pWindow->SetSettings( aSettings, TRUE );
+ m_pWindow->SetSettings( aSettings, sal_True );
}
}
catch( const Exception& )
@@ -986,7 +986,7 @@ void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect )
m_pPainter->SetTextFillColor( _rDev.GetTextColor() );
Font aFont( _rDev.GetFont() );
- aFont.SetTransparent( TRUE );
+ aFont.SetTransparent( sal_True );
m_pPainter->SetFont( aFont );
m_pPainter->SetPosSizePixel( _rRect.TopLeft(), _rRect.GetSize() );
@@ -1653,7 +1653,7 @@ DbCheckBox::DbCheckBox( DbGridColumn& _rColumn )
namespace
{
- void setCheckBoxStyle( Window* _pWindow, USHORT nStyle )
+ void setCheckBoxStyle( Window* _pWindow, sal_uInt16 nStyle )
{
AllSettings aSettings = _pWindow->GetSettings();
StyleSettings aStyleSettings = aSettings.GetStyleSettings();
@@ -2271,13 +2271,13 @@ void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet >
static_cast< DateField* >( m_pWindow )->SetMin( nMin );
static_cast< DateField* >( m_pWindow )->SetMax( nMax );
static_cast< DateField* >( m_pWindow )->SetStrictFormat( bStrict );
- static_cast< DateField* >( m_pWindow )->EnableEmptyFieldValue( TRUE );
+ static_cast< DateField* >( m_pWindow )->EnableEmptyFieldValue( sal_True );
static_cast< DateField* >( m_pPainter )->SetExtDateFormat( (ExtDateFieldFormat)nFormat );
static_cast< DateField* >( m_pPainter )->SetMin( nMin );
static_cast< DateField* >( m_pPainter )->SetMax( nMax );
static_cast< DateField* >( m_pPainter )->SetStrictFormat( bStrict );
- static_cast< DateField* >( m_pPainter )->EnableEmptyFieldValue( TRUE );
+ static_cast< DateField* >( m_pPainter )->EnableEmptyFieldValue( sal_True );
}
}
@@ -2381,13 +2381,13 @@ void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet >
static_cast< TimeField* >( m_pWindow )->SetMin( nMin );
static_cast< TimeField* >( m_pWindow )->SetMax( nMax );
static_cast< TimeField* >( m_pWindow )->SetStrictFormat( bStrict );
- static_cast< TimeField* >( m_pWindow )->EnableEmptyFieldValue( TRUE );
+ static_cast< TimeField* >( m_pWindow )->EnableEmptyFieldValue( sal_True );
static_cast< TimeField* >( m_pPainter )->SetExtFormat( (ExtTimeFieldFormat)nFormat );
static_cast< TimeField* >( m_pPainter )->SetMin( nMin );
static_cast< TimeField* >( m_pPainter )->SetMax( nMax );
static_cast< TimeField* >( m_pPainter )->SetStrictFormat( bStrict );
- static_cast< TimeField* >( m_pPainter )->EnableEmptyFieldValue( TRUE );
+ static_cast< TimeField* >( m_pPainter )->EnableEmptyFieldValue( sal_True );
}
}
@@ -3496,7 +3496,7 @@ void FmXGridCell::onFocusLost( const awt::FocusEvent& _rEvent )
}
//------------------------------------------------------------------------------
-void FmXGridCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
{
switch ( _nEventId )
{
@@ -3905,7 +3905,7 @@ void FmXEditCell::onFocusLost( const awt::FocusEvent& _rEvent )
}
//------------------------------------------------------------------------------
-void FmXEditCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
{
switch ( _nEventId )
{
@@ -4063,7 +4063,7 @@ Window* FmXCheckBoxCell::getEventWindow() const
}
//------------------------------------------------------------------
-void FmXCheckBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
{
switch ( _nEventId )
{
@@ -4400,7 +4400,7 @@ void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeExcept
}
//------------------------------------------------------------------
-void FmXListBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
{
if ( ( &_rWindow == m_pBox )
&& ( _nEventId == VCLEVENT_LISTBOX_SELECT )
@@ -4614,7 +4614,7 @@ void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Run
}
//------------------------------------------------------------------------------
-void FmXComboBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData )
+void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData )
{
switch ( _nEventId )
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index d54b091c6bd2..38342bf355ea 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -784,7 +784,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType )
{
case STATE_CHANGE_MIRRORING:
{
- BOOL bIsRTLEnabled = IsRTLEnabled();
+ sal_Bool bIsRTLEnabled = IsRTLEnabled();
for ( size_t i=0; i < sizeof( pWindows ) / sizeof( pWindows[0] ); ++i )
pWindows[i]->EnableRTL( bIsRTLEnabled );
}
@@ -945,7 +945,7 @@ DbGridControl::DbGridControl(
,m_nDeleteEvent(0)
,m_nOptions(OPT_READONLY)
,m_nOptionMask(OPT_INSERT | OPT_UPDATE | OPT_DELETE)
- ,m_nLastColId((USHORT)-1)
+ ,m_nLastColId((sal_uInt16)-1)
,m_nLastRowId(-1)
,m_bDesignMode(sal_False)
,m_bRecordCountFinal(sal_False)
@@ -2323,7 +2323,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
if (nNewPos < 0) // keine Position gefunden
return;
- m_bInAdjustDataSource = TRUE;
+ m_bInAdjustDataSource = sal_True;
if (nNewPos != m_nCurrentPos)
{
if (m_bSynchDisplay)
@@ -2341,7 +2341,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull)
SetCurrent(nNewPos);
RowModified(nNewPos);
}
- m_bInAdjustDataSource = FALSE;
+ m_bInAdjustDataSource = sal_False;
// Wird der DatenCursor von aussen bewegt, wird die selektion aufgehoben
SetNoSelection();
@@ -2734,7 +2734,7 @@ void DbGridControl::SetFilterMode(sal_Bool bMode)
}
}
// -----------------------------------------------------------------------------
-String DbGridControl::GetCellText(long _nRow, USHORT _nColId) const
+String DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
{
DbGridColumn* pColumn = m_aColumns.GetObject( GetModelColumnPos( _nColId ) );
String sRet;
@@ -3630,7 +3630,7 @@ sal_uInt16 DbGridControl::GetModelColumnPos( sal_uInt16 nId ) const
}
//------------------------------------------------------------------------------
-void DbGridControl::implAdjustInSolarThread(BOOL _bRows)
+void DbGridControl::implAdjustInSolarThread(sal_Bool _bRows)
{
TRACE_RANGE("DbGridControl::implAdjustInSolarThread");
::osl::MutexGuard aGuard(m_aAdjustSafety);
@@ -3862,7 +3862,7 @@ Reference<XAccessible > DbGridControl::CreateAccessibleControl( sal_Int32 _nInde
// -----------------------------------------------------------------------------
Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos )
{
- USHORT nColumnId = GetColumnId( _nColumnPos );
+ sal_uInt16 nColumnId = GetColumnId( _nColumnPos );
DbGridColumn* pColumn = m_aColumns.GetObject(GetModelColumnPos(nColumnId));
if ( pColumn )
{
@@ -3883,7 +3883,7 @@ Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, s
eValue = STATE_DONTKNOW;
break;
}
- return DbGridControl_Base::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eValue,TRUE );
+ return DbGridControl_Base::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eValue,sal_True );
}
}
return DbGridControl_Base::CreateAccessibleCell( _nRow, _nColumnPos );
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index aecb4f295efa..de429ca75c57 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -265,7 +265,7 @@ namespace svxform
return pMenu;
}
- void DataTreeListBox::ExcecuteContextMenuAction( USHORT _nSelectedPopupEntry )
+ void DataTreeListBox::ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry )
{
m_pXFormsPage->DoMenuAction( _nSelectedPopupEntry );
}
@@ -281,7 +281,7 @@ namespace svxform
void DataTreeListBox::DeleteAndClear()
{
- ULONG i, nCount = GetEntryCount();
+ sal_uIntPtr i, nCount = GetEntryCount();
for ( i = 0; i < nCount; ++i )
{
SvLBoxEntry* pEntry = GetEntry(i);
@@ -411,7 +411,7 @@ namespace svxform
{
ItemNode* pNode = new ItemNode( xChild );
SvLBoxEntry* pEntry = m_aItemList.InsertEntry(
- sName, aExpImg, aCollImg, _pParent, FALSE, LIST_APPEND, pNode );
+ sName, aExpImg, aCollImg, _pParent, sal_False, LIST_APPEND, pNode );
if ( xChild->hasAttributes() )
{
Reference< css::xml::dom::XNamedNodeMap > xMap = xChild->getAttributes();
@@ -427,7 +427,7 @@ namespace svxform
m_xUIHelper->getNodeDisplayName( xAttr, bShowDetails );
m_aItemList.InsertEntry(
sAttrName, aExpImg, aCollImg,
- pEntry, FALSE, LIST_APPEND, pNode );
+ pEntry, sal_False, LIST_APPEND, pNode );
}
}
}
@@ -443,7 +443,7 @@ namespace svxform
}
}
//------------------------------------------------------------------------
- bool XFormsPage::DoToolBoxAction( USHORT _nToolBoxID ) {
+ bool XFormsPage::DoToolBoxAction( sal_uInt16 _nToolBoxID ) {
bool bHandled = false;
bool bIsDocModified = false;
@@ -470,7 +470,7 @@ namespace svxform
xSubmissions->insert( makeAny( xNewSubmission ) );
Reference< XPropertySet > xNewPropSet( xNewSubmission, UNO_QUERY );
SvLBoxEntry* pEntry = AddEntry( xNewPropSet );
- m_aItemList.Select( pEntry, TRUE );
+ m_aItemList.Select( pEntry, sal_True );
bIsDocModified = true;
}
catch ( Exception& )
@@ -486,7 +486,7 @@ namespace svxform
ItemNode* pNode = NULL;
Reference< css::xml::dom::XNode > xParentNode;
Reference< XPropertySet > xNewBinding;
- USHORT nResId = 0;
+ sal_uInt16 nResId = 0;
bool bIsElement = true;
if ( DGTInstance == m_eGroup )
{
@@ -597,7 +597,7 @@ namespace svxform
{
SvLBoxEntry* pNewEntry = AddEntry( pNode, bIsElement );
m_aItemList.MakeVisible( pNewEntry );
- m_aItemList.Select( pNewEntry, TRUE );
+ m_aItemList.Select( pNewEntry, sal_True );
bIsDocModified = true;
}
else
@@ -623,7 +623,7 @@ namespace svxform
if ( RET_OK == nReturn )
{
SvLBoxEntry* pNewEntry = AddEntry( xNewBinding );
- m_aItemList.Select( pNewEntry, TRUE );
+ m_aItemList.Select( pNewEntry, sal_True );
bIsDocModified = true;
}
else
@@ -664,7 +664,7 @@ namespace svxform
AddDataItemDialog aDlg( this, pNode, m_xUIHelper );
DataItemType eType = DITElement;
- USHORT nResId = RID_STR_DATANAV_EDIT_ELEMENT;
+ sal_uInt16 nResId = RID_STR_DATANAV_EDIT_ELEMENT;
if ( pNode && pNode->m_xNode.is() )
{
try
@@ -778,7 +778,7 @@ namespace svxform
const ImageList& rImageList = GetSettings().GetStyleSettings().GetHighContrastMode()
? m_pNaviWin->GetItemHCImageList()
: m_pNaviWin->GetItemImageList();
- USHORT nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE;
+ sal_uInt16 nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE;
Image aImage = rImageList.GetImage( nImageID );
::rtl::OUString sName;
try
@@ -791,7 +791,7 @@ namespace svxform
DBG_UNHANDLED_EXCEPTION();
}
return m_aItemList.InsertEntry(
- sName, aImage, aImage, pParent, FALSE, LIST_APPEND, _pNewNode );
+ sName, aImage, aImage, pParent, sal_False, LIST_APPEND, _pNewNode );
}
//------------------------------------------------------------------------
class lcl_ResourceString
@@ -999,7 +999,7 @@ namespace svxform
{
// ID
_rEntry->getPropertyValue( PN_SUBMISSION_ID ) >>= sTemp;
- pEntry = m_aItemList.InsertEntry( sTemp, aImage, aImage, NULL, FALSE, LIST_APPEND, pNode );
+ pEntry = m_aItemList.InsertEntry( sTemp, aImage, aImage, NULL, sal_False, LIST_APPEND, pNode );
// Action
_rEntry->getPropertyValue( PN_SUBMISSION_ACTION ) >>= sTemp;
String sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_ACTION );
@@ -1043,7 +1043,7 @@ namespace svxform
_rEntry->getPropertyValue( PN_BINDING_EXPR ) >>= sTemp;
sName += String( sTemp );
pEntry = m_aItemList.InsertEntry(
- sName, aImage, aImage, NULL, FALSE, LIST_APPEND, pNode );
+ sName, aImage, aImage, NULL, sal_False, LIST_APPEND, pNode );
}
catch ( Exception& )
{
@@ -1080,7 +1080,7 @@ namespace svxform
_rEntry->getPropertyValue( PN_SUBMISSION_BIND ) >>= sTemp;
String sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_BIND );
sEntry += String( sTemp );
- ULONG nPos = 0;
+ sal_uIntPtr nPos = 0;
SvLBoxEntry* pChild = m_aItemList.GetEntry( pEntry, nPos++ );
m_aItemList.SetEntryText( pChild, sEntry );
_rEntry->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp;
@@ -1131,7 +1131,7 @@ namespace svxform
DBG_ASSERT( pNode->m_xNode.is(), "XFormsPage::RemoveEntry(): no XNode" );
css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType();
bool bIsElement = ( eChildType == css::xml::dom::NodeType_ELEMENT_NODE );
- USHORT nResId = bIsElement ? RID_QRY_REMOVE_ELEMENT : RID_QRY_REMOVE_ATTRIBUTE;
+ sal_uInt16 nResId = bIsElement ? RID_QRY_REMOVE_ELEMENT : RID_QRY_REMOVE_ATTRIBUTE;
String sVar = bIsElement ? ELEMENTNAME : ATTRIBUTENAME;
QueryBox aQBox( this, SVX_RES( nResId ) );
String sMessText = aQBox.GetMessText();
@@ -1163,7 +1163,7 @@ namespace svxform
{
DBG_ASSERT( pNode->m_xPropSet.is(), "XFormsPage::RemoveEntry(): no propset" );
bool bSubmission = ( DGTSubmission == m_eGroup );
- USHORT nResId = bSubmission ? RID_QRY_REMOVE_SUBMISSION : RID_QRY_REMOVE_BINDING;
+ sal_uInt16 nResId = bSubmission ? RID_QRY_REMOVE_SUBMISSION : RID_QRY_REMOVE_BINDING;
rtl::OUString sProperty = bSubmission ? PN_SUBMISSION_ID : PN_BINDING_ID;
String sSearch = bSubmission ? SUBMISSIONNAME : BINDINGNAME;
rtl::OUString sName;
@@ -1210,7 +1210,7 @@ namespace svxform
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
- USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+ sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
switch ( nCode )
{
@@ -1234,7 +1234,7 @@ namespace svxform
m_aItemList.SetPosSizePixel( Point( 2, 2 + aTbxSize.Height() ), aSize );
}
//------------------------------------------------------------------------
- String XFormsPage::SetModel( const Reference< css::xforms::XModel >& _xModel, USHORT _nPagePos )
+ String XFormsPage::SetModel( const Reference< css::xforms::XModel >& _xModel, sal_uInt16 _nPagePos )
{
DBG_ASSERT( _xModel.is(), "XFormsPage::SetModel(): invalid model" );
@@ -1256,7 +1256,7 @@ namespace svxform
if ( xContainer.is() )
m_pNaviWin->AddContainerBroadcaster( xContainer );
- USHORT nIter = 0;
+ sal_uInt16 nIter = 0;
Reference< XEnumerationAccess > xNumAccess( _xModel->getInstances(), UNO_QUERY );
if ( xNumAccess.is() )
{
@@ -1359,7 +1359,7 @@ namespace svxform
ItemNode* pNode = new ItemNode( xPropSet );
m_aItemList.InsertEntry(
- sEntry, aImage1, aImage2, NULL, FALSE, LIST_APPEND, pNode );
+ sEntry, aImage1, aImage2, NULL, sal_False, LIST_APPEND, pNode );
}
}
}
@@ -1436,7 +1436,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- bool XFormsPage::DoMenuAction( USHORT _nMenuID )
+ bool XFormsPage::DoMenuAction( sal_uInt16 _nMenuID )
{
return DoToolBoxAction( _nMenuID );
}
@@ -1444,14 +1444,14 @@ namespace svxform
//------------------------------------------------------------------------
void XFormsPage::EnableMenuItems( Menu* _pMenu )
{
- BOOL bEnableAdd = FALSE;
- BOOL bEnableEdit = FALSE;
- BOOL bEnableRemove = FALSE;
+ sal_Bool bEnableAdd = sal_False;
+ sal_Bool bEnableEdit = sal_False;
+ sal_Bool bEnableRemove = sal_False;
SvLBoxEntry* pEntry = m_aItemList.FirstSelected();
if ( pEntry )
{
- bEnableAdd = TRUE;
+ bEnableAdd = sal_True;
bool bSubmitChild = false;
if ( DGTSubmission == m_eGroup && m_aItemList.GetParent( pEntry ) )
{
@@ -1461,10 +1461,10 @@ namespace svxform
ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() );
if ( pNode && ( pNode->m_xNode.is() || pNode->m_xPropSet.is() ) )
{
- bEnableEdit = TRUE;
+ bEnableEdit = sal_True;
bEnableRemove = ( bSubmitChild != true );
if ( DGTInstance == m_eGroup && !m_aItemList.GetParent( pEntry ) )
- bEnableRemove = FALSE;
+ bEnableRemove = sal_False;
if ( pNode->m_xNode.is() )
{
try
@@ -1473,7 +1473,7 @@ namespace svxform
if ( eChildType != css::xml::dom::NodeType_ELEMENT_NODE
&& eChildType != css::xml::dom::NodeType_DOCUMENT_NODE )
{
- bEnableAdd = FALSE;
+ bEnableAdd = sal_False;
}
}
catch ( Exception& )
@@ -1484,7 +1484,7 @@ namespace svxform
}
}
else if ( m_eGroup != DGTInstance )
- bEnableAdd = TRUE;
+ bEnableAdd = sal_True;
m_aToolBox.EnableItem( TBI_ITEM_ADD, bEnableAdd );
m_aToolBox.EnableItem( TBI_ITEM_ADD_ELEMENT, bEnableAdd );
@@ -1502,8 +1502,8 @@ namespace svxform
}
if ( DGTInstance == m_eGroup )
{
- USHORT nResId1 = RID_STR_DATANAV_EDIT_ELEMENT;
- USHORT nResId2 = RID_STR_DATANAV_REMOVE_ELEMENT;
+ sal_uInt16 nResId1 = RID_STR_DATANAV_EDIT_ELEMENT;
+ sal_uInt16 nResId2 = RID_STR_DATANAV_REMOVE_ELEMENT;
if ( pEntry )
{
ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() );
@@ -1601,7 +1601,7 @@ namespace svxform
pMenu->SetItemBits( MID_SHOW_DETAILS, MIB_CHECKABLE );
pMenu->CheckItem( MID_SHOW_DETAILS, m_bShowDetails );
- m_aTabCtrl.SetCurPageId( static_cast< USHORT >( nPageId ) );
+ m_aTabCtrl.SetCurPageId( static_cast< sal_uInt16 >( nPageId ) );
ActivatePageHdl( &m_aTabCtrl );
// get our frame
@@ -1645,7 +1645,7 @@ namespace svxform
// -----------------------------------------------------------------------
IMPL_LINK( DataNavigatorWindow, ModelSelectHdl, ListBox *, pBox )
{
- USHORT nPos = m_aModelsBox.GetSelectEntryPos();
+ sal_uInt16 nPos = m_aModelsBox.GetSelectEntryPos();
// pBox == NULL, if you want to force a new fill.
if ( nPos != m_nLastSelectedPos || !pBox )
{
@@ -1662,7 +1662,7 @@ namespace svxform
{
bool bIsDocModified = false;
Reference< css::xforms::XFormsUIHelper1 > xUIHelper;
- USHORT nSelectedPos = m_aModelsBox.GetSelectEntryPos();
+ sal_uInt16 nSelectedPos = m_aModelsBox.GetSelectEntryPos();
::rtl::OUString sSelectedModel( m_aModelsBox.GetEntry( nSelectedPos ) );
Reference< css::xforms::XModel > xModel;
try
@@ -1718,7 +1718,7 @@ namespace svxform
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) ),
makeAny( sal_Bool( !bDocumentData ) ) );
- USHORT nNewPos = m_aModelsBox.InsertEntry( sNewName );
+ sal_uInt16 nNewPos = m_aModelsBox.InsertEntry( sNewName );
m_aModelsBox.SelectEntryPos( nNewPos );
ModelSelectHdl( &m_aModelsBox );
bIsDocModified = true;
@@ -1835,7 +1835,7 @@ namespace svxform
AddInstanceDialog aDlg( this, false );
if ( aDlg.Execute() == RET_OK )
{
- USHORT nInst = GetNewPageId();
+ sal_uInt16 nInst = GetNewPageId();
::rtl::OUString sName = aDlg.GetName();
::rtl::OUString sURL = aDlg.GetURL();
bool bLinkOnce = aDlg.IsLinkInstance();
@@ -1861,7 +1861,7 @@ namespace svxform
}
case MID_INSTANCES_EDIT :
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
XFormsPage* pPage = GetCurrentPage( nId );
if ( pPage )
{
@@ -1897,7 +1897,7 @@ namespace svxform
}
case MID_INSTANCES_REMOVE :
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
XFormsPage* pPage = GetCurrentPage( nId );
if ( pPage )
{
@@ -1997,7 +1997,7 @@ namespace svxform
// -----------------------------------------------------------------------
IMPL_LINK( DataNavigatorWindow, ActivatePageHdl, TabControl *, EMPTYARG )
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
XFormsPage* pPage = GetCurrentPage( nId );
if ( pPage )
{
@@ -2015,7 +2015,7 @@ namespace svxform
return 0;
}
// -----------------------------------------------------------------------
- XFormsPage* DataNavigatorWindow::GetCurrentPage( USHORT& rCurId )
+ XFormsPage* DataNavigatorWindow::GetCurrentPage( sal_uInt16& rCurId )
{
rCurId = m_aTabCtrl.GetCurPageId();
XFormsPage* pPage = NULL;
@@ -2048,7 +2048,7 @@ namespace svxform
if ( rCurId > TID_INSTANCE )
{
- USHORT nPos = m_aTabCtrl.GetPagePos( rCurId );
+ sal_uInt16 nPos = m_aTabCtrl.GetPagePos( rCurId );
if ( HasFirstInstancePage() && nPos > 0 )
nPos--;
if ( m_aPageList.size() > nPos )
@@ -2129,8 +2129,8 @@ namespace svxform
Reference< css::xforms::XModel > xFormsModel;
if ( aAny >>= xFormsModel )
{
- USHORT nPagePos = TAB_PAGE_NOTFOUND;
- USHORT nId = 0;
+ sal_uInt16 nPagePos = TAB_PAGE_NOTFOUND;
+ sal_uInt16 nId = 0;
XFormsPage* pPage = GetCurrentPage( nId );
DBG_ASSERT( pPage, "DataNavigatorWindow::SetPageModel(): no page" );
if ( nId >= TID_INSTANCE )
@@ -2243,7 +2243,7 @@ namespace svxform
}
}
- USHORT nPageId = GetNewPageId();
+ sal_uInt16 nPageId = GetNewPageId();
if ( sInstName.getLength() == 0 )
{
DBG_ERRORFILE( "DataNavigatorWindow::CreateInstancePage(): instance without name" );
@@ -2261,9 +2261,9 @@ namespace svxform
}
//------------------------------------------------------------------------
- USHORT DataNavigatorWindow::GetNewPageId() const
+ sal_uInt16 DataNavigatorWindow::GetNewPageId() const
{
- USHORT i, nMax = 0, nCount = m_aTabCtrl.GetPageCount();
+ sal_uInt16 i, nMax = 0, nCount = m_aTabCtrl.GetPageCount();
for ( i = 0; i < nCount; ++i )
{
if ( nMax < m_aTabCtrl.GetPageId(i) )
@@ -2599,7 +2599,7 @@ namespace svxform
sPropName = PN_READONLY_EXPR;
else if ( &m_aCalculateCB == pBox )
sPropName = PN_CALCULATE_EXPR;
- bool bIsChecked = ( pBox->IsChecked() != FALSE );
+ bool bIsChecked = ( pBox->IsChecked() != sal_False );
m_xTempBinding->getPropertyValue( sPropName ) >>= sTemp;
if ( bIsChecked && sTemp.getLength() == 0 )
sTemp = TRUE_VALUE;
@@ -2891,19 +2891,19 @@ namespace svxform
{
if ( ( m_xTempBinding->getPropertyValue( PN_REQUIRED_EXPR ) >>= sTemp )
&& sTemp.getLength() > 0 )
- m_aRequiredCB.Check( TRUE );
+ m_aRequiredCB.Check( sal_True );
if ( ( m_xTempBinding->getPropertyValue( PN_RELEVANT_EXPR ) >>= sTemp )
&& sTemp.getLength() > 0 )
- m_aRelevantCB.Check( TRUE );
+ m_aRelevantCB.Check( sal_True );
if ( ( m_xTempBinding->getPropertyValue( PN_CONSTRAINT_EXPR ) >>= sTemp )
&& sTemp.getLength() > 0 )
- m_aConstraintCB.Check( TRUE );
+ m_aConstraintCB.Check( sal_True );
if ( ( m_xTempBinding->getPropertyValue( PN_READONLY_EXPR ) >>= sTemp )
&& sTemp.getLength() > 0 )
- m_aReadonlyCB.Check( TRUE );
+ m_aReadonlyCB.Check( sal_True );
if ( ( m_xTempBinding->getPropertyValue( PN_CALCULATE_EXPR ) >>= sTemp )
&& sTemp.getLength() > 0 )
- m_aCalculateCB.Check( TRUE );
+ m_aCalculateCB.Check( sal_True );
}
catch ( Exception& )
{
@@ -2973,7 +2973,7 @@ namespace svxform
rtl::OUString sTemp;
if ( m_xTempBinding->getPropertyValue( PN_BINDING_TYPE ) >>= sTemp )
{
- USHORT nPos = m_aDataTypeLB.GetEntryPos( String( sTemp ) );
+ sal_uInt16 nPos = m_aDataTypeLB.GetEntryPos( String( sTemp ) );
if ( LISTBOX_ENTRY_NOTFOUND == nPos )
nPos = m_aDataTypeLB.InsertEntry( sTemp );
m_aDataTypeLB.SelectEntryPos( nPos );
@@ -3208,7 +3208,7 @@ namespace svxform
//------------------------------------------------------------------------
IMPL_LINK( NamespaceItemDialog, SelectHdl, SvxSimpleTable *, EMPTYARG )
{
- BOOL bEnable = ( m_aNamespacesList.FirstSelected() != NULL );
+ sal_Bool bEnable = ( m_aNamespacesList.FirstSelected() != NULL );
m_aEditNamespaceBtn.Enable( bEnable );
m_aDeleteNamespaceBtn.Enable( bEnable );
@@ -3597,7 +3597,7 @@ namespace svxform
m_xSubmission->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp;
sTemp = lcl_MethodString::get().toUI( sTemp );
- USHORT nPos = m_aMethodLB.GetEntryPos( String( sTemp ) );
+ sal_uInt16 nPos = m_aMethodLB.GetEntryPos( String( sTemp ) );
if ( LISTBOX_ENTRY_NOTFOUND == nPos )
nPos = m_aMethodLB.InsertEntry( sTemp );
m_aMethodLB.SelectEntryPos( nPos );
diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx
index a10f7a40da84..6c1415aecf64 100644
--- a/svx/source/form/fmmodel.cxx
+++ b/svx/source/form/fmmodel.cxx
@@ -112,7 +112,7 @@ FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectSh
|*
\************************************************************************/
FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers,
- FASTBOOL bUseExtColorTable
+ int bUseExtColorTable
)
:SdrModel(pPool, pPers, bUseExtColorTable, LOADREFCOUNTS)
,m_pImpl(NULL)
@@ -133,7 +133,7 @@ FmFormModel::FmFormModel(SfxItemPool* pPool, SfxObjectShell* pPers,
|*
\************************************************************************/
FmFormModel::FmFormModel(const XubString& rPath, SfxItemPool* pPool, SfxObjectShell* pPers,
- FASTBOOL bUseExtColorTable)
+ int bUseExtColorTable)
:SdrModel(rPath, pPool, pPers, bUseExtColorTable, LOADREFCOUNTS)
,m_pImpl( NULL )
,m_pObjShell(0)
@@ -173,7 +173,7 @@ FmFormModel::~FmFormModel()
|* Erzeugt eine neue Seite
|*
\************************************************************************/
-SdrPage* FmFormModel::AllocPage(FASTBOOL bMasterPage)
+SdrPage* FmFormModel::AllocPage(int bMasterPage)
{
return new FmFormPage(*this, NULL, bMasterPage);
}
@@ -199,7 +199,7 @@ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
|* MovePage
|*
\************************************************************************/
-void FmFormModel::MovePage( USHORT nPgNum, USHORT nNewPos )
+void FmFormModel::MovePage( sal_uInt16 nPgNum, sal_uInt16 nNewPos )
{
#ifndef SVX_LIGHT
m_pImpl->bMovingPage = sal_True;
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 1c7da93dfd95..2b13f2a90bf0 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -75,7 +75,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::svxform;
-static BOOL bInit = FALSE;
+static sal_Bool bInit = sal_False;
/*************************************************************************
|*
@@ -111,7 +111,7 @@ FmFormObjFactory::FmFormObjFactory()
FmFormShell::RegisterInterface(0);
ImplSmartRegisterUnoServices();
- bInit = TRUE;
+ bInit = sal_True;
}
}
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 7a705dfa4aa5..2ff40610fa77 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -1030,7 +1030,7 @@ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId )
if (m_nLockSlotInvalidation)
{
m_arrInvalidSlots.Insert(nId, m_arrInvalidSlots.Count());
- BYTE nFlags = ( bWithId ? 0x01 : 0 );
+ sal_uInt8 nFlags = ( bWithId ? 0x01 : 0 );
m_arrInvalidSlots_Flags.push_back(nFlags);
}
else
@@ -1070,7 +1070,7 @@ IMPL_LINK(FmXFormShell, OnInvalidateSlots, void*, EMPTYARG)
DBG_ASSERT(m_arrInvalidSlots.Count() == m_arrInvalidSlots_Flags.size(),
"FmXFormShell::OnInvalidateSlots : inconsistent slot arrays !");
- BYTE nFlags;
+ sal_uInt8 nFlags;
for (sal_Int16 i=0; i<m_arrInvalidSlots.Count(); ++i)
{
nFlags = m_arrInvalidSlots_Flags[i];
@@ -1111,7 +1111,7 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation)
PopupMenu* FmXFormShell::GetConversionMenu()
{
const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings();
- BOOL bIsHiContrastMode = rSettings.GetHighContrastMode();
+ sal_Bool bIsHiContrastMode = rSettings.GetHighContrastMode();
PopupMenu* pNewMenu = new PopupMenu(SVX_RES( RID_FMSHELL_CONVERSIONMENU ));
@@ -4226,10 +4226,10 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState
// We can't simply re-insert the item because we have a clear order for all the our items.
// So first we have to determine the position of the item to insert.
PopupMenu* pSource = FmXFormShell::GetConversionMenu();
- USHORT nSourcePos = pSource->GetItemPos(nSID);
+ sal_uInt16 nSourcePos = pSource->GetItemPos(nSID);
DBG_ASSERT(nSourcePos != MENU_ITEM_NOTFOUND, "ControlConversionMenuController::StateChanged : FmXFormShell supplied an invalid menu !");
- USHORT nPrevInSource = nSourcePos;
- USHORT nPrevInConversion = MENU_ITEM_NOTFOUND;
+ sal_uInt16 nPrevInSource = nSourcePos;
+ sal_uInt16 nPrevInConversion = MENU_ITEM_NOTFOUND;
while (nPrevInSource>0)
{
sal_Int16 nPrevId = pSource->GetItemId(--nPrevInSource);
@@ -4241,7 +4241,7 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState
}
if (MENU_ITEM_NOTFOUND == nPrevInConversion)
// none of the items which precede the nSID-slot in the source menu are present in our conversion menu
- nPrevInConversion = sal::static_int_cast< USHORT >(-1); // put the item at the first position
+ nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1); // put the item at the first position
m_pConversionMenu->InsertItem(nSID, pSource->GetItemText(nSID), pSource->GetItemBits(nSID), ++nPrevInConversion);
m_pConversionMenu->SetItemImage(nSID, pSource->GetItemImage(nSID));
m_pConversionMenu->SetHelpId(nSID, pSource->GetHelpId(nSID));
diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx
index d758b5622e0b..9be7d4881f61 100644
--- a/svx/source/form/fmtextcontroldialogs.cxx
+++ b/svx/source/form/fmtextcontroldialogs.cxx
@@ -76,7 +76,7 @@ namespace svx
}
//--------------------------------------------------------------------
- void TextControlCharAttribDialog::PageCreated( USHORT _nId, SfxTabPage& _rPage )
+ void TextControlCharAttribDialog::PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage )
{
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 19ca20dd7983..e2b959d013eb 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -94,7 +94,7 @@ namespace svx
using namespace ::com::sun::star::container;
//====================================================================
- typedef USHORT WhichId;
+ typedef sal_uInt16 WhichId;
//====================================================================
static SfxSlotId pTextControlSlots[] =
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index e63325f710e9..35dc652b9330 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -177,8 +177,8 @@ private:
//------------------------------------------------------------------------------
struct PropertyInfo
{
- BOOL bIsTransientOrReadOnly : 1; // the property is transient or read-only, thus we need no undo action for it
- BOOL bIsValueProperty : 1; // the property is the special value property, thus it may be handled
+ sal_Bool bIsTransientOrReadOnly : 1; // the property is transient or read-only, thus we need no undo action for it
+ sal_Bool bIsValueProperty : 1; // the property is the special value property, thus it may be handled
// as if it's transient or persistent
};
@@ -187,11 +187,11 @@ struct PropertySetInfo
DECLARE_STL_USTRINGACCESS_MAP(PropertyInfo, AllProperties);
AllProperties aProps; // all properties of this set which we know so far
- BOOL bHasEmptyControlSource; // sal_True -> the set has a DataField property, and the current value is an empty string
+ sal_Bool bHasEmptyControlSource; // sal_True -> the set has a DataField property, and the current value is an empty string
// sal_False -> the set has _no_ such property or it's value isn't empty
};
-BOOL operator < (const Reference< XPropertySet >& lhs,
+sal_Bool operator < (const Reference< XPropertySet >& lhs,
const Reference< XPropertySet >& rhs)
{
return lhs.get() < rhs.get();
@@ -668,7 +668,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
PropertyInfo aNewEntry;
// the attributes
- INT32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName(evt.PropertyName).Attributes;
+ sal_Int32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName(evt.PropertyName).Attributes;
aNewEntry.bIsTransientOrReadOnly = ((nAttributes & PropertyAttribute::READONLY) != 0) || ((nAttributes & PropertyAttribute::TRANSIENT) != 0);
// check if it is the special "DataFieldProperty"
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index f9980284993d..fb70cc318c84 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -187,7 +187,7 @@ void FmFormView::MarkListHasChanged()
pImpl->m_xWindow->removeFocusListener(pImpl);
pImpl->m_xWindow = NULL;
}
- SetMoveOutside(FALSE);
+ SetMoveOutside(sal_False);
//OLMRefreshAllIAOManagers();
}
@@ -504,9 +504,9 @@ void FmFormView::EndCompleteRedraw( SdrPaintWindow& rPaintWindow, bool bPaintFor
}
// -----------------------------------------------------------------------------
-BOOL FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
+sal_Bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
{
- BOOL bDone = FALSE;
+ sal_Bool bDone = sal_False;
const KeyCode& rKeyCode = rKEvt.GetKeyCode();
if ( IsDesignMode()
&& rKeyCode.GetCode() == KEY_RETURN
@@ -529,10 +529,10 @@ BOOL FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
pImpl->m_xWindow = xWindow;
// add as listener to get notified when ESC will be pressed inside the grid
pImpl->m_xWindow->addFocusListener(pImpl);
- SetMoveOutside(TRUE);
+ SetMoveOutside(sal_True);
//OLMRefreshAllIAOManagers();
xWindow->setFocus();
- bDone = TRUE;
+ bDone = sal_True;
}
}
}
@@ -565,9 +565,9 @@ sal_Bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource)
}
// -----------------------------------------------------------------------------
-BOOL FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin )
+sal_Bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin )
{
- BOOL bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin );
+ sal_Bool bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin );
if ( pFormShell && pFormShell->GetImpl() )
{
@@ -604,7 +604,7 @@ FmFormObj* FmFormView::getMarkedGrid() const
// -----------------------------------------------------------------------------
void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM,
const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats,
- sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, UINT32 _nInventor, UINT16 _nLabelObjectID,
+ sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID,
SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl )
{
FmXFormView::createControlLabelPair(
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 8e0f6b2a261a..d2b6d6cbded4 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -768,7 +768,7 @@ void FmXFormView::Activate(sal_Bool bSync)
}
//------------------------------------------------------------------------------
-void FmXFormView::Deactivate(BOOL bDeactivateController)
+void FmXFormView::Deactivate(sal_Bool bDeactivateController)
{
if (m_nActivationEvent)
{
@@ -1518,7 +1518,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& _rContext,
OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField,
const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID,
- const ::rtl::OUString& _rFieldPostfix, UINT32 _nInventor, UINT16 _nLabelObjectID,
+ const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID,
SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl)
{
sal_Int32 nDataType = 0;
@@ -1690,8 +1690,8 @@ void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject )
// muss ich es jetzt da rausnehmen, da ich sonst beim Zurueckschalten versuche, die Markierung wieder zu setzen
// (interesanterweise geht das nur bei gruppierten Objekten schief (beim Zugriff auf deren ObjList GPF), nicht bei einzelnen)
- ULONG nCount = m_aMark.GetMarkCount();
- for (ULONG i = 0; i < nCount; ++i)
+ sal_uIntPtr nCount = m_aMark.GetMarkCount();
+ for (sal_uIntPtr i = 0; i < nCount; ++i)
{
SdrMark* pMark = m_aMark.GetMark(i);
SdrObject* pCurrent = pMark->GetMarkedSdrObj();
@@ -1740,8 +1740,8 @@ void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark )
m_aMark = m_pView->GetMarkedObjectList();
if ( _bSmartUnmark )
{
- ULONG nCount = m_aMark.GetMarkCount( );
- for ( ULONG i = 0; i < nCount; ++i )
+ sal_uIntPtr nCount = m_aMark.GetMarkCount( );
+ for ( sal_uIntPtr i = 0; i < nCount; ++i )
{
SdrMark* pMark = m_aMark.GetMark(i);
SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -1807,15 +1807,15 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
sal_Bool bMisMatch = sal_False;
// loop through all current marks
- ULONG nCurrentCount = rCurrentList.GetMarkCount();
- for ( ULONG i=0; i<nCurrentCount&& !bMisMatch; ++i )
+ sal_uIntPtr nCurrentCount = rCurrentList.GetMarkCount();
+ for ( sal_uIntPtr i=0; i<nCurrentCount&& !bMisMatch; ++i )
{
const SdrObject* pCurrentMarked = rCurrentList.GetMark( i )->GetMarkedSdrObj();
// loop through all saved marks, check for equality
sal_Bool bFound = sal_False;
- ULONG nSavedCount = m_aMark.GetMarkCount();
- for ( ULONG j=0; j<nSavedCount && !bFound; ++j )
+ sal_uIntPtr nSavedCount = m_aMark.GetMarkCount();
+ for ( sal_uIntPtr j=0; j<nSavedCount && !bFound; ++j )
{
if ( m_aMark.GetMark( j )->GetMarkedSdrObj() == pCurrentMarked )
bFound = sal_True;
@@ -1840,8 +1840,8 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
sal_Bool bFound = sal_True;
// gibt es noch alle Objecte
- ULONG nCount = m_aMark.GetMarkCount();
- for (ULONG i = 0; i < nCount && bFound; i++)
+ sal_uIntPtr nCount = m_aMark.GetMarkCount();
+ for (sal_uIntPtr i = 0; i < nCount && bFound; i++)
{
SdrMark* pMark = m_aMark.GetMark(i);
SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -1862,7 +1862,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList )
// Das LastObject auswerten
if (nCount) // Objecte jetzt Markieren
{
- for (ULONG i = 0; i < nCount; i++)
+ for (sal_uIntPtr i = 0; i < nCount; i++)
{
SdrMark* pMark = m_aMark.GetMark(i);
SdrObject* pObj = pMark->GetMarkedSdrObj();
@@ -1882,7 +1882,7 @@ void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (Runtime
{
if ( m_xWindow.is() && m_pView )
{
- m_pView->SetMoveOutside( TRUE, FmFormView::ImplAccess() );
+ m_pView->SetMoveOutside( sal_True, FmFormView::ImplAccess() );
}
}
// -----------------------------------------------------------------------------
@@ -1892,7 +1892,7 @@ void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeEx
// so we can not remove us as focus listener
if ( m_xWindow.is() && m_pView )
{
- m_pView->SetMoveOutside( FALSE, FmFormView::ImplAccess() );
+ m_pView->SetMoveOutside( sal_False, FmFormView::ImplAccess() );
}
}
// -----------------------------------------------------------------------------
@@ -1903,7 +1903,7 @@ void FmXFormView::removeGridWindowListening()
m_xWindow->removeFocusListener(this);
if ( m_pView )
{
- m_pView->SetMoveOutside( FALSE, FmFormView::ImplAccess() );
+ m_pView->SetMoveOutside( sal_False, FmFormView::ImplAccess() );
}
m_xWindow = NULL;
}
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index b98e63fb2bd1..739e9788c64b 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -60,7 +60,7 @@ namespace svxform
}
//--------------------------------------------------------------------
- void FormToolboxes::toggleToolbox( USHORT _nSlotId ) const
+ void FormToolboxes::toggleToolbox( sal_uInt16 _nSlotId ) const
{
try
{
@@ -88,14 +88,14 @@ namespace svxform
}
//--------------------------------------------------------------------
- bool FormToolboxes::isToolboxVisible( USHORT _nSlotId ) const
+ bool FormToolboxes::isToolboxVisible( sal_uInt16 _nSlotId ) const
{
return m_xLayouter.is() && m_xLayouter->isElementVisible(
getToolboxResourceName( _nSlotId ) );
}
//--------------------------------------------------------------------
- ::rtl::OUString FormToolboxes::getToolboxResourceName( USHORT _nSlotId ) const
+ ::rtl::OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const
{
OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) || ( _nSlotId == SID_FM_CONFIG ),
"FormToolboxes::getToolboxResourceName: unsupported slot!" );
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 78bbc7a533d9..362b4bba0faf 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -714,7 +714,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- SvLBoxEntry* NavigatorTree::Insert( FmEntryData* pEntryData, ULONG nRelPos )
+ SvLBoxEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uIntPtr nRelPos )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::Insert" );
//////////////////////////////////////////////////////////////////////
@@ -782,7 +782,7 @@ namespace svxform
// beim eigentlichen Entfernen kann die Selection geaendert werden, da ich aber das SelectionHandling abgeschaltet
// habe, muss ich mich hinterher darum kuemmern
- ULONG nExpectedSelectionCount = GetSelectionCount();
+ sal_uIntPtr nExpectedSelectionCount = GetSelectionCount();
if( pEntry )
GetModel()->Remove( pEntry );
@@ -1760,7 +1760,7 @@ namespace svxform
// erstmal die PropertySet-Interfaces der Forms einsammeln
for ( sal_Int32 i = 0; i < m_nFormsSelected; ++i )
{
- FmFormData* pFormData = (FmFormData*)m_arrCurrentSelection.GetObject((USHORT)i)->GetUserData();
+ FmFormData* pFormData = (FmFormData*)m_arrCurrentSelection.GetObject((sal_uInt16)i)->GetUserData();
aSelection.insert( pFormData->GetPropertySet().get() );
}
}
@@ -1770,7 +1770,7 @@ namespace svxform
{ // ein MultiSet fuer die Properties der hidden controls
for ( sal_Int32 i = 0; i < m_nHiddenControls; ++i )
{
- FmEntryData* pEntryData = (FmEntryData*)m_arrCurrentSelection.GetObject((USHORT)i)->GetUserData();
+ FmEntryData* pEntryData = (FmEntryData*)m_arrCurrentSelection.GetObject((sal_uInt16)i)->GetUserData();
aSelection.insert( pEntryData->GetPropertySet().get() );
}
}
@@ -1802,7 +1802,7 @@ namespace svxform
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::DeleteSelection" );
// die Root darf ich natuerlich nicht mitloeschen
sal_Bool bRootSelected = IsSelected(m_pRootEntry);
- ULONG nSelectedEntries = GetSelectionCount();
+ sal_uIntPtr nSelectedEntries = GetSelectionCount();
if (bRootSelected && (nSelectedEntries > 1)) // die Root plus andere Elemente ?
Select(m_pRootEntry, sal_False); // ja -> die Root raus
@@ -1843,7 +1843,7 @@ namespace svxform
// then go on to the strucure. This means I have to delete the forms *after* the normal controls, so
// that during UNDO, they're restored in the proper order.
pFormShell->GetImpl()->EnableTrackProperties(sal_False);
- USHORT i;
+ sal_uInt16 i;
for (i = m_arrCurrentSelection.Count(); i>0; --i)
{
FmEntryData* pCurrent = (FmEntryData*)(m_arrCurrentSelection.GetObject(i - 1)->GetUserData());
@@ -2103,7 +2103,7 @@ namespace svxform
for (sal_uInt32 i=0; i<m_arrCurrentSelection.Count(); ++i)
{
- SvLBoxEntry* pSelectionLoop = m_arrCurrentSelection.GetObject((USHORT)i);
+ SvLBoxEntry* pSelectionLoop = m_arrCurrentSelection.GetObject((sal_uInt16)i);
// Bei Formselektion alle Controls dieser Form markieren
if (IsFormEntry(pSelectionLoop) && (pSelectionLoop != m_pRootEntry))
MarkViewObj((FmFormData*)pSelectionLoop->GetUserData(), sal_True, sal_False);
diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx
index eb799e2b2927..06f8814a9721 100644
--- a/svx/source/form/stringlistresource.cxx
+++ b/svx/source/form/stringlistresource.cxx
@@ -50,7 +50,7 @@ namespace svx
StringListResource::StringListResource( const ResId& _rResId )
:Resource( _rResId )
{
- USHORT nLocalID = 1;
+ sal_uInt16 nLocalID = 1;
ResId aLocalID( nLocalID, *_rResId.GetResMgr() );
while ( IsAvailableRes( aLocalID.SetRT( RSC_STRING ) ) )
{
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index fb13eddd15f0..0bad14631355 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -81,7 +81,7 @@ SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pControlle
SetSizePixel( Size(70,19) );
SetDecimalDigits(0);
- SetStrictFormat(TRUE);
+ SetStrictFormat(sal_True);
}
// -----------------------------------------------------------------------
@@ -101,7 +101,7 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce )
return;
}
- SfxInt32Item aPositionParam( FN_PARAM_1, static_cast<INT32>(nRecord) );
+ SfxInt32Item aPositionParam( FN_PARAM_1, static_cast<sal_Int32>(nRecord) );
Any a;
Sequence< PropertyValue > aArgs( 1 );
@@ -137,7 +137,7 @@ void SvxFmAbsRecWin::KeyInput( const KeyEvent& rKeyEvent )
struct MapSlotToCmd
{
- USHORT nSlotId;
+ sal_uInt16 nSlotId;
const char* pCommand;
};
@@ -170,7 +170,7 @@ static MapSlotToCmd SlotToCommands[] =
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlConfig, SfxUInt16Item );
//-----------------------------------------------------------------------
-SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
: SfxToolBoxControl( nSlotId, nId, rTbx )
,nLastSlot( 0 )
{
@@ -178,11 +178,11 @@ SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx
}
//-----------------------------------------------------------------------
-void SvxFmTbxCtlConfig::StateChanged(USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
if (nSID == SID_FM_CONFIG)
{
- UINT16 nSlot = 0;
+ sal_uInt16 nSlot = 0;
if (eState >= SFX_ITEM_AVAILABLE)
nSlot = ((SfxUInt16Item*)pState)->GetValue();
@@ -245,13 +245,13 @@ SfxPopupWindow* SvxFmTbxCtlConfig::CreatePopupWindow()
}
//-----------------------------------------------------------------------
-void SvxFmTbxCtlConfig::Select( USHORT /*nModifier*/ )
+void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ )
{
//////////////////////////////////////////////////////////////////////
// Click auf den Button SID_FM_CONFIG in der ObjectBar
if ( nLastSlot )
{
- USHORT n = 0;
+ sal_uInt16 n = 0;
while( SlotToCommands[n].nSlotId > 0 )
{
if ( SlotToCommands[n].nSlotId == nLastSlot )
@@ -276,7 +276,7 @@ void SvxFmTbxCtlConfig::Select( USHORT /*nModifier*/ )
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlAbsRec, SfxInt32Item );
DBG_NAME(SvxFmTbxCtlAbsRec);
//-----------------------------------------------------------------------
-SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
DBG_CTOR(SvxFmTbxCtlAbsRec,NULL);
@@ -289,9 +289,9 @@ SvxFmTbxCtlAbsRec::~SvxFmTbxCtlAbsRec()
}
//-----------------------------------------------------------------------
-void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
ToolBox* pToolBox = &GetToolBox();
SvxFmAbsRecWin* pWin = (SvxFmAbsRecWin*)( pToolBox->GetItemWindow(nId) );
@@ -304,7 +304,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const Sf
pWin->SetValue( pItem ? pItem->GetValue() : -1 );
}
- BOOL bEnable = SFX_ITEM_DISABLED != eState && pState;
+ sal_Bool bEnable = SFX_ITEM_DISABLED != eState && pState;
if (!bEnable)
pWin->SetText(String());
@@ -330,7 +330,7 @@ Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent )
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecText, SfxBoolItem );
DBG_NAME(SvxFmTbxCtlRecText);
//-----------------------------------------------------------------------
-SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
DBG_CTOR(SvxFmTbxCtlRecText,NULL);
@@ -364,7 +364,7 @@ Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent )
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecFromText, SfxBoolItem );
DBG_NAME(SvxFmTbxCtlRecFromText);
//-----------------------------------------------------------------------
-SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
DBG_CTOR(SvxFmTbxCtlRecFromText,NULL);
@@ -397,7 +397,7 @@ DBG_NAME(SvxFmTbxCtlRecTotal);
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecTotal, SfxStringItem );
//-----------------------------------------------------------------------
-SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
,pFixedText( NULL )
{
@@ -419,12 +419,12 @@ Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent )
aSize.Width() += 12;
pFixedText->SetSizePixel( aSize );
pFixedText->SetBackground();
- pFixedText->SetPaintTransparent(TRUE);
+ pFixedText->SetPaintTransparent(sal_True);
return pFixedText;
}
//-----------------------------------------------------------------------
-void SvxFmTbxCtlRecTotal::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
//////////////////////////////////////////////////////////////////////
// Setzen des FixedTextes
@@ -450,7 +450,7 @@ void SvxFmTbxCtlRecTotal::StateChanged( USHORT nSID, SfxItemState eState, const
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxNextRec, SfxBoolItem );
//-----------------------------------------------------------------------
-SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxNextRec::SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.SetItemBits(nId, rTbx.GetItemBits(nId) | TIB_REPEAT);
@@ -459,7 +459,7 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
MouseSettings aMouseSettings = aSettings.GetMouseSettings();
aMouseSettings.SetButtonRepeat(aMouseSettings.GetButtonRepeat() / 4);
aSettings.SetMouseSettings(aMouseSettings);
- rTbx.SetSettings(aSettings, TRUE);
+ rTbx.SetSettings(aSettings, sal_True);
}
//========================================================================
@@ -468,7 +468,7 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxPrevRec, SfxBoolItem );
//-----------------------------------------------------------------------
-SvxFmTbxPrevRec::SvxFmTbxPrevRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxFmTbxPrevRec::SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.SetItemBits(nId, rTbx.GetItemBits(nId) | TIB_REPEAT);
diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx
index 7249df9c121f..3306e7896c5d 100644
--- a/svx/source/gallery2/codec.cxx
+++ b/svx/source/gallery2/codec.cxx
@@ -49,23 +49,23 @@ GalleryCodec::~GalleryCodec()
// -----------------------------------------------------------------------------
-BOOL GalleryCodec::IsCoded( SvStream& rStm, UINT32& rVersion )
+sal_Bool GalleryCodec::IsCoded( SvStream& rStm, sal_uInt32& rVersion )
{
- const ULONG nPos = rStm.Tell();
- BOOL bRet;
- BYTE cByte1, cByte2, cByte3, cByte4, cByte5, cByte6;
+ const sal_uIntPtr nPos = rStm.Tell();
+ sal_Bool bRet;
+ sal_uInt8 cByte1, cByte2, cByte3, cByte4, cByte5, cByte6;
rStm >> cByte1 >> cByte2 >> cByte3 >> cByte4 >> cByte5 >> cByte6;
if ( cByte1 == 'S' && cByte2 == 'V' && cByte3 == 'R' && cByte4 == 'L' && cByte5 == 'E' && ( cByte6 == '1' || cByte6 == '2' ) )
{
rVersion = ( ( cByte6 == '1' ) ? 1 : 2 );
- bRet = TRUE;
+ bRet = sal_True;
}
else
{
rVersion = 0;
- bRet = FALSE;
+ bRet = sal_False;
}
rStm.Seek( nPos );
@@ -77,10 +77,10 @@ BOOL GalleryCodec::IsCoded( SvStream& rStm, UINT32& rVersion )
void GalleryCodec::Write( SvStream& rStmToWrite )
{
- UINT32 nPos, nCompSize;
+ sal_uInt32 nPos, nCompSize;
rStmToWrite.Seek( STREAM_SEEK_TO_END );
- const UINT32 nSize = rStmToWrite.Tell();
+ const sal_uInt32 nSize = rStmToWrite.Tell();
rStmToWrite.Seek( 0UL );
rStm << 'S' << 'V' << 'R' << 'L' << 'E' << '2';
@@ -104,11 +104,11 @@ void GalleryCodec::Write( SvStream& rStmToWrite )
void GalleryCodec::Read( SvStream& rStmToRead )
{
- UINT32 nVersion = 0;
+ sal_uInt32 nVersion = 0;
if( IsCoded( rStm, nVersion ) )
{
- UINT32 nCompressedSize, nUnCompressedSize;
+ sal_uInt32 nCompressedSize, nUnCompressedSize;
rStm.SeekRel( 6 );
rStm >> nUnCompressedSize >> nCompressedSize;
@@ -116,13 +116,13 @@ void GalleryCodec::Read( SvStream& rStmToRead )
// decompress
if( 1 == nVersion )
{
- BYTE* pCompressedBuffer = new BYTE[ nCompressedSize ]; rStm.Read( pCompressedBuffer, nCompressedSize );
- BYTE* pInBuf = pCompressedBuffer;
- BYTE* pOutBuf = new BYTE[ nUnCompressedSize ];
- BYTE* pTmpBuf = pOutBuf;
- BYTE* pLast = pOutBuf + nUnCompressedSize - 1;
- ULONG nIndex = 0UL, nCountByte, nRunByte;
- BOOL bEndDecoding = FALSE;
+ sal_uInt8* pCompressedBuffer = new sal_uInt8[ nCompressedSize ]; rStm.Read( pCompressedBuffer, nCompressedSize );
+ sal_uInt8* pInBuf = pCompressedBuffer;
+ sal_uInt8* pOutBuf = new sal_uInt8[ nUnCompressedSize ];
+ sal_uInt8* pTmpBuf = pOutBuf;
+ sal_uInt8* pLast = pOutBuf + nUnCompressedSize - 1;
+ sal_uIntPtr nIndex = 0UL, nCountByte, nRunByte;
+ sal_Bool bEndDecoding = sal_False;
do
{
@@ -144,11 +144,11 @@ void GalleryCodec::Read( SvStream& rStmToRead )
pInBuf++;
}
else if ( nRunByte == 1 ) // Ende des Bildes
- bEndDecoding = TRUE;
+ bEndDecoding = sal_True;
}
else
{
- const BYTE cVal = *pInBuf++;
+ const sal_uInt8 cVal = *pInBuf++;
memset( &pTmpBuf[ nIndex ], cVal, nCountByte );
nIndex += nCountByte;
diff --git a/svx/source/gallery2/codec.hxx b/svx/source/gallery2/codec.hxx
index 7a13cad3fd46..ca7ee5d3adbf 100644
--- a/svx/source/gallery2/codec.hxx
+++ b/svx/source/gallery2/codec.hxx
@@ -47,5 +47,5 @@ public:
void Write( SvStream& rStmToWrite );
void Read( SvStream& rStmToRead );
- static BOOL IsCoded( SvStream& rStm, UINT32& rVersion );
+ static sal_Bool IsCoded( SvStream& rStm, sal_uInt32& rVersion );
};
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx
index b972dccd9ab7..5d4e4297f0a4 100644
--- a/svx/source/gallery2/galbrws.cxx
+++ b/svx/source/gallery2/galbrws.cxx
@@ -81,7 +81,7 @@ void GallerySplitter::DataChanged( const DataChangedEvent& rDCEvt )
// - SvxGalleryChildWindow -
// -------------------------
-GalleryChildWindow::GalleryChildWindow( Window* _pParent, USHORT nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
+GalleryChildWindow::GalleryChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) :
SfxChildWindow( _pParent, nId )
{
pWindow = new GalleryBrowser( pBindings, this, _pParent, GAL_RESID( RID_SVXDLG_GALLERYBROWSER ) );
@@ -116,11 +116,11 @@ GalleryBrowser::GalleryBrowser( SfxBindings* _pBindings, SfxChildWindow* pCW,
SetMinOutputSizePixel( maLastSize = GetOutputSizePixel() );
mpBrowser1->SelectTheme( 0 );
- mpBrowser1->Show( TRUE );
- mpBrowser2->Show( TRUE );
+ mpBrowser1->Show( sal_True );
+ mpBrowser2->Show( sal_True );
mpSplitter->SetSplitHdl( LINK( this, GalleryBrowser, SplitHdl ) );
- mpSplitter->Show( TRUE );
+ mpSplitter->Show( sal_True );
InitSettings();
}
@@ -182,17 +182,17 @@ void GalleryBrowser::Resize()
// -----------------------------------------------------------------------------
-BOOL GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
+sal_Bool GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
{
- const USHORT nCode = rKEvt.GetKeyCode().GetCode();
- BOOL bRet = ( !rKEvt.GetKeyCode().IsMod1() &&
+ const sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode();
+ sal_Bool bRet = ( !rKEvt.GetKeyCode().IsMod1() &&
( ( KEY_TAB == nCode ) || ( KEY_F6 == nCode && rKEvt.GetKeyCode().IsMod2() ) ) );
if( bRet )
{
if( !rKEvt.GetKeyCode().IsShift() )
{
- if( mpBrowser1->mpThemes->HasChildPathFocus( TRUE ) )
+ if( mpBrowser1->mpThemes->HasChildPathFocus( sal_True ) )
mpBrowser2->GetViewWindow()->GrabFocus();
else if( mpBrowser2->GetViewWindow()->HasFocus() )
mpBrowser2->maViewBox.GrabFocus();
@@ -203,7 +203,7 @@ BOOL GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
}
else
{
- if( mpBrowser1->mpThemes->HasChildPathFocus( TRUE ) )
+ if( mpBrowser1->mpThemes->HasChildPathFocus( sal_True ) )
mpBrowser1->maNewTheme.GrabFocus();
else if( mpBrowser1->maNewTheme.HasFocus() )
mpBrowser2->maViewBox.GrabFocus();
@@ -219,7 +219,7 @@ BOOL GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* )
// -----------------------------------------------------------------------------
-BOOL GalleryBrowser::Close()
+sal_Bool GalleryBrowser::Close()
{
return SfxDockingWindow::Close();
}
@@ -262,14 +262,14 @@ Graphic GalleryBrowser::GetGraphic() const
// -----------------------------------------------------------------------------
-BOOL GalleryBrowser::GetVCDrawModel( FmFormModel& rModel ) const
+sal_Bool GalleryBrowser::GetVCDrawModel( FmFormModel& rModel ) const
{
return mpBrowser2->GetVCDrawModel( rModel );
}
// -----------------------------------------------------------------------------
-BOOL GalleryBrowser::IsLinkage() const
+sal_Bool GalleryBrowser::IsLinkage() const
{
return mpBrowser2->IsLinkage();
}
diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx
index 04f402804b0c..e1f7f38b9e33 100644
--- a/svx/source/gallery2/galbrws1.cxx
+++ b/svx/source/gallery2/galbrws1.cxx
@@ -163,12 +163,12 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId,
mpThemes->SetHelpId( HID_GALLERY_THEMELIST );
mpThemes->SetSelectHdl( LINK( this, GalleryBrowser1, SelectThemeHdl ) );
- for( ULONG i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ )
+ for( sal_uIntPtr i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ )
ImplInsertThemeEntry( mpGallery->GetThemeInfo( i ) );
ImplAdjustControls();
- maNewTheme.Show( TRUE );
- mpThemes->Show( TRUE );
+ maNewTheme.Show( sal_True );
+ mpThemes->Show( sal_True );
}
// -----------------------------------------------------------------------------
@@ -184,11 +184,11 @@ GalleryBrowser1::~GalleryBrowser1()
// -----------------------------------------------------------------------------
-ULONG GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry )
+sal_uIntPtr GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry )
{
static const BOOL bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL );
- ULONG nRet = LISTBOX_ENTRY_NOTFOUND;
+ sal_uIntPtr nRet = LISTBOX_ENTRY_NOTFOUND;
if( pEntry && ( !pEntry->IsHidden() || bShowHiddenThemes ) )
{
@@ -255,30 +255,30 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa
// -----------------------------------------------------------------------------
-::std::vector< USHORT > GalleryBrowser1::ImplGetExecuteVector()
+::std::vector< sal_uInt16 > GalleryBrowser1::ImplGetExecuteVector()
{
- ::std::vector< USHORT > aExecVector;
+ ::std::vector< sal_uInt16 > aExecVector;
GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this );
if( pTheme )
{
- BOOL bUpdateAllowed, bRenameAllowed, bRemoveAllowed;
+ sal_Bool bUpdateAllowed, bRenameAllowed, bRemoveAllowed;
static const BOOL bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != NULL );
if( pTheme->IsReadOnly() )
- bUpdateAllowed = bRenameAllowed = bRemoveAllowed = FALSE;
+ bUpdateAllowed = bRenameAllowed = bRemoveAllowed = sal_False;
else if( pTheme->IsImported() )
{
- bUpdateAllowed = FALSE;
- bRenameAllowed = bRemoveAllowed = TRUE;
+ bUpdateAllowed = sal_False;
+ bRenameAllowed = bRemoveAllowed = sal_True;
}
else if( pTheme->IsDefault() )
{
- bUpdateAllowed = bRenameAllowed = TRUE;
- bRemoveAllowed = FALSE;
+ bUpdateAllowed = bRenameAllowed = sal_True;
+ bRemoveAllowed = sal_False;
}
else
- bUpdateAllowed = bRenameAllowed = bRemoveAllowed = TRUE;
+ bUpdateAllowed = bRenameAllowed = bRemoveAllowed = sal_True;
if( bUpdateAllowed && pTheme->GetObjectCount() )
aExecVector.push_back( MN_ACTUALIZE );
@@ -341,7 +341,7 @@ void GalleryBrowser1::ImplEndGalleryThemeProperties( VclAbstractDialog2* pDialog
{
const String aOldName( aName );
String aTitle( mpExchangeData->aEditedTitle );
- USHORT nCount = 0;
+ sal_uInt16 nCount = 0;
while( mpGallery->HasTheme( aTitle ) && ( nCount++ < 16000 ) )
{
@@ -400,7 +400,7 @@ IMPL_LINK( GalleryBrowser1, DestroyThemePropertiesDlgHdl, VclAbstractDialog2*, p
// -----------------------------------------------------------------------------
-void GalleryBrowser1::ImplExecute( USHORT nId )
+void GalleryBrowser1::ImplExecute( sal_uInt16 nId )
{
switch( nId )
{
@@ -446,7 +446,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
if( aNewName.Len() && ( aNewName != aOldName ) )
{
String aName( aNewName );
- USHORT nCount = 0;
+ sal_uInt16 nCount = 0;
while( mpGallery->HasTheme( aName ) && ( nCount++ < 16000 ) )
{
@@ -477,7 +477,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId )
DBG_ASSERT(aDlg, "Dialogdiet fail!");//CHINA001
if( aDlg->Execute() == RET_OK ) //CHINA001 if( aDlg.Execute() == RET_OK )
- pTheme->SetId( aDlg->GetId(), TRUE ); //CHINA001 pTheme->SetId( aDlg.GetId(), TRUE );
+ pTheme->SetId( aDlg->GetId(), sal_True ); //CHINA001 pTheme->SetId( aDlg.GetId(), sal_True );
delete aDlg; //add CHINA001
}
}
@@ -525,8 +525,8 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint )
case( GALLERY_HINT_THEME_RENAMED ):
{
- const USHORT nCurSelectPos = mpThemes->GetSelectEntryPos();
- const USHORT nRenameEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() );
+ const sal_uInt16 nCurSelectPos = mpThemes->GetSelectEntryPos();
+ const sal_uInt16 nRenameEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() );
mpThemes->RemoveEntry( rGalleryHint.GetThemeName() );
ImplInsertThemeEntry( mpGallery->GetThemeInfo( rGalleryHint.GetStringData() ) );
@@ -547,8 +547,8 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint )
case( GALLERY_HINT_CLOSE_THEME ):
{
- const USHORT nCurSelectPos = mpThemes->GetSelectEntryPos();
- const USHORT nCloseEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() );
+ const sal_uInt16 nCurSelectPos = mpThemes->GetSelectEntryPos();
+ const sal_uInt16 nCloseEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() );
if( nCurSelectPos == nCloseEntryPos )
{
@@ -578,15 +578,15 @@ void GalleryBrowser1::ShowContextMenu()
// -----------------------------------------------------------------------------
-BOOL GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
+sal_Bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
{
- BOOL bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow );
+ sal_Bool bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow );
if( !bRet )
{
- ::std::vector< USHORT > aExecVector( ImplGetExecuteVector() );
- USHORT nExecuteId = 0;
- BOOL bMod1 = rKEvt.GetKeyCode().IsMod1();
+ ::std::vector< sal_uInt16 > aExecVector( ImplGetExecuteVector() );
+ sal_uInt16 nExecuteId = 0;
+ sal_Bool bMod1 = rKEvt.GetKeyCode().IsMod1();
switch( rKEvt.GetKeyCode().GetCode() )
{
@@ -637,7 +637,7 @@ BOOL GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
if( nExecuteId && ( ::std::find( aExecVector.begin(), aExecVector.end(), nExecuteId ) != aExecVector.end() ) )
{
ImplExecute( nExecuteId );
- bRet = TRUE;
+ bRet = sal_True;
}
}
@@ -648,7 +648,7 @@ BOOL GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
IMPL_LINK( GalleryBrowser1, ShowContextMenuHdl, void*, EMPTYARG )
{
- ::std::vector< USHORT > aExecVector( ImplGetExecuteVector() );
+ ::std::vector< sal_uInt16 > aExecVector( ImplGetExecuteVector() );
if( aExecVector.size() )
{
@@ -696,7 +696,7 @@ IMPL_LINK( GalleryBrowser1, ClickNewThemeHdl, void*, EMPTYARG )
{
String aNewTheme( GAL_RESID( RID_SVXSTR_GALLERY_NEWTHEME ) );
String aName( aNewTheme );
- ULONG nCount = 0;
+ sal_uIntPtr nCount = 0;
while( mpGallery->HasTheme( aName ) && ( nCount++ < 16000 ) )
{
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 2903dcabef59..d05187d4c856 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -99,10 +99,10 @@ private:
Image aImgImported;
void ImplAdjustControls();
- ULONG ImplInsertThemeEntry( const GalleryThemeEntry* pEntry );
+ sal_uIntPtr ImplInsertThemeEntry( const GalleryThemeEntry* pEntry );
void ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData );
- ::std::vector< USHORT > ImplGetExecuteVector();
- void ImplExecute( USHORT nId );
+ ::std::vector< sal_uInt16 > ImplGetExecuteVector();
+ void ImplExecute( sal_uInt16 nId );
void ImplGalleryThemeProperties( const String & rThemeName, bool bCreateNew );
void ImplEndGalleryThemeProperties( VclAbstractDialog2* pDialog, bool bCreateNew );
@@ -127,9 +127,9 @@ public:
~GalleryBrowser1();
void SelectTheme( const String& rThemeName ) { mpThemes->SelectEntry( rThemeName ); SelectThemeHdl( NULL ); }
- void SelectTheme( ULONG nThemePos ) { mpThemes->SelectEntryPos( (USHORT) nThemePos ); SelectThemeHdl( NULL ); }
+ void SelectTheme( sal_uIntPtr nThemePos ) { mpThemes->SelectEntryPos( (sal_uInt16) nThemePos ); SelectThemeHdl( NULL ); }
String GetSelectedTheme() { return mpThemes->GetEntryCount() ? mpThemes->GetEntry( mpThemes->GetSelectEntryPos() ) : String(); }
void ShowContextMenu();
- BOOL KeyInput( const KeyEvent& rKEvt, Window* pWindow );
+ sal_Bool KeyInput( const KeyEvent& rKEvt, Window* pWindow );
};
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 045b52aa2e53..98e4d69ee84e 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -79,20 +79,20 @@ GalleryBrowserMode GalleryBrowser2::meInitMode = GALLERYBROWSERMODE_ICON;
class GalleryBackgroundPopup : public PopupMenu, public SfxControllerItem
{
const GalleryTheme* mpTheme;
- ULONG mnObjectPos;
+ sal_uIntPtr mnObjectPos;
virtual void Select();
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
public:
- GalleryBackgroundPopup( const GalleryTheme* pTheme, ULONG nObjectPos );
+ GalleryBackgroundPopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos );
~GalleryBackgroundPopup();
};
// ------------------------------------------------------------------------
-GalleryBackgroundPopup::GalleryBackgroundPopup( const GalleryTheme* pTheme, ULONG nObjectPos ) :
+GalleryBackgroundPopup::GalleryBackgroundPopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos ) :
SfxControllerItem ( SID_GALLERY_BG_BRUSH, SfxViewFrame::Current()->GetBindings() ),
mpTheme ( pTheme ),
mnObjectPos ( nObjectPos )
@@ -109,7 +109,7 @@ GalleryBackgroundPopup::~GalleryBackgroundPopup()
// ------------------------------------------------------------------------
-void GalleryBackgroundPopup::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pItem )
+void GalleryBackgroundPopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pItem )
{
if ( ( nSID == SID_GALLERY_BG_BRUSH ) && pItem && ( eState != SFX_ITEM_DISABLED ) )
{
@@ -123,8 +123,8 @@ void GalleryBackgroundPopup::StateChanged( USHORT nSID, SfxItemState eState, con
List* pList = pStrLstItem->GetList();
if( pList )
- for ( ULONG i = 0, nCount = pList->Count(); i < nCount; i++ )
- InsertItem( (USHORT) i + 1, *(String*) pList->GetObject( i ) );
+ for ( sal_uIntPtr i = 0, nCount = pList->Count(); i < nCount; i++ )
+ InsertItem( (sal_uInt16) i + 1, *(String*) pList->GetObject( i ) );
}
else if( ( pStrItem = PTR_CAST( SfxStringItem, pItem ) ) != NULL )
InsertItem( 1, pStrItem->GetValue() );
@@ -159,20 +159,20 @@ class GalleryThemePopup : public PopupMenu, public SfxControllerItem
{
GalleryBackgroundPopup maBackgroundPopup;
const GalleryTheme* mpTheme;
- ULONG mnObjectPos;
- BOOL mbPreview;
+ sal_uIntPtr mnObjectPos;
+ sal_Bool mbPreview;
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
public:
- GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectPos, BOOL bPreview );
+ GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, sal_Bool bPreview );
~GalleryThemePopup();
};
// ------------------------------------------------------------------------
-GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectPos, BOOL bPreview ) :
+GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, sal_Bool bPreview ) :
PopupMenu ( GAL_RESID( RID_SVXMN_GALLERY2 ) ),
SfxControllerItem ( SID_GALLERY_ENABLE_ADDCOPY, SfxViewFrame::Current()->GetBindings() ),
maBackgroundPopup ( pTheme, nObjectPos ),
@@ -186,7 +186,7 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP
INetURLObject aURL;
const_cast< GalleryTheme* >( mpTheme )->GetURL( mnObjectPos, aURL );
- const BOOL bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
+ const sal_Bool bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
pAddMenu->EnableItem( MN_ADD, bValidURL && SGA_OBJ_SOUND != eObjKind );
pAddMenu->EnableItem( MN_ADD_LINK, bValidURL && SGA_OBJ_SVDRAW != eObjKind );
@@ -198,28 +198,28 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP
if( mpTheme->IsReadOnly() || !mpTheme->GetObjectCount() )
{
- EnableItem( MN_DELETE, FALSE );
- EnableItem( MN_TITLE, FALSE );
+ EnableItem( MN_DELETE, sal_False );
+ EnableItem( MN_TITLE, sal_False );
if( mpTheme->IsReadOnly() )
- EnableItem( MN_PASTECLIPBOARD, FALSE );
+ EnableItem( MN_PASTECLIPBOARD, sal_False );
if( !mpTheme->GetObjectCount() )
- EnableItem( MN_COPYCLIPBOARD, FALSE );
+ EnableItem( MN_COPYCLIPBOARD, sal_False );
}
else
{
EnableItem( MN_DELETE, !bPreview );
- EnableItem( MN_TITLE, TRUE );
- EnableItem( MN_COPYCLIPBOARD, TRUE );
- EnableItem( MN_PASTECLIPBOARD, TRUE );
+ EnableItem( MN_TITLE, sal_True );
+ EnableItem( MN_COPYCLIPBOARD, sal_True );
+ EnableItem( MN_PASTECLIPBOARD, sal_True );
}
#ifdef GALLERY_USE_CLIPBOARD
if( IsItemEnabled( MN_PASTECLIPBOARD ) )
{
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( this ) );
- BOOL bEnable = FALSE;
+ sal_Bool bEnable = sal_False;
if( aDataHelper.GetFormatCount() )
{
@@ -230,23 +230,23 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP
aDataHelper.HasFormat( FORMAT_GDIMETAFILE ) ||
aDataHelper.HasFormat( FORMAT_BITMAP ) )
{
- bEnable = TRUE;
+ bEnable = sal_True;
}
}
if( !bEnable )
- EnableItem( MN_PASTECLIPBOARD, FALSE );
+ EnableItem( MN_PASTECLIPBOARD, sal_False );
}
#else
- EnableItem( MN_COPYCLIPBOARD, FALSE );
- EnableItem( MN_PASTECLIPBOARD, FALSE );
+ EnableItem( MN_COPYCLIPBOARD, sal_False );
+ EnableItem( MN_PASTECLIPBOARD, sal_False );
#endif
if( !maBackgroundPopup.GetItemCount() || ( eObjKind == SGA_OBJ_SVDRAW ) || ( eObjKind == SGA_OBJ_SOUND ) )
- pAddMenu->EnableItem( MN_BACKGROUND, FALSE );
+ pAddMenu->EnableItem( MN_BACKGROUND, sal_False );
else
{
- pAddMenu->EnableItem( MN_BACKGROUND, TRUE );
+ pAddMenu->EnableItem( MN_BACKGROUND, sal_True );
pAddMenu->SetPopupMenu( MN_BACKGROUND, &maBackgroundPopup );
}
@@ -262,7 +262,7 @@ GalleryThemePopup::~GalleryThemePopup()
// ------------------------------------------------------------------------
-void GalleryThemePopup::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pItem )
+void GalleryThemePopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pItem )
{
if( ( nSID == SID_GALLERY_ENABLE_ADDCOPY ) && pItem && ( eState != SFX_ITEM_DISABLED ) )
{
@@ -315,7 +315,7 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId,
mnCurActionPos ( 0xffffffff ),
meMode ( GALLERYBROWSERMODE_NONE ),
meLastMode ( GALLERYBROWSERMODE_NONE ),
- mbCurActionIsLinkage( FALSE )
+ mbCurActionIsLinkage( sal_False )
{
Image aDummyImage;
const Link aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) );
@@ -439,7 +439,7 @@ void GalleryBrowser2::Notify( SfxBroadcaster&, const SfxHint& rHint )
if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
SetMode( meLastMode );
- ImplUpdateViews( (USHORT) rGalleryHint.GetData1() + 1 );
+ ImplUpdateViews( (sal_uInt16) rGalleryHint.GetData1() + 1 );
}
break;
@@ -484,8 +484,8 @@ sal_Int8 GalleryBrowser2::ExecuteDrop( DropTargetHelper&, const ExecuteDropEvent
if( mpCurTheme )
{
Point aSelPos;
- const ULONG nItemId = ImplGetSelectedItemId( &rEvt.maPosPixel, aSelPos );
- const ULONG nInsertPos = ( nItemId ? ( nItemId - 1 ) : LIST_APPEND );
+ const sal_uIntPtr nItemId = ImplGetSelectedItemId( &rEvt.maPosPixel, aSelPos );
+ const sal_uIntPtr nInsertPos = ( nItemId ? ( nItemId - 1 ) : LIST_APPEND );
if( mpCurTheme->IsDragging() )
mpCurTheme->ChangeObjectPos( mpCurTheme->GetDragPos(), nInsertPos );
@@ -503,7 +503,7 @@ void GalleryBrowser2::StartDrag( Window*, const Point* pDragPoint )
if( mpCurTheme )
{
Point aSelPos;
- const ULONG nItemId = ImplGetSelectedItemId( pDragPoint, aSelPos );
+ const sal_uIntPtr nItemId = ImplGetSelectedItemId( pDragPoint, aSelPos );
if( nItemId )
mpCurTheme->StartDrag( this, nItemId - 1 );
@@ -523,7 +523,7 @@ void GalleryBrowser2::TogglePreview( Window*, const Point* )
void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint )
{
Point aSelPos;
- const ULONG nItemId = ImplGetSelectedItemId( pContextPoint, aSelPos );
+ const sal_uIntPtr nItemId = ImplGetSelectedItemId( pContextPoint, aSelPos );
if( mpCurTheme && nItemId && ( nItemId <= mpCurTheme->GetObjectCount() ) )
{
@@ -544,31 +544,31 @@ void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint )
// -----------------------------------------------------------------------------
-BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
+sal_Bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
{
Point aSelPos;
- const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos );
- BOOL bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow );
+ const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+ sal_Bool bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow );
if( !bRet && !maViewBox.HasFocus() && nItemId && mpCurTheme )
{
- USHORT nExecuteId = 0;
+ sal_uInt16 nExecuteId = 0;
const SgaObjKind eObjKind = mpCurTheme->GetObjectKind( nItemId - 1 );
INetURLObject aURL;
const_cast< GalleryTheme* >( mpCurTheme )->GetURL( nItemId - 1, aURL );
- const BOOL bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
- BOOL bPreview = bValidURL;
- BOOL bAdd = bValidURL;
- BOOL bAddLink = ( bValidURL && SGA_OBJ_SVDRAW != eObjKind );
- BOOL bDelete = FALSE;
- BOOL bTitle = FALSE;
+ const sal_Bool bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID );
+ sal_Bool bPreview = bValidURL;
+ sal_Bool bAdd = bValidURL;
+ sal_Bool bAddLink = ( bValidURL && SGA_OBJ_SVDRAW != eObjKind );
+ sal_Bool bDelete = sal_False;
+ sal_Bool bTitle = sal_False;
if( !mpCurTheme->IsReadOnly() && mpCurTheme->GetObjectCount() )
{
bDelete = ( GALLERYBROWSERMODE_PREVIEW != GetMode() );
- bTitle = TRUE;
+ bTitle = sal_True;
}
switch( rKEvt.GetKeyCode().GetCode() )
@@ -580,7 +580,7 @@ BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
if( bPreview )
{
TogglePreview( pWindow );
- bRet = TRUE;
+ bRet = sal_True;
}
}
break;
@@ -617,7 +617,7 @@ BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow )
if( nExecuteId )
{
ImplExecute( nExecuteId );
- bRet = TRUE;
+ bRet = sal_True;
}
}
@@ -652,9 +652,9 @@ void GalleryBrowser2::SelectTheme( const String& rThemeName )
Resize();
ImplUpdateViews( 1 );
- maViewBox.EnableItem( TBX_ID_ICON, TRUE );
- maViewBox.EnableItem( TBX_ID_LIST, TRUE );
- maViewBox.CheckItem( ( GALLERYBROWSERMODE_ICON == GetMode() ) ? TBX_ID_ICON : TBX_ID_LIST, TRUE );
+ maViewBox.EnableItem( TBX_ID_ICON, sal_True );
+ maViewBox.EnableItem( TBX_ID_LIST, sal_True );
+ maViewBox.CheckItem( ( GALLERYBROWSERMODE_ICON == GetMode() ) ? TBX_ID_ICON : TBX_ID_LIST, sal_True );
}
// -----------------------------------------------------------------------------
@@ -677,11 +677,11 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
mpIconView->Show();
- maViewBox.EnableItem( TBX_ID_ICON, TRUE );
- maViewBox.EnableItem( TBX_ID_LIST, TRUE );
+ maViewBox.EnableItem( TBX_ID_ICON, sal_True );
+ maViewBox.EnableItem( TBX_ID_LIST, sal_True );
- maViewBox.CheckItem( TBX_ID_ICON, TRUE );
- maViewBox.CheckItem( TBX_ID_LIST, FALSE );
+ maViewBox.CheckItem( TBX_ID_ICON, sal_True );
+ maViewBox.CheckItem( TBX_ID_LIST, sal_False );
}
break;
@@ -695,11 +695,11 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
mpListView->Show();
- maViewBox.EnableItem( TBX_ID_ICON, TRUE );
- maViewBox.EnableItem( TBX_ID_LIST, TRUE );
+ maViewBox.EnableItem( TBX_ID_ICON, sal_True );
+ maViewBox.EnableItem( TBX_ID_LIST, sal_True );
- maViewBox.CheckItem( TBX_ID_ICON, FALSE );
- maViewBox.CheckItem( TBX_ID_LIST, TRUE );
+ maViewBox.CheckItem( TBX_ID_ICON, sal_False );
+ maViewBox.CheckItem( TBX_ID_LIST, sal_True );
}
break;
@@ -707,11 +707,11 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
{
Graphic aGraphic;
Point aSelPos;
- const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+ const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos );
if( nItemId )
{
- const ULONG nPos = nItemId - 1;
+ const sal_uIntPtr nPos = nItemId - 1;
mpIconView->Hide();
mpListView->Hide();
@@ -725,8 +725,8 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode )
if( mpCurTheme && mpCurTheme->GetObjectKind( nPos ) == SGA_OBJ_SOUND )
mpPreview->PreviewMedia( mpCurTheme->GetObjectURL( nPos ) );
- maViewBox.EnableItem( TBX_ID_ICON, FALSE );
- maViewBox.EnableItem( TBX_ID_LIST, FALSE );
+ maViewBox.EnableItem( TBX_ID_ICON, sal_False );
+ maViewBox.EnableItem( TBX_ID_LIST, sal_False );
}
}
break;
@@ -765,11 +765,11 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel )
if( mpCurTheme )
{
Point aSelPos;
- const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+ const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos );
if( nItemId )
{
- ULONG nNewItemId = nItemId;
+ sal_uIntPtr nNewItemId = nItemId;
switch( eTravel )
{
@@ -794,7 +794,7 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel )
if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
{
Graphic aGraphic;
- const ULONG nPos = nNewItemId - 1;
+ const sal_uIntPtr nPos = nNewItemId - 1;
mpCurTheme->GetGraphic( nPos, aGraphic );
mpPreview->SetGraphic( aGraphic );
@@ -811,7 +811,7 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel )
// -----------------------------------------------------------------------------
-void GalleryBrowser2::ImplUpdateViews( USHORT nSelectionId )
+void GalleryBrowser2::ImplUpdateViews( sal_uInt16 nSelectionId )
{
mpIconView->Hide();
mpListView->Hide();
@@ -822,10 +822,10 @@ void GalleryBrowser2::ImplUpdateViews( USHORT nSelectionId )
if( mpCurTheme )
{
- for( ULONG i = 0, nCount = mpCurTheme->GetObjectCount(); i < nCount; )
+ for( sal_uIntPtr i = 0, nCount = mpCurTheme->GetObjectCount(); i < nCount; )
{
mpListView->RowInserted( i++ );
- mpIconView->InsertItem( (USHORT) i );
+ mpIconView->InsertItem( (sal_uInt16) i );
}
ImplSelectItemId( ( ( nSelectionId > mpCurTheme->GetObjectCount() ) ? mpCurTheme->GetObjectCount() : nSelectionId ) );
@@ -853,11 +853,11 @@ void GalleryBrowser2::ImplUpdateInfoBar()
if( mpCurTheme )
{
Point aSelPos;
- const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+ const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos );
if( nItemId )
{
- const ULONG nPos = nItemId - 1;
+ const sal_uIntPtr nPos = nItemId - 1;
aInfoText = mpCurTheme->GetName();
@@ -879,10 +879,10 @@ void GalleryBrowser2::ImplUpdateInfoBar()
// -----------------------------------------------------------------------------
-ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelPos )
+sal_uIntPtr GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelPos )
{
const Size aOutputSizePixel( GetOutputSizePixel() );
- ULONG nRet = 0;
+ sal_uIntPtr nRet = 0;
if( GALLERYBROWSERMODE_PREVIEW == GetMode() )
{
@@ -903,7 +903,7 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP
else
{
nRet = mpIconView->GetSelectItemId();
- rSelPos = mpIconView->GetItemRect( (USHORT) nRet ).Center();
+ rSelPos = mpIconView->GetItemRect( (sal_uInt16) nRet ).Center();
}
}
else
@@ -916,7 +916,7 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP
else
{
nRet = mpListView->FirstSelectedRow() + 1;
- rSelPos = mpListView->GetFieldRectPixel( (USHORT) nRet, 1 ).Center();
+ rSelPos = mpListView->GetFieldRectPixel( (sal_uInt16) nRet, 1 ).Center();
}
}
@@ -933,22 +933,22 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP
// -----------------------------------------------------------------------------
-void GalleryBrowser2::ImplSelectItemId( ULONG nItemId )
+void GalleryBrowser2::ImplSelectItemId( sal_uIntPtr nItemId )
{
if( nItemId )
{
- mpIconView->SelectItem( (USHORT) nItemId );
+ mpIconView->SelectItem( (sal_uInt16) nItemId );
mpListView->SelectRow( nItemId - 1 );
}
}
// -----------------------------------------------------------------------------
-void GalleryBrowser2::ImplExecute( USHORT nId )
+void GalleryBrowser2::ImplExecute( sal_uInt16 nId )
{
Point aSelPos;
- const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos );
+ const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos );
if( mpCurTheme && nItemId )
{
@@ -1074,7 +1074,7 @@ void GalleryBrowser2::ImplExecute( USHORT nId )
// -----------------------------------------------------------------------------
-String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, ULONG nItemTextFlags )
+String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, sal_uIntPtr nItemTextFlags )
{
INetURLObject aURL;
String aRet;
@@ -1177,9 +1177,9 @@ Graphic GalleryBrowser2::GetGraphic() const
// -----------------------------------------------------------------------------
-BOOL GalleryBrowser2::GetVCDrawModel( FmFormModel& rModel ) const
+sal_Bool GalleryBrowser2::GetVCDrawModel( FmFormModel& rModel ) const
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( mpCurTheme && mnCurActionPos != 0xffffffff )
bRet = mpCurTheme->GetModel( mnCurActionPos, rModel );
@@ -1189,7 +1189,7 @@ BOOL GalleryBrowser2::GetVCDrawModel( FmFormModel& rModel ) const
// -----------------------------------------------------------------------------
-BOOL GalleryBrowser2::IsLinkage() const
+sal_Bool GalleryBrowser2::IsLinkage() const
{
return mbCurActionIsLinkage;
}
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index d6817134fefb..6dca7b050e01 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -126,11 +126,11 @@ void GalleryPreview::DataChanged( const DataChangedEvent& rDCEvt )
// ------------------------------------------------------------------------
-BOOL GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
+sal_Bool GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const
{
const Size aWinSize( GetOutputSizePixel() );
Size aNewSize( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( aNewSize.Width() && aNewSize.Height() )
{
@@ -153,7 +153,7 @@ BOOL GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangl
( aWinSize.Height() - aNewSize.Height() ) >> 1 );
rResultRect = Rectangle( aNewPos, aNewSize );
- bRet = TRUE;
+ bRet = sal_True;
}
return bRet;
@@ -307,7 +307,7 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme
DragSourceHelper( this ),
mpTheme ( pTheme )
{
- EnableFullItemMode( FALSE );
+ EnableFullItemMode( sal_False );
SetHelpId( HID_GALLERY_WINDOW );
InitSettings();
@@ -346,7 +346,7 @@ void GalleryIconView::DataChanged( const DataChangedEvent& rDCEvt )
void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt )
{
- const USHORT nId = rUDEvt.GetItemId();
+ const sal_uInt16 nId = rUDEvt.GetItemId();
if( nId && mpTheme )
{
@@ -457,7 +457,7 @@ sal_Int8 GalleryIconView::ExecuteDrop( const ExecuteDropEvent& rEvt )
void GalleryIconView::StartDrag( sal_Int8, const Point& )
{
- const CommandEvent aEvt( GetPointerPosPixel(), COMMAND_STARTDRAG, TRUE );
+ const CommandEvent aEvt( GetPointerPosPixel(), COMMAND_STARTDRAG, sal_True );
Region aRegion;
// call this to initiate dragging for ValueSet
@@ -473,7 +473,7 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme
BrowseBox( pParent, WB_TABSTOP | WB_3DLOOK | WB_BORDER ),
mpTheme( pTheme ),
mnCurRow( 0 ),
- mbInit( FALSE )
+ mbInit( sal_False )
{
SetHelpId( HID_GALLERY_WINDOW );
@@ -512,15 +512,15 @@ void GalleryListView::DataChanged( const DataChangedEvent& rDCEvt )
// ------------------------------------------------------------------------
-BOOL GalleryListView::SeekRow( long nRow )
+sal_Bool GalleryListView::SeekRow( long nRow )
{
mnCurRow = nRow;
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------------
-String GalleryListView::GetCellText(long _nRow, USHORT nColumnId) const
+String GalleryListView::GetCellText(long _nRow, sal_uInt16 nColumnId) const
{
String sRet;
if( mpTheme && ( _nRow < static_cast< long >( mpTheme->GetObjectCount() ) ) )
@@ -548,7 +548,7 @@ Rectangle GalleryListView::GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nC
if ( SeekRow(_nRow) )
{
SvxFont aFont( GetFont() );
- AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<USHORT>( GetColumnId( sal::static_int_cast<USHORT>(_nColumnPos) ) ) ) );
+ AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<sal_uInt16>( GetColumnId( sal::static_int_cast<sal_uInt16>(_nColumnPos) ) ) ) );
// get the bounds inside the string
aStringWrap.GetCharacterBounds(nIndex, aRect);
@@ -567,7 +567,7 @@ sal_Int32 GalleryListView::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColu
if ( SeekRow(_nRow) )
{
SvxFont aFont( GetFont() );
- AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<USHORT>(GetColumnId(sal::static_int_cast<USHORT>(_nColumnPos)))) );
+ AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<sal_uInt16>(GetColumnId(sal::static_int_cast<sal_uInt16>(_nColumnPos)))) );
nRet = aStringWrap.GetIndexAtPoint(_rPoint);
}
return nRet;
@@ -575,7 +575,7 @@ sal_Int32 GalleryListView::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColu
// ------------------------------------------------------------------------
-void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const
+void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const
{
rDev.Push( PUSH_CLIPREGION );
rDev.IntersectClipRegion( rRect );
diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx
index cad6780f11f7..84f62fc795e7 100644
--- a/svx/source/gallery2/galexpl.cxx
+++ b/svx/source/gallery2/galexpl.cxx
@@ -94,27 +94,27 @@ Graphic GalleryExplorer::GetGraphic() const
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::GetVCDrawModel( FmFormModel& rModel ) const
+sal_Bool GalleryExplorer::GetVCDrawModel( FmFormModel& rModel ) const
{
return GALLERYBROWSER()->GetVCDrawModel( rModel );
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::IsLinkage() const
+sal_Bool GalleryExplorer::IsLinkage() const
{
return GALLERYBROWSER()->IsLinkage();
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::FillThemeList( List& rThemeList )
+sal_Bool GalleryExplorer::FillThemeList( List& rThemeList )
{
Gallery* pGal = ImplGetGallery();
if( pGal )
{
- for( ULONG i = 0, nCount = pGal->GetThemeCount(); i < nCount; i++ )
+ for( sal_uIntPtr i = 0, nCount = pGal->GetThemeCount(); i < nCount; i++ )
{
const GalleryThemeEntry* pEntry = pGal->GetThemeInfo( i );
@@ -128,7 +128,7 @@ BOOL GalleryExplorer::FillThemeList( List& rThemeList )
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
+sal_Bool GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
{
Gallery* pGal = ImplGetGallery();
@@ -139,7 +139,7 @@ BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
if( pTheme )
{
- for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
+ for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
rObjList.Insert( new String( pTheme->GetObjectURL( i ).GetMainURL( INetURLObject::NO_DECODE ) ), LIST_APPEND );
pGal->ReleaseTheme( pTheme, aListener );
@@ -151,10 +151,10 @@ BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList )
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::FillObjList( ULONG nThemeId, List& rObjList )
+sal_Bool GalleryExplorer::FillObjList( sal_uIntPtr nThemeId, List& rObjList )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? FillObjList( pGal->GetThemeName( nThemeId ), rObjList ) : FALSE );
+ return( pGal ? FillObjList( pGal->GetThemeName( nThemeId ), rObjList ) : sal_False );
}
// ------------------------------------------------------------------------
@@ -169,7 +169,7 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect
if( pTheme )
{
- for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
+ for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
{
SgaObject* pObj = pTheme->AcquireObject( i );
if ( pObj )
@@ -187,24 +187,24 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL )
+sal_Bool GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL )
{
return InsertURL( rThemeName, rURL, SGA_FORMAT_ALL );
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertURL( ULONG nThemeId, const String& rURL )
+sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const String& rURL )
{
return InsertURL( nThemeId, rURL, SGA_FORMAT_ALL );
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, const ULONG )
+sal_Bool GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, const sal_uIntPtr )
{
Gallery* pGal = ImplGetGallery();
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pGal )
{
@@ -225,18 +225,18 @@ BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, c
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertURL( ULONG nThemeId, const String& rURL, const ULONG nSgaFormat )
+sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const String& rURL, const sal_uIntPtr nSgaFormat )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? InsertURL( pGal->GetThemeName( nThemeId ), rURL, nSgaFormat ) : FALSE );
+ return( pGal ? InsertURL( pGal->GetThemeName( nThemeId ), rURL, nSgaFormat ) : sal_False );
}
// ------------------------------------------------------------------------
-ULONG GalleryExplorer::GetObjCount( const String& rThemeName )
+sal_uIntPtr GalleryExplorer::GetObjCount( const String& rThemeName )
{
Gallery* pGal = ImplGetGallery();
- ULONG nRet = 0;
+ sal_uIntPtr nRet = 0;
if( pGal )
{
@@ -255,20 +255,20 @@ ULONG GalleryExplorer::GetObjCount( const String& rThemeName )
// ------------------------------------------------------------------------
-ULONG GalleryExplorer::GetObjCount( ULONG nThemeId )
+sal_uIntPtr GalleryExplorer::GetObjCount( sal_uIntPtr nThemeId )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? GetObjCount( pGal->GetThemeName( nThemeId ) ) : FALSE );
+ return( pGal ? GetObjCount( pGal->GetThemeName( nThemeId ) ) : sal_False );
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::GetGraphicObj( const String& rThemeName, ULONG nPos,
+sal_Bool GalleryExplorer::GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos,
Graphic* pGraphic, Bitmap* pThumb,
- BOOL bProgress )
+ sal_Bool bProgress )
{
Gallery* pGal = ImplGetGallery();
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pGal )
{
@@ -292,20 +292,20 @@ BOOL GalleryExplorer::GetGraphicObj( const String& rThemeName, ULONG nPos,
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::GetGraphicObj( ULONG nThemeId, ULONG nPos,
+sal_Bool GalleryExplorer::GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos,
Graphic* pGraphic, Bitmap* pThumb,
- BOOL bProgress )
+ sal_Bool bProgress )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, pThumb, bProgress ) : FALSE );
+ return( pGal ? GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, pThumb, bProgress ) : sal_False );
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic )
+sal_Bool GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic )
{
Gallery* pGal = ImplGetGallery();
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pGal )
{
@@ -324,18 +324,18 @@ BOOL GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic&
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertGraphicObj( ULONG nThemeId, const Graphic& rGraphic )
+sal_Bool GalleryExplorer::InsertGraphicObj( sal_uIntPtr nThemeId, const Graphic& rGraphic )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? InsertGraphicObj( pGal->GetThemeName( nThemeId ), rGraphic ) : FALSE );
+ return( pGal ? InsertGraphicObj( pGal->GetThemeName( nThemeId ), rGraphic ) : sal_False );
}
// ------------------------------------------------------------------------
-ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName )
+sal_uIntPtr GalleryExplorer::GetSdrObjCount( const String& rThemeName )
{
Gallery* pGal = ImplGetGallery();
- ULONG nRet = 0;
+ sal_uIntPtr nRet = 0;
if( pGal )
{
@@ -344,7 +344,7 @@ ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName )
if( pTheme )
{
- for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
+ for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ )
if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) )
nRet++;
@@ -357,19 +357,19 @@ ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName )
// ------------------------------------------------------------------------
-ULONG GalleryExplorer::GetSdrObjCount( ULONG nThemeId )
+sal_uIntPtr GalleryExplorer::GetSdrObjCount( sal_uIntPtr nThemeId )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : FALSE );
+ return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : sal_False );
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
+sal_Bool GalleryExplorer::GetSdrObj( const String& rThemeName, sal_uIntPtr nSdrModelPos,
SdrModel* pModel, Bitmap* pThumb )
{
Gallery* pGal = ImplGetGallery();
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pGal )
{
@@ -378,14 +378,14 @@ BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
if( pTheme )
{
- for( ULONG i = 0, nCount = pTheme->GetObjectCount(), nActPos = 0; ( i < nCount ) && !bRet; i++ )
+ for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(), nActPos = 0; ( i < nCount ) && !bRet; i++ )
{
if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) )
{
if( nActPos++ == nSdrModelPos )
{
if( pModel )
- bRet = bRet || pTheme->GetModel( i, *pModel, FALSE );
+ bRet = bRet || pTheme->GetModel( i, *pModel, sal_False );
if( pThumb )
bRet = bRet || pTheme->GetThumb( i, *pThumb );
@@ -402,19 +402,19 @@ BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos,
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::GetSdrObj( ULONG nThemeId, ULONG nSdrModelPos,
+sal_Bool GalleryExplorer::GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos,
SdrModel* pModel, Bitmap* pThumb )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos, pModel, pThumb ) : FALSE );
+ return( pGal ? GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos, pModel, pThumb ) : sal_False );
}
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rModel )
+sal_Bool GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rModel )
{
Gallery* pGal = ImplGetGallery();
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pGal )
{
@@ -433,18 +433,18 @@ BOOL GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rMode
// ------------------------------------------------------------------------
-BOOL GalleryExplorer::InsertSdrObj( ULONG nThemeId, FmFormModel& rModel )
+sal_Bool GalleryExplorer::InsertSdrObj( sal_uIntPtr nThemeId, FmFormModel& rModel )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? InsertSdrObj( pGal->GetThemeName( nThemeId ), rModel ) : FALSE );
+ return( pGal ? InsertSdrObj( pGal->GetThemeName( nThemeId ), rModel ) : sal_False );
}
// -----------------------------------------------------------------------------
-BOOL GalleryExplorer::BeginLocking( const String& rThemeName )
+sal_Bool GalleryExplorer::BeginLocking( const String& rThemeName )
{
Gallery* pGal = ImplGetGallery();
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pGal )
{
@@ -453,7 +453,7 @@ BOOL GalleryExplorer::BeginLocking( const String& rThemeName )
if( pTheme )
{
pTheme->LockTheme();
- bRet = TRUE;
+ bRet = sal_True;
}
}
@@ -462,18 +462,18 @@ BOOL GalleryExplorer::BeginLocking( const String& rThemeName )
// -----------------------------------------------------------------------------
-BOOL GalleryExplorer::BeginLocking( ULONG nThemeId )
+sal_Bool GalleryExplorer::BeginLocking( sal_uIntPtr nThemeId )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? BeginLocking( pGal->GetThemeName( nThemeId ) ) : FALSE );
+ return( pGal ? BeginLocking( pGal->GetThemeName( nThemeId ) ) : sal_False );
}
// -----------------------------------------------------------------------------
-BOOL GalleryExplorer::EndLocking( const String& rThemeName )
+sal_Bool GalleryExplorer::EndLocking( const String& rThemeName )
{
Gallery* pGal = ImplGetGallery();
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pGal )
{
@@ -482,7 +482,7 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName )
if( pTheme )
{
- const BOOL bReleaseLockedTheme = pTheme->UnlockTheme();
+ const sal_Bool bReleaseLockedTheme = pTheme->UnlockTheme();
// release acquired theme
pGal->ReleaseTheme( pTheme, aListener );
@@ -491,7 +491,7 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName )
{
// release locked theme
pGal->ReleaseTheme( pTheme, aLockListener );
- bRet = TRUE;
+ bRet = sal_True;
}
}
}
@@ -501,15 +501,15 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName )
// -----------------------------------------------------------------------------
-BOOL GalleryExplorer::EndLocking( ULONG nThemeId )
+sal_Bool GalleryExplorer::EndLocking( sal_uIntPtr nThemeId )
{
Gallery* pGal = ImplGetGallery();
- return( pGal ? EndLocking( pGal->GetThemeName( nThemeId ) ) : FALSE );
+ return( pGal ? EndLocking( pGal->GetThemeName( nThemeId ) ) : sal_False );
}
// -----------------------------------------------------------------------------
-BOOL GalleryExplorer::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
+sal_Bool GalleryExplorer::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
{
return SgaObjectSvDraw::DrawCentered( pOut, rModel );
}
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 32ad01aca4a2..eab2546e5e91 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -57,8 +57,8 @@ using namespace ::com::sun::star;
// ---------------------
GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName,
- UINT32 _nFileNumber, BOOL _bReadOnly, BOOL _bImported,
- BOOL _bNewFile, UINT32 _nId, BOOL _bThemeNameFromResource ) :
+ sal_uInt32 _nFileNumber, sal_Bool _bReadOnly, sal_Bool _bImported,
+ sal_Bool _bNewFile, sal_uInt32 _nId, sal_Bool _bThemeNameFromResource ) :
nFileNumber ( _nFileNumber ),
nId ( _nId ),
bReadOnly ( _bReadOnly || _bImported ),
@@ -81,7 +81,7 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const Strin
SetModified( _bNewFile );
if( nId && bThemeNameFromResource )
- aName = String( GAL_RESID( RID_GALLERYSTR_THEME_START + (USHORT) nId ) );
+ aName = String( GAL_RESID( RID_GALLERYSTR_THEME_START + (sal_uInt16) nId ) );
if( !aName.Len() )
aName = rName;
@@ -93,25 +93,25 @@ INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL
{
INetURLObject aURL( rURL );
String aFileName;
- BOOL bExists = FALSE;
+ sal_Bool bExists = sal_False;
// check original file name
if( FileExists( aURL ) )
- bExists = TRUE;
+ bExists = sal_True;
else
{
// check upper case file name
aURL.setName( aURL.getName().toAsciiUpperCase() );
if( FileExists( aURL ) )
- bExists = TRUE;
+ bExists = sal_True;
else
{
// check lower case file name
aURL.setName( aURL.getName().toAsciiLowerCase() );
if( FileExists( aURL ) )
- bExists = TRUE;
+ bExists = sal_True;
}
}
@@ -125,17 +125,17 @@ void GalleryThemeEntry::SetName( const String& rNewName )
if( aName != rNewName )
{
aName = rNewName;
- SetModified( TRUE );
- bThemeNameFromResource = FALSE;
+ SetModified( sal_True );
+ bThemeNameFromResource = sal_False;
}
}
// -----------------------------------------------------------------------------
-void GalleryThemeEntry::SetId( UINT32 nNewId, BOOL bResetThemeName )
+void GalleryThemeEntry::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName )
{
nId = nNewId;
- SetModified( TRUE );
+ SetModified( sal_True );
bThemeNameFromResource = ( nId && bResetThemeName );
}
@@ -199,7 +199,7 @@ public:
Gallery::Gallery( const String& rMultiPath )
: nReadTextEncoding ( gsl_getSystemTextEncoding() )
, nLastFileNumber ( 0 )
-, bMultiPath ( FALSE )
+, bMultiPath ( sal_False )
{
ImplLoad( rMultiPath );
}
@@ -239,7 +239,7 @@ Gallery* Gallery::GetGalleryInstance()
void Gallery::ImplLoad( const String& rMultiPath )
{
- const USHORT nTokenCount = rMultiPath.GetTokenCount( ';' );
+ const sal_uInt16 nTokenCount = rMultiPath.GetTokenCount( ';' );
sal_Bool bIsReadOnlyDir;
bMultiPath = ( nTokenCount > 0 );
@@ -254,7 +254,7 @@ void Gallery::ImplLoad( const String& rMultiPath )
{
aRelURL = INetURLObject( rMultiPath.GetToken( 0, ';' ) );
- for( USHORT i = 0UL; i < nTokenCount; i++ )
+ for( sal_uInt16 i = 0UL; i < nTokenCount; i++ )
{
aCurURL = INetURLObject(rMultiPath.GetToken( i, ';' ));
@@ -430,7 +430,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR
if( pEntry )
{
- const ULONG nFileNumber = (ULONG) String(aThmURL.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32();
+ const sal_uIntPtr nFileNumber = (sal_uIntPtr) String(aThmURL.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32();
aThemeList.Insert( pEntry, LIST_APPEND );
@@ -481,11 +481,11 @@ void Gallery::ImplLoadImports()
GalleryThemeEntry* pThemeEntry;
GalleryImportThemeEntry* pImportEntry;
INetURLObject aFile;
- UINT32 nInventor;
- UINT32 nCount;
- UINT16 nId;
- UINT16 i;
- UINT16 nTempCharSet;
+ sal_uInt32 nInventor;
+ sal_uInt32 nCount;
+ sal_uInt16 nId;
+ sal_uInt16 i;
+ sal_uInt16 nTempCharSet;
for( pImportEntry = aImportList.First(); pImportEntry; pImportEntry = aImportList.Next() )
delete pImportEntry;
@@ -507,7 +507,7 @@ void Gallery::ImplLoadImports()
pThemeEntry = new GalleryThemeEntry( aFile,
pImportEntry->aUIName,
String(aFile.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32(),
- TRUE, TRUE, FALSE, 0, FALSE );
+ sal_True, sal_True, sal_False, 0, sal_False );
aThemeList.Insert( pThemeEntry, LIST_APPEND );
}
@@ -528,10 +528,10 @@ void Gallery::ImplWriteImportList()
if( pOStm )
{
- const UINT32 nInventor = (UINT32) COMPAT_FORMAT( 'S', 'G', 'A', '3' );
- const UINT16 nId = 0x0004;
+ const sal_uInt32 nInventor = (sal_uInt32) COMPAT_FORMAT( 'S', 'G', 'A', '3' );
+ const sal_uInt16 nId = 0x0004;
- *pOStm << nInventor << nId << (UINT32) aImportList.Count() << (UINT16) gsl_getSystemTextEncoding();
+ *pOStm << nInventor << nId << (sal_uInt32) aImportList.Count() << (sal_uInt16) gsl_getSystemTextEncoding();
for( GalleryImportThemeEntry* pImportEntry = aImportList.First(); pImportEntry; pImportEntry = aImportList.Next() )
*pOStm << *pImportEntry;
@@ -572,11 +572,11 @@ GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const String& rImport
// ------------------------------------------------------------------------
-String Gallery::GetThemeName( ULONG nThemeId ) const
+String Gallery::GetThemeName( sal_uIntPtr nThemeId ) const
{
GalleryThemeEntry* pFound = NULL;
- for( ULONG n = 0, nCount = aThemeList.Count(); n < nCount; n++ )
+ for( sal_uIntPtr n = 0, nCount = aThemeList.Count(); n < nCount; n++ )
{
GalleryThemeEntry* pEntry = aThemeList.GetObject( n );
@@ -613,28 +613,28 @@ String Gallery::GetThemeName( ULONG nThemeId ) const
// ------------------------------------------------------------------------
-BOOL Gallery::HasTheme( const String& rThemeName )
+sal_Bool Gallery::HasTheme( const String& rThemeName )
{
return( ImplGetThemeEntry( rThemeName ) != NULL );
}
// ------------------------------------------------------------------------
-BOOL Gallery::CreateTheme( const String& rThemeName, UINT32 nNumFrom )
+sal_Bool Gallery::CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( !HasTheme( rThemeName ) && ( GetUserURL().GetProtocol() != INET_PROT_NOT_VALID ) )
{
nLastFileNumber=nNumFrom > nLastFileNumber ? nNumFrom : ++nLastFileNumber;
GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( GetUserURL(), rThemeName,
nLastFileNumber,
- FALSE, FALSE, TRUE, 0, FALSE );
+ sal_False, sal_False, sal_True, 0, sal_False );
aThemeList.Insert( pNewEntry, LIST_APPEND );
delete( new GalleryTheme( this, pNewEntry ) );
Broadcast( GalleryHint( GALLERY_HINT_THEME_CREATED, rThemeName ) );
- bRet = TRUE;
+ bRet = sal_True;
}
return bRet;
@@ -642,10 +642,10 @@ BOOL Gallery::CreateTheme( const String& rThemeName, UINT32 nNumFrom )
// ------------------------------------------------------------------------
-BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImportName )
+sal_Bool Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImportName )
{
INetURLObject aURL( rURL );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
@@ -655,8 +655,8 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
if( pIStm )
{
- ULONG nStmErr;
- UINT16 nId;
+ sal_uIntPtr nStmErr;
+ sal_uInt16 nId;
*pIStm >> nId;
@@ -668,7 +668,7 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
String aThemeName; *pIStm >> aTmpStr; aThemeName = String( aTmpStr, RTL_TEXTENCODING_UTF8 );
GalleryThemeEntry* pThemeEntry = new GalleryThemeEntry( aURL, rImportName,
String(aURL.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32(),
- TRUE, TRUE, TRUE, 0, FALSE );
+ sal_True, sal_True, sal_True, 0, sal_False );
GalleryTheme* pImportTheme = new GalleryTheme( this, pThemeEntry );
pIStm->Seek( STREAM_SEEK_TO_BEGIN );
@@ -684,7 +684,7 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
{
String aName( rImportName );
String aNewName( aName );
- ULONG nCount = 0;
+ sal_uIntPtr nCount = 0;
aName += ' ';
@@ -704,7 +704,7 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
pImportEntry->aImportName = rImportName;
aImportList.Insert( pImportEntry, LIST_APPEND );
ImplWriteImportList();
- bRet = TRUE;
+ bRet = sal_True;
}
delete pImportTheme;
@@ -719,10 +719,10 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor
// ------------------------------------------------------------------------
-BOOL Gallery::RenameTheme( const String& rOldName, const String& rNewName )
+sal_Bool Gallery::RenameTheme( const String& rOldName, const String& rNewName )
{
GalleryThemeEntry* pThemeEntry = ImplGetThemeEntry( rOldName );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
// Ueberpruefen, ob neuer Themenname schon vorhanden ist
if( pThemeEntry && !HasTheme( rNewName ) && ( !pThemeEntry->IsReadOnly() || pThemeEntry->IsImported() ) )
@@ -752,7 +752,7 @@ BOOL Gallery::RenameTheme( const String& rOldName, const String& rNewName )
Broadcast( GalleryHint( GALLERY_HINT_THEME_RENAMED, aOldName, pThm->GetName() ) );
ReleaseTheme( pThm, aListener );
- bRet = TRUE;
+ bRet = sal_True;
}
}
@@ -761,10 +761,10 @@ BOOL Gallery::RenameTheme( const String& rOldName, const String& rNewName )
// ------------------------------------------------------------------------
-BOOL Gallery::RemoveTheme( const String& rThemeName )
+sal_Bool Gallery::RemoveTheme( const String& rThemeName )
{
GalleryThemeEntry* pThemeEntry = ImplGetThemeEntry( rThemeName );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pThemeEntry && ( !pThemeEntry->IsReadOnly() || pThemeEntry->IsImported() ) )
{
@@ -802,7 +802,7 @@ BOOL Gallery::RemoveTheme( const String& rThemeName )
delete aThemeList.Remove( pThemeEntry );
Broadcast( GalleryHint( GALLERY_HINT_THEME_REMOVED, rThemeName ) );
- bRet = TRUE;
+ bRet = sal_True;
}
return bRet;
@@ -880,14 +880,14 @@ GalleryTheme* Gallery::ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry
void Gallery::ImplDeleteCachedTheme( GalleryTheme* pTheme )
{
GalleryThemeCacheEntry* pEntry;
- BOOL bDone = FALSE;
+ sal_Bool bDone = sal_False;
for( pEntry = (GalleryThemeCacheEntry*) aThemeCache.First(); pEntry && !bDone; pEntry = (GalleryThemeCacheEntry*) aThemeCache.Next() )
{
if( pTheme == pEntry->GetTheme() )
{
delete (GalleryThemeCacheEntry*) aThemeCache.Remove( pEntry );
- bDone = TRUE;
+ bDone = sal_True;
}
}
}
@@ -918,6 +918,6 @@ void Gallery::ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener )
}
}
-BOOL GalleryThemeEntry::IsDefault() const
+sal_Bool GalleryThemeEntry::IsDefault() const
{ return( ( nId > 0 ) && ( nId != ( RID_GALLERYSTR_THEME_MYTHEME - RID_GALLERYSTR_THEME_START ) ) ); }
diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx
index 835c7dc3e731..da5375423b56 100644
--- a/svx/source/gallery2/galmisc.cxx
+++ b/svx/source/gallery2/galmisc.cxx
@@ -113,11 +113,11 @@ IMPL_LINK( SgaUserDataFactory, MakeUserData, SdrObjFactory*, pObjFactory )
// - GalleryGraphicImport -
// ------------------------
-USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
- String& rFilterName, BOOL bShowProgress )
+sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
+ String& rFilterName, sal_Bool bShowProgress )
{
- USHORT nRet = SGA_IMPORT_NONE;
- SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, TRUE );
+ sal_uInt16 nRet = SGA_IMPORT_NONE;
+ SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, sal_True );
String aFilterName;
aMedium.DownLoad();
@@ -128,7 +128,7 @@ USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
{
GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter();
GalleryProgress* pProgress = bShowProgress ? new GalleryProgress( pGraphicFilter ) : NULL;
- USHORT nFormat;
+ sal_uInt16 nFormat;
if( !pGraphicFilter->ImportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) )
{
@@ -146,10 +146,10 @@ USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic,
// - GallerySvDrawImport -
// -----------------------
-BOOL GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel )
+sal_Bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel )
{
- UINT32 nVersion;
- BOOL bRet = FALSE;
+ sal_uInt32 nVersion;
+ sal_Bool bRet = sal_False;
if( GalleryCodec::IsCoded( rIStm, nVersion ) )
{
@@ -194,9 +194,9 @@ BOOL GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel )
// - CreateIMapGraphic -
// ---------------------
-BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap )
+sal_Bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if ( rModel.GetPageCount() )
{
@@ -205,10 +205,10 @@ BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap&
if ( pPage->GetObjCount() == 1 && pObj->ISA( SdrGrafObj ) )
{
- const USHORT nCount = pObj->GetUserDataCount();
+ const sal_uInt16 nCount = pObj->GetUserDataCount();
// gibt es in den User-Daten eine IMap-Information?
- for ( USHORT i = 0; i < nCount; i++ )
+ for ( sal_uInt16 i = 0; i < nCount; i++ )
{
const SdrObjUserData* pUserData = pObj->GetUserData( i );
@@ -216,7 +216,7 @@ BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap&
{
rGraphic = ( (SdrGrafObj*) pObj )->GetGraphic();
rImageMap = ( (SgaIMapInfo*) pUserData )->GetImageMap();
- bRet = TRUE;
+ bRet = sal_True;
break;
}
}
@@ -230,7 +230,7 @@ BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap&
// - GetReducedString -
// --------------------
-String GetReducedString( const INetURLObject& rURL, ULONG nMaxLen )
+String GetReducedString( const INetURLObject& rURL, sal_uIntPtr nMaxLen )
{
String aReduced( rURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) );
@@ -244,7 +244,7 @@ String GetReducedString( const INetURLObject& rURL, ULONG nMaxLen )
if( aPath.Len() > nMaxLen )
{
- aReduced = aPath.Copy( 0, (USHORT)( nMaxLen - aName.Len() - 4 ) );
+ aReduced = aPath.Copy( 0, (sal_uInt16)( nMaxLen - aName.Len() - 4 ) );
aReduced += String( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
aReduced += aDelimiter;
aReduced += aName;
@@ -273,9 +273,9 @@ String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL )
// -----------------------------------------------------------------------------
-BOOL FileExists( const INetURLObject& rURL )
+sal_Bool FileExists( const INetURLObject& rURL )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( rURL.GetProtocol() != INET_PROT_NOT_VALID )
{
@@ -303,9 +303,9 @@ BOOL FileExists( const INetURLObject& rURL )
// -----------------------------------------------------------------------------
-BOOL CreateDir( const INetURLObject& rURL )
+sal_Bool CreateDir( const INetURLObject& rURL )
{
- BOOL bRet = FileExists( rURL );
+ sal_Bool bRet = FileExists( rURL );
if( !bRet )
{
@@ -340,9 +340,9 @@ BOOL CreateDir( const INetURLObject& rURL )
// -----------------------------------------------------------------------------
-BOOL CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
+sal_Bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
try
{
@@ -351,7 +351,7 @@ BOOL CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
aDestPath.executeCommand( OUString::createFromAscii( "transfer" ),
uno::makeAny( ucb::TransferInfo( sal_False, rSrcURL.GetMainURL( INetURLObject::NO_DECODE ),
rDstURL.GetName(), ucb::NameClash::OVERWRITE ) ) );
- bRet = TRUE;
+ bRet = sal_True;
}
catch( const ucb::ContentCreationException& )
{
@@ -368,9 +368,9 @@ BOOL CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL )
// -----------------------------------------------------------------------------
-BOOL KillFile( const INetURLObject& rURL )
+sal_Bool KillFile( const INetURLObject& rURL )
{
- BOOL bRet = FileExists( rURL );
+ sal_Bool bRet = FileExists( rURL );
if( bRet )
{
@@ -381,15 +381,15 @@ BOOL KillFile( const INetURLObject& rURL )
}
catch( const ucb::ContentCreationException& )
{
- bRet = FALSE;
+ bRet = sal_False;
}
catch( const uno::RuntimeException& )
{
- bRet = FALSE;
+ bRet = sal_False;
}
catch( const uno::Exception& )
{
- bRet = FALSE;
+ bRet = sal_False;
}
}
@@ -446,17 +446,17 @@ GalleryProgress::~GalleryProgress()
// ------------------------------------------------------------------------
-void GalleryProgress::Update( ULONG nVal, ULONG nMaxVal )
+void GalleryProgress::Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal )
{
if( mxProgressBar.is() && nMaxVal )
- mxProgressBar->setValue( Min( (ULONG)( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE ), (ULONG) GALLERY_PROGRESS_RANGE ) );
+ mxProgressBar->setValue( Min( (sal_uIntPtr)( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE ), (sal_uIntPtr) GALLERY_PROGRESS_RANGE ) );
}
// -----------------------
// - GalleryTransferable -
// -----------------------
-GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, ULONG nObjectPos, bool bLazy ) :
+GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy ) :
mpTheme( pTheme ),
meObjectKind( mpTheme->GetObjectKind( nObjectPos ) ),
mnObjectPos( nObjectPos ),
@@ -626,7 +626,7 @@ sal_Bool GalleryTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pU
void GalleryTransferable::DragFinished( sal_Int8 nDropAction )
{
- mpTheme->SetDragging( FALSE );
+ mpTheme->SetDragging( sal_False );
mpTheme->SetDragPos( 0 );
if ( nDropAction )
{
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index 39aceac564ad..9ba9cff068a3 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -59,16 +59,16 @@ using namespace ::com::sun::star;
// -------------
SgaObject::SgaObject() :
- bIsValid ( FALSE ),
- bIsThumbBmp ( TRUE )
+ bIsValid ( sal_False ),
+ bIsThumbBmp ( sal_True )
{
}
// ------------------------------------------------------------------------
-BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
+sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( rGraphic.GetType() == GRAPHIC_BITMAP )
{
@@ -104,7 +104,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
if( ( aBmpSize.Width() <= S_THUMB ) && ( aBmpSize.Height() <= S_THUMB ) )
{
aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
- bRet = TRUE;
+ bRet = sal_True;
}
else
{
@@ -116,7 +116,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
(double) aNewSize.Height() / aBmpSize.Height(), BMP_SCALE_INTERPOLATE ) )
{
aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
- bRet = TRUE;
+ bRet = sal_True;
}
}
}
@@ -137,7 +137,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
if( !aThumbBmp.IsEmpty() )
{
aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
- bRet = TRUE;
+ bRet = sal_True;
}
}
@@ -148,15 +148,15 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic )
void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const
{
- static const UINT32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' );
+ static const sal_uInt32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' );
- rOut << nInventor << (UINT16) 0x0004 << GetVersion() << (UINT16) GetObjKind();
+ rOut << nInventor << (sal_uInt16) 0x0004 << GetVersion() << (sal_uInt16) GetObjKind();
rOut << bIsThumbBmp;
if( bIsThumbBmp )
{
- const USHORT nOldCompressMode = rOut.GetCompressMode();
- const ULONG nOldVersion = rOut.GetVersion();
+ const sal_uInt16 nOldCompressMode = rOut.GetCompressMode();
+ const sal_uIntPtr nOldVersion = rOut.GetVersion();
rOut.SetCompressMode( COMPRESSMODE_ZBITMAP );
rOut.SetVersion( SOFFICE_FILEFORMAT_50 );
@@ -176,11 +176,11 @@ void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const
// ------------------------------------------------------------------------
-void SgaObject::ReadData(SvStream& rIn, UINT16& rReadVersion )
+void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion )
{
ByteString aTmpStr;
- UINT32 nTmp32;
- UINT16 nTmp16;
+ sal_uInt32 nTmp32;
+ sal_uInt16 nTmp16;
rIn >> nTmp32 >> nTmp16 >> rReadVersion >> nTmp16 >> bIsThumbBmp;
@@ -245,7 +245,7 @@ SvStream& operator<<( SvStream& rOut, const SgaObject& rObj )
SvStream& operator>>( SvStream& rIn, SgaObject& rObj )
{
- UINT16 nReadVersion;
+ sal_uInt16 nReadVersion;
rObj.ReadData( rIn, nReadVersion );
rObj.bIsValid = ( rIn.GetError() == ERRCODE_NONE );
@@ -303,7 +303,7 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const String& rDestDir ) const
// ------------------------------------------------------------------------
-void SgaObjectBmp::ReadData( SvStream& rIn, UINT16& rReadVersion )
+void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
{
ByteString aTmpStr;
@@ -335,10 +335,10 @@ SgaObjectSound::SgaObjectSound( const INetURLObject& rURL ) :
{
aURL = rURL;
aThumbBmp = Bitmap( Size( 1, 1 ), 1 );
- bIsValid = TRUE;
+ bIsValid = sal_True;
}
else
- bIsValid = FALSE;
+ bIsValid = sal_False;
}
// ------------------------------------------------------------------------
@@ -351,7 +351,7 @@ SgaObjectSound::~SgaObjectSound()
Bitmap SgaObjectSound::GetThumbBmp() const
{
- USHORT nId;
+ sal_uInt16 nId;
switch( eSoundType )
{
@@ -380,19 +380,19 @@ Bitmap SgaObjectSound::GetThumbBmp() const
void SgaObjectSound::WriteData( SvStream& rOut, const String& rDestDir ) const
{
SgaObject::WriteData( rOut, rDestDir );
- rOut << (UINT16) eSoundType << ByteString( aTitle, RTL_TEXTENCODING_UTF8 );
+ rOut << (sal_uInt16) eSoundType << ByteString( aTitle, RTL_TEXTENCODING_UTF8 );
}
// ------------------------------------------------------------------------
-void SgaObjectSound::ReadData( SvStream& rIn, UINT16& rReadVersion )
+void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
{
SgaObject::ReadData( rIn, rReadVersion );
if( rReadVersion >= 5 )
{
ByteString aTmpStr;
- UINT16 nTmp16;
+ sal_uInt16 nTmp16;
rIn >> nTmp16; eSoundType = (GalSoundType) nTmp16;
@@ -504,11 +504,11 @@ SgaObjectSvDraw::SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL )
// ------------------------------------------------------------------------
-BOOL SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
+sal_Bool SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
{
Graphic aGraphic;
ImageMap aImageMap;
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if ( CreateIMapGraphic( rModel, aGraphic, aImageMap ) )
bRet = SgaObject::CreateThumb( aGraphic );
@@ -537,10 +537,10 @@ BOOL SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel )
// ------------------------------------------------------------------------
-BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
+sal_Bool SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel )
{
const FmFormPage* pPage = static_cast< const FmFormPage* >( rModel.GetPage( 0 ) );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pOut && pPage )
{
@@ -566,11 +566,11 @@ BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rMode
aOrigin.Y() += ( ( aDrawSize.Height() - aObjRect.GetHeight() ) >> 1 ) - aObjRect.Top();
aMap.SetOrigin( aOrigin );
- aView.SetPageVisible( FALSE );
- aView.SetBordVisible( FALSE );
- aView.SetGridVisible( FALSE );
- aView.SetHlplVisible( FALSE );
- aView.SetGlueVisible( FALSE );
+ aView.SetPageVisible( sal_False );
+ aView.SetBordVisible( sal_False );
+ aView.SetGridVisible( sal_False );
+ aView.SetHlplVisible( sal_False );
+ aView.SetGlueVisible( sal_False );
pOut->Push();
pOut->SetMapMode( aMap );
@@ -578,7 +578,7 @@ BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rMode
aView.CompleteRedraw( pOut, Rectangle( pOut->PixelToLogic( Point() ), pOut->GetOutputSize() ) );
pOut->Pop();
- bRet = TRUE;
+ bRet = sal_True;
}
}
@@ -595,7 +595,7 @@ void SgaObjectSvDraw::WriteData( SvStream& rOut, const String& rDestDir ) const
// ------------------------------------------------------------------------
-void SgaObjectSvDraw::ReadData( SvStream& rIn, UINT16& rReadVersion )
+void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion )
{
SgaObject::ReadData( rIn, rReadVersion );
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx
index 730c1179a07e..bd1ae10cd746 100644
--- a/svx/source/gallery2/galtheme.cxx
+++ b/svx/source/gallery2/galtheme.cxx
@@ -79,7 +79,7 @@ GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry )
mnThemeLockCount ( 0 ),
mnBroadcasterLockCount( 0 ),
nDragPos ( 0 ),
- bDragging ( FALSE )
+ bDragging ( sal_False )
{
ImplCreateSvDrawStorage();
@@ -95,9 +95,9 @@ GalleryTheme::~GalleryTheme()
for( GalleryObject* pEntry = aObjectList.First(); pEntry; pEntry = aObjectList.Next() )
{
- Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+ Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
delete pEntry;
- Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+ Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
}
}
@@ -107,10 +107,10 @@ void GalleryTheme::ImplCreateSvDrawStorage()
{
if( !pThm->IsImported() )
{
- aSvDrawStorageRef = new SvStorage( FALSE, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE );
+ aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE );
// #i50423# ReadOnly may not been set though the file can't be written (because of security reasons)
if ( ( aSvDrawStorageRef->GetError() != ERRCODE_NONE ) && !pThm->IsReadOnly() )
- aSvDrawStorageRef = new SvStorage( FALSE, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
+ aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ );
}
else
aSvDrawStorageRef.Clear();
@@ -118,10 +118,10 @@ void GalleryTheme::ImplCreateSvDrawStorage()
// ------------------------------------------------------------------------
-BOOL GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, ULONG nPos, GalleryObject* pExistentEntry )
+sal_Bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, sal_uIntPtr nPos, GalleryObject* pExistentEntry )
{
SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pOStm )
{
@@ -144,7 +144,7 @@ BOOL GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, ULONG nPos, Galler
pEntry->aURL = rObj.GetURL();
pEntry->nOffset = nOffset;
pEntry->eObjKind = rObj.GetObjKind();
- bRet = TRUE;
+ bRet = sal_True;
}
delete pOStm;
@@ -241,7 +241,7 @@ void GalleryTheme::ImplWrite()
delete pOStm;
}
- ImplSetModified( FALSE );
+ ImplSetModified( sal_False );
}
}
}
@@ -286,14 +286,14 @@ INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject ) const
// ------------------------------------------------------------------------
-INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat )
+INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat )
{
INetURLObject aDir( GetParent()->GetUserURL() );
INetURLObject aInfoFileURL( GetParent()->GetUserURL() );
INetURLObject aNewURL;
sal_uInt32 nNextNumber = 1999;
sal_Char const* pExt = NULL;
- BOOL bExists;
+ sal_Bool bExists;
aDir.Append( String( RTL_CONSTASCII_USTRINGPARAM( "dragdrop" ) ) );
CreateDir( aDir );
@@ -342,11 +342,11 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFor
String aFileName( RTL_CONSTASCII_USTRINGPARAM( "gallery/svdraw/dd" ) );
aNewURL = INetURLObject( aFileName += String::CreateFromInt32( ++nNextNumber % 99999999 ), INET_PROT_PRIV_SOFFICE );
- bExists = FALSE;
+ bExists = sal_False;
for( GalleryObject* pEntry = aObjectList.First(); pEntry && !bExists; pEntry = aObjectList.Next() )
if( pEntry->aURL == aNewURL )
- bExists = TRUE;
+ bExists = sal_True;
}
else
{
@@ -377,7 +377,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFor
// ------------------------------------------------------------------------
-void GalleryTheme::ImplBroadcast( ULONG nUpdatePos )
+void GalleryTheme::ImplBroadcast( sal_uIntPtr nUpdatePos )
{
if( !IsBroadcasterLocked() )
{
@@ -390,16 +390,16 @@ void GalleryTheme::ImplBroadcast( ULONG nUpdatePos )
// ------------------------------------------------------------------------
-BOOL GalleryTheme::UnlockTheme()
+sal_Bool GalleryTheme::UnlockTheme()
{
DBG_ASSERT( mnThemeLockCount, "Theme is not locked" );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( mnThemeLockCount )
{
--mnThemeLockCount;
- bRet = TRUE;
+ bRet = sal_True;
}
return bRet;
@@ -407,7 +407,7 @@ BOOL GalleryTheme::UnlockTheme()
// ------------------------------------------------------------------------
-void GalleryTheme::UnlockBroadcaster( ULONG nUpdatePos )
+void GalleryTheme::UnlockBroadcaster( sal_uIntPtr nUpdatePos )
{
DBG_ASSERT( mnBroadcasterLockCount, "Broadcaster is not locked" );
@@ -417,9 +417,9 @@ void GalleryTheme::UnlockBroadcaster( ULONG nUpdatePos )
// ------------------------------------------------------------------------
-BOOL GalleryTheme::InsertObject( const SgaObject& rObj, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( rObj.IsValid() )
{
@@ -454,7 +454,7 @@ BOOL GalleryTheme::InsertObject( const SgaObject& rObj, ULONG nInsertPos )
else
ImplWriteSgaObject( rObj, nInsertPos, NULL );
- ImplSetModified( bRet = TRUE );
+ ImplSetModified( bRet = sal_True );
ImplBroadcast( pFoundEntry ? aObjectList.GetPos( pFoundEntry ) : nInsertPos );
}
@@ -463,7 +463,7 @@ BOOL GalleryTheme::InsertObject( const SgaObject& rObj, ULONG nInsertPos )
// ------------------------------------------------------------------------
-SgaObject* GalleryTheme::AcquireObject( ULONG nPos )
+SgaObject* GalleryTheme::AcquireObject( sal_uIntPtr nPos )
{
return ImplReadSgaObject( aObjectList.GetObject( nPos ) );
}
@@ -477,7 +477,7 @@ void GalleryTheme::ReleaseObject( SgaObject* pObject )
// ------------------------------------------------------------------------
-BOOL GalleryTheme::RemoveObject( ULONG nPos )
+sal_Bool GalleryTheme::RemoveObject( sal_uIntPtr nPos )
{
GalleryObject* pEntry = aObjectList.Remove( nPos );
@@ -489,11 +489,11 @@ BOOL GalleryTheme::RemoveObject( ULONG nPos )
if( SGA_OBJ_SVDRAW == pEntry->eObjKind )
aSvDrawStorageRef->Remove( pEntry->aURL.GetMainURL( INetURLObject::NO_DECODE ) );
- Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+ Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
delete pEntry;
- Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+ Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
- ImplSetModified( TRUE );
+ ImplSetModified( sal_True );
ImplBroadcast( nPos );
}
@@ -502,9 +502,9 @@ BOOL GalleryTheme::RemoveObject( ULONG nPos )
// ------------------------------------------------------------------------
-BOOL GalleryTheme::ChangeObjectPos( ULONG nOldPos, ULONG nNewPos )
+sal_Bool GalleryTheme::ChangeObjectPos( sal_uIntPtr nOldPos, sal_uIntPtr nNewPos )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( nOldPos != nNewPos )
{
@@ -518,7 +518,7 @@ BOOL GalleryTheme::ChangeObjectPos( ULONG nOldPos, ULONG nNewPos )
nOldPos++;
aObjectList.Remove( nOldPos );
- ImplSetModified( bRet = TRUE );
+ ImplSetModified( bRet = sal_True );
ImplBroadcast( ( nNewPos < nOldPos ) ? nNewPos : ( nNewPos - 1 ) );
}
}
@@ -535,15 +535,15 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
Graphic aGraphic;
String aFormat;
GalleryObject* pEntry;
- const ULONG nCount = aObjectList.Count();
- ULONG i;
+ const sal_uIntPtr nCount = aObjectList.Count();
+ sal_uIntPtr i;
LockBroadcaster();
- bAbortActualize = FALSE;
+ bAbortActualize = sal_False;
// LoeschFlag zuruecksetzen
for ( i = 0; i < nCount; i++ )
- aObjectList.GetObject( i )->bDummy = FALSE;
+ aObjectList.GetObject( i )->bDummy = sal_False;
for( i = 0; ( i < nCount ) && !bAbortActualize; i++ )
{
@@ -566,7 +566,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
{
SgaObjectSound aObjSound( aURL );
if( !InsertObject( aObjSound ) )
- pEntry->bDummy = TRUE;
+ pEntry->bDummy = sal_True;
}
else
{
@@ -584,12 +584,12 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
pNewObj = (SgaObject*) new SgaObjectBmp( aGraphic, aURL, aFormat );
if( !InsertObject( *pNewObj ) )
- pEntry->bDummy = TRUE;
+ pEntry->bDummy = sal_True;
delete pNewObj;
}
else
- pEntry->bDummy = TRUE; // Loesch-Flag setzen
+ pEntry->bDummy = sal_True; // Loesch-Flag setzen
}
}
else
@@ -606,7 +606,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
SgaObjectSvDraw aNewObj( *pIStm, pEntry->aURL );
if( !InsertObject( aNewObj ) )
- pEntry->bDummy = TRUE;
+ pEntry->bDummy = sal_True;
pIStm->SetBufferSize( 0L );
}
@@ -620,9 +620,9 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
{
if( pEntry->bDummy )
{
- Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+ Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
delete aObjectList.Remove( pEntry );
- Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) );
+ Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) );
pEntry = aObjectList.GetCurObject();
}
@@ -685,10 +685,10 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
CopyFile( aTmpURL, aInURL );
KillFile( aTmpURL );
- ULONG nStorErr = 0;
+ sal_uIntPtr nStorErr = 0;
{
- SvStorageRef aTempStorageRef( new SvStorage( FALSE, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) );
+ SvStorageRef aTempStorageRef( new SvStorage( sal_False, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) );
aSvDrawStorageRef->CopyTo( aTempStorageRef );
nStorErr = aSvDrawStorageRef->GetError();
}
@@ -701,7 +701,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
}
KillFile( aTmpURL );
- ImplSetModified( TRUE );
+ ImplSetModified( sal_True );
ImplWrite();
UnlockBroadcaster();
}
@@ -709,7 +709,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg
// ------------------------------------------------------------------------
-GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly )
+GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sal_Bool bReadOnly )
{
DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
@@ -724,7 +724,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO
String aThemeName;
sal_uInt32 nThemeId = 0;
sal_uInt16 nVersion;
- BOOL bThemeNameFromResource = FALSE;
+ sal_Bool bThemeNameFromResource = sal_False;
*pIStm >> nVersion;
@@ -776,7 +776,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO
aPathURL.removeFinalSlash();
pRet = new GalleryThemeEntry( aPathURL, aThemeName,
String(rURL.GetBase()).Copy( 2, 6 ).ToInt32(),
- bReadOnly, FALSE, FALSE, nThemeId,
+ bReadOnly, sal_False, sal_False, nThemeId,
bThemeNameFromResource );
}
@@ -789,16 +789,16 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO
// -----------------------------------------------------------------------------
-BOOL GalleryTheme::GetThumb( ULONG nPos, Bitmap& rBmp, BOOL )
+sal_Bool GalleryTheme::GetThumb( sal_uIntPtr nPos, Bitmap& rBmp, sal_Bool )
{
SgaObject* pObj = AcquireObject( nPos );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pObj )
{
rBmp = pObj->GetThumbBmp();
ReleaseObject( pObj );
- bRet = TRUE;
+ bRet = sal_True;
}
return bRet;
@@ -806,10 +806,10 @@ BOOL GalleryTheme::GetThumb( ULONG nPos, Bitmap& rBmp, BOOL )
// -----------------------------------------------------------------------------
-BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
+sal_Bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool bProgress )
{
const GalleryObject* pObject = ImplGetGalleryObject( nPos );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pObject )
{
@@ -837,7 +837,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
ImageMap aIMap;
if( CreateIMapGraphic( *aModel.GetModel(), rGraphic, aIMap ) )
- bRet = TRUE;
+ bRet = sal_True;
else
{
VirtualDevice aVDev;
@@ -848,7 +848,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
aView.ShowSdrPage(aView.GetModel()->GetPage(0));
aView.MarkAll();
rGraphic = aView.GetAllMarkedGraphic();
- bRet = TRUE;
+ bRet = sal_True;
}
}
}
@@ -865,7 +865,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
aBmp.Replace( COL_LIGHTMAGENTA, COL_WHITE );
rGraphic = aBmp;
ReleaseObject( pObj );
- bRet = TRUE;
+ bRet = sal_True;
}
}
break;
@@ -880,13 +880,13 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress )
// -----------------------------------------------------------------------------
-BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( rGraphic.GetType() != GRAPHIC_NONE )
{
- ULONG nExportFormat = CVT_UNKNOWN;
+ sal_uIntPtr nExportFormat = CVT_UNKNOWN;
const GfxLink aGfxLink( ( (Graphic&) rGraphic ).GetLink() );
if( aGfxLink.GetDataSize() )
@@ -958,10 +958,10 @@ BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos )
// -----------------------------------------------------------------------------
-BOOL GalleryTheme::GetModel( ULONG nPos, SdrModel& rModel, BOOL )
+sal_Bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel, sal_Bool )
{
const GalleryObject* pObject = ImplGetGalleryObject( nPos );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pObject && ( SGA_OBJ_SVDRAW == pObject->eObjKind ) )
{
@@ -987,11 +987,11 @@ BOOL GalleryTheme::GetModel( ULONG nPos, SdrModel& rModel, BOOL )
// -----------------------------------------------------------------------------
-BOOL GalleryTheme::InsertModel( const FmFormModel& rModel, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos )
{
INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) );
SvStorageRef xStor( GetSvDrawStorage() );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( xStor.Is() )
{
@@ -1034,10 +1034,10 @@ BOOL GalleryTheme::InsertModel( const FmFormModel& rModel, ULONG nInsertPos )
// -----------------------------------------------------------------------------
-BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStream, BOOL )
+sal_Bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rxModelStream, sal_Bool )
{
const GalleryObject* pObject = ImplGetGalleryObject( nPos );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pObject && ( SGA_OBJ_SVDRAW == pObject->eObjKind ) )
{
@@ -1051,7 +1051,7 @@ BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStrea
if( xIStm.Is() && !xIStm->GetError() )
{
- UINT32 nVersion = 0;
+ sal_uInt32 nVersion = 0;
xIStm->SetBufferSize( 16348 );
@@ -1087,11 +1087,11 @@ BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStrea
// -----------------------------------------------------------------------------
-BOOL GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, sal_uIntPtr nInsertPos )
{
INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) );
SvStorageRef xStor( GetSvDrawStorage() );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( xStor.Is() )
{
@@ -1123,15 +1123,15 @@ BOOL GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream,
// -----------------------------------------------------------------------------
-BOOL GalleryTheme::GetURL( ULONG nPos, INetURLObject& rURL, BOOL )
+sal_Bool GalleryTheme::GetURL( sal_uIntPtr nPos, INetURLObject& rURL, sal_Bool )
{
const GalleryObject* pObject = ImplGetGalleryObject( nPos );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( pObject )
{
rURL = INetURLObject( ImplGetURL( pObject ) );
- bRet = TRUE;
+ bRet = sal_True;
}
return bRet;
@@ -1139,13 +1139,13 @@ BOOL GalleryTheme::GetURL( ULONG nPos, INetURLObject& rURL, BOOL )
// -----------------------------------------------------------------------------
-BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos )
{
Graphic aGraphic;
String aFormat;
SgaObject* pNewObj = NULL;
- const USHORT nImportRet = GalleryGraphicImport( rURL, aGraphic, aFormat );
- BOOL bRet = FALSE;
+ const sal_uInt16 nImportRet = GalleryGraphicImport( rURL, aGraphic, aFormat );
+ sal_Bool bRet = sal_False;
if( nImportRet != SGA_IMPORT_NONE )
{
@@ -1160,7 +1160,7 @@ BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos )
pNewObj = (SgaObject*) new SgaObjectSound( rURL );
if( pNewObj && InsertObject( *pNewObj, nInsertPos ) )
- bRet = TRUE;
+ bRet = sal_True;
delete pNewObj;
@@ -1169,11 +1169,11 @@ BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos )
// -----------------------------------------------------------------------------
-BOOL GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos )
{
INetURLObject aURL;
::std::vector< INetURLObject > aURLVector;
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
try
{
@@ -1225,9 +1225,9 @@ BOOL GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG
// -----------------------------------------------------------------------------
-BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTransferable >& rxTransferable, ULONG nInsertPos )
+sal_Bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( rxTransferable.is() )
{
@@ -1278,7 +1278,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran
else
{
Graphic aGraphic;
- ULONG nFormat = 0;
+ sal_uIntPtr nFormat = 0;
if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVXB ) )
nFormat = SOT_FORMATSTR_ID_SVXB;
@@ -1293,7 +1293,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran
if( pGraphic )
{
- bRet = FALSE;
+ bRet = sal_False;
if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVIM ) )
{
@@ -1331,7 +1331,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran
// -----------------------------------------------------------------------------
-void GalleryTheme::CopyToClipboard( Window* pWindow, ULONG nPos )
+void GalleryTheme::CopyToClipboard( Window* pWindow, sal_uIntPtr nPos )
{
GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, false );
pTransferable->CopyToClipboard( pWindow );
@@ -1339,7 +1339,7 @@ void GalleryTheme::CopyToClipboard( Window* pWindow, ULONG nPos )
// -----------------------------------------------------------------------------
-void GalleryTheme::StartDrag( Window* pWindow, ULONG nPos )
+void GalleryTheme::StartDrag( Window* pWindow, sal_uIntPtr nPos )
{
GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, true );
pTransferable->StartDrag( pWindow, DND_ACTION_COPY | DND_ACTION_LINK );
@@ -1353,7 +1353,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
const INetURLObject aRelURL2( GetParent()->GetUserURL() );
INetURLObject aNewURL, aTempURL;
sal_uInt32 nCount = GetObjectCount();
- BOOL bRel;
+ sal_Bool bRel;
rOStm << (sal_uInt16) 0x0004;
rOStm << ByteString( GetRealName(), RTL_TEXTENCODING_UTF8 );
@@ -1367,7 +1367,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
if( SGA_OBJ_SVDRAW == pObj->eObjKind )
{
aPath = GetSvDrawStreamNameFromURL( pObj->aURL );
- bRel = FALSE;
+ bRel = sal_False;
}
else
{
@@ -1399,7 +1399,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const
}
// neuerdings wird ein 512-Byte-Reservepuffer gechrieben;
- // um diesen zu erkennen werden zwei ULONG-Ids geschrieben
+ // um diesen zu erkennen werden zwei sal_uIntPtr-Ids geschrieben
rOStm << COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) << COMPAT_FORMAT( 'E', 'S', 'R', 'V' );
const long nReservePos = rOStm.Tell();
@@ -1438,7 +1438,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
if( nVersion >= 0x0004 )
{
- UINT16 nTmp16;
+ sal_uInt16 nTmp16;
rIStm >> nTmp16;
nTextEncoding = (rtl_TextEncoding) nTmp16;
}
@@ -1453,13 +1453,13 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
INetURLObject aRelURL1( GetParent()->GetRelativeURL() );
INetURLObject aRelURL2( GetParent()->GetUserURL() );
sal_uInt32 nId1, nId2;
- BOOL bRel;
+ sal_Bool bRel;
for( pObj = aObjectList.First(); pObj; pObj = aObjectList.Next() )
{
- Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pObj ) ) );
+ Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pObj ) ) );
delete pObj;
- Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pObj ) ) );
+ Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pObj ) ) );
}
aObjectList.Clear();
@@ -1540,7 +1540,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
{
VersionCompat* pCompat = new VersionCompat( rIStm, STREAM_READ );
sal_uInt32 nTemp32;
- BOOL bThemeNameFromResource = FALSE;
+ sal_Bool bThemeNameFromResource = sal_False;
rIStm >> nTemp32;
@@ -1556,7 +1556,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm )
else
rIStm.SetError( SVSTREAM_READ_ERROR );
- ImplSetModified( FALSE );
+ ImplSetModified( sal_False );
return rIStm;
}
@@ -1575,25 +1575,25 @@ SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme )
return rTheme.ReadData( rIn );
}
-void GalleryTheme::ImplSetModified( BOOL bModified )
+void GalleryTheme::ImplSetModified( sal_Bool bModified )
{ pThm->SetModified( bModified ); }
const String& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); }
const INetURLObject& GalleryTheme::GetThmURL() const { return pThm->GetThmURL(); }
const INetURLObject& GalleryTheme::GetSdgURL() const { return pThm->GetSdgURL(); }
const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL(); }
-UINT32 GalleryTheme::GetId() const { return pThm->GetId(); }
-void GalleryTheme::SetId( UINT32 nNewId, BOOL bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); }
-BOOL GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); }
-BOOL GalleryTheme::IsImported() const { return pThm->IsImported(); }
-BOOL GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
-BOOL GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
-BOOL GalleryTheme::IsModified() const { return pThm->IsModified(); }
+sal_uInt32 GalleryTheme::GetId() const { return pThm->GetId(); }
+void GalleryTheme::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); }
+sal_Bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); }
+sal_Bool GalleryTheme::IsImported() const { return pThm->IsImported(); }
+sal_Bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); }
+sal_Bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); }
+sal_Bool GalleryTheme::IsModified() const { return pThm->IsModified(); }
const String& GalleryTheme::GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); }
void GalleryTheme::InsertAllThemes( ListBox& rListBox )
{
- for( USHORT i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ )
+ for( sal_uInt16 i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ )
rListBox.InsertEntry( String( GAL_RESID( i ) ) );
}
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index e7001d176920..d7328e9ac2e7 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -101,7 +101,7 @@ void disposeGallery( Gallery* pGallery )
static void createTheme( rtl::OUString aThemeName,
rtl::OUString aGalleryURL,
rtl::OUString aDestDir,
- UINT32 nNumFrom,
+ sal_uInt32 nNumFrom,
FileNameList &rFiles )
{
Gallery * pGallery( createGallery( aGalleryURL ) );
@@ -280,10 +280,10 @@ void GalApp::Main()
bool bHelp = false;
rtl::OUString aPath, aDestDir;
rtl::OUString aName = rtl::OUString::createFromAscii( "Default name" );
- UINT32 nNumFrom = 0;
+ sal_uInt32 nNumFrom = 0;
FileNameList aFiles;
- for( USHORT i = 0; i < GetCommandLineParamCount(); i++ )
+ for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ )
{
rtl::OUString aParam = GetCommandLineParam( i );
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index 395d3d511841..1d29cba30c8c 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -184,7 +184,7 @@ public:
//===== IAccessibleViewforwarder ========================================
- virtual BOOL IsValid (void) const;
+ virtual sal_Bool IsValid (void) const;
virtual Rectangle GetVisibleArea() const;
virtual Point LogicToPixel (const Point& rPoint) const;
virtual Size LogicToPixel (const Size& rSize) const;
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index f7eba57bd8fb..5bd5714b8039 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -109,14 +109,14 @@ namespace svx
struct SvxShowCharSetItem
{
SvxShowCharSet& mrParent;
- USHORT mnId;
+ sal_uInt16 mnId;
XubString maText;
Rectangle maRect;
SvxShowCharSetItemAcc* m_pItem;
SvxShowCharSetAcc* m_pParent;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAcc;
- SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,USHORT _nPos );
+ SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,sal_uInt16 _nPos );
~SvxShowCharSetItem();
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible();
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index ab8bda588c5a..a8bfad89090b 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -129,7 +129,7 @@ namespace svxform
~DataTreeListBox();
virtual PopupMenu* CreateContextMenu( void );
- virtual void ExcecuteContextMenuAction( USHORT _nSelectedPopupEntry );
+ virtual void ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry );
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
@@ -166,7 +166,7 @@ namespace svxform
void AddChildren( SvLBoxEntry* _pParent,
const ImageList& _rImgLst,
const XNode_ref& _xNode );
- bool DoToolBoxAction( USHORT _nToolBoxID );
+ bool DoToolBoxAction( sal_uInt16 _nToolBoxID );
SvLBoxEntry* AddEntry( ItemNode* _pNewNode, bool _bIsElement );
SvLBoxEntry* AddEntry( const XPropertySet_ref& _rPropSet );
void EditEntry( const XPropertySet_ref& _rPropSet );
@@ -182,12 +182,12 @@ namespace svxform
virtual void Resize();
inline bool HasModel() const { return m_bHasModel; }
- String SetModel( const XModel_ref& _xModel, USHORT _nPagePos );
+ String SetModel( const XModel_ref& _xModel, sal_uInt16 _nPagePos );
void ClearModel();
String LoadInstance( const PropertyValue_seq& _xPropSeq,
const ImageList& _rImgLst );
- bool DoMenuAction( USHORT _nMenuID );
+ bool DoMenuAction( sal_uInt16 _nMenuID );
void EnableMenuItems( Menu* _pMenu );
inline SvLBoxEntry* GetSelectedItem() const { return m_aItemList.FirstSelected(); }
@@ -227,7 +227,7 @@ namespace svxform
long m_nMinWidth;
long m_nMinHeight;
long m_nBorderHeight;
- USHORT m_nLastSelectedPos;
+ sal_uInt16 m_nLastSelectedPos;
bool m_bShowDetails;
bool m_bIsNotifyDisabled;
Size m_a2Size;
@@ -250,14 +250,14 @@ namespace svxform
DECL_LINK( ActivatePageHdl, TabControl* );
DECL_LINK( UpdateHdl, Timer* );
- XFormsPage* GetCurrentPage( USHORT& rCurId );
+ XFormsPage* GetCurrentPage( sal_uInt16& rCurId );
void LoadModels();
void SetPageModel();
void ClearAllPageModels( bool bClearPages );
void InitPages();
void CreateInstancePage( const PropertyValue_seq& _xPropSeq );
bool HasFirstInstancePage() const;
- USHORT GetNewPageId() const;
+ sal_uInt16 GetNewPageId() const;
protected:
virtual void Resize();
@@ -574,7 +574,7 @@ namespace svxform
inline void SetName( const String& _rName ) { m_aNameED.SetText( _rName );}
inline String GetURL() const { return m_aURLED.GetText(); }
inline void SetURL( const String& _rURL ) { m_aURLED.SetText( _rURL );}
- inline bool IsLinkInstance() const { return ( m_aLinkInstanceCB.IsChecked() != FALSE ); }
+ inline bool IsLinkInstance() const { return ( m_aLinkInstanceCB.IsChecked() != sal_False ); }
inline void SetLinkInstance( bool _bLink ) { m_aLinkInstanceCB.Check( _bLink != false ); }
};
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index b35b46a941aa..ebe104058509 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -591,14 +591,14 @@ class RecovDocListEntry : public SvLBoxString
//---------------------------------------
/** @short TODO */
RecovDocListEntry( SvLBoxEntry* pEntry,
- USHORT nFlags,
+ sal_uInt16 nFlags,
const String& sText );
//---------------------------------------
/** @short TODO */
virtual void Paint(const Point& aPos ,
SvLBox& aDevice,
- USHORT nFlags ,
+ sal_uInt16 nFlags ,
SvLBoxEntry* pEntry );
};
diff --git a/svx/source/inc/fmgroup.hxx b/svx/source/inc/fmgroup.hxx
index 109a445dca70..5cad571dee7b 100644
--- a/svx/source/inc/fmgroup.hxx
+++ b/svx/source/inc/fmgroup.hxx
@@ -63,9 +63,9 @@ public:
virtual XIdlClassRef getIdlClass();
// XGroup
- virtual INT32 getFormControlCount();
+ virtual sal_Int32 getFormControlCount();
virtual XFormControlRef getFormControlByName( const XubString& sName ) const;
- virtual XFormControlRef getFormControlByIndex( INT32 Index ) const;
+ virtual XFormControlRef getFormControlByIndex( sal_Int32 Index ) const;
virtual void appendFormControl( const XFormControlRef& FormControl );
virtual XFormControlRef removeFormControl( const XFormControlRef& FormControl );
@@ -93,11 +93,11 @@ public:
// PropertySetInterface
virtual FmXPropertySetInfo* createPropertySetInfo() const;
- virtual BOOL setPropertyValue( UINT16 nId, const XubString& aPropertyName,
+ virtual sal_Bool setPropertyValue( sal_uInt16 nId, const XubString& aPropertyName,
const UsrAny& aValue,
PropertyChangeEventSequence* pSeq,
- INT32 nIndex );
- virtual UsrAny getPropertyValue( UINT16 nId, const XubString& aPropertyName ) const;
+ sal_Int32 nIndex );
+ virtual UsrAny getPropertyValue( sal_uInt16 nId, const XubString& aPropertyName ) const;
virtual void addPropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener );
virtual void removePropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener );
};
@@ -112,7 +112,7 @@ class FmXGroupModelInfo : public FmXControlModelInfo
protected:
FmXGroupModelInfo( const FmXGroupModel* pCp );
- virtual void fillProperties( UINT32& nIndex, PropertySequence& aSeq ) const;
+ virtual void fillProperties( sal_uInt32& nIndex, PropertySequence& aSeq ) const;
};
diff --git a/svx/source/inc/fmslotinvalidator.hxx b/svx/source/inc/fmslotinvalidator.hxx
index 7baa4f451a3f..d37099f40cf4 100644
--- a/svx/source/inc/fmslotinvalidator.hxx
+++ b/svx/source/inc/fmslotinvalidator.hxx
@@ -35,7 +35,7 @@ namespace svx
{
//........................................................................
- typedef USHORT SfxSlotId;
+ typedef sal_uInt16 SfxSlotId;
//====================================================================
//= ISlotInvalidator
diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx
index afb737864bd8..2b6ccb09d89d 100644
--- a/svx/source/inc/fmtextcontroldialogs.hxx
+++ b/svx/source/inc/fmtextcontroldialogs.hxx
@@ -50,7 +50,7 @@ namespace svx
~TextControlCharAttribDialog();
protected:
- virtual void PageCreated( USHORT _nId, SfxTabPage& _rPage );
+ virtual void PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage );
};
//====================================================================
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index 8bb682690b36..9641db8c8a19 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -252,7 +252,7 @@ private:
void addWindow(const SdrPageWindow&);
void removeWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC );
void Activate(sal_Bool bSync = sal_False);
- void Deactivate(BOOL bDeactivateController = TRUE);
+ void Deactivate(sal_Bool bDeactivateController = sal_True);
SdrObject* implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor );
SdrObject* implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc );
@@ -266,8 +266,8 @@ private:
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats,
sal_uInt16 _nControlObjectID,
const ::rtl::OUString& _rFieldPostfix,
- UINT32 _nInventor,
- UINT16 _nLabelObjectID,
+ sal_uInt32 _nInventor,
+ sal_uInt16 _nLabelObjectID,
SdrPage* _pLabelPage,
SdrPage* _pControlPage,
SdrModel* _pModel,
diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx
index 96da1c9aa5af..db21979ab756 100644
--- a/svx/source/inc/formtoolbars.hxx
+++ b/svx/source/inc/formtoolbars.hxx
@@ -63,19 +63,19 @@ namespace svxform
on the type of our document
*/
SVX_DLLPUBLIC ::rtl::OUString
- getToolboxResourceName( USHORT _nSlotId ) const;
+ getToolboxResourceName( sal_uInt16 _nSlotId ) const;
/** toggles the toolbox associated with the given slot
*/
- SVX_DLLPUBLIC void toggleToolbox( USHORT _nSlotId ) const;
+ SVX_DLLPUBLIC void toggleToolbox( sal_uInt16 _nSlotId ) const;
/** determines whether the toolbox associated with the given slot is currently visible
*/
- SVX_DLLPUBLIC bool isToolboxVisible( USHORT _nSlotId ) const;
+ SVX_DLLPUBLIC bool isToolboxVisible( sal_uInt16 _nSlotId ) const;
/** ensures that a given toolbox is visible
*/
- inline void showToolbox( USHORT _SlotId ) const
+ inline void showToolbox( sal_uInt16 _SlotId ) const
{
if ( !isToolboxVisible( _SlotId ) )
toggleToolbox( _SlotId );
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index f9e3727988af..77554da2587e 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -75,7 +75,7 @@ public:
void SetKeyboardNeighbors(
FrameBorderType eLeft, FrameBorderType eRight,
FrameBorderType eTop, FrameBorderType eBottom );
- FrameBorderType GetKeyboardNeighbor( USHORT nKeyCode ) const;
+ FrameBorderType GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const;
private:
const FrameBorderType meType; /// Frame border type (position in control).
diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx
index 2f7b60073200..5fdcfb320443 100644
--- a/svx/source/inc/stringlistresource.hxx
+++ b/svx/source/inc/stringlistresource.hxx
@@ -65,7 +65,7 @@ namespace svx
@return String
The string.
*/
- String getString( USHORT _nResId )
+ String getString( sal_uInt16 _nResId )
{
return String( ResId( _nResId, *m_pResMgr ) );
}
diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx
index 3014b42d4721..91add6aaa48e 100644
--- a/svx/source/inc/svdoimp.hxx
+++ b/svx/source/inc/svdoimp.hxx
@@ -98,9 +98,9 @@ void ImpCalcBmpFillSizes( Size& rStartOffset,
const Size& rBmpSize,
const Size& rBmpPerCent,
const Size& rBmpOffPerCent,
- BOOL bBmpLogSize,
- BOOL bBmpTile,
- BOOL bBmpStretch,
+ sal_Bool bBmpLogSize,
+ sal_Bool bBmpTile,
+ sal_Bool bBmpStretch,
RECT_POINT eBmpRectPoint );
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index b62a71e56525..bbb5cb261b46 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.hxx
@@ -60,7 +60,7 @@ protected:
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
// SvLBox
- virtual BOOL DoubleClickHdl();
+ virtual sal_Bool DoubleClickHdl();
using SvLBox::ExecuteDrop;
};
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index 79fee9082999..774e786b80f7 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.hxx
@@ -59,7 +59,7 @@ private:
DECL_LINK( TbxSelectHdl, ToolBox* );
public:
- SvxFmConfigWin( USHORT nId, ResId aRIdWin, ResId aRIdTbx );
+ SvxFmConfigWin( sal_uInt16 nId, ResId aRIdWin, ResId aRIdTbx );
~SvxFmConfigWin();
void Update();
@@ -71,7 +71,7 @@ public:
class SvxFmTbxCtlConfig : public SfxToolBoxControl
{
private:
- UINT16 nLastSlot;
+ sal_uInt16 nLastSlot;
protected:
using SfxToolBoxControl::Select;
@@ -79,11 +79,11 @@ protected:
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxFmTbxCtlConfig() {}
- virtual void Select( USHORT nModifier );
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void Select( sal_uInt16 nModifier );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
@@ -96,12 +96,12 @@ class SvxFmTbxCtlAbsRec : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFmTbxCtlAbsRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxFmTbxCtlAbsRec();
virtual Window* CreateItemWindow( Window* pParent );
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
};
@@ -111,7 +111,7 @@ class SvxFmTbxCtlRecText : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFmTbxCtlRecText( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxFmTbxCtlRecText();
virtual Window* CreateItemWindow( Window* pParent );
@@ -123,7 +123,7 @@ class SvxFmTbxCtlRecFromText : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFmTbxCtlRecFromText( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxFmTbxCtlRecFromText();
virtual Window* CreateItemWindow( Window* pParent );
@@ -137,11 +137,11 @@ class SvxFmTbxCtlRecTotal : public SfxToolBoxControl
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFmTbxCtlRecTotal( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
~SvxFmTbxCtlRecTotal();
virtual Window* CreateItemWindow( Window* pParent );
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
};
@@ -150,7 +150,7 @@ class SvxFmTbxNextRec : public SfxToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
};
//========================================================================
@@ -158,7 +158,7 @@ class SvxFmTbxPrevRec : public SfxToolBoxControl
{
public:
SFX_DECL_TOOLBOX_CONTROL();
- SvxFmTbxPrevRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+ SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
};
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index 7089da42860b..ba100a2e2ab0 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -47,7 +47,7 @@ TYPEINIT1(SvxSmartTagItem, SfxPoolItem);
// class SvxFontItem -----------------------------------------------------
-SvxSmartTagItem::SvxSmartTagItem( const USHORT nId,
+SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId,
const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence,
const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& rActionIndicesSequence,
const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > >& rStringKeyMaps,
@@ -72,12 +72,12 @@ SvxSmartTagItem::SvxSmartTagItem( const USHORT nId,
// -----------------------------------------------------------------------
-sal_Bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, BYTE /* nMemberId */ ) const
+sal_Bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, sal_uInt8 /* nMemberId */ ) const
{
return sal_False;
}
// -----------------------------------------------------------------------
-sal_Bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, BYTE /* nMemberId */)
+sal_Bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, sal_uInt8 /* nMemberId */)
{
return sal_False;
}
@@ -110,14 +110,14 @@ SfxPoolItem* SvxSmartTagItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxSmartTagItem::Store( SvStream& rStream, USHORT /*nItemVersion*/ ) const
+SvStream& SvxSmartTagItem::Store( SvStream& rStream, sal_uInt16 /*nItemVersion*/ ) const
{
return rStream;
}
// -----------------------------------------------------------------------
-SfxPoolItem* SvxSmartTagItem::Create(SvStream& , USHORT) const
+SfxPoolItem* SvxSmartTagItem::Create(SvStream& , sal_uInt16) const
{
return 0;
}
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index 183db0e3a722..b5f399f2b88f 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -71,14 +71,14 @@ TYPEINIT1_FACTORY( SvxMarginItem, SfxPoolItem, new SvxMarginItem(0) );
// class SvxHorJustifyItem -----------------------------------------------
-SvxHorJustifyItem::SvxHorJustifyItem( const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)SVX_HOR_JUSTIFY_STANDARD )
+SvxHorJustifyItem::SvxHorJustifyItem( const sal_uInt16 nId ) :
+ SfxEnumItem( nId, (sal_uInt16)SVX_HOR_JUSTIFY_STANDARD )
{
}
SvxHorJustifyItem::SvxHorJustifyItem( const SvxCellHorJustify eJustify,
- const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)eJustify )
+ const sal_uInt16 nId ) :
+ SfxEnumItem( nId, (sal_uInt16)eJustify )
{
}
@@ -107,7 +107,7 @@ SfxItemPresentation SvxHorJustifyItem::GetPresentation
//------------------------------------------------------------------------
-sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -151,7 +151,7 @@ sal_Bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return sal_True;
}
-sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -178,7 +178,7 @@ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case table::CellHoriJustify_REPEAT: eSvx = SVX_HOR_JUSTIFY_REPEAT; break;
default: ; //prevent warning
}
- SetValue( (USHORT)eSvx );
+ SetValue( (sal_uInt16)eSvx );
}
break;
case MID_HORJUST_ADJUST:
@@ -198,7 +198,7 @@ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case style::ParagraphAdjust_BLOCK: eSvx = SVX_HOR_JUSTIFY_BLOCK; break;
case style::ParagraphAdjust_CENTER: eSvx = SVX_HOR_JUSTIFY_CENTER; break;
}
- SetValue( (USHORT)eSvx );
+ SetValue( (sal_uInt16)eSvx );
}
}
return sal_True;
@@ -206,7 +206,7 @@ sal_Bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
//------------------------------------------------------------------------
-XubString SvxHorJustifyItem::GetValueText( USHORT nVal ) const
+XubString SvxHorJustifyItem::GetValueText( sal_uInt16 nVal ) const
{
DBG_ASSERT( nVal <= SVX_HOR_JUSTIFY_REPEAT, "enum overflow!" );
return SVX_RESSTR(RID_SVXITEMS_HORJUST_STANDARD + nVal);
@@ -221,29 +221,29 @@ SfxPoolItem* SvxHorJustifyItem::Clone( SfxItemPool* ) const
//------------------------------------------------------------------------
-SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxHorJustifyItem::Create( SvStream& rStream, sal_uInt16 ) const
{
- USHORT nVal;
+ sal_uInt16 nVal;
rStream >> nVal;
return new SvxHorJustifyItem( (SvxCellHorJustify)nVal, Which() );
}
//------------------------------------------------------------------------
-USHORT SvxHorJustifyItem::GetValueCount() const
+sal_uInt16 SvxHorJustifyItem::GetValueCount() const
{
return SVX_HOR_JUSTIFY_REPEAT + 1; // letzter Enum-Wert + 1
}
// class SvxVerJustifyItem -----------------------------------------------
-SvxVerJustifyItem::SvxVerJustifyItem( const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)SVX_VER_JUSTIFY_STANDARD )
+SvxVerJustifyItem::SvxVerJustifyItem( const sal_uInt16 nId ) :
+ SfxEnumItem( nId, (sal_uInt16)SVX_VER_JUSTIFY_STANDARD )
{
}
SvxVerJustifyItem::SvxVerJustifyItem( const SvxCellVerJustify eJustify,
- const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)eJustify )
+ const sal_uInt16 nId ) :
+ SfxEnumItem( nId, (sal_uInt16)eJustify )
{
}
@@ -273,7 +273,7 @@ SfxItemPresentation SvxVerJustifyItem::GetPresentation
//------------------------------------------------------------------------
-sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -309,7 +309,7 @@ sal_Bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return sal_True;
}
-sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -329,7 +329,7 @@ sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case style::VerticalAlignment_BOTTOM: eSvx = SVX_VER_JUSTIFY_BOTTOM; break;
default:;
}
- SetValue( (USHORT)eSvx );
+ SetValue( (sal_uInt16)eSvx );
break;
}
default:
@@ -352,7 +352,7 @@ sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case table::CellVertJustify_BOTTOM: eSvx = SVX_VER_JUSTIFY_BOTTOM; break;
default: ; //prevent warning
}
- SetValue( (USHORT)eSvx );
+ SetValue( (sal_uInt16)eSvx );
break;
}
}
@@ -362,7 +362,7 @@ sal_Bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
//------------------------------------------------------------------------
-XubString SvxVerJustifyItem::GetValueText( USHORT nVal ) const
+XubString SvxVerJustifyItem::GetValueText( sal_uInt16 nVal ) const
{
DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" );
return SVX_RESSTR(RID_SVXITEMS_VERJUST_STANDARD + nVal);
@@ -377,16 +377,16 @@ SfxPoolItem* SvxVerJustifyItem::Clone( SfxItemPool* ) const
//------------------------------------------------------------------------
-SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxVerJustifyItem::Create( SvStream& rStream, sal_uInt16 ) const
{
- USHORT nVal;
+ sal_uInt16 nVal;
rStream >> nVal;
return new SvxVerJustifyItem( (SvxCellVerJustify)nVal, Which() );
}
//------------------------------------------------------------------------
-USHORT SvxVerJustifyItem::GetValueCount() const
+sal_uInt16 SvxVerJustifyItem::GetValueCount() const
{
return SVX_VER_JUSTIFY_BOTTOM + 1; // letzter Enum-Wert + 1
}
@@ -394,12 +394,12 @@ USHORT SvxVerJustifyItem::GetValueCount() const
// class SvxOrientationItem ----------------------------------------------
SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation,
- const USHORT nId):
- SfxEnumItem( nId, (USHORT)eOrientation )
+ const sal_uInt16 nId):
+ SfxEnumItem( nId, (sal_uInt16)eOrientation )
{
}
-SvxOrientationItem::SvxOrientationItem( INT32 nRotation, BOOL bStacked, const USHORT nId ) :
+SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, sal_Bool bStacked, const sal_uInt16 nId ) :
SfxEnumItem( nId )
{
SetFromRotation( nRotation, bStacked );
@@ -430,7 +430,7 @@ SfxItemPresentation SvxOrientationItem::GetPresentation
//------------------------------------------------------------------------
-sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
table::CellOrientation eUno = table::CellOrientation_STANDARD;
switch ( (SvxCellOrientation)GetValue() )
@@ -444,7 +444,7 @@ sal_Bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) co
return sal_True;
}
-sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
table::CellOrientation eOrient;
if(!(rVal >>= eOrient))
@@ -463,13 +463,13 @@ sal_Bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/
case table::CellOrientation_STACKED: eSvx = SVX_ORIENTATION_STACKED; break;
default: ; //prevent warning
}
- SetValue( (USHORT)eSvx );
+ SetValue( (sal_uInt16)eSvx );
return sal_True;
}
//------------------------------------------------------------------------
-XubString SvxOrientationItem::GetValueText( USHORT nVal ) const
+XubString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) const
{
DBG_ASSERT( nVal <= SVX_ORIENTATION_STACKED, "enum overflow!" );
return SVX_RESSTR(RID_SVXITEMS_ORI_STANDARD + nVal);
@@ -484,30 +484,30 @@ SfxPoolItem* SvxOrientationItem::Clone( SfxItemPool* ) const
//------------------------------------------------------------------------
-SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const
{
- USHORT nVal;
+ sal_uInt16 nVal;
rStream >> nVal;
return new SvxOrientationItem( (SvxCellOrientation)nVal, Which() );
}
//------------------------------------------------------------------------
-USHORT SvxOrientationItem::GetValueCount() const
+sal_uInt16 SvxOrientationItem::GetValueCount() const
{
return SVX_ORIENTATION_STACKED + 1; // letzter Enum-Wert + 1
}
//------------------------------------------------------------------------
-BOOL SvxOrientationItem::IsStacked() const
+sal_Bool SvxOrientationItem::IsStacked() const
{
return static_cast< SvxCellOrientation >( GetValue() ) == SVX_ORIENTATION_STACKED;
}
-INT32 SvxOrientationItem::GetRotation( INT32 nStdAngle ) const
+sal_Int32 SvxOrientationItem::GetRotation( sal_Int32 nStdAngle ) const
{
- INT32 nAngle = nStdAngle;
+ sal_Int32 nAngle = nStdAngle;
switch( static_cast< SvxCellOrientation >( GetValue() ) )
{
case SVX_ORIENTATION_BOTTOMTOP: nAngle = 9000;
@@ -517,7 +517,7 @@ INT32 SvxOrientationItem::GetRotation( INT32 nStdAngle ) const
return nAngle;
}
-void SvxOrientationItem::SetFromRotation( INT32 nRotation, BOOL bStacked )
+void SvxOrientationItem::SetFromRotation( sal_Int32 nRotation, sal_Bool bStacked )
{
if( bStacked )
{
@@ -533,7 +533,7 @@ void SvxOrientationItem::SetFromRotation( INT32 nRotation, BOOL bStacked )
// class SvxMarginItem ---------------------------------------------------
-SvxMarginItem::SvxMarginItem( const USHORT nId ) :
+SvxMarginItem::SvxMarginItem( const sal_uInt16 nId ) :
SfxPoolItem( nId ),
@@ -550,7 +550,7 @@ SvxMarginItem::SvxMarginItem( sal_Int16 nLeft,
sal_Int16 nTop,
sal_Int16 nRight,
sal_Int16 nBottom,
- const USHORT nId ) :
+ const sal_uInt16 nId ) :
SfxPoolItem( nId ),
nLeftMargin ( nLeft ),
@@ -646,7 +646,7 @@ SfxPoolItem* SvxMarginItem::Clone( SfxItemPool* ) const
//------------------------------------------------------------------------
-SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const
{
sal_Int16 nLeft;
sal_Int16 nTop;
@@ -661,7 +661,7 @@ SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, USHORT ) const
//------------------------------------------------------------------------
-SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) const
+SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) const
{
rStream << nLeftMargin;
rStream << nTopMargin;
@@ -673,7 +673,7 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) cons
//------------------------------------------------------------------------
-sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -701,7 +701,7 @@ sal_Bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
//------------------------------------------------------------------------
-sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 );
long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX; // Members sind sal_Int16
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index 474bf19f7bd6..114ce405bb69 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -66,14 +66,14 @@ TYPEINIT1_FACTORY(SvxDoubleItem, SfxPoolItem, new SvxDoubleItem(0.0, 0));
|*
*************************************************************************/
-SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, USHORT nId) :
- SfxEnumItem(nId, (USHORT)eStyle)
+SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eStyle)
{
}
// -----------------------------------------------------------------------
-SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, USHORT nId) :
+SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -87,7 +87,7 @@ SfxPoolItem* SvxChartStyleItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartStyleItem(rIn, Which());
}
@@ -99,14 +99,14 @@ SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
*************************************************************************/
SvxChartDataDescrItem::SvxChartDataDescrItem(SvxChartDataDescr eDataDescr,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eDataDescr)
+ sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eDataDescr)
{
}
// -----------------------------------------------------------------------
-SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, USHORT nId) :
+SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -120,7 +120,7 @@ SfxPoolItem* SvxChartDataDescrItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartDataDescrItem(rIn, Which());
}
@@ -132,14 +132,14 @@ SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, USHORT /*nVer*/) const
*************************************************************************/
SvxChartLegendPosItem::SvxChartLegendPosItem(SvxChartLegendPos eLegendPos,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eLegendPos)
+ sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eLegendPos)
{
}
// -----------------------------------------------------------------------
-SvxChartLegendPosItem::SvxChartLegendPosItem(SvStream& rIn, USHORT nId) :
+SvxChartLegendPosItem::SvxChartLegendPosItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -153,7 +153,7 @@ SfxPoolItem* SvxChartLegendPosItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartLegendPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartLegendPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartLegendPosItem(rIn, Which());
}
@@ -165,14 +165,14 @@ SfxPoolItem* SvxChartLegendPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const
*************************************************************************/
SvxChartTextOrderItem::SvxChartTextOrderItem(SvxChartTextOrder eOrder,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eOrder)
+ sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eOrder)
{
}
// -----------------------------------------------------------------------
-SvxChartTextOrderItem::SvxChartTextOrderItem(SvStream& rIn, USHORT nId) :
+SvxChartTextOrderItem::SvxChartTextOrderItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -186,14 +186,14 @@ SfxPoolItem* SvxChartTextOrderItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartTextOrderItem(rIn, Which());
}
// -----------------------------------------------------------------------
-sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
// the order of the two enums is not equal, so a mapping is required
::com::sun::star::chart::ChartAxisArrangeOrderType eAO;
@@ -218,7 +218,7 @@ sal_Bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BY
// -----------------------------------------------------------------------
-sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
// the order of the two enums is not equal, so a mapping is required
::com::sun::star::chart::ChartAxisArrangeOrderType eAO;
@@ -247,7 +247,7 @@ sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal
return sal_False;
}
- SetValue( (USHORT)eOrder );
+ SetValue( (sal_uInt16)eOrder );
return sal_True;
}
@@ -259,14 +259,14 @@ sal_Bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal
*************************************************************************/
SvxChartTextOrientItem::SvxChartTextOrientItem(SvxChartTextOrient eOrient,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eOrient)
+ sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eOrient)
{
}
// -----------------------------------------------------------------------
-SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, USHORT nId) :
+SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -280,7 +280,7 @@ SfxPoolItem* SvxChartTextOrientItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartTextOrientItem(rIn, Which());
}
@@ -291,7 +291,7 @@ SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, USHORT /*nVer*/) cons
|*
*************************************************************************/
-SvxDoubleItem::SvxDoubleItem(double fValue, USHORT nId) :
+SvxDoubleItem::SvxDoubleItem(double fValue, sal_uInt16 nId) :
SfxPoolItem(nId),
fVal(fValue)
{
@@ -299,7 +299,7 @@ SvxDoubleItem::SvxDoubleItem(double fValue, USHORT nId) :
// -----------------------------------------------------------------------
-SvxDoubleItem::SvxDoubleItem(SvStream& rIn, USHORT nId) :
+SvxDoubleItem::SvxDoubleItem(SvStream& rIn, sal_uInt16 nId) :
SfxPoolItem(nId)
{
rIn >> fVal;
@@ -355,7 +355,7 @@ SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, USHORT /*nVersion*/) const
+SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const
{
double _fVal;
rIn >> _fVal;
@@ -364,7 +364,7 @@ SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, USHORT /*nVersion*/) const
// -----------------------------------------------------------------------
-SvStream& SvxDoubleItem::Store(SvStream& rOut, USHORT /*nItemVersion*/) const
+SvStream& SvxDoubleItem::Store(SvStream& rOut, sal_uInt16 /*nItemVersion*/) const
{
rOut << fVal;
return rOut;
@@ -395,14 +395,14 @@ SfxFieldUnit SvxDoubleItem::GetUnit() const
// -----------------------------------------------------------------------
-sal_Bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxDoubleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
rVal <<= fVal;
return sal_True;
}
// -----------------------------------------------------------------------
-sal_Bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
return rVal >>= fVal;
}
@@ -416,14 +416,14 @@ sal_Bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
*************************************************************************/
SvxChartKindErrorItem::SvxChartKindErrorItem(SvxChartKindError eOrient,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eOrient)
+ sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eOrient)
{
}
// -----------------------------------------------------------------------
-SvxChartKindErrorItem::SvxChartKindErrorItem(SvStream& rIn, USHORT nId) :
+SvxChartKindErrorItem::SvxChartKindErrorItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -437,14 +437,14 @@ SfxPoolItem* SvxChartKindErrorItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartKindErrorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartKindErrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartKindErrorItem(rIn, Which());
}
// -----------------------------------------------------------------------
-USHORT SvxChartKindErrorItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxChartKindErrorItem::GetVersion (sal_uInt16 nFileFormatVersion) const
{
return (nFileFormatVersion == SOFFICE_FILEFORMAT_31)
? USHRT_MAX
@@ -458,14 +458,14 @@ USHORT SvxChartKindErrorItem::GetVersion (USHORT nFileFormatVersion) const
*************************************************************************/
SvxChartIndicateItem::SvxChartIndicateItem(SvxChartIndicate eOrient,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eOrient)
+ sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eOrient)
{
}
// -----------------------------------------------------------------------
-SvxChartIndicateItem::SvxChartIndicateItem(SvStream& rIn, USHORT nId) :
+SvxChartIndicateItem::SvxChartIndicateItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -479,14 +479,14 @@ SfxPoolItem* SvxChartIndicateItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartIndicateItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartIndicateItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartIndicateItem(rIn, Which());
}
// -----------------------------------------------------------------------
-USHORT SvxChartIndicateItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxChartIndicateItem::GetVersion (sal_uInt16 nFileFormatVersion) const
{
return (nFileFormatVersion == SOFFICE_FILEFORMAT_31)
? USHRT_MAX
@@ -500,14 +500,14 @@ USHORT SvxChartIndicateItem::GetVersion (USHORT nFileFormatVersion) const
*************************************************************************/
SvxChartRegressItem::SvxChartRegressItem(SvxChartRegress eOrient,
- USHORT nId) :
- SfxEnumItem(nId, (USHORT)eOrient)
+ sal_uInt16 nId) :
+ SfxEnumItem(nId, (sal_uInt16)eOrient)
{
}
// -----------------------------------------------------------------------
-SvxChartRegressItem::SvxChartRegressItem(SvStream& rIn, USHORT nId) :
+SvxChartRegressItem::SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId) :
SfxEnumItem(nId, rIn)
{
}
@@ -521,14 +521,14 @@ SfxPoolItem* SvxChartRegressItem::Clone(SfxItemPool* /*pPool*/) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxChartRegressItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* SvxChartRegressItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SvxChartRegressItem(rIn, Which());
}
// -----------------------------------------------------------------------
-USHORT SvxChartRegressItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxChartRegressItem::GetVersion (sal_uInt16 nFileFormatVersion) const
{
return (nFileFormatVersion == SOFFICE_FILEFORMAT_31)
? USHRT_MAX
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index bc3ca621635b..f65c9bbf6df4 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -53,7 +53,7 @@ SvxClipboardFmtItem_Impl::SvxClipboardFmtItem_Impl(
const SvxClipboardFmtItem_Impl& rCpy )
{
aFmtIds.Insert( &rCpy.aFmtIds, 0 );
- for( USHORT n = 0, nEnd = rCpy.aFmtNms.Count(); n < nEnd; ++n )
+ for( sal_uInt16 n = 0, nEnd = rCpy.aFmtNms.Count(); n < nEnd; ++n )
{
String* pStr = rCpy.aFmtNms[ n ];
if( pStr )
@@ -62,7 +62,7 @@ SvxClipboardFmtItem_Impl::SvxClipboardFmtItem_Impl(
}
}
-SvxClipboardFmtItem::SvxClipboardFmtItem( USHORT nId )
+SvxClipboardFmtItem::SvxClipboardFmtItem( sal_uInt16 nId )
: SfxPoolItem( nId ), pImpl( new SvxClipboardFmtItem_Impl )
{
}
@@ -78,35 +78,35 @@ SvxClipboardFmtItem::~SvxClipboardFmtItem()
delete pImpl;
}
-BOOL SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
- USHORT nCount = Count();
+ sal_uInt16 nCount = Count();
::com::sun::star::frame::status::ClipboardFormats aClipFormats;
aClipFormats.Identifiers.realloc( nCount );
aClipFormats.Names.realloc( nCount );
- for ( USHORT n=0; n < nCount; n++ )
+ for ( sal_uInt16 n=0; n < nCount; n++ )
{
aClipFormats.Identifiers[n] = (sal_Int64)GetClipbrdFormatId( n );
aClipFormats.Names[n] = GetClipbrdFormatName( n );
}
rVal <<= aClipFormats;
- return TRUE;
+ return sal_True;
}
-sal_Bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
::com::sun::star::frame::status::ClipboardFormats aClipFormats;
if ( rVal >>= aClipFormats )
{
- USHORT nCount = USHORT( aClipFormats.Identifiers.getLength() );
+ sal_uInt16 nCount = sal_uInt16( aClipFormats.Identifiers.getLength() );
pImpl->aFmtIds.Remove( 0, pImpl->aFmtIds.Count() );
pImpl->aFmtNms.Remove( 0, pImpl->aFmtNms.Count() );
- for ( USHORT n=0; n < nCount; n++ )
- AddClipbrdFormat( ULONG( aClipFormats.Identifiers[n] ), aClipFormats.Names[n], n );
+ for ( sal_uInt16 n=0; n < nCount; n++ )
+ AddClipbrdFormat( sal_uIntPtr( aClipFormats.Identifiers[n] ), aClipFormats.Names[n], n );
return sal_True;
}
@@ -122,7 +122,7 @@ int SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
{
nRet = 1;
const String* pStr1, *pStr2;
- for( USHORT n = 0, nEnd = rCmp.pImpl->aFmtNms.Count(); n < nEnd; ++n )
+ for( sal_uInt16 n = 0, nEnd = rCmp.pImpl->aFmtNms.Count(); n < nEnd; ++n )
{
if( pImpl->aFmtIds[ n ] != rCmp.pImpl->aFmtIds[ n ] ||
( (0 == ( pStr1 = pImpl->aFmtNms[ n ] )) ^
@@ -142,7 +142,7 @@ SfxPoolItem* SvxClipboardFmtItem::Clone( SfxItemPool * /*pPool*/ ) const
return new SvxClipboardFmtItem( *this );
}
-void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, USHORT nPos )
+void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos )
{
if( nPos > pImpl->aFmtNms.Count() )
nPos = pImpl->aFmtNms.Count();
@@ -151,8 +151,8 @@ void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, USHORT nPos )
pImpl->aFmtIds.Insert( nId, nPos );
}
-void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, const String& rName,
- USHORT nPos )
+void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, const String& rName,
+ sal_uInt16 nPos )
{
if( nPos > pImpl->aFmtNms.Count() )
nPos = pImpl->aFmtNms.Count();
@@ -161,17 +161,17 @@ void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, const String& rName,
pImpl->aFmtIds.Insert( nId, nPos );
}
-USHORT SvxClipboardFmtItem::Count() const
+sal_uInt16 SvxClipboardFmtItem::Count() const
{
return pImpl->aFmtIds.Count();
}
-ULONG SvxClipboardFmtItem::GetClipbrdFormatId( USHORT nPos ) const
+sal_uIntPtr SvxClipboardFmtItem::GetClipbrdFormatId( sal_uInt16 nPos ) const
{
return pImpl->aFmtIds[ nPos ];
}
-const String& SvxClipboardFmtItem::GetClipbrdFormatName( USHORT nPos ) const
+const String& SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const
{
const String* pS = pImpl->aFmtNms[ nPos ];
return pS ? *pS : SvxClipboardFmtItem_Impl::sEmptyStr;
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index c7a401ed4054..c2e49401cfc8 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -347,7 +347,7 @@ SfxPoolItem* __EXPORT SdrCustomShapeGeometryItem::Clone( SfxItemPool * /*pPool*/
#ifdef SDR_ISPOOLABLE
int __EXPORT SdrCustomShapeGeometryItem::IsPoolable() const
{
- USHORT nId=Which();
+ sal_uInt16 nId=Which();
return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
}
#endif
@@ -355,12 +355,12 @@ sal_uInt16 SdrCustomShapeGeometryItem::GetVersion( sal_uInt16 /*nFileFormatVersi
{
return 1;
}
-sal_Bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
rVal <<= aPropSeq;
return sal_True;
}
-sal_Bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
if ( ! ( rVal >>= aPropSeq ) )
return sal_False;
diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx
index 846c422ae03a..67c87606e04e 100644
--- a/svx/source/items/e3ditem.cxx
+++ b/svx/source/items/e3ditem.cxx
@@ -58,7 +58,7 @@ SvxB3DVectorItem::~SvxB3DVectorItem()
// -----------------------------------------------------------------------
-SvxB3DVectorItem::SvxB3DVectorItem( USHORT _nWhich, const basegfx::B3DVector& rVal ) :
+SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector& rVal ) :
SfxPoolItem( _nWhich ),
aVal( rVal )
{
@@ -67,7 +67,7 @@ SvxB3DVectorItem::SvxB3DVectorItem( USHORT _nWhich, const basegfx::B3DVector& rV
// -----------------------------------------------------------------------
-SvxB3DVectorItem::SvxB3DVectorItem( USHORT _nWhich, SvStream& rStream ) :
+SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, SvStream& rStream ) :
SfxPoolItem( _nWhich )
{
DBG_CTOR(SvxB3DVectorItem, 0);
@@ -105,7 +105,7 @@ SfxPoolItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, USHORT /*nVersion*/) const
+SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/) const
{
DBG_CHKTHIS(SvxB3DVectorItem, 0);
basegfx::B3DVector aStr;
@@ -118,7 +118,7 @@ SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, USHORT /*nVersion*/) co
// -----------------------------------------------------------------------
-SvStream& SvxB3DVectorItem::Store(SvStream &rStream, USHORT /*nItemVersion*/) const
+SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/) const
{
DBG_CHKTHIS(SvxB3DVectorItem, 0);
@@ -133,7 +133,7 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, USHORT /*nItemVersion*/) co
// -----------------------------------------------------------------------
-sal_Bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
drawing::Direction3D aDirection;
@@ -148,7 +148,7 @@ sal_Bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) cons
// -----------------------------------------------------------------------
-sal_Bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
drawing::Direction3D aDirection;
if(!(rVal >>= aDirection))
@@ -162,7 +162,7 @@ sal_Bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
// -----------------------------------------------------------------------
-USHORT SvxB3DVectorItem::GetVersion (USHORT nFileFormatVersion) const
+sal_uInt16 SvxB3DVectorItem::GetVersion (sal_uInt16 nFileFormatVersion) const
{
return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) ? USHRT_MAX : 0;
}
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index ce28ee300cbb..50af1f8f9609 100644
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -44,13 +44,13 @@ using namespace ::com::sun::star;
* Implementierung class SwCropGrf
******************************************************************************/
-SvxGrfCrop::SvxGrfCrop( USHORT nItemId )
+SvxGrfCrop::SvxGrfCrop( sal_uInt16 nItemId )
: SfxPoolItem( nItemId ),
nLeft( 0 ), nRight( 0 ), nTop( 0 ), nBottom( 0 )
{}
SvxGrfCrop::SvxGrfCrop( sal_Int32 nL, sal_Int32 nR,
- sal_Int32 nT, sal_Int32 nB, USHORT nItemId )
+ sal_Int32 nT, sal_Int32 nB, sal_uInt16 nItemId )
: SfxPoolItem( nItemId ),
nLeft( nL ), nRight( nR ), nTop( nT ), nBottom( nB )
{}
@@ -76,7 +76,7 @@ SfxPoolItem* SvxGrfCrop::Clone( SfxItemPool* ) const
*/
/*
-USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxGrfCrop::GetVersion( sal_uInt16 nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -86,9 +86,9 @@ USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const
}
*/
-SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, USHORT nVersion ) const
+SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
{
- INT32 top, left, right, bottom;
+ sal_Int32 top, left, right, bottom;
rStrm >> top >> left >> right >> bottom;
if( GRFCROP_VERSION_SWDEFAULT == nVersion )
@@ -103,9 +103,9 @@ SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, USHORT nVersion ) const
}
-SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const
+SvStream& SvxGrfCrop::Store( SvStream& rStrm, sal_uInt16 nVersion ) const
{
- INT32 left = GetLeft(), right = GetRight(),
+ sal_Int32 left = GetLeft(), right = GetRight(),
top = GetTop(), bottom = GetBottom();
if( GRFCROP_VERSION_SWDEFAULT == nVersion )
top = -top, bottom = -bottom, left = -left, right = -right;
@@ -117,7 +117,7 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const
-BOOL SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -140,7 +140,7 @@ BOOL SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return sal_True;
}
-BOOL SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 7f4505e37866..95722e3144c9 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -452,7 +452,7 @@ void SvxNumberFormatShell::MakePreviewString( const String& rFormatStr,
{
rpFontColor = NULL;
- ULONG nExistingFormat = pFormatter->GetEntryKey( rFormatStr, eCurLanguage );
+ sal_uIntPtr nExistingFormat = pFormatter->GetEntryKey( rFormatStr, eCurLanguage );
if ( nExistingFormat == NUMBERFORMAT_ENTRY_NOT_FOUND )
{
// real preview - not implemented in NumberFormatter for text formats
@@ -465,7 +465,7 @@ void SvxNumberFormatShell::MakePreviewString( const String& rFormatStr,
// format exists
// #50441# if a string was set in addition to the value, use it for text formats
- BOOL bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
+ sal_Bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
( aValStr.Len() && ( pFormatter->GetType(nExistingFormat) & NUMBERFORMAT_TEXT ) ) );
if ( bUseText )
pFormatter->GetOutputString( aValStr, nExistingFormat,
@@ -1027,7 +1027,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n
aWSStringsDtor, *pTmpCurrencyEntry, bTmpBanking );
if ( !bTmpBanking )
pFormatter->GetCurrencyFormatStrings(
- aWSStringsDtor, *pTmpCurrencyEntry, TRUE );
+ aWSStringsDtor, *pTmpCurrencyEntry, sal_True );
}
else
nDefault = 0;
@@ -1041,8 +1041,8 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n
const NfCurrencyEntry* pCurr = rCurrencyTable[i];
if ( pCurr->GetLanguage() == eLang && pTmpCurrencyEntry != pCurr )
{
- pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, FALSE );
- pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, TRUE );
+ pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, sal_False );
+ pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, sal_True );
}
}
}
@@ -1171,7 +1171,7 @@ void SvxNumberFormatShell::GetPreviewString_Impl( String& rString, Color*& rpCol
rpColor = NULL;
// #50441# if a string was set in addition to the value, use it for text formats
- BOOL bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
+ sal_Bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING ||
( aValStr.Len() && ( pFormatter->GetType(nCurFormatKey) & NUMBERFORMAT_TEXT ) ) );
if ( bUseText )
diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx
index e996373eb48e..75fc574be3b7 100644
--- a/svx/source/items/ofaitem.cxx
+++ b/svx/source/items/ofaitem.cxx
@@ -30,7 +30,7 @@
#include "svx/ofaitem.hxx"
-OfaPtrItem::OfaPtrItem( USHORT _nWhich, void *_pPtr )
+OfaPtrItem::OfaPtrItem( sal_uInt16 _nWhich, void *_pPtr )
: SfxPoolItem( _nWhich ), pPtr( _pPtr )
{
@@ -54,7 +54,7 @@ SfxPoolItem* OfaPtrItem::Clone( SfxItemPool * ) const
/*
TYPEINIT1_FACTORY(DashListPtrItem, SvxDashListPtrItem, new DashListPtrItem(0));
-DashListPtrItem::DashListPtrItem( USHORT nWhich, SvxDashListItem* pPtr )
+DashListPtrItem::DashListPtrItem( sal_uInt16 nWhich, SvxDashListItem* pPtr )
: OfaPtrItem( nWhich ), pPtr( pPtr )
{
}
@@ -74,11 +74,11 @@ SfxPoolItem* DashListPtrItem::Clone( SfxItemPool *pPool ) const
return new DashListPtrItem( *this );
}
-sal_Bool DashListPtrItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const
+sal_Bool DashListPtrItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const
{
}
-sal_Bool DashListPtrItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 )
+sal_Bool DashListPtrItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 )
{
sal_Int64 nHyper;
if ( rVal >>= nHyper )
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 49aa566f867d..e05fee56ad52 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -52,7 +52,7 @@ TYPEINIT1_FACTORY( SvxPageItem, SfxPoolItem , new SvxPageItem(0));
Beschreibung: Konstruktor
--------------------------------------------------------------------*/
-SvxPageItem::SvxPageItem( const USHORT nId ) : SfxPoolItem( nId ),
+SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ),
eNumType ( SVX_ARABIC ),
bLandscape ( sal_False ),
@@ -94,7 +94,7 @@ int SvxPageItem::operator==( const SfxPoolItem& rAttr ) const
eUse == rItem.eUse );
}
-inline XubString GetUsageText( const USHORT eU )
+inline XubString GetUsageText( const sal_uInt16 eU )
{
if ( eU & SVX_PAGE_LEFT )
return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_LEFT);
@@ -164,7 +164,7 @@ SfxItemPresentation SvxPageItem::GetPresentation
}
//------------------------------------------------------------------------
-sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -201,7 +201,7 @@ sal_Bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return sal_True;
}
//------------------------------------------------------------------------
-sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
switch( nMemberId )
{
@@ -244,12 +244,12 @@ sal_Bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
//------------------------------------------------------------------------
-SfxPoolItem* SvxPageItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const
{
XubString sStr;
- BYTE eType;
+ sal_uInt8 eType;
sal_Bool bLand;
- USHORT nUse;
+ sal_uInt16 nUse;
// UNICODE: rStream >> sStr;
rStream.ReadByteString( sStr );
@@ -268,12 +268,12 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, USHORT ) const
//------------------------------------------------------------------------
-SvStream& SvxPageItem::Store( SvStream &rStrm, USHORT /*nItemVersion*/ ) const
+SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const
{
// UNICODE: rStrm << aDescName;
rStrm.WriteByteString(aDescName);
- rStrm << (BYTE)eNumType << bLandscape << eUse;
+ rStrm << (sal_uInt8)eNumType << bLandscape << eUse;
return rStrm;
}
@@ -281,7 +281,7 @@ SvStream& SvxPageItem::Store( SvStream &rStrm, USHORT /*nItemVersion*/ ) const
Beschreibung: HeaderFooterSet
--------------------------------------------------------------------*/
-SvxSetItem::SvxSetItem( const USHORT nId, const SfxItemSet& rSet ) :
+SvxSetItem::SvxSetItem( const sal_uInt16 nId, const SfxItemSet& rSet ) :
SfxSetItem( nId, rSet )
{
@@ -293,7 +293,7 @@ SvxSetItem::SvxSetItem( const SvxSetItem& rItem ) :
{
}
-SvxSetItem::SvxSetItem( const USHORT nId, SfxItemSet* _pSet ) :
+SvxSetItem::SvxSetItem( const sal_uInt16 nId, SfxItemSet* _pSet ) :
SfxSetItem( nId, _pSet )
{
@@ -318,7 +318,7 @@ SfxItemPresentation SvxSetItem::GetPresentation
return SFX_ITEM_PRESENTATION_NONE;
}
-SfxPoolItem* SvxSetItem::Create(SvStream &rStrm, USHORT /*nVersion*/) const
+SfxPoolItem* SvxSetItem::Create(SvStream &rStrm, sal_uInt16 /*nVersion*/) const
{
SfxItemSet* _pSet = new SfxItemSet( *GetItemSet().GetPool(),
GetItemSet().GetRanges() );
@@ -328,7 +328,7 @@ SfxPoolItem* SvxSetItem::Create(SvStream &rStrm, USHORT /*nVersion*/) const
return new SvxSetItem( Which(), *_pSet );
}
-SvStream& SvxSetItem::Store(SvStream &rStrm, USHORT nItemVersion) const
+SvStream& SvxSetItem::Store(SvStream &rStrm, sal_uInt16 nItemVersion) const
{
GetItemSet().Store( rStrm, nItemVersion );
diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx
index 6e6f46cdc373..84f2853d9196 100644
--- a/svx/source/items/rotmodit.cxx
+++ b/svx/source/items/rotmodit.cxx
@@ -56,8 +56,8 @@ TYPEINIT1_FACTORY(SvxRotateModeItem, SfxEnumItem, new SvxRotateModeItem(SVX_ROTA
// SvxRotateModeItem - Ausrichtung bei gedrehtem Text
//-----------------------------------------------------------------------
-SvxRotateModeItem::SvxRotateModeItem( SvxRotateMode eMode, USHORT _nWhich )
- : SfxEnumItem( _nWhich, (USHORT)eMode )
+SvxRotateModeItem::SvxRotateModeItem( SvxRotateMode eMode, sal_uInt16 _nWhich )
+ : SfxEnumItem( _nWhich, (sal_uInt16)eMode )
{
}
@@ -70,9 +70,9 @@ __EXPORT SvxRotateModeItem::~SvxRotateModeItem()
{
}
-SfxPoolItem* __EXPORT SvxRotateModeItem::Create( SvStream& rStream, USHORT ) const
+SfxPoolItem* __EXPORT SvxRotateModeItem::Create( SvStream& rStream, sal_uInt16 ) const
{
- USHORT nVal;
+ sal_uInt16 nVal;
rStream >> nVal;
return new SvxRotateModeItem( (SvxRotateMode) nVal,Which() );
}
@@ -100,7 +100,7 @@ SfxItemPresentation __EXPORT SvxRotateModeItem::GetPresentation(
return ePres;
}
-String __EXPORT SvxRotateModeItem::GetValueText( USHORT nVal ) const
+String __EXPORT SvxRotateModeItem::GetValueText( sal_uInt16 nVal ) const
{
String aText;
@@ -119,7 +119,7 @@ String __EXPORT SvxRotateModeItem::GetValueText( USHORT nVal ) const
return aText;
}
-USHORT __EXPORT SvxRotateModeItem::GetValueCount() const
+sal_uInt16 __EXPORT SvxRotateModeItem::GetValueCount() const
{
return 4; // STANDARD, TOP, CENTER, BOTTOM
}
@@ -129,14 +129,14 @@ SfxPoolItem* __EXPORT SvxRotateModeItem::Clone( SfxItemPool* ) const
return new SvxRotateModeItem( *this );
}
-USHORT __EXPORT SvxRotateModeItem::GetVersion( USHORT /*nFileVersion*/ ) const
+sal_uInt16 __EXPORT SvxRotateModeItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
{
return 0;
}
// QueryValue/PutValue: Der ::com::sun::star::table::CellVertJustify enum wird mitbenutzt...
-sal_Bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+sal_Bool SvxRotateModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
table::CellVertJustify eUno = table::CellVertJustify_STANDARD;
switch ( (SvxRotateMode)GetValue() )
@@ -150,7 +150,7 @@ sal_Bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) con
return sal_True;
}
-sal_Bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+sal_Bool SvxRotateModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
table::CellVertJustify eUno;
if(!(rVal >>= eUno))
@@ -170,7 +170,7 @@ sal_Bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
case table::CellVertJustify_BOTTOM: eSvx = SVX_ROTATE_MODE_BOTTOM; break;
default: ;//prevent warning
}
- SetValue( (USHORT)eSvx );
+ SetValue( (sal_uInt16)eSvx );
return sal_True;
}
diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx
index 47775bb7a2ce..7f8dd5854e3b 100644
--- a/svx/source/items/viewlayoutitem.cxx
+++ b/svx/source/items/viewlayoutitem.cxx
@@ -45,7 +45,7 @@ TYPEINIT1_FACTORY(SvxViewLayoutItem,SfxUInt16Item, new SvxViewLayoutItem);
SvxViewLayoutItem::SvxViewLayoutItem
(
- USHORT nColumns,
+ sal_uInt16 nColumns,
bool bBookMode,
sal_uInt16 _nWhich
)
@@ -111,7 +111,7 @@ int SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const
mbBookMode == rItem.IsBookMode() );
}
-sal_Bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -137,7 +137,7 @@ sal_Bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMe
return sal_True;
}
-sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -168,7 +168,7 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if ( bAllConverted && nConvertedCount == VIEWLAYOUT_PARAMS )
{
- SetValue( (UINT16)nColumns );
+ SetValue( (sal_uInt16)nColumns );
mbBookMode = bBookMode;
return sal_True;
}
@@ -182,7 +182,7 @@ sal_Bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
sal_Int32 nVal = 0;
if ( rVal >>= nVal )
{
- SetValue( (UINT16)nVal );
+ SetValue( (sal_uInt16)nVal );
return sal_True;
}
else
diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
index 555e0ad07f94..c66432c5b0d4 100644
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -44,7 +44,7 @@ TYPEINIT1_FACTORY(SvxZoomSliderItem,SfxUInt16Item, new SvxZoomSliderItem);
// -----------------------------------------------------------------------
-SvxZoomSliderItem::SvxZoomSliderItem( USHORT nCurrentZoom, USHORT nMinZoom, USHORT nMaxZoom, USHORT _nWhich )
+SvxZoomSliderItem::SvxZoomSliderItem( sal_uInt16 nCurrentZoom, sal_uInt16 nMinZoom, sal_uInt16 nMaxZoom, sal_uInt16 _nWhich )
: SfxUInt16Item( _nWhich, nCurrentZoom ), mnMinZoom( nMinZoom ), mnMaxZoom( nMaxZoom )
{
}
@@ -108,7 +108,7 @@ int SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const
mnMinZoom == rItem.mnMinZoom && mnMaxZoom == rItem.mnMaxZoom );
}
-sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -156,7 +156,7 @@ sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMe
return sal_True;
}
-sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -200,10 +200,10 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
if ( bAllConverted && nConvertedCount == ZOOMSLIDER_PARAMS )
{
- SetValue( (UINT16)nCurrentZoom );
+ SetValue( (sal_uInt16)nCurrentZoom );
maValues = aValues;
- mnMinZoom = sal::static_int_cast< USHORT >( nMinZoom );
- mnMaxZoom = sal::static_int_cast< USHORT >( nMaxZoom );
+ mnMinZoom = sal::static_int_cast< sal_uInt16 >( nMinZoom );
+ mnMaxZoom = sal::static_int_cast< sal_uInt16 >( nMaxZoom );
return sal_True;
}
@@ -217,7 +217,7 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
sal_Int32 nVal = 0;
if ( rVal >>= nVal )
{
- SetValue( (UINT16)nVal );
+ SetValue( (sal_uInt16)nVal );
return sal_True;
}
else
@@ -240,7 +240,7 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
sal_Int32 nVal = 0;
if( rVal >>= nVal )
{
- mnMinZoom = (UINT16)nVal;
+ mnMinZoom = (sal_uInt16)nVal;
return sal_True;
}
else
@@ -251,7 +251,7 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
sal_Int32 nVal = 0;
if( rVal >>= nVal )
{
- mnMaxZoom = (UINT16)nVal;
+ mnMaxZoom = (sal_uInt16)nVal;
return sal_True;
}
else
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 6833117a1335..471146daf00b 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -55,7 +55,7 @@ SFX_IMPL_MENU_CONTROL(SvxSmartTagsControl, SvxSmartTagItem);
SvxSmartTagsControl::SvxSmartTagsControl
(
- USHORT _nId,
+ sal_uInt16 _nId,
Menu& rMenu,
SfxBindings& /*rBindings*/
) :
@@ -68,17 +68,17 @@ SvxSmartTagsControl::SvxSmartTagsControl
//--------------------------------------------------------------------
-const USHORT MN_ST_INSERT_START = 500;
+const sal_uInt16 MN_ST_INSERT_START = 500;
void SvxSmartTagsControl::FillMenu()
{
if ( !mpSmartTagItem )
return;
- USHORT nMenuPos = 0;
- USHORT nSubMenuPos = 0;
- USHORT nMenuId = 1;
- USHORT nSubMenuId = MN_ST_INSERT_START;
+ sal_uInt16 nMenuPos = 0;
+ sal_uInt16 nSubMenuPos = 0;
+ sal_uInt16 nMenuId = 1;
+ sal_uInt16 nSubMenuId = MN_ST_INSERT_START;
const Sequence < Sequence< Reference< smarttags::XSmartTagAction > > >& rActionComponentsSequence = mpSmartTagItem->GetActionComponentsSequence();
const Sequence < Sequence< sal_Int32 > >& rActionIndicesSequence = mpSmartTagItem->GetActionIndicesSequence();
@@ -89,7 +89,7 @@ void SvxSmartTagsControl::FillMenu()
const Reference<text::XTextRange>& xTextRange = mpSmartTagItem->GetTextRange();
const Reference<frame::XController>& xController = mpSmartTagItem->GetController();
- for ( USHORT j = 0; j < rActionComponentsSequence.getLength(); ++j )
+ for ( sal_uInt16 j = 0; j < rActionComponentsSequence.getLength(); ++j )
{
Reference< container::XStringKeyMap > xSmartTagProperties = rStringKeyMaps[j];
@@ -127,7 +127,7 @@ void SvxSmartTagsControl::FillMenu()
pSbMenu->InsertSeparator( nSubMenuPos++ );
// Add subitem for every action reference for the current smart tag type:
- for ( USHORT i = 0; i < rActionComponents.getLength(); ++i )
+ for ( sal_uInt16 i = 0; i < rActionComponents.getLength(); ++i )
{
xAction = rActionComponents[i];
@@ -153,7 +153,7 @@ void SvxSmartTagsControl::FillMenu()
//--------------------------------------------------------------------
-void SvxSmartTagsControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
mrParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState );
@@ -200,7 +200,7 @@ IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen )
// ohne dispatcher!!!
// GetBindings().Execute( GetId(), SFX_CALLMODE_RECORD,meine beiden items, 0L );*/
- //SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, TRUE);
+ //SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, sal_True);
//GetBindings().GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SFX_CALLMODE_ASYNCHRON, &aBool, 0L );
return 0;
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index db92fd66d425..52c468d0bda5 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -51,13 +51,13 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxClipBoardControl, SfxVoidItem /*SfxUInt16Item*/ );
SvxClipBoardControl::SvxClipBoardControl(
- USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+ sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
pClipboardFmtItem( 0 ),
pPopup (0),
nItemId (nId),
- bDisabled( FALSE )
+ bDisabled( sal_False )
{
addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ClipboardFormatItems" )));
ToolBox& rBox = GetToolBox();
@@ -83,25 +83,25 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow()
else
pPopup = new PopupMenu;
- USHORT nCount = pFmtItem->Count();
- for (USHORT i = 0; i < nCount; ++i)
+ sal_uInt16 nCount = pFmtItem->Count();
+ for (sal_uInt16 i = 0; i < nCount; ++i)
{
- ULONG nFmtID = pFmtItem->GetClipbrdFormatId( i );
+ sal_uIntPtr nFmtID = pFmtItem->GetClipbrdFormatId( i );
String aFmtStr( pFmtItem->GetClipbrdFormatName( i ) );
if (!aFmtStr.Len())
aFmtStr = SvPasteObjectHelper::GetSotFormatUIName( nFmtID );
- pPopup->InsertItem( (USHORT)nFmtID, aFmtStr );
+ pPopup->InsertItem( (sal_uInt16)nFmtID, aFmtStr );
}
ToolBox& rBox = GetToolBox();
- USHORT nId = GetId();
- rBox.SetItemDown( nId, TRUE );
+ sal_uInt16 nId = GetId();
+ rBox.SetItemDown( nId, sal_True );
pPopup->Execute( &rBox, rBox.GetItemRect( nId ),
(rBox.GetAlign() == WINDOWALIGN_TOP || rBox.GetAlign() == WINDOWALIGN_BOTTOM) ?
POPUPMENU_EXECUTE_DOWN : POPUPMENU_EXECUTE_RIGHT );
- rBox.SetItemDown( nId, FALSE );
+ rBox.SetItemDown( nId, sal_False );
SfxUInt32Item aItem( SID_CLIPBOARD_FORMAT_ITEMS, pPopup->GetCurItemId() );
@@ -126,7 +126,7 @@ SfxPopupWindowType SvxClipBoardControl::GetPopupWindowType() const
}
-void SvxClipBoardControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
if ( SID_CLIPBOARD_FORMAT_ITEMS == nSID )
{
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
index 0cd5dfa335da..4f51e111c2c3 100644
--- a/svx/source/mnuctrls/fntctl.cxx
+++ b/svx/source/mnuctrls/fntctl.cxx
@@ -53,7 +53,7 @@ SFX_IMPL_MENU_CONTROL(SvxFontMenuControl, SvxFontItem);
SvxFontMenuControl::SvxFontMenuControl
(
- USHORT _nId,
+ sal_uInt16 _nId,
Menu& rMenu,
SfxBindings& rBindings
) :
@@ -102,7 +102,7 @@ void SvxFontMenuControl::FillMenu()
void SvxFontMenuControl::StateChanged(
- USHORT, SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
rParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState );
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
index 48c1a1158c4c..32933ae8b716 100644
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ b/svx/source/mnuctrls/fntszctl.cxx
@@ -67,7 +67,7 @@ IMPL_LINK( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen )
return 0;
const SfxItemPool& rPool = pSh->GetPool();
- USHORT nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
+ sal_uInt16 nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
const SfxMapUnit eUnit = rPool.GetMetric( nWhich );
long nH = LOGIC( pMen->GetCurHeight(), MAP_POINT, (MapUnit)eUnit ) / 10;
SvxFontHeightItem aItem( nH, 100, GetId() );
@@ -87,7 +87,7 @@ IMPL_LINK( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen )
void SvxFontSizeMenuControl::StateChanged(
- USHORT, SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
rParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState );
@@ -110,7 +110,7 @@ void SvxFontSizeMenuControl::StateChanged(
return;
const SfxItemPool& rPool = pSh->GetPool();
- USHORT nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
+ sal_uInt16 nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
const SfxMapUnit eUnit = rPool.GetMetric( nWhich );
long nH = pItem->GetHeight() * 10;
nVal = LOGIC( nH, (MapUnit)eUnit, MAP_POINT );
@@ -169,7 +169,7 @@ void SvxFontSizeMenuControl::StateChanged(
SvxFontSizeMenuControl::SvxFontSizeMenuControl
(
- USHORT _nId,
+ sal_uInt16 _nId,
Menu& rMenu,
SfxBindings& rBindings
) :
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index d4748a14ed98..48e0e5b1e349 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -326,7 +326,7 @@ namespace sdr
aLocalGrafInfo.SetChannelG(((SdrGrafGreenItem&)rItemSet.Get(SDRATTR_GRAFGREEN)).GetValue());
aLocalGrafInfo.SetChannelB(((SdrGrafBlueItem&)rItemSet.Get(SDRATTR_GRAFBLUE)).GetValue());
aLocalGrafInfo.SetGamma(((SdrGrafGamma100Item&)rItemSet.Get(SDRATTR_GRAFGAMMA)).GetValue() * 0.01);
- aLocalGrafInfo.SetTransparency((BYTE)::basegfx::fround(Min(nTrans, (USHORT)100) * 2.55));
+ aLocalGrafInfo.SetTransparency((sal_uInt8)::basegfx::fround(Min(nTrans, (sal_uInt16)100) * 2.55));
aLocalGrafInfo.SetInvert(((SdrGrafInvertItem&)rItemSet.Get(SDRATTR_GRAFINVERT)).GetValue());
aLocalGrafInfo.SetDrawMode(((SdrGrafModeItem&)rItemSet.Get(SDRATTR_GRAFMODE)).GetValue());
aLocalGrafInfo.SetCrop(rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom());
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 0070646b3330..dabb4e21231e 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -145,7 +145,7 @@ void SmartTagMgr::GetActionSequences( Sequence < rtl::OUString >& rSmartTagTypes
rActionComponentsSequence.realloc( rSmartTagTypes.getLength() );
rActionIndicesSequence.realloc( rSmartTagTypes.getLength() );
- for ( USHORT j = 0; j < rSmartTagTypes.getLength(); ++j )
+ for ( sal_uInt16 j = 0; j < rSmartTagTypes.getLength(); ++j )
{
const rtl::OUString& rSmartTagType = rSmartTagTypes[j];
@@ -154,7 +154,7 @@ void SmartTagMgr::GetActionSequences( Sequence < rtl::OUString >& rSmartTagTypes
Sequence< Reference< smarttags::XSmartTagAction > > aActions( nNumberOfActionRefs );
Sequence< sal_Int32 > aIndices( nNumberOfActionRefs );
- USHORT i = 0;
+ sal_uInt16 i = 0;
SmartTagMapIter aActionsIter;
SmartTagMapIter aEnd = maSmartTagMap.upper_bound( rSmartTagType );
diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx
index 157a9bd06f7e..34952b1deea9 100644
--- a/svx/source/stbctrls/insctrl.cxx
+++ b/svx/source/stbctrls/insctrl.cxx
@@ -50,12 +50,12 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxInsertStatusBarControl, SfxBoolItem);
// class SvxInsertStatusBarControl ---------------------------------------
-SvxInsertStatusBarControl::SvxInsertStatusBarControl( USHORT _nSlotId,
- USHORT _nId,
+SvxInsertStatusBarControl::SvxInsertStatusBarControl( sal_uInt16 _nSlotId,
+ sal_uInt16 _nId,
StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb ),
- bInsert( TRUE )
+ bInsert( sal_True )
{
}
@@ -67,7 +67,7 @@ SvxInsertStatusBarControl::~SvxInsertStatusBarControl()
// -----------------------------------------------------------------------
-void SvxInsertStatusBarControl::StateChanged( USHORT , SfxItemState eState,
+void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState,
const SfxPoolItem* pState )
{
if ( SFX_ITEM_AVAILABLE != eState )
@@ -110,14 +110,14 @@ void SvxInsertStatusBarControl::Paint( const UserDrawEvent& )
void SvxInsertStatusBarControl::DrawItemText_Impl()
{
- USHORT _nId = RID_SVXSTR_OVERWRITE_TEXT;
+ sal_uInt16 _nId = RID_SVXSTR_OVERWRITE_TEXT;
if ( bInsert )
_nId = RID_SVXSTR_INSERT_TEXT;
GetStatusBar().SetItemText( GetId(), SVX_RESSTR( _nId ) );
}
-ULONG SvxInsertStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxInsertStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
{
long nWidth1 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_OVERWRITE_TEXT));
long nWidth2 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_INSERT_TEXT));
diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx
index 986b84f7b8dc..87dce0e942df 100644
--- a/svx/source/stbctrls/modctrl.cxx
+++ b/svx/source/stbctrls/modctrl.cxx
@@ -47,18 +47,18 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxModifyControl, SfxBoolItem);
// class SvxModifyControl ------------------------------------------------
-SvxModifyControl::SvxModifyControl( USHORT _nSlotId,
- USHORT _nId,
+SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId,
+ sal_uInt16 _nId,
StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb ),
- bState( TRUE )
+ bState( sal_True )
{
}
// -----------------------------------------------------------------------
-void SvxModifyControl::StateChanged( USHORT, SfxItemState eState,
+void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState,
const SfxPoolItem* pState )
{
if ( SFX_ITEM_AVAILABLE != eState )
@@ -90,7 +90,7 @@ void SvxModifyControl::DrawItemText_Impl()
GetStatusBar().SetItemText( GetId(), sMode );
}
-ULONG SvxModifyControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxModifyControl::GetDefItemWidth(const StatusBar& rStb)
{
return rStb.GetTextWidth(String::CreateFromAscii("XX"));
}
diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx
index 43b563f78411..d02b86ad3920 100644
--- a/svx/source/stbctrls/pszctrl.cxx
+++ b/svx/source/stbctrls/pszctrl.cxx
@@ -113,19 +113,19 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxPosSizeStatusBarControl, SvxSizeItem);
class FunctionPopup_Impl : public PopupMenu
{
public:
- FunctionPopup_Impl( USHORT nCheck );
+ FunctionPopup_Impl( sal_uInt16 nCheck );
- USHORT GetSelected() const { return nSelected; }
+ sal_uInt16 GetSelected() const { return nSelected; }
private:
- USHORT nSelected;
+ sal_uInt16 nSelected;
virtual void Select();
};
// -----------------------------------------------------------------------
-FunctionPopup_Impl::FunctionPopup_Impl( USHORT nCheck ) :
+FunctionPopup_Impl::FunctionPopup_Impl( sal_uInt16 nCheck ) :
PopupMenu( ResId( RID_SVXMNU_PSZ_FUNC, DIALOG_MGR() ) ),
nSelected( 0 )
{
@@ -158,11 +158,11 @@ struct SvxPosSizeStatusBarControl_Impl
Point aPos; // g"ultig, wenn eine Position angezeigt wird
Size aSize; // g"ultig, wenn eine Gr"o/se angezeigt wird
String aStr; // g"ultig, wenn ein Text angezeigt wird
- BOOL bPos; // show position
+ sal_Bool bPos; // show position
BOOL bSize; // Gr"o/se anzeigen?
- BOOL bTable; // Tabellenindex anzeigen?
- BOOL bHasMenu; // StarCalc Popup-Menue anzeigen?
- USHORT nFunction; // selektierte StarCalc Funktion
+ sal_Bool bTable; // Tabellenindex anzeigen?
+ sal_Bool bHasMenu; // StarCalc Popup-Menue anzeigen?
+ sal_uInt16 nFunction; // selektierte StarCalc Funktion
Image aPosImage; // Image f"ur die Positionsanzeige
Image aSizeImage; // Image f"ur die Gr"o/senanzeige
};
@@ -180,16 +180,16 @@ struct SvxPosSizeStatusBarControl_Impl
#define STR_TABLECELL ".uno:StateTableCell"
#define STR_FUNC ".uno:StatusBarFunc"
-SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( USHORT _nSlotId,
- USHORT _nId,
+SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId,
+ sal_uInt16 _nId,
StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb ),
pImp( new SvxPosSizeStatusBarControl_Impl )
{
- pImp->bPos = FALSE;
- pImp->bSize = FALSE;
- pImp->bTable = FALSE;
- pImp->bHasMenu = FALSE;
+ pImp->bPos = sal_False;
+ pImp->bSize = sal_False;
+ pImp->bTable = sal_False;
+ pImp->bHasMenu = sal_False;
pImp->nFunction = 0;
pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) );
@@ -223,15 +223,15 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl()
NULL/Void SfxPointItem SvxSizeItem SfxStringItem
------------------------------------------------------------------------
- Zeit TRUE FALSE FALSE FALSE
- Position FALSE FALSE
+ Zeit sal_True sal_False sal_False FALSE
+ Position sal_False FALSE
Gro"sse FALSE TRUE FALSE
- Text FALSE FALSE TRUE
+ Text sal_False sal_False TRUE
Ein anderes Item bewirkt einen Assert, die Zeitanzeige wird enabled.
*/
-void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState )
{
// da Kombi-Controller, immer die aktuelle Id als HelpId setzen
@@ -250,12 +250,12 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState,
{
if ( eState == SFX_ITEM_AVAILABLE )
{
- pImp->bHasMenu = TRUE;
+ pImp->bHasMenu = sal_True;
if ( pState && pState->ISA(SfxUInt16Item) )
pImp->nFunction = ((const SfxUInt16Item*)pState)->GetValue();
}
else
- pImp->bHasMenu = FALSE;
+ pImp->bHasMenu = sal_False;
}
else if ( SFX_ITEM_AVAILABLE != eState )
{
@@ -263,11 +263,11 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState,
// notified for all display types
if ( nSID == SID_TABLE_CELL )
- pImp->bTable = FALSE;
+ pImp->bTable = sal_False;
else if ( nSID == SID_ATTR_POSITION )
- pImp->bPos = FALSE;
+ pImp->bPos = sal_False;
else if ( nSID == GetSlotId() ) // controller is registered for SID_ATTR_SIZE
- pImp->bSize = FALSE;
+ pImp->bSize = sal_False;
else
{
DBG_ERRORFILE("unknown slot id");
@@ -277,31 +277,31 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState,
{
// Position anzeigen
pImp->aPos = ( (SfxPointItem*)pState )->GetValue();
- pImp->bPos = TRUE;
- pImp->bTable = FALSE;
+ pImp->bPos = sal_True;
+ pImp->bTable = sal_False;
}
else if ( pState->ISA( SvxSizeItem ) )
{
// Groesse anzeigen
pImp->aSize = ( (SvxSizeItem*)pState )->GetSize();
- pImp->bSize = TRUE;
- pImp->bTable = FALSE;
+ pImp->bSize = sal_True;
+ pImp->bTable = sal_False;
}
else if ( pState->ISA( SfxStringItem ) )
{
// String anzeigen (Tabellen-Zelle oder anderes)
pImp->aStr = ( (SfxStringItem*)pState )->GetValue();
- pImp->bTable = TRUE;
- pImp->bPos = FALSE;
- pImp->bSize = FALSE;
+ pImp->bTable = sal_True;
+ pImp->bPos = sal_False;
+ pImp->bSize = sal_False;
}
else
{
DBG_ERRORFILE( "invalid item type" );
// trotzdem Datum und Zeit anzeigen
- pImp->bPos = FALSE;
- pImp->bSize = FALSE;
- pImp->bTable = FALSE;
+ pImp->bPos = sal_False;
+ pImp->bSize = sal_False;
+ pImp->bTable = sal_False;
}
if ( GetStatusBar().AreItemsVisible() )
@@ -326,7 +326,7 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt )
{
if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU && pImp->bHasMenu )
{
- USHORT nSelect = pImp->nFunction;
+ sal_uInt16 nSelect = pImp->nFunction;
if (!nSelect)
nSelect = PSZ_FUNC_NONE;
FunctionPopup_Impl aMenu( nSelect );
@@ -432,12 +432,12 @@ void SvxPosSizeStatusBarControl::Paint( const UserDrawEvent& rUsrEvt )
// -----------------------------------------------------------------------
-ULONG SvxPosSizeStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxPosSizeStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
{
Image aTmpPosImage( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) );
Image aTmpSizeImage( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) );
- ULONG nWidth=PAINT_OFFSET+aTmpPosImage.GetSizePixel().Width();
+ sal_uIntPtr nWidth=PAINT_OFFSET+aTmpPosImage.GetSizePixel().Width();
nWidth+=PAINT_OFFSET+aTmpSizeImage.GetSizePixel().Width();
nWidth+=2*(PAINT_OFFSET+rStb.GetTextWidth(String::CreateFromAscii("XXXX,XX / XXXX,XX")));
diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx
index e56ba9aeaef9..e216a4c204ba 100644
--- a/svx/source/stbctrls/selctrl.cxx
+++ b/svx/source/stbctrls/selctrl.cxx
@@ -50,8 +50,8 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxSelectionModeControl, SfxUInt16Item);
// class SvxSelectionModeControl -----------------------------------------
-SvxSelectionModeControl::SvxSelectionModeControl( USHORT _nSlotId,
- USHORT _nId,
+SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId,
+ sal_uInt16 _nId,
StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb ),
nState( 0 )
@@ -60,7 +60,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( USHORT _nSlotId,
// -----------------------------------------------------------------------
-void SvxSelectionModeControl::StateChanged( USHORT, SfxItemState eState,
+void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState,
const SfxPoolItem* pState )
{
if ( SFX_ITEM_AVAILABLE != eState )
@@ -108,7 +108,7 @@ void SvxSelectionModeControl::Paint( const UserDrawEvent& )
void SvxSelectionModeControl::DrawItemText_Impl()
{
String sTxt;
- USHORT _nId = 0;
+ sal_uInt16 _nId = 0;
switch ( nState )
{
@@ -132,7 +132,7 @@ void SvxSelectionModeControl::DrawItemText_Impl()
GetStatusBar().SetItemText( GetId(), sTxt );
}
-ULONG SvxSelectionModeControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxSelectionModeControl::GetDefItemWidth(const StatusBar& rStb)
{
long nWidth1 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_STD));
long nWidth2 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_ER));
diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx
index 26daed799c6e..4a5062cc6645 100644
--- a/svx/source/stbctrls/xmlsecctrl.cxx
+++ b/svx/source/stbctrls/xmlsecctrl.cxx
@@ -80,19 +80,19 @@ struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl
{
Point maPos;
Size maSize;
- UINT16 mnState;
+ sal_uInt16 mnState;
Image maImage;
Image maImageBroken;
Image maImageNotValidated;
};
-XmlSecStatusBarControl::XmlSecStatusBarControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb )
+XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb )
:SfxStatusBarControl( _nSlotId, _nId, _rStb )
,mpImpl( new XmlSecStatusBarControl_Impl )
{
- mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
+ mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
sal_Bool bHC = GetStatusBar().GetSettings().GetStyleSettings().GetHighContrastMode();
mpImpl->maImage = Image( SVX_RES( bHC ? RID_SVXBMP_SIGNET_H : RID_SVXBMP_SIGNET ) );
@@ -107,11 +107,11 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl()
delete mpImpl;
}
-void XmlSecStatusBarControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
if( SFX_ITEM_AVAILABLE != eState )
{
- mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
+ mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
}
else if( pState->ISA( SfxUInt16Item ) )
{
@@ -121,7 +121,7 @@ void XmlSecStatusBarControl::StateChanged( USHORT, SfxItemState eState, const Sf
else
{
DBG_ERRORFILE( "+XmlSecStatusBarControl::StateChanged(): invalid item type" );
- mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN;
+ mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN;
}
if( GetStatusBar().AreItemsVisible() ) // necessary ?
@@ -129,7 +129,7 @@ void XmlSecStatusBarControl::StateChanged( USHORT, SfxItemState eState, const Sf
GetStatusBar().SetItemText( GetId(), String() ); // necessary ?
- USHORT nResId = RID_SVXSTR_XMLSEC_NO_SIG;
+ sal_uInt16 nResId = RID_SVXSTR_XMLSEC_NO_SIG;
if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_OK )
nResId = RID_SVXSTR_XMLSEC_SIG_OK;
else if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_BROKEN )
diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx
index fb9fc65583e3..9439df87d8b9 100644
--- a/svx/source/stbctrls/zoomctrl.cxx
+++ b/svx/source/stbctrls/zoomctrl.cxx
@@ -52,27 +52,27 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxZoomStatusBarControl,SvxZoomItem);
class ZoomPopup_Impl : public PopupMenu
{
public:
- ZoomPopup_Impl( USHORT nZ, USHORT nValueSet );
+ ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet );
- USHORT GetZoom() const { return nZoom; }
- USHORT GetCurId() const { return nCurId; }
+ sal_uInt16 GetZoom() const { return nZoom; }
+ sal_uInt16 GetCurId() const { return nCurId; }
private:
- USHORT nZoom;
- USHORT nCurId;
+ sal_uInt16 nZoom;
+ sal_uInt16 nCurId;
virtual void Select();
};
// -----------------------------------------------------------------------
-ZoomPopup_Impl::ZoomPopup_Impl( USHORT nZ, USHORT nValueSet )
+ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet )
: PopupMenu( ResId( RID_SVXMNU_ZOOM, DIALOG_MGR() ) ),
nZoom( nZ )
{
- static USHORT aTable[] =
+ static sal_uInt16 aTable[] =
{
SVX_ZOOM_ENABLE_50, ZOOM_50,
SVX_ZOOM_ENABLE_100, ZOOM_100,
@@ -83,9 +83,9 @@ ZoomPopup_Impl::ZoomPopup_Impl( USHORT nZ, USHORT nValueSet )
SVX_ZOOM_ENABLE_PAGEWIDTH, ZOOM_PAGE_WIDTH
};
- for ( USHORT nPos = 0; nPos < sizeof(aTable) / sizeof(USHORT); nPos += 2 )
+ for ( sal_uInt16 nPos = 0; nPos < sizeof(aTable) / sizeof(sal_uInt16); nPos += 2 )
if ( ( aTable[nPos] != ( aTable[nPos] & nValueSet ) ) )
- EnableItem( aTable[nPos+1], FALSE );
+ EnableItem( aTable[nPos+1], sal_False );
}
// -----------------------------------------------------------------------
@@ -111,8 +111,8 @@ void ZoomPopup_Impl::Select()
// class SvxZoomStatusBarControl ------------------------------------------
-SvxZoomStatusBarControl::SvxZoomStatusBarControl( USHORT _nSlotId,
- USHORT _nId,
+SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId,
+ sal_uInt16 _nId,
StatusBar& rStb ) :
SfxStatusBarControl( _nSlotId, _nId, rStb ),
@@ -123,7 +123,7 @@ SvxZoomStatusBarControl::SvxZoomStatusBarControl( USHORT _nSlotId,
// -----------------------------------------------------------------------
-void SvxZoomStatusBarControl::StateChanged( USHORT, SfxItemState eState,
+void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState,
const SfxPoolItem* pState )
{
if( SFX_ITEM_AVAILABLE != eState )
@@ -214,7 +214,7 @@ void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt )
SfxStatusBarControl::Command( rCEvt );
}
-ULONG SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
+sal_uIntPtr SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar& rStb)
{
long nWidth1 = rStb.GetTextWidth(String::CreateFromAscii("XXXXX%"));
return nWidth1;
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx
index 729538f707c7..a957482405c4 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -51,12 +51,12 @@ SFX_IMPL_STATUSBAR_CONTROL( SvxZoomSliderControl, SvxZoomSliderItem );
struct SvxZoomSliderControl::SvxZoomSliderControl_Impl
{
- USHORT mnCurrentZoom;
- USHORT mnMinZoom;
- USHORT mnMaxZoom;
- USHORT mnSliderCenter;
+ sal_uInt16 mnCurrentZoom;
+ sal_uInt16 mnMinZoom;
+ sal_uInt16 mnMaxZoom;
+ sal_uInt16 mnSliderCenter;
std::vector< long > maSnappingPointOffsets;
- std::vector< USHORT > maSnappingPointZooms;
+ std::vector< sal_uInt16 > maSnappingPointZooms;
Image maSliderButton;
Image maIncreaseButton;
Image maDecreaseButton;
@@ -93,10 +93,10 @@ const long nSnappingPointsMinDist = nSnappingEpsilon; // minimum distance of two
// nOffset referes to the origin of the control:
// + ----------- -
-USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
+sal_uInt16 SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
{
const long nControlWidth = getControlRect().GetWidth();
- USHORT nRet = 0;
+ sal_uInt16 nRet = 0;
if ( nOffset < nSliderXOffset )
return mpImpl->mnMinZoom;;
@@ -105,7 +105,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
return mpImpl->mnMaxZoom;
// check for snapping points:
- USHORT nCount = 0;
+ sal_uInt16 nCount = 0;
std::vector< long >::iterator aSnappingPointIter;
for ( aSnappingPointIter = mpImpl->maSnappingPointOffsets.begin();
aSnappingPointIter != mpImpl->maSnappingPointOffsets.end();
@@ -130,7 +130,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset;
const long nZoomPerSliderPixel = (1000 * nFirstHalfRange) / nHalfSliderWidth;
const long nOffsetToSliderLeft = nOffset - nSliderXOffset;
- nRet = mpImpl->mnMinZoom + USHORT( nOffsetToSliderLeft * nZoomPerSliderPixel / 1000 );
+ nRet = mpImpl->mnMinZoom + sal_uInt16( nOffsetToSliderLeft * nZoomPerSliderPixel / 1000 );
}
else
{
@@ -139,7 +139,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset;
const long nZoomPerSliderPixel = 1000 * nSecondHalfRange / nHalfSliderWidth;
const long nOffsetToSliderCenter = nOffset - nControlWidth/2;
- nRet = mpImpl->mnSliderCenter + USHORT( nOffsetToSliderCenter * nZoomPerSliderPixel / 1000 );
+ nRet = mpImpl->mnSliderCenter + sal_uInt16( nOffsetToSliderCenter * nZoomPerSliderPixel / 1000 );
}
}
@@ -152,7 +152,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const
}
// returns the offset to the left control border
-long SvxZoomSliderControl::Zoom2Offset( USHORT nCurrentZoom ) const
+long SvxZoomSliderControl::Zoom2Offset( sal_uInt16 nCurrentZoom ) const
{
const long nControlWidth = getControlRect().GetWidth();
long nRet = nSliderXOffset;
@@ -181,7 +181,7 @@ long SvxZoomSliderControl::Zoom2Offset( USHORT nCurrentZoom ) const
// -----------------------------------------------------------------------
-SvxZoomSliderControl::SvxZoomSliderControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb ) :
+SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ) :
SfxStatusBarControl( _nSlotId, _nId, _rStb ),
mpImpl( new SvxZoomSliderControl_Impl )
{
@@ -200,7 +200,7 @@ SvxZoomSliderControl::~SvxZoomSliderControl()
// -----------------------------------------------------------------------
-void SvxZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
+void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
{
if ( (SFX_ITEM_AVAILABLE != eState) || pState->ISA( SfxVoidItem ) )
{
@@ -217,7 +217,7 @@ void SvxZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, c
mpImpl->mbValuesSet = true;
if ( mpImpl->mnSliderCenter == mpImpl->mnMaxZoom )
- mpImpl->mnSliderCenter = mpImpl->mnMinZoom + (USHORT)((mpImpl->mnMaxZoom - mpImpl->mnMinZoom) * 0.5);
+ mpImpl->mnSliderCenter = mpImpl->mnMinZoom + (sal_uInt16)((mpImpl->mnMaxZoom - mpImpl->mnMinZoom) * 0.5);
DBG_ASSERT( mpImpl->mnMinZoom <= mpImpl->mnCurrentZoom &&
@@ -231,20 +231,20 @@ void SvxZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, c
mpImpl->maSnappingPointZooms.clear();
// get all snapping points:
- std::set< USHORT > aTmpSnappingPoints;
- for ( USHORT j = 0; j < rSnappingPoints.getLength(); ++j )
+ std::set< sal_uInt16 > aTmpSnappingPoints;
+ for ( sal_uInt16 j = 0; j < rSnappingPoints.getLength(); ++j )
{
const sal_Int32 nSnappingPoint = rSnappingPoints[j];
- aTmpSnappingPoints.insert( (USHORT)nSnappingPoint );
+ aTmpSnappingPoints.insert( (sal_uInt16)nSnappingPoint );
}
// remove snapping points that are to close to each other:
- std::set< USHORT >::iterator aSnappingPointIter;
+ std::set< sal_uInt16 >::iterator aSnappingPointIter;
long nLastOffset = 0;
for ( aSnappingPointIter = aTmpSnappingPoints.begin(); aSnappingPointIter != aTmpSnappingPoints.end(); ++aSnappingPointIter )
{
- const USHORT nCurrent = *aSnappingPointIter;
+ const sal_uInt16 nCurrent = *aSnappingPointIter;
const long nCurrentOffset = Zoom2Offset( nCurrent );
if ( nCurrentOffset - nLastOffset >= nSnappingPointsMinDist )
@@ -347,10 +347,10 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt )
// -----------------------------------------------------------------------
-BOOL SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
+sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
{
if ( !mpImpl->mbValuesSet )
- return TRUE;;
+ return sal_True;;
const Rectangle aControlRect = getControlRect();
const Point aPoint = rEvt.GetPosPixel();
@@ -378,7 +378,7 @@ BOOL SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
mpImpl->mnCurrentZoom = mpImpl->mnMaxZoom;
if ( nOldZoom == mpImpl->mnCurrentZoom )
- return TRUE;
+ return sal_True;
if ( GetStatusBar().AreItemsVisible() )
GetStatusBar().SetItemData( GetId(), 0 ); // force repaint
@@ -399,15 +399,15 @@ BOOL SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt )
mpImpl->mbOmitPaint = false;
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------
-BOOL SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
+sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
{
if ( !mpImpl->mbValuesSet )
- return TRUE;;
+ return sal_True;;
const short nButtons = rEvt.GetButtons();
@@ -444,5 +444,5 @@ BOOL SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt )
}
}
- return TRUE;
+ return sal_True;
}
diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx
index ffc753e61276..d6805fb24ee3 100644
--- a/svx/source/svdraw/ActionDescriptionProvider.cxx
+++ b/svx/source/svdraw/ActionDescriptionProvider.cxx
@@ -35,7 +35,7 @@
::rtl::OUString ActionDescriptionProvider::createDescription( ActionType eActionType
, const ::rtl::OUString& rObjectName )
{
- USHORT nResID=0;
+ sal_uInt16 nResID=0;
switch( eActionType )
{
case INSERT:
diff --git a/svx/source/svdraw/impgrfll.cxx b/svx/source/svdraw/impgrfll.cxx
index be2fc907d173..a649977b744c 100644
--- a/svx/source/svdraw/impgrfll.cxx
+++ b/svx/source/svdraw/impgrfll.cxx
@@ -42,12 +42,12 @@ void ImpCalcBmpFillSizes( Size& rStartOffset,
const Size& rBmpSize,
const Size& rBmpPerCent,
const Size& rBmpOffPerCent,
- BOOL bBmpLogSize,
- BOOL bBmpTile,
- BOOL bBmpStretch,
+ sal_Bool bBmpLogSize,
+ sal_Bool bBmpTile,
+ sal_Bool bBmpStretch,
RECT_POINT eBmpRectPoint )
{
- BOOL bOriginalSize = FALSE, bScaleSize = FALSE;
+ sal_Bool bOriginalSize = sal_False, bScaleSize = sal_False;
// Falls keine Groessen gegeben sind ( z.B. alte Dokumente )
// berechnen wir uns die Groesse selber aus der Bitmap
@@ -57,16 +57,16 @@ void ImpCalcBmpFillSizes( Size& rStartOffset,
if( bBmpLogSize )
{
if( !rBmpSize.Width() && !rBmpSize.Height() )
- bOriginalSize = TRUE;
+ bOriginalSize = sal_True;
else if( !rBmpSize.Width() || !rBmpSize.Height() )
- bScaleSize = TRUE;
+ bScaleSize = sal_True;
}
else
{
if( !rBmpPerCent.Width() && !rBmpPerCent.Height() )
- bOriginalSize = TRUE;
+ bOriginalSize = sal_True;
else if( !rBmpPerCent.Width() || !rBmpPerCent.Height() )
- bScaleSize = TRUE;
+ bScaleSize = sal_True;
}
// entweder Originalgroesse oder angepasste Groesse
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index b564421f6d0e..79c09eea0179 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -79,8 +79,8 @@ using namespace ::com::sun::star;
// , thus it seems not necessary to make
// it visible her at all.
// #58917# Das Show darf nicht am VCL-Fenster landen, weil dann Assertion vom SFX
- // BOOL bVis = pWindow->IsVisible();
- // xC->setVisible(TRUE);
+ // sal_Bool bVis = pWindow->IsVisible();
+ // xC->setVisible(sal_True);
// if ( !bVis )
// pWindow->Hide();
// if( !mxContext.is() && bVisible )
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 1adddfc29b2b..1a4c17d19959 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -299,11 +299,11 @@ SdrItemPool::SdrItemPool(
SvxBoxInfoItem* pBoxInfoItem = new SvxBoxInfoItem( SDRATTR_TABLE_BORDER_INNER );
- pBoxInfoItem->SetTable( TRUE );
- pBoxInfoItem->SetDist( TRUE); // Abstandsfeld immer anzeigen
-// pBoxInfoItem->SetMinDist( TRUE );// Minimalgroesse in Tabellen und Absaetzen setzen
+ pBoxInfoItem->SetTable( sal_True );
+ pBoxInfoItem->SetDist( sal_True); // Abstandsfeld immer anzeigen
+// pBoxInfoItem->SetMinDist( sal_True );// Minimalgroesse in Tabellen und Absaetzen setzen
// pBoxInfoItem->SetDefDist( MIN_BORDER_DIST );// Default-Abstand immer setzen
- pBoxInfoItem->SetValid( VALID_DISABLE, TRUE ); // Einzelne Linien koennen nur in Tabellen DontCare-Status haben
+ pBoxInfoItem->SetValid( VALID_DISABLE, sal_True ); // Einzelne Linien koennen nur in Tabellen DontCare-Status haben
mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_INNER - SDRATTR_START ] = pBoxInfoItem;
// mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_SHADOW - SDRATTR_START ] = new SvxShadowItem( SDRATTR_TABLE_BORDER_SHADOW );
@@ -329,7 +329,7 @@ SdrItemPool::SdrItemPool(
/*************************************************************************
|*
|* copy ctor, sorgt dafuer, dass die static defaults gecloned werden
-|* (Parameter 2 = TRUE)
+|* (Parameter 2 = sal_True)
|*
\************************************************************************/
@@ -384,7 +384,7 @@ SfxItemPresentation __EXPORT SdrItemPool::GetPresentation(
const IntlWrapper * pIntlWrapper) const
{
if (!IsInvalidItem(&rItem)) {
- USHORT nWhich=rItem.Which();
+ sal_uInt16 nWhich=rItem.Which();
if (nWhich>=SDRATTR_SHADOW_FIRST && nWhich<=SDRATTR_END) {
rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS,
GetMetric(nWhich),ePresentationMetric,rText,
@@ -404,7 +404,7 @@ SfxItemPresentation __EXPORT SdrItemPool::GetPresentation(
void SdrItemPool::TakeItemName(sal_uInt16 nWhich, String& rItemName)
{
ResMgr* pResMgr = ImpGetResMgr();
- USHORT nResId = SIP_UNKNOWN_ATTR;
+ sal_uInt16 nResId = SIP_UNKNOWN_ATTR;
switch (nWhich)
{
@@ -632,10 +632,10 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, String& rItemName)
TYPEINIT1_AUTOFACTORY(SdrFractionItem,SfxPoolItem);
-SdrFractionItem::SdrFractionItem(USHORT nId, SvStream& rIn):
+SdrFractionItem::SdrFractionItem(sal_uInt16 nId, SvStream& rIn):
SfxPoolItem(nId)
{
- INT32 nMul,nDiv;
+ sal_Int32 nMul,nDiv;
rIn>>nMul;
rIn>>nDiv;
nValue=Fraction(nMul,nDiv);
@@ -653,7 +653,7 @@ SfxItemPresentation __EXPORT SdrFractionItem::GetPresentation(
{
if(nValue.IsValid())
{
- INT32 nDiv = nValue.GetDenominator();
+ sal_Int32 nDiv = nValue.GetDenominator();
rText = UniString::CreateFromInt32(nValue.GetNumerator());
if(nDiv != 1)
@@ -680,15 +680,15 @@ SfxItemPresentation __EXPORT SdrFractionItem::GetPresentation(
return ePresentation;
}
-SfxPoolItem* __EXPORT SdrFractionItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrFractionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrFractionItem(Which(),rIn);
}
-SvStream& __EXPORT SdrFractionItem::Store(SvStream& rOut, USHORT /*nItemVers*/) const
+SvStream& __EXPORT SdrFractionItem::Store(SvStream& rOut, sal_uInt16 /*nItemVers*/) const
{
- rOut<<INT32(nValue.GetNumerator());
- rOut<<INT32(nValue.GetDenominator());
+ rOut<<sal_Int32(nValue.GetNumerator());
+ rOut<<sal_Int32(nValue.GetDenominator());
return rOut;
}
@@ -700,7 +700,7 @@ SfxPoolItem* __EXPORT SdrFractionItem::Clone(SfxItemPool * /*pPool*/) const
#ifdef SDR_ISPOOLABLE
int __EXPORT SdrFractionItem::IsPoolable() const
{
- USHORT nId=Which();
+ sal_uInt16 nId=Which();
return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
}
#endif
@@ -717,7 +717,7 @@ SfxItemPresentation __EXPORT SdrScaleItem::GetPresentation(
{
if(GetValue().IsValid())
{
- INT32 nDiv = GetValue().GetDenominator();
+ sal_Int32 nDiv = GetValue().GetDenominator();
rText = UniString::CreateFromInt32(GetValue().GetNumerator());
rText += sal_Unicode(':');
@@ -741,7 +741,7 @@ SfxItemPresentation __EXPORT SdrScaleItem::GetPresentation(
return ePresentation;
}
-SfxPoolItem* __EXPORT SdrScaleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrScaleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrScaleItem(Which(),rIn);
}
@@ -762,12 +762,12 @@ SfxPoolItem* __EXPORT SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const
return new SdrOnOffItem(Which(),GetValue());
}
-SfxPoolItem* __EXPORT SdrOnOffItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrOnOffItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrOnOffItem(Which(),rIn);
}
-XubString __EXPORT SdrOnOffItem::GetValueTextByVal(BOOL bVal) const
+XubString __EXPORT SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const
{
if (bVal) return ImpGetResStr(STR_ItemValON);
else return ImpGetResStr(STR_ItemValOFF);
@@ -790,7 +790,7 @@ SfxItemPresentation __EXPORT SdrOnOffItem::GetPresentation(SfxItemPresentation e
#ifdef SDR_ISPOOLABLE
int __EXPORT SdrOnOffItem::IsPoolable() const
{
- USHORT nId=Which();
+ sal_uInt16 nId=Which();
return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
}
#endif
@@ -802,12 +802,12 @@ SfxPoolItem* __EXPORT SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const
return new SdrYesNoItem(Which(),GetValue());
}
-SfxPoolItem* __EXPORT SdrYesNoItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrYesNoItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrYesNoItem(Which(),rIn);
}
-XubString __EXPORT SdrYesNoItem::GetValueTextByVal(BOOL bVal) const
+XubString __EXPORT SdrYesNoItem::GetValueTextByVal(sal_Bool bVal) const
{
if (bVal) return ImpGetResStr(STR_ItemValYES);
else return ImpGetResStr(STR_ItemValNO);
@@ -830,7 +830,7 @@ SfxItemPresentation __EXPORT SdrYesNoItem::GetPresentation(SfxItemPresentation e
#ifdef SDR_ISPOOLABLE
int __EXPORT SdrYesNoItem::IsPoolable() const
{
- USHORT nId=Which();
+ sal_uInt16 nId=Which();
return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
}
#endif
@@ -846,7 +846,7 @@ SfxPoolItem* __EXPORT SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const
return new SdrPercentItem(Which(),GetValue());
}
-SfxPoolItem* __EXPORT SdrPercentItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrPercentItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrPercentItem(Which(),rIn);
}
@@ -873,7 +873,7 @@ SfxItemPresentation __EXPORT SdrPercentItem::GetPresentation(
#ifdef SDR_ISPOOLABLE
int __EXPORT SdrPercentItem::IsPoolable() const
{
- USHORT nId=Which();
+ sal_uInt16 nId=Which();
return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
}
#endif
@@ -889,7 +889,7 @@ SfxPoolItem* __EXPORT SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const
return new SdrAngleItem(Which(),GetValue());
}
-SfxPoolItem* __EXPORT SdrAngleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrAngleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrAngleItem(Which(),rIn);
}
@@ -898,8 +898,8 @@ SfxItemPresentation __EXPORT SdrAngleItem::GetPresentation(
SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
XubString& rText, const IntlWrapper * pIntlWrapper) const
{
- INT32 nValue(GetValue());
- BOOL bNeg(nValue < 0);
+ sal_Int32 nValue(GetValue());
+ sal_Bool bNeg(nValue < 0);
if(bNeg)
nValue = -nValue;
@@ -925,8 +925,8 @@ SfxItemPresentation __EXPORT SdrAngleItem::GetPresentation(
rText.Insert(aUnicodeNull, 0);
xub_StrLen nLen = rText.Len();
- BOOL bNull1(rText.GetChar(nLen-1) == aUnicodeNull);
- BOOL bNull2(bNull1 && rText.GetChar(nLen-2) == aUnicodeNull);
+ sal_Bool bNull1(rText.GetChar(nLen-1) == aUnicodeNull);
+ sal_Bool bNull2(bNull1 && rText.GetChar(nLen-2) == aUnicodeNull);
if(bNull2)
{
@@ -970,7 +970,7 @@ SfxItemPresentation __EXPORT SdrAngleItem::GetPresentation(
#ifdef SDR_ISPOOLABLE
int __EXPORT SdrAngleItem::IsPoolable() const
{
- USHORT nId=Which();
+ sal_uInt16 nId=Which();
return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
}
#endif
@@ -986,17 +986,17 @@ SfxPoolItem* __EXPORT SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const
return new SdrMetricItem(Which(),GetValue());
}
-SfxPoolItem* __EXPORT SdrMetricItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrMetricItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrMetricItem(Which(),rIn);
}
-FASTBOOL __EXPORT SdrMetricItem::HasMetrics() const
+int __EXPORT SdrMetricItem::HasMetrics() const
{
- return TRUE;
+ return sal_True;
}
-FASTBOOL __EXPORT SdrMetricItem::ScaleMetrics(long nMul, long nDiv)
+int __EXPORT SdrMetricItem::ScaleMetrics(long nMul, long nDiv)
{
if (GetValue()!=0) {
BigInt aVal(GetValue());
@@ -1005,7 +1005,7 @@ FASTBOOL __EXPORT SdrMetricItem::ScaleMetrics(long nMul, long nDiv)
aVal/=nDiv;
SetValue(long(aVal));
}
- return TRUE;
+ return sal_True;
}
SfxItemPresentation __EXPORT SdrMetricItem::GetPresentation(SfxItemPresentation ePres,
@@ -1030,7 +1030,7 @@ SfxItemPresentation __EXPORT SdrMetricItem::GetPresentation(SfxItemPresentation
#ifdef SDR_ISPOOLABLE
int __EXPORT SdrMetricItem::IsPoolable() const
{
- USHORT nId=Which();
+ sal_uInt16 nId=Which();
return nId<SDRATTR_NOTPERSIST_FIRST || nId>SDRATTR_NOTPERSIST_LAST;
}
#endif
@@ -1043,11 +1043,11 @@ TYPEINIT1_AUTOFACTORY(SdrCaptionTypeItem,SfxEnumItem);
SfxPoolItem* __EXPORT SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionTypeItem(*this); }
-SfxPoolItem* __EXPORT SdrCaptionTypeItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrCaptionTypeItem(rIn); }
+SfxPoolItem* __EXPORT SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCaptionTypeItem(rIn); }
-USHORT __EXPORT SdrCaptionTypeItem::GetValueCount() const { return 4; }
+sal_uInt16 __EXPORT SdrCaptionTypeItem::GetValueCount() const { return 4; }
-XubString __EXPORT SdrCaptionTypeItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValCAPTIONTYPE1+nPos);
}
@@ -1055,7 +1055,7 @@ XubString __EXPORT SdrCaptionTypeItem::GetValueTextByPos(USHORT nPos) const
SfxItemPresentation __EXPORT SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
{
- rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+ rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
String aStr;
@@ -1070,11 +1070,11 @@ TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem);
SfxPoolItem* __EXPORT SdrCaptionEscDirItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionEscDirItem(*this); }
-SfxPoolItem* __EXPORT SdrCaptionEscDirItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrCaptionEscDirItem(rIn); }
+SfxPoolItem* __EXPORT SdrCaptionEscDirItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCaptionEscDirItem(rIn); }
-USHORT __EXPORT SdrCaptionEscDirItem::GetValueCount() const { return 3; }
+sal_uInt16 __EXPORT SdrCaptionEscDirItem::GetValueCount() const { return 3; }
-XubString __EXPORT SdrCaptionEscDirItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValCAPTIONESCHORI+nPos);
}
@@ -1082,7 +1082,7 @@ XubString __EXPORT SdrCaptionEscDirItem::GetValueTextByPos(USHORT nPos) const
SfxItemPresentation __EXPORT SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
{
- rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+ rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
String aStr;
@@ -1102,11 +1102,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextFitToSizeTypeItem,SfxEnumItem);
SfxPoolItem* __EXPORT SdrTextFitToSizeTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextFitToSizeTypeItem(*this); }
-SfxPoolItem* __EXPORT SdrTextFitToSizeTypeItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextFitToSizeTypeItem(rIn); }
+SfxPoolItem* __EXPORT SdrTextFitToSizeTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextFitToSizeTypeItem(rIn); }
-USHORT __EXPORT SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
+sal_uInt16 __EXPORT SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; }
-XubString __EXPORT SdrTextFitToSizeTypeItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValFITTOSIZENONE+nPos);
}
@@ -1114,7 +1114,7 @@ XubString __EXPORT SdrTextFitToSizeTypeItem::GetValueTextByPos(USHORT nPos) cons
SfxItemPresentation __EXPORT SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
{
- rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+ rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
String aStr;
@@ -1125,13 +1125,13 @@ SfxItemPresentation __EXPORT SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPr
return ePres;
}
-int __EXPORT SdrTextFitToSizeTypeItem::HasBoolValue() const { return TRUE; }
+int __EXPORT SdrTextFitToSizeTypeItem::HasBoolValue() const { return sal_True; }
-BOOL __EXPORT SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; }
+sal_Bool __EXPORT SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; }
-void __EXPORT SdrTextFitToSizeTypeItem::SetBoolValue(BOOL bVal) { SetValue(sal::static_int_cast< USHORT >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); }
+void __EXPORT SdrTextFitToSizeTypeItem::SetBoolValue(sal_Bool bVal) { SetValue(sal::static_int_cast< sal_uInt16 >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); }
-sal_Bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
drawing::TextFitToSizeType eFS = (drawing::TextFitToSizeType)GetValue();
rVal <<= eFS;
@@ -1139,7 +1139,7 @@ sal_Bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*
return sal_True;
}
-sal_Bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::TextFitToSizeType eFS;
if(!(rVal >>= eFS))
@@ -1151,7 +1151,7 @@ sal_Bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMembe
eFS = (drawing::TextFitToSizeType) nEnum;
}
- SetValue( sal::static_int_cast< USHORT >( (SdrFitToSizeType)eFS ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( (SdrFitToSizeType)eFS ) );
return sal_True;
}
@@ -1160,11 +1160,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextVertAdjustItem,SfxEnumItem);
SfxPoolItem* __EXPORT SdrTextVertAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextVertAdjustItem(*this); }
-SfxPoolItem* __EXPORT SdrTextVertAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextVertAdjustItem(rIn); }
+SfxPoolItem* __EXPORT SdrTextVertAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextVertAdjustItem(rIn); }
-USHORT __EXPORT SdrTextVertAdjustItem::GetValueCount() const { return 5; }
+sal_uInt16 __EXPORT SdrTextVertAdjustItem::GetValueCount() const { return 5; }
-XubString __EXPORT SdrTextVertAdjustItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValTEXTVADJTOP+nPos);
}
@@ -1172,7 +1172,7 @@ XubString __EXPORT SdrTextVertAdjustItem::GetValueTextByPos(USHORT nPos) const
SfxItemPresentation __EXPORT SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
{
- rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+ rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
String aStr;
@@ -1183,13 +1183,13 @@ SfxItemPresentation __EXPORT SdrTextVertAdjustItem::GetPresentation(SfxItemPrese
return ePres;
}
-sal_Bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::TextVerticalAdjust)GetValue();
return sal_True;
}
-sal_Bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::TextVerticalAdjust eAdj;
if(!(rVal >>= eAdj))
@@ -1201,7 +1201,7 @@ sal_Bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId
eAdj = (drawing::TextVerticalAdjust)nEnum;
}
- SetValue( sal::static_int_cast< USHORT >( (SdrTextVertAdjust)eAdj ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextVertAdjust)eAdj ) );
return sal_True;
}
@@ -1210,11 +1210,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextHorzAdjustItem,SfxEnumItem);
SfxPoolItem* __EXPORT SdrTextHorzAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextHorzAdjustItem(*this); }
-SfxPoolItem* __EXPORT SdrTextHorzAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextHorzAdjustItem(rIn); }
+SfxPoolItem* __EXPORT SdrTextHorzAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextHorzAdjustItem(rIn); }
-USHORT __EXPORT SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
+sal_uInt16 __EXPORT SdrTextHorzAdjustItem::GetValueCount() const { return 5; }
-XubString __EXPORT SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos);
}
@@ -1222,7 +1222,7 @@ XubString __EXPORT SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const
SfxItemPresentation __EXPORT SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
{
- rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+ rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
String aStr;
@@ -1233,13 +1233,13 @@ SfxItemPresentation __EXPORT SdrTextHorzAdjustItem::GetPresentation(SfxItemPrese
return ePres;
}
-sal_Bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::TextHorizontalAdjust)GetValue();
return sal_True;
}
-sal_Bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::TextHorizontalAdjust eAdj;
if(!(rVal >>= eAdj))
@@ -1251,7 +1251,7 @@ sal_Bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId
eAdj = (drawing::TextHorizontalAdjust)nEnum;
}
- SetValue( sal::static_int_cast< USHORT >( (SdrTextHorzAdjust)eAdj ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextHorzAdjust)eAdj ) );
return sal_True;
}
@@ -1260,11 +1260,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniKindItem,SfxEnumItem);
SfxPoolItem* __EXPORT SdrTextAniKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniKindItem(*this); }
-SfxPoolItem* __EXPORT SdrTextAniKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniKindItem(rIn); }
+SfxPoolItem* __EXPORT SdrTextAniKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniKindItem(rIn); }
-USHORT __EXPORT SdrTextAniKindItem::GetValueCount() const { return 5; }
+sal_uInt16 __EXPORT SdrTextAniKindItem::GetValueCount() const { return 5; }
-XubString __EXPORT SdrTextAniKindItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValTEXTANI_NONE+nPos);
}
@@ -1272,7 +1272,7 @@ XubString __EXPORT SdrTextAniKindItem::GetValueTextByPos(USHORT nPos) const
SfxItemPresentation __EXPORT SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
{
- rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+ rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
String aStr;
@@ -1283,13 +1283,13 @@ SfxItemPresentation __EXPORT SdrTextAniKindItem::GetPresentation(SfxItemPresenta
return ePres;
}
-sal_Bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::TextAnimationKind)GetValue();
return sal_True;
}
-sal_Bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::TextAnimationKind eKind;
if(!(rVal >>= eKind))
@@ -1300,7 +1300,7 @@ sal_Bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
eKind = (drawing::TextAnimationKind)nEnum;
}
- SetValue( sal::static_int_cast< USHORT >( (SdrTextAniKind)eKind ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextAniKind)eKind ) );
return sal_True;
}
@@ -1309,11 +1309,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniDirectionItem,SfxEnumItem);
SfxPoolItem* __EXPORT SdrTextAniDirectionItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDirectionItem(*this); }
-SfxPoolItem* __EXPORT SdrTextAniDirectionItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniDirectionItem(rIn); }
+SfxPoolItem* __EXPORT SdrTextAniDirectionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniDirectionItem(rIn); }
-USHORT __EXPORT SdrTextAniDirectionItem::GetValueCount() const { return 4; }
+sal_uInt16 __EXPORT SdrTextAniDirectionItem::GetValueCount() const { return 4; }
-XubString __EXPORT SdrTextAniDirectionItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValTEXTANI_LEFT+nPos);
}
@@ -1321,7 +1321,7 @@ XubString __EXPORT SdrTextAniDirectionItem::GetValueTextByPos(USHORT nPos) const
SfxItemPresentation __EXPORT SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
{
- rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+ rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
String aStr;
@@ -1332,13 +1332,13 @@ SfxItemPresentation __EXPORT SdrTextAniDirectionItem::GetPresentation(SfxItemPre
return ePres;
}
-sal_Bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::TextAnimationDirection)GetValue();
return sal_True;
}
-sal_Bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::TextAnimationDirection eDir;
if(!(rVal >>= eDir))
@@ -1350,7 +1350,7 @@ sal_Bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMember
eDir = (drawing::TextAnimationDirection)nEnum;
}
- SetValue( sal::static_int_cast< USHORT >( (SdrTextAniDirection)eDir ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextAniDirection)eDir ) );
return sal_True;
}
@@ -1359,7 +1359,7 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniDelayItem,SfxUInt16Item);
SfxPoolItem* __EXPORT SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDelayItem(*this); }
-SfxPoolItem* __EXPORT SdrTextAniDelayItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniDelayItem(rIn); }
+SfxPoolItem* __EXPORT SdrTextAniDelayItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniDelayItem(rIn); }
SfxItemPresentation __EXPORT SdrTextAniDelayItem::GetPresentation(
SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
@@ -1385,14 +1385,14 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item);
SfxPoolItem* __EXPORT SdrTextAniAmountItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniAmountItem(*this); }
-SfxPoolItem* __EXPORT SdrTextAniAmountItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniAmountItem(rIn); }
+SfxPoolItem* __EXPORT SdrTextAniAmountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniAmountItem(rIn); }
-FASTBOOL __EXPORT SdrTextAniAmountItem::HasMetrics() const
+int __EXPORT SdrTextAniAmountItem::HasMetrics() const
{
return GetValue()>0;
}
-FASTBOOL __EXPORT SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv)
+int __EXPORT SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv)
{
if (GetValue()>0) {
BigInt aVal(GetValue());
@@ -1400,15 +1400,15 @@ FASTBOOL __EXPORT SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv)
aVal+=nDiv/2; // fuer korrektes Runden
aVal/=nDiv;
SetValue(short(aVal));
- return TRUE;
- } else return FALSE;
+ return sal_True;
+ } else return sal_False;
}
SfxItemPresentation __EXPORT SdrTextAniAmountItem::GetPresentation(
SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
XubString& rText, const IntlWrapper *) const
{
- INT32 nValue(GetValue());
+ sal_Int32 nValue(GetValue());
if(!nValue)
nValue = -1L;
@@ -1443,12 +1443,12 @@ SfxItemPresentation __EXPORT SdrTextAniAmountItem::GetPresentation(
}
TYPEINIT1_AUTOFACTORY( SdrTextFixedCellHeightItem, SfxBoolItem );
-SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( BOOL bUseFixedCellHeight )
+SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( sal_Bool bUseFixedCellHeight )
: SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, bUseFixedCellHeight )
{
}
SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion )
- : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, FALSE )
+ : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, sal_False )
{
if ( nVersion )
{
@@ -1492,13 +1492,13 @@ sal_uInt16 SdrTextFixedCellHeightItem::GetVersion( sal_uInt16 /*nFileFormatVersi
{
return 1;
}
-sal_Bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
sal_Bool bValue = (sal_Bool)GetValue();
rVal <<= bValue;
return sal_True;
}
-sal_Bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Bool bValue = sal_Bool();
if( !( rVal >>= bValue ) )
@@ -1509,7 +1509,7 @@ sal_Bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, BYTE /*nMem
#ifdef SDR_ISPOOLABLE
int __EXPORT SdrTextFixedCellHeightItem::IsPoolable() const
{
- USHORT nId=Which();
+ sal_uInt16 nId=Which();
return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
}
#endif
@@ -1619,7 +1619,7 @@ SfxPoolItem* __EXPORT SdrCustomShapeAdjustmentItem::Clone( SfxItemPool * /*pPool
#ifdef SDR_ISPOOLABLE
int __EXPORT SdrCustomShapeAdjustmentItem::IsPoolable() const
{
- USHORT nId=Which();
+ sal_uInt16 nId=Which();
return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
}
#endif
@@ -1650,7 +1650,7 @@ sal_uInt16 SdrCustomShapeAdjustmentItem::GetVersion( sal_uInt16 /*nFileFormatVer
return 1;
}
-sal_Bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
sal_uInt32 i, nCount = GetCount();
uno::Sequence< sal_Int32 > aSequence( nCount );
@@ -1664,7 +1664,7 @@ sal_Bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMembe
return sal_True;
}
-sal_Bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
uno::Sequence< sal_Int32 > aSequence;
if( !( rVal >>= aSequence ) )
@@ -1698,11 +1698,11 @@ TYPEINIT1_AUTOFACTORY(SdrEdgeKindItem,SfxEnumItem);
SfxPoolItem* __EXPORT SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeKindItem(*this); }
-SfxPoolItem* __EXPORT SdrEdgeKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrEdgeKindItem(rIn); }
+SfxPoolItem* __EXPORT SdrEdgeKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrEdgeKindItem(rIn); }
-USHORT __EXPORT SdrEdgeKindItem::GetValueCount() const { return 4; }
+sal_uInt16 __EXPORT SdrEdgeKindItem::GetValueCount() const { return 4; }
-XubString __EXPORT SdrEdgeKindItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValEDGE_ORTHOLINES+nPos);
}
@@ -1710,7 +1710,7 @@ XubString __EXPORT SdrEdgeKindItem::GetValueTextByPos(USHORT nPos) const
SfxItemPresentation __EXPORT SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
{
- rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+ rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
String aStr;
@@ -1721,7 +1721,7 @@ SfxItemPresentation __EXPORT SdrEdgeKindItem::GetPresentation(SfxItemPresentatio
return ePres;
}
-sal_Bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
drawing::ConnectorType eCT = drawing::ConnectorType_STANDARD;
@@ -1741,7 +1741,7 @@ sal_Bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
return sal_True;
}
-sal_Bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::ConnectorType eCT;
if(!(rVal >>= eCT))
@@ -1763,18 +1763,18 @@ sal_Bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
default:
DBG_ERROR( "SdrEdgeKindItem::PuValue : unknown enum" );
}
- SetValue( sal::static_int_cast< USHORT >( eEK ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( eEK ) );
return sal_True;
}
-sal_Bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
}
-sal_Bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
@@ -1784,13 +1784,13 @@ sal_Bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMembe
return sal_True;
}
-BOOL SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
}
-BOOL SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
@@ -1800,13 +1800,13 @@ BOOL SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*
return sal_True;
}
-BOOL SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
}
-BOOL SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
@@ -1816,13 +1816,13 @@ BOOL SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*
return sal_True;
}
-BOOL SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
}
-BOOL SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
@@ -1832,13 +1832,13 @@ BOOL SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*
return sal_True;
}
-BOOL SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
}
-BOOL SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
@@ -1848,13 +1848,13 @@ BOOL SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
return sal_True;
}
-BOOL SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
}
-BOOL SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
@@ -1864,13 +1864,13 @@ BOOL SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
return sal_True;
}
-BOOL SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
}
-BOOL SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
@@ -1889,11 +1889,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureKindItem,SfxEnumItem);
SfxPoolItem* __EXPORT SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureKindItem(*this); }
-SfxPoolItem* __EXPORT SdrMeasureKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureKindItem(rIn); }
+SfxPoolItem* __EXPORT SdrMeasureKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureKindItem(rIn); }
-USHORT __EXPORT SdrMeasureKindItem::GetValueCount() const { return 2; }
+sal_uInt16 __EXPORT SdrMeasureKindItem::GetValueCount() const { return 2; }
-XubString __EXPORT SdrMeasureKindItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValMEASURE_STD+nPos);
}
@@ -1901,7 +1901,7 @@ XubString __EXPORT SdrMeasureKindItem::GetValueTextByPos(USHORT nPos) const
SfxItemPresentation __EXPORT SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
{
- rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+ rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
String aStr;
@@ -1912,13 +1912,13 @@ SfxItemPresentation __EXPORT SdrMeasureKindItem::GetPresentation(SfxItemPresenta
return ePres;
}
-sal_Bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::MeasureKind)GetValue();
return sal_True;
}
-sal_Bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::MeasureKind eKind;
if(!(rVal >>= eKind))
@@ -1930,7 +1930,7 @@ sal_Bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
eKind = (drawing::MeasureKind)nEnum;
}
- SetValue( sal::static_int_cast< USHORT >( (SdrMeasureKind)eKind ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureKind)eKind ) );
return sal_True;
}
@@ -1938,11 +1938,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureTextHPosItem,SfxEnumItem);
SfxPoolItem* __EXPORT SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextHPosItem(*this); }
-SfxPoolItem* __EXPORT SdrMeasureTextHPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureTextHPosItem(rIn); }
+SfxPoolItem* __EXPORT SdrMeasureTextHPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureTextHPosItem(rIn); }
-USHORT __EXPORT SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
+sal_uInt16 __EXPORT SdrMeasureTextHPosItem::GetValueCount() const { return 4; }
-XubString __EXPORT SdrMeasureTextHPosItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValMEASURE_TEXTHAUTO+nPos);
}
@@ -1950,7 +1950,7 @@ XubString __EXPORT SdrMeasureTextHPosItem::GetValueTextByPos(USHORT nPos) const
SfxItemPresentation __EXPORT SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
{
- rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+ rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
String aStr;
@@ -1961,13 +1961,13 @@ SfxItemPresentation __EXPORT SdrMeasureTextHPosItem::GetPresentation(SfxItemPres
return ePres;
}
-sal_Bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::MeasureTextHorzPos)GetValue();
return sal_True;
}
-sal_Bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::MeasureTextHorzPos ePos;
if(!(rVal >>= ePos))
@@ -1979,7 +1979,7 @@ sal_Bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberI
ePos = (drawing::MeasureTextHorzPos)nEnum;
}
- SetValue( sal::static_int_cast< USHORT >( (SdrMeasureTextHPos)ePos ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureTextHPos)ePos ) );
return sal_True;
}
@@ -1987,11 +1987,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureTextVPosItem,SfxEnumItem);
SfxPoolItem* __EXPORT SdrMeasureTextVPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextVPosItem(*this); }
-SfxPoolItem* __EXPORT SdrMeasureTextVPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureTextVPosItem(rIn); }
+SfxPoolItem* __EXPORT SdrMeasureTextVPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureTextVPosItem(rIn); }
-USHORT __EXPORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
+sal_uInt16 __EXPORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; }
-XubString __EXPORT SdrMeasureTextVPosItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValMEASURE_TEXTVAUTO+nPos);
}
@@ -1999,7 +1999,7 @@ XubString __EXPORT SdrMeasureTextVPosItem::GetValueTextByPos(USHORT nPos) const
SfxItemPresentation __EXPORT SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
{
- rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+ rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
String aStr;
@@ -2010,13 +2010,13 @@ SfxItemPresentation __EXPORT SdrMeasureTextVPosItem::GetPresentation(SfxItemPres
return ePres;
}
-sal_Bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::MeasureTextVertPos)GetValue();
return sal_True;
}
-sal_Bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::MeasureTextVertPos ePos;
if(!(rVal >>= ePos))
@@ -2028,7 +2028,7 @@ sal_Bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberI
ePos = (drawing::MeasureTextVertPos)nEnum;
}
- SetValue( sal::static_int_cast< USHORT >( (SdrMeasureTextHPos)ePos ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureTextHPos)ePos ) );
return sal_True;
}
@@ -2036,11 +2036,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureUnitItem,SfxEnumItem);
SfxPoolItem* __EXPORT SdrMeasureUnitItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureUnitItem(*this); }
-SfxPoolItem* __EXPORT SdrMeasureUnitItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureUnitItem(rIn); }
+SfxPoolItem* __EXPORT SdrMeasureUnitItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureUnitItem(rIn); }
-USHORT __EXPORT SdrMeasureUnitItem::GetValueCount() const { return 14; }
+sal_uInt16 __EXPORT SdrMeasureUnitItem::GetValueCount() const { return 14; }
-XubString __EXPORT SdrMeasureUnitItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const
{
XubString aRetval;
@@ -2060,7 +2060,7 @@ XubString __EXPORT SdrMeasureUnitItem::GetValueTextByPos(USHORT nPos) const
SfxItemPresentation __EXPORT SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
{
- rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+ rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
String aStr;
@@ -2071,19 +2071,19 @@ SfxItemPresentation __EXPORT SdrMeasureUnitItem::GetPresentation(SfxItemPresenta
return ePres;
}
-sal_Bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
}
-sal_Bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nMeasure = 0;
if(!(rVal >>= nMeasure))
return sal_False;
- SetValue( sal::static_int_cast< USHORT >( (FieldUnit)nMeasure ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( (FieldUnit)nMeasure ) );
return sal_True;
}
@@ -2096,11 +2096,11 @@ TYPEINIT1_AUTOFACTORY(SdrCircKindItem,SfxEnumItem);
SfxPoolItem* __EXPORT SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCircKindItem(*this); }
-SfxPoolItem* __EXPORT SdrCircKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrCircKindItem(rIn); }
+SfxPoolItem* __EXPORT SdrCircKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCircKindItem(rIn); }
-USHORT __EXPORT SdrCircKindItem::GetValueCount() const { return 4; }
+sal_uInt16 __EXPORT SdrCircKindItem::GetValueCount() const { return 4; }
-XubString __EXPORT SdrCircKindItem::GetValueTextByPos(USHORT nPos) const
+XubString __EXPORT SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const
{
return ImpGetResStr(STR_ItemValCIRC_FULL+nPos);
}
@@ -2108,7 +2108,7 @@ XubString __EXPORT SdrCircKindItem::GetValueTextByPos(USHORT nPos) const
SfxItemPresentation __EXPORT SdrCircKindItem::GetPresentation(SfxItemPresentation ePres,
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const
{
- rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue()));
+ rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue()));
if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) {
String aStr;
@@ -2119,13 +2119,13 @@ SfxItemPresentation __EXPORT SdrCircKindItem::GetPresentation(SfxItemPresentatio
return ePres;
}
-sal_Bool SdrCircKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrCircKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (drawing::CircleKind)GetValue();
return sal_True;
}
-sal_Bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
drawing::CircleKind eKind;
if(!(rVal >>= eKind))
@@ -2137,7 +2137,7 @@ sal_Bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
eKind = (drawing::CircleKind)nEnum;
}
- SetValue( sal::static_int_cast< USHORT >( (SdrCircKind)eKind ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( (SdrCircKind)eKind ) );
return sal_True;
}
@@ -2153,7 +2153,7 @@ SfxPoolItem* __EXPORT SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const
return new SdrSignedPercentItem( Which(), GetValue() );
}
-SfxPoolItem* __EXPORT SdrSignedPercentItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrSignedPercentItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrSignedPercentItem( Which(), rIn );
}
@@ -2181,7 +2181,7 @@ SfxItemPresentation __EXPORT SdrSignedPercentItem::GetPresentation(
int __EXPORT SdrSignedPercentItem::IsPoolable() const
{
- USHORT nId=Which();
+ sal_uInt16 nId=Which();
return nId < SDRATTR_NOTPERSIST_FIRST || nId > SDRATTR_NOTPERSIST_LAST;
}
#endif
@@ -2197,7 +2197,7 @@ SfxPoolItem* __EXPORT SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const
return new SdrGrafRedItem( *this );
}
-SfxPoolItem* __EXPORT SdrGrafRedItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafRedItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrGrafRedItem( rIn );
}
@@ -2213,7 +2213,7 @@ SfxPoolItem* __EXPORT SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const
return new SdrGrafGreenItem( *this );
}
-SfxPoolItem* __EXPORT SdrGrafGreenItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafGreenItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrGrafGreenItem( rIn );
}
@@ -2229,7 +2229,7 @@ SfxPoolItem* __EXPORT SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const
return new SdrGrafBlueItem( *this );
}
-SfxPoolItem* __EXPORT SdrGrafBlueItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafBlueItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrGrafBlueItem( rIn );
}
@@ -2245,7 +2245,7 @@ SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const
return new SdrGrafLuminanceItem( *this );
}
-SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafLuminanceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrGrafLuminanceItem( rIn );
}
@@ -2261,7 +2261,7 @@ SfxPoolItem* __EXPORT SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const
return new SdrGrafContrastItem( *this );
}
-SfxPoolItem* __EXPORT SdrGrafContrastItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafContrastItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrGrafContrastItem( rIn );
}
@@ -2277,24 +2277,24 @@ SfxPoolItem* __EXPORT SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const
return new SdrGrafGamma100Item( *this );
}
-SfxPoolItem* __EXPORT SdrGrafGamma100Item::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafGamma100Item::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrGrafGamma100Item( rIn );
}
-sal_Bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= ((double)GetValue()) / 100.0;
return sal_True;
}
-sal_Bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
double nGamma = 0;
if(!(rVal >>= nGamma))
return sal_False;
- SetValue( (UINT32)(nGamma * 100.0 ) );
+ SetValue( (sal_uInt32)(nGamma * 100.0 ) );
return sal_True;
}
@@ -2309,7 +2309,7 @@ SfxPoolItem* __EXPORT SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/) const
return new SdrGrafInvertItem( *this );
}
-SfxPoolItem* __EXPORT SdrGrafInvertItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafInvertItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrGrafInvertItem( rIn );
}
@@ -2325,7 +2325,7 @@ SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) co
return new SdrGrafTransparenceItem( *this );
}
-SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafTransparenceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrGrafTransparenceItem( rIn );
}
@@ -2341,17 +2341,17 @@ SfxPoolItem* __EXPORT SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const
return new SdrGrafModeItem( *this );
}
-SfxPoolItem* __EXPORT SdrGrafModeItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* __EXPORT SdrGrafModeItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new SdrGrafModeItem( rIn );
}
-USHORT __EXPORT SdrGrafModeItem::GetValueCount() const
+sal_uInt16 __EXPORT SdrGrafModeItem::GetValueCount() const
{
return 4;
}
-XubString __EXPORT SdrGrafModeItem::GetValueTextByPos(UINT16 nPos) const
+XubString __EXPORT SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const
{
XubString aStr;
@@ -2390,7 +2390,7 @@ SfxItemPresentation __EXPORT SdrGrafModeItem::GetPresentation( SfxItemPresentati
SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/,
XubString& rText, const IntlWrapper *) const
{
- rText = GetValueTextByPos( sal::static_int_cast< USHORT >( GetValue() ) );
+ rText = GetValueTextByPos( sal::static_int_cast< sal_uInt16 >( GetValue() ) );
if( ePres == SFX_ITEM_PRESENTATION_COMPLETE )
{
@@ -2415,12 +2415,12 @@ SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* /*pPool*/) const
return new SdrGrafCropItem( *this );
}
-SfxPoolItem* SdrGrafCropItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* SdrGrafCropItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
{
return( ( 0 == nVer ) ? Clone( NULL ) : SvxGrfCrop::Create( rIn, nVer ) );
}
-USHORT SdrGrafCropItem::GetVersion( USHORT /*nFileVersion*/) const
+sal_uInt16 SdrGrafCropItem::GetVersion( sal_uInt16 /*nFileVersion*/) const
{
// GRFCROP_VERSION_MOVETOSVX is 1
return GRFCROP_VERSION_MOVETOSVX;
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 7980668c0b9a..6fa8b0552f35 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -214,11 +214,11 @@ void SdrCreateView::ImpClearVars()
nAktIdent=OBJ_NONE;
pAktCreate=NULL;
pCreatePV=NULL;
- bAutoTextEdit=FALSE;
- b1stPointAsCenter=FALSE;
+ bAutoTextEdit=sal_False;
+ b1stPointAsCenter=sal_False;
aAktCreatePointer=Pointer(POINTER_CROSS);
- bUseIncompatiblePathCreateInterface=FALSE;
- bAutoClosePolys=TRUE;
+ bUseIncompatiblePathCreateInterface=sal_False;
+ bAutoClosePolys=sal_True;
nAutoCloseDistPix=5;
nFreeHandMinDistPix=10;
@@ -249,7 +249,7 @@ void SdrCreateView::ImpDelCreateAttr()
{
}
-BOOL SdrCreateView::IsAction() const
+sal_Bool SdrCreateView::IsAction() const
{
return SdrDragView::IsAction() || pAktCreate!=NULL;
}
@@ -296,26 +296,26 @@ void SdrCreateView::TakeActionRect(Rectangle& rRect) const
}
}
-BOOL SdrCreateView::CheckEdgeMode()
+sal_Bool SdrCreateView::CheckEdgeMode()
{
- UINT32 nInv=nAktInvent;
- UINT16 nIdn=nAktIdent;
+ sal_uInt32 nInv=nAktInvent;
+ sal_uInt16 nIdn=nAktIdent;
if (pAktCreate!=NULL)
{
nInv=pAktCreate->GetObjInventor();
nIdn=pAktCreate->GetObjIdentifier();
// wird vom EdgeObj gemanaged
- if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return FALSE;
+ if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return sal_False;
}
if (!IsCreateMode() || nAktInvent!=SdrInventor || nAktIdent!=OBJ_EDGE)
{
ImpClearConnectMarker();
- return FALSE;
+ return sal_False;
}
else
{
- // TRUE heisst: MouseMove soll Connect checken
+ // sal_True heisst: MouseMove soll Connect checken
return !IsAction();
}
}
@@ -348,7 +348,7 @@ void SdrCreateView::HideConnectMarker()
ImpClearConnectMarker();
}
-BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
{
if(CheckEdgeMode() && pWin)
{
@@ -358,7 +358,7 @@ BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
{
// Defaultete Hit-Toleranz bei IsMarkedHit() mal aendern !!!!
Point aPos(pWin->PixelToLogic(rMEvt.GetPosPixel()));
- BOOL bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos);
+ sal_Bool bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos);
SdrObjConnection aCon;
if (!bMarkHit) SdrEdgeObj::ImpFindConnector(aPos,*pPV,aCon,NULL,pWin);
SetConnectMarker(aCon,*pPV);
@@ -367,22 +367,22 @@ BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
return SdrDragView::MouseMove(rMEvt,pWin);
}
-BOOL SdrCreateView::IsTextTool() const
+sal_Bool SdrCreateView::IsTextTool() const
{
return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT);
}
-BOOL SdrCreateView::IsEdgeTool() const
+sal_Bool SdrCreateView::IsEdgeTool() const
{
return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_EDGE);
}
-BOOL SdrCreateView::IsMeasureTool() const
+sal_Bool SdrCreateView::IsMeasureTool() const
{
return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_MEASURE);
}
-void SdrCreateView::SetCurrentObj(UINT16 nIdent, UINT32 nInvent)
+void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent)
{
if (nAktInvent!=nInvent || nAktIdent!=nIdent)
{
@@ -416,10 +416,10 @@ void SdrCreateView::SetCurrentObj(UINT16 nIdent, UINT32 nInvent)
ImpSetGlueVisible3(IsEdgeTool());
}
-BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& rPnt, OutputDevice* pOut,
+sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
short nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject)
{
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
UnmarkAllObj();
BrkAction();
@@ -442,7 +442,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
aLay = aMeasureLayer;
}
- SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,TRUE);
+ SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,sal_True);
if (nLayer==SDRLAYER_NOTFOUND) nLayer=0;
if (!pCreatePV->GetLockedLayers().IsSet(nLayer) && pCreatePV->GetVisibleLayers().IsSet(nLayer))
{
@@ -465,14 +465,14 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
}
Point aPnt(rPnt);
- if (nAktInvent!=SdrInventor || (nAktIdent!=USHORT(OBJ_EDGE) &&
- nAktIdent!=USHORT(OBJ_FREELINE) &&
- nAktIdent!=USHORT(OBJ_FREEFILL) )) { // Kein Fang fuer Edge und Freihand!
+ if (nAktInvent!=SdrInventor || (nAktIdent!=sal_uInt16(OBJ_EDGE) &&
+ nAktIdent!=sal_uInt16(OBJ_FREELINE) &&
+ nAktIdent!=sal_uInt16(OBJ_FREEFILL) )) { // Kein Fang fuer Edge und Freihand!
aPnt=GetSnapPos(aPnt,pCreatePV);
}
if (pAktCreate!=NULL)
{
- BOOL bStartEdit=FALSE; // nach Ende von Create automatisch TextEdit starten
+ sal_Bool bStartEdit=sal_False; // nach Ende von Create automatisch TextEdit starten
if (pDefaultStyleSheet!=NULL) pAktCreate->NbcSetStyleSheet(pDefaultStyleSheet, sal_False);
// #101618# SW uses a naked SdrObject for frame construction. Normally, such an
@@ -492,7 +492,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
pAktCreate->SetMergedItemSet(aSet);
- bStartEdit=TRUE;
+ bStartEdit=sal_True;
}
if (nInvent==SdrInventor && (nIdent==OBJ_TEXT || nIdent==OBJ_TEXTEXT ||
nIdent==OBJ_TITLETEXT || nIdent==OBJ_OUTLINETEXT))
@@ -506,7 +506,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
pAktCreate->SetMergedItemSet(aSet);
- bStartEdit=TRUE;
+ bStartEdit=sal_True;
}
if (!rLogRect.IsEmpty()) pAktCreate->NbcSetLogicRect(rLogRect);
@@ -543,8 +543,8 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
pDragWin=pOut;
if (pAktCreate->BegCreate(aDragStat))
{
- ShowCreateObj(/*pOut,TRUE*/);
- bRet=TRUE;
+ ShowCreateObj(/*pOut,sal_True*/);
+ bRet=sal_True;
}
else
{
@@ -558,7 +558,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point&
return bRet;
}
-BOOL SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
+sal_Bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
{
return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,pPV,Rectangle(), 0L);
}
@@ -577,7 +577,7 @@ sal_Bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMi
return ImpBegCreateObj(nInvent, nIdent, rPnt, 0L, nMinMov, 0L, Rectangle(), pPreparedFactoryObject);
}
-BOOL SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz,
+sal_Bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz,
OutputDevice* pOut, short nMinMov, SdrPageView* pPV)
{
return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,pPV,
@@ -604,9 +604,9 @@ void SdrCreateView::MovCreateObj(const Point& rPnt)
if(bDidLimit && IsOrtho())
{
if(aDragStat.IsOrtho8Possible())
- OrthoDistance8(aDragStat.GetPrev(), aPnt, FALSE);
+ OrthoDistance8(aDragStat.GetPrev(), aPnt, sal_False);
else if(aDragStat.IsOrtho4Possible())
- OrthoDistance4(aDragStat.GetPrev(), aPnt, FALSE);
+ OrthoDistance4(aDragStat.GetPrev(), aPnt, sal_False);
}
if (aPnt==aDragStat.GetNow()) return;
@@ -628,24 +628,24 @@ void SdrCreateView::MovCreateObj(const Point& rPnt)
}
}
-BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
+sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
{
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
SdrObject* pObjMerk=pAktCreate;
SdrPageView* pPVMerk=pCreatePV;
if (pAktCreate!=NULL)
{
- ULONG nAnz=aDragStat.GetPointAnz();
+ sal_uIntPtr nAnz=aDragStat.GetPointAnz();
if (nAnz<=1 && eCmd==SDRCREATE_FORCEEND)
{
BrkCreateObj(); // Objekte mit nur einem Punkt gibt's nicht (zumindest noch nicht)
- return FALSE; // FALSE=Event nicht ausgewertet
+ return sal_False; // sal_False=Event nicht ausgewertet
}
- BOOL bPntsEq=nAnz>1;
- ULONG i=1;
+ sal_Bool bPntsEq=nAnz>1;
+ sal_uIntPtr i=1;
Point aP0=aDragStat.GetPoint(0);
while (bPntsEq && i<nAnz) { bPntsEq=aP0==aDragStat.GetPoint(i); i++; }
@@ -670,7 +670,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
}
else
{
- nLayer = rAd.GetLayerID(aAktLayer, TRUE);
+ nLayer = rAd.GetLayerID(aAktLayer, sal_True);
}
if(SDRLAYER_NOTFOUND == nLayer)
@@ -681,7 +681,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
pObj->SetLayer(nLayer);
// #83403# recognize creation of a new 3D object inside a 3D scene
- BOOL bSceneIntoScene(FALSE);
+ sal_Bool bSceneIntoScene(sal_False);
if(pObjMerk
&& pObjMerk->ISA(E3dScene)
@@ -689,7 +689,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
&& pCreatePV->GetAktGroup()
&& pCreatePV->GetAktGroup()->ISA(E3dScene))
{
- BOOL bDidInsert = ((E3dView*)this)->ImpCloneAll3DObjectsToDestScene(
+ sal_Bool bDidInsert = ((E3dView*)this)->ImpCloneAll3DObjectsToDestScene(
(E3dScene*)pObjMerk, (E3dScene*)pCreatePV->GetAktGroup(), Point(0, 0));
if(bDidInsert)
@@ -697,8 +697,8 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
// delete object, it's content is cloned and inserted
SdrObject::Free( pObjMerk );
pObjMerk = 0L;
- bRet = FALSE;
- bSceneIntoScene = TRUE;
+ bRet = sal_False;
+ bSceneIntoScene = sal_True;
}
}
@@ -709,7 +709,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
}
pCreatePV=NULL;
- bRet=TRUE; // TRUE=Event ausgewertet
+ bRet=sal_True; // sal_True=Event ausgewertet
}
else
{
@@ -729,7 +729,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
HideCreateObj();
ShowCreateObj();
aDragStat.ResetMinMoved(); // NextPoint gibt's bei MovCreateObj()
- bRet=TRUE;
+ bRet=sal_True;
}
}
if (bRet && pObjMerk!=NULL && IsTextEditAfterCreate())
@@ -780,7 +780,7 @@ void SdrCreateView::BrkCreateObj()
}
}
-void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/)
+void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/)
{
if(IsCreateObj() && !aDragStat.IsShown())
{
@@ -889,7 +889,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/)
}
}
- aDragStat.SetShown(TRUE);
+ aDragStat.SetShown(sal_True);
}
}
@@ -902,19 +902,19 @@ void SdrCreateView::HideCreateObj()
mpCreateViewExtraData->HideOverlay();
//DrawCreateObj(pOut,bFull);
- aDragStat.SetShown(FALSE);
+ aDragStat.SetShown(sal_False);
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////
/* new interface src537 */
-BOOL SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
{
if(pAktCreate)
{
rTargetSet.Put(pAktCreate->GetMergedItemSet());
- return TRUE;
+ return sal_True;
}
else
{
@@ -922,13 +922,13 @@ BOOL SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) co
}
}
-BOOL SdrCreateView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
+sal_Bool SdrCreateView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
{
if(pAktCreate)
{
pAktCreate->SetMergedItemSetAndBroadcast(rSet, bReplaceAll);
- return TRUE;
+ return sal_True;
}
else
{
@@ -936,11 +936,11 @@ BOOL SdrCreateView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
}
}
-SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateView::GetStyleSheet(BOOL& rOk) const
+SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateView::GetStyleSheet(sal_Bool& rOk) const
{
if (pAktCreate!=NULL)
{
- //rOk=TRUE;
+ //rOk=sal_True;
return pAktCreate->GetStyleSheet();
}
else
@@ -949,12 +949,12 @@ SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateV
}
}
-BOOL SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+sal_Bool SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
{
if (pAktCreate!=NULL)
{
pAktCreate->SetStyleSheet(pStyleSheet,bDontRemoveHardAttr);
- return TRUE;
+ return sal_True;
}
else
{
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index f47d30fb3bdd..e976150a2b15 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -68,34 +68,34 @@ using namespace sdr;
void SdrDragView::ImpClearVars()
{
- bFramDrag=FALSE;
+ bFramDrag=sal_False;
eDragMode=SDRDRAG_MOVE;
- bDragLimit=FALSE;
- bMarkedHitMovesAlways=FALSE;
+ bDragLimit=sal_False;
+ bMarkedHitMovesAlways=sal_False;
eDragHdl=HDL_MOVE;
pDragHdl=NULL;
- bDragHdl=FALSE;
- bDragSpecial=FALSE;
+ bDragHdl=sal_False;
+ bDragSpecial=sal_False;
mpCurrentSdrDragMethod=NULL;
- bDragStripes=FALSE;
- bMirrRefDragObj=TRUE;
- bDragWithCopy=FALSE;
+ bDragStripes=sal_False;
+ bMirrRefDragObj=sal_True;
+ bDragWithCopy=sal_False;
pInsPointUndo=NULL;
- bInsGluePoint=FALSE;
- bInsObjPointMode=FALSE;
- bInsGluePointMode=FALSE;
+ bInsGluePoint=sal_False;
+ bInsObjPointMode=sal_False;
+ bInsGluePointMode=sal_False;
nDragXorPolyLimit=100;
nDragXorPointLimit=500;
- bNoDragXorPolys=FALSE;
- bAutoVertexCon=TRUE;
- bAutoCornerCon=FALSE;
- bRubberEdgeDragging=TRUE;
+ bNoDragXorPolys=sal_False;
+ bAutoVertexCon=sal_True;
+ bAutoCornerCon=sal_False;
+ bRubberEdgeDragging=sal_True;
nRubberEdgeDraggingLimit=100;
- bDetailedEdgeDragging=TRUE;
+ bDetailedEdgeDragging=sal_True;
nDetailedEdgeDraggingLimit=10;
- bResizeAtCenter=FALSE;
- bCrookAtCenter=FALSE;
- bMouseHideWhileDraggingPoints=FALSE;
+ bResizeAtCenter=sal_False;
+ bCrookAtCenter=sal_False;
+ bMouseHideWhileDraggingPoints=sal_False;
// init using default
mbSolidDragging = getOptionsDrawinglayer().IsSolidDragCreate();
@@ -122,7 +122,7 @@ void SdrDragView::ImpDelDragAttr()
{
}
-BOOL SdrDragView::IsAction() const
+sal_Bool SdrDragView::IsAction() const
{
return (mpCurrentSdrDragMethod || SdrExchangeView::IsAction());
}
@@ -140,7 +140,7 @@ void SdrDragView::EndAction()
{
if (mpCurrentSdrDragMethod)
{
- EndDragObj(FALSE);
+ EndDragObj(sal_False);
}
SdrExchangeView::EndAction();
}
@@ -186,7 +186,7 @@ void SdrDragView::TakeActionRect(Rectangle& rRect) const
}
}
-BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const
+sal_Bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, sal_Bool bTR ) const
{
Rectangle aR;
TakeActionRect(aR);
@@ -199,8 +199,8 @@ BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const
if (pObj->ISA(SdrCaptionObj))
{
Point aPt(((SdrCaptionObj*)pObj)->GetTailPos());
- BOOL bTail=eDragHdl==HDL_POLY; // Schwanz wird gedraggt (nicht so ganz feine Abfrage hier)
- BOOL bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // Objektspeziefisch
+ sal_Bool bTail=eDragHdl==HDL_POLY; // Schwanz wird gedraggt (nicht so ganz feine Abfrage hier)
+ sal_Bool bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // Objektspeziefisch
if (!bTail)
{ // bei bTail liefert TakeActionRect schon das richtige
if (bOwn)
@@ -216,30 +216,30 @@ BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const
}
}
}
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const
+sal_Bool SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const
{
- return FALSE;
+ return sal_False;
}
-BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth)
+sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth)
{
BrkAction();
bool bRet=false;
{
- SetDragWithCopy(FALSE);
+ SetDragWithCopy(sal_False);
//ForceEdgesOfMarkedNodes();
//TODO: aAni.Reset();
mpCurrentSdrDragMethod=NULL;
- bDragSpecial=FALSE;
- bDragLimit=FALSE;
+ bDragSpecial=sal_False;
+ bDragLimit=sal_False;
SdrDragMode eTmpMode=eDragMode;
if (eTmpMode==SDRDRAG_MOVE && pHdl!=NULL && pHdl->GetKind()!=HDL_MOVE) {
eTmpMode=SDRDRAG_RESIZE;
@@ -249,7 +249,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
if (!bFramDrag &&
(pMarkedObj==NULL || !pMarkedObj->hasSpecialDrag()) &&
(pHdl==NULL || pHdl->GetObj()==NULL)) {
- bFramDrag=TRUE;
+ bFramDrag=sal_True;
}
Point aPnt(rPnt);
@@ -277,7 +277,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
bDragHdl=eDragHdl==HDL_REF1 || eDragHdl==HDL_REF2 || eDragHdl==HDL_MIRX;
// #103894# Expand test for HDL_ANCHOR_TR
- BOOL bNotDraggable = (HDL_ANCHOR == eDragHdl || HDL_ANCHOR_TR == eDragHdl);
+ sal_Bool bNotDraggable = (HDL_ANCHOR == eDragHdl || HDL_ANCHOR_TR == eDragHdl);
if(pHdl && (pHdl->GetKind() == HDL_SMARTTAG) && pForcedMeth )
{
@@ -299,18 +299,18 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
case HDL_UPPER: case HDL_LOWER:
{
// Sind 3D-Objekte selektiert?
- BOOL b3DObjSelected = FALSE;
- for(UINT32 a=0;!b3DObjSelected && a<GetMarkedObjectCount();a++)
+ sal_Bool b3DObjSelected = sal_False;
+ for(sal_uInt32 a=0;!b3DObjSelected && a<GetMarkedObjectCount();a++)
{
SdrObject* pObj = GetMarkedObjectByIndex(a);
if(pObj && pObj->ISA(E3dObject))
- b3DObjSelected = TRUE;
+ b3DObjSelected = sal_True;
}
// Falls ja, Shear auch bei !IsShearAllowed zulassen,
// da es sich bei 3D-Objekten um eingeschraenkte
// Rotationen handelt
if (!b3DObjSelected && !IsShearAllowed())
- return FALSE;
+ return sal_False;
mpCurrentSdrDragMethod = new SdrDragShear(*this,eDragMode==SDRDRAG_ROTATE);
} break;
case HDL_UPLFT: case HDL_UPRGT:
@@ -318,12 +318,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
{
if (eDragMode==SDRDRAG_SHEAR || eDragMode==SDRDRAG_DISTORT)
{
- if (!IsDistortAllowed(TRUE) && !IsDistortAllowed(FALSE)) return FALSE;
+ if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return sal_False;
mpCurrentSdrDragMethod = new SdrDragDistort(*this);
}
else
{
- if (!IsRotateAllowed(TRUE)) return FALSE;
+ if (!IsRotateAllowed(sal_True)) return sal_False;
mpCurrentSdrDragMethod = new SdrDragRotate(*this);
}
} break;
@@ -331,12 +331,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
{
if (IsMarkedHitMovesAlways() && eDragHdl==HDL_MOVE)
{ // HDL_MOVE ist auch wenn Obj direkt getroffen
- if (!IsMoveAllowed()) return FALSE;
+ if (!IsMoveAllowed()) return sal_False;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
- if (!IsRotateAllowed(TRUE)) return FALSE;
+ if (!IsRotateAllowed(sal_True)) return sal_False;
mpCurrentSdrDragMethod = new SdrDragRotate(*this);
}
}
@@ -346,12 +346,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
{
if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways())
{
- if (!IsMoveAllowed()) return FALSE;
+ if (!IsMoveAllowed()) return sal_False;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
- if (!IsMirrorAllowed(TRUE,TRUE)) return FALSE;
+ if (!IsMirrorAllowed(sal_True,TRUE)) return sal_False;
mpCurrentSdrDragMethod = new SdrDragMirror(*this);
}
} break;
@@ -361,13 +361,13 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways())
{
if (!IsMoveAllowed())
- return FALSE;
+ return sal_False;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
- if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE))
- return FALSE;
+ if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False))
+ return sal_False;
mpCurrentSdrDragMethod = new SdrDragCrop(*this);
}
}
@@ -378,15 +378,15 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways())
{
if(!IsMoveAllowed())
- return FALSE;
+ return sal_False;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
if(!IsTransparenceAllowed())
- return FALSE;
+ return sal_False;
- mpCurrentSdrDragMethod = new SdrDragGradient(*this, FALSE);
+ mpCurrentSdrDragMethod = new SdrDragGradient(*this, sal_False);
}
break;
}
@@ -395,13 +395,13 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways())
{
if(!IsMoveAllowed())
- return FALSE;
+ return sal_False;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
if(!IsGradientAllowed())
- return FALSE;
+ return sal_False;
mpCurrentSdrDragMethod = new SdrDragGradient(*this);
}
@@ -412,12 +412,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
{
if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways())
{
- if (!IsMoveAllowed()) return FALSE;
+ if (!IsMoveAllowed()) return sal_False;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
}
else
{
- if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE)) return FALSE;
+ if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return sal_False;
mpCurrentSdrDragMethod = new SdrDragCrook(*this);
}
} break;
@@ -427,7 +427,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
// SDRDRAG_MOVE
if((eDragHdl == HDL_MOVE) && !IsMoveAllowed())
{
- return FALSE;
+ return sal_False;
}
else if(eDragHdl == HDL_GLUE)
{
@@ -443,9 +443,9 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
}
else
{
- if(!IsResizeAllowed(TRUE))
+ if(!IsResizeAllowed(sal_True))
{
- return FALSE;
+ return sal_False;
}
sal_Bool bSingleTextObjMark = sal_False; // SJ: #i100490#
@@ -488,14 +488,14 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
{
// #i77187#
// do not allow move of polygon points if object is move or size protected
- return FALSE;
+ return sal_False;
}
}
if(!mpCurrentSdrDragMethod)
{
// fallback to DragSpecial if no interaction defined
- bDragSpecial = TRUE;
+ bDragSpecial = sal_True;
mpCurrentSdrDragMethod = new SdrDragObjOwn(*this);
}
}
@@ -519,12 +519,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl
// Aha, Obj kann nicht Move SpecialDrag, also MoveFrameDrag versuchen
delete mpCurrentSdrDragMethod;
mpCurrentSdrDragMethod = 0;
- bDragSpecial=FALSE;
+ bDragSpecial=sal_False;
if (!IsMoveAllowed())
- return FALSE;
+ return sal_False;
- bFramDrag=TRUE;
+ bFramDrag=sal_True;
mpCurrentSdrDragMethod = new SdrDragMove(*this);
aDragStat.SetDragMethod(mpCurrentSdrDragMethod);
bRet = mpCurrentSdrDragMethod->BeginSdrDrag();
@@ -552,14 +552,14 @@ void SdrDragView::MovDragObj(const Point& rPnt)
}
}
-BOOL SdrDragView::EndDragObj(BOOL bCopy)
+sal_Bool SdrDragView::EndDragObj(sal_Bool bCopy)
{
bool bRet(false);
// #i73341# If insert GluePoint, do not insist on last points being different
if(mpCurrentSdrDragMethod && aDragStat.IsMinMoved() && (IsInsertGluePoint() || aDragStat.GetNow() != aDragStat.GetPrev()))
{
- ULONG nHdlAnzMerk=0;
+ sal_uIntPtr nHdlAnzMerk=0;
if (bEliminatePolyPoints)
{ // IBM Special
@@ -592,7 +592,7 @@ BOOL SdrDragView::EndDragObj(BOOL bCopy)
if (bInsPolyPoint)
{
SetMarkHandles();
- bInsPolyPoint=FALSE;
+ bInsPolyPoint=sal_False;
if( bUndo )
{
BegUndo(aInsPointUndoStr);
@@ -618,8 +618,8 @@ BOOL SdrDragView::EndDragObj(BOOL bCopy)
BrkDragObj();
}
- bInsPolyPoint=FALSE;
- SetInsertGluePoint(FALSE);
+ bInsPolyPoint=sal_False;
+ SetInsertGluePoint(sal_False);
return bRet;
}
@@ -639,7 +639,7 @@ void SdrDragView::BrkDragObj()
delete pInsPointUndo;
pInsPointUndo=NULL;
SetMarkHandles();
- bInsPolyPoint=FALSE;
+ bInsPolyPoint=sal_False;
}
if (IsInsertGluePoint())
@@ -647,7 +647,7 @@ void SdrDragView::BrkDragObj()
pInsPointUndo->Undo(); // Den eingefuegten Klebepunkt wieder raus
delete pInsPointUndo;
pInsPointUndo=NULL;
- SetInsertGluePoint(FALSE);
+ SetInsertGluePoint(sal_False);
}
eDragHdl=HDL_MOVE;
@@ -655,7 +655,7 @@ void SdrDragView::BrkDragObj()
}
}
-BOOL SdrDragView::IsInsObjPointPossible() const
+sal_Bool SdrDragView::IsInsObjPointPossible() const
{
return pMarkedObj!=NULL && pMarkedObj->IsPolyObj();
}
@@ -731,51 +731,51 @@ sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, con
return bRet;
}
-BOOL SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd)
+sal_Bool SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd)
{
if(IsInsObjPoint())
{
sal_uInt32 nNextPnt(mnInsPointNum);
Point aPnt(aDragStat.GetNow());
- BOOL bOk=EndDragObj(FALSE);
- if (bOk==TRUE && eCmd!=SDRCREATE_FORCEEND)
+ sal_Bool bOk=EndDragObj(sal_False);
+ if (bOk==sal_True && eCmd!=SDRCREATE_FORCEEND)
{
// Ret=True bedeutet: Action ist vorbei.
bOk=!(ImpBegInsObjPoint(sal_True, nNextPnt, aPnt, eCmd == SDRCREATE_NEXTOBJECT, pDragWin));
}
return bOk;
- } else return FALSE;
+ } else return sal_False;
}
-BOOL SdrDragView::IsInsGluePointPossible() const
+sal_Bool SdrDragView::IsInsGluePointPossible() const
{
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
if (IsInsGluePointMode() && AreObjectsMarked())
{
if (GetMarkedObjectCount()==1)
{
- // FALSE liefern, wenn 1 Objekt und dieses ein Verbinder ist.
+ // sal_False liefern, wenn 1 Objekt und dieses ein Verbinder ist.
const SdrObject* pObj=GetMarkedObjectByIndex(0);
if (!HAS_BASE(SdrEdgeObj,pObj))
{
- bRet=TRUE;
+ bRet=sal_True;
}
}
else
{
- bRet=TRUE;
+ bRet=sal_True;
}
}
return bRet;
}
-BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
+sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt)
{
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
SdrObject* pObj;
SdrPageView* pPV;
- ULONG nMarkNum;
+ sal_uIntPtr nMarkNum;
if (PickMarkedObj(rPnt,pObj,pPV,&nMarkNum,SDRSEARCH_PASS2BOUND))
{
BrkAction();
@@ -791,9 +791,9 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
SdrGluePointList* pGPL=pObj->ForceGluePointList();
if (pGPL!=NULL)
{
- USHORT nGlueIdx=pGPL->Insert(SdrGluePoint());
+ sal_uInt16 nGlueIdx=pGPL->Insert(SdrGluePoint());
SdrGluePoint& rGP=(*pGPL)[nGlueIdx];
- USHORT nGlueId=rGP.GetId();
+ sal_uInt16 nGlueId=rGP.GetId();
rGP.SetAbsolutePos(rPnt,*pObj);
SdrHdl* pHdl=NULL;
@@ -803,7 +803,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
}
if (pHdl!=NULL && pHdl->GetKind()==HDL_GLUE && pHdl->GetObj()==pObj && pHdl->GetObjHdlNum()==nGlueId)
{
- SetInsertGluePoint(TRUE);
+ SetInsertGluePoint(sal_True);
bRet=BegDragObj(rPnt,NULL,pHdl,0);
if (bRet)
{
@@ -812,7 +812,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
}
else
{
- SetInsertGluePoint(FALSE);
+ SetInsertGluePoint(sal_False);
delete pInsPointUndo;
pInsPointUndo=NULL;
}
@@ -825,7 +825,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt)
else
{
// Keine Klebepunkte moeglich bei diesem Objekt (z.B. Edge)
- SetInsertGluePoint(FALSE);
+ SetInsertGluePoint(sal_False);
delete pInsPointUndo;
pInsPointUndo=NULL;
}
@@ -852,7 +852,7 @@ void SdrDragView::ShowDragObj()
}
}
- aDragStat.SetShown(TRUE);
+ aDragStat.SetShown(sal_True);
}
}
@@ -861,13 +861,13 @@ void SdrDragView::HideDragObj()
if(mpCurrentSdrDragMethod && aDragStat.IsShown())
{
mpCurrentSdrDragMethod->destroyOverlayGeometry();
- aDragStat.SetShown(FALSE);
+ aDragStat.SetShown(sal_False);
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrDragView::SetNoDragXorPolys(BOOL bOn)
+void SdrDragView::SetNoDragXorPolys(sal_Bool bOn)
{
if (IsNoDragXorPolys()!=bOn)
{
@@ -894,7 +894,7 @@ void SdrDragView::SetNoDragXorPolys(BOOL bOn)
}
}
-void SdrDragView::SetDragStripes(BOOL bOn)
+void SdrDragView::SetDragStripes(sal_Bool bOn)
{
if (mpCurrentSdrDragMethod && aDragStat.IsShown())
{
@@ -908,24 +908,24 @@ void SdrDragView::SetDragStripes(BOOL bOn)
}
}
-BOOL SdrDragView::IsOrthoDesired() const
+sal_Bool SdrDragView::IsOrthoDesired() const
{
if(mpCurrentSdrDragMethod && (IS_TYPE(SdrDragObjOwn, mpCurrentSdrDragMethod) || IS_TYPE(SdrDragResize, mpCurrentSdrDragMethod)))
{
return bOrthoDesiredOnMarked;
}
- return FALSE;
+ return sal_False;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrDragView::SetRubberEdgeDragging(BOOL bOn)
+void SdrDragView::SetRubberEdgeDragging(sal_Bool bOn)
{
if (bOn!=IsRubberEdgeDragging())
{
- ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
- BOOL bShowHide=nAnz!=0 && IsDragObj() &&
+ sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+ sal_Bool bShowHide=nAnz!=0 && IsDragObj() &&
(nRubberEdgeDraggingLimit>=nAnz);
if (bShowHide)
HideDragObj();
@@ -935,12 +935,12 @@ void SdrDragView::SetRubberEdgeDragging(BOOL bOn)
}
}
-void SdrDragView::SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz)
+void SdrDragView::SetRubberEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz)
{
if (nEdgeObjAnz!=nRubberEdgeDraggingLimit)
{
- ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
- BOOL bShowHide=IsRubberEdgeDragging() && nAnz!=0 && IsDragObj() &&
+ sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+ sal_Bool bShowHide=IsRubberEdgeDragging() && nAnz!=0 && IsDragObj() &&
(nEdgeObjAnz>=nAnz)!=(nRubberEdgeDraggingLimit>=nAnz);
if (bShowHide)
HideDragObj();
@@ -950,12 +950,12 @@ void SdrDragView::SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz)
}
}
-void SdrDragView::SetDetailedEdgeDragging(BOOL bOn)
+void SdrDragView::SetDetailedEdgeDragging(sal_Bool bOn)
{
if (bOn!=IsDetailedEdgeDragging())
{
- ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
- BOOL bShowHide=nAnz!=0 && IsDragObj() &&
+ sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+ sal_Bool bShowHide=nAnz!=0 && IsDragObj() &&
(nDetailedEdgeDraggingLimit>=nAnz);
if (bShowHide)
HideDragObj();
@@ -965,12 +965,12 @@ void SdrDragView::SetDetailedEdgeDragging(BOOL bOn)
}
}
-void SdrDragView::SetDetailedEdgeDraggingLimit(USHORT nEdgeObjAnz)
+void SdrDragView::SetDetailedEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz)
{
if (nEdgeObjAnz!=nDetailedEdgeDraggingLimit)
{
- ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
- BOOL bShowHide=IsDetailedEdgeDragging() && nAnz!=0 && IsDragObj() &&
+ sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+ sal_Bool bShowHide=IsDetailedEdgeDragging() && nAnz!=0 && IsDragObj() &&
(nEdgeObjAnz>=nAnz)!=(nDetailedEdgeDraggingLimit>=nAnz);
if (bShowHide)
HideDragObj();
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index d2c1e7bc52ef..ec9fece55649 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -63,55 +63,55 @@
void SdrEditView::ImpResetPossibilityFlags()
{
- bReadOnly =FALSE;
-
- bGroupPossible =FALSE;
- bUnGroupPossible =FALSE;
- bGrpEnterPossible =FALSE;
- bDeletePossible =FALSE;
- bToTopPossible =FALSE;
- bToBtmPossible =FALSE;
- bReverseOrderPossible =FALSE;
-
- bImportMtfPossible =FALSE;
- bCombinePossible =FALSE;
- bDismantlePossible =FALSE;
- bCombineNoPolyPolyPossible =FALSE;
- bDismantleMakeLinesPossible=FALSE;
- bOrthoDesiredOnMarked =FALSE;
-
- bMoreThanOneNotMovable =FALSE;
- bOneOrMoreMovable =FALSE;
- bMoreThanOneNoMovRot =FALSE;
- bContortionPossible =FALSE;
- bAllPolys =FALSE;
- bOneOrMorePolys =FALSE;
- bMoveAllowed =FALSE;
- bResizeFreeAllowed =FALSE;
- bResizePropAllowed =FALSE;
- bRotateFreeAllowed =FALSE;
- bRotate90Allowed =FALSE;
- bMirrorFreeAllowed =FALSE;
- bMirror45Allowed =FALSE;
- bMirror90Allowed =FALSE;
- bTransparenceAllowed =FALSE;
- bGradientAllowed =FALSE;
- bShearAllowed =FALSE;
- bEdgeRadiusAllowed =FALSE;
- bCanConvToPath =FALSE;
- bCanConvToPoly =FALSE;
- bCanConvToContour =FALSE;
- bCanConvToPathLineToArea=FALSE;
- bCanConvToPolyLineToArea=FALSE;
- bMoveProtect =FALSE;
- bResizeProtect =FALSE;
+ bReadOnly =sal_False;
+
+ bGroupPossible =sal_False;
+ bUnGroupPossible =sal_False;
+ bGrpEnterPossible =sal_False;
+ bDeletePossible =sal_False;
+ bToTopPossible =sal_False;
+ bToBtmPossible =sal_False;
+ bReverseOrderPossible =sal_False;
+
+ bImportMtfPossible =sal_False;
+ bCombinePossible =sal_False;
+ bDismantlePossible =sal_False;
+ bCombineNoPolyPolyPossible =sal_False;
+ bDismantleMakeLinesPossible=sal_False;
+ bOrthoDesiredOnMarked =sal_False;
+
+ bMoreThanOneNotMovable =sal_False;
+ bOneOrMoreMovable =sal_False;
+ bMoreThanOneNoMovRot =sal_False;
+ bContortionPossible =sal_False;
+ bAllPolys =sal_False;
+ bOneOrMorePolys =sal_False;
+ bMoveAllowed =sal_False;
+ bResizeFreeAllowed =sal_False;
+ bResizePropAllowed =sal_False;
+ bRotateFreeAllowed =sal_False;
+ bRotate90Allowed =sal_False;
+ bMirrorFreeAllowed =sal_False;
+ bMirror45Allowed =sal_False;
+ bMirror90Allowed =sal_False;
+ bTransparenceAllowed =sal_False;
+ bGradientAllowed =sal_False;
+ bShearAllowed =sal_False;
+ bEdgeRadiusAllowed =sal_False;
+ bCanConvToPath =sal_False;
+ bCanConvToPoly =sal_False;
+ bCanConvToContour =sal_False;
+ bCanConvToPathLineToArea=sal_False;
+ bCanConvToPolyLineToArea=sal_False;
+ bMoveProtect =sal_False;
+ bResizeProtect =sal_False;
}
void SdrEditView::ImpClearVars()
{
ImpResetPossibilityFlags();
- bPossibilitiesDirty=TRUE; // << war von Purify angemeckert
- bBundleVirtObj=FALSE;
+ bPossibilitiesDirty=sal_True; // << war von Purify angemeckert
+ bBundleVirtObj=sal_False;
}
SdrEditView::SdrEditView(SdrModel* pModel1, OutputDevice* pOut):
@@ -126,10 +126,10 @@ SdrEditView::~SdrEditView()
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, USHORT nPos)
+SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, sal_uInt16 nPos)
{
SdrLayerAdmin& rLA=pMod->GetLayerAdmin();
- USHORT nMax=rLA.GetLayerCount();
+ sal_uInt16 nMax=rLA.GetLayerCount();
if (nPos>nMax) nPos=nMax;
SdrLayer* pNewLayer=rLA.NewLayer(rName,nPos);
@@ -143,7 +143,7 @@ SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, USHORT nPos)
#include <svx/svdogrp.hxx>
#include <svx/scene3d.hxx>
-BOOL SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const
+sal_Bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const
{
sal_Bool bDelAll(sal_True);
sal_uInt32 nObjAnz(pOL->GetObjCount());
@@ -224,7 +224,7 @@ void SdrEditView::ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID)
void SdrEditView::DeleteLayer(const XubString& rName)
{
SdrLayerAdmin& rLA = pMod->GetLayerAdmin();
- SdrLayer* pLayer = rLA.GetLayer(rName, TRUE);
+ SdrLayer* pLayer = rLA.GetLayer(rName, sal_True);
sal_uInt16 nLayerNum(rLA.GetLayerPos(pLayer));
if(SDRLAYER_NOTFOUND != nLayerNum)
@@ -306,11 +306,11 @@ void SdrEditView::DeleteLayer(const XubString& rName)
}
}
-void SdrEditView::MoveLayer(const XubString& rName, USHORT nNewPos)
+void SdrEditView::MoveLayer(const XubString& rName, sal_uInt16 nNewPos)
{
SdrLayerAdmin& rLA=pMod->GetLayerAdmin();
- SdrLayer* pLayer=rLA.GetLayer(rName,TRUE);
- USHORT nLayerNum=rLA.GetLayerPos(pLayer);
+ SdrLayer* pLayer=rLA.GetLayer(rName,sal_True);
+ sal_uInt16 nLayerNum=rLA.GetLayerPos(pLayer);
if (nLayerNum!=SDRLAYER_NOTFOUND)
{
if( IsUndoEnabled() )
@@ -375,8 +375,8 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes()
}
}
- ULONG nMarkedEdgeAnz = GetMarkedEdgesOfMarkedNodes().GetMarkCount();
- USHORT i;
+ sal_uIntPtr nMarkedEdgeAnz = GetMarkedEdgesOfMarkedNodes().GetMarkCount();
+ sal_uInt16 i;
for (i=0; i<nMarkedEdgeAnz; i++) {
SdrMark* pEM = GetMarkedEdgesOfMarkedNodes().GetMark(i);
@@ -401,95 +401,95 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes()
void SdrEditView::MarkListHasChanged()
{
SdrMarkView::MarkListHasChanged();
- bPossibilitiesDirty=TRUE;
+ bPossibilitiesDirty=sal_True;
}
void SdrEditView::ModelHasChanged()
{
SdrMarkView::ModelHasChanged();
- bPossibilitiesDirty=TRUE;
+ bPossibilitiesDirty=sal_True;
}
-BOOL SdrEditView::IsResizeAllowed(BOOL bProp) const
+sal_Bool SdrEditView::IsResizeAllowed(sal_Bool bProp) const
{
ForcePossibilities();
- if (bResizeProtect) return FALSE;
+ if (bResizeProtect) return sal_False;
if (bProp) return bResizePropAllowed;
return bResizeFreeAllowed;
}
-BOOL SdrEditView::IsRotateAllowed(BOOL b90Deg) const
+sal_Bool SdrEditView::IsRotateAllowed(sal_Bool b90Deg) const
{
ForcePossibilities();
- if (bMoveProtect) return FALSE;
+ if (bMoveProtect) return sal_False;
if (b90Deg) return bRotate90Allowed;
return bRotateFreeAllowed;
}
-BOOL SdrEditView::IsMirrorAllowed(BOOL b45Deg, BOOL b90Deg) const
+sal_Bool SdrEditView::IsMirrorAllowed(sal_Bool b45Deg, sal_Bool b90Deg) const
{
ForcePossibilities();
- if (bMoveProtect) return FALSE;
+ if (bMoveProtect) return sal_False;
if (b90Deg) return bMirror90Allowed;
if (b45Deg) return bMirror45Allowed;
return bMirrorFreeAllowed && !bMoveProtect;
}
-BOOL SdrEditView::IsTransparenceAllowed() const
+sal_Bool SdrEditView::IsTransparenceAllowed() const
{
ForcePossibilities();
return bTransparenceAllowed;
}
-BOOL SdrEditView::IsGradientAllowed() const
+sal_Bool SdrEditView::IsGradientAllowed() const
{
ForcePossibilities();
return bGradientAllowed;
}
-BOOL SdrEditView::IsShearAllowed() const
+sal_Bool SdrEditView::IsShearAllowed() const
{
ForcePossibilities();
- if (bResizeProtect) return FALSE;
+ if (bResizeProtect) return sal_False;
return bShearAllowed;
}
-BOOL SdrEditView::IsEdgeRadiusAllowed() const
+sal_Bool SdrEditView::IsEdgeRadiusAllowed() const
{
ForcePossibilities();
return bEdgeRadiusAllowed;
}
-BOOL SdrEditView::IsCrookAllowed(BOOL bNoContortion) const
+sal_Bool SdrEditView::IsCrookAllowed(sal_Bool bNoContortion) const
{
// CrookMode fehlt hier (weil kein Rotate bei Shear ...)
ForcePossibilities();
if (bNoContortion) {
- if (!bRotateFreeAllowed) return FALSE; // Crook is nich
+ if (!bRotateFreeAllowed) return sal_False; // Crook is nich
return !bMoveProtect && bMoveAllowed;
} else {
return !bResizeProtect && bContortionPossible;
}
}
-BOOL SdrEditView::IsDistortAllowed(BOOL bNoContortion) const
+sal_Bool SdrEditView::IsDistortAllowed(sal_Bool bNoContortion) const
{
ForcePossibilities();
if (bNoContortion) {
- return FALSE;
+ return sal_False;
} else {
return !bResizeProtect && bContortionPossible;
}
}
-BOOL SdrEditView::IsCombinePossible(BOOL bNoPolyPoly) const
+sal_Bool SdrEditView::IsCombinePossible(sal_Bool bNoPolyPoly) const
{
ForcePossibilities();
if (bNoPolyPoly) return bCombineNoPolyPolyPossible;
else return bCombinePossible;
}
-BOOL SdrEditView::IsDismantlePossible(BOOL bMakeLines) const
+sal_Bool SdrEditView::IsDismantlePossible(sal_Bool bMakeLines) const
{
ForcePossibilities();
if (bMakeLines) return bDismantleMakeLinesPossible;
@@ -498,7 +498,7 @@ BOOL SdrEditView::IsDismantlePossible(BOOL bMakeLines) const
void SdrEditView::CheckPossibilities()
{
- if (bSomeObjChgdFlag) bPossibilitiesDirty=TRUE;
+ if (bSomeObjChgdFlag) bPossibilitiesDirty=sal_True;
if(bSomeObjChgdFlag)
{
@@ -511,11 +511,11 @@ void SdrEditView::CheckPossibilities()
if (bPossibilitiesDirty) {
ImpResetPossibilityFlags();
SortMarkedObjects();
- ULONG nMarkAnz=GetMarkedObjectCount();
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
if (nMarkAnz!=0) {
bReverseOrderPossible=nMarkAnz>=2;
- ULONG nMovableCount=0;
+ sal_uIntPtr nMovableCount=0;
bGroupPossible=nMarkAnz>=2;
bCombinePossible=nMarkAnz>=2;
if (nMarkAnz==1) {
@@ -523,27 +523,27 @@ void SdrEditView::CheckPossibilities()
// fehlt noch ...
const SdrObject* pObj=GetMarkedObjectByIndex(0);
//const SdrPathObj* pPath=PTR_CAST(SdrPathObj,pObj);
- BOOL bGroup=pObj->GetSubList()!=NULL;
- BOOL bHasText=pObj->GetOutlinerParaObject()!=NULL;
+ sal_Bool bGroup=pObj->GetSubList()!=NULL;
+ sal_Bool bHasText=pObj->GetOutlinerParaObject()!=NULL;
if (bGroup || bHasText) {
- bCombinePossible=TRUE;
+ bCombinePossible=sal_True;
}
}
bCombineNoPolyPolyPossible=bCombinePossible;
- bDeletePossible=TRUE;
+ bDeletePossible=sal_True;
// Zu den Transformationen erstmal ja sagen
- bMoveAllowed =TRUE;
- bResizeFreeAllowed=TRUE;
- bResizePropAllowed=TRUE;
- bRotateFreeAllowed=TRUE;
- bRotate90Allowed =TRUE;
- bMirrorFreeAllowed=TRUE;
- bMirror45Allowed =TRUE;
- bMirror90Allowed =TRUE;
- bShearAllowed =TRUE;
- bEdgeRadiusAllowed=FALSE;
- bContortionPossible=TRUE;
- bCanConvToContour = TRUE;
+ bMoveAllowed =sal_True;
+ bResizeFreeAllowed=sal_True;
+ bResizePropAllowed=sal_True;
+ bRotateFreeAllowed=sal_True;
+ bRotate90Allowed =sal_True;
+ bMirrorFreeAllowed=sal_True;
+ bMirror45Allowed =sal_True;
+ bMirror90Allowed =sal_True;
+ bShearAllowed =sal_True;
+ bEdgeRadiusAllowed=sal_False;
+ bContortionPossible=sal_True;
+ bCanConvToContour = sal_True;
// these ones are only allowed when single object is selected
bTransparenceAllowed = (nMarkAnz == 1);
@@ -556,7 +556,7 @@ void SdrEditView::CheckPossibilities()
// maybe group object, so get merged ItemSet
const SfxItemSet& rSet = pObj->GetMergedItemSet();
- SfxItemState eState = rSet.GetItemState(XATTR_FILLSTYLE, FALSE);
+ SfxItemState eState = rSet.GetItemState(XATTR_FILLSTYLE, sal_False);
if(SFX_ITEM_DONTCARE != eState)
{
@@ -565,67 +565,67 @@ void SdrEditView::CheckPossibilities()
if(eFillStyle != XFILL_GRADIENT)
{
- bGradientAllowed = FALSE;
+ bGradientAllowed = sal_False;
}
}
}
- BOOL bNoMovRotFound=FALSE;
+ sal_Bool bNoMovRotFound=sal_False;
const SdrPageView* pPV0=NULL;
- for (ULONG nm=0; nm<nMarkAnz; nm++) {
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
const SdrMark* pM=GetSdrMarkByIndex(nm);
const SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrPageView* pPV=pM->GetPageView();
if (pPV!=pPV0) {
- if (pPV->IsReadOnly()) bReadOnly=TRUE;
+ if (pPV->IsReadOnly()) bReadOnly=sal_True;
pPV0=pPV;
}
SdrObjTransformInfoRec aInfo;
pObj->TakeObjInfo(aInfo);
- BOOL bMovPrt=pObj->IsMoveProtect();
- BOOL bSizPrt=pObj->IsResizeProtect();
+ sal_Bool bMovPrt=pObj->IsMoveProtect();
+ sal_Bool bSizPrt=pObj->IsResizeProtect();
if (!bMovPrt && aInfo.bMoveAllowed) nMovableCount++; // Menge der MovableObjs zaehlen
- if (bMovPrt) bMoveProtect=TRUE;
- if (bSizPrt) bResizeProtect=TRUE;
+ if (bMovPrt) bMoveProtect=sal_True;
+ if (bSizPrt) bResizeProtect=sal_True;
// not allowed when not allowed at one object
if(!aInfo.bTransparenceAllowed)
- bTransparenceAllowed = FALSE;
+ bTransparenceAllowed = sal_False;
// Wenn einer was nicht kann, duerfen's alle nicht
- if (!aInfo.bMoveAllowed ) bMoveAllowed =FALSE;
- if (!aInfo.bResizeFreeAllowed) bResizeFreeAllowed=FALSE;
- if (!aInfo.bResizePropAllowed) bResizePropAllowed=FALSE;
- if (!aInfo.bRotateFreeAllowed) bRotateFreeAllowed=FALSE;
- if (!aInfo.bRotate90Allowed ) bRotate90Allowed =FALSE;
- if (!aInfo.bMirrorFreeAllowed) bMirrorFreeAllowed=FALSE;
- if (!aInfo.bMirror45Allowed ) bMirror45Allowed =FALSE;
- if (!aInfo.bMirror90Allowed ) bMirror90Allowed =FALSE;
- if (!aInfo.bShearAllowed ) bShearAllowed =FALSE;
- if (aInfo.bEdgeRadiusAllowed) bEdgeRadiusAllowed=TRUE;
- if (aInfo.bNoContortion ) bContortionPossible=FALSE;
+ if (!aInfo.bMoveAllowed ) bMoveAllowed =sal_False;
+ if (!aInfo.bResizeFreeAllowed) bResizeFreeAllowed=sal_False;
+ if (!aInfo.bResizePropAllowed) bResizePropAllowed=sal_False;
+ if (!aInfo.bRotateFreeAllowed) bRotateFreeAllowed=sal_False;
+ if (!aInfo.bRotate90Allowed ) bRotate90Allowed =sal_False;
+ if (!aInfo.bMirrorFreeAllowed) bMirrorFreeAllowed=sal_False;
+ if (!aInfo.bMirror45Allowed ) bMirror45Allowed =sal_False;
+ if (!aInfo.bMirror90Allowed ) bMirror90Allowed =sal_False;
+ if (!aInfo.bShearAllowed ) bShearAllowed =sal_False;
+ if (aInfo.bEdgeRadiusAllowed) bEdgeRadiusAllowed=sal_True;
+ if (aInfo.bNoContortion ) bContortionPossible=sal_False;
// Fuer Crook mit Contortion: Alle Objekte muessen
// Movable und Rotatable sein, ausser maximal 1
if (!bMoreThanOneNoMovRot) {
if (!aInfo.bMoveAllowed || !aInfo.bResizeFreeAllowed) {
bMoreThanOneNoMovRot=bNoMovRotFound;
- bNoMovRotFound=TRUE;
+ bNoMovRotFound=sal_True;
}
}
// when one member cannot be converted, no conversion is possible
if(!aInfo.bCanConvToContour)
- bCanConvToContour = FALSE;
+ bCanConvToContour = sal_False;
// Ungroup
if (!bUnGroupPossible) bUnGroupPossible=pObj->GetSubList()!=NULL;
// ConvertToCurve: Wenn mind. einer konvertiert werden kann ist das ok.
- if (aInfo.bCanConvToPath ) bCanConvToPath =TRUE;
- if (aInfo.bCanConvToPoly ) bCanConvToPoly =TRUE;
- if (aInfo.bCanConvToPathLineToArea) bCanConvToPathLineToArea=TRUE;
- if (aInfo.bCanConvToPolyLineToArea) bCanConvToPolyLineToArea=TRUE;
+ if (aInfo.bCanConvToPath ) bCanConvToPath =sal_True;
+ if (aInfo.bCanConvToPoly ) bCanConvToPoly =sal_True;
+ if (aInfo.bCanConvToPathLineToArea) bCanConvToPathLineToArea=sal_True;
+ if (aInfo.bCanConvToPolyLineToArea) bCanConvToPolyLineToArea=sal_True;
// Combine/Dismantle
if(bCombinePossible)
@@ -637,15 +637,15 @@ void SdrEditView::CheckPossibilities()
if (!bDismantlePossible) bDismantlePossible = ImpCanDismantle(pObj, sal_False);
if (!bDismantleMakeLinesPossible) bDismantleMakeLinesPossible = ImpCanDismantle(pObj, sal_True);
// OrthoDesiredOnMarked checken
- if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=TRUE;
+ if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=sal_True;
// ImportMtf checken
if (!bImportMtfPossible) {
- BOOL bGraf=HAS_BASE(SdrGrafObj,pObj);
- BOOL bOle2=HAS_BASE(SdrOle2Obj,pObj);
+ sal_Bool bGraf=HAS_BASE(SdrGrafObj,pObj);
+ sal_Bool bOle2=HAS_BASE(SdrOle2Obj,pObj);
if( bGraf && ((SdrGrafObj*)pObj)->HasGDIMetaFile() && !((SdrGrafObj*)pObj)->IsEPS() )
- bImportMtfPossible = TRUE;
+ bImportMtfPossible = sal_True;
if (bOle2)
bImportMtfPossible=((SdrOle2Obj*)pObj)->GetObjRef().is();
@@ -658,12 +658,12 @@ void SdrEditView::CheckPossibilities()
}
ImpCheckToTopBtmPossible();
((SdrPolyEditView*)this)->ImpCheckPolyPossibilities();
- bPossibilitiesDirty=FALSE;
+ bPossibilitiesDirty=sal_False;
if (bReadOnly) {
- BOOL bMerker1=bGrpEnterPossible;
+ sal_Bool bMerker1=bGrpEnterPossible;
ImpResetPossibilityFlags();
- bReadOnly=TRUE;
+ bReadOnly=sal_True;
bGrpEnterPossible=bMerker1;
}
if (bMoveAllowed) {
@@ -673,9 +673,9 @@ void SdrEditView::CheckPossibilities()
SdrObject* pObj=GetMarkedObjectByIndex(0);
SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj);
if (pEdge!=NULL) {
- SdrObject* pNode1=pEdge->GetConnectedNode(TRUE);
- SdrObject* pNode2=pEdge->GetConnectedNode(FALSE);
- if (pNode1!=NULL || pNode2!=NULL) bMoveAllowed=FALSE;
+ SdrObject* pNode1=pEdge->GetConnectedNode(sal_True);
+ SdrObject* pNode2=pEdge->GetConnectedNode(sal_False);
+ if (pNode1!=NULL || pNode2!=NULL) bMoveAllowed=sal_False;
}
}
}
@@ -686,14 +686,14 @@ void SdrEditView::CheckPossibilities()
void SdrEditView::ForceMarkedObjToAnotherPage()
{
- BOOL bFlg=FALSE;
- for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) {
+ sal_Bool bFlg=sal_False;
+ for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
Rectangle aObjRect(pObj->GetCurrentBoundRect());
Rectangle aPgRect(pM->GetPageView()->GetPageRect());
if (!aObjRect.IsOver(aPgRect)) {
- BOOL bFnd=FALSE;
+ sal_Bool bFnd=sal_False;
SdrPageView* pPV = GetSdrPageView();
if(pPV)
@@ -708,7 +708,7 @@ void SdrEditView::ForceMarkedObjToAnotherPage()
pPV->GetObjList()->InsertObject(pObj,CONTAINER_APPEND,&aReason);
pM->SetPageView(pPV);
InvalidateAllWin(aObjRect);
- bFlg=TRUE;
+ bFlg=sal_True;
}
}
}
@@ -915,8 +915,8 @@ void SdrEditView::CopyMarkedObj()
SdrMarkList aSourceObjectsForCopy(GetMarkedObjectList());
// Folgende Schleife Anstatt MarkList::Merge(), damit
// ich jeweils mein Flag an die MarkEntries setzen kann.
- ULONG nEdgeAnz = GetEdgesOfMarkedNodes().GetMarkCount();
- for (ULONG nEdgeNum=0; nEdgeNum<nEdgeAnz; nEdgeNum++) {
+ sal_uIntPtr nEdgeAnz = GetEdgesOfMarkedNodes().GetMarkCount();
+ for (sal_uIntPtr nEdgeNum=0; nEdgeNum<nEdgeAnz; nEdgeNum++) {
SdrMark aM(*GetEdgesOfMarkedNodes().GetMark(nEdgeNum));
aM.SetUser(1);
aSourceObjectsForCopy.InsertEntry(aM);
@@ -930,9 +930,9 @@ void SdrEditView::CopyMarkedObj()
const bool bUndo = IsUndoEnabled();
GetMarkedObjectListWriteAccess().Clear();
- ULONG nCloneErrCnt=0;
- ULONG nMarkAnz=aSourceObjectsForCopy.GetMarkCount();
- ULONG nm;
+ sal_uIntPtr nCloneErrCnt=0;
+ sal_uIntPtr nMarkAnz=aSourceObjectsForCopy.GetMarkCount();
+ sal_uIntPtr nm;
for (nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=aSourceObjectsForCopy.GetMark(nm);
SdrObject* pO=pM->GetMarkedSdrObj()->Clone();
@@ -986,14 +986,14 @@ void SdrEditView::CopyMarkedObj()
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions)
+sal_Bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions)
{
if ((nOptions & SDRINSERT_SETDEFLAYER)!=0) {
- SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,TRUE);
+ SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,sal_True);
if (nLayer==SDRLAYER_NOTFOUND) nLayer=0;
if (rPV.GetLockedLayers().IsSet(nLayer) || !rPV.GetVisibleLayers().IsSet(nLayer)) {
SdrObject::Free( pObj ); // Layer gesperrt oder nicht sichtbar
- return FALSE;
+ return sal_False;
}
pObj->NbcSetLayer(nLayer);
}
@@ -1016,10 +1016,10 @@ BOOL SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nO
if ((nOptions & SDRINSERT_ADDMARK)==0) UnmarkAllObj();
MarkObj(pObj,&rPV);
}
- return TRUE;
+ return sal_True;
}
-void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, BOOL bMark)
+void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark)
{
SdrObjList* pOL=pOldObj->GetObjList();
const bool bUndo = IsUndoEnabled();
@@ -1027,7 +1027,7 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoReplaceObject(*pOldObj,*pNewObj));
if( IsObjMarked( pOldObj ) )
- MarkObj( pOldObj, &rPV, TRUE /*unmark!*/ );
+ MarkObj( pOldObj, &rPV, sal_True /*unmark!*/ );
pOL->ReplaceObject(pNewObj,pOldObj->GetOrdNum());
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 9e149bd8e42d..3502db48e4e9 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -76,11 +76,11 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy)
+void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy)
{
DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() mit leerem Rect mach keinen Sinn");
if (rRect.IsEmpty()) return;
- ULONG nAnz=GetMarkedObjectCount();
+ sal_uIntPtr nAnz=GetMarkedObjectCount();
if (nAnz==0) return;
Rectangle aR0(GetMarkedObjRect());
DBG_ASSERT(!aR0.IsEmpty(),"SetMarkedObjRect(): GetMarkedObjRect() ist leer");
@@ -105,7 +105,7 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy)
if (bCopy)
CopyMarkedObj();
- for (ULONG nm=0; nm<nAnz; nm++)
+ for (sal_uIntPtr nm=0; nm<nAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
@@ -203,8 +203,8 @@ void SdrEditView::MoveMarkedObj(const Size& rSiz, bool bCopy)
if (bCopy)
CopyMarkedObj();
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
@@ -236,8 +236,8 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons
if (bCopy)
CopyMarkedObj();
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
@@ -256,17 +256,17 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons
long SdrEditView::GetMarkedObjRotate() const
{
- BOOL b1st=TRUE;
- BOOL bOk=TRUE;
+ sal_Bool b1st=sal_True;
+ sal_Bool bOk=sal_True;
long nWink=0;
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz && bOk; nm++) {
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
long nWink2=pO->GetRotateAngle();
if (b1st) nWink=nWink2;
- else if (nWink2!=nWink) bOk=FALSE;
- b1st=FALSE;
+ else if (nWink2!=nWink) bOk=sal_False;
+ b1st=sal_False;
}
if (!bOk) nWink=0;
return nWink;
@@ -389,7 +389,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b
EndUndo();
}
-void SdrEditView::MirrorMarkedObjHorizontal(BOOL bCopy)
+void SdrEditView::MirrorMarkedObjHorizontal(sal_Bool bCopy)
{
Point aCenter(GetMarkedObjRect().Center());
Point aPt2(aCenter);
@@ -397,7 +397,7 @@ void SdrEditView::MirrorMarkedObjHorizontal(BOOL bCopy)
MirrorMarkedObj(aCenter,aPt2,bCopy);
}
-void SdrEditView::MirrorMarkedObjVertical(BOOL bCopy)
+void SdrEditView::MirrorMarkedObjVertical(sal_Bool bCopy)
{
Point aCenter(GetMarkedObjRect().Center());
Point aPt2(aCenter);
@@ -407,17 +407,17 @@ void SdrEditView::MirrorMarkedObjVertical(BOOL bCopy)
long SdrEditView::GetMarkedObjShear() const
{
- BOOL b1st=TRUE;
- BOOL bOk=TRUE;
+ sal_Bool b1st=sal_True;
+ sal_Bool bOk=sal_True;
long nWink=0;
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz && bOk; nm++) {
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
long nWink2=pO->GetShearAngle();
if (b1st) nWink=nWink2;
- else if (nWink2!=nWink) bOk=FALSE;
- b1st=FALSE;
+ else if (nWink2!=nWink) bOk=sal_False;
+ b1st=sal_False;
}
if (nWink>SDRMAXSHEAR) nWink=SDRMAXSHEAR;
if (nWink<-SDRMAXSHEAR) nWink=-SDRMAXSHEAR;
@@ -442,8 +442,8 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo
CopyMarkedObj();
double nTan=tan(nWink*nPi180);
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
@@ -461,10 +461,10 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo
}
void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad,
- SdrCrookMode eMode, BOOL bVertical, BOOL bNoContortion, BOOL bRotate, const Rectangle& rMarkRect)
+ SdrCrookMode eMode, sal_Bool bVertical, sal_Bool bNoContortion, sal_Bool bRotate, const Rectangle& rMarkRect)
{
SdrPathObj* pPath=PTR_CAST(SdrPathObj,pO);
- BOOL bDone = FALSE;
+ sal_Bool bDone = sal_False;
if(pPath!=NULL && !bNoContortion)
{
@@ -475,7 +475,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
case SDRCROOK_STRETCH: CrookStretchPoly(aXPP,rRef,rRad,bVertical,rMarkRect); break;
} // switch
pPath->SetPathPoly(aXPP.getB2DPolyPolygon());
- bDone = TRUE;
+ bDone = sal_True;
}
if(!bDone && !pPath && pO->IsPolyObj() && 0L != pO->GetPointCount())
@@ -505,7 +505,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa
pO->SetPoint(aXP[(sal_uInt16)nPtNum],nPtNum);
}
- bDone = TRUE;
+ bDone = sal_True;
}
if(!bDone)
@@ -544,7 +544,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
Rectangle aMarkRect(GetMarkedObjRect());
const bool bUndo = IsUndoEnabled();
- bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed(FALSE);
+ bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed(sal_False);
if( bUndo )
{
@@ -558,8 +558,8 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
if (bCopy)
CopyMarkedObj();
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
@@ -582,7 +582,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM
EndUndo();
}
-void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion)
+void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion)
{
SdrPathObj* pPath = PTR_CAST(SdrPathObj, pO);
@@ -632,8 +632,8 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto
if (bCopy)
CopyMarkedObj();
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
@@ -659,47 +659,47 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bReplaceAll*/)
+void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/)
{
// bReplaceAll hat hier keinerlei Wirkung
Rectangle aAllSnapRect(GetMarkedObjRect());
const SfxPoolItem *pPoolItem=NULL;
- if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrTransformRef1XItem*)pPoolItem)->GetValue();
SetRef1(Point(n,GetRef1().Y()));
}
- if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrTransformRef1YItem*)pPoolItem)->GetValue();
SetRef1(Point(GetRef1().X(),n));
}
- if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrTransformRef2XItem*)pPoolItem)->GetValue();
SetRef2(Point(n,GetRef2().Y()));
}
- if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrTransformRef2YItem*)pPoolItem)->GetValue();
SetRef2(Point(GetRef2().X(),n));
}
- long nAllPosX=0; BOOL bAllPosX=FALSE;
- long nAllPosY=0; BOOL bAllPosY=FALSE;
- long nAllWdt=0; BOOL bAllWdt=FALSE;
- long nAllHgt=0; BOOL bAllHgt=FALSE;
- BOOL bDoIt=FALSE;
- if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ long nAllPosX=0; sal_Bool bAllPosX=sal_False;
+ long nAllPosY=0; sal_Bool bAllPosY=sal_False;
+ long nAllWdt=0; sal_Bool bAllWdt=sal_False;
+ long nAllHgt=0; sal_Bool bAllHgt=sal_False;
+ sal_Bool bDoIt=sal_False;
+ if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,sal_True,&pPoolItem)==SFX_ITEM_SET) {
nAllPosX=((const SdrAllPositionXItem*)pPoolItem)->GetValue();
- bAllPosX=TRUE; bDoIt=TRUE;
+ bAllPosX=sal_True; bDoIt=sal_True;
}
- if (rAttr.GetItemState(SDRATTR_ALLPOSITIONY,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ALLPOSITIONY,sal_True,&pPoolItem)==SFX_ITEM_SET) {
nAllPosY=((const SdrAllPositionYItem*)pPoolItem)->GetValue();
- bAllPosY=TRUE; bDoIt=TRUE;
+ bAllPosY=sal_True; bDoIt=sal_True;
}
- if (rAttr.GetItemState(SDRATTR_ALLSIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ALLSIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) {
nAllWdt=((const SdrAllSizeWidthItem*)pPoolItem)->GetValue();
- bAllWdt=TRUE; bDoIt=TRUE;
+ bAllWdt=sal_True; bDoIt=sal_True;
}
- if (rAttr.GetItemState(SDRATTR_ALLSIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ALLSIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
nAllHgt=((const SdrAllSizeHeightItem*)pPoolItem)->GetValue();
- bAllHgt=TRUE; bDoIt=TRUE;
+ bAllHgt=sal_True; bDoIt=sal_True;
}
if (bDoIt) {
Rectangle aRect(aAllSnapRect); // !!! fuer PolyPt's und GluePt's aber bitte noch aendern !!!
@@ -709,32 +709,32 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bRep
if (bAllHgt) aRect.Bottom()=aAllSnapRect.Top()+nAllHgt;
SetMarkedObjRect(aRect);
}
- if (rAttr.GetItemState(SDRATTR_RESIZEXALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_RESIZEXALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
Fraction aXFact=((const SdrResizeXAllItem*)pPoolItem)->GetValue();
ResizeMarkedObj(aAllSnapRect.TopLeft(),aXFact,Fraction(1,1));
}
- if (rAttr.GetItemState(SDRATTR_RESIZEYALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_RESIZEYALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
Fraction aYFact=((const SdrResizeYAllItem*)pPoolItem)->GetValue();
ResizeMarkedObj(aAllSnapRect.TopLeft(),Fraction(1,1),aYFact);
}
- if (rAttr.GetItemState(SDRATTR_ROTATEALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ROTATEALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long nAngle=((const SdrRotateAllItem*)pPoolItem)->GetValue();
RotateMarkedObj(aAllSnapRect.Center(),nAngle);
}
- if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long nAngle=((const SdrHorzShearAllItem*)pPoolItem)->GetValue();
- ShearMarkedObj(aAllSnapRect.Center(),nAngle,FALSE);
+ ShearMarkedObj(aAllSnapRect.Center(),nAngle,sal_False);
}
- if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long nAngle=((const SdrVertShearAllItem*)pPoolItem)->GetValue();
- ShearMarkedObj(aAllSnapRect.Center(),nAngle,TRUE);
+ ShearMarkedObj(aAllSnapRect.Center(),nAngle,sal_True);
}
const bool bUndo = IsUndoEnabled();
// Todo: WhichRange nach Notwendigkeit ueberpruefen.
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
{
const SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -746,7 +746,7 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bRep
}
}
-void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyHardAttr*/) const
+void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const
{
// bOnlyHardAttr hat hier keinerlei Wirkung
// Hier muss ausserdem noch der Nullpunkt und
@@ -757,24 +757,24 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH
long nAllSnapWdt=aAllSnapRect.GetWidth()-1;
long nAllSnapHgt=aAllSnapRect.GetHeight()-1;
// koennte mal zu CheckPossibilities mit rein
- BOOL bMovProtect=FALSE,bMovProtectDC=FALSE;
- BOOL bSizProtect=FALSE,bSizProtectDC=FALSE;
- BOOL bPrintable =TRUE ,bPrintableDC=FALSE;
- BOOL bVisible = TRUE, bVisibleDC=FALSE;
- SdrLayerID nLayerId=0; BOOL bLayerDC=FALSE;
- XubString aObjName; BOOL bObjNameDC=FALSE,bObjNameSet=FALSE;
- long nSnapPosX=0; BOOL bSnapPosXDC=FALSE;
- long nSnapPosY=0; BOOL bSnapPosYDC=FALSE;
- long nSnapWdt=0; BOOL bSnapWdtDC=FALSE;
- long nSnapHgt=0; BOOL bSnapHgtDC=FALSE;
- long nLogicWdt=0; BOOL bLogicWdtDC=FALSE,bLogicWdtDiff=FALSE;
- long nLogicHgt=0; BOOL bLogicHgtDC=FALSE,bLogicHgtDiff=FALSE;
- long nRotAngle=0; BOOL bRotAngleDC=FALSE;
- long nShrAngle=0; BOOL bShrAngleDC=FALSE;
+ sal_Bool bMovProtect=sal_False,bMovProtectDC=sal_False;
+ sal_Bool bSizProtect=sal_False,bSizProtectDC=sal_False;
+ sal_Bool bPrintable =sal_True ,bPrintableDC=sal_False;
+ sal_Bool bVisible = sal_True, bVisibleDC=sal_False;
+ SdrLayerID nLayerId=0; sal_Bool bLayerDC=sal_False;
+ XubString aObjName; sal_Bool bObjNameDC=sal_False,bObjNameSet=sal_False;
+ long nSnapPosX=0; sal_Bool bSnapPosXDC=sal_False;
+ long nSnapPosY=0; sal_Bool bSnapPosYDC=sal_False;
+ long nSnapWdt=0; sal_Bool bSnapWdtDC=sal_False;
+ long nSnapHgt=0; sal_Bool bSnapHgtDC=sal_False;
+ long nLogicWdt=0; sal_Bool bLogicWdtDC=sal_False,bLogicWdtDiff=sal_False;
+ long nLogicHgt=0; sal_Bool bLogicHgtDC=sal_False,bLogicHgtDiff=sal_False;
+ long nRotAngle=0; sal_Bool bRotAngleDC=sal_False;
+ long nShrAngle=0; sal_Bool bShrAngleDC=sal_False;
Rectangle aSnapRect;
Rectangle aLogicRect;
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++) {
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
const SdrMark* pM=GetSdrMarkByIndex(nm);
const SdrObject* pObj=pM->GetMarkedSdrObj();
if (nm==0) {
@@ -796,33 +796,33 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH
nRotAngle=pObj->GetRotateAngle();
nShrAngle=pObj->GetShearAngle();
} else {
- if (!bLayerDC && nLayerId !=pObj->GetLayer()) bLayerDC=TRUE;
- if (!bMovProtectDC && bMovProtect!=pObj->IsMoveProtect()) bMovProtectDC=TRUE;
- if (!bSizProtectDC && bSizProtect!=pObj->IsResizeProtect()) bSizProtectDC=TRUE;
- if (!bPrintableDC && bPrintable !=pObj->IsPrintable()) bPrintableDC=TRUE;
- if (!bVisibleDC && bVisible !=pObj->IsVisible()) bVisibleDC=TRUE;
- if (!bRotAngleDC && nRotAngle !=pObj->GetRotateAngle()) bRotAngleDC=TRUE;
- if (!bShrAngleDC && nShrAngle !=pObj->GetShearAngle()) bShrAngleDC=TRUE;
+ if (!bLayerDC && nLayerId !=pObj->GetLayer()) bLayerDC=sal_True;
+ if (!bMovProtectDC && bMovProtect!=pObj->IsMoveProtect()) bMovProtectDC=sal_True;
+ if (!bSizProtectDC && bSizProtect!=pObj->IsResizeProtect()) bSizProtectDC=sal_True;
+ if (!bPrintableDC && bPrintable !=pObj->IsPrintable()) bPrintableDC=sal_True;
+ if (!bVisibleDC && bVisible !=pObj->IsVisible()) bVisibleDC=sal_True;
+ if (!bRotAngleDC && nRotAngle !=pObj->GetRotateAngle()) bRotAngleDC=sal_True;
+ if (!bShrAngleDC && nShrAngle !=pObj->GetShearAngle()) bShrAngleDC=sal_True;
if (!bSnapWdtDC || !bSnapHgtDC || !bSnapPosXDC || !bSnapPosYDC || !bLogicWdtDiff || !bLogicHgtDiff) {
aSnapRect=pObj->GetSnapRect();
- if (nSnapPosX!=aSnapRect.Left()) bSnapPosXDC=TRUE;
- if (nSnapPosY!=aSnapRect.Top()) bSnapPosYDC=TRUE;
- if (nSnapWdt!=aSnapRect.GetWidth()-1) bSnapWdtDC=TRUE;
- if (nSnapHgt!=aSnapRect.GetHeight()-1) bSnapHgtDC=TRUE;
+ if (nSnapPosX!=aSnapRect.Left()) bSnapPosXDC=sal_True;
+ if (nSnapPosY!=aSnapRect.Top()) bSnapPosYDC=sal_True;
+ if (nSnapWdt!=aSnapRect.GetWidth()-1) bSnapWdtDC=sal_True;
+ if (nSnapHgt!=aSnapRect.GetHeight()-1) bSnapHgtDC=sal_True;
}
if (!bLogicWdtDC || !bLogicHgtDC || !bLogicWdtDiff || !bLogicHgtDiff) {
aLogicRect=pObj->GetLogicRect();
- if (nLogicWdt!=aLogicRect.GetWidth()-1) bLogicWdtDC=TRUE;
- if (nLogicHgt!=aLogicRect.GetHeight()-1) bLogicHgtDC=TRUE;
- if (!bLogicWdtDiff && aSnapRect.GetWidth()!=aLogicRect.GetWidth()) bLogicWdtDiff=TRUE;
- if (!bLogicHgtDiff && aSnapRect.GetHeight()!=aLogicRect.GetHeight()) bLogicHgtDiff=TRUE;
+ if (nLogicWdt!=aLogicRect.GetWidth()-1) bLogicWdtDC=sal_True;
+ if (nLogicHgt!=aLogicRect.GetHeight()-1) bLogicHgtDC=sal_True;
+ if (!bLogicWdtDiff && aSnapRect.GetWidth()!=aLogicRect.GetWidth()) bLogicWdtDiff=sal_True;
+ if (!bLogicHgtDiff && aSnapRect.GetHeight()!=aLogicRect.GetHeight()) bLogicHgtDiff=sal_True;
}
}
if (!bObjNameDC ) {
if (!bObjNameSet) {
aObjName=pObj->GetName();
} else {
- if (aObjName!=pObj->GetName()) bObjNameDC=TRUE;
+ if (aObjName!=pObj->GetName()) bObjNameDC=sal_True;
}
}
}
@@ -862,7 +862,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH
}
}
-SfxItemSet SdrEditView::GetAttrFromMarked(BOOL bOnlyHardAttr) const
+SfxItemSet SdrEditView::GetAttrFromMarked(sal_Bool bOnlyHardAttr) const
{
SfxItemSet aSet(pMod->GetItemPool());
MergeAttrFromMarked(aSet,bOnlyHardAttr);
@@ -877,7 +877,7 @@ SfxItemSet SdrEditView::GetAttrFromMarked(BOOL bOnlyHardAttr) const
return aSet;
}
-void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const
+void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const
{
sal_uInt32 nMarkAnz(GetMarkedObjectCount());
@@ -893,15 +893,15 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) con
{
if(!bOnlyHardAttr)
{
- if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE))
+ if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
rAttr.InvalidateItem(nWhich);
else
- rAttr.MergeValue(rSet.Get(nWhich), TRUE);
+ rAttr.MergeValue(rSet.Get(nWhich), sal_True);
}
- else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE))
+ else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False))
{
const SfxPoolItem& rItem = rSet.Get(nWhich);
- rAttr.MergeValue(rItem, TRUE);
+ rAttr.MergeValue(rItem, sal_True);
}
nWhich = aIter.NextWhich();
@@ -909,19 +909,19 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) con
}
}
-void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
+void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
{
if (AreObjectsMarked())
{
#ifdef DBG_UTIL
{
- BOOL bHasEEFeatureItems=FALSE;
+ sal_Bool bHasEEFeatureItems=sal_False;
SfxItemIter aIter(rAttr);
const SfxPoolItem* pItem=aIter.FirstItem();
while (!bHasEEFeatureItems && pItem!=NULL) {
if (!IsInvalidItem(pItem)) {
- USHORT nW=pItem->Which();
- if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=TRUE;
+ sal_uInt16 nW=pItem->Which();
+ if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=sal_True;
}
pItem=aIter.NextItem();
}
@@ -955,13 +955,13 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
}
// Joe, 2.7.98: Damit Undo nach Format.Standard auch die Textattribute korrekt restauriert
- BOOL bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll);
+ sal_Bool bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll);
// AW 030100: save additional geom info when para or char attributes
// are changed and the geom form of the text object might be changed
- BOOL bPossibleGeomChange(FALSE);
+ sal_Bool bPossibleGeomChange(sal_False);
SfxWhichIter aIter(rAttr);
- UINT16 nWhich = aIter.FirstWhich();
+ sal_uInt16 nWhich = aIter.FirstWhich();
while(!bPossibleGeomChange && nWhich)
{
SfxItemState eState = rAttr.GetItemState(nWhich);
@@ -974,7 +974,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
|| nWhich == SDRATTR_3DOBJ_END_ANGLE
|| nWhich == SDRATTR_3DSCENE_DISTANCE)
{
- bPossibleGeomChange = TRUE;
+ bPossibleGeomChange = sal_True;
}
}
nWhich = aIter.NextWhich();
@@ -995,12 +995,12 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
// uses it's second parameter (bInvalidAsDefault) to
// remove all such items to set them to default.
SfxItemSet aAttr(*rAttr.GetPool(), rAttr.GetRanges());
- aAttr.Put(rAttr, TRUE);
+ aAttr.Put(rAttr, sal_True);
// #i38135#
bool bResetAnimationTimer(false);
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj = pM->GetMarkedSdrObj();
@@ -1010,7 +1010,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
std::vector< SdrUndoAction* > vConnectorUndoActions;
SdrEdgeObj* pEdgeObj = dynamic_cast< SdrEdgeObj* >( pObj );
if ( pEdgeObj )
- bPossibleGeomChange = TRUE;
+ bPossibleGeomChange = sal_True;
else if( bUndo )
vConnectorUndoActions = CreateConnectorUndo( *pObj );
@@ -1035,7 +1035,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
const bool bRescueText = dynamic_cast< SdrTextObj* >(pObj) != 0;
// add attribute undo
- AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,FALSE,bHasEEItems || bPossibleGeomChange || bRescueText));
+ AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,sal_False,bHasEEItems || bPossibleGeomChange || bRescueText));
}
// set up a scxene updater if object is a 3d object
@@ -1104,19 +1104,19 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll)
SfxStyleSheet* SdrEditView::GetStyleSheetFromMarked() const
{
SfxStyleSheet* pRet=NULL;
- BOOL b1st=TRUE;
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++) {
+ sal_Bool b1st=sal_True;
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm);
SfxStyleSheet* pSS=pM->GetMarkedSdrObj()->GetStyleSheet();
if (b1st) pRet=pSS;
else if (pRet!=pSS) return NULL; // verschiedene StyleSheets
- b1st=FALSE;
+ b1st=sal_False;
}
return pRet;
}
-void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
{
if (AreObjectsMarked())
{
@@ -1132,8 +1132,8 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRe
BegUndo(aStr);
}
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
if( bUndo )
@@ -1152,12 +1152,12 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRe
////////////////////////////////////////////////////////////////////////////////////////////////////
/* new interface src537 */
-BOOL SdrEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
{
if(GetMarkedObjectCount())
{
- rTargetSet.Put(GetAttrFromMarked(bOnlyHardAttr), FALSE);
- return TRUE;
+ rTargetSet.Put(GetAttrFromMarked(bOnlyHardAttr), sal_False);
+ return sal_True;
}
else
{
@@ -1165,31 +1165,31 @@ BOOL SdrEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) cons
}
}
-BOOL SdrEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
+sal_Bool SdrEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
{
if (GetMarkedObjectCount()!=0) {
SetAttrToMarked(rSet,bReplaceAll);
- return TRUE;
+ return sal_True;
} else {
return SdrMarkView::SetAttributes(rSet,bReplaceAll);
}
}
-SfxStyleSheet* SdrEditView::GetStyleSheet() const // SfxStyleSheet* SdrEditView::GetStyleSheet(BOOL& rOk) const
+SfxStyleSheet* SdrEditView::GetStyleSheet() const // SfxStyleSheet* SdrEditView::GetStyleSheet(sal_Bool& rOk) const
{
if (GetMarkedObjectCount()!=0) {
- //rOk=TRUE;
+ //rOk=sal_True;
return GetStyleSheetFromMarked();
} else {
return SdrMarkView::GetStyleSheet(); // SdrMarkView::GetStyleSheet(rOk);
}
}
-BOOL SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+sal_Bool SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
{
if (GetMarkedObjectCount()!=0) {
SetStyleSheetToMarked(pStyleSheet,bDontRemoveHardAttr);
- return TRUE;
+ return sal_True;
} else {
return SdrMarkView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr);
}
@@ -1205,7 +1205,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
SDRATTR_ECKENRADIUS,SDRATTR_ECKENRADIUS,
0);
if (AreObjectsMarked()) {
- SfxItemSet aMarkAttr(GetAttrFromMarked(FALSE)); // wg. AutoGrowHeight und Eckenradius
+ SfxItemSet aMarkAttr(GetAttrFromMarked(sal_False)); // wg. AutoGrowHeight und Eckenradius
Rectangle aRect(GetMarkedObjRect());
if(GetSdrPageView())
@@ -1260,16 +1260,16 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
// Pruefen der einzelnen Objekte, ob Objekte geschuetzt sind
const SdrMarkList& rMarkList=GetMarkedObjectList();
- ULONG nMarkCount=rMarkList.GetMarkCount();
+ sal_uIntPtr nMarkCount=rMarkList.GetMarkCount();
SdrObject* pObj=rMarkList.GetMark(0)->GetMarkedSdrObj();
- BOOL bPosProt=pObj->IsMoveProtect();
- BOOL bSizProt=pObj->IsResizeProtect();
- BOOL bPosProtDontCare=FALSE;
- BOOL bSizProtDontCare=FALSE;
- for (ULONG i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); i++) {
+ sal_Bool bPosProt=pObj->IsMoveProtect();
+ sal_Bool bSizProt=pObj->IsResizeProtect();
+ sal_Bool bPosProtDontCare=sal_False;
+ sal_Bool bSizProtDontCare=sal_False;
+ for (sal_uIntPtr i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); i++) {
pObj=rMarkList.GetMark(i)->GetMarkedSdrObj();
- if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=TRUE;
- if (bSizProt!=pObj->IsResizeProtect()) bSizProtDontCare=TRUE;
+ if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=sal_True;
+ if (bSizProt!=pObj->IsResizeProtect()) bSizProtDontCare=sal_True;
}
// InvalidateItem setzt das Item auf DONT_CARE
@@ -1285,7 +1285,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const
}
SfxItemState eState=aMarkAttr.GetItemState(SDRATTR_TEXT_AUTOGROWWIDTH);
- BOOL bAutoGrow=((SdrTextAutoGrowWidthItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
+ sal_Bool bAutoGrow=((SdrTextAutoGrowWidthItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
if (eState==SFX_ITEM_DONTCARE) {
aRetSet.InvalidateItem(SID_ATTR_TRANSFORM_AUTOWIDTH);
} else if (eState==SFX_ITEM_SET) {
@@ -1340,7 +1340,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
long nOldRotateAngle=GetMarkedObjRotate();
long nOldShearAngle=GetMarkedObjShear();
const SdrMarkList& rMarkList=GetMarkedObjectList();
- ULONG nMarkCount=rMarkList.GetMarkCount();
+ sal_uIntPtr nMarkCount=rMarkList.GetMarkCount();
SdrObject* pObj=NULL;
RECT_POINT eSizePoint=RP_MM;
@@ -1373,58 +1373,58 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
long nShearAngle=0;
long nShearX=0;
long nShearY=0;
- BOOL bShearVert=FALSE;
+ sal_Bool bShearVert=sal_False;
- BOOL bChgPos=FALSE;
- BOOL bChgSiz=FALSE;
- BOOL bChgHgt=FALSE;
- BOOL bRotate=FALSE;
- BOOL bShear =FALSE;
+ sal_Bool bChgPos=sal_False;
+ sal_Bool bChgSiz=sal_False;
+ sal_Bool bChgHgt=sal_False;
+ sal_Bool bRotate=sal_False;
+ sal_Bool bShear =sal_False;
- BOOL bSetAttr=FALSE;
+ sal_Bool bSetAttr=sal_False;
SfxItemSet aSetAttr(pMod->GetItemPool());
const SfxPoolItem* pPoolItem=NULL;
// Position
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,TRUE,&pPoolItem)) {
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,sal_True,&pPoolItem)) {
nPosDX=((const SfxInt32Item*)pPoolItem)->GetValue()-aRect.Left();
- bChgPos=TRUE;
+ bChgPos=sal_True;
}
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_Y,TRUE,&pPoolItem)){
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_Y,sal_True,&pPoolItem)){
nPosDY=((const SfxInt32Item*)pPoolItem)->GetValue()-aRect.Top();
- bChgPos=TRUE;
+ bChgPos=sal_True;
}
// Groesse
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_WIDTH,TRUE,&pPoolItem)) {
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_WIDTH,sal_True,&pPoolItem)) {
nSizX=((const SfxUInt32Item*)pPoolItem)->GetValue();
- bChgSiz=TRUE;
+ bChgSiz=sal_True;
}
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,TRUE,&pPoolItem)) {
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,sal_True,&pPoolItem)) {
nSizY=((const SfxUInt32Item*)pPoolItem)->GetValue();
- bChgSiz=TRUE;
- bChgHgt=TRUE;
+ bChgSiz=sal_True;
+ bChgHgt=sal_True;
}
if (bChgSiz) {
eSizePoint=(RECT_POINT)((const SfxAllEnumItem&)rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue();
}
// Rotation
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ANGLE,TRUE,&pPoolItem)) {
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ANGLE,sal_True,&pPoolItem)) {
nRotateAngle=((const SfxInt32Item*)pPoolItem)->GetValue()-nOldRotateAngle;
bRotate = (nRotateAngle != 0);
}
// #86909# pos rot point x
- if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, TRUE ,&pPoolItem))
+ if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, sal_True ,&pPoolItem))
nRotateX = ((const SfxInt32Item&)rAttr.Get(SID_ATTR_TRANSFORM_ROT_X)).GetValue();
// #86909# pos rot point y
- if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, TRUE ,&pPoolItem))
+ if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, sal_True ,&pPoolItem))
nRotateY = ((const SfxInt32Item&)rAttr.Get(SID_ATTR_TRANSFORM_ROT_Y)).GetValue();
// Shear
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,TRUE,&pPoolItem)) {
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,sal_True,&pPoolItem)) {
nNewShearAngle=((const SfxInt32Item*)pPoolItem)->GetValue();
if (nNewShearAngle>SDRMAXSHEAR) nNewShearAngle=SDRMAXSHEAR;
if (nNewShearAngle<-SDRMAXSHEAR) nNewShearAngle=-SDRMAXSHEAR;
@@ -1453,23 +1453,23 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
}
// AutoGrow
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,TRUE,&pPoolItem)) {
- BOOL bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,sal_True,&pPoolItem)) {
+ sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
aSetAttr.Put(SdrTextAutoGrowWidthItem(bAutoGrow));
- bSetAttr=TRUE;
+ bSetAttr=sal_True;
}
- if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,TRUE,&pPoolItem)) {
- BOOL bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
+ if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,sal_True,&pPoolItem)) {
+ sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue();
aSetAttr.Put(SdrTextAutoGrowHeightItem(bAutoGrow));
- bSetAttr=TRUE;
+ bSetAttr=sal_True;
}
// Eckenradius
- if (bEdgeRadiusAllowed && SFX_ITEM_SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,TRUE,&pPoolItem)) {
+ if (bEdgeRadiusAllowed && SFX_ITEM_SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,sal_True,&pPoolItem)) {
long nRadius=((SdrEckenradiusItem*)pPoolItem)->GetValue();
aSetAttr.Put(SdrEckenradiusItem(nRadius));
- bSetAttr=TRUE;
+ bSetAttr=sal_True;
}
ForcePossibilities();
@@ -1477,7 +1477,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
BegUndo(ImpGetResStr(STR_EditTransform),GetDescriptionOfMarkedObjects());
if (bSetAttr) {
- SetAttrToMarked(aSetAttr,FALSE);
+ SetAttrToMarked(aSetAttr,sal_False);
}
// Groesse und Hoehe aendern
@@ -1558,7 +1558,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
}
// protect position
- if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, TRUE, &pPoolItem))
+ if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, sal_True, &pPoolItem))
{
const sal_Bool bProtPos(((const SfxBoolItem*)pPoolItem)->GetValue());
bool bChanged(false);
@@ -1599,7 +1599,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
if(!bMoveProtect)
{
// protect size
- if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, TRUE, &pPoolItem))
+ if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, sal_True, &pPoolItem))
{
const sal_Bool bProtSize(((const SfxBoolItem*)pPoolItem)->GetValue());
bool bChanged(false);
@@ -1630,16 +1630,16 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr)
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrEditView::IsAlignPossible() const
+sal_Bool SdrEditView::IsAlignPossible() const
{ // Mindestens 2 markierte Objekte, davon mind. 1 beweglich
ForcePossibilities();
- ULONG nAnz=GetMarkedObjectCount();
- if (nAnz==0) return FALSE; // Nix markiert!
+ sal_uIntPtr nAnz=GetMarkedObjectCount();
+ if (nAnz==0) return sal_False; // Nix markiert!
if (nAnz==1) return bMoveAllowed; // einzelnes Obj an der Seite ausrichten
return bOneOrMoreMovable; // ansonsten ist MarkCount>=2
}
-void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL bBoundRects)
+void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_Bool bBoundRects)
{
if (eHor==SDRHALIGN_NONE && eVert==SDRVALIGN_NONE)
return;
@@ -1684,9 +1684,9 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL
}
Rectangle aBound;
- ULONG nMarkAnz=GetMarkedObjectCount();
- ULONG nm;
- BOOL bHasFixed=FALSE;
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ sal_uIntPtr nm;
+ sal_Bool bHasFixed=sal_False;
for (nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
@@ -1697,7 +1697,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL
{
Rectangle aObjRect(bBoundRects?pObj->GetCurrentBoundRect():pObj->GetSnapRect());
aBound.Union(aObjRect);
- bHasFixed=TRUE;
+ bHasFixed=sal_True;
}
}
if (!bHasFixed)
diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index afb81b5bc6c2..7af96024cb5e 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -88,13 +88,13 @@ SdrObject* SdrEditView::GetMaxToBtmObj(SdrObject* /*pObj*/) const
return NULL;
}
-void SdrEditView::ObjOrderChanged(SdrObject* /*pObj*/, ULONG /*nOldPos*/, ULONG /*nNewPos*/)
+void SdrEditView::ObjOrderChanged(SdrObject* /*pObj*/, sal_uIntPtr /*nOldPos*/, sal_uIntPtr /*nNewPos*/)
{
}
void SdrEditView::MovMarkedToTop()
{
- ULONG nAnz=GetMarkedObjectCount();
+ sal_uIntPtr nAnz=GetMarkedObjectCount();
if (nAnz!=0)
{
const bool bUndo = IsUndoEnabled();
@@ -103,14 +103,14 @@ void SdrEditView::MovMarkedToTop()
BegUndo(ImpGetResStr(STR_EditMovToTop),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_MOVTOTOP);
SortMarkedObjects();
- ULONG nm;
+ sal_uIntPtr nm;
for (nm=0; nm<nAnz; nm++)
{ // Ordnums muessen alle stimmen!
GetMarkedObjectByIndex(nm)->GetOrdNum();
}
- BOOL bChg=FALSE;
+ sal_Bool bChg=sal_False;
SdrObjList* pOL0=NULL;
- ULONG nNewPos=0;
+ sal_uIntPtr nNewPos=0;
for (nm=nAnz; nm>0;)
{
nm--;
@@ -119,16 +119,16 @@ void SdrEditView::MovMarkedToTop()
SdrObjList* pOL=pObj->GetObjList();
if (pOL!=pOL0)
{
- nNewPos=ULONG(pOL->GetObjCount()-1);
+ nNewPos=sal_uIntPtr(pOL->GetObjCount()-1);
pOL0=pOL;
}
- ULONG nNowPos=pObj->GetOrdNumDirect();
+ sal_uIntPtr nNowPos=pObj->GetOrdNumDirect();
const Rectangle& rBR=pObj->GetCurrentBoundRect();
- ULONG nCmpPos=nNowPos+1;
+ sal_uIntPtr nCmpPos=nNowPos+1;
SdrObject* pMaxObj=GetMaxToTopObj(pObj);
if (pMaxObj!=NULL)
{
- ULONG nMaxPos=pMaxObj->GetOrdNum();
+ sal_uIntPtr nMaxPos=pMaxObj->GetOrdNum();
if (nMaxPos!=0)
nMaxPos--;
if (nNewPos>nMaxPos)
@@ -136,25 +136,25 @@ void SdrEditView::MovMarkedToTop()
if (nNewPos<nNowPos)
nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben
}
- BOOL bEnd=FALSE;
+ sal_Bool bEnd=sal_False;
while (nCmpPos<nNewPos && !bEnd)
{
SdrObject* pCmpObj=pOL->GetObj(nCmpPos);
if (pCmpObj==NULL)
{
DBG_ERROR("MovMarkedToTop(): Vergleichsobjekt nicht gefunden");
- bEnd=TRUE;
+ bEnd=sal_True;
}
else if (pCmpObj==pMaxObj)
{
nNewPos=nCmpPos;
nNewPos--;
- bEnd=TRUE;
+ bEnd=sal_True;
}
else if (rBR.IsOver(pCmpObj->GetCurrentBoundRect()))
{
nNewPos=nCmpPos;
- bEnd=TRUE;
+ bEnd=sal_True;
}
else
{
@@ -163,7 +163,7 @@ void SdrEditView::MovMarkedToTop()
}
if (nNowPos!=nNewPos)
{
- bChg=TRUE;
+ bChg=sal_True;
pOL->SetObjectOrdNum(nNowPos,nNewPos);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos));
@@ -182,7 +182,7 @@ void SdrEditView::MovMarkedToTop()
void SdrEditView::MovMarkedToBtm()
{
- ULONG nAnz=GetMarkedObjectCount();
+ sal_uIntPtr nAnz=GetMarkedObjectCount();
if (nAnz!=0)
{
const bool bUndo = IsUndoEnabled();
@@ -191,15 +191,15 @@ void SdrEditView::MovMarkedToBtm()
BegUndo(ImpGetResStr(STR_EditMovToBtm),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_MOVTOBTM);
SortMarkedObjects();
- ULONG nm;
+ sal_uIntPtr nm;
for (nm=0; nm<nAnz; nm++)
{ // Ordnums muessen alle stimmen!
GetMarkedObjectByIndex(nm)->GetOrdNum();
}
- BOOL bChg=FALSE;
+ sal_Bool bChg=sal_False;
SdrObjList* pOL0=NULL;
- ULONG nNewPos=0;
+ sal_uIntPtr nNewPos=0;
for (nm=0; nm<nAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
@@ -210,19 +210,19 @@ void SdrEditView::MovMarkedToBtm()
nNewPos=0;
pOL0=pOL;
}
- ULONG nNowPos=pObj->GetOrdNumDirect();
+ sal_uIntPtr nNowPos=pObj->GetOrdNumDirect();
const Rectangle& rBR=pObj->GetCurrentBoundRect();
- ULONG nCmpPos=nNowPos; if (nCmpPos>0) nCmpPos--;
+ sal_uIntPtr nCmpPos=nNowPos; if (nCmpPos>0) nCmpPos--;
SdrObject* pMaxObj=GetMaxToBtmObj(pObj);
if (pMaxObj!=NULL)
{
- ULONG nMinPos=pMaxObj->GetOrdNum()+1;
+ sal_uIntPtr nMinPos=pMaxObj->GetOrdNum()+1;
if (nNewPos<nMinPos)
nNewPos=nMinPos; // diesen nicht ueberholen.
if (nNewPos>nNowPos)
nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben
}
- BOOL bEnd=FALSE;
+ sal_Bool bEnd=sal_False;
// nNewPos ist an dieser Stelle noch die maximale Position,
// an der das Obj hinruecken darf, ohne seinen Vorgaenger
// (Mehrfachselektion) zu ueberholen.
@@ -232,18 +232,18 @@ void SdrEditView::MovMarkedToBtm()
if (pCmpObj==NULL)
{
DBG_ERROR("MovMarkedToBtm(): Vergleichsobjekt nicht gefunden");
- bEnd=TRUE;
+ bEnd=sal_True;
}
else if (pCmpObj==pMaxObj)
{
nNewPos=nCmpPos;
nNewPos++;
- bEnd=TRUE;
+ bEnd=sal_True;
}
else if (rBR.IsOver(pCmpObj->GetCurrentBoundRect()))
{
nNewPos=nCmpPos;
- bEnd=TRUE;
+ bEnd=sal_True;
}
else
{
@@ -252,7 +252,7 @@ void SdrEditView::MovMarkedToBtm()
}
if (nNowPos!=nNewPos)
{
- bChg=TRUE;
+ bChg=sal_True;
pOL->SetObjectOrdNum(nNowPos,nNewPos);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos));
@@ -276,7 +276,7 @@ void SdrEditView::PutMarkedToTop()
void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
{
- ULONG nAnz=GetMarkedObjectCount();
+ sal_uIntPtr nAnz=GetMarkedObjectCount();
if (nAnz!=0)
{
const bool bUndo = IsUndoEnabled();
@@ -289,7 +289,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
{
// Damit "Vor das Objekt" auch funktioniert wenn die
// markierten Objekte bereits vor dem Objekt stehen
- ULONG nRefMark=TryToFindMarkedObject(pRefObj);
+ sal_uIntPtr nRefMark=TryToFindMarkedObject(pRefObj);
SdrMark aRefMark;
if (nRefMark!=CONTAINER_ENTRY_NOTFOUND)
{
@@ -303,14 +303,14 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
SortMarkedObjects();
}
}
- ULONG nm;
+ sal_uIntPtr nm;
for (nm=0; nm<nAnz; nm++)
{ // Ordnums muessen alle stimmen!
GetMarkedObjectByIndex(nm)->GetOrdNum();
}
- BOOL bChg=FALSE;
+ sal_Bool bChg=sal_False;
SdrObjList* pOL0=NULL;
- ULONG nNewPos=0;
+ sal_uIntPtr nNewPos=0;
for (nm=nAnz; nm>0;)
{
nm--;
@@ -321,14 +321,14 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
SdrObjList* pOL=pObj->GetObjList();
if (pOL!=pOL0)
{
- nNewPos=ULONG(pOL->GetObjCount()-1);
+ nNewPos=sal_uIntPtr(pOL->GetObjCount()-1);
pOL0=pOL;
}
- ULONG nNowPos=pObj->GetOrdNumDirect();
+ sal_uIntPtr nNowPos=pObj->GetOrdNumDirect();
SdrObject* pMaxObj=GetMaxToTopObj(pObj);
if (pMaxObj!=NULL)
{
- ULONG nMaxOrd=pMaxObj->GetOrdNum(); // geht leider nicht anders
+ sal_uIntPtr nMaxOrd=pMaxObj->GetOrdNum(); // geht leider nicht anders
if (nMaxOrd>0)
nMaxOrd--;
if (nNewPos>nMaxOrd)
@@ -340,7 +340,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
{
if (pRefObj->GetObjList()==pObj->GetObjList())
{
- ULONG nMaxOrd=pRefObj->GetOrdNum(); // geht leider nicht anders
+ sal_uIntPtr nMaxOrd=pRefObj->GetOrdNum(); // geht leider nicht anders
if (nNewPos>nMaxOrd)
nNewPos=nMaxOrd; // nicht ueberholen.
if (nNewPos<nNowPos)
@@ -353,7 +353,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj)
}
if (nNowPos!=nNewPos)
{
- bChg=TRUE;
+ bChg=sal_True;
pOL->SetObjectOrdNum(nNowPos,nNewPos);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos));
@@ -378,7 +378,7 @@ void SdrEditView::PutMarkedToBtm()
void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
{
- ULONG nAnz=GetMarkedObjectCount();
+ sal_uIntPtr nAnz=GetMarkedObjectCount();
if (nAnz!=0)
{
const bool bUndo = IsUndoEnabled();
@@ -391,7 +391,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
{
// Damit "Hinter das Objekt" auch funktioniert wenn die
// markierten Objekte bereits hinter dem Objekt stehen
- ULONG nRefMark=TryToFindMarkedObject(pRefObj);
+ sal_uIntPtr nRefMark=TryToFindMarkedObject(pRefObj);
SdrMark aRefMark;
if (nRefMark!=CONTAINER_ENTRY_NOTFOUND)
{
@@ -405,13 +405,13 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
SortMarkedObjects();
}
}
- ULONG nm;
+ sal_uIntPtr nm;
for (nm=0; nm<nAnz; nm++) { // Ordnums muessen alle stimmen!
GetMarkedObjectByIndex(nm)->GetOrdNum();
}
- BOOL bChg=FALSE;
+ sal_Bool bChg=sal_False;
SdrObjList* pOL0=NULL;
- ULONG nNewPos=0;
+ sal_uIntPtr nNewPos=0;
for (nm=0; nm<nAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -421,16 +421,16 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
nNewPos=0;
pOL0=pOL;
}
- ULONG nNowPos=pObj->GetOrdNumDirect();
+ sal_uIntPtr nNowPos=pObj->GetOrdNumDirect();
SdrObject* pMinObj=GetMaxToBtmObj(pObj);
if (pMinObj!=NULL) {
- ULONG nMinOrd=pMinObj->GetOrdNum()+1; // geht leider nicht anders
+ sal_uIntPtr nMinOrd=pMinObj->GetOrdNum()+1; // geht leider nicht anders
if (nNewPos<nMinOrd) nNewPos=nMinOrd; // nicht ueberholen.
if (nNewPos>nNowPos) nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben
}
if (pRefObj!=NULL) {
if (pRefObj->GetObjList()==pObj->GetObjList()) {
- ULONG nMinOrd=pRefObj->GetOrdNum(); // geht leider nicht anders
+ sal_uIntPtr nMinOrd=pRefObj->GetOrdNum(); // geht leider nicht anders
if (nNewPos<nMinOrd) nNewPos=nMinOrd; // nicht ueberholen.
if (nNewPos>nNowPos) nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben
} else {
@@ -438,7 +438,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
}
}
if (nNowPos!=nNewPos) {
- bChg=TRUE;
+ bChg=sal_True;
pOL->SetObjectOrdNum(nNowPos,nNewPos);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos));
@@ -459,32 +459,32 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj)
void SdrEditView::ReverseOrderOfMarked()
{
SortMarkedObjects();
- ULONG nMarkAnz=GetMarkedObjectCount();
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
if (nMarkAnz>0)
{
- //BOOL bNeedBundle=FALSE;
- BOOL bChg=FALSE;
+ //sal_Bool bNeedBundle=sal_False;
+ sal_Bool bChg=sal_False;
bool bUndo = IsUndoEnabled();
if( bUndo )
BegUndo(ImpGetResStr(STR_EditRevOrder),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_REVORDER);
- ULONG a=0;
+ sal_uIntPtr a=0;
do {
// Markierung ueber mehrere PageViews berueksichtigen
- ULONG b=a+1;
+ sal_uIntPtr b=a+1;
while (b<nMarkAnz && GetSdrPageViewOfMarkedByIndex(b) == GetSdrPageViewOfMarkedByIndex(a)) b++;
b--;
SdrObjList* pOL=GetSdrPageViewOfMarkedByIndex(a)->GetObjList();
- ULONG c=b;
+ sal_uIntPtr c=b;
if (a<c) { // Sicherstellen, dass die OrdNums nicht Dirty sind
GetMarkedObjectByIndex(a)->GetOrdNum();
}
while (a<c) {
SdrObject* pObj1=GetMarkedObjectByIndex(a);
SdrObject* pObj2=GetMarkedObjectByIndex(c);
- ULONG nOrd1=pObj1->GetOrdNumDirect();
- ULONG nOrd2=pObj2->GetOrdNumDirect();
+ sal_uIntPtr nOrd1=pObj1->GetOrdNumDirect();
+ sal_uIntPtr nOrd2=pObj2->GetOrdNumDirect();
if( bUndo )
{
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj1,nOrd1,nOrd2));
@@ -495,7 +495,7 @@ void SdrEditView::ReverseOrderOfMarked()
pOL->SetObjectOrdNum(nOrd2-1,nOrd1);
// Verwendung von Replace statt SetOrdNum wg. Performance (Neuberechnung der Ordnums)
a++; c--;
- bChg=TRUE;
+ bChg=sal_True;
}
a=b+1;
} while (a<nMarkAnz);
@@ -510,30 +510,30 @@ void SdrEditView::ReverseOrderOfMarked()
void SdrEditView::ImpCheckToTopBtmPossible()
{
- ULONG nAnz=GetMarkedObjectCount();
+ sal_uIntPtr nAnz=GetMarkedObjectCount();
if (nAnz==0)
return;
if (nAnz==1)
{ // Sonderbehandlung fuer Einzelmarkierung
SdrObject* pObj=GetMarkedObjectByIndex(0);
SdrObjList* pOL=pObj->GetObjList();
- ULONG nMax=pOL->GetObjCount();
- ULONG nMin=0;
- ULONG nObjNum=pObj->GetOrdNum();
+ sal_uIntPtr nMax=pOL->GetObjCount();
+ sal_uIntPtr nMin=0;
+ sal_uIntPtr nObjNum=pObj->GetOrdNum();
SdrObject* pRestrict=GetMaxToTopObj(pObj);
if (pRestrict!=NULL) {
- ULONG nRestrict=pRestrict->GetOrdNum();
+ sal_uIntPtr nRestrict=pRestrict->GetOrdNum();
if (nRestrict<nMax) nMax=nRestrict;
}
pRestrict=GetMaxToBtmObj(pObj);
if (pRestrict!=NULL) {
- ULONG nRestrict=pRestrict->GetOrdNum();
+ sal_uIntPtr nRestrict=pRestrict->GetOrdNum();
if (nRestrict>nMin) nMin=nRestrict;
}
- bToTopPossible=nObjNum<ULONG(nMax-1);
+ bToTopPossible=nObjNum<sal_uIntPtr(nMax-1);
bToBtmPossible=nObjNum>nMin;
} else { // Mehrfachselektion
- ULONG nm=0;
+ sal_uIntPtr nm=0;
SdrObjList* pOL0=NULL;
long nPos0=-1;
while (!bToBtmPossible && nm<nAnz) { // 'nach hinten' checken
@@ -543,8 +543,8 @@ void SdrEditView::ImpCheckToTopBtmPossible()
nPos0=-1;
pOL0=pOL;
}
- ULONG nPos=pObj->GetOrdNum();
- bToBtmPossible=nPos>ULONG(nPos0+1);
+ sal_uIntPtr nPos=pObj->GetOrdNum();
+ bToBtmPossible=nPos>sal_uIntPtr(nPos0+1);
nPos0=long(nPos);
nm++;
}
@@ -559,8 +559,8 @@ void SdrEditView::ImpCheckToTopBtmPossible()
nPos0=pOL->GetObjCount();
pOL0=pOL;
}
- ULONG nPos=pObj->GetOrdNum();
- bToTopPossible=nPos+1<ULONG(nPos0);
+ sal_uIntPtr nPos=pObj->GetOrdNum();
+ bToTopPossible=nPos+1<sal_uIntPtr(nPos0);
nPos0=nPos;
}
}
@@ -796,15 +796,15 @@ basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPol
struct ImpDistributeEntry
{
SdrObject* mpObj;
- INT32 mnPos;
- INT32 mnLength;
+ sal_Int32 mnPos;
+ sal_Int32 mnLength;
};
DECLARE_LIST(ImpDistributeEntryList, ImpDistributeEntry*)
void SdrEditView::DistributeMarkedObjects()
{
- UINT32 nMark(GetMarkedObjectCount());
+ sal_uInt32 nMark(GetMarkedObjectCount());
if(nMark > 2)
{
@@ -816,14 +816,14 @@ void SdrEditView::DistributeMarkedObjects()
AbstractSvxDistributeDialog *pDlg = pFact->CreateSvxDistributeDialog(NULL, aNewAttr);
DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001
- UINT16 nResult = pDlg->Execute();
+ sal_uInt16 nResult = pDlg->Execute();
if(nResult == RET_OK)
{
SvxDistributeHorizontal eHor = pDlg->GetDistributeHor();
SvxDistributeVertical eVer = pDlg->GetDistributeVer();
ImpDistributeEntryList aEntryList;
- UINT32 a, nInsPos, nFullLength;
+ sal_uInt32 a, nInsPos, nFullLength;
const bool bUndo = IsUndoEnabled();
if( bUndo )
@@ -878,7 +878,7 @@ void SdrEditView::DistributeMarkedObjects()
if(eHor == SvxDistributeHorizontalDistance)
{
// calc room in-between
- INT32 nWidth = GetAllMarkedBoundRect().GetWidth() + 1;
+ sal_Int32 nWidth = GetAllMarkedBoundRect().GetWidth() + 1;
double fStepWidth = ((double)nWidth - (double)nFullLength) / (double)(aEntryList.Count() - 1);
double fStepStart = (double)aEntryList.GetObject(0)->mnPos;
fStepStart += fStepWidth + (double)((aEntryList.GetObject(0)->mnLength + aEntryList.GetObject(1)->mnLength) / 2);
@@ -888,7 +888,7 @@ void SdrEditView::DistributeMarkedObjects()
{
ImpDistributeEntry* pCurr = aEntryList.GetObject(a);
ImpDistributeEntry* pNext = aEntryList.GetObject(a+1);
- INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos;
+ sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos;
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj));
pCurr->mpObj->Move(Size(nDelta, 0));
@@ -898,7 +898,7 @@ void SdrEditView::DistributeMarkedObjects()
else
{
// calc distances
- INT32 nWidth = aEntryList.GetObject(aEntryList.Count() - 1)->mnPos - aEntryList.GetObject(0)->mnPos;
+ sal_Int32 nWidth = aEntryList.GetObject(aEntryList.Count() - 1)->mnPos - aEntryList.GetObject(0)->mnPos;
double fStepWidth = (double)nWidth / (double)(aEntryList.Count() - 1);
double fStepStart = (double)aEntryList.GetObject(0)->mnPos;
fStepStart += fStepWidth;
@@ -907,7 +907,7 @@ void SdrEditView::DistributeMarkedObjects()
for(a=1;a<aEntryList.Count()-1;a++)
{
ImpDistributeEntry* pCurr = aEntryList.GetObject(a);
- INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos;
+ sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos;
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj));
pCurr->mpObj->Move(Size(nDelta, 0));
@@ -917,7 +917,7 @@ void SdrEditView::DistributeMarkedObjects()
// clear list
while(aEntryList.Count())
- delete aEntryList.Remove((ULONG)0L);
+ delete aEntryList.Remove((sal_uIntPtr)0L);
}
if(eVer != SvxDistributeVerticalNone)
@@ -969,7 +969,7 @@ void SdrEditView::DistributeMarkedObjects()
if(eVer == SvxDistributeVerticalDistance)
{
// calc room in-between
- INT32 nHeight = GetAllMarkedBoundRect().GetHeight() + 1;
+ sal_Int32 nHeight = GetAllMarkedBoundRect().GetHeight() + 1;
double fStepWidth = ((double)nHeight - (double)nFullLength) / (double)(aEntryList.Count() - 1);
double fStepStart = (double)aEntryList.GetObject(0)->mnPos;
fStepStart += fStepWidth + (double)((aEntryList.GetObject(0)->mnLength + aEntryList.GetObject(1)->mnLength) / 2);
@@ -979,7 +979,7 @@ void SdrEditView::DistributeMarkedObjects()
{
ImpDistributeEntry* pCurr = aEntryList.GetObject(a);
ImpDistributeEntry* pNext = aEntryList.GetObject(a+1);
- INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos;
+ sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos;
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj));
pCurr->mpObj->Move(Size(0, nDelta));
@@ -989,7 +989,7 @@ void SdrEditView::DistributeMarkedObjects()
else
{
// calc distances
- INT32 nHeight = aEntryList.GetObject(aEntryList.Count() - 1)->mnPos - aEntryList.GetObject(0)->mnPos;
+ sal_Int32 nHeight = aEntryList.GetObject(aEntryList.Count() - 1)->mnPos - aEntryList.GetObject(0)->mnPos;
double fStepWidth = (double)nHeight / (double)(aEntryList.Count() - 1);
double fStepStart = (double)aEntryList.GetObject(0)->mnPos;
fStepStart += fStepWidth;
@@ -998,7 +998,7 @@ void SdrEditView::DistributeMarkedObjects()
for(a=1;a<aEntryList.Count()-1;a++)
{
ImpDistributeEntry* pCurr = aEntryList.GetObject(a);
- INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos;
+ sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos;
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj));
pCurr->mpObj->Move(Size(0, nDelta));
@@ -1008,7 +1008,7 @@ void SdrEditView::DistributeMarkedObjects()
// clear list
while(aEntryList.Count())
- delete aEntryList.Remove((ULONG)0L);
+ delete aEntryList.Remove((sal_uIntPtr)0L);
}
// UNDO-Comment and end of UNDO
@@ -1036,24 +1036,24 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
if( bUndo )
BegUndo();
- UINT32 nInsPos=0xFFFFFFFF;
+ sal_uInt32 nInsPos=0xFFFFFFFF;
const SdrObject* pAttrObj = NULL;
basegfx::B2DPolyPolygon aMergePolyPolygonA;
basegfx::B2DPolyPolygon aMergePolyPolygonB;
SdrObjList* pInsOL = NULL;
SdrPageView* pInsPV = NULL;
- BOOL bFirstObjectComplete(FALSE);
+ sal_Bool bFirstObjectComplete(sal_False);
// make sure selected objects are contour objects
// since now basegfx::tools::adaptiveSubdivide() is used, it is no longer
// necessary to use ConvertMarkedToPolyObj which will subdivide curves using the old
// mechanisms. In a next step the polygon clipper will even be able to clip curves...
- // ConvertMarkedToPolyObj(TRUE);
+ // ConvertMarkedToPolyObj(sal_True);
ConvertMarkedToPathObj(sal_True);
OSL_ENSURE(AreObjectsMarked(), "no more objects selected after preparations (!)");
- for(UINT32 a=0;a<GetMarkedObjectCount();a++)
+ for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++)
{
SdrMark* pM = GetSdrMarkByIndex(a);
SdrObject* pObj = pM->GetMarkedSdrObj();
@@ -1121,7 +1121,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
// was there something added to the first poly?
if(!bFirstObjectComplete && aMergePolyPolygonA.count())
{
- bFirstObjectComplete = TRUE;
+ bFirstObjectComplete = sal_True;
}
// move object to temporary delete list
@@ -1168,7 +1168,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode)
pInsOL->InsertObject(pPath, nInsPos, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath));
- MarkObj(pPath, pInsPV, FALSE, TRUE);
+ MarkObj(pPath, pInsPV, sal_False, sal_True);
}
aRemove.ForceSort();
@@ -1364,7 +1364,7 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly)
// in the UNDO there is no problem, but as soon as they get deleted, the
// MarkList will contain deleted objects -> GPF.
UnmarkAllObj(pInsPV);
- MarkObj(pPath, pInsPV, FALSE, TRUE);
+ MarkObj(pPath, pInsPV, sal_False, sal_True);
}
// UndoComment aus den tatsaechlich verwendeten Objekten zusammenbauen
@@ -1417,8 +1417,8 @@ sal_Bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolyg
sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines) const
{
- sal_Bool bOtherObjs(sal_False); // TRUE=andere Objekte ausser PathObj's vorhanden
- sal_Bool bMin1PolyPoly(sal_False); // TRUE=mind. 1 PolyPolygon mit mehr als ein Polygon vorhanden
+ sal_Bool bOtherObjs(sal_False); // sal_True=andere Objekte ausser PathObj's vorhanden
+ sal_Bool bMin1PolyPoly(sal_False); // sal_True=mind. 1 PolyPolygon mit mehr als ein Polygon vorhanden
SdrObjList* pOL = pObj->GetSubList();
if(pOL)
@@ -1493,7 +1493,7 @@ sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines
return bMin1PolyPoly && !bOtherObjs;
}
-void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, ULONG& rPos, SdrPageView* pPV, BOOL bMakeLines)
+void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines)
{
const SdrPathObj* pSrcPath = PTR_CAST(SdrPathObj, pObj);
const SdrObjCustomShape* pCustomShape = PTR_CAST(SdrObjCustomShape, pObj);
@@ -1520,8 +1520,8 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
SdrInsertReason aReason(SDRREASON_VIEWCALL, pSrcPath);
rOL.InsertObject(pPath, rPos, &aReason);
if( bUndo )
- AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, TRUE));
- MarkObj(pPath, pPV, FALSE, TRUE);
+ AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, sal_True));
+ MarkObj(pPath, pPV, sal_False, sal_True);
rPos++;
}
else
@@ -1555,8 +1555,8 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
SdrInsertReason aReason(SDRREASON_VIEWCALL, pSrcPath);
rOL.InsertObject(pPath, rPos, &aReason);
if( bUndo )
- AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, TRUE));
- MarkObj(pPath, pPV, FALSE, TRUE);
+ AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, sal_True));
+ MarkObj(pPath, pPV, sal_False, sal_True);
rPos++;
}
}
@@ -1592,7 +1592,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
rOL.InsertObject(pCandidate, rPos, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pCandidate, true));
- MarkObj(pCandidate, pPV, FALSE, TRUE);
+ MarkObj(pCandidate, pPV, sal_False, sal_True);
if(pCustomShape->HasText() && !pCustomShape->IsTextPath())
{
@@ -1637,16 +1637,16 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL,
rOL.InsertObject(pTextObj, rPos + 1, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pTextObj, true));
- MarkObj(pTextObj, pPV, FALSE, TRUE);
+ MarkObj(pTextObj, pPV, sal_False, sal_True);
}
}
}
}
}
-void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines)
+void SdrEditView::DismantleMarkedObjects(sal_Bool bMakeLines)
{
- //UINT32 nCnt(0);
+ //sal_uInt32 nCnt(0);
// Temporaere Marklist
SdrMarkList aRemoveMerker;
@@ -1661,8 +1661,8 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines)
bMakeLines ? SDRREPFUNC_OBJ_DISMANTLE_LINES : SDRREPFUNC_OBJ_DISMANTLE_POLYS);
}
- ULONG nm;
- ULONG nAnz=GetMarkedObjectCount();
+ sal_uIntPtr nm;
+ sal_uIntPtr nAnz=GetMarkedObjectCount();
SdrObjList* pOL0=NULL;
for (nm=nAnz; nm>0;) {
nm--;
@@ -1673,8 +1673,8 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines)
if (pOL!=pOL0) { pOL0=pOL; pObj->GetOrdNum(); } // sicherstellen, dass OrdNums stimmen!
if (ImpCanDismantle(pObj,bMakeLines)) {
aRemoveMerker.InsertEntry(SdrMark(pObj,pM->GetPageView()));
- ULONG nPos0=pObj->GetOrdNumDirect();
- ULONG nPos=nPos0+1;
+ sal_uIntPtr nPos0=pObj->GetOrdNumDirect();
+ sal_uIntPtr nPos=nPos0+1;
SdrObjList* pSubList=pObj->GetSubList();
if (pSubList!=NULL && !pObj->Is3DObj()) {
SdrObjListIter aIter(*pSubList,IM_DEEPNOGROUPS);
@@ -1686,7 +1686,7 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines)
ImpDismantleOneObject(pObj,*pOL,nPos,pPV,bMakeLines);
}
if( bUndo )
- AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pObj,TRUE));
+ AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pObj,sal_True));
pOL->RemoveObject(nPos0);
if( !bUndo )
@@ -1724,8 +1724,8 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
{
BegUndo(ImpGetResStr(STR_EditGroup),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_GROUP);
- const ULONG nAnz = GetMarkedObjectCount();
- for(ULONG nm = nAnz; nm>0; )
+ const sal_uIntPtr nAnz = GetMarkedObjectCount();
+ for(sal_uIntPtr nm = nAnz; nm>0; )
{
// UndoActions fuer alle betroffenen Objekte anlegen
nm--;
@@ -1755,9 +1755,9 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
SdrObjList* pDstLst=NULL;
// Falls alle markierten Objekte aus Fremden Obj-Listen
// kommen, kommt das Gruppenobjekt an das Ende der Liste.
- ULONG nInsPos=pSrcLst->GetObjCount();
- BOOL bNeedInsPos=TRUE;
- for (ULONG nm=GetMarkedObjectCount(); nm>0;)
+ sal_uIntPtr nInsPos=pSrcLst->GetObjCount();
+ sal_Bool bNeedInsPos=sal_True;
+ for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;)
{
nm--;
SdrMark* pM=GetSdrMarkByIndex(nm);
@@ -1779,13 +1779,13 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
if (pSrcLst->IsObjOrdNumsDirty())
pSrcLst->RecalcObjOrdNums();
}
- BOOL bForeignList=pSrcLst!=pAktLst;
- BOOL bGrouped=pSrcLst!=pPage;
+ sal_Bool bForeignList=pSrcLst!=pAktLst;
+ sal_Bool bGrouped=pSrcLst!=pPage;
if (!bForeignList && bNeedInsPos)
{
nInsPos=pObj->GetOrdNum(); // ua, damit sind alle ObjOrdNum der Page gesetzt
nInsPos++;
- bNeedInsPos=FALSE;
+ bNeedInsPos=sal_False;
}
pSrcLst->RemoveObject(pObj->GetOrdNumDirect());
if (!bForeignList)
@@ -1808,13 +1808,13 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp)
if (pGrp!=NULL)
{
aNewMark.InsertEntry(SdrMark(pGrp,pPV));
- ULONG nAnz=pDstLst->GetObjCount();
+ sal_uIntPtr nAnz=pDstLst->GetObjCount();
SdrInsertReason aReason(SDRREASON_VIEWCALL,pRefObj);
pAktLst->InsertObject(pGrp,nInsPos,&aReason);
if( bUndo )
{
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pGrp,true)); // Kein Recalc!
- for (ULONG no=0; no<nAnz; no++)
+ for (sal_uIntPtr no=0; no<nAnz; no++)
{
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoInsertObject(*pDstLst->GetObj(no)));
}
@@ -1847,11 +1847,11 @@ void SdrEditView::UnGroupMarked()
if( bUndo )
BegUndo(String(), String(), SDRREPFUNC_OBJ_UNGROUP);
- ULONG nCount=0;
+ sal_uIntPtr nCount=0;
XubString aName1;
XubString aName;
- BOOL bNameOk=FALSE;
- for (ULONG nm=GetMarkedObjectCount(); nm>0;) {
+ sal_Bool bNameOk=sal_False;
+ for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) {
nm--;
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pGrp=pM->GetMarkedSdrObj();
@@ -1861,7 +1861,7 @@ void SdrEditView::UnGroupMarked()
if (nCount==1) {
pGrp->TakeObjNameSingul(aName); // Bezeichnung der Gruppe holen
pGrp->TakeObjNamePlural(aName1); // Bezeichnung der Gruppe holen
- bNameOk=TRUE;
+ bNameOk=sal_True;
} else {
if (nCount==2) aName=aName1; // Pluralname setzen
if (bNameOk) {
@@ -1869,17 +1869,17 @@ void SdrEditView::UnGroupMarked()
pGrp->TakeObjNamePlural(aStr); // Bezeichnung der Gruppe holen
if(!aStr.Equals(aName))
- bNameOk = FALSE;
+ bNameOk = sal_False;
}
}
- ULONG nDstCnt=pGrp->GetOrdNum();
+ sal_uIntPtr nDstCnt=pGrp->GetOrdNum();
SdrObjList* pDstLst=pM->GetPageView()->GetObjList();
// FIRST move contained objects to parent of group, so that
// the contained objects are NOT migrated to the UNDO-ItemPool
// when AddUndo(new SdrUndoDelObj(*pGrp)) is called.
- ULONG nAnz=pSrcLst->GetObjCount();
- ULONG no;
+ sal_uIntPtr nAnz=pSrcLst->GetObjCount();
+ sal_uIntPtr no;
if( bUndo )
{
@@ -1901,7 +1901,7 @@ void SdrEditView::UnGroupMarked()
// Kein SortCheck beim einfuegen in die MarkList, denn das
// wuerde wg. pObj->GetOrdNum() jedesmal ein RecalcOrdNums()
// provozieren:
- aNewMark.InsertEntry(SdrMark(pObj,pM->GetPageView()),FALSE);
+ aNewMark.InsertEntry(SdrMark(pObj,pM->GetPageView()),sal_False);
}
if( bUndo )
@@ -1932,7 +1932,7 @@ void SdrEditView::UnGroupMarked()
if (nCount!=0)
{
- GetMarkedObjectListWriteAccess().Merge(aNewMark,TRUE); // Durch das obige Einsortieren ist aNewMark genau verkehrtherum
+ GetMarkedObjectListWriteAccess().Merge(aNewMark,sal_True); // Durch das obige Einsortieren ist aNewMark genau verkehrtherum
MarkListHasChanged();
}
}
@@ -1947,7 +1947,7 @@ void SdrEditView::UnGroupMarked()
//
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLineToArea)
+SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea)
{
SdrObject* pNewObj = pObj->ConvertToPolyObj(bPath, bLineToArea);
if (pNewObj!=NULL)
@@ -1969,13 +1969,13 @@ SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLine
return pNewObj;
}
-void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea)
+void SdrEditView::ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea)
{
- BOOL bMrkChg=FALSE;
- BOOL bModChg=FALSE;
+ sal_Bool bMrkChg=sal_False;
+ sal_Bool bModChg=sal_False;
if (AreObjectsMarked()) {
- ULONG nMarkAnz=GetMarkedObjectCount();
- USHORT nDscrID=0;
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ sal_uInt16 nDscrID=0;
if(bLineToArea)
{
if(nMarkAnz == 1)
@@ -1997,7 +1997,7 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea)
BegUndo(ImpGetResStr(nDscrID),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_CONVERTTOPOLY);
}
}
- for (ULONG nm=nMarkAnz; nm>0;) {
+ for (sal_uIntPtr nm=nMarkAnz; nm>0;) {
nm--;
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -2007,13 +2007,13 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea)
SdrObjListIter aIter(*pGrp,IM_DEEPNOGROUPS);
while (aIter.IsMore()) {
pObj=aIter.Next();
- if (ImpConvertOneObj(pObj,bPath,bLineToArea)) bModChg=TRUE;
+ if (ImpConvertOneObj(pObj,bPath,bLineToArea)) bModChg=sal_True;
}
} else {
SdrObject* pNewObj=ImpConvertOneObj(pObj,bPath,bLineToArea);
if (pNewObj!=NULL) {
- bModChg=TRUE;
- bMrkChg=TRUE;
+ bModChg=sal_True;
+ bMrkChg=sal_True;
GetMarkedObjectListWriteAccess().ReplaceMark(SdrMark(pNewObj,pPV),nm);
}
}
@@ -2024,14 +2024,14 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea)
}
}
-void SdrEditView::ConvertMarkedToPathObj(BOOL bLineToArea)
+void SdrEditView::ConvertMarkedToPathObj(sal_Bool bLineToArea)
{
- ImpConvertTo(TRUE, bLineToArea);
+ ImpConvertTo(sal_True, bLineToArea);
}
-void SdrEditView::ConvertMarkedToPolyObj(BOOL bLineToArea)
+void SdrEditView::ConvertMarkedToPolyObj(sal_Bool bLineToArea)
{
- ImpConvertTo(FALSE, bLineToArea);
+ ImpConvertTo(sal_False, bLineToArea);
}
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2054,9 +2054,9 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
SortMarkedObjects();
SdrMarkList aForTheDescription;
SdrMarkList aNewMarked;
- ULONG nAnz=GetMarkedObjectCount();
+ sal_uIntPtr nAnz=GetMarkedObjectCount();
- for (ULONG nm=nAnz; nm>0;)
+ for (sal_uIntPtr nm=nAnz; nm>0;)
{ // Undo Objekte fuer alle neuen Objekte erzeugen
// zwischen den Metafiles auf Abbruch testen
if( pProgrInfo != NULL )
@@ -2071,10 +2071,10 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
SdrObject* pObj=pM->GetMarkedSdrObj();
SdrPageView* pPV=pM->GetPageView();
SdrObjList* pOL=pObj->GetObjList();
- ULONG nInsPos=pObj->GetOrdNum()+1;
+ sal_uIntPtr nInsPos=pObj->GetOrdNum()+1;
SdrGrafObj* pGraf=PTR_CAST(SdrGrafObj,pObj);
SdrOle2Obj* pOle2=PTR_CAST(SdrOle2Obj,pObj);
- ULONG nInsAnz=0;
+ sal_uIntPtr nInsAnz=0;
if (pGraf!=NULL && pGraf->HasGDIMetaFile())
{
ImpSdrGDIMetaFileImport aFilter(*pMod);
@@ -2092,8 +2092,8 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
}
if (nInsAnz!=0)
{
- ULONG nObj=nInsPos;
- for (ULONG i=0; i<nInsAnz; i++)
+ sal_uIntPtr nObj=nInsPos;
+ for (sal_uIntPtr i=0; i<nInsAnz; i++)
{
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pOL->GetObj(nObj)));
@@ -2122,7 +2122,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo)
if(aNewMarked.GetMarkCount())
{
// Neue Selektion bilden
- for(ULONG a(0); a < aNewMarked.GetMarkCount(); a++)
+ for(sal_uIntPtr a(0); a < aNewMarked.GetMarkCount(); a++)
{
GetMarkedObjectListWriteAccess().InsertEntry(*aNewMarked.GetMark(a));
}
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 961c860567f9..a8a0663a4b04 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -82,22 +82,22 @@
void SdrObjEditView::ImpClearVars()
{
- bQuickTextEditMode=TRUE;
- bMacroMode=TRUE;
+ bQuickTextEditMode=sal_True;
+ bMacroMode=sal_True;
pTextEditOutliner=NULL;
pTextEditOutlinerView=NULL;
pTextEditPV=NULL;
pTextEditWin=NULL;
pTextEditCursorMerker=NULL;
pEditPara=NULL;
- bTextEditNewObj=FALSE;
- bMacroDown=FALSE;
+ bTextEditNewObj=sal_False;
+ bMacroDown=sal_False;
pMacroObj=NULL;
pMacroPV=NULL;
pMacroWin=NULL;
nMacroTol=0;
- bTextEditDontDelete=FALSE;
- bTextEditOnlyOneView=FALSE;
+ bTextEditDontDelete=sal_False;
+ bTextEditOnlyOneView=sal_False;
}
SdrObjEditView::SdrObjEditView(SdrModel* pModel1, OutputDevice* pOut):
@@ -117,7 +117,7 @@ SdrObjEditView::~SdrObjEditView()
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrObjEditView::IsAction() const
+sal_Bool SdrObjEditView::IsAction() const
{
return IsMacroObj() || SdrGlueEditView::IsAction();
}
@@ -185,10 +185,10 @@ void SdrObjEditView::ModelHasChanged()
if (IsTextEdit()) {
SdrTextObj* pTextObj=dynamic_cast<SdrTextObj*>( mxTextEditObj.get() );
if (pTextObj!=NULL) {
- ULONG nOutlViewAnz=pTextEditOutliner->GetViewCount();
- BOOL bAreaChg=FALSE;
- BOOL bAnchorChg=FALSE;
- BOOL bColorChg=FALSE;
+ sal_uIntPtr nOutlViewAnz=pTextEditOutliner->GetViewCount();
+ sal_Bool bAreaChg=sal_False;
+ sal_Bool bAnchorChg=sal_False;
+ sal_Bool bColorChg=sal_False;
bool bContourFrame=pTextObj->IsContourTextFrame();
EVAnchorMode eNewAnchor(ANCHOR_VCENTER_HCENTER);
Rectangle aOldArea(aMinTextEditArea);
@@ -212,34 +212,34 @@ void SdrObjEditView::ModelHasChanged()
pTextEditOutliner->GetMinAutoPaperSize()!=aPaperMin1 || pTextEditOutliner->GetMaxAutoPaperSize()!=aPaperMax1) {
aTextEditArea=aEditArea1;
aMinTextEditArea=aMinArea1;
- pTextEditOutliner->SetUpdateMode(FALSE);
+ pTextEditOutliner->SetUpdateMode(sal_False);
pTextEditOutliner->SetMinAutoPaperSize(aPaperMin1);
pTextEditOutliner->SetMaxAutoPaperSize(aPaperMax1);
pTextEditOutliner->SetPaperSize(Size(0,0)); // Damit der Outliner neu formatiert
if (!bContourFrame) {
pTextEditOutliner->ClearPolygon();
- ULONG nStat=pTextEditOutliner->GetControlWord();
+ sal_uIntPtr nStat=pTextEditOutliner->GetControlWord();
nStat|=EE_CNTRL_AUTOPAGESIZE;
pTextEditOutliner->SetControlWord(nStat);
} else {
- ULONG nStat=pTextEditOutliner->GetControlWord();
+ sal_uIntPtr nStat=pTextEditOutliner->GetControlWord();
nStat&=~EE_CNTRL_AUTOPAGESIZE;
pTextEditOutliner->SetControlWord(nStat);
Rectangle aAnchorRect;
pTextObj->TakeTextAnchorRect(aAnchorRect);
- pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, TRUE);
+ pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, sal_True);
}
- for (ULONG nOV=0; nOV<nOutlViewAnz; nOV++) {
+ for (sal_uIntPtr nOV=0; nOV<nOutlViewAnz; nOV++) {
OutlinerView* pOLV=pTextEditOutliner->GetView(nOV);
- ULONG nStat0=pOLV->GetControlWord();
- ULONG nStat=nStat0;
+ sal_uIntPtr nStat0=pOLV->GetControlWord();
+ sal_uIntPtr nStat=nStat0;
// AutoViewSize nur wenn nicht KontourFrame.
if (!bContourFrame) nStat|=EV_CNTRL_AUTOSIZE;
else nStat&=~EV_CNTRL_AUTOSIZE;
if (nStat!=nStat0) pOLV->SetControlWord(nStat);
}
- pTextEditOutliner->SetUpdateMode(TRUE);
- bAreaChg=TRUE;
+ pTextEditOutliner->SetUpdateMode(sal_True);
+ bAreaChg=sal_True;
}
}
if (pTextEditOutlinerView!=NULL) { // Fuellfarbe und Anker checken
@@ -267,13 +267,13 @@ void SdrObjEditView::ModelHasChanged()
// again on ModelHasChanged().
if (bContourFrame || bAreaChg || bAnchorChg || bColorChg)
{
- for (ULONG nOV=0; nOV<nOutlViewAnz; nOV++)
+ for (sal_uIntPtr nOV=0; nOV<nOutlViewAnz; nOV++)
{
OutlinerView* pOLV=pTextEditOutliner->GetView(nOV);
{ // Alten OutlinerView-Bereich invalidieren
Window* pWin=pOLV->GetWindow();
Rectangle aTmpRect(aOldArea);
- USHORT nPixSiz=pOLV->GetInvalidateMore()+1;
+ sal_uInt16 nPixSiz=pOLV->GetInvalidateMore()+1;
Size aMore(pWin->PixelToLogic(Size(nPixSiz,nPixSiz)));
aTmpRect.Left()-=aMore.Width();
aTmpRect.Right()+=aMore.Width();
@@ -322,7 +322,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang
aBlankRect.Union(aMinTextEditArea);
Rectangle aPixRect(pWin->LogicToPixel(aBlankRect));
aBlankRect.Intersection(rRect);
- rOutlView.GetOutliner()->SetUpdateMode(TRUE); // Bugfix #22596#
+ rOutlView.GetOutliner()->SetUpdateMode(sal_True); // Bugfix #22596#
rOutlView.Paint(aBlankRect);
if(!bModifyMerk)
@@ -359,7 +359,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang
aOuterPix.Bottom()+=nPixSiz;
bool bMerk(pWin->IsMapModeEnabled());
- pWin->EnableMapMode(FALSE);
+ pWin->EnableMapMode(sal_False);
PolyPolygon aPolyPoly( 2 );
svtools::ColorConfig aColorConfig;
@@ -419,32 +419,32 @@ void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const
aOuterPix.Bottom()+=nPixSiz;
bool bMerk(pWin->IsMapModeEnabled());
- pWin->EnableMapMode(FALSE);
+ pWin->EnableMapMode(sal_False);
pWin->Invalidate(aOuterPix);
pWin->EnableMapMode(bMerk);
}
}
}
-OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, BOOL /*bNoPaint*/, OutlinerView* pGivenView) const
+OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, sal_Bool /*bNoPaint*/, OutlinerView* pGivenView) const
{
// Hintergrund
Color aBackground(GetTextEditBackgroundColor(*this));
SdrTextObj* pText = dynamic_cast< SdrTextObj * >( mxTextEditObj.get() );
- BOOL bTextFrame=pText!=NULL && pText->IsTextFrame();
- BOOL bContourFrame=pText!=NULL && pText->IsContourTextFrame();
+ sal_Bool bTextFrame=pText!=NULL && pText->IsTextFrame();
+ sal_Bool bContourFrame=pText!=NULL && pText->IsContourTextFrame();
// OutlinerView erzeugen
OutlinerView* pOutlView=pGivenView;
- pTextEditOutliner->SetUpdateMode(FALSE);
+ pTextEditOutliner->SetUpdateMode(sal_False);
if (pOutlView==NULL) pOutlView=new OutlinerView(pTextEditOutliner,pWin);
else pOutlView->SetWindow(pWin);
// Scrollen verbieten
- ULONG nStat=pOutlView->GetControlWord();
+ sal_uIntPtr nStat=pOutlView->GetControlWord();
nStat&=~EV_CNTRL_AUTOSCROLL;
// AutoViewSize nur wenn nicht KontourFrame.
if (!bContourFrame) nStat|=EV_CNTRL_AUTOSIZE;
if (bTextFrame) {
- USHORT nPixSiz=aHdl.GetHdlSize()*2+1;
+ sal_uInt16 nPixSiz=aHdl.GetHdlSize()*2+1;
nStat|=EV_CNTRL_INVONEMORE;
pOutlView->SetInvalidateMore(nPixSiz);
}
@@ -456,12 +456,12 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, BOOL /*bNoPaint*
pTextEditOutliner->SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)pText->GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
}
pOutlView->SetOutputArea(aTextEditArea);
- pTextEditOutliner->SetUpdateMode(TRUE);
+ pTextEditOutliner->SetUpdateMode(sal_True);
ImpInvalidateOutlinerView(*pOutlView);
return pOutlView;
}
-BOOL SdrObjEditView::IsTextEditFrame() const
+sal_Bool SdrObjEditView::IsTextEditFrame() const
{
SdrTextObj* pText = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() );
return pText!=NULL && pText->IsTextFrame();
@@ -489,7 +489,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
if (pTextObj!=NULL) {
Color* pTxtCol=NULL;
Color* pFldCol=NULL;
- bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),TRUE,pTxtCol,pFldCol,rStr);
+ bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),sal_True,pTxtCol,pFldCol,rStr);
if (bOk) {
if (pTxtCol!=NULL) {
pFI->SetTxtColor(*pTxtCol);
@@ -507,7 +507,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
Link aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl();
if (!bOk && aDrawOutlLink.IsSet()) {
aDrawOutlLink.Call(pFI);
- bOk = (BOOL)rStr.Len();
+ bOk = (sal_Bool)rStr.Len();
}
if (!bOk && aOldCalcFieldValueLink.IsSet()) {
return aOldCalcFieldValueLink.Call(pFI);
@@ -525,7 +525,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
SdrEndTextEdit();
if( dynamic_cast< SdrTextObj* >( pObj ) == 0 )
- return FALSE; // currently only possible with text objects
+ return sal_False; // currently only possible with text objects
if(bGrabFocus && pWin)
{
@@ -606,7 +606,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
pTextEditOutliner->ForceAutoColor( aOptions.GetIsAutomaticFontColor() );
}
- BOOL bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL;
+ sal_Bool bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL;
aOldCalcFieldValueLink=pTextEditOutliner->GetCalcFieldValueHdl();
// Der FieldHdl muss von SdrBeginTextEdit gesetzt sein, da dor ein UpdateFields gerufen wird.
@@ -624,7 +624,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() );
DBG_ASSERT( pTextObj, "svx::SdrObjEditView::BegTextEdit(), no text object?" );
if( !pTextObj )
- return FALSE;
+ return sal_False;
// #111096# Switch off evtl. running TextAnimation
pTextObj->SetTextAnimationAllowed(sal_False);
@@ -632,7 +632,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
// alten Cursor merken
if (pTextEditOutliner->GetViewCount()!=0)
{
- OutlinerView* pTmpOLV=pTextEditOutliner->RemoveView(ULONG(0));
+ OutlinerView* pTmpOLV=pTextEditOutliner->RemoveView(sal_uIntPtr(0));
if(pTmpOLV!=NULL && pTmpOLV!=pGivenOutlinerView)
delete pTmpOLV;
}
@@ -644,8 +644,8 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
Rectangle aTextRect;
Rectangle aAnchorRect;
- pTextObj->TakeTextRect(*pTextEditOutliner, aTextRect, TRUE,
- &aAnchorRect /* #97097# Give TRUE here, not FALSE */);
+ pTextObj->TakeTextRect(*pTextEditOutliner, aTextRect, sal_True,
+ &aAnchorRect /* #97097# Give sal_True here, not sal_False */);
if ( !pTextObj->IsContourTextFrame() )
{
@@ -664,7 +664,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
aMinTextEditArea.Move(aPvOfs.X(),aPvOfs.Y());
pTextEditCursorMerker=pWin->GetCursor();
- aHdl.SetMoveOutside(TRUE);
+ aHdl.SetMoveOutside(sal_True);
// #i72757#
// Since IsMarkHdlWhenTextEdit() is ignored, it is necessary
@@ -674,7 +674,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
pTextEditOutlinerView=ImpMakeOutlinerView(pWin,!bEmpty,pGivenOutlinerView);
// check if this view is already inserted
- ULONG i2,nCount = pTextEditOutliner->GetViewCount();
+ sal_uIntPtr i2,nCount = pTextEditOutliner->GetViewCount();
for( i2 = 0; i2 < nCount; i2++ )
{
if( pTextEditOutliner->GetView(i2) == pTextEditOutlinerView )
@@ -684,8 +684,8 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
if( i2 == nCount )
pTextEditOutliner->InsertView(pTextEditOutlinerView,0);
- aHdl.SetMoveOutside(FALSE);
- aHdl.SetMoveOutside(TRUE);
+ aHdl.SetMoveOutside(sal_False);
+ aHdl.SetMoveOutside(sal_True);
//OLMRefreshAllIAOManagers();
// alle Wins als OutlinerView beim Outliner anmelden
@@ -786,7 +786,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit(
//HMHif (bMarkHdlWhenTextEdit) {
//HMH HideMarkHdl();
//HMH}
- aHdl.SetMoveOutside(FALSE);
+ aHdl.SetMoveOutside(sal_False);
//HMHShowMarkHdl();
return sal_False;
@@ -819,7 +819,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
if (pTEOutliner!=NULL)
{
- BOOL bModified=pTEOutliner->IsModified();
+ sal_Bool bModified=pTEOutliner->IsModified();
if (pTEOutlinerView!=NULL)
{
pTEOutlinerView->HideCursor();
@@ -873,7 +873,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
}
// Loeschung des gesamten TextObj checken
SdrUndoAction* pDelUndo=NULL;
- BOOL bDelObj=FALSE;
+ sal_Bool bDelObj=sal_False;
SdrTextObj* pTextObj=PTR_CAST(SdrTextObj,pTEObj);
if (pTextObj!=NULL && bTextEditNewObj)
{
@@ -937,11 +937,11 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
AdjustMarkHdl();
}
// alle OutlinerViews loeschen
- for (ULONG i=pTEOutliner->GetViewCount(); i>0;)
+ for (sal_uIntPtr i=pTEOutliner->GetViewCount(); i>0;)
{
i--;
OutlinerView* pOLV=pTEOutliner->GetView(i);
- USHORT nMorePix=pOLV->GetInvalidateMore() + 10; // solaris aw033 test #i#
+ sal_uInt16 nMorePix=pOLV->GetInvalidateMore() + 10; // solaris aw033 test #i#
Window* pWin=pOLV->GetWindow();
Rectangle aRect(pOLV->GetOutputArea());
pTEOutliner->RemoveView(i);
@@ -980,7 +980,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally)
//HMH if (bMarkHdlWhenTextEdit) {
//HMH HideMarkHdl();
//HMH }
- aHdl.SetMoveOutside(FALSE);
+ aHdl.SetMoveOutside(sal_False);
if (eRet!=SDRENDTEXTEDIT_UNCHANGED)
//HMH {
//HMH ShowMarkHdl(); // Handles kommen ansonsten via Broadcast
@@ -1032,8 +1032,8 @@ OutlinerView* SdrObjEditView::ImpFindOutlinerView(Window* pWin) const
if (pWin==NULL) return NULL;
if (pTextEditOutliner==NULL) return NULL;
OutlinerView* pNewView=NULL;
- ULONG nWinAnz=pTextEditOutliner->GetViewCount();
- for (ULONG i=0; i<nWinAnz && pNewView==NULL; i++) {
+ sal_uIntPtr nWinAnz=pTextEditOutliner->GetViewCount();
+ for (sal_uIntPtr i=0; i<nWinAnz && pNewView==NULL; i++) {
OutlinerView* pView=pTextEditOutliner->GetView(i);
if (pView->GetWindow()==pWin) pNewView=pView;
}
@@ -1060,9 +1060,9 @@ void SdrObjEditView::SetTextEditWin(Window* pWin)
}
}
-BOOL SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const
+sal_Bool SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const
{
- BOOL bOk=FALSE;
+ sal_Bool bOk=sal_False;
if(mxTextEditObj.is())
{
nTol=ImpGetHitTolLogic(nTol,NULL);
@@ -1098,9 +1098,9 @@ BOOL SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const
return bOk;
}
-BOOL SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const
+sal_Bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const
{
- BOOL bOk=FALSE;
+ sal_Bool bOk=sal_False;
if(mxTextEditObj.is())
{
SdrTextObj* pText= dynamic_cast<SdrTextObj*>(mxTextEditObj.get());
@@ -1109,7 +1109,7 @@ BOOL SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const
{
Window* pWin=pOLV->GetWindow();
if (pText!=NULL && pText->IsTextFrame() && pOLV!=NULL && pWin!=NULL) {
- USHORT nPixSiz=pOLV->GetInvalidateMore();
+ sal_uInt16 nPixSiz=pOLV->GetInvalidateMore();
Rectangle aEditArea(aMinTextEditArea);
aEditArea.Union(pOLV->GetOutputArea());
if (!aEditArea.IsInside(rHit)) {
@@ -1146,7 +1146,7 @@ void SdrObjEditView::AddTextEditOfs(MouseEvent& rMEvt) const
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
+sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
{
if(pTextEditOutlinerView)
{
@@ -1175,16 +1175,16 @@ BOOL SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
- return TRUE;
+ return sal_True;
}
}
return SdrGlueEditView::KeyInput(rKEvt,pWin);
}
-BOOL SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
{
if (pTextEditOutlinerView!=NULL) {
- BOOL bPostIt=pTextEditOutliner->IsInSelectionMode();
+ sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode();
if (!bPostIt) {
Point aPt(rMEvt.GetPosPixel());
if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1206,17 +1206,17 @@ BOOL SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
- return TRUE;
+ return sal_True;
}
}
}
return SdrGlueEditView::MouseButtonDown(rMEvt,pWin);
}
-BOOL SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
{
if (pTextEditOutlinerView!=NULL) {
- BOOL bPostIt=pTextEditOutliner->IsInSelectionMode();
+ sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode();
if (!bPostIt) {
Point aPt(rMEvt.GetPosPixel());
if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1237,18 +1237,18 @@ BOOL SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
- return TRUE;
+ return sal_True;
}
}
}
return SdrGlueEditView::MouseButtonUp(rMEvt,pWin);
}
-BOOL SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
{
if (pTextEditOutlinerView!=NULL) {
- BOOL bSelMode=pTextEditOutliner->IsInSelectionMode();
- BOOL bPostIt=bSelMode;
+ sal_Bool bSelMode=pTextEditOutliner->IsInSelectionMode();
+ sal_Bool bPostIt=bSelMode;
if (!bPostIt) {
Point aPt(rMEvt.GetPosPixel());
if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1269,21 +1269,21 @@ BOOL SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
- return TRUE;
+ return sal_True;
}
}
}
return SdrGlueEditView::MouseMove(rMEvt,pWin);
}
-BOOL SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
+sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
{
- // solange bis die OutlinerView einen BOOL zurueckliefert
+ // solange bis die OutlinerView einen sal_Bool zurueckliefert
// bekommt sie nur COMMAND_STARTDRAG
if (pTextEditOutlinerView!=NULL)
{
if (rCEvt.GetCommand()==COMMAND_STARTDRAG) {
- BOOL bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent();
+ sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent();
if (!bPostIt && rCEvt.IsMouseEvent()) {
Point aPt(rCEvt.GetMousePosPixel());
if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt);
@@ -1307,19 +1307,19 @@ BOOL SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin)
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
- return TRUE;
+ return sal_True;
}
}
else // if (rCEvt.GetCommand() == COMMAND_VOICE )
{
pTextEditOutlinerView->Command(rCEvt);
- return TRUE;
+ return sal_True;
}
}
return SdrGlueEditView::Command(rCEvt,pWin);
}
-BOOL SdrObjEditView::Cut(ULONG nFormat)
+sal_Bool SdrObjEditView::Cut(sal_uIntPtr nFormat)
{
if (pTextEditOutliner!=NULL) {
pTextEditOutlinerView->Cut();
@@ -1327,23 +1327,23 @@ BOOL SdrObjEditView::Cut(ULONG nFormat)
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
- return TRUE;
+ return sal_True;
} else {
return SdrGlueEditView::Cut(nFormat);
}
}
-BOOL SdrObjEditView::Yank(ULONG nFormat)
+sal_Bool SdrObjEditView::Yank(sal_uIntPtr nFormat)
{
if (pTextEditOutliner!=NULL) {
pTextEditOutlinerView->Copy();
- return TRUE;
+ return sal_True;
} else {
return SdrGlueEditView::Yank(nFormat);
}
}
-BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat)
+sal_Bool SdrObjEditView::Paste(Window* pWin, sal_uIntPtr nFormat)
{
if (pTextEditOutliner!=NULL) {
if (pWin!=NULL) {
@@ -1358,7 +1358,7 @@ BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat)
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
ImpMakeTextCursorAreaVisible();
- return TRUE;
+ return sal_True;
} else {
return SdrGlueEditView::Paste(pWin,nFormat);
}
@@ -1366,9 +1366,9 @@ BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat)
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrObjEditView::ImpIsTextEditAllSelected() const
+sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const
{
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
if (pTextEditOutliner!=NULL && pTextEditOutlinerView!=NULL)
{
if(SdrTextObj::HasTextImpl( pTextEditOutliner ) )
@@ -1377,25 +1377,25 @@ BOOL SdrObjEditView::ImpIsTextEditAllSelected() const
Paragraph* pLastPara=pTextEditOutliner->GetParagraph( nParaAnz > 1 ? nParaAnz - 1 : 0 );
ESelection aESel(pTextEditOutlinerView->GetSelection());
- if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==USHORT(nParaAnz-1))
+ if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==sal_uInt16(nParaAnz-1))
{
XubString aStr(pTextEditOutliner->GetText(pLastPara));
if(aStr.Len() == aESel.nEndPos)
- bRet = TRUE;
+ bRet = sal_True;
}
// und nun auch noch fuer den Fall, das rueckwaerts selektiert wurde
- if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==USHORT(nParaAnz-1))
+ if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==sal_uInt16(nParaAnz-1))
{
XubString aStr(pTextEditOutliner->GetText(pLastPara));
if(aStr.Len() == aESel.nStartPos)
- bRet = TRUE;
+ bRet = sal_True;
}
}
else
{
- bRet=TRUE;
+ bRet=sal_True;
}
}
return bRet;
@@ -1414,9 +1414,9 @@ void SdrObjEditView::ImpMakeTextCursorAreaVisible()
}
}
-USHORT SdrObjEditView::GetScriptType() const
+sal_uInt16 SdrObjEditView::GetScriptType() const
{
- USHORT nScriptType = 0;
+ sal_uInt16 nScriptType = 0;
if( IsTextEdit() )
{
@@ -1448,11 +1448,11 @@ USHORT SdrObjEditView::GetScriptType() const
}
/* new interface src537 */
-BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
{
if( mxSelectionController.is() )
if( mxSelectionController->GetAttributes( rTargetSet, bOnlyHardAttr ) )
- return TRUE;
+ return sal_True;
if(IsTextEdit())
{
@@ -1472,8 +1472,8 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c
if(pTextEditOutlinerView)
{
// FALSE= InvalidItems nicht al Default, sondern als "Loecher" betrachten
- rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), FALSE);
- rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), FALSE );
+ rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False);
+ rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), sal_False );
}
if(GetMarkedObjectCount()==1 && GetMarkedObjectByIndex(0)==mxTextEditObj.get())
@@ -1481,7 +1481,7 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c
MergeNotPersistAttrFromMarked(rTargetSet, bOnlyHardAttr);
}
- return TRUE;
+ return sal_True;
}
else
{
@@ -1489,11 +1489,11 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c
}
}
-BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
+sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
{
- BOOL bRet=FALSE;
- BOOL bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is();
- BOOL bAllTextSelected=ImpIsTextEditAllSelected();
+ sal_Bool bRet=sal_False;
+ sal_Bool bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is();
+ sal_Bool bAllTextSelected=ImpIsTextEditAllSelected();
SfxItemSet* pModifiedSet=NULL;
const SfxItemSet* pSet=&rSet;
//const SvxAdjustItem* pParaJust=NULL;
@@ -1513,16 +1513,16 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
{
#ifdef DBG_UTIL
{
- BOOL bHasEEFeatureItems=FALSE;
+ sal_Bool bHasEEFeatureItems=sal_False;
SfxItemIter aIter(rSet);
const SfxPoolItem* pItem=aIter.FirstItem();
while (!bHasEEFeatureItems && pItem!=NULL)
{
if (!IsInvalidItem(pItem))
{
- USHORT nW=pItem->Which();
+ sal_uInt16 nW=pItem->Which();
if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END)
- bHasEEFeatureItems=TRUE;
+ bHasEEFeatureItems=sal_True;
}
pItem=aIter.NextItem();
@@ -1537,8 +1537,8 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
}
#endif
- BOOL bOnlyEEItems;
- BOOL bNoEEItems=!SearchOutlinerItems(*pSet,bReplaceAll,&bOnlyEEItems);
+ sal_Bool bOnlyEEItems;
+ sal_Bool bNoEEItems=!SearchOutlinerItems(*pSet,bReplaceAll,&bOnlyEEItems);
// alles selektiert? -> Attrs auch an den Rahmen
// und falls keine EEItems, dann Attrs nur an den Rahmen
if (bAllTextSelected || bNoEEItems)
@@ -1572,7 +1572,7 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
mxTextEditObj->SetMergedItemSetAndBroadcast(*pSet, bReplaceAll);
FlushComeBackTimer(); // Damit ModeHasChanged sofort kommt
- bRet=TRUE;
+ bRet=sal_True;
}
}
else if (!bOnlyEEItems)
@@ -1580,15 +1580,15 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
// sonst Set ggf. splitten
// Es wird nun ein ItemSet aSet gemacht, in den die EE_Items von
// *pSet nicht enhalten ist (ansonsten ist es eine Kopie).
- USHORT* pNewWhichTable=RemoveWhichRange(pSet->GetRanges(),EE_ITEMS_START,EE_ITEMS_END);
+ sal_uInt16* pNewWhichTable=RemoveWhichRange(pSet->GetRanges(),EE_ITEMS_START,EE_ITEMS_END);
SfxItemSet aSet(pMod->GetItemPool(),pNewWhichTable);
/*90353*/ delete[] pNewWhichTable;
SfxWhichIter aIter(aSet);
- USHORT nWhich=aIter.FirstWhich();
+ sal_uInt16 nWhich=aIter.FirstWhich();
while (nWhich!=0)
{
const SfxPoolItem* pItem;
- SfxItemState eState=pSet->GetItemState(nWhich,FALSE,&pItem);
+ SfxItemState eState=pSet->GetItemState(nWhich,sal_False,&pItem);
if (eState==SFX_ITEM_SET) aSet.Put(*pItem);
nWhich=aIter.NextWhich();
}
@@ -1617,14 +1617,14 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
}
}
FlushComeBackTimer();
- bRet=TRUE;
+ bRet=sal_True;
}
if(!bNoEEItems)
{
// und nun die Attribute auch noch an die EditEngine
if (bReplaceAll) {
// Am Outliner kann man leider nur alle Attribute platthauen
- pTextEditOutlinerView->RemoveAttribs( TRUE );
+ pTextEditOutlinerView->RemoveAttribs( sal_True );
}
pTextEditOutlinerView->SetAttribs(rSet);
@@ -1635,7 +1635,7 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
ImpMakeTextCursorAreaVisible();
}
- bRet=TRUE;
+ bRet=sal_True;
}
if (pModifiedSet!=NULL)
delete pModifiedSet;
@@ -1663,12 +1663,12 @@ SfxStyleSheet* SdrObjEditView::GetStyleSheet() const
return pSheet;
}
-BOOL SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+sal_Bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
{
if( mxSelectionController.is() )
{
if( mxSelectionController->SetStyleSheet( pStyleSheet, bDontRemoveHardAttr ) )
- return TRUE;
+ return sal_True;
}
// if we are currently in edit mode we must also set the stylesheet
@@ -1678,8 +1678,8 @@ BOOL SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveH
{
Outliner* pOutliner = pTextEditOutlinerView->GetOutliner();
- const ULONG nParaCount = pOutliner->GetParagraphCount();
- ULONG nPara;
+ const sal_uIntPtr nParaCount = pOutliner->GetParagraphCount();
+ sal_uIntPtr nPara;
for( nPara = 0; nPara < nParaCount; nPara++ )
{
pOutliner->SetStyleSheet( nPara, pStyleSheet );
@@ -1697,7 +1697,7 @@ void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin)
if(mxTextEditObj.is() && !bTextEditOnlyOneView && pNewWin->GetOutDevType()==OUTDEV_WINDOW)
{
- OutlinerView* pOutlView=ImpMakeOutlinerView((Window*)pNewWin,FALSE,NULL);
+ OutlinerView* pOutlView=ImpMakeOutlinerView((Window*)pNewWin,sal_False,NULL);
pTextEditOutliner->InsertView(pOutlView);
}
}
@@ -1708,7 +1708,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
if(mxTextEditObj.is() && !bTextEditOnlyOneView && pOldWin->GetOutDevType()==OUTDEV_WINDOW)
{
- for (ULONG i=pTextEditOutliner->GetViewCount(); i>0;) {
+ for (sal_uIntPtr i=pTextEditOutliner->GetViewCount(); i>0;) {
i--;
OutlinerView* pOLV=pTextEditOutliner->GetView(i);
if (pOLV && pOLV->GetWindow()==(Window*)pOldWin) {
@@ -1718,7 +1718,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
}
}
-BOOL SdrObjEditView::IsTextEditInSelectionMode() const
+sal_Bool SdrObjEditView::IsTextEditInSelectionMode() const
{
return pTextEditOutliner!=NULL && pTextEditOutliner->IsInSelectionMode();
}
@@ -1735,17 +1735,17 @@ BOOL SdrObjEditView::IsTextEditInSelectionMode() const
//
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin)
+sal_Bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin)
{
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
BrkMacroObj();
if (pObj!=NULL && pPV!=NULL && pWin!=NULL && pObj->HasMacro()) {
nTol=ImpGetHitTolLogic(nTol,NULL);
pMacroObj=pObj;
pMacroPV=pPV;
pMacroWin=pWin;
- bMacroDown=FALSE;
- nMacroTol=USHORT(nTol);
+ bMacroDown=sal_False;
+ nMacroTol=sal_uInt16(nTol);
aMacroDownPos=rPnt;
MovMacroObj(rPnt);
}
@@ -1764,7 +1764,7 @@ void SdrObjEditView::ImpMacroUp(const Point& rUpPos)
aHitRec.pPageView=pMacroPV;
aHitRec.pOut=pMacroWin;
pMacroObj->PaintMacro(*pMacroWin,Rectangle(),aHitRec);
- bMacroDown=FALSE;
+ bMacroDown=sal_False;
}
}
@@ -1778,10 +1778,10 @@ void SdrObjEditView::ImpMacroDown(const Point& rDownPos)
aHitRec.nTol=nMacroTol;
aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers();
aHitRec.pPageView=pMacroPV;
- aHitRec.bDown=TRUE;
+ aHitRec.bDown=sal_True;
aHitRec.pOut=pMacroWin;
pMacroObj->PaintMacro(*pMacroWin,Rectangle(),aHitRec);
- bMacroDown=TRUE;
+ bMacroDown=sal_True;
}
}
@@ -1796,7 +1796,7 @@ void SdrObjEditView::MovMacroObj(const Point& rPnt)
aHitRec.pPageView=pMacroPV;
aHitRec.bDown=bMacroDown;
aHitRec.pOut=pMacroWin;
- BOOL bDown=pMacroObj->IsMacroHit(aHitRec);
+ sal_Bool bDown=pMacroObj->IsMacroHit(aHitRec);
if (bDown) ImpMacroDown(rPnt);
else ImpMacroUp(rPnt);
}
@@ -1812,7 +1812,7 @@ void SdrObjEditView::BrkMacroObj()
}
}
-BOOL SdrObjEditView::EndMacroObj()
+sal_Bool SdrObjEditView::EndMacroObj()
{
if (pMacroObj!=NULL && bMacroDown) {
ImpMacroUp(aMacroDownPos);
@@ -1822,7 +1822,7 @@ BOOL SdrObjEditView::EndMacroObj()
aHitRec.nTol=nMacroTol;
aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers();
aHitRec.pPageView=pMacroPV;
- aHitRec.bDown=TRUE;
+ aHitRec.bDown=sal_True;
aHitRec.pOut=pMacroWin;
bool bRet=pMacroObj->DoMacro(aHitRec);
pMacroObj=NULL;
@@ -1831,7 +1831,7 @@ BOOL SdrObjEditView::EndMacroObj()
return bRet;
} else {
BrkMacroObj();
- return FALSE;
+ return sal_False;
}
}
@@ -1924,7 +1924,7 @@ void SdrObjEditView::OnEndPasteOrDrop( PasteOrDropInfos* )
// applications can derive from these virtual methods to do something before a drop or paste operation
}
-bool SdrObjEditView::SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const
+bool SdrObjEditView::SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const
{
if( nObjectInventor != SdrInventor && nObjectInventor != E3dInventor )
return false;
@@ -1974,9 +1974,9 @@ bool SdrObjEditView::SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nO
}
}
-static const USHORT* GetFormatRangeImpl( bool bTextOnly )
+static const sal_uInt16* GetFormatRangeImpl( bool bTextOnly )
{
- static const USHORT gRanges[] = {
+ static const sal_uInt16 gRanges[] = {
SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST,
SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST,
SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST,
@@ -2006,7 +2006,7 @@ bool SdrObjEditView::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFor
}
else
{
- const BOOL bOnlyHardAttr = FALSE;
+ const sal_Bool bOnlyHardAttr = sal_False;
rFormatSet->Put( GetAttrFromMarked(bOnlyHardAttr) );
}
return true;
@@ -2015,14 +2015,14 @@ bool SdrObjEditView::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFor
return false;
}
-static SfxItemSet CreatePaintSet( const USHORT *pRanges, SfxItemPool& rPool, const SfxItemSet& rSourceSet, const SfxItemSet& rTargetSet, bool bNoCharacterFormats, bool bNoParagraphFormats )
+static SfxItemSet CreatePaintSet( const sal_uInt16 *pRanges, SfxItemPool& rPool, const SfxItemSet& rSourceSet, const SfxItemSet& rTargetSet, bool bNoCharacterFormats, bool bNoParagraphFormats )
{
SfxItemSet aPaintSet( rPool, pRanges );
while( *pRanges )
{
- USHORT nWhich = *pRanges++;
- const USHORT nLastWhich = *pRanges++;
+ sal_uInt16 nWhich = *pRanges++;
+ const sal_uInt16 nLastWhich = *pRanges++;
if( bNoCharacterFormats && (nWhich == EE_CHAR_START) )
continue;
@@ -2091,7 +2091,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar
// All formating items (see ranges above) that are unequal in selected shape and
// the format paintbrush are hard set on the selected shape.
- const USHORT* pRanges = rFormatSet.GetRanges();
+ const sal_uInt16* pRanges = rFormatSet.GetRanges();
bool bTextOnly = true;
while( *pRanges )
@@ -2107,7 +2107,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar
if( !bTextOnly )
{
SfxItemSet aPaintSet( CreatePaintSet( GetFormatRangeImpl(false), *rShapeSet.GetPool(), rFormatSet, rShapeSet, bNoCharacterFormats, bNoParagraphFormats ) );
- const BOOL bReplaceAll = FALSE;
+ const sal_Bool bReplaceAll = sal_False;
SetAttrToMarked(aPaintSet, bReplaceAll);
}
@@ -2135,7 +2135,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar
if( !aSel.HasRange() )
pOLV->SetSelection( rEditEngine.GetWord( aSel, com::sun::star::i18n::WordType::DICTIONARY_WORD ) );
- const BOOL bRemoveParaAttribs = !bNoParagraphFormats;
+ const sal_Bool bRemoveParaAttribs = !bNoParagraphFormats;
pOLV->RemoveAttribsKeepLanguages( bRemoveParaAttribs );
SfxItemSet aSet( pOLV->GetAttribs() );
SfxItemSet aPaintSet( CreatePaintSet(GetFormatRangeImpl(true), *aSet.GetPool(), rFormatSet, aSet, bNoCharacterFormats, bNoParagraphFormats ) );
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 74d0cf6046da..9fd87af3b163 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -151,8 +151,8 @@ void OLEObjCache::UnloadOnDemand()
{
// more objects than configured cache size try to remove objects
// of course not the freshly inserted one at nIndex=0
- ULONG nCount2 = Count();
- ULONG nIndex = nCount2-1;
+ sal_uIntPtr nCount2 = Count();
+ sal_uIntPtr nIndex = nCount2-1;
while( nIndex && nCount2 > nSize )
{
SdrOle2Obj* pUnloadObj = (SdrOle2Obj*) GetObject(nIndex--);
@@ -171,7 +171,7 @@ void OLEObjCache::UnloadOnDemand()
uno::Reference< frame::XModel > xUnloadModel( xUnloadObj->getComponent(), uno::UNO_QUERY );
if ( xUnloadModel.is() )
{
- for ( ULONG nCheckInd = 0; nCheckInd < Count(); nCheckInd++ )
+ for ( sal_uIntPtr nCheckInd = 0; nCheckInd < Count(); nCheckInd++ )
{
SdrOle2Obj* pCacheObj = (SdrOle2Obj*) GetObject(nCheckInd);
if ( pCacheObj && pCacheObj != pUnloadObj )
@@ -195,7 +195,7 @@ void OLEObjCache::UnloadOnDemand()
}
}
-void OLEObjCache::SetSize(ULONG nNewSize)
+void OLEObjCache::SetSize(sal_uIntPtr nNewSize)
{
nSize = nNewSize;
}
@@ -211,11 +211,11 @@ void OLEObjCache::InsertObj(SdrOle2Obj* pObj)
}
// get the old position of the object to know whether it is already in container
- ULONG nOldPos = GetPos( pObj );
+ sal_uIntPtr nOldPos = GetPos( pObj );
// insert object into first position
Remove( nOldPos );
- Insert(pObj, (ULONG) 0L);
+ Insert(pObj, (sal_uIntPtr) 0L);
if ( nOldPos == CONTAINER_ENTRY_NOTFOUND )
{
@@ -229,9 +229,9 @@ void OLEObjCache::RemoveObj(SdrOle2Obj* pObj)
Remove(pObj);
}
-BOOL OLEObjCache::UnloadObj(SdrOle2Obj* pObj)
+sal_Bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj)
{
- BOOL bUnloaded = FALSE;
+ sal_Bool bUnloaded = sal_False;
if (pObj)
{
//#i80528# The old mechanism is completely useless, only taking into account if
@@ -259,9 +259,9 @@ IMPL_LINK(OLEObjCache, UnloadCheckHdl, AutoTimer*, /*pTim*/)
return 0;
}
-void ContainerSorter::DoSort(ULONG a, ULONG b) const
+void ContainerSorter::DoSort(sal_uIntPtr a, sal_uIntPtr b) const
{
- ULONG nAnz=rCont.Count();
+ sal_uIntPtr nAnz=rCont.Count();
if (b>nAnz) b=nAnz;
if (b>0) b--;
if (a<b) ImpSubSort(a,b);
@@ -306,8 +306,8 @@ public:
int ImpUShortContainerSorter::Compare(const void* pElem1, const void* pElem2) const
{
- USHORT n1=USHORT(ULONG(pElem1));
- USHORT n2=USHORT(ULONG(pElem2));
+ sal_uInt16 n1=sal_uInt16(sal_uIntPtr(pElem1));
+ sal_uInt16 n2=sal_uInt16(sal_uIntPtr(pElem2));
return n1<n2 ? -1 : n1>n2 ? 1 : 0;
}
@@ -321,7 +321,7 @@ void UShortCont::Sort()
class ImpClipMerk {
Region aClip;
- FASTBOOL bClip;
+ int bClip;
public:
ImpClipMerk(const OutputDevice& rOut): aClip(rOut.GetClipRegion()),bClip(rOut.IsClipRegion()) {}
void Restore(OutputDevice& rOut)
@@ -329,10 +329,10 @@ public:
// Kein Clipping in die Metafileaufzeichnung
GDIMetaFile* pMtf=rOut.GetConnectMetaFile();
if (pMtf!=NULL && (!pMtf->IsRecord() || pMtf->IsPause())) pMtf=NULL;
- if (pMtf!=NULL) pMtf->Pause(TRUE);
+ if (pMtf!=NULL) pMtf->Pause(sal_True);
if (bClip) rOut.SetClipRegion(aClip);
else rOut.SetClipRegion();
- if (pMtf!=NULL) pMtf->Pause(FALSE);
+ if (pMtf!=NULL) pMtf->Pause(sal_False);
}
};
@@ -348,7 +348,7 @@ public:
aBckgrdColor( rOut.GetBackground().GetColor() ),
aFont (rOut.GetFont()) {}
- ImpColorMerk(const OutputDevice& rOut, USHORT nMode)
+ ImpColorMerk(const OutputDevice& rOut, sal_uInt16 nMode)
{
if ( (nMode & SDRHDC_SAVEPEN) == SDRHDC_SAVEPEN )
aLineColor = rOut.GetLineColor();
@@ -363,7 +363,7 @@ public:
aFont=rOut.GetFont();
}
- void Restore(OutputDevice& rOut, USHORT nMode=SDRHDC_SAVEPENANDBRUSHANDFONT)
+ void Restore(OutputDevice& rOut, sal_uInt16 nMode=SDRHDC_SAVEPENANDBRUSHANDFONT)
{
if ( (nMode & SDRHDC_SAVEPEN) == SDRHDC_SAVEPEN)
rOut.SetLineColor( aLineColor );
@@ -385,7 +385,7 @@ public:
const Color& GetLineColor() const { return aLineColor; }
};
-ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode, FASTBOOL bAutoMerk):
+ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode, int bAutoMerk):
pFarbMerk(NULL),
pClipMerk(NULL),
pLineColorMerk(NULL),
@@ -421,7 +421,7 @@ void ImpSdrHdcMerk::Save(const OutputDevice& rOut)
if ((nMode & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING)
pClipMerk=new ImpClipMerk(rOut);
- USHORT nCol=nMode & SDRHDC_SAVEPENANDBRUSHANDFONT;
+ sal_uInt16 nCol=nMode & SDRHDC_SAVEPENANDBRUSHANDFONT;
if (nCol==SDRHDC_SAVEPEN)
pLineColorMerk=new Color( rOut.GetLineColor() );
@@ -431,14 +431,14 @@ void ImpSdrHdcMerk::Save(const OutputDevice& rOut)
pFarbMerk=new ImpColorMerk(rOut,nCol);
}
-void ImpSdrHdcMerk::Restore(OutputDevice& rOut, USHORT nMask) const
+void ImpSdrHdcMerk::Restore(OutputDevice& rOut, sal_uInt16 nMask) const
{
nMask&=nMode; // nur restaurieren, was auch gesichert wurde
if ((nMask & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING && pClipMerk!=NULL)
pClipMerk->Restore(rOut);
- USHORT nCol=nMask & SDRHDC_SAVEPENANDBRUSHANDFONT;
+ sal_uInt16 nCol=nMask & SDRHDC_SAVEPENANDBRUSHANDFONT;
if (nCol==SDRHDC_SAVEPEN)
{
@@ -498,17 +498,17 @@ void SdrLinkList::RemoveLink(const Link& rLink)
////////////////////////////////////////////////////////////////////////////////////////////////////
// #98988# Re-implement GetDraftFillColor(...)
-FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
+int GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
{
XFillStyle eFill=((XFillStyleItem&)rSet.Get(XATTR_FILLSTYLE)).GetValue();
- FASTBOOL bRetval(FALSE);
+ int bRetval(sal_False);
switch(eFill)
{
case XFILL_SOLID:
{
rCol = ((XFillColorItem&)rSet.Get(XATTR_FILLCOLOR)).GetColorValue();
- bRetval = TRUE;
+ bRetval = sal_True;
break;
}
@@ -526,7 +526,7 @@ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
const basegfx::BColor aAverageColor(basegfx::average(aCol1.getBColor(), aCol2.getBColor()));
rCol = Color(aAverageColor);
- bRetval = TRUE;
+ bRetval = sal_True;
break;
}
@@ -536,7 +536,7 @@ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
Color aCol2(rGrad.GetEndColor());
const basegfx::BColor aAverageColor(basegfx::average(aCol1.getBColor(), aCol2.getBColor()));
rCol = Color(aAverageColor);
- bRetval = TRUE;
+ bRetval = sal_True;
break;
}
@@ -564,7 +564,7 @@ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
for(sal_uInt32 nX(0L); nX < nWidth; nX += nXStep)
{
const BitmapColor& rCol2 = (pAccess->HasPalette())
- ? pAccess->GetPaletteColor((BYTE)pAccess->GetPixel(nY, nX))
+ ? pAccess->GetPaletteColor((sal_uInt8)pAccess->GetPixel(nY, nX))
: pAccess->GetPixel(nY, nX);
nRt += rCol2.GetRed();
@@ -578,9 +578,9 @@ FASTBOOL GetDraftFillColor(const SfxItemSet& rSet, Color& rCol)
nGn /= nAnz;
nBl /= nAnz;
- rCol = Color(UINT8(nRt), UINT8(nGn), UINT8(nBl));
+ rCol = Color(sal_uInt8(nRt), sal_uInt8(nGn), sal_uInt8(nBl));
- bRetval = TRUE;
+ bRetval = sal_True;
}
if(pAccess)
@@ -630,7 +630,7 @@ void SdrEngineDefaults::LanguageHasChanged()
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pModel )
+SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pModel )
{
//SdrEngineDefaults& rDefaults = SdrEngineDefaults::GetDefaults();
@@ -697,47 +697,47 @@ String GetResourceString(sal_uInt16 nResID)
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SearchOutlinerItems(const SfxItemSet& rSet, BOOL bInklDefaults, BOOL* pbOnlyEE)
+sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE)
{
- BOOL bHas=FALSE;
- BOOL bOnly=TRUE;
- BOOL bLookOnly=pbOnlyEE!=NULL;
+ sal_Bool bHas=sal_False;
+ sal_Bool bOnly=sal_True;
+ sal_Bool bLookOnly=pbOnlyEE!=NULL;
SfxWhichIter aIter(rSet);
- USHORT nWhich=aIter.FirstWhich();
+ sal_uInt16 nWhich=aIter.FirstWhich();
while (((bLookOnly && bOnly) || !bHas) && nWhich!=0) {
// bei bInklDefaults ist der gesamte Which-Range
// ausschlaggebend, ansonsten nur die gesetzten Items
// Disabled und DontCare wird als Loch im Which-Range betrachtet
SfxItemState eState=rSet.GetItemState(nWhich);
if ((eState==SFX_ITEM_DEFAULT && bInklDefaults) || eState==SFX_ITEM_SET) {
- if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=FALSE;
- else bHas=TRUE;
+ if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=sal_False;
+ else bHas=sal_True;
}
nWhich=aIter.NextWhich();
}
- if (!bHas) bOnly=FALSE;
+ if (!bHas) bOnly=sal_False;
if (pbOnlyEE!=NULL) *pbOnlyEE=bOnly;
return bHas;
}
-USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT nRangeEnd)
+sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd)
{
// insgesamt sind 6 Faelle moeglich (je Range):
// [Beg..End] zu entfernender Range
// [b..e] [b..e] [b..e] Fall 1,3,2: egal, ganz weg, egal + Ranges
// [b........e] [b........e] Fall 4,5 : Bereich verkleinern | in
// [b......................e] Fall 6 : Splitting + pOldWhichTable
- USHORT nAnz=0;
+ sal_uInt16 nAnz=0;
while (pOldWhichTable[nAnz]!=0) nAnz++;
nAnz++; // nAnz muesste nun in jedem Fall eine ungerade Zahl sein (0 am Ende des Arrays)
DBG_ASSERT((nAnz&1)==1,"Joe: RemoveWhichRange: WhichTable hat keine ungerade Anzahl von Eintraegen");
- USHORT nAlloc=nAnz;
+ sal_uInt16 nAlloc=nAnz;
// benoetigte Groesse des neuen Arrays ermitteln
- USHORT nNum=nAnz-1;
+ sal_uInt16 nNum=nAnz-1;
while (nNum!=0) {
nNum-=2;
- USHORT nBeg=pOldWhichTable[nNum];
- USHORT nEnd=pOldWhichTable[nNum+1];
+ sal_uInt16 nBeg=pOldWhichTable[nNum];
+ sal_uInt16 nEnd=pOldWhichTable[nNum+1];
if (nEnd<nRangeBeg) /*nCase=1*/ ;
else if (nBeg>nRangeEnd) /* nCase=2 */ ;
else if (nBeg>=nRangeBeg && nEnd<=nRangeEnd) /* nCase=3 */ nAlloc-=2;
@@ -746,15 +746,15 @@ USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT
else /* nCase=6 */ nAlloc+=2;
}
- USHORT* pNewWhichTable=new USHORT[nAlloc];
- memcpy(pNewWhichTable,pOldWhichTable,nAlloc*sizeof(USHORT));
+ sal_uInt16* pNewWhichTable=new sal_uInt16[nAlloc];
+ memcpy(pNewWhichTable,pOldWhichTable,nAlloc*sizeof(sal_uInt16));
pNewWhichTable[nAlloc-1]=0; // im Falle 3 fehlt die 0 am Ende
// nun die unerwuenschten Ranges entfernen
nNum=nAlloc-1;
while (nNum!=0) {
nNum-=2;
- USHORT nBeg=pNewWhichTable[nNum];
- USHORT nEnd=pNewWhichTable[nNum+1];
+ sal_uInt16 nBeg=pNewWhichTable[nNum];
+ sal_uInt16 nEnd=pNewWhichTable[nNum+1];
unsigned nCase=0;
if (nEnd<nRangeBeg) nCase=1;
else if (nBeg>nRangeEnd) nCase=2;
@@ -764,14 +764,14 @@ USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT
else nCase=6;
switch (nCase) {
case 3: {
- unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(USHORT);
+ unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(sal_uInt16);
memcpy(&pNewWhichTable[nNum],&pNewWhichTable[nNum+2],nTailBytes);
nAnz-=2; // Merken: Array hat sich verkleinert
} break;
case 4: pNewWhichTable[nNum+1]=nRangeBeg-1; break;
case 5: pNewWhichTable[nNum]=nRangeEnd+1; break;
case 6: {
- unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(USHORT);
+ unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(sal_uInt16);
memcpy(&pNewWhichTable[nNum+4],&pNewWhichTable[nNum+2],nTailBytes);
nAnz+=2; // Merken: Array hat sich vergroessert
pNewWhichTable[nNum+2]=nRangeEnd+1;
@@ -803,13 +803,13 @@ SvdProgressInfo::SvdProgressInfo( Link *_pLink )
nCurInsert = 0;
}
-void SvdProgressInfo::Init( ULONG _nSumActionCount, ULONG _nObjCount )
+void SvdProgressInfo::Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount )
{
nSumActionCount = _nSumActionCount;
nObjCount = _nObjCount;
}
-BOOL SvdProgressInfo::ReportActions( ULONG nAnzActions )
+sal_Bool SvdProgressInfo::ReportActions( sal_uIntPtr nAnzActions )
{
nSumCurAction += nAnzActions;
nCurAction += nAnzActions;
@@ -819,7 +819,7 @@ BOOL SvdProgressInfo::ReportActions( ULONG nAnzActions )
return pLink->Call(NULL) == 1L;
}
-BOOL SvdProgressInfo::ReportInserts( ULONG nAnzInserts )
+sal_Bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts )
{
nSumCurAction += nAnzInserts;
nCurInsert += nAnzInserts;
@@ -827,23 +827,23 @@ BOOL SvdProgressInfo::ReportInserts( ULONG nAnzInserts )
return pLink->Call(NULL) == 1L;
}
-BOOL SvdProgressInfo::ReportRescales( ULONG nAnzRescales )
+sal_Bool SvdProgressInfo::ReportRescales( sal_uIntPtr nAnzRescales )
{
nSumCurAction += nAnzRescales;
return pLink->Call(NULL) == 1L;
}
-void SvdProgressInfo::SetActionCount( ULONG _nActionCount )
+void SvdProgressInfo::SetActionCount( sal_uIntPtr _nActionCount )
{
nActionCount = _nActionCount;
}
-void SvdProgressInfo::SetInsertCount( ULONG _nInsertCount )
+void SvdProgressInfo::SetInsertCount( sal_uIntPtr _nInsertCount )
{
nInsertCount = _nInsertCount;
}
-BOOL SvdProgressInfo::SetNextObject()
+sal_Bool SvdProgressInfo::SetNextObject()
{
nActionCount = 0;
nCurAction = 0;
@@ -879,7 +879,7 @@ namespace
bool bRet(false);
bool bMaster(rList.GetPage() ? rList.GetPage()->IsMasterPage() : false);
- for(ULONG no(rList.GetObjCount()); !bRet && no > 0; )
+ for(sal_uIntPtr no(rList.GetObjCount()); !bRet && no > 0; )
{
no--;
SdrObject* pObj = rList.GetObj(no);
@@ -963,17 +963,17 @@ namespace
if(!rStyleSettings.GetHighContrastMode())
{
// search in page
- const USHORT SPOTCOUNT(5);
+ const sal_uInt16 SPOTCOUNT(5);
Point aSpotPos[SPOTCOUNT];
Color aSpotColor[SPOTCOUNT];
- ULONG nHeight( rArea.GetSize().Height() );
- ULONG nWidth( rArea.GetSize().Width() );
- ULONG nWidth14 = nWidth / 4;
- ULONG nHeight14 = nHeight / 4;
- ULONG nWidth34 = ( 3 * nWidth ) / 4;
- ULONG nHeight34 = ( 3 * nHeight ) / 4;
-
- USHORT i;
+ sal_uIntPtr nHeight( rArea.GetSize().Height() );
+ sal_uIntPtr nWidth( rArea.GetSize().Width() );
+ sal_uIntPtr nWidth14 = nWidth / 4;
+ sal_uIntPtr nHeight14 = nHeight / 4;
+ sal_uIntPtr nWidth34 = ( 3 * nWidth ) / 4;
+ sal_uIntPtr nHeight34 = ( 3 * nHeight ) / 4;
+
+ sal_uInt16 i;
for ( i = 0; i < SPOTCOUNT; i++ )
{
// five spots are used
@@ -1028,14 +1028,14 @@ namespace
impGetSdrPageFillColor(rPage, aSpotPos[i], rTextEditPV, rTextEditPV.GetVisibleLayers(), aSpotColor[i], false);
}
- USHORT aMatch[SPOTCOUNT];
+ sal_uInt16 aMatch[SPOTCOUNT];
for ( i = 0; i < SPOTCOUNT; i++ )
{
// were same spot colors found?
aMatch[i] = 0;
- for ( USHORT j = 0; j < SPOTCOUNT; j++ )
+ for ( sal_uInt16 j = 0; j < SPOTCOUNT; j++ )
{
if( j != i )
{
@@ -1050,7 +1050,7 @@ namespace
// highest weight to center spot
aBackground = aSpotColor[0];
- for ( USHORT nMatchCount = SPOTCOUNT - 1; nMatchCount > 1; nMatchCount-- )
+ for ( sal_uInt16 nMatchCount = SPOTCOUNT - 1; nMatchCount > 1; nMatchCount-- )
{
// which spot color was found most?
for ( i = 0; i < SPOTCOUNT; i++ )
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index f10610317578..e661788b3027 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -81,10 +81,10 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport(SdrModel& rModel):
nLineWidth(0),
maLineJoin(basegfx::B2DLINEJOIN_NONE),
maDash(XDASH_RECT, 0, 0, 0, 0, 0),
- bFntDirty(TRUE),
- bLastObjWasPolyWithoutLine(FALSE),bNoLine(FALSE),bNoFill(FALSE),bLastObjWasLine(FALSE)
+ bFntDirty(sal_True),
+ bLastObjWasPolyWithoutLine(sal_False),bNoLine(sal_False),bNoFill(sal_False),bLastObjWasLine(sal_False)
{
- aVD.EnableOutput(FALSE);
+ aVD.EnableOutput(sal_False);
// #i111954# init to no fill and no line initially
aVD.SetLineColor();
@@ -104,15 +104,15 @@ ImpSdrGDIMetaFileImport::~ImpSdrGDIMetaFileImport()
delete pTextAttr;
}
-ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
+sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
SdrObjList& rOL,
- ULONG nInsPos,
+ sal_uIntPtr nInsPos,
SvdProgressInfo *pProgrInfo)
{
pPage = rOL.GetPage();
GDIMetaFile* pTmpMtf=NULL;
GDIMetaFile* pMtf = (GDIMetaFile*) &rMtf;
- ULONG nActionAnz=pMtf->GetActionCount();
+ sal_uIntPtr nActionAnz=pMtf->GetActionCount();
sal_Bool bError = sal_False;
@@ -148,13 +148,13 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
if(65000 < nActionAnz)
{
nActionAnz = 65000;
- bError = TRUE;
+ bError = sal_True;
}
if(pProgrInfo)
pProgrInfo->SetActionCount(nActionAnz);
- ULONG nActionsToReport = 0;
+ sal_uIntPtr nActionsToReport = 0;
for( MetaAction* pAct = pMtf->FirstAction(); pAct; pAct = pMtf->NextAction() )
{
@@ -219,7 +219,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
// MapMode-Scaling vornehmen
MapScaling();
// Objekte in vorgegebenes Rechteck hineinskalieren
- ULONG nAnz=aTmpList.GetObjCount();
+ sal_uIntPtr nAnz=aTmpList.GetObjCount();
// Beim berechnen der Fortschrittsanzeige wird GetActionCount()*3 benutzt.
// Da in aTmpList allerdings weniger eintraege als GetActionCount()
@@ -239,7 +239,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
// alle in aTmpList zwischengespeicherten Objekte nun in rOL ab der Position nInsPos einfuegen
if (nInsPos>rOL.GetObjCount()) nInsPos=rOL.GetObjCount();
SdrInsertReason aReason(SDRREASON_VIEWCALL);
- for (ULONG i=0; i<nAnz; i++)
+ for (sal_uIntPtr i=0; i<nAnz; i++)
{
SdrObject* pObj=aTmpList.GetObj(i);
rOL.NbcInsertObject(pObj,nInsPos,&aReason);
@@ -268,12 +268,12 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf,
return aTmpList.GetObjCount();
}
-void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceTextAttr)
+void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, int bForceTextAttr)
{
- bNoLine = FALSE; bNoFill = FALSE;
- FASTBOOL bLine=TRUE && !bForceTextAttr;
- FASTBOOL bFill=pObj==NULL || pObj->IsClosedObj() && !bForceTextAttr;
- FASTBOOL bText=bForceTextAttr || (pObj!=NULL && pObj->GetOutlinerParaObject()!=NULL);
+ bNoLine = sal_False; bNoFill = sal_False;
+ int bLine=sal_True && !bForceTextAttr;
+ int bFill=pObj==NULL || pObj->IsClosedObj() && !bForceTextAttr;
+ int bText=bForceTextAttr || (pObj!=NULL && pObj->GetOutlinerParaObject()!=NULL);
if ( bLine )
{
@@ -320,7 +320,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceText
}
}
else
- bNoLine = TRUE;
+ bNoLine = sal_True;
if ( bFill )
{
@@ -333,7 +333,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceText
pFillAttr->Put(XFillStyleItem(XFILL_NONE));
}
else
- bNoFill = TRUE;
+ bNoFill = sal_True;
if ( bText && bFntDirty )
{
@@ -360,7 +360,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, FASTBOOL bForceText
pTextAttr->Put(SvxContourItem(aFnt.IsOutline(), EE_CHAR_OUTLINE));
pTextAttr->Put(SvxColorItem(aFnt.GetColor(), EE_CHAR_COLOR));
//... svxfont textitem svditext
- bFntDirty=FALSE;
+ bFntDirty=sal_False;
}
if (pObj!=NULL)
{
@@ -431,14 +431,14 @@ void ImpSdrGDIMetaFileImport::InsertObj( SdrObject* pObj, sal_Bool bScale )
aTmpList.InsertObject( pObj );
if ( HAS_BASE( SdrPathObj, pObj ) )
{
- FASTBOOL bClosed=pObj->IsClosedObj();
+ int bClosed=pObj->IsClosedObj();
bLastObjWasPolyWithoutLine=bNoLine && bClosed;
bLastObjWasLine=!bClosed;
}
else
{
- bLastObjWasPolyWithoutLine = FALSE;
- bLastObjWasLine = FALSE;
+ bLastObjWasPolyWithoutLine = sal_False;
+ bLastObjWasLine = sal_False;
}
}
}
@@ -772,7 +772,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rS
if ( aFnt.GetWidth() || ( rAct.GetType() == META_STRETCHTEXT_ACTION ) )
{
pText->ClearMergedItem( SDRATTR_TEXT_AUTOGROWWIDTH );
- pText->SetMergedItem( SdrTextAutoGrowHeightItem( FALSE ) );
+ pText->SetMergedItem( SdrTextAutoGrowHeightItem( sal_False ) );
// don't let the margins eat the space needed for the text
pText->SetMergedItem ( SdrTextUpperDistItem (0));
pText->SetMergedItem ( SdrTextLowerDistItem (0));
@@ -786,7 +786,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rS
pText->SetModel( pModel );
pText->SetLayer( nLayer );
pText->NbcSetText( rStr );
- SetAttributes( pText, TRUE );
+ SetAttributes( pText, sal_True );
pText->SetSnapRect( aTextRect );
if (!aFnt.IsTransparent())
@@ -927,8 +927,8 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMapModeAction& rAct)
{
MapScaling();
rAct.Execute(&aVD);
- bLastObjWasPolyWithoutLine=FALSE;
- bLastObjWasLine=FALSE;
+ bLastObjWasPolyWithoutLine=sal_False;
+ bLastObjWasLine=sal_False;
}
void ImpSdrGDIMetaFileImport::MapScaling()
@@ -978,7 +978,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM
aXGradient.SetGradientStyle((XGradientStyle)rGrad.GetStyle());
aXGradient.SetStartColor(rGrad.GetStartColor());
aXGradient.SetEndColor(rGrad.GetEndColor());
- aXGradient.SetAngle((USHORT)rGrad.GetAngle());
+ aXGradient.SetAngle((sal_uInt16)rGrad.GetAngle());
aXGradient.SetBorder(rGrad.GetBorder());
aXGradient.SetXOffset(rGrad.GetOfsX());
aXGradient.SetYOffset(rGrad.GetOfsY());
diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx
index e90d1972a4cd..a9c1e387d46e 100644
--- a/svx/source/svdraw/svdglev.cxx
+++ b/svx/source/svdraw/svdglev.cxx
@@ -57,14 +57,14 @@ SdrGlueEditView::~SdrGlueEditView()
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
+void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
{
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++) {
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
- ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+ sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
if (nPtAnz!=0) {
SdrGluePointList* pGPL=NULL;
if (bConst) {
@@ -78,10 +78,10 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, co
if(!bConst && IsUndoEnabled() )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
- for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++)
+ for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++)
{
- USHORT nPtId=pPts->GetObject(nPtNum);
- USHORT nGlueIdx=pGPL->FindGluePoint(nPtId);
+ sal_uInt16 nPtId=pPts->GetObject(nPtNum);
+ sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId);
if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND)
{
SdrGluePoint& rGP=(*pGPL)[nGlueIdx];
@@ -103,38 +103,38 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, co
static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*, const void*)
{
- USHORT& nRet=*(USHORT*)pnRet;
- BOOL& bFirst=*(BOOL*)pbFirst;
+ sal_uInt16& nRet=*(sal_uInt16*)pnRet;
+ sal_Bool& bFirst=*(sal_Bool*)pbFirst;
if (nRet!=FUZZY) {
- USHORT nEsc=rGP.GetEscDir();
- BOOL bOn=(nEsc & *(USHORT*)pnThisEsc)!=0;
- if (bFirst) { nRet=bOn; bFirst=FALSE; }
+ sal_uInt16 nEsc=rGP.GetEscDir();
+ sal_Bool bOn=(nEsc & *(sal_uInt16*)pnThisEsc)!=0;
+ if (bFirst) { nRet=bOn; bFirst=sal_False; }
else if (nRet!=bOn) nRet=FUZZY;
}
}
-TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(USHORT nThisEsc) const
+TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const
{
ForceUndirtyMrkPnt();
- BOOL bFirst=TRUE;
- USHORT nRet=FALSE;
- ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,TRUE,&bFirst,&nThisEsc,&nRet);
+ sal_Bool bFirst=sal_True;
+ sal_uInt16 nRet=sal_False;
+ ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,sal_True,&bFirst,&nThisEsc,&nRet);
return (TRISTATE)nRet;
}
static void ImpSetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pnThisEsc, const void* pbOn, const void*, const void*, const void*)
{
- USHORT nEsc=rGP.GetEscDir();
- if (*(BOOL*)pbOn) nEsc|=*(USHORT*)pnThisEsc;
- else nEsc&=~*(USHORT*)pnThisEsc;
+ sal_uInt16 nEsc=rGP.GetEscDir();
+ if (*(sal_Bool*)pbOn) nEsc|=*(sal_uInt16*)pnThisEsc;
+ else nEsc&=~*(sal_uInt16*)pnThisEsc;
rGP.SetEscDir(nEsc);
}
-void SdrGlueEditView::SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn)
+void SdrGlueEditView::SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bOn)
{
ForceUndirtyMrkPnt();
BegUndo(ImpGetResStr(STR_EditSetGlueEscDir),GetDescriptionOfMarkedGluePoints());
- ImpDoMarkedGluePoints(ImpSetEscDir,FALSE,&nThisEsc,&bOn);
+ ImpDoMarkedGluePoints(ImpSetEscDir,sal_False,&nThisEsc,&bOn);
EndUndo();
}
@@ -142,11 +142,11 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn)
static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*, const void*)
{
- USHORT& nRet=*(USHORT*)pnRet;
- BOOL& bFirst=*(BOOL*)pbFirst;
+ sal_uInt16& nRet=*(sal_uInt16*)pnRet;
+ sal_Bool& bFirst=*(sal_Bool*)pbFirst;
if (nRet!=FUZZY) {
bool bOn=rGP.IsPercent();
- if (bFirst) { nRet=bOn; bFirst=FALSE; }
+ if (bFirst) { nRet=bOn; bFirst=sal_False; }
else if ((nRet!=0)!=bOn) nRet=FUZZY;
}
}
@@ -154,24 +154,24 @@ static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const vo
TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const
{
ForceUndirtyMrkPnt();
- BOOL bFirst=TRUE;
- USHORT nRet=TRUE;
- ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,TRUE,&bFirst,&nRet);
+ sal_Bool bFirst=sal_True;
+ sal_uInt16 nRet=sal_True;
+ ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,sal_True,&bFirst,&nRet);
return (TRISTATE)nRet;
}
static void ImpSetPercent(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbOn, const void*, const void*, const void*, const void*)
{
Point aPos(rGP.GetAbsolutePos(*pObj));
- rGP.SetPercent(*(BOOL*)pbOn);
+ rGP.SetPercent(*(sal_Bool*)pbOn);
rGP.SetAbsolutePos(aPos,*pObj);
}
-void SdrGlueEditView::SetMarkedGluePointsPercent(BOOL bOn)
+void SdrGlueEditView::SetMarkedGluePointsPercent(sal_Bool bOn)
{
ForceUndirtyMrkPnt();
BegUndo(ImpGetResStr(STR_EditSetGluePercent),GetDescriptionOfMarkedGluePoints());
- ImpDoMarkedGluePoints(ImpSetPercent,FALSE,&bOn);
+ ImpDoMarkedGluePoints(ImpSetPercent,sal_False,&bOn);
EndUndo();
}
@@ -179,61 +179,61 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(BOOL bOn)
static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet, const void*)
{
- USHORT& nRet=*(USHORT*)pnRet;
- BOOL& bFirst=*(BOOL*)pbFirst;
- BOOL& bDontCare=*(BOOL*)pbDontCare;
- BOOL bVert=*(BOOL*)pbVert;
+ sal_uInt16& nRet=*(sal_uInt16*)pnRet;
+ sal_Bool& bFirst=*(sal_Bool*)pbFirst;
+ sal_Bool& bDontCare=*(sal_Bool*)pbDontCare;
+ sal_Bool bVert=*(sal_Bool*)pbVert;
if (!bDontCare) {
- USHORT nAlg=0;
+ sal_uInt16 nAlg=0;
if (bVert) {
nAlg=rGP.GetVertAlign();
} else {
nAlg=rGP.GetHorzAlign();
}
- if (bFirst) { nRet=nAlg; bFirst=FALSE; }
+ if (bFirst) { nRet=nAlg; bFirst=sal_False; }
else if (nRet!=nAlg) {
if (bVert) {
nRet=SDRVERTALIGN_DONTCARE;
} else {
nRet=SDRHORZALIGN_DONTCARE;
}
- bDontCare=TRUE;
+ bDontCare=sal_True;
}
}
}
-USHORT SdrGlueEditView::GetMarkedGluePointsAlign(BOOL bVert) const
+sal_uInt16 SdrGlueEditView::GetMarkedGluePointsAlign(sal_Bool bVert) const
{
ForceUndirtyMrkPnt();
- BOOL bFirst=TRUE;
- BOOL bDontCare=FALSE;
- USHORT nRet=0;
- ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,TRUE,&bFirst,&bDontCare,&bVert,&nRet);
+ sal_Bool bFirst=sal_True;
+ sal_Bool bDontCare=sal_False;
+ sal_uInt16 nRet=0;
+ ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,sal_True,&bFirst,&bDontCare,&bVert,&nRet);
return nRet;
}
static void ImpSetAlign(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbVert, const void* pnAlign, const void*, const void*, const void*)
{
Point aPos(rGP.GetAbsolutePos(*pObj));
- if (*(BOOL*)pbVert) { // bVert?
- rGP.SetVertAlign(*(USHORT*)pnAlign);
+ if (*(sal_Bool*)pbVert) { // bVert?
+ rGP.SetVertAlign(*(sal_uInt16*)pnAlign);
} else {
- rGP.SetHorzAlign(*(USHORT*)pnAlign);
+ rGP.SetHorzAlign(*(sal_uInt16*)pnAlign);
}
rGP.SetAbsolutePos(aPos,*pObj);
}
-void SdrGlueEditView::SetMarkedGluePointsAlign(BOOL bVert, USHORT nAlign)
+void SdrGlueEditView::SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign)
{
ForceUndirtyMrkPnt();
BegUndo(ImpGetResStr(STR_EditSetGlueAlign),GetDescriptionOfMarkedGluePoints());
- ImpDoMarkedGluePoints(ImpSetAlign,FALSE,&bVert,&nAlign);
+ ImpDoMarkedGluePoints(ImpSetAlign,sal_False,&bVert,&nAlign);
EndUndo();
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrGlueEditView::IsDeleteMarkedGluePointsPossible() const
+sal_Bool SdrGlueEditView::IsDeleteMarkedGluePointsPossible() const
{
return HasMarkedGluePoints();
}
@@ -246,13 +246,13 @@ void SdrGlueEditView::DeleteMarkedGluePoints()
if( bUndo )
BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedGluePoints(),SDRREPFUNC_OBJ_DELETE);
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
- ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+ sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
if (nPtAnz!=0)
{
SdrGluePointList* pGPL=pObj->ForceGluePointList();
@@ -261,10 +261,10 @@ void SdrGlueEditView::DeleteMarkedGluePoints()
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
- for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++)
+ for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++)
{
- USHORT nPtId=pPts->GetObject(nPtNum);
- USHORT nGlueIdx=pGPL->FindGluePoint(nPtId);
+ sal_uInt16 nPtId=pPts->GetObject(nPtNum);
+ sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId);
if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND)
{
pGPL->Delete(nGlueIdx);
@@ -291,28 +291,28 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints()
if( bUndo )
BegUndo();
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
SdrUShortCont* pPts=pM->GetMarkedGluePoints();
SdrGluePointList* pGPL=pObj->ForceGluePointList();
- ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+ sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
if (nPtAnz!=0 && pGPL!=NULL)
{
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
- for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++)
+ for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++)
{
- USHORT nPtId=pPts->GetObject(nPtNum);
- USHORT nGlueIdx=pGPL->FindGluePoint(nPtId);
+ sal_uInt16 nPtId=pPts->GetObject(nPtNum);
+ sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId);
if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND)
{
SdrGluePoint aNewGP((*pGPL)[nGlueIdx]); // GluePoint klonen
- USHORT nNewIdx=pGPL->Insert(aNewGP); // und einfuegen
- USHORT nNewId=(*pGPL)[nNewIdx].GetId(); // Id des neuen GluePoints ermitteln
+ sal_uInt16 nNewIdx=pGPL->Insert(aNewGP); // und einfuegen
+ sal_uInt16 nNewId=(*pGPL)[nNewIdx].GetId(); // Id des neuen GluePoints ermitteln
pPts->Replace(nNewId,nPtNum); // und diesen markieren (anstelle des alten)
}
}
@@ -329,12 +329,12 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints()
void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5)
{
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++) {
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
- ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+ sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
if (nPtAnz!=0) {
SdrGluePointList* pGPL=pObj->ForceGluePointList();
if (pGPL!=NULL)
@@ -342,9 +342,9 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo
if( IsUndoEnabled() )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj));
- for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) {
- USHORT nPtId=pPts->GetObject(nPtNum);
- USHORT nGlueIdx=pGPL->FindGluePoint(nPtId);
+ for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++) {
+ sal_uInt16 nPtId=pPts->GetObject(nPtNum);
+ sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId);
if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND) {
SdrGluePoint& rGP=(*pGPL)[nGlueIdx];
Point aPos(rGP.GetAbsolutePos(*pObj));
diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx
index 634d7060e735..4f7605d0a4dd 100644
--- a/svx/source/svdraw/svdglue.cxx
+++ b/svx/source/svdraw/svdglue.cxx
@@ -35,7 +35,7 @@
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrGluePoint::SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj)
+void SdrGluePoint::SetReallyAbsolute(int bOn, const SdrObject& rObj)
{
if ( bReallyAbsolute != bOn )
{
@@ -159,7 +159,7 @@ void SdrGluePoint::SetAlignAngle(long nWink)
else if (nWink<33750) nAlign=SDRHORZALIGN_RIGHT |SDRVERTALIGN_BOTTOM;
}
-long SdrGluePoint::EscDirToAngle(USHORT nEsc) const
+long SdrGluePoint::EscDirToAngle(sal_uInt16 nEsc) const
{
switch (nEsc) {
case SDRESC_RIGHT : return 0;
@@ -170,7 +170,7 @@ long SdrGluePoint::EscDirToAngle(USHORT nEsc) const
return 0;
}
-USHORT SdrGluePoint::EscAngleToDir(long nWink) const
+sal_uInt16 SdrGluePoint::EscAngleToDir(long nWink) const
{
nWink=NormAngle360(nWink);
if (nWink>=31500 || nWink<4500) return SDRESC_RIGHT;
@@ -190,8 +190,8 @@ void SdrGluePoint::Rotate(const Point& rRef, long nWink, double sn, double cs, c
SetAlignAngle(GetAlignAngle()+nWink);
}
// Austrittsrichtungen drehen
- USHORT nEscDir0=nEscDir;
- USHORT nEscDir1=0;
+ sal_uInt16 nEscDir0=nEscDir;
+ sal_uInt16 nEscDir1=0;
if ((nEscDir0&SDRESC_LEFT )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_LEFT )+nWink);
if ((nEscDir0&SDRESC_TOP )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_TOP )+nWink);
if ((nEscDir0&SDRESC_RIGHT )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_RIGHT )+nWink);
@@ -219,8 +219,8 @@ void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nWink, co
SetAlignAngle(nAW);
}
// Austrittsrichtungen spiegeln
- USHORT nEscDir0=nEscDir;
- USHORT nEscDir1=0;
+ sal_uInt16 nEscDir0=nEscDir;
+ sal_uInt16 nEscDir1=0;
if ((nEscDir0&SDRESC_LEFT)!=0) {
long nEW=EscDirToAngle(SDRESC_LEFT);
nEW+=2*(nWink-nEW);
@@ -245,7 +245,7 @@ void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nWink, co
if (pObj!=NULL) SetAbsolutePos(aPt,*pObj); else SetPos(aPt);
}
-void SdrGluePoint::Shear(const Point& rRef, long /*nWink*/, double tn, FASTBOOL bVShear, const SdrObject* pObj)
+void SdrGluePoint::Shear(const Point& rRef, long /*nWink*/, double tn, int bVShear, const SdrObject* pObj)
{
Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
ShearPoint(aPt,rRef,tn,bVShear);
@@ -260,7 +260,7 @@ void SdrGluePoint::Draw(OutputDevice& rOut, const SdrObject* pObj) const
bool bMapMerk=rOut.IsMapModeEnabled();
Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
aPt=rOut.LogicToPixel(aPt);
- rOut.EnableMapMode(FALSE);
+ rOut.EnableMapMode(sal_False);
long x=aPt.X(),y=aPt.Y(); // Groesse erstmal fest auf 7 Pixel
rOut.SetLineColor( aBackPenColor );
@@ -295,7 +295,7 @@ void SdrGluePoint::Invalidate(Window& rWin, const SdrObject* pObj) const
bool bMapMerk=rWin.IsMapModeEnabled();
Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
aPt=rWin.LogicToPixel(aPt);
- rWin.EnableMapMode(FALSE);
+ rWin.EnableMapMode(sal_False);
long x=aPt.X(),y=aPt.Y(); // Groesse erstmal fest auf 7 Pixel
// #111096#
@@ -305,7 +305,7 @@ void SdrGluePoint::Invalidate(Window& rWin, const SdrObject* pObj) const
rWin.EnableMapMode(bMapMerk);
}
-FASTBOOL SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const
+int SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const
{
Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos());
Size aSiz=rOut.PixelToLogic(Size(3,3));
@@ -317,8 +317,8 @@ FASTBOOL SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const
void SdrGluePointList::Clear()
{
- USHORT nAnz=GetCount();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=GetCount();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
delete GetObject(i);
}
aList.Clear();
@@ -327,8 +327,8 @@ void SdrGluePointList::Clear()
void SdrGluePointList::operator=(const SdrGluePointList& rSrcList)
{
if (GetCount()!=0) Clear();
- USHORT nAnz=rSrcList.GetCount();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rSrcList.GetCount();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
Insert(rSrcList[i]);
}
}
@@ -336,30 +336,30 @@ void SdrGluePointList::operator=(const SdrGluePointList& rSrcList)
// Die Id's der Klebepunkte in der Liste sind stets streng monoton steigend!
// Ggf. wird dem neuen Klebepunkt eine neue Id zugewiesen (wenn diese bereits
// vergeben ist). Die Id 0 ist reserviert.
-USHORT SdrGluePointList::Insert(const SdrGluePoint& rGP)
+sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP)
{
SdrGluePoint* pGP=new SdrGluePoint(rGP);
- USHORT nId=pGP->GetId();
- USHORT nAnz=GetCount();
- USHORT nInsPos=nAnz;
- USHORT nLastId=nAnz!=0 ? GetObject(nAnz-1)->GetId() : 0;
+ sal_uInt16 nId=pGP->GetId();
+ sal_uInt16 nAnz=GetCount();
+ sal_uInt16 nInsPos=nAnz;
+ sal_uInt16 nLastId=nAnz!=0 ? GetObject(nAnz-1)->GetId() : 0;
DBG_ASSERT(nLastId>=nAnz,"SdrGluePointList::Insert(): nLastId<nAnz");
- FASTBOOL bHole=nLastId>nAnz;
+ int bHole=nLastId>nAnz;
if (nId<=nLastId) {
if (!bHole || nId==0) {
nId=nLastId+1;
} else {
- FASTBOOL bBrk=FALSE;
- for (USHORT nNum=0; nNum<nAnz && !bBrk; nNum++) {
+ int bBrk=sal_False;
+ for (sal_uInt16 nNum=0; nNum<nAnz && !bBrk; nNum++) {
const SdrGluePoint* pGP2=GetObject(nNum);
- USHORT nTmpId=pGP2->GetId();
+ sal_uInt16 nTmpId=pGP2->GetId();
if (nTmpId==nId) {
nId=nLastId+1; // bereits vorhanden
- bBrk=TRUE;
+ bBrk=sal_True;
}
if (nTmpId>nId) {
nInsPos=nNum; // Hier einfuegen (einsortieren)
- bBrk=TRUE;
+ bBrk=sal_True;
}
}
}
@@ -371,35 +371,35 @@ USHORT SdrGluePointList::Insert(const SdrGluePoint& rGP)
void SdrGluePointList::Invalidate(Window& rWin, const SdrObject* pObj) const
{
- USHORT nAnz=GetCount();
- for (USHORT nNum=0; nNum<nAnz; nNum++) {
+ sal_uInt16 nAnz=GetCount();
+ for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
GetObject(nNum)->Invalidate(rWin,pObj);
}
}
-USHORT SdrGluePointList::FindGluePoint(USHORT nId) const
+sal_uInt16 SdrGluePointList::FindGluePoint(sal_uInt16 nId) const
{
// Hier noch einen optimaleren Suchalgorithmus implementieren.
// Die Liste sollte stets sortiert sein!!!!
- USHORT nAnz=GetCount();
- USHORT nRet=SDRGLUEPOINT_NOTFOUND;
- for (USHORT nNum=0; nNum<nAnz && nRet==SDRGLUEPOINT_NOTFOUND; nNum++) {
+ sal_uInt16 nAnz=GetCount();
+ sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND;
+ for (sal_uInt16 nNum=0; nNum<nAnz && nRet==SDRGLUEPOINT_NOTFOUND; nNum++) {
const SdrGluePoint* pGP=GetObject(nNum);
if (pGP->GetId()==nId) nRet=nNum;
}
return nRet;
}
-USHORT SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, FASTBOOL bBack, FASTBOOL bNext, USHORT nId0) const
+sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, int bBack, int bNext, sal_uInt16 nId0) const
{
- USHORT nAnz=GetCount();
- USHORT nRet=SDRGLUEPOINT_NOTFOUND;
- USHORT nNum=bBack ? 0 : nAnz;
+ sal_uInt16 nAnz=GetCount();
+ sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND;
+ sal_uInt16 nNum=bBack ? 0 : nAnz;
while ((bBack ? nNum<nAnz : nNum>0) && nRet==SDRGLUEPOINT_NOTFOUND) {
if (!bBack) nNum--;
const SdrGluePoint* pGP=GetObject(nNum);
if (bNext) {
- if (pGP->GetId()==nId0) bNext=FALSE;
+ if (pGP->GetId()==nId0) bNext=sal_False;
} else {
if (pGP->IsHit(rPnt,rOut,pObj)) nRet=nNum;
}
@@ -408,18 +408,18 @@ USHORT SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, co
return nRet;
}
-void SdrGluePointList::SetReallyAbsolute(FASTBOOL bOn, const SdrObject& rObj)
+void SdrGluePointList::SetReallyAbsolute(int bOn, const SdrObject& rObj)
{
- USHORT nAnz=GetCount();
- for (USHORT nNum=0; nNum<nAnz; nNum++) {
+ sal_uInt16 nAnz=GetCount();
+ for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
GetObject(nNum)->SetReallyAbsolute(bOn,rObj);
}
}
void SdrGluePointList::Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj)
{
- USHORT nAnz=GetCount();
- for (USHORT nNum=0; nNum<nAnz; nNum++) {
+ sal_uInt16 nAnz=GetCount();
+ for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
GetObject(nNum)->Rotate(rRef,nWink,sn,cs,pObj);
}
}
@@ -433,16 +433,16 @@ void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, const SdrO
void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj)
{
- USHORT nAnz=GetCount();
- for (USHORT nNum=0; nNum<nAnz; nNum++) {
+ sal_uInt16 nAnz=GetCount();
+ for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
GetObject(nNum)->Mirror(rRef1,rRef2,nWink,pObj);
}
}
-void SdrGluePointList::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear, const SdrObject* pObj)
+void SdrGluePointList::Shear(const Point& rRef, long nWink, double tn, int bVShear, const SdrObject* pObj)
{
- USHORT nAnz=GetCount();
- for (USHORT nNum=0; nNum<nAnz; nNum++) {
+ sal_uInt16 nAnz=GetCount();
+ for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
GetObject(nNum)->Shear(rRef,nWink,tn,bVShear,pObj);
}
}
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 791d0f5ca8e7..b587945b183d 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -88,10 +88,10 @@ class SdrHdlBitmapSet
BitmapEx& impGetOrCreateTargetBitmap(sal_uInt16 nIndex, const Rectangle& rRectangle);
public:
- SdrHdlBitmapSet(UINT16 nResId);
+ SdrHdlBitmapSet(sal_uInt16 nResId);
~SdrHdlBitmapSet();
- const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, UINT16 nInd=0);
+ const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd=0);
};
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -99,7 +99,7 @@ public:
#define INDEX_COUNT (6)
#define INDIVIDUAL_COUNT (4)
-SdrHdlBitmapSet::SdrHdlBitmapSet(UINT16 nResId)
+SdrHdlBitmapSet::SdrHdlBitmapSet(sal_uInt16 nResId)
: maMarkersBitmap(),
// 14 kinds (BitmapMarkerKind) use index [0..5], 4 extra
maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT)
@@ -132,7 +132,7 @@ BitmapEx& SdrHdlBitmapSet::impGetOrCreateTargetBitmap(sal_uInt16 nIndex, const R
}
// change getting of bitmap to use the big ressource bitmap
-const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, UINT16 nInd)
+const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd)
{
// fill in size and source position in maMarkersBitmap
const sal_uInt16 nYPos(nInd * 11);
@@ -303,9 +303,9 @@ SdrHdl::SdrHdl():
nPolyNum(0),
nPPntNum(0),
nSourceHdlNum(0),
- bSelect(FALSE),
- b1PixMore(FALSE),
- bPlusHdl(FALSE),
+ bSelect(sal_False),
+ b1PixMore(sal_False),
+ bPlusHdl(sal_False),
mbMoveOutside(false),
mbMouseOver(false)
{
@@ -322,9 +322,9 @@ SdrHdl::SdrHdl(const Point& rPnt, SdrHdlKind eNewKind):
nPolyNum(0),
nPPntNum(0),
nSourceHdlNum(0),
- bSelect(FALSE),
- b1PixMore(FALSE),
- bPlusHdl(FALSE),
+ bSelect(sal_False),
+ b1PixMore(sal_False),
+ bPlusHdl(sal_False),
mbMoveOutside(false),
mbMouseOver(false)
{
@@ -335,7 +335,7 @@ SdrHdl::~SdrHdl()
GetRidOfIAObject();
}
-void SdrHdl::Set1PixMore(BOOL bJa)
+void SdrHdl::Set1PixMore(sal_Bool bJa)
{
if(b1PixMore != bJa)
{
@@ -380,7 +380,7 @@ void SdrHdl::SetPos(const Point& rPnt)
}
}
-void SdrHdl::SetSelected(BOOL bJa)
+void SdrHdl::SetSelected(sal_Bool bJa)
{
if(bSelect != bJa)
{
@@ -440,7 +440,7 @@ void SdrHdl::CreateB2dIAObject()
BitmapColorIndex eColIndex = LightGreen;
BitmapMarkerKind eKindOfMarker = Rect_7x7;
- BOOL bRot = pHdlList->IsRotateShear();
+ sal_Bool bRot = pHdlList->IsRotateShear();
if(pObj)
eColIndex = (bSelect) ? Cyan : LightCyan;
if(bRot)
@@ -755,17 +755,17 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd,
{
// #101688# AnchorTR for SW, take top right as (0,0)
pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime,
- (UINT16)(aBmpEx1.GetSizePixel().Width() - 1), 0,
- (UINT16)(aBmpEx2.GetSizePixel().Width() - 1), 0);
+ (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1), 0,
+ (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1), 0);
}
else
{
// create centered handle as default
pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime,
- (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
- (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
- (UINT16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1,
- (UINT16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1);
+ (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
+ (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
+ (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1,
+ (sal_uInt16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1);
}
}
else
@@ -783,7 +783,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd,
{
// #101688# AnchorTR for SW, take top right as (0,0)
pRetval = new ::sdr::overlay::OverlayBitmapEx(rPos, aBmpEx,
- (UINT16)(aBmpEx.GetSizePixel().Width() - 1), 0);
+ (sal_uInt16)(aBmpEx.GetSizePixel().Width() - 1), 0);
}
else
{
@@ -826,9 +826,9 @@ bool SdrHdl::IsHdlHit(const Point& rPnt) const
Pointer SdrHdl::GetPointer() const
{
PointerStyle ePtr=POINTER_MOVE;
- const BOOL bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT;
- const BOOL bRot=pHdlList!=NULL && pHdlList->IsRotateShear();
- const BOOL bDis=pHdlList!=NULL && pHdlList->IsDistortShear();
+ const sal_Bool bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT;
+ const sal_Bool bRot=pHdlList!=NULL && pHdlList->IsRotateShear();
+ const sal_Bool bDis=pHdlList!=NULL && pHdlList->IsDistortShear();
if (bSize && pHdlList!=NULL && (bRot || bDis)) {
switch (eKind) {
case HDL_UPLFT: case HDL_UPRGT:
@@ -858,7 +858,7 @@ Pointer SdrHdl::GetPointer() const
while (nHdlWink<0) nHdlWink+=36000;
while (nHdlWink>=36000) nHdlWink-=36000;
nHdlWink/=4500;
- switch ((BYTE)nHdlWink) {
+ switch ((sal_uInt8)nHdlWink) {
case 0: ePtr=POINTER_ESIZE; break;
case 1: ePtr=POINTER_NESIZE; break;
case 2: ePtr=POINTER_NSIZE; break;
@@ -894,7 +894,7 @@ Pointer SdrHdl::GetPointer() const
}
// #97016# II
-BOOL SdrHdl::IsFocusHdl() const
+sal_Bool SdrHdl::IsFocusHdl() const
{
switch(eKind)
{
@@ -909,9 +909,9 @@ BOOL SdrHdl::IsFocusHdl() const
{
// if it's a activated TextEdit, it's moved to extended points
if(pHdlList && pHdlList->IsMoveOutside())
- return FALSE;
+ return sal_False;
else
- return TRUE;
+ return sal_True;
}
case HDL_MOVE: // Handle zum Verschieben des Objekts
@@ -938,12 +938,12 @@ BOOL SdrHdl::IsFocusHdl() const
case HDL_USER:
{
- return TRUE;
+ return sal_True;
}
default:
{
- return FALSE;
+ return sal_False;
}
}
}
@@ -964,7 +964,7 @@ bool SdrHdl::isMouseOver() const
////////////////////////////////////////////////////////////////////////////////////////////////////
// class SdrHdlColor
-SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, BOOL bLum)
+SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, sal_Bool bLum)
: SdrHdl(rRef, HDL_COLR),
aMarkerSize(rSize),
bUseLuminance(bLum)
@@ -1010,8 +1010,8 @@ void SdrHdlColor::CreateB2dIAObject()
::sdr::overlay::OverlayBitmapEx(
aPosition,
BitmapEx(aBmpCol),
- (UINT16)(aBmpCol.GetSizePixel().Width() - 1) >> 1,
- (UINT16)(aBmpCol.GetSizePixel().Height() - 1) >> 1
+ (sal_uInt16)(aBmpCol.GetSizePixel().Width() - 1) >> 1,
+ (sal_uInt16)(aBmpCol.GetSizePixel().Height() - 1) >> 1
);
DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!");
@@ -1042,8 +1042,8 @@ Bitmap SdrHdlColor::CreateColorDropper(Color aCol)
if(pWrite)
{
// draw outer border
- INT32 nWidth = aMarkerSize.Width();
- INT32 nHeight = aMarkerSize.Height();
+ sal_Int32 nWidth = aMarkerSize.Width();
+ sal_Int32 nHeight = aMarkerSize.Height();
pWrite->SetLineColor(Color(COL_LIGHTGRAY));
pWrite->DrawLine(Point(0, 0), Point(0, nHeight - 1));
@@ -1079,7 +1079,7 @@ Bitmap SdrHdlColor::CreateColorDropper(Color aCol)
Color SdrHdlColor::GetLuminance(const Color& rCol)
{
- UINT8 aLum = rCol.GetLuminance();
+ sal_uInt8 aLum = rCol.GetLuminance();
Color aRetval(aLum, aLum, aLum);
return aRetval;
}
@@ -1089,7 +1089,7 @@ void SdrHdlColor::CallColorChangeLink()
aColorChangeHdl.Call(this);
}
-void SdrHdlColor::SetColor(Color aNew, BOOL bCallLink)
+void SdrHdlColor::SetColor(Color aNew, sal_Bool bCallLink)
{
if(IsUseLuminance())
aNew = GetLuminance(aNew);
@@ -1123,7 +1123,7 @@ void SdrHdlColor::SetSize(const Size& rNew)
////////////////////////////////////////////////////////////////////////////////////////////////////
// class SdrHdlGradient
-SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, BOOL bGrad)
+SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad)
: SdrHdl(rRef1, bGrad ? HDL_GRAD : HDL_TRNS),
pColHdl1(NULL),
pColHdl2(NULL),
@@ -1178,8 +1178,8 @@ void SdrHdlGradient::CreateB2dIAObject()
double fHalfArrowWidth = (0.05 * 0.5) * fVecLen;
aVec.normalize();
basegfx::B2DVector aPerpend(-aVec.getY(), aVec.getX());
- INT32 nMidX = (INT32)(aPos.X() + aVec.getX() * fLongPercentArrow);
- INT32 nMidY = (INT32)(aPos.Y() + aVec.getY() * fLongPercentArrow);
+ sal_Int32 nMidX = (sal_Int32)(aPos.X() + aVec.getX() * fLongPercentArrow);
+ sal_Int32 nMidY = (sal_Int32)(aPos.Y() + aVec.getY() * fLongPercentArrow);
Point aMidPoint(nMidX, nMidY);
basegfx::B2DPoint aPosition(aPos.X(), aPos.Y());
@@ -1196,10 +1196,10 @@ void SdrHdlGradient::CreateB2dIAObject()
maOverlayGroup.append(*pNewOverlayObject);
// arrowhead
- Point aLeft(aMidPoint.X() + (INT32)(aPerpend.getX() * fHalfArrowWidth),
- aMidPoint.Y() + (INT32)(aPerpend.getY() * fHalfArrowWidth));
- Point aRight(aMidPoint.X() - (INT32)(aPerpend.getX() * fHalfArrowWidth),
- aMidPoint.Y() - (INT32)(aPerpend.getY() * fHalfArrowWidth));
+ Point aLeft(aMidPoint.X() + (sal_Int32)(aPerpend.getX() * fHalfArrowWidth),
+ aMidPoint.Y() + (sal_Int32)(aPerpend.getY() * fHalfArrowWidth));
+ Point aRight(aMidPoint.X() - (sal_Int32)(aPerpend.getX() * fHalfArrowWidth),
+ aMidPoint.Y() - (sal_Int32)(aPerpend.getY() * fHalfArrowWidth));
basegfx::B2DPoint aPositionLeft(aLeft.X(), aLeft.Y());
basegfx::B2DPoint aPositionRight(aRight.X(), aRight.Y());
@@ -1227,11 +1227,11 @@ void SdrHdlGradient::CreateB2dIAObject()
IMPL_LINK(SdrHdlGradient, ColorChangeHdl, SdrHdl*, /*pHdl*/)
{
if(GetObj())
- FromIAOToItem(GetObj(), TRUE, TRUE);
+ FromIAOToItem(GetObj(), sal_True, sal_True);
return 0;
}
-void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, BOOL bSetItemOnObject, BOOL bUndo)
+void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo)
{
// from IAO positions and colors to gradient
const SfxItemSet& rSet = _pObj->GetMergedItemSet();
@@ -1568,13 +1568,13 @@ Pointer ImpEdgeHdl::GetPointer() const
return Pointer(POINTER_SSIZE);
}
-BOOL ImpEdgeHdl::IsHorzDrag() const
+sal_Bool ImpEdgeHdl::IsHorzDrag() const
{
SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj);
if (pEdge==NULL)
- return FALSE;
+ return sal_False;
if (nObjHdlNum<=1)
- return FALSE;
+ return sal_False;
SdrEdgeKind eEdgeKind = ((SdrEdgeKindItem&)(pEdge->GetObjectItem(SDRATTR_EDGEKIND))).GetValue();
@@ -1587,11 +1587,11 @@ BOOL ImpEdgeHdl::IsHorzDrag() const
{
long nWink=nObjHdlNum==2 ? rInfo.nAngle1 : rInfo.nAngle2;
if (nWink==0 || nWink==18000)
- return TRUE;
+ return sal_True;
else
- return FALSE;
+ return sal_False;
}
- return FALSE;
+ return sal_False;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1774,7 +1774,7 @@ int ImpSdrHdlListSorter::Compare(const void* pElem1, const void* pElem2) const
{ // #48763#
if (eKind1==eKind2)
return (long)pElem1<(long)pElem2 ? -1 : 1; // Notloesung, um immer die gleiche Sortierung zu haben
- return (USHORT)eKind1<(USHORT)eKind2 ? -1 : 1;
+ return (sal_uInt16)eKind1<(sal_uInt16)eKind2 ? -1 : 1;
}
else
return nNum1<nNum2 ? -1 : 1;
@@ -1895,7 +1895,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward)
if(aList.Count())
{
// take care of old handle
- const ULONG nOldHdlNum(mnFocusIndex);
+ const sal_uIntPtr nOldHdlNum(mnFocusIndex);
SdrHdl* pOld = GetHdl(nOldHdlNum);
//SDOsal_Bool bRefresh(sal_False);
@@ -1922,7 +1922,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward)
qsort(pHdlAndIndex, aList.Count(), sizeof(ImplHdlAndIndex), ImplSortHdlFunc);
// #105678# look for old num in sorted array
- ULONG nOldHdl(nOldHdlNum);
+ sal_uIntPtr nOldHdl(nOldHdlNum);
if(nOldHdlNum != CONTAINER_ENTRY_NOTFOUND)
{
@@ -1937,7 +1937,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward)
}
// #105678# build new HdlNum
- ULONG nNewHdl(nOldHdl);
+ sal_uIntPtr nNewHdl(nOldHdl);
// #105678# do the focus travel
if(bForward)
@@ -2036,7 +2036,7 @@ void SdrHdlList::SetFocusHdl(SdrHdl* pNew)
if(!pActual || pActual != pNew)
{
- ULONG nNewHdlNum = GetHdlNum(pNew);
+ sal_uIntPtr nNewHdlNum = GetHdlNum(pNew);
if(nNewHdlNum != CONTAINER_ENTRY_NOTFOUND)
{
@@ -2085,10 +2085,10 @@ SdrHdlList::SdrHdlList(SdrMarkView* pV)
aList(1024,32,32)
{
nHdlSize = 3;
- bRotateShear = FALSE;
- bMoveOutside = FALSE;
- bDistortShear = FALSE;
- bFineHandles = FALSE;
+ bRotateShear = sal_False;
+ bMoveOutside = sal_False;
+ bDistortShear = sal_False;
+ bFineHandles = sal_False;
}
SdrHdlList::~SdrHdlList()
@@ -2096,7 +2096,7 @@ SdrHdlList::~SdrHdlList()
Clear();
}
-void SdrHdlList::SetHdlSize(USHORT nSiz)
+void SdrHdlList::SetHdlSize(sal_uInt16 nSiz)
{
if(nHdlSize != nSiz)
{
@@ -2104,7 +2104,7 @@ void SdrHdlList::SetHdlSize(USHORT nSiz)
nHdlSize = nSiz;
// propagate change to IAOs
- for(UINT32 i=0; i<GetHdlCount(); i++)
+ for(sal_uInt32 i=0; i<GetHdlCount(); i++)
{
SdrHdl* pHdl = GetHdl(i);
pHdl->Touch();
@@ -2112,7 +2112,7 @@ void SdrHdlList::SetHdlSize(USHORT nSiz)
}
}
-void SdrHdlList::SetMoveOutside(BOOL bOn)
+void SdrHdlList::SetMoveOutside(sal_Bool bOn)
{
if(bMoveOutside != bOn)
{
@@ -2120,7 +2120,7 @@ void SdrHdlList::SetMoveOutside(BOOL bOn)
bMoveOutside = bOn;
// propagate change to IAOs
- for(UINT32 i=0; i<GetHdlCount(); i++)
+ for(sal_uInt32 i=0; i<GetHdlCount(); i++)
{
SdrHdl* pHdl = GetHdl(i);
pHdl->Touch();
@@ -2128,17 +2128,17 @@ void SdrHdlList::SetMoveOutside(BOOL bOn)
}
}
-void SdrHdlList::SetRotateShear(BOOL bOn)
+void SdrHdlList::SetRotateShear(sal_Bool bOn)
{
bRotateShear = bOn;
}
-void SdrHdlList::SetDistortShear(BOOL bOn)
+void SdrHdlList::SetDistortShear(sal_Bool bOn)
{
bDistortShear = bOn;
}
-void SdrHdlList::SetFineHdl(BOOL bOn)
+void SdrHdlList::SetFineHdl(sal_Bool bOn)
{
if(bFineHandles != bOn)
{
@@ -2146,7 +2146,7 @@ void SdrHdlList::SetFineHdl(BOOL bOn)
bFineHandles = bOn;
// propagate change to IAOs
- for(UINT32 i=0; i<GetHdlCount(); i++)
+ for(sal_uInt32 i=0; i<GetHdlCount(); i++)
{
SdrHdl* pHdl = GetHdl(i);
pHdl->Touch();
@@ -2154,7 +2154,7 @@ void SdrHdlList::SetFineHdl(BOOL bOn)
}
}
-SdrHdl* SdrHdlList::RemoveHdl(ULONG nNum)
+SdrHdl* SdrHdlList::RemoveHdl(sal_uIntPtr nNum)
{
SdrHdl* pRetval = (SdrHdl*)aList.Remove(nNum);
@@ -2163,15 +2163,15 @@ SdrHdl* SdrHdlList::RemoveHdl(ULONG nNum)
void SdrHdlList::Clear()
{
- for (ULONG i=0; i<GetHdlCount(); i++)
+ for (sal_uIntPtr i=0; i<GetHdlCount(); i++)
{
SdrHdl* pHdl=GetHdl(i);
delete pHdl;
}
aList.Clear();
- bRotateShear=FALSE;
- bDistortShear=FALSE;
+ bRotateShear=sal_False;
+ bDistortShear=sal_False;
}
void SdrHdlList::Sort()
@@ -2203,21 +2203,21 @@ void SdrHdlList::Sort()
}
}
-ULONG SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const
+sal_uIntPtr SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const
{
if (pHdl==NULL)
return CONTAINER_ENTRY_NOTFOUND;
- ULONG nPos=aList.GetPos(pHdl);
+ sal_uIntPtr nPos=aList.GetPos(pHdl);
return nPos;
}
-void SdrHdlList::AddHdl(SdrHdl* pHdl, BOOL bAtBegin)
+void SdrHdlList::AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin)
{
if (pHdl!=NULL)
{
if (bAtBegin)
{
- aList.Insert(pHdl,ULONG(0));
+ aList.Insert(pHdl,sal_uIntPtr(0));
}
else
{
@@ -2227,11 +2227,11 @@ void SdrHdlList::AddHdl(SdrHdl* pHdl, BOOL bAtBegin)
}
}
-SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrHdl* pHdl0) const
+SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, sal_Bool bBack, sal_Bool bNext, SdrHdl* pHdl0) const
{
SdrHdl* pRet=NULL;
- ULONG nAnz=GetHdlCount();
- ULONG nNum=bBack ? 0 : nAnz;
+ sal_uIntPtr nAnz=GetHdlCount();
+ sal_uIntPtr nNum=bBack ? 0 : nAnz;
while ((bBack ? nNum<nAnz : nNum>0) && pRet==NULL)
{
if (!bBack)
@@ -2240,7 +2240,7 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrH
if (bNext)
{
if (pHdl==pHdl0)
- bNext=FALSE;
+ bNext=sal_False;
}
else
{
@@ -2256,7 +2256,7 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrH
SdrHdl* SdrHdlList::GetHdl(SdrHdlKind eKind1) const
{
SdrHdl* pRet=NULL;
- for (ULONG i=0; i<GetHdlCount() && pRet==NULL; i++)
+ for (sal_uIntPtr i=0; i<GetHdlCount() && pRet==NULL; i++)
{
SdrHdl* pHdl=GetHdl(i);
if (pHdl->GetKind()==eKind1)
@@ -2389,17 +2389,17 @@ void SdrCropHdl::CreateB2dIAObject()
const sal_uInt32 nBlinkTime = sal::static_int_cast<sal_uInt32>(rStyleSettings.GetCursorBlinkTime());
pOverlayObject = new ::sdr::overlay::OverlayAnimatedBitmapEx(aPosition, aBmpEx1, aBmpEx2, nBlinkTime,
- (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
- (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
- (UINT16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1,
- (UINT16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1);
+ (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
+ (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1,
+ (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1,
+ (sal_uInt16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1);
}
else
{
// create centered handle as default
pOverlayObject = new ::sdr::overlay::OverlayBitmapEx(aPosition, aBmpEx1,
- (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
- (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1);
+ (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1,
+ (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1);
}
// OVERLAYMANAGER
diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx
index 2813b6f032f1..c59250ea67ef 100644
--- a/svx/source/svdraw/svdhlpln.cxx
+++ b/svx/source/svdraw/svdhlpln.cxx
@@ -47,11 +47,11 @@ Pointer SdrHelpLine::GetPointer() const
} // switch
}
-FASTBOOL SdrHelpLine::IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const
+int SdrHelpLine::IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const
{
Size a1Pix(rOut.PixelToLogic(Size(1,1)));
- FASTBOOL bXHit=rPnt.X()>=aPos.X()-nTolLog && rPnt.X()<=aPos.X()+nTolLog+a1Pix.Width();
- FASTBOOL bYHit=rPnt.Y()>=aPos.Y()-nTolLog && rPnt.Y()<=aPos.Y()+nTolLog+a1Pix.Height();
+ int bXHit=rPnt.X()>=aPos.X()-nTolLog && rPnt.X()<=aPos.X()+nTolLog+a1Pix.Width();
+ int bYHit=rPnt.Y()>=aPos.Y()-nTolLog && rPnt.Y()<=aPos.Y()+nTolLog+a1Pix.Height();
switch (eKind) {
case SDRHELPLINE_VERTICAL : return bXHit;
case SDRHELPLINE_HORIZONTAL: return bYHit;
@@ -63,7 +63,7 @@ FASTBOOL SdrHelpLine::IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevic
}
} break;
} // switch
- return FALSE;
+ return sal_False;
}
Rectangle SdrHelpLine::GetBoundRect(const OutputDevice& rOut) const
@@ -105,8 +105,8 @@ bool SdrHelpLine::IsVisibleEqual( const SdrHelpLine& rHelpLine, const OutputDevi
void SdrHelpLineList::Clear()
{
- USHORT nAnz=GetCount();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=GetCount();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
delete GetObject(i);
}
aList.Clear();
@@ -115,31 +115,31 @@ void SdrHelpLineList::Clear()
void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList)
{
Clear();
- USHORT nAnz=rSrcList.GetCount();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rSrcList.GetCount();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
Insert(rSrcList[i]);
}
}
bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const
{
- FASTBOOL bEqual=FALSE;
- USHORT nAnz=GetCount();
+ int bEqual=sal_False;
+ sal_uInt16 nAnz=GetCount();
if (nAnz==rSrcList.GetCount()) {
- bEqual=TRUE;
- for (USHORT i=0; i<nAnz && bEqual; i++) {
+ bEqual=sal_True;
+ for (sal_uInt16 i=0; i<nAnz && bEqual; i++) {
if (*GetObject(i)!=*rSrcList.GetObject(i)) {
- bEqual=FALSE;
+ bEqual=sal_False;
}
}
}
return bEqual;
}
-USHORT SdrHelpLineList::HitTest(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const
+sal_uInt16 SdrHelpLineList::HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const
{
- USHORT nAnz=GetCount();
- for (USHORT i=nAnz; i>0;) {
+ sal_uInt16 nAnz=GetCount();
+ for (sal_uInt16 i=nAnz; i>0;) {
i--;
if (GetObject(i)->IsHit(rPnt,nTolLog,rOut)) return i;
}
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 3ded3a1f90c3..d2d4220ae36f 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -91,18 +91,18 @@ public:
XubString aName;
XubString aValue;
SfxItemState eState;
- UINT16 nWhichId;
+ sal_uInt16 nWhichId;
TypeId pType;
ItemType eItemType;
- INT32 nVal;
- INT32 nMin;
- INT32 nMax;
+ sal_Int32 nVal;
+ sal_Int32 nMin;
+ sal_Int32 nMax;
- BOOL bComment;
- BOOL bIsNum;
- BOOL bCanNum;
+ sal_Bool bComment;
+ sal_Bool bIsNum;
+ sal_Bool bCanNum;
public:
ImpItemListRow()
@@ -113,14 +113,14 @@ public:
nVal(0),
nMin(0),
nMax(0),
- bComment(FALSE),
- bIsNum(FALSE),
- bCanNum(FALSE)
+ bComment(sal_False),
+ bIsNum(sal_False),
+ bCanNum(sal_False)
{}
XubString GetItemTypeStr() const;
- BOOL operator==(const ImpItemListRow& rEntry) const;
- BOOL operator!=(const ImpItemListRow& rEntry) const { return !operator==(rEntry); }
+ sal_Bool operator==(const ImpItemListRow& rEntry) const;
+ sal_Bool operator!=(const ImpItemListRow& rEntry) const { return !operator==(rEntry); }
};
XubString ImpItemListRow::GetItemTypeStr() const
@@ -155,7 +155,7 @@ XubString ImpItemListRow::GetItemTypeStr() const
return aStr;
}
-BOOL ImpItemListRow::operator==(const ImpItemListRow& rEntry) const
+sal_Bool ImpItemListRow::operator==(const ImpItemListRow& rEntry) const
{
return (aName.Equals(rEntry.aName)
&& aValue.Equals(rEntry.aValue)
@@ -195,7 +195,7 @@ void __EXPORT ImpItemEdit::KeyInput(const KeyEvent& rKEvt)
{
_SdrItemBrowserControl* pBrowseMerk = pBrowse;
- UINT16 nKeyCode(rKEvt.GetKeyCode().GetCode() + rKEvt.GetKeyCode().GetModifier());
+ sal_uInt16 nKeyCode(rKEvt.GetKeyCode().GetCode() + rKEvt.GetKeyCode().GetModifier());
if(nKeyCode == KEY_RETURN)
{
@@ -247,13 +247,13 @@ void _SdrItemBrowserControl::ImpCtor()
nLastWhich = 0;
nLastWhichOben = 0; // not implemented yet
nLastWhichUnten = 0; // not implemented yet
- bWhichesButNames = FALSE;
- bDontHideIneffectiveItems = FALSE;
- bDontSortItems = FALSE;
- bShowWhichIds = FALSE;
- bShowRealValues = FALSE;
- bShowWhichIds = TRUE; // not implemented yet
- bShowRealValues = TRUE; // not implemented yet
+ bWhichesButNames = sal_False;
+ bDontHideIneffectiveItems = sal_False;
+ bDontSortItems = sal_False;
+ bShowWhichIds = sal_False;
+ bShowRealValues = sal_False;
+ bShowWhichIds = sal_True; // not implemented yet
+ bShowRealValues = sal_True; // not implemented yet
rtl_TextEncoding aTextEncoding = gsl_getSystemTextEncoding();
@@ -294,8 +294,8 @@ void _SdrItemBrowserControl::ImpCtor()
void _SdrItemBrowserControl::Clear()
{
- ULONG nAnz=aList.Count();
- for (ULONG nNum=0; nNum<nAnz; nNum++) {
+ sal_uIntPtr nAnz=aList.Count();
+ for (sal_uIntPtr nNum=0; nNum<nAnz; nNum++) {
delete ImpGetEntry(nNum);
}
aList.Clear();
@@ -307,13 +307,13 @@ long __EXPORT _SdrItemBrowserControl::GetRowCount() const
return aList.Count();
}
-BOOL __EXPORT _SdrItemBrowserControl::SeekRow(long nRow)
+sal_Bool __EXPORT _SdrItemBrowserControl::SeekRow(long nRow)
{
nAktPaintRow=nRow;
- return TRUE;
+ return sal_True;
}
-String _SdrItemBrowserControl::GetCellText(long _nRow, USHORT _nColId) const
+String _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const
{
String sRet;
if ( _nRow >= 0 && _nRow < (sal_Int32)aList.Count() )
@@ -356,9 +356,9 @@ String _SdrItemBrowserControl::GetCellText(long _nRow, USHORT _nColId) const
return sRet;
}
-void __EXPORT _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId) const
+void __EXPORT _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const
{
- if (nAktPaintRow<0 || (ULONG)nAktPaintRow>=aList.Count()) {
+ if (nAktPaintRow<0 || (sal_uIntPtr)nAktPaintRow>=aList.Count()) {
return;
}
Rectangle aR(rRect);
@@ -382,22 +382,22 @@ void __EXPORT _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Recta
}
}
-ULONG _SdrItemBrowserControl::GetCurrentPos() const
+sal_uIntPtr _SdrItemBrowserControl::GetCurrentPos() const
{
- ULONG nRet=CONTAINER_ENTRY_NOTFOUND;
+ sal_uIntPtr nRet=CONTAINER_ENTRY_NOTFOUND;
if (GetSelectRowCount()==1) {
long nPos=((BrowseBox*)this)->FirstSelectedRow();
- if (nPos>=0 && (ULONG)nPos<aList.Count()) {
- nRet=(ULONG)nPos;
+ if (nPos>=0 && (sal_uIntPtr)nPos<aList.Count()) {
+ nRet=(sal_uIntPtr)nPos;
}
}
return nRet;
}
-USHORT _SdrItemBrowserControl::GetCurrentWhich() const
+sal_uInt16 _SdrItemBrowserControl::GetCurrentWhich() const
{
- USHORT nRet=0;
- ULONG nPos=GetCurrentPos();
+ sal_uInt16 nRet=0;
+ sal_uIntPtr nPos=GetCurrentPos();
if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
nRet=ImpGetEntry(nPos)->nWhichId;
}
@@ -406,7 +406,7 @@ USHORT _SdrItemBrowserControl::GetCurrentWhich() const
void __EXPORT _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&)
{
- ULONG nPos=GetCurrentPos();
+ sal_uIntPtr nPos=GetCurrentPos();
if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
BegChangeEntry(nPos);
}
@@ -414,12 +414,12 @@ void __EXPORT _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&)
void __EXPORT _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt)
{
- USHORT nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier();
- FASTBOOL bAusgewertet=FALSE;
- ULONG nPos=GetCurrentPos();
+ sal_uInt16 nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier();
+ int bAusgewertet=sal_False;
+ sal_uIntPtr nPos=GetCurrentPos();
if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
if (nKeyCode==KEY_RETURN) {
- if (BegChangeEntry(nPos)) bAusgewertet=TRUE;
+ if (BegChangeEntry(nPos)) bAusgewertet=sal_True;
} else if (nKeyCode==KEY_ESCAPE) {
// ...
} else if (rKEvt.GetKeyCode().GetModifier()==KEY_SHIFT+KEY_MOD1+KEY_MOD2) { // Strg
@@ -466,7 +466,7 @@ void __EXPORT _SdrItemBrowserControl::Select()
void _SdrItemBrowserControl::ImpSaveWhich()
{
- USHORT nWh=GetCurrentWhich();
+ sal_uInt16 nWh=GetCurrentWhich();
if (nWh!=0) {
long nPos=GetCurrentPos();
long nTop=GetTopRow();
@@ -483,16 +483,16 @@ void _SdrItemBrowserControl::ImpSaveWhich()
void _SdrItemBrowserControl::ImpRestoreWhich()
{
if (nLastWhich!=0) {
- FASTBOOL bFnd=FALSE;
- USHORT nBestMinWh=0,nBestMaxWh=0xFFFF; // not implemented yet
- ULONG nBestMinPos=0,nBestMaxPos=0xFFFFFFFF; // not implemented yet
- ULONG nAnz=aList.Count();
- ULONG nNum;
+ int bFnd=sal_False;
+ sal_uInt16 nBestMinWh=0,nBestMaxWh=0xFFFF; // not implemented yet
+ sal_uIntPtr nBestMinPos=0,nBestMaxPos=0xFFFFFFFF; // not implemented yet
+ sal_uIntPtr nAnz=aList.Count();
+ sal_uIntPtr nNum;
for (nNum=0; nNum<nAnz && !bFnd; nNum++) {
ImpItemListRow* pEntry=ImpGetEntry(nNum);
if (!pEntry->bComment) {
- USHORT nWh=pEntry->nWhichId;
- if (nWh==nLastWhich) bFnd=TRUE;
+ sal_uInt16 nWh=pEntry->nWhichId;
+ if (nWh==nLastWhich) bFnd=sal_True;
else if (nWh<nLastWhich && nWh>nBestMinWh) nBestMinPos=nNum;
else if (nWh>nLastWhich && nWh<nBestMaxWh) nBestMaxPos=nNum;
}
@@ -508,15 +508,15 @@ void _SdrItemBrowserControl::ImpRestoreWhich()
}
}
-FASTBOOL _SdrItemBrowserControl::BegChangeEntry(ULONG nPos)
+int _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos)
{
BrkChangeEntry();
- FASTBOOL bRet=FALSE;
+ int bRet=sal_False;
ImpItemListRow* pEntry=ImpGetEntry(nPos);
if (pEntry!=NULL && !pEntry->bComment) {
SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT);
pEditControl=new ImpItemEdit(&GetDataWindow(),this,0/*|WB_BORDER|WB_3DLOOK*/);
- Rectangle aRect(GetFieldRectPixel(nPos,ITEMBROWSER_VALUECOL_ID,FALSE));
+ Rectangle aRect(GetFieldRectPixel(nPos,ITEMBROWSER_VALUECOL_ID,sal_False));
aRect.Left()+=2; // Kleiner Offset fuer's Edit, damit's pixelgenau stimmt
aRect.Right()--;
pEditControl->SetPosSizePixel(aRect.TopLeft(),aRect.GetSize());
@@ -542,14 +542,14 @@ FASTBOOL _SdrItemBrowserControl::BegChangeEntry(ULONG nPos)
aNeuNam.AppendAscii(" - Type 'del' to reset to default.");
pParent->SetText(aNeuNam);
pAktChangeEntry=new ImpItemListRow(*pEntry);
- bRet=TRUE;
+ bRet=sal_True;
}
return bRet;
}
-FASTBOOL _SdrItemBrowserControl::EndChangeEntry()
+int _SdrItemBrowserControl::EndChangeEntry()
{
- FASTBOOL bRet=FALSE;
+ int bRet=sal_False;
if (pEditControl!=NULL) {
aEntryChangedHdl.Call(this);
delete pEditControl;
@@ -559,7 +559,7 @@ FASTBOOL _SdrItemBrowserControl::EndChangeEntry()
Window* pParent=GetParent();
pParent->SetText(aWNamMerk);
SetMode(MYBROWSEMODE);
- bRet=TRUE;
+ bRet=sal_True;
}
return bRet;
}
@@ -577,22 +577,22 @@ void _SdrItemBrowserControl::BrkChangeEntry()
}
}
-void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEntryNum)
+void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntPtr nEntryNum)
{
ImpItemListRow* pAktEntry=ImpGetEntry(nEntryNum);
if (pAktEntry==NULL) {
aList.Insert(new ImpItemListRow(rEntry),CONTAINER_APPEND);
RowInserted(nEntryNum);
} else if (*pAktEntry!=rEntry) {
- FASTBOOL bStateDiff=rEntry.eState!=pAktEntry->eState;
- FASTBOOL bValueDiff=!rEntry.aValue.Equals(pAktEntry->aValue);
- FASTBOOL bAllDiff=TRUE;
+ int bStateDiff=rEntry.eState!=pAktEntry->eState;
+ int bValueDiff=!rEntry.aValue.Equals(pAktEntry->aValue);
+ int bAllDiff=sal_True;
if (bStateDiff || bValueDiff) {
// Checken, ob nur State und/oder Value geaendert
ImpItemListRow aTest(rEntry);
aTest.eState=pAktEntry->eState;
aTest.aValue=pAktEntry->aValue;
- if (aTest==*pAktEntry) bAllDiff=FALSE;
+ if (aTest==*pAktEntry) bAllDiff=sal_False;
}
*pAktEntry=rEntry;
if (bAllDiff) {
@@ -604,21 +604,21 @@ void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEn
}
}
-FASTBOOL ImpGetItem(const SfxItemSet& rSet, USHORT nWhich, const SfxPoolItem*& rpItem)
+int ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rpItem)
{
- SfxItemState eState=rSet.GetItemState(nWhich,TRUE,&rpItem);
+ SfxItemState eState=rSet.GetItemState(nWhich,sal_True,&rpItem);
if (eState==SFX_ITEM_DEFAULT) {
rpItem=&rSet.Get(nWhich);
}
return (eState==SFX_ITEM_DEFAULT || eState==SFX_ITEM_SET) && rpItem!=NULL;
}
-FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent)
+int IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent)
{
rIndent=0;
- if (pSet==NULL) return FALSE;
+ if (pSet==NULL) return sal_False;
const SfxPoolItem* pItem=NULL;
- FASTBOOL bRet=FALSE;
+ int bRet=sal_False;
switch (nWhich) {
case XATTR_LINEDASH :
case XATTR_LINEWIDTH :
@@ -633,21 +633,21 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
rIndent=1;
if (ImpGetItem(*pSet,XATTR_LINESTYLE,pItem)) {
XLineStyle eLineStyle=((const XLineStyleItem*)pItem)->GetValue();
- if (eLineStyle==XLINE_NONE) return TRUE;
- if (eLineStyle!=XLINE_DASH && nWhich==XATTR_LINEDASH) return TRUE;
+ if (eLineStyle==XLINE_NONE) return sal_True;
+ if (eLineStyle!=XLINE_DASH && nWhich==XATTR_LINEDASH) return sal_True;
}
if (nWhich==XATTR_LINESTART || nWhich==XATTR_LINESTARTCENTER) {
rIndent=2;
if (ImpGetItem(*pSet,XATTR_LINESTARTWIDTH,pItem)) {
- INT32 nWdt=((const XLineStartWidthItem*)pItem)->GetValue();
- if (nWdt==0) return TRUE;
+ sal_Int32 nWdt=((const XLineStartWidthItem*)pItem)->GetValue();
+ if (nWdt==0) return sal_True;
}
}
if (nWhich==XATTR_LINEEND || nWhich==XATTR_LINEENDCENTER) {
rIndent=2;
if (ImpGetItem(*pSet,XATTR_LINEENDWIDTH,pItem)) {
- INT32 nWdt=((const XLineEndWidthItem*)pItem)->GetValue();
- if (nWdt==0) return TRUE;
+ sal_Int32 nWdt=((const XLineEndWidthItem*)pItem)->GetValue();
+ if (nWdt==0) return sal_True;
}
}
} break;
@@ -661,36 +661,36 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
rIndent=1;
if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) {
XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue();
- if (eFillStyle==XFILL_NONE) return TRUE;
+ if (eFillStyle==XFILL_NONE) return sal_True;
// Transparenz z.Zt. nur fuer SolidFill
- if (eFillStyle!=XFILL_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return TRUE;
- if (eFillStyle!=XFILL_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return TRUE;
- if (eFillStyle!=XFILL_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return TRUE;
+ if (eFillStyle!=XFILL_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return sal_True;
+ if (eFillStyle!=XFILL_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return sal_True;
+ if (eFillStyle!=XFILL_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return sal_True;
}
} break;
case XATTR_FILLBITMAP :
case XATTR_FILLBMP_TILE :
- case XATTR_FILLBMP_POS : /* z.Zt. nur wenn TILE=TRUE */
+ case XATTR_FILLBMP_POS : /* z.Zt. nur wenn TILE=sal_True */
case XATTR_FILLBMP_SIZEX : /* nur wenn nicht Stretch */
case XATTR_FILLBMP_SIZEY : /* nur wenn nicht Stretch */
- case XATTR_FILLBMP_SIZELOG : /* nur wenn SIZELOG=FALSE zum ruecksetzen auf TRUE (alt) -> doch noch in Gebrauch */
- case XATTR_FILLBMP_TILEOFFSETX : /* nur wenn TILE=TRUE */
- case XATTR_FILLBMP_TILEOFFSETY : /* nur wenn TILE=TRUE */
- case XATTR_FILLBMP_STRETCH : /* nur wenn TILE=FALSE */
- case XATTR_FILLBMP_POSOFFSETX : /* nur wenn TILE=TRUE*/
- case XATTR_FILLBMP_POSOFFSETY : { /* nur wenn TILE=TRUE*/
+ case XATTR_FILLBMP_SIZELOG : /* nur wenn SIZELOG=sal_False zum ruecksetzen auf sal_True (alt) -> doch noch in Gebrauch */
+ case XATTR_FILLBMP_TILEOFFSETX : /* nur wenn TILE=sal_True */
+ case XATTR_FILLBMP_TILEOFFSETY : /* nur wenn TILE=sal_True */
+ case XATTR_FILLBMP_STRETCH : /* nur wenn TILE=sal_False */
+ case XATTR_FILLBMP_POSOFFSETX : /* nur wenn TILE=sal_True*/
+ case XATTR_FILLBMP_POSOFFSETY : { /* nur wenn TILE=sal_True*/
rIndent=1;
if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) {
XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue();
- if (eFillStyle!=XFILL_BITMAP) return TRUE;
+ if (eFillStyle!=XFILL_BITMAP) return sal_True;
}
if (nWhich==XATTR_FILLBITMAP || nWhich==XATTR_FILLBMP_TILE) {
- return FALSE; // immer anwaehlbar
+ return sal_False; // immer anwaehlbar
}
- FASTBOOL bTileTRUE=FALSE;
- FASTBOOL bTileFALSE=FALSE;
- FASTBOOL bStretchTRUE=FALSE;
- FASTBOOL bStretchFALSE=FALSE;
+ int bTileTRUE=sal_False;
+ int bTileFALSE=sal_False;
+ int bStretchTRUE=sal_False;
+ int bStretchFALSE=sal_False;
if (ImpGetItem(*pSet,XATTR_FILLBMP_TILE,pItem)) {
bTileTRUE=((const XFillBmpTileItem*)pItem)->GetValue();
bTileFALSE=!bTileTRUE;
@@ -715,31 +715,31 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
}
// Noch 2 Items speziell fuer Tile die sich jedoch gegenseitig ausschliessen
if (nWhich==XATTR_FILLBMP_TILEOFFSETX || nWhich==XATTR_FILLBMP_TILEOFFSETY) {
- if (bTileFALSE) return TRUE;
- USHORT nX=0,nY=0;
- FASTBOOL bX=FALSE,bY=FALSE;
+ if (bTileFALSE) return sal_True;
+ sal_uInt16 nX=0,nY=0;
+ int bX=sal_False,bY=sal_False;
if (ImpGetItem(*pSet,XATTR_FILLBMP_TILEOFFSETX,pItem)) {
nX=((const XFillBmpTileOffsetXItem*)pItem)->GetValue();
- bX=TRUE;
+ bX=sal_True;
}
if (ImpGetItem(*pSet,XATTR_FILLBMP_TILEOFFSETY,pItem)) {
nY=((const XFillBmpTileOffsetYItem*)pItem)->GetValue();
- bY=TRUE;
+ bY=sal_True;
}
if (nWhich==XATTR_FILLBMP_TILEOFFSETX) {
- if (nX!=0 || !bX) return FALSE;
- if (nY!=0) return TRUE;
+ if (nX!=0 || !bX) return sal_False;
+ if (nY!=0) return sal_True;
} else {
- if (nY!=0 || !bY) return FALSE;
- if (nX!=0) return TRUE;
+ if (nY!=0 || !bY) return sal_False;
+ if (nX!=0) return sal_True;
}
}
// SizeLog nicht anwaehlbar bei Stretch=TRUE
- // und sonst auch nur wenn es auf SizeLog=FALSE gesetzt ist.
+ // und sonst auch nur wenn es auf SizeLog=sal_False gesetzt ist.
// -> wohl doch noch in Gebrauch
- // (TRUE ist der statische PoolDefault)
+ // (sal_True ist der statische PoolDefault)
if (nWhich==XATTR_FILLBMP_SIZELOG) {
- if (bTileFALSE && bStretchTRUE) return TRUE;
+ if (bTileFALSE && bStretchTRUE) return sal_True;
}
} break;
@@ -758,13 +758,13 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
rIndent=1;
if (ImpGetItem(*pSet,XATTR_FORMTXTSTYLE,pItem)) {
XFormTextStyle eStyle=((const XFormTextStyleItem*)pItem)->GetValue();
- if (eStyle==XFT_NONE) return TRUE;
+ if (eStyle==XFT_NONE) return sal_True;
}
if ((nWhich>=XATTR_FORMTXTSHDWCOLOR && nWhich<=XATTR_FORMTXTSHDWYVAL) || nWhich>=XATTR_FORMTXTSHDWTRANSP) {
rIndent=2;
if (ImpGetItem(*pSet,XATTR_FORMTXTSHADOW,pItem)) {
XFormTextShadow eShadow=((const XFormTextShadowItem*)pItem)->GetValue();
- if (eShadow==XFTSHADOW_NONE) return TRUE;
+ if (eShadow==XFTSHADOW_NONE) return sal_True;
}
}
} break;
@@ -777,32 +777,32 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
case SDRATTR_SHADOWPERSP : {
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_SHADOW,pItem)) {
- FASTBOOL bShadow=((const SdrShadowItem*)pItem)->GetValue();
- if (!bShadow) return TRUE;
+ int bShadow=((const SdrShadowItem*)pItem)->GetValue();
+ if (!bShadow) return sal_True;
}
} break;
case SDRATTR_CAPTIONANGLE: {
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_CAPTIONFIXEDANGLE,pItem)) {
- FASTBOOL bFixed=((const SdrCaptionFixedAngleItem*)pItem)->GetValue();
- if (!bFixed) return TRUE;
+ int bFixed=((const SdrCaptionFixedAngleItem*)pItem)->GetValue();
+ if (!bFixed) return sal_True;
}
} break;
case SDRATTR_CAPTIONESCREL:
case SDRATTR_CAPTIONESCABS: {
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_CAPTIONESCISREL,pItem)) {
- FASTBOOL bRel=((const SdrCaptionEscIsRelItem*)pItem)->GetValue();
- if (bRel && nWhich==SDRATTR_CAPTIONESCABS) return TRUE;
- if (!bRel && nWhich==SDRATTR_CAPTIONESCREL) return TRUE;
+ int bRel=((const SdrCaptionEscIsRelItem*)pItem)->GetValue();
+ if (bRel && nWhich==SDRATTR_CAPTIONESCABS) return sal_True;
+ if (!bRel && nWhich==SDRATTR_CAPTIONESCREL) return sal_True;
}
} break;
case SDRATTR_CAPTIONLINELEN: {
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_CAPTIONFITLINELEN,pItem)) {
- FASTBOOL bFit=((const SdrCaptionFitLineLenItem*)pItem)->GetValue();
- if (bFit) return TRUE;
+ int bFit=((const SdrCaptionFitLineLenItem*)pItem)->GetValue();
+ if (bFit) return sal_True;
}
} break;
@@ -810,23 +810,23 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
case SDRATTR_TEXT_MAXFRAMEHEIGHT: {
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWHEIGHT,pItem)) {
- FASTBOOL bAutoGrow=((const SdrTextAutoGrowHeightItem*)pItem)->GetValue();
- if (!bAutoGrow) return TRUE;
+ int bAutoGrow=((const SdrTextAutoGrowHeightItem*)pItem)->GetValue();
+ if (!bAutoGrow) return sal_True;
}
} break;
case SDRATTR_TEXT_MINFRAMEWIDTH:
case SDRATTR_TEXT_MAXFRAMEWIDTH: {
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWWIDTH,pItem)) {
- FASTBOOL bAutoGrow=((const SdrTextAutoGrowWidthItem*)pItem)->GetValue();
- if (!bAutoGrow) return TRUE;
+ int bAutoGrow=((const SdrTextAutoGrowWidthItem*)pItem)->GetValue();
+ if (!bAutoGrow) return sal_True;
}
} break;
case SDRATTR_TEXT_VERTADJUST:
case SDRATTR_TEXT_HORZADJUST: {
if (ImpGetItem(*pSet,SDRATTR_TEXT_FITTOSIZE,pItem)) {
SdrFitToSizeType eFit=((const SdrTextFitToSizeTypeItem*)pItem)->GetValue();
- if (eFit!=SDRTEXTFIT_NONE) return TRUE;
+ if (eFit!=SDRTEXTFIT_NONE) return sal_True;
}
} break;
@@ -839,30 +839,30 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_TEXT_ANIKIND,pItem)) {
SdrTextAniKind eAniKind=((const SdrTextAniKindItem*)pItem)->GetValue();
- if (eAniKind==SDRTEXTANI_NONE) return TRUE;
- if (eAniKind==SDRTEXTANI_BLINK && (nWhich==SDRATTR_TEXT_ANIDIRECTION || nWhich==SDRATTR_TEXT_ANIAMOUNT)) return TRUE;
- if (eAniKind==SDRTEXTANI_SLIDE && (nWhich==SDRATTR_TEXT_ANISTARTINSIDE || nWhich==SDRATTR_TEXT_ANISTOPINSIDE)) return TRUE;
+ if (eAniKind==SDRTEXTANI_NONE) return sal_True;
+ if (eAniKind==SDRTEXTANI_BLINK && (nWhich==SDRATTR_TEXT_ANIDIRECTION || nWhich==SDRATTR_TEXT_ANIAMOUNT)) return sal_True;
+ if (eAniKind==SDRTEXTANI_SLIDE && (nWhich==SDRATTR_TEXT_ANISTARTINSIDE || nWhich==SDRATTR_TEXT_ANISTOPINSIDE)) return sal_True;
}
} break;
- case SDRATTR_EDGELINEDELTAANZ: return TRUE;
+ case SDRATTR_EDGELINEDELTAANZ: return sal_True;
case SDRATTR_EDGELINE1DELTA:
case SDRATTR_EDGELINE2DELTA:
case SDRATTR_EDGELINE3DELTA: {
if (ImpGetItem(*pSet,SDRATTR_EDGEKIND,pItem)) {
SdrEdgeKind eKind=((const SdrEdgeKindItem*)pItem)->GetValue();
if (eKind==SDREDGE_THREELINES) {
- if (nWhich>SDRATTR_EDGELINE2DELTA) return TRUE;
- else return FALSE;
+ if (nWhich>SDRATTR_EDGELINE2DELTA) return sal_True;
+ else return sal_False;
}
- if (eKind!=SDREDGE_ORTHOLINES && eKind!=SDREDGE_BEZIER) return TRUE;
+ if (eKind!=SDREDGE_ORTHOLINES && eKind!=SDREDGE_BEZIER) return sal_True;
}
if (ImpGetItem(*pSet,SDRATTR_EDGELINEDELTAANZ,pItem)) {
- UINT16 nAnz=((const SdrEdgeLineDeltaAnzItem*)pItem)->GetValue();
- if (nAnz==0) return TRUE;
- if (nAnz==1 && nWhich>SDRATTR_EDGELINE1DELTA) return TRUE;
- if (nAnz==2 && nWhich>SDRATTR_EDGELINE2DELTA) return TRUE;
- if (nAnz==3 && nWhich>SDRATTR_EDGELINE3DELTA) return TRUE;
+ sal_uInt16 nAnz=((const SdrEdgeLineDeltaAnzItem*)pItem)->GetValue();
+ if (nAnz==0) return sal_True;
+ if (nAnz==1 && nWhich>SDRATTR_EDGELINE1DELTA) return sal_True;
+ if (nAnz==2 && nWhich>SDRATTR_EDGELINE2DELTA) return sal_True;
+ if (nAnz==3 && nWhich>SDRATTR_EDGELINE3DELTA) return sal_True;
}
} break;
@@ -871,14 +871,14 @@ FASTBOOL IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rInden
rIndent=1;
if (ImpGetItem(*pSet,SDRATTR_CIRCKIND,pItem)) {
SdrCircKind eKind=((const SdrCircKindItem*)pItem)->GetValue();
- if (eKind==SDRCIRC_FULL) return TRUE;
+ if (eKind==SDRCIRC_FULL) return sal_True;
}
} break;
} // switch
return bRet;
}
-USHORT ImpSortWhich(USHORT nWhich)
+sal_uInt16 ImpSortWhich(sal_uInt16 nWhich)
{
switch (nWhich) {
// Line
@@ -933,11 +933,11 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT);
if (pSet!=NULL) {
rtl_TextEncoding aTextEncoding = gsl_getSystemTextEncoding();
- USHORT nEntryNum=0;
+ sal_uInt16 nEntryNum=0;
SfxWhichIter aIter(*pSet);
const SfxItemPool* pPool=pSet->GetPool();
- USHORT nWhich0=0;
- USHORT nWhich=aIter.FirstWhich();
+ sal_uInt16 nWhich0=0;
+ sal_uInt16 nWhich=aIter.FirstWhich();
while (nWhich!=0) {
// Nun erstmal etwas umsortieren
// Geht nur, solange keine InvalidItems, d.h. keine Luecken
@@ -951,7 +951,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
}
if (eState!=SFX_ITEM_DISABLED) {
const SfxPoolItem& rItem=pSet->Get(nWhich);
- USHORT nIndent=0;
+ sal_uInt16 nIndent=0;
if (!HAS_BASE(SfxVoidItem,&rItem) && !HAS_BASE(SfxSetItem,&rItem) && (!IsItemIneffective(nWhich,pSet,nIndent) || bDontHideIneffectiveItems)) {
XubString aCommentStr;
@@ -975,7 +975,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
if(aCommentStr.Len())
{
ImpItemListRow aEntry;
- aEntry.bComment=TRUE;
+ aEntry.bComment=sal_True;
aEntry.aName=aCommentStr;
ImpSetEntry(aEntry,nEntryNum);
nEntryNum++;
@@ -1018,20 +1018,20 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
else if (HAS_BASE(SvxCharScaleWidthItem,&rItem)) aEntry.eItemType=ITEM_FONTWIDTH;
else if (HAS_BASE(SvxFieldItem ,&rItem)) aEntry.eItemType=ITEM_FIELD;
switch (aEntry.eItemType) {
- case ITEM_BYTE : aEntry.bIsNum=TRUE; aEntry.nVal=((SfxByteItem &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=255; break;
- case ITEM_INT16 : aEntry.bIsNum=TRUE; aEntry.nVal=((SfxInt16Item &)rItem).GetValue(); aEntry.nMin=-32767; aEntry.nMax=32767; break;
- case ITEM_UINT16 : aEntry.bIsNum=TRUE; aEntry.nVal=((SfxUInt16Item&)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=65535; break;
- case ITEM_INT32 : aEntry.bIsNum=TRUE; aEntry.nVal=((SfxInt32Item &)rItem).GetValue(); break;
- case ITEM_UINT32 : aEntry.bIsNum=TRUE; aEntry.nVal=((SfxUInt32Item&)rItem).GetValue(); aEntry.nMin=0; /*aEntry.nMax=0xFF...*/;break;
- case ITEM_ENUM : aEntry.bCanNum=TRUE; aEntry.nVal=((SfxEnumItemInterface&)rItem).GetEnumValue(); aEntry.nMin=0; aEntry.nMax=((SfxEnumItemInterface&)rItem).GetValueCount()-1; break;
- case ITEM_BOOL : aEntry.bCanNum=TRUE; aEntry.nVal=((SfxBoolItem &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=1; break;
- case ITEM_FLAG : aEntry.bCanNum=TRUE; aEntry.nVal=((SfxFlagItem &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=0xFFFF; break;
- case ITEM_FONTHEIGHT: aEntry.bCanNum=TRUE; aEntry.nVal=((SvxFontHeightItem&)rItem).GetHeight(); aEntry.nMin=0; break;
- case ITEM_FONTWIDTH : aEntry.bCanNum=TRUE; aEntry.nVal=((SvxCharScaleWidthItem&)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=0xFFFF;break;
+ case ITEM_BYTE : aEntry.bIsNum=sal_True; aEntry.nVal=((SfxByteItem &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=255; break;
+ case ITEM_INT16 : aEntry.bIsNum=sal_True; aEntry.nVal=((SfxInt16Item &)rItem).GetValue(); aEntry.nMin=-32767; aEntry.nMax=32767; break;
+ case ITEM_UINT16 : aEntry.bIsNum=sal_True; aEntry.nVal=((SfxUInt16Item&)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=65535; break;
+ case ITEM_INT32 : aEntry.bIsNum=sal_True; aEntry.nVal=((SfxInt32Item &)rItem).GetValue(); break;
+ case ITEM_UINT32 : aEntry.bIsNum=sal_True; aEntry.nVal=((SfxUInt32Item&)rItem).GetValue(); aEntry.nMin=0; /*aEntry.nMax=0xFF...*/;break;
+ case ITEM_ENUM : aEntry.bCanNum=sal_True; aEntry.nVal=((SfxEnumItemInterface&)rItem).GetEnumValue(); aEntry.nMin=0; aEntry.nMax=((SfxEnumItemInterface&)rItem).GetValueCount()-1; break;
+ case ITEM_BOOL : aEntry.bCanNum=sal_True; aEntry.nVal=((SfxBoolItem &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=1; break;
+ case ITEM_FLAG : aEntry.bCanNum=sal_True; aEntry.nVal=((SfxFlagItem &)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=0xFFFF; break;
+ case ITEM_FONTHEIGHT: aEntry.bCanNum=sal_True; aEntry.nVal=((SvxFontHeightItem&)rItem).GetHeight(); aEntry.nMin=0; break;
+ case ITEM_FONTWIDTH : aEntry.bCanNum=sal_True; aEntry.nVal=((SvxCharScaleWidthItem&)rItem).GetValue(); aEntry.nMin=0; aEntry.nMax=0xFFFF;break;
default: break;
} // switch
- if (aEntry.bIsNum) aEntry.bCanNum=TRUE;
- FASTBOOL bGetPres=TRUE;
+ if (aEntry.bIsNum) aEntry.bCanNum=sal_True;
+ int bGetPres=sal_True;
if (bGetPres) {
rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS,
pPool->GetMetric(nWhich),
@@ -1044,7 +1044,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
if (aEntry.eItemType==ITEM_BOOL) aEntry.aValue.AppendAscii(aEntry.nVal!=0 ? "True" : "False");
else if (aEntry.bCanNum) aEntry.aValue = UniString::CreateFromInt32(aEntry.nVal);
else if (aEntry.eItemType==ITEM_STRING) aEntry.aValue=((SfxStringItem&)rItem).GetValue();
- else if (aEntry.eItemType==ITEM_ENUM && nWhich!=EE_CHAR_WEIGHT) aEntry.aValue=((SfxEnumItemInterface&)rItem).GetValueTextByPos((BOOL)aEntry.nVal);
+ else if (aEntry.eItemType==ITEM_ENUM && nWhich!=EE_CHAR_WEIGHT) aEntry.aValue=((SfxEnumItemInterface&)rItem).GetValueTextByPos((sal_Bool)aEntry.nVal);
else aEntry.aValue = String("GPF", aTextEncoding);
}
} else {
@@ -1058,8 +1058,8 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem
} // while
if (aList.Count()>nEntryNum) { // evtl. noch zuviele Eintraege
- ULONG nTooMuch=aList.Count()-nEntryNum;
- for (ULONG nNum=0; nNum<nTooMuch; nNum++) {
+ sal_uIntPtr nTooMuch=aList.Count()-nEntryNum;
+ for (sal_uIntPtr nNum=0; nNum<nTooMuch; nNum++) {
delete ImpGetEntry(nEntryNum);
aList.Remove(nEntryNum);
}
@@ -1102,7 +1102,7 @@ void __EXPORT _SdrItemBrowserWindow::GetFocus()
SdrItemBrowser::SdrItemBrowser(SdrView& rView):
_SdrItemBrowserWindow(ImpGetViewWin(rView)),
pView(&rView),
- bDirty(FALSE)
+ bDirty(sal_False)
{
aIdleTimer.SetTimeoutHdl(LINK(this,SdrItemBrowser,IdleHdl));
GetBrowserControl().SetEntryChangedHdl(LINK(this,SdrItemBrowser,ChangedHdl));
@@ -1136,7 +1136,7 @@ void SdrItemBrowser::ForceParent()
void SdrItemBrowser::SetDirty()
{
if (!bDirty) {
- bDirty=TRUE;
+ bDirty=sal_True;
aIdleTimer.SetTimeout(1);
aIdleTimer.Start();
}
@@ -1145,7 +1145,7 @@ void SdrItemBrowser::SetDirty()
void SdrItemBrowser::Undirty()
{
aIdleTimer.Stop();
- bDirty = FALSE;
+ bDirty = sal_False;
// SfxItemSet aSet(pView->GetAttributes());
SfxItemSet aSet(pView->GetModel()->GetItemPool());
@@ -1153,9 +1153,9 @@ void SdrItemBrowser::Undirty()
if(pView->AreObjectsMarked())
{
- // SfxItemSet a2ndSet(pView->GetAttributes(TRUE));
+ // SfxItemSet a2ndSet(pView->GetAttributes(sal_True));
SfxItemSet a2ndSet(pView->GetModel()->GetItemPool());
- pView->GetAttributes(a2ndSet, TRUE);
+ pView->GetAttributes(a2ndSet, sal_True);
SetAttributes(&aSet,&a2ndSet);
}
@@ -1197,10 +1197,10 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
if (nLongVal>pEntry->nMax) nLongVal=pEntry->nMax;
if (nLongVal<pEntry->nMin) nLongVal=pEntry->nMin;
}
- FASTBOOL bPair=FALSE;
- FASTBOOL bPairX=TRUE;
- FASTBOOL bPairY=FALSE;
- USHORT nSepLen=1;
+ int bPair=sal_False;
+ int bPairX=sal_True;
+ int bPairY=sal_False;
+ sal_uInt16 nSepLen=1;
long nLongX = aNewText.ToInt32();
long nLongY=0;
xub_StrLen nPos = aNewText.Search(sal_Unicode('/'));
@@ -1208,17 +1208,17 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
if (nPos==STRING_NOTFOUND) nPos=aNewText.Search(sal_Unicode(' '));
if (nPos==STRING_NOTFOUND) { nPos=aNewText.SearchAscii(".."); if (nPos!=STRING_NOTFOUND) nSepLen=2; }
if (nPos!=STRING_NOTFOUND) {
- bPair=TRUE;
+ bPair=sal_True;
bPairX=nPos>0;
XubString s(aNewText);
s.Erase(0,nPos+nSepLen);
- bPairY = (BOOL)aNewText.Len();
+ bPairY = (sal_Bool)aNewText.Len();
nLongY = s.ToInt32();
}
switch (pEntry->eItemType) {
- case ITEM_BYTE : ((SfxByteItem *)pNewItem)->SetValue((BYTE )nLongVal); break;
- case ITEM_INT16 : ((SfxInt16Item *)pNewItem)->SetValue((INT16 )nLongVal); break;
- case ITEM_UINT16: ((SfxUInt16Item*)pNewItem)->SetValue((UINT16)nLongVal); break;
+ case ITEM_BYTE : ((SfxByteItem *)pNewItem)->SetValue((sal_uInt8 )nLongVal); break;
+ case ITEM_INT16 : ((SfxInt16Item *)pNewItem)->SetValue((sal_Int16 )nLongVal); break;
+ case ITEM_UINT16: ((SfxUInt16Item*)pNewItem)->SetValue((sal_uInt16)nLongVal); break;
case ITEM_INT32: {
if(HAS_BASE(SdrAngleItem, pNewItem))
{
@@ -1226,10 +1226,10 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
double nVal = aNewText.ToFloat();
nLongVal = (long)(nVal * 100 + 0.5);
}
- ((SfxInt32Item *)pNewItem)->SetValue((INT32)nLongVal);
+ ((SfxInt32Item *)pNewItem)->SetValue((sal_Int32)nLongVal);
} break;
case ITEM_UINT32: ((SfxUInt32Item*)pNewItem)->SetValue(aNewText.ToInt32()); break;
- case ITEM_ENUM : ((SfxEnumItemInterface*)pNewItem)->SetEnumValue((USHORT)nLongVal); break;
+ case ITEM_ENUM : ((SfxEnumItemInterface*)pNewItem)->SetEnumValue((sal_uInt16)nLongVal); break;
case ITEM_BOOL: {
aNewText.ToUpperAscii();
if (aNewText.EqualsAscii("TRUE")) nLongVal=1;
@@ -1238,15 +1238,15 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
if (aNewText.EqualsAscii("EIN")) nLongVal=1;
if (aNewText.EqualsAscii("ON")) nLongVal=1;
if (aNewText.EqualsAscii("YES")) nLongVal=1;
- ((SfxBoolItem*)pNewItem)->SetValue((BOOL)nLongVal);
+ ((SfxBoolItem*)pNewItem)->SetValue((sal_Bool)nLongVal);
} break;
- case ITEM_FLAG : ((SfxFlagItem *)pNewItem)->SetValue((USHORT)nLongVal); break;
+ case ITEM_FLAG : ((SfxFlagItem *)pNewItem)->SetValue((sal_uInt16)nLongVal); break;
case ITEM_STRING: ((SfxStringItem*)pNewItem)->SetValue(aNewText); break;
case ITEM_POINT : ((SfxPointItem*)pNewItem)->SetValue(Point(nLongX,nLongY)); break;
case ITEM_RECT : break;
case ITEM_RANGE : {
- ((SfxRangeItem*)pNewItem)->From()=(USHORT)nLongX;
- ((SfxRangeItem*)pNewItem)->From()=(USHORT)nLongY;
+ ((SfxRangeItem*)pNewItem)->From()=(sal_uInt16)nLongX;
+ ((SfxRangeItem*)pNewItem)->From()=(sal_uInt16)nLongY;
} break;
case ITEM_LRANGE : {
} break;
@@ -1263,19 +1263,19 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse)
((SvxFontItem*)pNewItem)->GetStyleName().Erase();
} break;
case ITEM_FONTHEIGHT: {
- ULONG nHgt=0;
- USHORT nProp=100;
+ sal_uIntPtr nHgt=0;
+ sal_uInt16 nProp=100;
if (aNewText.Search(sal_Unicode('%'))!=STRING_NOTFOUND) {
- nProp=(USHORT)nLongVal;
+ nProp=(sal_uInt16)nLongVal;
} else {
nHgt=nLongVal;
}
((SvxFontHeightItem*)pNewItem)->SetHeight(nHgt,nProp);
} break;
case ITEM_FONTWIDTH: {
- USHORT nProp=100;
+ sal_uInt16 nProp=100;
if (aNewText.Search(sal_Unicode('%'))!=STRING_NOTFOUND) {
- nProp=(USHORT)nLongVal;
+ nProp=(sal_uInt16)nLongVal;
}
((SvxCharScaleWidthItem*)pNewItem)->SetValue(nProp);
} break;
diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx
index 0e7bc872c5a6..7bc03d3a5957 100644
--- a/svx/source/svdraw/svditer.cxx
+++ b/svx/source/svdraw/svditer.cxx
@@ -36,16 +36,16 @@
// #99190#
#include <svx/scene3d.hxx>
-SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode, BOOL bReverse)
+SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bReverse)
: maObjList(1024, 64, 64),
mnIndex(0L),
mbReverse(bReverse)
{
- ImpProcessObjectList(rObjList, eMode, TRUE);
+ ImpProcessObjectList(rObjList, eMode, sal_True);
Reset();
}
-SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, BOOL bUseZOrder, SdrIterMode eMode, BOOL bReverse)
+SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, sal_Bool bUseZOrder, SdrIterMode eMode, sal_Bool bReverse)
: maObjList(1024, 64, 64),
mnIndex(0L),
mbReverse(bReverse)
@@ -54,19 +54,19 @@ SdrObjListIter::SdrObjListIter(const SdrObjList& rObjList, BOOL bUseZOrder, SdrI
Reset();
}
-SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode, BOOL bReverse )
+SdrObjListIter::SdrObjListIter( const SdrObject& rObj, SdrIterMode eMode, sal_Bool bReverse )
: maObjList(1024, 64, 64),
mnIndex(0L),
mbReverse(bReverse)
{
if ( rObj.ISA( SdrObjGroup ) )
- ImpProcessObjectList(*rObj.GetSubList(), eMode, TRUE);
+ ImpProcessObjectList(*rObj.GetSubList(), eMode, sal_True);
else
maObjList.Insert( (void*)&rObj, LIST_APPEND );
Reset();
}
-SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode, BOOL bReverse )
+SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode, sal_Bool bReverse )
: maObjList(1024, 64, 64),
mnIndex(0L),
mbReverse(bReverse)
@@ -75,9 +75,9 @@ SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode,
Reset();
}
-void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, BOOL bUseZOrder)
+void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, sal_Bool bUseZOrder)
{
- for( ULONG nIdx = 0, nCount = rObjList.GetObjCount(); nIdx < nCount; ++nIdx )
+ for( sal_uIntPtr nIdx = 0, nCount = rObjList.GetObjCount(); nIdx < nCount; ++nIdx )
{
SdrObject* pObj = bUseZOrder ?
rObjList.GetObj( nIdx ) : rObjList.GetObjectForNavigationPosition( nIdx );
@@ -89,12 +89,12 @@ void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMod
void SdrObjListIter::ImpProcessMarkList( const SdrMarkList& rMarkList, SdrIterMode eMode )
{
- for( ULONG nIdx = 0, nCount = rMarkList.GetMarkCount(); nIdx < nCount; ++nIdx )
+ for( sal_uIntPtr nIdx = 0, nCount = rMarkList.GetMarkCount(); nIdx < nCount; ++nIdx )
if( SdrObject* pObj = rMarkList.GetMark( nIdx )->GetMarkedSdrObj() )
- ImpProcessObj( pObj, eMode, FALSE );
+ ImpProcessObj( pObj, eMode, sal_False );
}
-void SdrObjListIter::ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, BOOL bUseZOrder)
+void SdrObjListIter::ImpProcessObj(SdrObject* pObj, SdrIterMode eMode, sal_Bool bUseZOrder)
{
bool bIsGroup = pObj->IsGroupObject();
// #99190# 3D objects are no group objects, IsGroupObject()
diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx
index 2c12a7b5d06c..c4ee0a231bd6 100644
--- a/svx/source/svdraw/svdlayer.cxx
+++ b/svx/source/svdraw/svdlayer.cxx
@@ -157,7 +157,7 @@ void SetOfByte::PutValue( const com::sun::star::uno::Any & rAny )
sal_Int16 nIndex;
for( nIndex = 0; nIndex < nCount; nIndex++ )
{
- aData[nIndex] = static_cast<BYTE>(aSeq[nIndex]);
+ aData[nIndex] = static_cast<sal_uInt8>(aSeq[nIndex]);
}
for( ; nIndex < 32; nIndex++ )
@@ -196,9 +196,9 @@ void SetOfByte::QueryValue( com::sun::star::uno::Any & rAny ) const
// SdrLayer
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrLayer::SetStandardLayer(FASTBOOL bStd)
+void SdrLayer::SetStandardLayer(int bStd)
{
- nType=(UINT16)bStd;
+ nType=(sal_uInt16)bStd;
if (bStd) {
aName=ImpGetResStr(STR_StandardLayerName);
}
@@ -278,8 +278,8 @@ const SdrLayerAdmin& SdrLayerAdmin::operator=(const SdrLayerAdmin& rSrcLayerAdmi
{
ClearLayer();
pParent=rSrcLayerAdmin.pParent;
- USHORT i;
- USHORT nAnz=rSrcLayerAdmin.GetLayerCount();
+ sal_uInt16 i;
+ sal_uInt16 nAnz=rSrcLayerAdmin.GetLayerCount();
for (i=0; i<nAnz; i++) {
aLayer.Insert(new SdrLayer(*rSrcLayerAdmin.GetLayer(i)),CONTAINER_APPEND);
}
@@ -290,10 +290,10 @@ bool SdrLayerAdmin::operator==(const SdrLayerAdmin& rCmpLayerAdmin) const
{
if (pParent!=rCmpLayerAdmin.pParent ||
aLayer.Count()!=rCmpLayerAdmin.aLayer.Count() ||
- aLSets.Count()!=rCmpLayerAdmin.aLSets.Count()) return FALSE;
- FASTBOOL bOk=TRUE;
- USHORT nAnz=GetLayerCount();
- USHORT i=0;
+ aLSets.Count()!=rCmpLayerAdmin.aLSets.Count()) return sal_False;
+ int bOk=sal_True;
+ sal_uInt16 nAnz=GetLayerCount();
+ sal_uInt16 i=0;
while (bOk && i<nAnz) {
bOk=*GetLayer(i)==*rCmpLayerAdmin.GetLayer(i);
i++;
@@ -305,8 +305,8 @@ void SdrLayerAdmin::SetModel(SdrModel* pNewModel)
{
if (pNewModel!=pModel) {
pModel=pNewModel;
- USHORT nAnz=GetLayerCount();
- USHORT i;
+ sal_uInt16 nAnz=GetLayerCount();
+ sal_uInt16 i;
for (i=0; i<nAnz; i++) {
GetLayer(i)->SetModel(pNewModel);
}
@@ -322,14 +322,14 @@ void SdrLayerAdmin::Broadcast() const
}
}
-SdrLayer* SdrLayerAdmin::RemoveLayer(USHORT nPos)
+SdrLayer* SdrLayerAdmin::RemoveLayer(sal_uInt16 nPos)
{
SdrLayer* pRetLayer=(SdrLayer*)(aLayer.Remove(nPos));
Broadcast();
return pRetLayer;
}
-SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, USHORT nPos)
+SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, sal_uInt16 nPos)
{
SdrLayerID nID=GetUniqueLayerID();
SdrLayer* pLay=new SdrLayer(nID,rName);
@@ -339,7 +339,7 @@ SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, USHORT nPos)
return pLay;
}
-SdrLayer* SdrLayerAdmin::NewStandardLayer(USHORT nPos)
+SdrLayer* SdrLayerAdmin::NewStandardLayer(sal_uInt16 nPos)
{
SdrLayerID nID=GetUniqueLayerID();
SdrLayer* pLay=new SdrLayer(nID,String());
@@ -350,7 +350,7 @@ SdrLayer* SdrLayerAdmin::NewStandardLayer(USHORT nPos)
return pLay;
}
-SdrLayer* SdrLayerAdmin::MoveLayer(USHORT nPos, USHORT nNewPos)
+SdrLayer* SdrLayerAdmin::MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos)
{
SdrLayer* pLayer=(SdrLayer*)(aLayer.Remove(nPos));
if (pLayer!=NULL) {
@@ -361,9 +361,9 @@ SdrLayer* SdrLayerAdmin::MoveLayer(USHORT nPos, USHORT nNewPos)
return pLayer;
}
-void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, USHORT nNewPos)
+void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, sal_uInt16 nNewPos)
{
- ULONG nPos=aLayer.GetPos(pLayer);
+ sal_uIntPtr nPos=aLayer.GetPos(pLayer);
if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
aLayer.Remove(nPos);
aLayer.Insert(pLayer,nNewPos);
@@ -371,21 +371,21 @@ void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, USHORT nNewPos)
}
}
-USHORT SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const
+sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const
{
- ULONG nRet=SDRLAYER_NOTFOUND;
+ sal_uIntPtr nRet=SDRLAYER_NOTFOUND;
if (pLayer!=NULL) {
nRet=aLayer.GetPos(pLayer);
if (nRet==CONTAINER_ENTRY_NOTFOUND) {
nRet=SDRLAYER_NOTFOUND;
}
}
- return USHORT(nRet);
+ return sal_uInt16(nRet);
}
-const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, FASTBOOL /*bInherited*/) const
+const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, int /*bInherited*/) const
{
- UINT16 i(0);
+ sal_uInt16 i(0);
const SdrLayer* pLay = NULL;
while(i < GetLayerCount() && !pLay)
@@ -398,13 +398,13 @@ const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, FASTBOOL /*bInhe
if(!pLay && pParent)
{
- pLay = pParent->GetLayer(rName, TRUE);
+ pLay = pParent->GetLayer(rName, sal_True);
}
return pLay;
}
-SdrLayerID SdrLayerAdmin::GetLayerID(const XubString& rName, FASTBOOL bInherited) const
+SdrLayerID SdrLayerAdmin::GetLayerID(const XubString& rName, int bInherited) const
{
SdrLayerID nRet=SDRLAYER_NOTFOUND;
const SdrLayer* pLay=GetLayer(rName,bInherited);
@@ -412,9 +412,9 @@ SdrLayerID SdrLayerAdmin::GetLayerID(const XubString& rName, FASTBOOL bInherited
return nRet;
}
-const SdrLayer* SdrLayerAdmin::GetLayerPerID(USHORT nID) const
+const SdrLayer* SdrLayerAdmin::GetLayerPerID(sal_uInt16 nID) const
{
- USHORT i=0;
+ sal_uInt16 i=0;
const SdrLayer* pLay=NULL;
while (i<GetLayerCount() && pLay==NULL) {
if (nID==GetLayer(i)->GetID()) pLay=GetLayer(i);
@@ -431,7 +431,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const
{
SetOfByte aSet;
sal_Bool bDown = (pParent == NULL);
- USHORT j;
+ sal_uInt16 j;
for (j=0; j<GetLayerCount(); j++)
{
aSet.Set(GetLayer((sal_uInt16)j)->GetID());
@@ -440,7 +440,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const
if (!bDown)
{
i=254;
- while (i && aSet.IsSet(BYTE(i)))
+ while (i && aSet.IsSet(sal_uInt8(i)))
--i;
if (i == 0)
i=254;
@@ -448,7 +448,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const
else
{
i=0;
- while (i<=254 && aSet.IsSet(BYTE(i)))
+ while (i<=254 && aSet.IsSet(sal_uInt8(i)))
i++;
if (i>254)
i=0;
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index 7718451ab945..bf6db87761f7 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -123,10 +123,10 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
eUIUnit=FUNIT_MM;
aUIScale=Fraction(1,1);
nUIUnitKomma=0;
- bUIOnlyKomma=FALSE;
+ bUIOnlyKomma=sal_False;
pLayerAdmin=NULL;
pItemPool=pPool;
- bMyPool=FALSE;
+ bMyPool=sal_False;
m_pEmbeddedHelper=_pEmbeddedHelper;
pDrawOutliner=NULL;
pHitTestOutliner=NULL;
@@ -144,21 +144,21 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
mbUndoEnabled=true;
nProgressPercent=0;
nLoadVersion=0;
- bExtColorTable=FALSE;
+ bExtColorTable=sal_False;
mbChanged = sal_False;
- bInfoChanged=FALSE;
- bPagNumsDirty=FALSE;
- bMPgNumsDirty=FALSE;
- bPageNotValid=FALSE;
- bSavePortable=FALSE;
- bSaveCompressed=FALSE;
- bSaveNative=FALSE;
- bSwapGraphics=FALSE;
+ bInfoChanged=sal_False;
+ bPagNumsDirty=sal_False;
+ bMPgNumsDirty=sal_False;
+ bPageNotValid=sal_False;
+ bSavePortable=sal_False;
+ bSaveCompressed=sal_False;
+ bSaveNative=sal_False;
+ bSwapGraphics=sal_False;
nSwapGraphicsMode=SDR_SWAPGRAPHICSMODE_DEFAULT;
- bSaveOLEPreview=FALSE;
- bPasteResize=FALSE;
- bNoBitmapCaching=FALSE;
- bReadOnly=FALSE;
+ bSaveOLEPreview=sal_False;
+ bPasteResize=sal_False;
+ bNoBitmapCaching=sal_False;
+ bReadOnly=sal_False;
nStreamCompressMode=COMPRESSMODE_NONE;
nStreamNumberFormat=NUMBERFORMAT_INT_BIGENDIAN;
nDefaultTabulator=0;
@@ -169,12 +169,12 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
pGradientList=NULL;
pBitmapList=NULL;
mpNumberFormatter = NULL;
- bTransparentTextFrames=FALSE;
- bStarDrawPreviewMode = FALSE;
+ bTransparentTextFrames=sal_False;
+ bStarDrawPreviewMode = sal_False;
nStarDrawPreviewMasterPageNum = SDRPAGE_NOTFOUND;
pModelStorage = NULL;
mpForbiddenCharactersTable = NULL;
- mbModelLocked = FALSE;
+ mbModelLocked = sal_False;
mpOutlinerCache = NULL;
mbKernAsianPunctuation = sal_False;
mbAddExtLeading = sal_False;
@@ -196,7 +196,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
// OutlinerPool als SecondaryPool des SdrPool
pItemPool->SetSecondaryPool(pOutlPool);
// Merken, dass ich mir die beiden Pools selbst gemacht habe
- bMyPool=TRUE;
+ bMyPool=sal_True;
}
pItemPool->SetDefaultMetric((SfxMapUnit)eObjUnit);
@@ -217,10 +217,10 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe
// den DrawOutliner OnDemand erzeugen geht noch nicht, weil ich den Pool
// sonst nicht kriege (erst ab 302!)
pDrawOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this );
- ImpSetOutlinerDefaults(pDrawOutliner, TRUE);
+ ImpSetOutlinerDefaults(pDrawOutliner, sal_True);
pHitTestOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this );
- ImpSetOutlinerDefaults(pHitTestOutliner, TRUE);
+ ImpSetOutlinerDefaults(pHitTestOutliner, sal_True);
ImpCreateTables();
}
@@ -234,7 +234,7 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal
#endif
DBG_CTOR(SdrModel,NULL);
- ImpCtor(pPool,pPers,FALSE, (FASTBOOL)bLoadRefCounts);
+ ImpCtor(pPool,pPers,sal_False, (int)bLoadRefCounts);
}
SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal_Bool bLoadRefCounts):
@@ -247,10 +247,10 @@ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbed
#endif
DBG_CTOR(SdrModel,NULL);
- ImpCtor(pPool,pPers,FALSE, (FASTBOOL)bLoadRefCounts);
+ ImpCtor(pPool,pPers,sal_False, (int)bLoadRefCounts);
}
-SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts):
+SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, int bUseExtColorTable, sal_Bool bLoadRefCounts):
maMaPag(1024,32,32),
maPages(1024,32,32)
{
@@ -259,10 +259,10 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FAS
#endif
DBG_CTOR(SdrModel,NULL);
- ImpCtor(pPool,pPers,bUseExtColorTable, (FASTBOOL)bLoadRefCounts);
+ ImpCtor(pPool,pPers,bUseExtColorTable, (int)bLoadRefCounts);
}
-SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, FASTBOOL bUseExtColorTable, sal_Bool bLoadRefCounts):
+SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, int bUseExtColorTable, sal_Bool bLoadRefCounts):
maMaPag(1024,32,32),
maPages(1024,32,32),
aTablePath(rPath)
@@ -272,7 +272,7 @@ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbed
#endif
DBG_CTOR(SdrModel,NULL);
- ImpCtor(pPool,pPers,bUseExtColorTable, (FASTBOOL)bLoadRefCounts);
+ ImpCtor(pPool,pPers,bUseExtColorTable, (int)bLoadRefCounts);
}
SdrModel::SdrModel(const SdrModel& /*rSrcModel*/):
@@ -398,30 +398,30 @@ void SdrModel::operator=(const SdrModel& /*rSrcModel*/)
DBG_ERROR("SdrModel::operator=() ist noch nicht implementiert");
}
-FASTBOOL SdrModel::operator==(const SdrModel& /*rCmpModel*/) const
+int SdrModel::operator==(const SdrModel& /*rCmpModel*/) const
{
DBG_ERROR("SdrModel::operator==() ist noch nicht implementiert");
- return FALSE;
+ return sal_False;
}
-void SdrModel::SetSwapGraphics( FASTBOOL bSwap )
+void SdrModel::SetSwapGraphics( int bSwap )
{
bSwapGraphics = bSwap;
}
-FASTBOOL SdrModel::IsReadOnly() const
+int SdrModel::IsReadOnly() const
{
return bReadOnly;
}
-void SdrModel::SetReadOnly(FASTBOOL bYes)
+void SdrModel::SetReadOnly(int bYes)
{
bReadOnly=bYes;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrModel::SetMaxUndoActionCount(ULONG nAnz)
+void SdrModel::SetMaxUndoActionCount(sal_uIntPtr nAnz)
{
if (nAnz<1) nAnz=1;
nMaxUndoCount=nAnz;
@@ -450,9 +450,9 @@ void SdrModel::ClearUndoBuffer()
}
}
-FASTBOOL SdrModel::Undo()
+int SdrModel::Undo()
{
- FASTBOOL bRet=FALSE;
+ int bRet=sal_False;
if( mpImpl->mpUndoManager )
{
DBG_ERROR("svx::SdrModel::Undo(), method not supported with application undo manager!");
@@ -467,16 +467,16 @@ FASTBOOL SdrModel::Undo()
pDo->Undo();
if(pRedoStack==NULL)
pRedoStack=new Container(1024,16,16);
- pRedoStack->Insert(pUndoStack->Remove((ULONG)0),(ULONG)0);
+ pRedoStack->Insert(pUndoStack->Remove((sal_uIntPtr)0),(sal_uIntPtr)0);
mbUndoEnabled = bWasUndoEnabled;
}
}
return bRet;
}
-FASTBOOL SdrModel::Redo()
+int SdrModel::Redo()
{
- FASTBOOL bRet=FALSE;
+ int bRet=sal_False;
if( mpImpl->mpUndoManager )
{
DBG_ERROR("svx::SdrModel::Redo(), method not supported with application undo manager!");
@@ -491,16 +491,16 @@ FASTBOOL SdrModel::Redo()
pDo->Redo();
if(pUndoStack==NULL)
pUndoStack=new Container(1024,16,16);
- pUndoStack->Insert(pRedoStack->Remove((ULONG)0),(ULONG)0);
+ pUndoStack->Insert(pRedoStack->Remove((sal_uIntPtr)0),(sal_uIntPtr)0);
mbUndoEnabled = bWasUndoEnabled;
}
}
return bRet;
}
-FASTBOOL SdrModel::Repeat(SfxRepeatTarget& rView)
+int SdrModel::Repeat(SfxRepeatTarget& rView)
{
- FASTBOOL bRet=FALSE;
+ int bRet=sal_False;
if( mpImpl->mpUndoManager )
{
DBG_ERROR("svx::SdrModel::Redo(), method not supported with application undo manager!");
@@ -513,7 +513,7 @@ FASTBOOL SdrModel::Repeat(SfxRepeatTarget& rView)
if(pDo->CanRepeat(rView))
{
pDo->Repeat(rView);
- bRet=TRUE;
+ bRet=sal_True;
}
}
}
@@ -533,7 +533,7 @@ void SdrModel::ImpPostUndoAction(SdrUndoAction* pUndo)
{
if (pUndoStack==NULL)
pUndoStack=new Container(1024,16,16);
- pUndoStack->Insert(pUndo,(ULONG)0);
+ pUndoStack->Insert(pUndo,(sal_uIntPtr)0);
while (pUndoStack->Count()>nMaxUndoCount)
{
delete (SfxUndoAction*)pUndoStack->Remove(pUndoStack->Count()-1);
@@ -782,7 +782,7 @@ void SdrModel::ClearModel(sal_Bool bCalledFromDestructor)
sal_Int32 nAnz=GetPageCount();
for (i=nAnz-1; i>=0; i--)
{
- DeletePage( (USHORT)i );
+ DeletePage( (sal_uInt16)i );
}
maPages.Clear();
// #109538#
@@ -792,7 +792,7 @@ void SdrModel::ClearModel(sal_Bool bCalledFromDestructor)
nAnz=GetMasterPageCount();
for(i=nAnz-1; i>=0; i--)
{
- DeleteMasterPage( (USHORT)i );
+ DeleteMasterPage( (sal_uInt16)i );
}
maMaPag.Clear();
// #109538#
@@ -808,7 +808,7 @@ SdrModel* SdrModel::AllocModel() const
return pModel;
}
-SdrPage* SdrModel::AllocPage(FASTBOOL bMasterPage)
+SdrPage* SdrModel::AllocPage(int bMasterPage)
{
return new SdrPage(*this,bMasterPage);
}
@@ -820,9 +820,9 @@ void SdrModel::SetTextDefaults() const
void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rComplex)
{
- const USHORT nItemCnt = 3;
+ const sal_uInt16 nItemCnt = 3;
static struct {
- USHORT nFntType, nLanguage;
+ sal_uInt16 nFntType, nLanguage;
} aOutTypeArr[ nItemCnt ] = {
{ DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US },
{ DEFAULTFONT_CJK_TEXT, LANGUAGE_ENGLISH_US },
@@ -830,7 +830,7 @@ void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFo
};
SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex };
- for( USHORT n = 0; n < nItemCnt; ++n )
+ for( sal_uInt16 n = 0; n < nItemCnt; ++n )
{
Font aFnt( OutputDevice::GetDefaultFont(
aOutTypeArr[ n ].nFntType, aOutTypeArr[ n ].nLanguage,
@@ -844,7 +844,7 @@ void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFo
}
}
-void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, ULONG nDefTextHgt )
+void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt )
{
// #95114# set application-language specific dynamic pool language defaults
SvxFontItem aSvxFontItem( EE_CHAR_FONTINFO) ;
@@ -897,7 +897,7 @@ SdrOutliner& SdrModel::GetDrawOutliner(const SdrTextObj* pObj) const
boost::shared_ptr< SdrOutliner > SdrModel::CreateDrawOutliner(const SdrTextObj* pObj)
{
boost::shared_ptr< SdrOutliner > xDrawOutliner( SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this ) );
- ImpSetOutlinerDefaults(xDrawOutliner.get(), TRUE);
+ ImpSetOutlinerDefaults(xDrawOutliner.get(), sal_True);
xDrawOutliner->SetTextObj(pObj);
return xDrawOutliner;
}
@@ -910,7 +910,7 @@ const SdrTextObj* SdrModel::GetFormattingTextObj() const
return NULL;
}
-void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit )
+void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit )
{
/**************************************************************************
* Initialisierung der Outliner fuer Textausgabe und HitTest
@@ -918,7 +918,7 @@ void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit )
if( bInit )
{
pOutliner->EraseVirtualDevice();
- pOutliner->SetUpdateMode(FALSE);
+ pOutliner->SetUpdateMode(sal_False);
pOutliner->SetEditTextObjectPool(pItemPool);
pOutliner->SetDefTab(nDefaultTabulator);
}
@@ -949,8 +949,8 @@ void SdrModel::ImpReformatAllTextObjects()
if( isLocked() )
return;
- USHORT nAnz=GetMasterPageCount();
- USHORT nNum;
+ sal_uInt16 nAnz=GetMasterPageCount();
+ sal_uInt16 nNum;
for (nNum=0; nNum<nAnz; nNum++) {
GetMasterPage(nNum)->ReformatAllTextObjects();
}
@@ -991,8 +991,8 @@ SvStream* SdrModel::GetDocumentStream(SdrDocumentStreamInfo& /*rStreamInfo*/) co
// Die Vorlagenattribute der Zeichenobjekte in harte Attribute verwandeln.
void SdrModel::BurnInStyleSheetAttributes()
{
- USHORT nAnz=GetMasterPageCount();
- USHORT nNum;
+ sal_uInt16 nAnz=GetMasterPageCount();
+ sal_uInt16 nNum;
for (nNum=0; nNum<nAnz; nNum++) {
GetMasterPage(nNum)->BurnInStyleSheetAttributes();
}
@@ -1008,7 +1008,7 @@ void SdrModel::RefDeviceChanged()
ImpReformatAllTextObjects();
}
-void SdrModel::SetDefaultFontHeight(ULONG nVal)
+void SdrModel::SetDefaultFontHeight(sal_uIntPtr nVal)
{
if (nVal!=nDefTextHgt) {
nDefTextHgt=nVal;
@@ -1017,7 +1017,7 @@ void SdrModel::SetDefaultFontHeight(ULONG nVal)
}
}
-void SdrModel::SetDefaultTabulator(USHORT nVal)
+void SdrModel::SetDefaultTabulator(sal_uInt16 nVal)
{
if (nDefaultTabulator!=nVal) {
nDefaultTabulator=nVal;
@@ -1294,7 +1294,7 @@ void SdrModel::TakeUnitStr(FieldUnit eUnit, XubString& rStr)
}
}
-void SdrModel::TakeMetricStr(long nVal, XubString& rStr, FASTBOOL bNoUnitChars, sal_Int32 nNumDigits) const
+void SdrModel::TakeMetricStr(long nVal, XubString& rStr, int bNoUnitChars, sal_Int32 nNumDigits) const
{
// #i22167#
// change to double precision usage to not loose decimal places after comma
@@ -1408,9 +1408,9 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, FASTBOOL bNoUnitChars,
rStr += aUIUnitStr;
}
-void SdrModel::TakeWinkStr(long nWink, XubString& rStr, FASTBOOL bNoDegChar) const
+void SdrModel::TakeWinkStr(long nWink, XubString& rStr, int bNoDegChar) const
{
- BOOL bNeg(nWink < 0);
+ sal_Bool bNeg(nWink < 0);
if(bNeg)
nWink = -nWink;
@@ -1436,11 +1436,11 @@ void SdrModel::TakeWinkStr(long nWink, XubString& rStr, FASTBOOL bNoDegChar) con
rStr += DEGREE_CHAR;
}
-void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, FASTBOOL bNoPercentChar) const
+void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, int bNoPercentChar) const
{
- INT32 nMul(rVal.GetNumerator());
- INT32 nDiv(rVal.GetDenominator());
- BOOL bNeg(nMul < 0);
+ sal_Int32 nMul(rVal.GetNumerator());
+ sal_Int32 nDiv(rVal.GetDenominator());
+ sal_Bool bNeg(nMul < 0);
if(nDiv < 0)
bNeg = !bNeg;
@@ -1469,51 +1469,51 @@ void SdrModel::SetChanged(sal_Bool bFlg)
mbChanged = bFlg;
}
-void SdrModel::RecalcPageNums(FASTBOOL bMaster)
+void SdrModel::RecalcPageNums(int bMaster)
{
Container& rPL=*(bMaster ? &maMaPag : &maPages);
- USHORT nAnz=USHORT(rPL.Count());
- USHORT i;
+ sal_uInt16 nAnz=sal_uInt16(rPL.Count());
+ sal_uInt16 i;
for (i=0; i<nAnz; i++) {
SdrPage* pPg=(SdrPage*)(rPL.GetObject(i));
pPg->SetPageNum(i);
}
- if (bMaster) bMPgNumsDirty=FALSE;
- else bPagNumsDirty=FALSE;
+ if (bMaster) bMPgNumsDirty=sal_False;
+ else bPagNumsDirty=sal_False;
}
-void SdrModel::InsertPage(SdrPage* pPage, USHORT nPos)
+void SdrModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos)
{
- USHORT nAnz=GetPageCount();
+ sal_uInt16 nAnz=GetPageCount();
if (nPos>nAnz) nPos=nAnz;
maPages.Insert(pPage,nPos);
// #109538#
PageListChanged();
- pPage->SetInserted(TRUE);
+ pPage->SetInserted(sal_True);
pPage->SetPageNum(nPos);
pPage->SetModel(this);
- if (nPos<nAnz) bPagNumsDirty=TRUE;
+ if (nPos<nAnz) bPagNumsDirty=sal_True;
SetChanged();
SdrHint aHint(HINT_PAGEORDERCHG);
aHint.SetPage(pPage);
Broadcast(aHint);
}
-void SdrModel::DeletePage(USHORT nPgNum)
+void SdrModel::DeletePage(sal_uInt16 nPgNum)
{
SdrPage* pPg=RemovePage(nPgNum);
delete pPg;
}
-SdrPage* SdrModel::RemovePage(USHORT nPgNum)
+SdrPage* SdrModel::RemovePage(sal_uInt16 nPgNum)
{
SdrPage* pPg=(SdrPage*)maPages.Remove(nPgNum);
// #109538#
PageListChanged();
if (pPg!=NULL) {
- pPg->SetInserted(FALSE);
+ pPg->SetInserted(sal_False);
}
- bPagNumsDirty=TRUE;
+ bPagNumsDirty=sal_True;
SetChanged();
SdrHint aHint(HINT_PAGEORDERCHG);
aHint.SetPage(pPg);
@@ -1521,29 +1521,29 @@ SdrPage* SdrModel::RemovePage(USHORT nPgNum)
return pPg;
}
-void SdrModel::MovePage(USHORT nPgNum, USHORT nNewPos)
+void SdrModel::MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos)
{
SdrPage* pPg=(SdrPage*)maPages.Remove(nPgNum);
// #109538#
PageListChanged();
if (pPg!=NULL) {
- pPg->SetInserted(FALSE);
+ pPg->SetInserted(sal_False);
InsertPage(pPg,nNewPos);
}
}
-void SdrModel::InsertMasterPage(SdrPage* pPage, USHORT nPos)
+void SdrModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos)
{
- USHORT nAnz=GetMasterPageCount();
+ sal_uInt16 nAnz=GetMasterPageCount();
if (nPos>nAnz) nPos=nAnz;
maMaPag.Insert(pPage,nPos);
// #109538#
MasterPageListChanged();
- pPage->SetInserted(TRUE);
+ pPage->SetInserted(sal_True);
pPage->SetPageNum(nPos);
pPage->SetModel(this);
if (nPos<nAnz) {
- bMPgNumsDirty=TRUE;
+ bMPgNumsDirty=sal_True;
}
SetChanged();
SdrHint aHint(HINT_PAGEORDERCHG);
@@ -1551,13 +1551,13 @@ void SdrModel::InsertMasterPage(SdrPage* pPage, USHORT nPos)
Broadcast(aHint);
}
-void SdrModel::DeleteMasterPage(USHORT nPgNum)
+void SdrModel::DeleteMasterPage(sal_uInt16 nPgNum)
{
SdrPage* pPg=RemoveMasterPage(nPgNum);
if (pPg!=NULL) delete pPg;
}
-SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum)
+SdrPage* SdrModel::RemoveMasterPage(sal_uInt16 nPgNum)
{
SdrPage* pRetPg=(SdrPage*)maMaPag.Remove(nPgNum);
// #109538#
@@ -1573,10 +1573,10 @@ SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum)
GetPage(np)->TRG_ImpMasterPageRemoved(*pRetPg);
}
- pRetPg->SetInserted(FALSE);
+ pRetPg->SetInserted(sal_False);
}
- bMPgNumsDirty=TRUE;
+ bMPgNumsDirty=sal_True;
SetChanged();
SdrHint aHint(HINT_PAGEORDERCHG);
aHint.SetPage(pRetPg);
@@ -1584,18 +1584,18 @@ SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum)
return pRetPg;
}
-void SdrModel::MoveMasterPage(USHORT nPgNum, USHORT nNewPos)
+void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos)
{
SdrPage* pPg=(SdrPage*)maMaPag.Remove(nPgNum);
// #109538#
MasterPageListChanged();
if (pPg!=NULL) {
- pPg->SetInserted(FALSE);
+ pPg->SetInserted(sal_False);
maMaPag.Insert(pPg,nNewPos);
// #109538#
MasterPageListChanged();
}
- bMPgNumsDirty=TRUE;
+ bMPgNumsDirty=sal_True;
SetChanged();
SdrHint aHint(HINT_PAGEORDERCHG);
aHint.SetPage(pPg);
@@ -1604,9 +1604,9 @@ void SdrModel::MoveMasterPage(USHORT nPgNum, USHORT nNewPos)
////////////////////////////////////////////////////////////////////////////////////////////////////
-FASTBOOL SdrModel::CheckConsistence() const
+int SdrModel::CheckConsistence() const
{
- FASTBOOL bRet=TRUE;
+ int bRet=sal_True;
#ifdef DBG_UTIL
DBG_CHKTHIS(SdrModel,NULL);
#endif
@@ -1616,9 +1616,9 @@ FASTBOOL SdrModel::CheckConsistence() const
////////////////////////////////////////////////////////////////////////////////////////////////////
// #48289#
-void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
- USHORT nDestPos,
- FASTBOOL bUndo, FASTBOOL bMoveNoCopy)
+void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
+ sal_uInt16 nDestPos,
+ int bUndo, int bMoveNoCopy)
{
if( bUndo && !IsUndoEnabled() )
bUndo = false;
@@ -1626,8 +1626,8 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
if( bUndo )
BegUndo(ImpGetResStr(STR_UndoMergeModel));
- USHORT nPageAnz=GetPageCount();
- USHORT nMaxPage=nPageAnz;
+ sal_uInt16 nPageAnz=GetPageCount();
+ sal_uInt16 nMaxPage=nPageAnz;
if (nMaxPage!=0)
nMaxPage--;
@@ -1635,15 +1635,15 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
nFirstPageNum=nMaxPage;
if (nLastPageNum>nMaxPage)
nLastPageNum =nMaxPage;
- FASTBOOL bReverse=nLastPageNum<nFirstPageNum;
+ int bReverse=nLastPageNum<nFirstPageNum;
if (nDestPos>nPageAnz)
nDestPos=nPageAnz;
// Zunaechst die Zeiger der betroffenen Seiten in einem Array sichern
- USHORT nPageNum=nFirstPageNum;
- USHORT nCopyAnz=((!bReverse)?(nLastPageNum-nFirstPageNum):(nFirstPageNum-nLastPageNum))+1;
+ sal_uInt16 nPageNum=nFirstPageNum;
+ sal_uInt16 nCopyAnz=((!bReverse)?(nLastPageNum-nFirstPageNum):(nFirstPageNum-nLastPageNum))+1;
SdrPage** pPagePtrs=new SdrPage*[nCopyAnz];
- USHORT nCopyNum;
+ sal_uInt16 nCopyNum;
for(nCopyNum=0; nCopyNum<nCopyAnz; nCopyNum++)
{
pPagePtrs[nCopyNum]=GetPage(nPageNum);
@@ -1654,11 +1654,11 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
}
// Jetzt die Seiten kopieren
- USHORT nDestNum=nDestPos;
+ sal_uInt16 nDestNum=nDestPos;
for (nCopyNum=0; nCopyNum<nCopyAnz; nCopyNum++)
{
SdrPage* pPg=pPagePtrs[nCopyNum];
- USHORT nPageNum2=pPg->GetPageNum();
+ sal_uInt16 nPageNum2=pPg->GetPageNum();
if (!bMoveNoCopy)
{
const SdrPage* pPg1=GetPage(nPageNum2);
@@ -1694,10 +1694,10 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum,
}
void SdrModel::Merge(SdrModel& rSourceModel,
- USHORT nFirstPageNum, USHORT nLastPageNum,
- USHORT nDestPos,
- FASTBOOL bMergeMasterPages, FASTBOOL bAllMasterPages,
- FASTBOOL bUndo, FASTBOOL bTreadSourceAsConst)
+ sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum,
+ sal_uInt16 nDestPos,
+ int bMergeMasterPages, int bAllMasterPages,
+ int bUndo, int bTreadSourceAsConst)
{
if (&rSourceModel==this)
{ // #48289#
@@ -1711,30 +1711,30 @@ void SdrModel::Merge(SdrModel& rSourceModel,
if (bUndo)
BegUndo(ImpGetResStr(STR_UndoMergeModel));
- USHORT nSrcPageAnz=rSourceModel.GetPageCount();
- USHORT nSrcMasterPageAnz=rSourceModel.GetMasterPageCount();
- USHORT nDstMasterPageAnz=GetMasterPageCount();
- FASTBOOL bInsPages=(nFirstPageNum<nSrcPageAnz || nLastPageNum<nSrcPageAnz);
- USHORT nMaxSrcPage=nSrcPageAnz; if (nMaxSrcPage!=0) nMaxSrcPage--;
+ sal_uInt16 nSrcPageAnz=rSourceModel.GetPageCount();
+ sal_uInt16 nSrcMasterPageAnz=rSourceModel.GetMasterPageCount();
+ sal_uInt16 nDstMasterPageAnz=GetMasterPageCount();
+ int bInsPages=(nFirstPageNum<nSrcPageAnz || nLastPageNum<nSrcPageAnz);
+ sal_uInt16 nMaxSrcPage=nSrcPageAnz; if (nMaxSrcPage!=0) nMaxSrcPage--;
if (nFirstPageNum>nMaxSrcPage) nFirstPageNum=nMaxSrcPage;
if (nLastPageNum>nMaxSrcPage) nLastPageNum =nMaxSrcPage;
- FASTBOOL bReverse=nLastPageNum<nFirstPageNum;
+ int bReverse=nLastPageNum<nFirstPageNum;
- USHORT* pMasterMap=NULL;
- FASTBOOL* pMasterNeed=NULL;
- USHORT nMasterNeed=0;
+ sal_uInt16* pMasterMap=NULL;
+ int* pMasterNeed=NULL;
+ sal_uInt16 nMasterNeed=0;
if (bMergeMasterPages && nSrcMasterPageAnz!=0) {
// Feststellen, welche MasterPages aus rSrcModel benoetigt werden
- pMasterMap=new USHORT[nSrcMasterPageAnz];
- pMasterNeed=new FASTBOOL[nSrcMasterPageAnz];
- memset(pMasterMap,0xFF,nSrcMasterPageAnz*sizeof(USHORT));
+ pMasterMap=new sal_uInt16[nSrcMasterPageAnz];
+ pMasterNeed=new int[nSrcMasterPageAnz];
+ memset(pMasterMap,0xFF,nSrcMasterPageAnz*sizeof(sal_uInt16));
if (bAllMasterPages) {
- memset(pMasterNeed,TRUE,nSrcMasterPageAnz*sizeof(FASTBOOL));
+ memset(pMasterNeed,sal_True,nSrcMasterPageAnz*sizeof(int));
} else {
- memset(pMasterNeed,FALSE,nSrcMasterPageAnz*sizeof(FASTBOOL));
- USHORT nAnf= bReverse ? nLastPageNum : nFirstPageNum;
- USHORT nEnd= bReverse ? nFirstPageNum : nLastPageNum;
- for (USHORT i=nAnf; i<=nEnd; i++) {
+ memset(pMasterNeed,sal_False,nSrcMasterPageAnz*sizeof(int));
+ sal_uInt16 nAnf= bReverse ? nLastPageNum : nFirstPageNum;
+ sal_uInt16 nEnd= bReverse ? nFirstPageNum : nLastPageNum;
+ for (sal_uInt16 i=nAnf; i<=nEnd; i++) {
const SdrPage* pPg=rSourceModel.GetPage(i);
if(pPg->TRG_HasMasterPage())
{
@@ -1743,14 +1743,14 @@ void SdrModel::Merge(SdrModel& rSourceModel,
if(nMPgNum < nSrcMasterPageAnz)
{
- pMasterNeed[nMPgNum] = TRUE;
+ pMasterNeed[nMPgNum] = sal_True;
}
}
}
}
// Nun das Mapping der MasterPages bestimmen
- USHORT nAktMaPagNum=nDstMasterPageAnz;
- for (USHORT i=0; i<nSrcMasterPageAnz; i++) {
+ sal_uInt16 nAktMaPagNum=nDstMasterPageAnz;
+ for (sal_uInt16 i=0; i<nSrcMasterPageAnz; i++) {
if (pMasterNeed[i]) {
pMasterMap[i]=nAktMaPagNum;
nAktMaPagNum++;
@@ -1761,7 +1761,7 @@ void SdrModel::Merge(SdrModel& rSourceModel,
// rueberholen der Masterpages
if (pMasterMap!=NULL && pMasterNeed!=NULL && nMasterNeed!=0) {
- for (USHORT i=nSrcMasterPageAnz; i>0;) {
+ for (sal_uInt16 i=nSrcMasterPageAnz; i>0;) {
i--;
if (pMasterNeed[i]) {
SdrPage* pPg=NULL;
@@ -1778,9 +1778,9 @@ void SdrModel::Merge(SdrModel& rSourceModel,
maMaPag.Insert(pPg,nDstMasterPageAnz);
// #109538#
MasterPageListChanged();
- pPg->SetInserted(TRUE);
+ pPg->SetInserted(sal_True);
pPg->SetModel(this);
- bMPgNumsDirty=TRUE;
+ bMPgNumsDirty=sal_True;
if (bUndo) AddUndo(GetSdrUndoFactory().CreateUndoNewPage(*pPg));
} else {
DBG_ERROR("SdrModel::Merge(): MasterPage im SourceModel nicht gefunden");
@@ -1791,8 +1791,8 @@ void SdrModel::Merge(SdrModel& rSourceModel,
// rueberholen der Zeichenseiten
if (bInsPages) {
- USHORT nSourcePos=nFirstPageNum;
- USHORT nMergeCount=USHORT(Abs((long)((long)nFirstPageNum-nLastPageNum))+1);
+ sal_uInt16 nSourcePos=nFirstPageNum;
+ sal_uInt16 nMergeCount=sal_uInt16(Abs((long)((long)nFirstPageNum-nLastPageNum))+1);
if (nDestPos>GetPageCount()) nDestPos=GetPageCount();
while (nMergeCount>0) {
SdrPage* pPg=NULL;
@@ -1852,8 +1852,8 @@ void SdrModel::Merge(SdrModel& rSourceModel,
delete [] pMasterMap;
delete [] pMasterNeed;
- bMPgNumsDirty=TRUE;
- bPagNumsDirty=TRUE;
+ bMPgNumsDirty=sal_True;
+ bPagNumsDirty=sal_True;
SetChanged();
// Fehlt: Mergen und Mapping der Layer
@@ -1861,7 +1861,7 @@ void SdrModel::Merge(SdrModel& rSourceModel,
if (bUndo) EndUndo();
}
-void SdrModel::SetStarDrawPreviewMode(BOOL bPreview)
+void SdrModel::SetStarDrawPreviewMode(sal_Bool bPreview)
{
if (!bPreview && bStarDrawPreviewMode && GetPageCount())
{
@@ -1894,7 +1894,7 @@ uno::Reference< uno::XInterface > SdrModel::createUnoModel()
return xInt;
}
-void SdrModel::setLock( BOOL bLock )
+void SdrModel::setLock( sal_Bool bLock )
{
if( mbModelLocked != bLock )
{
@@ -1923,7 +1923,7 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe
while(nWhich)
{
- if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, FALSE, &pPoolItem))
+ if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, sal_False, &pPoolItem))
{
const SfxPoolItem* pItem = pPoolItem;
@@ -1989,7 +1989,7 @@ vos::ORef<SvxForbiddenCharactersTable> SdrModel::GetForbiddenCharsTable() const
return mpForbiddenCharactersTable;
}
-void SdrModel::SetCharCompressType( UINT16 nType )
+void SdrModel::SetCharCompressType( sal_uInt16 nType )
{
if( nType != mnCharCompressType )
{
@@ -2024,26 +2024,26 @@ void SdrModel::ReformatAllTextObjects()
ImpReformatAllTextObjects();
}
-FASTBOOL SdrModel::HasTransparentObjects( BOOL bCheckForAlphaChannel ) const
+int SdrModel::HasTransparentObjects( sal_Bool bCheckForAlphaChannel ) const
{
- FASTBOOL bRet = FALSE;
- USHORT n, nCount;
+ int bRet = sal_False;
+ sal_uInt16 n, nCount;
for( n = 0, nCount = GetMasterPageCount(); ( n < nCount ) && !bRet; n++ )
if( GetMasterPage( n )->HasTransparentObjects( bCheckForAlphaChannel ) )
- bRet = TRUE;
+ bRet = sal_True;
if( !bRet )
{
for( n = 0, nCount = GetPageCount(); ( n < nCount ) && !bRet; n++ )
if( GetPage( n )->HasTransparentObjects( bCheckForAlphaChannel ) )
- bRet = TRUE;
+ bRet = sal_True;
}
return bRet;
}
-SdrOutliner* SdrModel::createOutliner( USHORT nOutlinerMode )
+SdrOutliner* SdrModel::createOutliner( sal_uInt16 nOutlinerMode )
{
if( NULL == mpOutlinerCache )
mpOutlinerCache = new SdrOutlinerCache(this);
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index d51ecbc53dac..f9055fedcabc 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -146,24 +146,24 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition
void SdrMarkView::ImpClearVars()
{
eDragMode=SDRDRAG_MOVE;
- //HMHbHdlShown=FALSE;
- bRefHdlShownOnly=FALSE;
+ //HMHbHdlShown=sal_False;
+ bRefHdlShownOnly=sal_False;
eEditMode=SDREDITMODE_EDIT;
eEditMode0=SDREDITMODE_EDIT;
- bDesignMode=FALSE;
+ bDesignMode=sal_False;
pMarkedObj=NULL;
pMarkedPV=NULL;
- bForceFrameHandles=FALSE;
- bPlusHdlAlways=FALSE;
+ bForceFrameHandles=sal_False;
+ bPlusHdlAlways=sal_False;
nFrameHandlesLimit=50;
- bInsPolyPoint=FALSE;
+ bInsPolyPoint=sal_False;
mnInsPointNum = 0L;
- bMarkedObjRectDirty=FALSE;
- bMarkedPointsRectsDirty=FALSE;
+ bMarkedObjRectDirty=sal_False;
+ bMarkedPointsRectsDirty=sal_False;
mbMarkHandlesHidden = false;
- bMrkPntDirty=FALSE;
- bMarkHdlWhenTextEdit=FALSE;
- bMarkableObjCountDirty=FALSE; // noch nicht implementiert
+ bMrkPntDirty=sal_False;
+ bMarkHdlWhenTextEdit=sal_False;
+ bMarkableObjCountDirty=sal_False; // noch nicht implementiert
nMarkableObjCount=0; // noch nicht implementiert
// #114409#-3 Migrate selections
@@ -202,13 +202,13 @@ void __EXPORT SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED)
{
- bMarkedObjRectDirty=TRUE;
- bMarkedPointsRectsDirty=TRUE;
+ bMarkedObjRectDirty=sal_True;
+ bMarkedPointsRectsDirty=sal_True;
}
/* removed for now since this breaks existing code who iterates over the mark list and sequentially replaces objects
if( eKind==HINT_OBJREMOVED && IsObjMarked( const_cast<SdrObject*>(pSdrHint->GetObject()) ) )
{
- MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), TRUE );
+ MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), sal_True );
}
*/
}
@@ -219,14 +219,14 @@ void SdrMarkView::ModelHasChanged()
{
SdrPaintView::ModelHasChanged();
GetMarkedObjectListWriteAccess().SetNameDirty();
- bMarkedObjRectDirty=TRUE;
- bMarkedPointsRectsDirty=TRUE;
+ bMarkedObjRectDirty=sal_True;
+ bMarkedPointsRectsDirty=sal_True;
// Es sind beispielsweise Obj markiert und maMarkedObjectListist Sorted.
// In einer anderen View 2 wird die ObjOrder veraendert
// (z.B. MovToTop()). Dann ist Neusortieren der MarkList erforderlich.
GetMarkedObjectListWriteAccess().SetUnsorted();
SortMarkedObjects();
- bMrkPntDirty=TRUE;
+ bMrkPntDirty=sal_True;
UndirtyMrkPnt();
SdrView* pV=(SdrView*)this;
if (pV!=NULL && !pV->IsDragObj() && !pV->IsInsObjPoint()) { // an dieser Stelle habe ich ein ziemliches Problem !!!
@@ -236,7 +236,7 @@ void SdrMarkView::ModelHasChanged()
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrMarkView::IsAction() const
+sal_Bool SdrMarkView::IsAction() const
{
return SdrSnapView::IsAction() || IsMarkObj() || IsMarkPoints() || IsMarkGluePoints();
}
@@ -538,16 +538,16 @@ void SdrMarkView::BrkMarkGluePoints()
}
}
-BOOL SdrMarkView::HasMarkableObj() const
+sal_Bool SdrMarkView::HasMarkableObj() const
{
- ULONG nCount=0;
+ sal_uIntPtr nCount=0;
SdrPageView* pPV = GetSdrPageView();
if(pPV)
{
SdrObjList* pOL=pPV->GetObjList();
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG nObjNum=0; nObjNum<nObjAnz && nCount==0; nObjNum++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz && nCount==0; nObjNum++) {
SdrObject* pObj=pOL->GetObj(nObjNum);
if (IsObjMarkable(pObj,pPV)) {
nCount++;
@@ -557,16 +557,16 @@ BOOL SdrMarkView::HasMarkableObj() const
return nCount!=0;
}
-ULONG SdrMarkView::GetMarkableObjCount() const
+sal_uIntPtr SdrMarkView::GetMarkableObjCount() const
{
- ULONG nCount=0;
+ sal_uIntPtr nCount=0;
SdrPageView* pPV = GetSdrPageView();
if(pPV)
{
SdrObjList* pOL=pPV->GetObjList();
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
SdrObject* pObj=pOL->GetObj(nObjNum);
if (IsObjMarkable(pObj,pPV)) {
nCount++;
@@ -578,26 +578,26 @@ ULONG SdrMarkView::GetMarkableObjCount() const
//HMHvoid SdrMarkView::ImpShowMarkHdl(bool /*bNoRefHdl*/)
//HMH{
-//HMH bNoRefHdl=FALSE; // geht leider erstmal nicht anders
+//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders
//HMH if (!bHdlShown) {
-//HMH bRefHdlShownOnly=FALSE;
-//HMH bHdlShown=TRUE;
+//HMH bRefHdlShownOnly=sal_False;
+//HMH bHdlShown=sal_True;
//HMH }
//HMH}
//HMHvoid SdrMarkView::ShowMarkHdl(bool /*bNoRefHdl*/)
//HMH{
-//HMH bNoRefHdl=FALSE; // geht leider erstmal nicht anders
+//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders
//HMH ImpShowMarkHdl(bNoRefHdl);
//HMH}
//HMHvoid SdrMarkView::HideMarkHdl(bool /*bNoRefHdl*/)
//HMH{
-//HMH bNoRefHdl=FALSE; // geht leider erstmal nicht anders
+//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders
//HMH if (bHdlShown) {
//HMH bRefHdlShownOnly=bNoRefHdl;
-//HMH bHdlShown=FALSE;
+//HMH bHdlShown=sal_False;
//HMH }
//HMH}
@@ -619,29 +619,29 @@ void SdrMarkView::showMarkHandles()
}
}
-BOOL SdrMarkView::ImpIsFrameHandles() const
+sal_Bool SdrMarkView::ImpIsFrameHandles() const
{
- ULONG nMarkAnz=GetMarkedObjectCount();
- BOOL bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles;
- BOOL bStdDrag=eDragMode==SDRDRAG_MOVE;
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ sal_Bool bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles;
+ sal_Bool bStdDrag=eDragMode==SDRDRAG_MOVE;
if (nMarkAnz==1 && bStdDrag && bFrmHdl)
{
const SdrObject* pObj=GetMarkedObjectByIndex(0);
if (pObj->GetObjInventor()==SdrInventor)
{
- UINT16 nIdent=pObj->GetObjIdentifier();
+ sal_uInt16 nIdent=pObj->GetObjIdentifier();
if (nIdent==OBJ_LINE || nIdent==OBJ_EDGE || nIdent==OBJ_CAPTION || nIdent==OBJ_MEASURE || nIdent==OBJ_CUSTOMSHAPE || nIdent==OBJ_TABLE )
{
- bFrmHdl=FALSE;
+ bFrmHdl=sal_False;
}
}
}
if (!bStdDrag && !bFrmHdl) {
// Grundsaetzlich erstmal alle anderen Dragmodi nur mit FrameHandles
- bFrmHdl=TRUE;
+ bFrmHdl=sal_True;
if (eDragMode==SDRDRAG_ROTATE) {
// bei Rotate ObjOwn-Drag, wenn mind. 1 PolyObj
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; nMarkNum++) {
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; nMarkNum++) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrObject* pObj=pM->GetMarkedSdrObj();
bFrmHdl=!pObj->IsPolyObj();
@@ -650,7 +650,7 @@ BOOL SdrMarkView::ImpIsFrameHandles() const
}
if (!bFrmHdl) {
// FrameHandles, wenn wenigstens 1 Obj kein SpecialDrag kann
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) {
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrObject* pObj=pM->GetMarkedSdrObj();
bFrmHdl=!pObj->hasSpecialDrag();
@@ -690,9 +690,9 @@ void SdrMarkView::SetMarkHandles()
// are handles enabled at all? Create only then
if(!areMarkHandlesHidden())
{
- ULONG nMarkAnz=GetMarkedObjectCount();
- BOOL bStdDrag=eDragMode==SDRDRAG_MOVE;
- BOOL bSingleTextObjMark=FALSE;
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ sal_Bool bStdDrag=eDragMode==SDRDRAG_MOVE;
+ sal_Bool bSingleTextObjMark=sal_False;
if (nMarkAnz==1)
{
@@ -703,13 +703,13 @@ void SdrMarkView::SetMarkHandles()
static_cast<SdrTextObj*>(pMarkedObj)->IsTextFrame();
}
- BOOL bFrmHdl=ImpIsFrameHandles();
+ sal_Bool bFrmHdl=ImpIsFrameHandles();
if (nMarkAnz>0)
{
pMarkedPV=GetSdrPageViewOfMarkedByIndex(0);
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && (pMarkedPV!=NULL || !bFrmHdl); nMarkNum++)
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && (pMarkedPV!=NULL || !bFrmHdl); nMarkNum++)
{
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -735,15 +735,15 @@ void SdrMarkView::SetMarkHandles()
{ // sonst nix gefunden
if( bSingleTextObjMark )
{
- const ULONG nSiz0=aHdl.GetHdlCount();
+ const sal_uIntPtr nSiz0=aHdl.GetHdlCount();
pMarkedObj->AddToHdlList(aHdl);
- const ULONG nSiz1=aHdl.GetHdlCount();
- for (ULONG i=nSiz0; i<nSiz1; i++)
+ const sal_uIntPtr nSiz1=aHdl.GetHdlCount();
+ for (sal_uIntPtr i=nSiz0; i<nSiz1; i++)
{
SdrHdl* pHdl=aHdl.GetHdl(i);
pHdl->SetObj(pMarkedObj);
pHdl->SetPageView(pMarkedPV);
- pHdl->SetObjHdlNum(USHORT(i-nSiz0));
+ pHdl->SetObjHdlNum(sal_uInt16(i-nSiz0));
}
}
else if( eDragMode==SDRDRAG_CROP )
@@ -759,8 +759,8 @@ void SdrMarkView::SetMarkHandles()
}
else
{
- BOOL bWdt0=aRect.Left()==aRect.Right();
- BOOL bHgt0=aRect.Top()==aRect.Bottom();
+ sal_Bool bWdt0=aRect.Left()==aRect.Right();
+ sal_Bool bHgt0=aRect.Top()==aRect.Bottom();
if (bWdt0 && bHgt0)
{
aHdl.AddHdl(new SdrHdl(aRect.TopLeft(),HDL_UPLFT));
@@ -786,27 +786,27 @@ void SdrMarkView::SetMarkHandles()
}
else
{
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++)
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++)
{
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
SdrObject* pObj=pM->GetMarkedSdrObj();
SdrPageView* pPV=pM->GetPageView();
- const ULONG nSiz0=aHdl.GetHdlCount();
+ const sal_uIntPtr nSiz0=aHdl.GetHdlCount();
pObj->AddToHdlList(aHdl);
- const ULONG nSiz1=aHdl.GetHdlCount();
+ const sal_uIntPtr nSiz1=aHdl.GetHdlCount();
bool bPoly=pObj->IsPolyObj();
const SdrUShortCont* pMrkPnts=pM->GetMarkedPoints();
- for (ULONG i=nSiz0; i<nSiz1; i++)
+ for (sal_uIntPtr i=nSiz0; i<nSiz1; i++)
{
SdrHdl* pHdl=aHdl.GetHdl(i);
pHdl->SetObj(pObj);
pHdl->SetPageView(pPV);
- pHdl->SetObjHdlNum(USHORT(i-nSiz0));
+ pHdl->SetObjHdlNum(sal_uInt16(i-nSiz0));
if (bPoly)
{
- BOOL bSelected=pMrkPnts!=NULL && pMrkPnts->Exist(USHORT(i-nSiz0));
+ sal_Bool bSelected=pMrkPnts!=NULL && pMrkPnts->Exist(sal_uInt16(i-nSiz0));
pHdl->SetSelected(bSelected);
- //BOOL bPlus=bPlusHdlAlways;
+ //sal_Bool bPlus=bPlusHdlAlways;
if (bPlusHdlAlways || bSelected)
{
sal_uInt32 nPlusAnz=pObj->GetPlusHdlCount(*pHdl);
@@ -817,7 +817,7 @@ void SdrMarkView::SetMarkHandles()
{
pPlusHdl->SetObj(pObj);
pPlusHdl->SetPageView(pPV);
- pPlusHdl->SetPlusHdl(TRUE);
+ pPlusHdl->SetPlusHdl(sal_True);
aHdl.AddHdl(pPlusHdl);
}
}
@@ -828,7 +828,7 @@ void SdrMarkView::SetMarkHandles()
} // if bFrmHdl else
// GluePoint-Handles
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++)
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++)
{
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
SdrObject* pObj=pM->GetMarkedSdrObj();
@@ -839,13 +839,13 @@ void SdrMarkView::SetMarkHandles()
const SdrGluePointList* pGPL=pObj->GetGluePointList();
if (pGPL!=NULL)
{
- //USHORT nGlueAnz=pGPL->GetCount();
- USHORT nAnz=(USHORT)pMrkGlue->GetCount();
- for (USHORT nNum=0; nNum<nAnz; nNum++)
+ //sal_uInt16 nGlueAnz=pGPL->GetCount();
+ sal_uInt16 nAnz=(sal_uInt16)pMrkGlue->GetCount();
+ for (sal_uInt16 nNum=0; nNum<nAnz; nNum++)
{
- USHORT nId=pMrkGlue->GetObject(nNum);
+ sal_uInt16 nId=pMrkGlue->GetObject(nNum);
//nNum changed to nNumGP because already used in for loop
- USHORT nNumGP=pGPL->FindGluePoint(nId);
+ sal_uInt16 nNumGP=pGPL->FindGluePoint(nId);
if (nNumGP!=SDRGLUEPOINT_NOTFOUND)
{
const SdrGluePoint& rGP=(*pGPL)[nNumGP];
@@ -946,21 +946,21 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
case SDRDRAG_TRANSPARENCE:
{
// add interactive transparence handle
- ULONG nMarkAnz = GetMarkedObjectCount();
+ sal_uIntPtr nMarkAnz = GetMarkedObjectCount();
if(nMarkAnz == 1)
{
SdrObject* pObj = GetMarkedObjectByIndex(0);
SdrModel* pModel = GetModel();
const SfxItemSet& rSet = pObj->GetMergedItemSet();
- if(SFX_ITEM_SET != rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, FALSE))
+ if(SFX_ITEM_SET != rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_False))
{
// add this item, it's not yet there
XFillFloatTransparenceItem aNewItem(
(const XFillFloatTransparenceItem&)rSet.Get(XATTR_FILLFLOATTRANSPARENCE));
XGradient aGrad = aNewItem.GetGradientValue();
- aNewItem.SetEnabled(TRUE);
+ aNewItem.SetEnabled(sal_True);
aGrad.SetStartIntens(100);
aGrad.SetEndIntens(100);
aNewItem.SetGradientValue(aGrad);
@@ -990,9 +990,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
// build handles
const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY()));
const Point aTmpPos2(basegfx::fround(aGradTransVector.maPositionB.getX()), basegfx::fround(aGradTransVector.maPositionB.getY()));
- SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, SDR_HANDLE_COLOR_SIZE_NORMAL, TRUE);
- SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, SDR_HANDLE_COLOR_SIZE_NORMAL, TRUE);
- SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, FALSE);
+ SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, SDR_HANDLE_COLOR_SIZE_NORMAL, sal_True);
+ SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, SDR_HANDLE_COLOR_SIZE_NORMAL, sal_True);
+ SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, sal_False);
DBG_ASSERT(pColHdl1 && pColHdl2 && pGradHdl, "Got not all necessary handles!!");
// link them
@@ -1011,7 +1011,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
case SDRDRAG_GRADIENT:
{
// add interactive gradient handle
- ULONG nMarkAnz = GetMarkedObjectCount();
+ sal_uIntPtr nMarkAnz = GetMarkedObjectCount();
if(nMarkAnz == 1)
{
SdrObject* pObj = GetMarkedObjectByIndex(0);
@@ -1032,9 +1032,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
// build handles
const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY()));
const Point aTmpPos2(basegfx::fround(aGradTransVector.maPositionB.getX()), basegfx::fround(aGradTransVector.maPositionB.getY()));
- SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, aHdlSize, FALSE);
- SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, aHdlSize, FALSE);
- SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, TRUE);
+ SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, aHdlSize, sal_False);
+ SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, aHdlSize, sal_False);
+ SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, sal_True);
DBG_ASSERT(pColHdl1 && pColHdl2 && pGradHdl, "Got not all necessary handles!!");
// link them
@@ -1061,7 +1061,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode)
}
/** handle mouse over effects for handles */
-BOOL SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
{
if(aHdl.GetHdlCount())
{
@@ -1073,9 +1073,9 @@ BOOL SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
}
// notify last mouse over handle that he lost the mouse
- const ULONG nHdlCount = aHdl.GetHdlCount();
+ const sal_uIntPtr nHdlCount = aHdl.GetHdlCount();
- for(ULONG nHdl = 0; nHdl < nHdlCount; nHdl++ )
+ for(sal_uIntPtr nHdl = 0; nHdl < nHdlCount; nHdl++ )
{
SdrHdl* pCurrentHdl = GetHdl(nHdl);
if( pCurrentHdl->mbMouseOver )
@@ -1215,13 +1215,13 @@ void SdrMarkView::SetRef2(const Point& rPt)
void SdrMarkView::CheckMarked()
{
- for (ULONG nm=GetMarkedObjectCount(); nm>0;) {
+ for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) {
nm--;
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
SdrPageView* pPV=pM->GetPageView();
SdrLayerID nLay=pObj->GetLayer();
- BOOL bRaus=!pObj->IsInserted(); // Obj geloescht?
+ sal_Bool bRaus=!pObj->IsInserted(); // Obj geloescht?
if (!pObj->Is3DObj()) {
bRaus=bRaus || pObj->GetPage()!=pPV->GetPage(); // Obj ploetzlich in anderer Page oder Group
}
@@ -1260,7 +1260,7 @@ void SdrMarkView::CheckMarked()
// #97995# at least reset the remembered BoundRect to prevent handle
// generation if bForceFrameHandles is TRUE.
- bMarkedObjRectDirty = TRUE;
+ bMarkedObjRectDirty = sal_True;
}
void SdrMarkView::SetMarkRects()
@@ -1274,12 +1274,12 @@ void SdrMarkView::SetMarkRects()
}
}
-void SdrMarkView::SetFrameHandles(BOOL bOn)
+void SdrMarkView::SetFrameHandles(sal_Bool bOn)
{
if (bOn!=bForceFrameHandles) {
- BOOL bOld=ImpIsFrameHandles();
+ sal_Bool bOld=ImpIsFrameHandles();
bForceFrameHandles=bOn;
- BOOL bNew=ImpIsFrameHandles();
+ sal_Bool bNew=ImpIsFrameHandles();
if (bNew!=bOld) {
AdjustMarkHdl(); //HMHTRUE);
MarkListHasChanged();
@@ -1290,12 +1290,12 @@ void SdrMarkView::SetFrameHandles(BOOL bOn)
void SdrMarkView::SetEditMode(SdrViewEditMode eMode)
{
if (eMode!=eEditMode) {
- BOOL bGlue0=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
- BOOL bEdge0=((SdrCreateView*)this)->IsEdgeTool();
+ sal_Bool bGlue0=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
+ sal_Bool bEdge0=((SdrCreateView*)this)->IsEdgeTool();
eEditMode0=eEditMode;
eEditMode=eMode;
- BOOL bGlue1=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
- BOOL bEdge1=((SdrCreateView*)this)->IsEdgeTool();
+ sal_Bool bGlue1=eEditMode==SDREDITMODE_GLUEPOINTEDIT;
+ sal_Bool bEdge1=((SdrCreateView*)this)->IsEdgeTool();
// etwas Aufwand um Flackern zu verhindern beim Umschalten
// zwischen GlueEdit und EdgeTool
if (bGlue1 && !bGlue0) ImpSetGlueVisible2(bGlue1);
@@ -1307,7 +1307,7 @@ void SdrMarkView::SetEditMode(SdrViewEditMode eMode)
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
+sal_Bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
{
if (pObj)
{
@@ -1316,65 +1316,65 @@ BOOL SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
{
// Objekt nicht selektierbar oder
// SdrUnoObj nicht im DesignMode
- return FALSE;
+ return sal_False;
}
}
- return pPV!=NULL ? pPV->IsObjMarkable(pObj) : TRUE;
+ return pPV!=NULL ? pPV->IsObjMarkable(pObj) : sal_True;
}
-BOOL SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const
+sal_Bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const
{
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
nTol=ImpGetHitTolLogic(nTol,NULL);
Point aPt(rPnt);
- for (ULONG nm=0; nm<GetMarkedObjectCount() && !bRet; nm++) {
+ for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount() && !bRet; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm);
- bRet = 0 != CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0);
+ bRet = 0 != CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0);
}
return bRet;
}
-SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, ULONG nOptions, SdrHdl* pHdl0) const
+SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, sal_uIntPtr nOptions, SdrHdl* pHdl0) const
{
if (bSomeObjChgdFlag) { // ggf. Handles neu berechnen lassen!
FlushComeBackTimer();
}
- BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
- BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0;
+ sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
+ sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0;
Point aPt(rPnt);
return aHdl.IsHdlListHit(aPt,bBack,bNext,pHdl0);
}
-BOOL SdrMarkView::MarkObj(const Point& rPnt, short nTol, BOOL bToggle, BOOL bDeep)
+sal_Bool SdrMarkView::MarkObj(const Point& rPnt, short nTol, sal_Bool bToggle, sal_Bool bDeep)
{
SdrObject* pObj;
SdrPageView* pPV;
nTol=ImpGetHitTolLogic(nTol,NULL);
- ULONG nOptions=SDRSEARCH_PICKMARKABLE;
+ sal_uIntPtr nOptions=SDRSEARCH_PICKMARKABLE;
if (bDeep) nOptions=nOptions|SDRSEARCH_DEEP;
- BOOL bRet=PickObj(rPnt,(USHORT)nTol,pObj,pPV,nOptions);
+ sal_Bool bRet=PickObj(rPnt,(sal_uInt16)nTol,pObj,pPV,nOptions);
if (bRet) {
- BOOL bUnmark=bToggle && IsObjMarked(pObj);
+ sal_Bool bUnmark=bToggle && IsObjMarked(pObj);
MarkObj(pObj,pPV,bUnmark);
}
return bRet;
}
-BOOL SdrMarkView::MarkNextObj(BOOL bPrev)
+sal_Bool SdrMarkView::MarkNextObj(sal_Bool bPrev)
{
SdrPageView* pPageView = GetSdrPageView();
if(!pPageView)
{
- return FALSE;
+ return sal_False;
}
SortMarkedObjects();
- ULONG nMarkAnz=GetMarkedObjectCount();
- ULONG nChgMarkNum = ULONG_MAX; // Nummer des zu ersetzenden MarkEntries
- ULONG nSearchObjNum = bPrev ? 0 : ULONG_MAX;
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ sal_uIntPtr nChgMarkNum = ULONG_MAX; // Nummer des zu ersetzenden MarkEntries
+ sal_uIntPtr nSearchObjNum = bPrev ? 0 : ULONG_MAX;
if (nMarkAnz!=0) {
- nChgMarkNum=bPrev ? 0 : ULONG(nMarkAnz-1);
+ nChgMarkNum=bPrev ? 0 : sal_uIntPtr(nMarkAnz-1);
SdrMark* pM=GetSdrMarkByIndex(nChgMarkNum);
OSL_ASSERT(pM!=NULL);
if (pM->GetMarkedSdrObj() != NULL)
@@ -1383,7 +1383,7 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev)
SdrObject* pMarkObj=NULL;
SdrObjList* pSearchObjList=pPageView->GetObjList();
- ULONG nObjAnz=pSearchObjList->GetObjCount();
+ sal_uIntPtr nObjAnz=pSearchObjList->GetObjCount();
if (nObjAnz!=0) {
if (nSearchObjNum>nObjAnz) nSearchObjNum=nObjAnz;
while (pMarkObj==NULL && ((!bPrev && nSearchObjNum>0) || (bPrev && nSearchObjNum<nObjAnz)))
@@ -1404,7 +1404,7 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev)
if(!pMarkObj)
{
- return FALSE;
+ return sal_False;
}
if (nChgMarkNum!=ULONG_MAX)
@@ -1412,32 +1412,32 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev)
GetMarkedObjectListWriteAccess().DeleteMark(nChgMarkNum);
}
MarkObj(pMarkObj,pPageView); // ruft auch MarkListHasChanged(), AdjustMarkHdl()
- return TRUE;
+ return sal_True;
}
-BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
+sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev)
{
SortMarkedObjects();
nTol=ImpGetHitTolLogic(nTol,NULL);
Point aPt(rPnt);
SdrMark* pTopMarkHit=NULL;
SdrMark* pBtmMarkHit=NULL;
- ULONG nTopMarkHit=0;
- ULONG nBtmMarkHit=0;
+ sal_uIntPtr nTopMarkHit=0;
+ sal_uIntPtr nBtmMarkHit=0;
// oberstes der markierten Objekte suchen, das von rPnt getroffen wird
- ULONG nMarkAnz=GetMarkedObjectCount();
- ULONG nm=0;
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ sal_uIntPtr nm=0;
for (nm=nMarkAnz; nm>0 && pTopMarkHit==NULL;) {
nm--;
SdrMark* pM=GetSdrMarkByIndex(nm);
- if(CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0))
+ if(CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0))
{
pTopMarkHit=pM;
nTopMarkHit=nm;
}
}
// Nichts gefunden, dann ganz normal ein Obj markieren.
- if (pTopMarkHit==NULL) return MarkObj(rPnt,USHORT(nTol),FALSE);
+ if (pTopMarkHit==NULL) return MarkObj(rPnt,sal_uInt16(nTol),sal_False);
SdrObject* pTopObjHit=pTopMarkHit->GetMarkedSdrObj();
SdrObjList* pObjList=pTopObjHit->GetObjList();
@@ -1447,7 +1447,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
for (nm=0; nm<nMarkAnz && pBtmMarkHit==NULL; nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrPageView* pPV2=pM->GetPageView();
- if (pPV2==pPV && CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pPV2,0,0))
+ if (pPV2==pPV && CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pPV2,0,0))
{
pBtmMarkHit=pM;
nBtmMarkHit=nm;
@@ -1455,10 +1455,10 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
}
if (pBtmMarkHit==NULL) { pBtmMarkHit=pTopMarkHit; nBtmMarkHit=nTopMarkHit; }
SdrObject* pBtmObjHit=pBtmMarkHit->GetMarkedSdrObj();
- ULONG nObjAnz=pObjList->GetObjCount();
+ sal_uIntPtr nObjAnz=pObjList->GetObjCount();
// #110988#
- //ULONG nSearchBeg=bPrev ? pBtmObjHit->GetOrdNum()+1 : pTopObjHit->GetOrdNum();
+ //sal_uIntPtr nSearchBeg=bPrev ? pBtmObjHit->GetOrdNum()+1 : pTopObjHit->GetOrdNum();
sal_uInt32 nSearchBeg;
E3dScene* pScene = NULL;
SdrObject* pObjHit = (bPrev) ? pBtmObjHit : pTopObjHit;
@@ -1489,7 +1489,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
nSearchBeg = nOrdNumTop;
}
- ULONG no=nSearchBeg;
+ sal_uIntPtr no=nSearchBeg;
SdrObject* pFndObj=NULL;
//SdrObject* pAktObj=NULL;
while (pFndObj==NULL && ((!bPrev && no>0) || (bPrev && no<nObjAnz))) {
@@ -1505,7 +1505,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
pObj = pObjList->GetObj(no);
}
- if (CheckSingleSdrObjectHit(aPt,USHORT(nTol),pObj,pPV,SDRSEARCH_TESTMARKABLE,0))
+ if (CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pObj,pPV,SDRSEARCH_TESTMARKABLE,0))
{
if (TryToFindMarkedObject(pObj)==CONTAINER_ENTRY_NOTFOUND) {
pFndObj=pObj;
@@ -1525,9 +1525,9 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev)
return pFndObj!=NULL;
}
-BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkObj(const Rectangle& rRect, sal_Bool bUnmark)
{
- BOOL bFnd=FALSE;
+ sal_Bool bFnd=sal_False;
Rectangle aR(rRect);
SdrObject* pObj;
SdrObjList* pObjList;
@@ -1538,8 +1538,8 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark)
{
pObjList=pPV->GetObjList();
Rectangle aFrm1(aR);
- ULONG nObjAnz=pObjList->GetObjCount();
- for (ULONG nO=0; nO<nObjAnz; nO++) {
+ sal_uIntPtr nObjAnz=pObjList->GetObjCount();
+ for (sal_uIntPtr nO=0; nO<nObjAnz; nO++) {
pObj=pObjList->GetObj(nO);
Rectangle aRect(pObj->GetCurrentBoundRect());
if (aFrm1.IsInside(aRect)) {
@@ -1547,14 +1547,14 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark)
if (IsObjMarkable(pObj,pPV))
{
GetMarkedObjectListWriteAccess().InsertEntry(SdrMark(pObj,pPV));
- bFnd=TRUE;
+ bFnd=sal_True;
}
} else {
- ULONG nPos=TryToFindMarkedObject(pObj);
+ sal_uIntPtr nPos=TryToFindMarkedObject(pObj);
if (nPos!=CONTAINER_ENTRY_NOTFOUND)
{
GetMarkedObjectListWriteAccess().DeleteMark(nPos);
- bFnd=TRUE;
+ bFnd=sal_True;
}
}
}
@@ -1569,7 +1569,7 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark)
return bFnd;
}
-void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL bImpNoSetMarkHdl)
+void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark, sal_Bool bImpNoSetMarkHdl)
{
if (pObj!=NULL && pPV!=NULL && IsObjMarkable(pObj, pPV)) {
BrkAction();
@@ -1579,7 +1579,7 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL
}
else
{
- ULONG nPos=TryToFindMarkedObject(pObj);
+ sal_uIntPtr nPos=TryToFindMarkedObject(pObj);
if (nPos!=CONTAINER_ENTRY_NOTFOUND)
{
GetMarkedObjectListWriteAccess().DeleteMark(nPos);
@@ -1596,20 +1596,20 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL
}
}
-BOOL SdrMarkView::IsObjMarked(SdrObject* pObj) const
+sal_Bool SdrMarkView::IsObjMarked(SdrObject* pObj) const
{
// nicht so ganz die feine Art: Da FindObject() nicht const ist
// muss ich mich hier auf non-const casten.
- ULONG nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj);
+ sal_uIntPtr nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj);
return nPos!=CONTAINER_ENTRY_NOTFOUND;
}
-USHORT SdrMarkView::GetMarkHdlSizePixel() const
+sal_uInt16 SdrMarkView::GetMarkHdlSizePixel() const
{
return aHdl.GetHdlSize()*2+1;
}
-void SdrMarkView::SetSolidMarkHdl(BOOL bOn)
+void SdrMarkView::SetSolidMarkHdl(sal_Bool bOn)
{
if (bOn!=aHdl.IsFineHdl()) {
//HMHBOOL bMerk=IsMarkHdlShown();
@@ -1619,7 +1619,7 @@ void SdrMarkView::SetSolidMarkHdl(BOOL bOn)
}
}
-void SdrMarkView::SetMarkHdlSizePixel(USHORT nSiz)
+void SdrMarkView::SetMarkHdlSizePixel(sal_uInt16 nSiz)
{
if (nSiz<3) nSiz=3;
nSiz/=2;
@@ -1632,7 +1632,7 @@ void SdrMarkView::SetMarkHdlSizePixel(USHORT nSiz)
}
#define SDRSEARCH_IMPISMASTER 0x80000000 /* MasterPage wird gerade durchsucht */
-SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const
+SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay) const
{
if(((nOptions & SDRSEARCH_IMPISMASTER) && pObj->IsNotVisibleAsMaster()) || (!pObj->IsVisible()))
{
@@ -1645,7 +1645,7 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol,
const bool bTXT(pObj->ISA(SdrTextObj) && ((SdrTextObj*)pObj)->IsTextFrame());
SdrObject* pRet=NULL;
Rectangle aRect(pObj->GetCurrentBoundRect());
- USHORT nTol2(nTol);
+ sal_uInt16 nTol2(nTol);
// double tolerance for OLE, text frames and objects in
// active text edit
@@ -1698,9 +1698,9 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol,
return pRet;
}
-SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObjList* pOL, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const
+SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const
{
- BOOL bBack=(nOptions & SDRSEARCH_BACKWARD)!=0;
+ sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD)!=0;
SdrObject* pRet=NULL;
rpRootObj=NULL;
if (pOL!=NULL)
@@ -1709,8 +1709,8 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol,
sal_Bool bRemap(pOL->GetOwnerObj() && pOL->GetOwnerObj()->ISA(E3dScene));
E3dScene* pRemapScene = (bRemap ? (E3dScene*)pOL->GetOwnerObj() : 0L);
- ULONG nObjAnz=pOL->GetObjCount();
- ULONG nObjNum=bBack ? 0 : nObjAnz;
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ sal_uIntPtr nObjNum=bBack ? 0 : nObjAnz;
while (pRet==NULL && (bBack ? nObjNum<nObjAnz : nObjNum>0)) {
if (!bBack) nObjNum--;
SdrObject* pObj;
@@ -1733,12 +1733,12 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol,
return pRet;
}
-BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions) const
+sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions) const
{
return PickObj(rPnt,nTol,rpObj,rpPV,nOptions,NULL,NULL,NULL);
}
-BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions, SdrObject** ppRootObj, ULONG* pnMarkNum, USHORT* pnPassNum) const
+sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum, sal_uInt16* pnPassNum) const
{ // Fehlt noch Pass2,Pass3
SortMarkedObjects();
if (ppRootObj!=NULL) *ppRootObj=NULL;
@@ -1746,14 +1746,14 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP
if (pnPassNum!=NULL) *pnPassNum=0;
rpObj=NULL;
rpPV=NULL;
- BOOL bWholePage=(nOptions & SDRSEARCH_WHOLEPAGE) !=0;
- BOOL bMarked=(nOptions & SDRSEARCH_MARKED) !=0;
- BOOL bMasters=!bMarked && (nOptions & SDRSEARCH_ALSOONMASTER) !=0;
- BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
+ sal_Bool bWholePage=(nOptions & SDRSEARCH_WHOLEPAGE) !=0;
+ sal_Bool bMarked=(nOptions & SDRSEARCH_MARKED) !=0;
+ sal_Bool bMasters=!bMarked && (nOptions & SDRSEARCH_ALSOONMASTER) !=0;
+ sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
#if OSL_DEBUG_LEVEL > 0
- BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0; (void)bNext; // n.i.
- BOOL bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; (void)bBoundCheckOn2ndPass;// n.i.
- BOOL bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; (void)bCheckNearestOn3rdPass;// n.i.
+ sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; (void)bNext; // n.i.
+ sal_Bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; (void)bBoundCheckOn2ndPass;// n.i.
+ sal_Bool bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; (void)bCheckNearestOn3rdPass;// n.i.
#endif
if (nTol<0) nTol=ImpGetHitTolLogic(nTol,NULL);
Point aPt(rPnt);
@@ -1766,8 +1766,8 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP
pPV=((SdrObjEditView*)this)->GetTextEditPageView();
}
if (bMarked) {
- ULONG nMrkAnz=GetMarkedObjectCount();
- ULONG nMrkNum=bBack ? 0 : nMrkAnz;
+ sal_uIntPtr nMrkAnz=GetMarkedObjectCount();
+ sal_uIntPtr nMrkNum=bBack ? 0 : nMrkAnz;
while (pHitObj==NULL && (bBack ? nMrkNum<nMrkAnz : nMrkNum>0)) {
if (!bBack) nMrkNum--;
SdrMark* pM=GetSdrMarkByIndex(nMrkNum);
@@ -1784,18 +1784,18 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP
if(pPV)
{
SdrPage* pPage=pPV->GetPage();
- USHORT nPgAnz=1;
+ sal_uInt16 nPgAnz=1;
if(bMasters && pPage->TRG_HasMasterPage())
{
nPgAnz++;
}
- BOOL bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList();
+ sal_Bool bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList();
if (bExtraPassForWholePage) nPgAnz++; // Suche erst in AktObjList, dann auf der gesamten Page
- USHORT nPgNum=bBack ? 0 : nPgAnz;
+ sal_uInt16 nPgNum=bBack ? 0 : nPgAnz;
while (pHitObj==NULL && (bBack ? nPgNum<nPgAnz : nPgNum>0)) {
- ULONG nTmpOptions=nOptions;
+ sal_uIntPtr nTmpOptions=nOptions;
if (!bBack) nPgNum--;
const SetOfByte* pMVisLay=NULL;
SdrObjList* pObjList=NULL;
@@ -1857,19 +1857,19 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP
return rpObj!=NULL;
}
-BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG* pnMarkNum, ULONG nOptions) const
+sal_Bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum, sal_uIntPtr nOptions) const
{
SortMarkedObjects();
- BOOL bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0;
- BOOL bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0;
+ sal_Bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0;
+ sal_Bool bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0;
rpObj=NULL;
rpPV=NULL;
if (pnMarkNum!=NULL) *pnMarkNum=CONTAINER_ENTRY_NOTFOUND;
Point aPt(rPnt);
- USHORT nTol=(USHORT)nHitTolLog;
- BOOL bFnd=FALSE;
- ULONG nMarkAnz=GetMarkedObjectCount();
- ULONG nMarkNum;
+ sal_uInt16 nTol=(sal_uInt16)nHitTolLog;
+ sal_Bool bFnd=sal_False;
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ sal_uIntPtr nMarkNum;
for (nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) {
nMarkNum--;
SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -1885,8 +1885,8 @@ BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie
if ((bBoundCheckOn2ndPass || bCheckNearestOn3rdPass) && !bFnd) {
SdrObject* pBestObj=NULL;
SdrPageView* pBestPV=NULL;
- ULONG nBestMarkNum=0;
- ULONG nBestDist=ULONG_MAX;
+ sal_uIntPtr nBestMarkNum=0;
+ sal_uIntPtr nBestDist=ULONG_MAX;
for (nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) {
nMarkNum--;
SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -1898,12 +1898,12 @@ BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie
aRect.Right ()+=nTol;
aRect.Bottom()+=nTol;
if (aRect.IsInside(aPt)) {
- bFnd=TRUE;
+ bFnd=sal_True;
rpObj=pObj;
rpPV=pPV;
if (pnMarkNum!=NULL) *pnMarkNum=nMarkNum;
} else if (bCheckNearestOn3rdPass) {
- ULONG nDist=0;
+ sal_uIntPtr nDist=0;
if (aPt.X()<aRect.Left()) nDist+=aRect.Left()-aPt.X();
if (aPt.X()>aRect.Right()) nDist+=aPt.X()-aRect.Right();
if (aPt.Y()<aRect.Top()) nDist+=aRect.Top()-aPt.Y();
@@ -1932,7 +1932,7 @@ SdrHitKind SdrMarkView::PickSomething(const Point& rPnt, short nTol) const
Point aPt(rPnt);
SdrObject* pObj=NULL;
SdrPageView* pPV=NULL;
- if (eRet==SDRHIT_NONE && PickObj(rPnt,USHORT(nTol),pObj,pPV,SDRSEARCH_PICKMARKABLE)) {
+ if (eRet==SDRHIT_NONE && PickObj(rPnt,sal_uInt16(nTol),pObj,pPV,SDRSEARCH_PICKMARKABLE)) {
Rectangle aRct1(aPt-Point(nTol,nTol),aPt+Point(nTol,nTol)); // HitRect fuer Toleranz
Rectangle aBR(pObj->GetCurrentBoundRect());
if (aRct1.IsInside(aBR.TopLeft())) eRet=SDRHIT_BOUNDTL;
@@ -2015,7 +2015,7 @@ void SdrMarkView::AdjustMarkHdl() //HMHBOOL bRestraintPaint)
Rectangle SdrMarkView::GetMarkedObjBoundRect() const
{
Rectangle aRect;
- for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) {
+ for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
Rectangle aR1(pO->GetCurrentBoundRect());
@@ -2028,9 +2028,9 @@ Rectangle SdrMarkView::GetMarkedObjBoundRect() const
const Rectangle& SdrMarkView::GetMarkedObjRect() const
{
if (bMarkedObjRectDirty) {
- ((SdrMarkView*)this)->bMarkedObjRectDirty=FALSE;
+ ((SdrMarkView*)this)->bMarkedObjRectDirty=sal_False;
Rectangle aRect;
- for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) {
+ for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) {
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
Rectangle aR1(pO->GetSnapRect());
@@ -2044,7 +2044,7 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrMarkView::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT nVal, USHORT nOpt) const
+void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 nVal, sal_uInt16 nOpt) const
{
rStr = ImpGetResStr(nStrCacheID);
xub_StrLen nPos = rStr.SearchAscii("%1");
@@ -2078,9 +2078,9 @@ void SdrMarkView::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USH
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrMarkView::EnterMarkedGroup()
+sal_Bool SdrMarkView::EnterMarkedGroup()
{
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
// Es wird nur die erste gefundene Gruppe (also nur in einer PageView) geentert
// Weil PageView::EnterGroup ein AdjustMarkHdl ruft.
// Das muss ich per Flag mal unterbinden vvvvvvvv
@@ -2088,7 +2088,7 @@ BOOL SdrMarkView::EnterMarkedGroup()
if(pPV)
{
- BOOL bEnter=FALSE;
+ sal_Bool bEnter=sal_False;
for (sal_uInt32 nm(GetMarkedObjectCount()); nm > 0 && !bEnter;)
{
nm--;
@@ -2097,8 +2097,8 @@ BOOL SdrMarkView::EnterMarkedGroup()
SdrObject* pObj=pM->GetMarkedSdrObj();
if (pObj->IsGroupObject()) {
if (pPV->EnterGroup(pObj)) {
- bRet=TRUE;
- bEnter=TRUE;
+ bRet=sal_True;
+ bEnter=sal_True;
}
}
}
@@ -2112,18 +2112,18 @@ BOOL SdrMarkView::EnterMarkedGroup()
void SdrMarkView::MarkListHasChanged()
{
GetMarkedObjectListWriteAccess().SetNameDirty();
- SetEdgesOfMarkedNodesDirty(); // bEdgesOfMarkedNodesDirty=TRUE;
+ SetEdgesOfMarkedNodesDirty(); // bEdgesOfMarkedNodesDirty=sal_True;
- bMarkedObjRectDirty=TRUE;
- bMarkedPointsRectsDirty=TRUE;
+ bMarkedObjRectDirty=sal_True;
+ bMarkedPointsRectsDirty=sal_True;
#ifdef DBG_UTIL
if (pItemBrowser!=NULL) pItemBrowser->SetDirty();
#endif
- BOOL bOneEdgeMarked=FALSE;
+ sal_Bool bOneEdgeMarked=sal_False;
if (GetMarkedObjectCount()==1) {
const SdrObject* pObj=GetMarkedObjectByIndex(0);
if (pObj->GetObjInventor()==SdrInventor) {
- UINT16 nIdent=pObj->GetObjIdentifier();
+ sal_uInt16 nIdent=pObj->GetObjIdentifier();
bOneEdgeMarked=nIdent==OBJ_EDGE;
}
}
@@ -2132,17 +2132,17 @@ void SdrMarkView::MarkListHasChanged()
////////////////////////////////////////////////////////////////////////////////////////////////////
-void SdrMarkView::SetMoveOutside(BOOL bOn)
+void SdrMarkView::SetMoveOutside(sal_Bool bOn)
{
aHdl.SetMoveOutside(bOn);
}
-BOOL SdrMarkView::IsMoveOutside() const
+sal_Bool SdrMarkView::IsMoveOutside() const
{
return aHdl.IsMoveOutside();
}
-void SdrMarkView::SetDesignMode( BOOL _bOn )
+void SdrMarkView::SetDesignMode( sal_Bool _bOn )
{
if ( bDesignMode != _bOn )
{
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index f67b35bfdf67..a1d2a2ecae9d 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -50,14 +50,14 @@
//
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrMarkView::HasMarkablePoints() const
+sal_Bool SdrMarkView::HasMarkablePoints() const
{
ForceUndirtyMrkPnt();
bool bRet=false;
if (!ImpIsFrameHandles()) {
- ULONG nMarkAnz=GetMarkedObjectCount();
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
if (nMarkAnz<=nFrameHandlesLimit) {
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrObject* pObj=pM->GetMarkedSdrObj();
bRet=pObj->IsPolyObj();
@@ -67,14 +67,14 @@ BOOL SdrMarkView::HasMarkablePoints() const
return bRet;
}
-ULONG SdrMarkView::GetMarkablePointCount() const
+sal_uIntPtr SdrMarkView::GetMarkablePointCount() const
{
ForceUndirtyMrkPnt();
- ULONG nAnz=0;
+ sal_uIntPtr nAnz=0;
if (!ImpIsFrameHandles()) {
- ULONG nMarkAnz=GetMarkedObjectCount();
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
if (nMarkAnz<=nFrameHandlesLimit) {
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrObject* pObj=pM->GetMarkedSdrObj();
if (pObj->IsPolyObj()) {
@@ -86,14 +86,14 @@ ULONG SdrMarkView::GetMarkablePointCount() const
return nAnz;
}
-BOOL SdrMarkView::HasMarkedPoints() const
+sal_Bool SdrMarkView::HasMarkedPoints() const
{
ForceUndirtyMrkPnt();
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
if (!ImpIsFrameHandles()) {
- ULONG nMarkAnz=GetMarkedObjectCount();
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
if (nMarkAnz<=nFrameHandlesLimit) {
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrUShortCont* pPts=pM->GetMarkedPoints();
bRet=pPts!=NULL && pPts->GetCount()!=0;
@@ -103,14 +103,14 @@ BOOL SdrMarkView::HasMarkedPoints() const
return bRet;
}
-ULONG SdrMarkView::GetMarkedPointCount() const
+sal_uIntPtr SdrMarkView::GetMarkedPointCount() const
{
ForceUndirtyMrkPnt();
- ULONG nAnz=0;
+ sal_uIntPtr nAnz=0;
if (!ImpIsFrameHandles()) {
- ULONG nMarkAnz=GetMarkedObjectCount();
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
if (nMarkAnz<=nFrameHandlesLimit) {
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrUShortCont* pPts=pM->GetMarkedPoints();
if (pPts!=NULL) nAnz+=pPts->GetCount();
@@ -120,33 +120,33 @@ ULONG SdrMarkView::GetMarkedPointCount() const
return nAnz;
}
-BOOL SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const
+sal_Bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const
{
return !ImpIsFrameHandles() && &rHdl!=NULL && !rHdl.IsPlusHdl() && rHdl.GetKind()!=HDL_GLUE && rHdl.GetKind()!=HDL_SMARTTAG && rHdl.GetObj()!=NULL && rHdl.GetObj()->IsPolyObj();
}
-BOOL SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark)
{
return ImpMarkPoint( pHdl, pMark, bUnmark );
}
-BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
+sal_Bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark)
{
if (pHdl==NULL || pHdl->IsPlusHdl() || pHdl->GetKind()==HDL_GLUE)
- return FALSE;
+ return sal_False;
if (pHdl->IsSelected() != bUnmark)
- return FALSE;
+ return sal_False;
SdrObject* pObj=pHdl->GetObj();
if (pObj==NULL || !pObj->IsPolyObj())
- return FALSE;
+ return sal_False;
if (pMark==NULL)
{
- ULONG nMarkNum=TryToFindMarkedObject(pObj);
+ sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj);
if (nMarkNum==CONTAINER_ENTRY_NOTFOUND)
- return FALSE;
+ return sal_False;
pMark=GetSdrMarkByIndex(nMarkNum);
}
const sal_uInt32 nHdlNum(pHdl->GetObjHdlNum());
@@ -157,14 +157,14 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
}
else
{
- ULONG nBla=pPts->GetPos((sal_uInt16)nHdlNum);
+ sal_uIntPtr nBla=pPts->GetPos((sal_uInt16)nHdlNum);
if (nBla!=CONTAINER_ENTRY_NOTFOUND)
{
pPts->Remove(nBla);
}
else
{
- return FALSE; // Fehlerfall!
+ return sal_False; // Fehlerfall!
}
}
@@ -181,14 +181,14 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
{
pPlusHdl->SetObj(pObj);
pPlusHdl->SetPageView(pMark->GetPageView());
- pPlusHdl->SetPlusHdl(TRUE);
+ pPlusHdl->SetPlusHdl(sal_True);
aHdl.AddHdl(pPlusHdl);
}
}
}
else
{
- for (ULONG i = aHdl.GetHdlCount(); i>0;)
+ for (sal_uIntPtr i = aHdl.GetHdlCount(); i>0;)
{
i--;
SdrHdl* pPlusHdl=aHdl.GetHdl(i);
@@ -204,18 +204,18 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark)
// #97016# II: Sort handles. This was missing in ImpMarkPoint all the time.
aHdl.Sort();
- return TRUE;
+ return sal_True;
}
-BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark)
{
- if (&rHdl==NULL) return FALSE;
+ if (&rHdl==NULL) return sal_False;
ForceUndirtyMrkPnt();
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
const SdrObject* pObj=rHdl.GetObj();
if (IsPointMarkable(rHdl) && rHdl.IsSelected()==bUnmark) {
- ULONG nMarkNum=TryToFindMarkedObject(pObj);
+ sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj);
if (nMarkNum!=CONTAINER_ENTRY_NOTFOUND) {
SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
SdrUShortCont* pPts=pM->ForceMarkedPoints();
@@ -223,7 +223,7 @@ BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark)
if (ImpMarkPoint(&rHdl,pM,bUnmark)) {
pPts->ForceSort();
MarkListHasChanged();
- bRet=TRUE;
+ bRet=sal_True;
}
}
}
@@ -231,18 +231,18 @@ BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark)
return bRet;
}
-BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark)
{
ForceUndirtyMrkPnt();
- BOOL bChgd=FALSE;
+ sal_Bool bChgd=sal_False;
SortMarkedObjects();
const SdrObject* pObj0=NULL;
const SdrPageView* pPV0=NULL;
SdrMark* pM=NULL;
aHdl.Sort();
//HMHBOOL bHideHdl=IsMarkHdlShown() && IsSolidMarkHdl() && !bPlusHdlAlways;
- ULONG nHdlAnz=aHdl.GetHdlCount();
- for (ULONG nHdlNum=nHdlAnz; nHdlNum>0;) {
+ sal_uIntPtr nHdlAnz=aHdl.GetHdlCount();
+ for (sal_uIntPtr nHdlNum=nHdlAnz; nHdlNum>0;) {
nHdlNum--;
SdrHdl* pHdl=aHdl.GetHdl(nHdlNum);
if (IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark) {
@@ -253,7 +253,7 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark)
SdrUShortCont* pPts=pM->GetMarkedPoints();
if (pPts!=NULL) pPts->ForceSort();
}
- ULONG nMarkNum=TryToFindMarkedObject(pObj); // damit ImpMarkPoint() nicht staendig das
+ sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj); // damit ImpMarkPoint() nicht staendig das
if (nMarkNum!=CONTAINER_ENTRY_NOTFOUND) { // Objekt in der MarkList suchen muss.
pM=GetSdrMarkByIndex(nMarkNum);
pObj0=pObj;
@@ -275,7 +275,7 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark)
//HMHsal_uInt32 nAnz=pHdl->GetObj()->GetPlusHdlCount(*pHdl);
//HMHif (nAnz!=0L) HideMarkHdl(); // #36987#
//HMH}
- if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=TRUE;
+ if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=sal_True;
}
}
}
@@ -291,10 +291,10 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark)
return bChgd;
}
-BOOL SdrMarkView::MarkNextPoint(BOOL /*bPrev*/)
+sal_Bool SdrMarkView::MarkNextPoint(sal_Bool /*bPrev*/)
{
ForceUndirtyMrkPnt();
- BOOL bChgd=FALSE;
+ sal_Bool bChgd=sal_False;
SortMarkedObjects();
// ...
if (bChgd) {
@@ -303,10 +303,10 @@ BOOL SdrMarkView::MarkNextPoint(BOOL /*bPrev*/)
return bChgd;
}
-BOOL SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, BOOL /*bPrev*/)
+sal_Bool SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/)
{
ForceUndirtyMrkPnt();
- BOOL bChgd=FALSE;
+ sal_Bool bChgd=sal_False;
SortMarkedObjects();
// ...
if (bChgd) {
@@ -322,7 +322,7 @@ const Rectangle& SdrMarkView::GetMarkedPointsRect() const
return aMarkedPointsRect;
}
-void SdrMarkView::SetPlusHandlesAlwaysVisible(BOOL bOn)
+void SdrMarkView::SetPlusHandlesAlwaysVisible(sal_Bool bOn)
{ // HandlePaint optimieren !!!!!!!
ForceUndirtyMrkPnt();
if (bOn!=bPlusHdlAlways) {
@@ -343,8 +343,8 @@ void SdrMarkView::ImpSetPointsRects() const
{
Rectangle aPnts;
Rectangle aGlue;
- ULONG nHdlAnz=aHdl.GetHdlCount();
- for (ULONG nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) {
+ sal_uIntPtr nHdlAnz=aHdl.GetHdlCount();
+ for (sal_uIntPtr nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) {
const SdrHdl* pHdl=aHdl.GetHdl(nHdlNum);
SdrHdlKind eKind=pHdl->GetKind();
if ((eKind==HDL_POLY && pHdl->IsSelected()) || eKind==HDL_GLUE) {
@@ -362,7 +362,7 @@ void SdrMarkView::ImpSetPointsRects() const
}
((SdrMarkView*)this)->aMarkedPointsRect=aPnts;
((SdrMarkView*)this)->aMarkedGluePointsRect=aGlue;
- ((SdrMarkView*)this)->bMarkedPointsRectsDirty=FALSE;
+ ((SdrMarkView*)this)->bMarkedPointsRectsDirty=sal_False;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -371,9 +371,9 @@ void SdrMarkView::ImpSetPointsRects() const
void SdrMarkView::UndirtyMrkPnt() const
{
- BOOL bChg=FALSE;
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+ sal_Bool bChg=sal_False;
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrObject* pObj=pM->GetMarkedSdrObj();
// PolyPoints
@@ -395,7 +395,7 @@ void SdrMarkView::UndirtyMrkPnt() const
if(nPtNum >= nMax)
{
pPts->Remove(nIndex);
- bChg = TRUE;
+ bChg = sal_True;
}
}
}
@@ -405,7 +405,7 @@ void SdrMarkView::UndirtyMrkPnt() const
if(pPts && pPts->GetCount())
{
pPts->Clear();
- bChg = TRUE;
+ bChg = sal_True;
}
}
}
@@ -419,37 +419,37 @@ void SdrMarkView::UndirtyMrkPnt() const
// Eintraege (Id's) die nicht in der GluePointList des
// Objekts enthalten sind
pPts->ForceSort();
- for (ULONG nIndex=pPts->GetCount(); nIndex>0;) {
+ for (sal_uIntPtr nIndex=pPts->GetCount(); nIndex>0;) {
nIndex--;
- USHORT nId=pPts->GetObject(nIndex);
+ sal_uInt16 nId=pPts->GetObject(nIndex);
if (pGPL->FindGluePoint(nId)==SDRGLUEPOINT_NOTFOUND) {
pPts->Remove(nIndex);
- bChg=TRUE;
+ bChg=sal_True;
}
}
} else {
if (pPts!=NULL && pPts->GetCount()!=0) {
pPts->Clear(); // Objekt hat keine Klebepunkte (mehr)
- bChg=TRUE;
+ bChg=sal_True;
}
}
}
}
- if (bChg) ((SdrMarkView*)this)->bMarkedPointsRectsDirty=TRUE;
- ((SdrMarkView*)this)->bMrkPntDirty=FALSE;
+ if (bChg) ((SdrMarkView*)this)->bMarkedPointsRectsDirty=sal_True;
+ ((SdrMarkView*)this)->bMrkPntDirty=sal_False;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrMarkView::HasMarkableGluePoints() const
+sal_Bool SdrMarkView::HasMarkableGluePoints() const
{
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
if (IsGluePointEditMode()) {
ForceUndirtyMrkPnt();
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrGluePointList* pGPL=pObj->GetGluePointList();
@@ -461,7 +461,7 @@ BOOL SdrMarkView::HasMarkableGluePoints() const
{
if((*pGPL)[a].IsUserDefined())
{
- bRet = TRUE;
+ bRet = sal_True;
}
}
}
@@ -470,13 +470,13 @@ BOOL SdrMarkView::HasMarkableGluePoints() const
return bRet;
}
-ULONG SdrMarkView::GetMarkableGluePointCount() const
+sal_uIntPtr SdrMarkView::GetMarkableGluePointCount() const
{
- ULONG nAnz=0;
+ sal_uIntPtr nAnz=0;
if (IsGluePointEditMode()) {
ForceUndirtyMrkPnt();
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrGluePointList* pGPL=pObj->GetGluePointList();
@@ -497,12 +497,12 @@ ULONG SdrMarkView::GetMarkableGluePointCount() const
return nAnz;
}
-BOOL SdrMarkView::HasMarkedGluePoints() const
+sal_Bool SdrMarkView::HasMarkedGluePoints() const
{
ForceUndirtyMrkPnt();
- BOOL bRet=FALSE;
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
+ sal_Bool bRet=sal_False;
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
bRet=pPts!=NULL && pPts->GetCount()!=0;
@@ -510,12 +510,12 @@ BOOL SdrMarkView::HasMarkedGluePoints() const
return bRet;
}
-ULONG SdrMarkView::GetMarkedGluePointCount() const
+sal_uIntPtr SdrMarkView::GetMarkedGluePointCount() const
{
ForceUndirtyMrkPnt();
- ULONG nAnz=0;
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+ sal_uIntPtr nAnz=0;
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
const SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
if (pPts!=NULL) nAnz+=pPts->GetCount();
@@ -523,14 +523,14 @@ ULONG SdrMarkView::GetMarkedGluePointCount() const
return nAnz;
}
-BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark)
{
- if (!IsGluePointEditMode() && !bUnmark) return FALSE;
+ if (!IsGluePointEditMode() && !bUnmark) return sal_False;
ForceUndirtyMrkPnt();
- BOOL bChgd=FALSE;
+ sal_Bool bChgd=sal_False;
SortMarkedObjects();
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) {
SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
const SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrGluePointList* pGPL=pObj->GetGluePointList();
@@ -538,12 +538,12 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark)
if (bUnmark && pRect==NULL) { // UnmarkAll
if (pPts!=NULL && pPts->GetCount()!=0) {
pPts->Clear();
- bChgd=TRUE;
+ bChgd=sal_True;
}
} else {
if (pGPL!=NULL && (pPts!=NULL || !bUnmark)) {
- USHORT nGPAnz=pGPL->GetCount();
- for (USHORT nGPNum=0; nGPNum<nGPAnz; nGPNum++) {
+ sal_uInt16 nGPAnz=pGPL->GetCount();
+ for (sal_uInt16 nGPNum=0; nGPNum<nGPAnz; nGPNum++) {
const SdrGluePoint& rGP=(*pGPL)[nGPNum];
// #i38892#
@@ -553,13 +553,13 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark)
if (pRect==NULL || pRect->IsInside(aPos)) {
if (pPts==NULL) pPts=pM->ForceMarkedGluePoints();
else pPts->ForceSort();
- ULONG nPos=pPts->GetPos(rGP.GetId());
+ sal_uIntPtr nPos=pPts->GetPos(rGP.GetId());
if (!bUnmark && nPos==CONTAINER_ENTRY_NOTFOUND) {
- bChgd=TRUE;
+ bChgd=sal_True;
pPts->Insert(rGP.GetId());
}
if (bUnmark && nPos!=CONTAINER_ENTRY_NOTFOUND) {
- bChgd=TRUE;
+ bChgd=sal_True;
pPts->Remove(nPos);
}
}
@@ -575,24 +575,24 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark)
return bChgd;
}
-BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rnId, SdrPageView*& rpPV, ULONG nOptions) const
+sal_Bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions) const
{
SdrObject* pObj0=rpObj;
//SdrPageView* pPV0=rpPV;
- USHORT nId0=rnId;
+ sal_uInt16 nId0=rnId;
rpObj=NULL; rpPV=NULL; rnId=0;
- if (!IsGluePointEditMode()) return FALSE;
- BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
- BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0;
+ if (!IsGluePointEditMode()) return sal_False;
+ sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0;
+ sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0;
OutputDevice* pOut=(OutputDevice*)pActualOutDev;
if (pOut==NULL) pOut=GetFirstOutputDevice(); //GetWin(0);
- if (pOut==NULL) return FALSE;
+ if (pOut==NULL) return sal_False;
SortMarkedObjects();
- ULONG nMarkAnz=GetMarkedObjectCount();
- ULONG nMarkNum=bBack ? 0 : nMarkAnz;
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ sal_uIntPtr nMarkNum=bBack ? 0 : nMarkAnz;
if (bNext) {
nMarkNum=((SdrMarkView*)this)->TryToFindMarkedObject(pObj0);
- if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return FALSE;
+ if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return sal_False;
if (!bBack) nMarkNum++;
}
while (bBack ? nMarkNum<nMarkAnz : nMarkNum>0) {
@@ -602,7 +602,7 @@ BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rn
SdrPageView* pPV=pM->GetPageView();
const SdrGluePointList* pGPL=pObj->GetGluePointList();
if (pGPL!=NULL) {
- USHORT nNum=pGPL->HitTest(rPnt,*pOut,pObj,bBack,bNext,nId0);
+ sal_uInt16 nNum=pGPL->HitTest(rPnt,*pOut,pObj,bBack,bNext,nId0);
if (nNum!=SDRGLUEPOINT_NOTFOUND)
{
// #i38892#
@@ -613,34 +613,34 @@ BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rn
rpObj=pObj;
rnId=(*pGPL)[nNum].GetId();
rpPV=pPV;
- return TRUE;
+ return sal_True;
}
}
}
- bNext=FALSE; // HitNextGluePoint nur beim ersten Obj
+ bNext=sal_False; // HitNextGluePoint nur beim ersten Obj
if (bBack) nMarkNum++;
}
- return FALSE;
+ return sal_False;
}
-BOOL SdrMarkView::MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* /*pPV*/, BOOL bUnmark)
+sal_Bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* /*pPV*/, sal_Bool bUnmark)
{
- if (!IsGluePointEditMode()) return FALSE;
+ if (!IsGluePointEditMode()) return sal_False;
ForceUndirtyMrkPnt();
- BOOL bChgd=FALSE;
+ sal_Bool bChgd=sal_False;
if (pObj!=NULL) {
- ULONG nMarkPos=TryToFindMarkedObject(pObj);
+ sal_uIntPtr nMarkPos=TryToFindMarkedObject(pObj);
if (nMarkPos!=CONTAINER_ENTRY_NOTFOUND) {
SdrMark* pM=GetSdrMarkByIndex(nMarkPos);
SdrUShortCont* pPts=bUnmark ? pM->GetMarkedGluePoints() : pM->ForceMarkedGluePoints();
if (pPts!=NULL) {
- ULONG nPointPos=pPts->GetPos(nId);
+ sal_uIntPtr nPointPos=pPts->GetPos(nId);
if (!bUnmark && nPointPos==CONTAINER_ENTRY_NOTFOUND) {
- bChgd=TRUE;
+ bChgd=sal_True;
pPts->Insert(nId);
}
if (bUnmark && nPointPos!=CONTAINER_ENTRY_NOTFOUND) {
- bChgd=TRUE;
+ bChgd=sal_True;
pPts->Remove(nPointPos);
}
}
@@ -656,11 +656,11 @@ BOOL SdrMarkView::MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPage
return bChgd;
}
-BOOL SdrMarkView::IsGluePointMarked(const SdrObject* pObj, USHORT nId) const
+sal_Bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const
{
ForceUndirtyMrkPnt();
- BOOL bRet=FALSE;
- ULONG nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting auf NonConst
+ sal_Bool bRet=sal_False;
+ sal_uIntPtr nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting auf NonConst
if (nPos!=CONTAINER_ENTRY_NOTFOUND) {
const SdrMark* pM=GetSdrMarkByIndex(nPos);
const SdrUShortCont* pPts=pM->GetMarkedGluePoints();
@@ -671,18 +671,18 @@ BOOL SdrMarkView::IsGluePointMarked(const SdrObject* pObj, USHORT nId) const
return bRet;
}
-BOOL SdrMarkView::UnmarkGluePoint(const SdrHdl& rHdl)
+sal_Bool SdrMarkView::UnmarkGluePoint(const SdrHdl& rHdl)
{
if (&rHdl!=NULL && rHdl.GetKind()==HDL_GLUE && rHdl.GetObj()!=NULL) {
- return MarkGluePoint(rHdl.GetObj(),(sal_uInt16)rHdl.GetObjHdlNum(),rHdl.GetPageView(),TRUE);
- } else return FALSE;
+ return MarkGluePoint(rHdl.GetObj(),(sal_uInt16)rHdl.GetObjHdlNum(),rHdl.GetPageView(),sal_True);
+ } else return sal_False;
}
-SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, USHORT nId) const
+SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const
{
ForceUndirtyMrkPnt();
- ULONG nHdlAnz=aHdl.GetHdlCount();
- for (ULONG nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) {
+ sal_uIntPtr nHdlAnz=aHdl.GetHdlCount();
+ for (sal_uIntPtr nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) {
SdrHdl* pHdl=aHdl.GetHdl(nHdlNum);
if (pHdl->GetObj()==pObj &&
pHdl->GetKind()==HDL_GLUE &&
@@ -691,10 +691,10 @@ SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, USHORT nId) const
return NULL;
}
-BOOL SdrMarkView::MarkNextGluePoint(BOOL /*bPrev*/)
+sal_Bool SdrMarkView::MarkNextGluePoint(sal_Bool /*bPrev*/)
{
ForceUndirtyMrkPnt();
- BOOL bChgd=FALSE;
+ sal_Bool bChgd=sal_False;
SortMarkedObjects();
// ...
if (bChgd) {
@@ -703,10 +703,10 @@ BOOL SdrMarkView::MarkNextGluePoint(BOOL /*bPrev*/)
return bChgd;
}
-BOOL SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, BOOL /*bPrev*/)
+sal_Bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/)
{
ForceUndirtyMrkPnt();
- BOOL bChgd=FALSE;
+ sal_Bool bChgd=sal_False;
SortMarkedObjects();
// ...
if (bChgd) {
diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx
index 6a8221136f7c..14ac649b53d7 100644
--- a/svx/source/svdraw/svdoashp.cxx
+++ b/svx/source/svdraw/svdoashp.cxx
@@ -632,7 +632,7 @@ SdrObjCustomShape::SdrObjCustomShape() :
fObjectRotation( 0.0 ),
mpLastShadowGeometry(0L)
{
- bTextFrame = TRUE;
+ bTextFrame = sal_True;
}
SdrObjCustomShape::~SdrObjCustomShape()
@@ -1623,17 +1623,17 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType )
void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
rInfo.bResizeFreeAllowed=fObjectRotation == 0.0;
- rInfo.bResizePropAllowed=TRUE;
- rInfo.bRotateFreeAllowed=TRUE;
- rInfo.bRotate90Allowed =TRUE;
- rInfo.bMirrorFreeAllowed=TRUE;
- rInfo.bMirror45Allowed =TRUE;
- rInfo.bMirror90Allowed =TRUE;
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
- rInfo.bShearAllowed =TRUE;
- rInfo.bEdgeRadiusAllowed=FALSE;
- rInfo.bNoContortion =TRUE;
+ rInfo.bResizePropAllowed=sal_True;
+ rInfo.bRotateFreeAllowed=sal_True;
+ rInfo.bRotate90Allowed =sal_True;
+ rInfo.bMirrorFreeAllowed=sal_True;
+ rInfo.bMirror45Allowed =sal_True;
+ rInfo.bMirror90Allowed =sal_True;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
+ rInfo.bShearAllowed =sal_True;
+ rInfo.bEdgeRadiusAllowed=sal_False;
+ rInfo.bNoContortion =sal_True;
// #i37011#
if ( mXRenderedCustomShape.is() )
@@ -1680,9 +1680,9 @@ void SdrObjCustomShape::SetModel(SdrModel* pNewModel)
mXRenderedCustomShape.clear();
}
-UINT16 SdrObjCustomShape::GetObjIdentifier() const
+sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const
{
- return UINT16(OBJ_CUSTOMSHAPE);
+ return sal_uInt16(OBJ_CUSTOMSHAPE);
}
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1972,12 +1972,12 @@ void SdrObjCustomShape::NbcMirror( const Point& rRef1, const Point& rRef2 )
InvalidateRenderGeometry();
}
-void SdrObjCustomShape::Shear( const Point& rRef, long nWink, double tn, FASTBOOL bVShear )
+void SdrObjCustomShape::Shear( const Point& rRef, long nWink, double tn, int bVShear )
{
SdrTextObj::Shear( rRef, nWink, tn, bVShear );
InvalidateRenderGeometry();
}
-void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, FASTBOOL bVShear )
+void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, int bVShear )
{
long nDrehWink = aGeo.nDrehWink;
if ( nDrehWink )
@@ -1998,9 +1998,9 @@ void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, FAST
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const
{
- INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
+ sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
// #i25616#
if(!LineIsOutsideGeometry())
@@ -2020,7 +2020,7 @@ SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(USHORT nPosNum) const
if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
aPt-=GetSnapRect().Center();
SdrGluePoint aGP(aPt);
- aGP.SetPercent(FALSE);
+ aGP.SetPercent(sal_False);
return aGP;
}
@@ -2052,7 +2052,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
for(a = 0; a < pSource->GetCount(); a++)
{
SdrGluePoint aCopy((*pSource)[a]);
- aCopy.SetUserDefined(FALSE);
+ aCopy.SetUserDefined(sal_False);
aNewList.Insert(aCopy);
}
@@ -2067,9 +2067,9 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded()
Polygon aPoly( aRect );
if( nShearWink )
{
- USHORT nPointCount=aPoly.GetSize();
- for (USHORT i=0; i<nPointCount; i++)
- ShearPoint(aPoly[i],aRect.Center(), fTan, FALSE );
+ sal_uInt16 nPointCount=aPoly.GetSize();
+ for (sal_uInt16 i=0; i<nPointCount; i++)
+ ShearPoint(aPoly[i],aRect.Center(), fTan, sal_False );
}
if ( aGeo.nDrehWink )
aPoly.Rotate( aRect.Center(), aGeo.nDrehWink / 10 );
@@ -2464,15 +2464,15 @@ void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat )
}
SetBoundRectDirty();
- bSnapRectDirty=TRUE;
+ bSnapRectDirty=sal_True;
}
-FASTBOOL SdrObjCustomShape::BegCreate( SdrDragStat& rDrag )
+int SdrObjCustomShape::BegCreate( SdrDragStat& rDrag )
{
return SdrTextObj::BegCreate( rDrag );
}
-FASTBOOL SdrObjCustomShape::MovCreate(SdrDragStat& rStat)
+int SdrObjCustomShape::MovCreate(SdrDragStat& rStat)
{
SdrView* pView = rStat.GetView(); // #i37448#
if( pView && pView->IsSolidDragging() )
@@ -2481,10 +2481,10 @@ FASTBOOL SdrObjCustomShape::MovCreate(SdrDragStat& rStat)
}
DragCreateObject( rStat );
SetRectsDirty();
- return TRUE;
+ return sal_True;
}
-FASTBOOL SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd )
+int SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd )
{
DragCreateObject( rStat );
@@ -2522,20 +2522,20 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeCreatePoly(const SdrDragStat& /*r
// in context with the SdrObjCustomShape the SdrTextAutoGrowHeightItem == true -> Resize Shape to fit text,
// the SdrTextAutoGrowWidthItem == true -> Word wrap text in Shape
-FASTBOOL SdrObjCustomShape::IsAutoGrowHeight() const
+int SdrObjCustomShape::IsAutoGrowHeight() const
{
const SfxItemSet& rSet = GetMergedItemSet();
- FASTBOOL bIsAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
+ int bIsAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
if ( bIsAutoGrowHeight && IsVerticalWriting() )
- bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == FALSE;
+ bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False;
return bIsAutoGrowHeight;
}
-FASTBOOL SdrObjCustomShape::IsAutoGrowWidth() const
+int SdrObjCustomShape::IsAutoGrowWidth() const
{
const SfxItemSet& rSet = GetMergedItemSet();
- FASTBOOL bIsAutoGrowWidth = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
+ int bIsAutoGrowWidth = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
if ( bIsAutoGrowWidth && !IsVerticalWriting() )
- bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == FALSE;
+ bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False;
return bIsAutoGrowWidth;
}
@@ -2601,12 +2601,12 @@ void SdrObjCustomShape::SetVerticalWriting( sal_Bool bVertical )
}
}
}
-FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt, FASTBOOL bWdt) const
+int SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt, int bWdt) const
{
if ( pModel && HasText() && !rR.IsEmpty() )
{
- FASTBOOL bWdtGrow=bWdt && IsAutoGrowWidth();
- FASTBOOL bHgtGrow=bHgt && IsAutoGrowHeight();
+ int bWdtGrow=bWdt && IsAutoGrowWidth();
+ int bHgtGrow=bHgt && IsAutoGrowHeight();
if ( bWdtGrow || bHgtGrow )
{
Rectangle aR0(rR);
@@ -2659,7 +2659,7 @@ FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOO
{
Outliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetPaperSize(aSiz);
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
// !!! hier sollte ich wohl auch noch mal die Optimierung mit
// bPortionInfoChecked usw einbauen
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
@@ -2696,9 +2696,9 @@ FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOO
long nWdtGrow = nWdt-(rR.Right()-rR.Left());
long nHgtGrow = nHgt-(rR.Bottom()-rR.Top());
if ( nWdtGrow == 0 )
- bWdtGrow = FALSE;
+ bWdtGrow = sal_False;
if ( nHgtGrow == 0 )
- bHgtGrow=FALSE;
+ bHgtGrow=sal_False;
if ( bWdtGrow || bHgtGrow )
{
if ( bWdtGrow )
@@ -2738,14 +2738,14 @@ FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOO
aD2-=aD1;
rR.Move(aD2.X(),aD2.Y());
}
- return TRUE;
+ return sal_True;
}
}
}
- return FALSE;
+ return sal_False;
}
-Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const FASTBOOL bHgt, const FASTBOOL bWdt )
+Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const int bHgt, const int bWdt )
{
Rectangle aReturnValue;
@@ -2775,7 +2775,7 @@ Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const FASTBOOL bHgt, const F
return aReturnValue;
}
-FASTBOOL SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt)
+int SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(int bHgt, int bWdt)
{
Rectangle aNewTextRect = ImpCalculateTextFrame( bHgt, bWdt );
sal_Bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != aRect );
@@ -2805,7 +2805,7 @@ FASTBOOL SdrObjCustomShape::NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FAST
}
return bRet;
}
-FASTBOOL SdrObjCustomShape::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt)
+int SdrObjCustomShape::AdjustTextFrameWidthAndHeight(int bHgt, int bWdt)
{
Rectangle aNewTextRect = ImpCalculateTextFrame( bHgt, bWdt );
sal_Bool bRet = !aNewTextRect.IsEmpty() && ( aNewTextRect != aRect );
@@ -2968,14 +2968,14 @@ void SdrObjCustomShape::TakeTextAnchorRect( Rectangle& rAnchorRect ) const
else
SdrTextObj::TakeTextAnchorRect( rAnchorRect );
}
-void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText,
- Rectangle* pAnchorRect, BOOL /*bLineWidth*/) const
+void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText,
+ Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/) const
{
Rectangle aAnkRect; // Rect innerhalb dem geankert wird
TakeTextAnchorRect(aAnkRect);
SdrTextVertAdjust eVAdj=GetTextVerticalAdjust();
SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust();
- ULONG nStat0=rOutliner.GetControlWord();
+ sal_uIntPtr nStat0=rOutliner.GetControlWord();
Size aNullSize;
rOutliner.SetControlWord(nStat0|EE_CNTRL_AUTOPAGESIZE);
@@ -3012,7 +3012,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
if (pPara)
{
- BOOL bHitTest = FALSE;
+ sal_Bool bHitTest = sal_False;
if( pModel )
bHitTest = &pModel->GetHitTestOutliner() == &rOutliner;
@@ -3023,7 +3023,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
if( bHitTest )
rOutliner.SetTextObj( this );
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
rOutliner.SetText(*pPara);
}
}
@@ -3034,7 +3034,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe
if (pEdtOutl && !bNoEditText && pPara)
delete pPara;
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
rOutliner.SetControlWord(nStat0);
SdrText* pText = getActiveText();
@@ -3104,7 +3104,7 @@ void SdrObjCustomShape::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject
{
SdrTextObj::NbcSetOutlinerParaObject( pTextObject );
SetBoundRectDirty();
- SetRectsDirty(TRUE);
+ SetRectsDirty(sal_True);
InvalidateRenderGeometry();
}
@@ -3148,7 +3148,7 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeContour() const
return basegfx::B2DPolyPolygon();
}
-SdrObject* SdrObjCustomShape::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrObjCustomShape::DoConvertToPolyObj(sal_Bool bBezier) const
{
// #i37011#
SdrObject* pRetval = 0L;
@@ -3319,7 +3319,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix,
GeoStat aGeoStat;
aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0);
aGeoStat.RecalcTan();
- Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, FALSE);
+ Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False);
}
// rotation?
@@ -3367,8 +3367,8 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba
Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() );
Point aRef2( aRef1.X(), aRef1.Y() + 1000 );
- USHORT i;
- USHORT nPntAnz=aPol.GetSize();
+ sal_uInt16 i;
+ sal_uInt16 nPntAnz=aPol.GetSize();
for (i=0; i<nPntAnz; i++)
{
MirrorPoint(aPol[i],aRef1,aRef2);
@@ -3389,8 +3389,8 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba
Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 );
Point aRef2( aRef1.X() + 1000, aRef1.Y() );
- USHORT i;
- USHORT nPntAnz=aPol.GetSize();
+ sal_uInt16 i;
+ sal_uInt16 nPntAnz=aPol.GetSize();
for (i=0; i<nPntAnz; i++)
{
MirrorPoint(aPol[i],aRef1,aRef2);
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx
index 09965a1b98a6..27c31647e881 100644
--- a/svx/source/svdraw/svdoattr.cxx
+++ b/svx/source/svdraw/svdoattr.cxx
@@ -140,7 +140,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel)
void __EXPORT SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
{
SfxSimpleHint *pSimple = PTR_CAST(SfxSimpleHint, &rHint);
- BOOL bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId());
+ sal_Bool bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId());
if(bDataChg)
{
@@ -167,12 +167,12 @@ sal_Int32 SdrAttrObj::ImpGetLineWdt() const
return nRetval;
}
-BOOL SdrAttrObj::HasFill() const
+sal_Bool SdrAttrObj::HasFill() const
{
return bClosedObj && ((XFillStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_FILLSTYLE))).GetValue()!=XFILL_NONE;
}
-BOOL SdrAttrObj::HasLine() const
+sal_Bool SdrAttrObj::HasLine() const
{
return ((XLineStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_LINESTYLE))).GetValue()!=XLINE_NONE;
}
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 0a0c35aec524..60b037782991 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -150,21 +150,21 @@ void SdrObjUserData::operator=(const SdrObjUserData& /*rData*/) // nicht impl
sal_Bool SdrObjUserData::operator==(const SdrObjUserData& /*rData*/) const // nicht implementiert
{
- return FALSE;
+ return sal_False;
}
sal_Bool SdrObjUserData::operator!=(const SdrObjUserData& /*rData*/) const // nicht implementiert
{
- return FALSE;
+ return sal_False;
}
SdrObjUserData::~SdrObjUserData()
{
}
-FASTBOOL SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const
+int SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const
{
- return FALSE;
+ return sal_False;
}
SdrObject* SdrObjUserData::CheckMacroHit(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const
@@ -206,9 +206,9 @@ void SdrObjUserData::PaintMacro(OutputDevice& rOut, const Rectangle& /*rDirtyRec
rOut.SetRasterOp(eRop);
}
-FASTBOOL SdrObjUserData::DoMacro(const SdrObjMacroHitRec& /*rRec*/, SdrObject* /*pObj*/)
+int SdrObjUserData::DoMacro(const SdrObjMacroHitRec& /*rRec*/, SdrObject* /*pObj*/)
{
- return FALSE;
+ return sal_False;
}
XubString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/, const SdrObject* /*pObj*/) const
@@ -218,8 +218,8 @@ XubString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/
void SdrObjUserDataList::Clear()
{
- USHORT nAnz=GetUserDataCount();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=GetUserDataCount();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
delete GetUserData(i);
}
aList.Clear();
@@ -231,10 +231,10 @@ DBG_NAME(SdrObjGeoData);
SdrObjGeoData::SdrObjGeoData():
pGPL(NULL),
- bMovProt(FALSE),
- bSizProt(FALSE),
- bNoPrint(FALSE),
- bClosedObj(FALSE),
+ bMovProt(sal_False),
+ bSizProt(sal_False),
+ bNoPrint(sal_False),
+ bClosedObj(sal_False),
mbVisible(true),
mnLayerID(0)
{
@@ -271,10 +271,10 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const
{
SdrObjPlusData* pNeuPlusData=new SdrObjPlusData;
if (pUserDataList!=NULL) {
- USHORT nAnz=pUserDataList->GetUserDataCount();
+ sal_uInt16 nAnz=pUserDataList->GetUserDataCount();
if (nAnz!=0) {
pNeuPlusData->pUserDataList=new SdrObjUserDataList;
- for (USHORT i=0; i<nAnz; i++) {
+ for (sal_uInt16 i=0; i<nAnz; i++) {
SdrObjUserData* pNeuUserData=pUserDataList->GetUserData(i)->Clone(pObj1);
if (pNeuUserData!=NULL) {
pNeuPlusData->pUserDataList->InsertUserData(pNeuUserData);
@@ -404,17 +404,17 @@ SdrObject::SdrObject()
,maWeakUnoShape()
{
DBG_CTOR(SdrObject,NULL);
- bVirtObj =FALSE;
- bSnapRectDirty =TRUE;
- bNetLock =FALSE;
- bInserted =FALSE;
- bGrouped =FALSE;
- bMovProt =FALSE;
- bSizProt =FALSE;
- bNoPrint =FALSE;
- bEmptyPresObj =FALSE;
- bNotVisibleAsMaster=FALSE;
- bClosedObj =FALSE;
+ bVirtObj =sal_False;
+ bSnapRectDirty =sal_True;
+ bNetLock =sal_False;
+ bInserted =sal_False;
+ bGrouped =sal_False;
+ bMovProt =sal_False;
+ bSizProt =sal_False;
+ bNoPrint =sal_False;
+ bEmptyPresObj =sal_False;
+ bNotVisibleAsMaster=sal_False;
+ bClosedObj =sal_False;
mbVisible = true;
// #i25616#
@@ -424,13 +424,13 @@ SdrObject::SdrObject()
mbSupportTextIndentingOnLineWidthChange = sal_False;
//#110094#-1
- //bWriterFlyFrame =FALSE;
+ //bWriterFlyFrame =sal_False;
- bNotMasterCachable=FALSE;
- bIsEdge=FALSE;
- bIs3DObj=FALSE;
- bMarkProt=FALSE;
- bIsUnoObj=FALSE;
+ bNotMasterCachable=sal_False;
+ bIsEdge=sal_False;
+ bIs3DObj=sal_False;
+ bMarkProt=sal_False;
+ bIsUnoObj=sal_False;
}
SdrObject::~SdrObject()
@@ -506,7 +506,7 @@ void SdrObject::SetRectsDirty(sal_Bool bNotMyself)
{
if (!bNotMyself) {
SetBoundRectDirty();
- bSnapRectDirty=TRUE;
+ bSnapRectDirty=sal_True;
}
if (pObjList!=NULL) {
pObjList->SetRectsDirty();
@@ -586,29 +586,29 @@ SdrItemPool* SdrObject::GetObjectItemPool() const
return &SdrObject::GetGlobalDrawObjectItemPool();
}
-UINT32 SdrObject::GetObjInventor() const
+sal_uInt32 SdrObject::GetObjInventor() const
{
return SdrInventor;
}
-UINT16 SdrObject::GetObjIdentifier() const
+sal_uInt16 SdrObject::GetObjIdentifier() const
{
- return UINT16(OBJ_NONE);
+ return sal_uInt16(OBJ_NONE);
}
void SdrObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed=FALSE;
- rInfo.bMirrorFreeAllowed=FALSE;
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
- rInfo.bShearAllowed =FALSE;
- rInfo.bEdgeRadiusAllowed=FALSE;
- rInfo.bCanConvToPath =FALSE;
- rInfo.bCanConvToPoly =FALSE;
- rInfo.bCanConvToContour = FALSE;
- rInfo.bCanConvToPathLineToArea=FALSE;
- rInfo.bCanConvToPolyLineToArea=FALSE;
+ rInfo.bRotateFreeAllowed=sal_False;
+ rInfo.bMirrorFreeAllowed=sal_False;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
+ rInfo.bShearAllowed =sal_False;
+ rInfo.bEdgeRadiusAllowed=sal_False;
+ rInfo.bCanConvToPath =sal_False;
+ rInfo.bCanConvToPoly =sal_False;
+ rInfo.bCanConvToContour = sal_False;
+ rInfo.bCanConvToPathLineToArea=sal_False;
+ rInfo.bCanConvToPolyLineToArea=sal_False;
}
SdrLayerID SdrObject::GetLayer() const
@@ -621,8 +621,8 @@ void SdrObject::getMergedHierarchyLayerSet(SetOfByte& rSet) const
rSet.Set(GetLayer());
SdrObjList* pOL=GetSubList();
if (pOL!=NULL) {
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
pOL->GetObj(nObjNum)->getMergedHierarchyLayerSet(rSet);
}
}
@@ -678,9 +678,9 @@ AutoTimer* SdrObject::ForceAutoTimer()
return pPlusData->pAutoTimer;
}
-FASTBOOL SdrObject::HasRefPoint() const
+int SdrObject::HasRefPoint() const
{
- return FALSE;
+ return sal_False;
}
Point SdrObject::GetRefPoint() const
@@ -867,7 +867,7 @@ String SdrObject::GetHTMLName() const
return String();
}
-UINT32 SdrObject::GetOrdNum() const
+sal_uInt32 SdrObject::GetOrdNum() const
{
if (pObjList!=NULL) {
if (pObjList->IsObjOrdNumsDirty()) {
@@ -1006,7 +1006,7 @@ sal_Bool SdrObject::SingleObjectPainter(OutputDevice& rOut) const
return sal_True;
}
-BOOL SdrObject::LineGeometryUsageIsNecessary() const
+sal_Bool SdrObject::LineGeometryUsageIsNecessary() const
{
XLineStyle eXLS = (XLineStyle)((const XLineStyleItem&)GetMergedItem(XATTR_LINESTYLE)).GetValue();
return (eXLS != XLINE_NONE);
@@ -1057,7 +1057,7 @@ void SdrObject::operator=(const SdrObject& rObj)
bEmptyPresObj =rObj.bEmptyPresObj;
//NotVisibleAsMaster wird nicht kopiert: nun doch! (25-07-1995, Joe)
bNotVisibleAsMaster=rObj.bNotVisibleAsMaster;
- bSnapRectDirty=TRUE; //rObj.bSnapRectDirty;
+ bSnapRectDirty=sal_True; //rObj.bSnapRectDirty;
bNotMasterCachable=rObj.bNotMasterCachable;
if (pPlusData!=NULL) { delete pPlusData; pPlusData=NULL; }
if (rObj.pPlusData!=NULL) {
@@ -1088,7 +1088,7 @@ void SdrObject::TakeObjNamePlural(XubString& rName) const
rName=ImpGetResStr(STR_ObjNamePluralNONE);
}
-void SdrObject::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT nVal) const
+void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 nVal) const
{
rStr = ImpGetResStr(nStrCacheID);
@@ -1115,7 +1115,7 @@ void SdrObject::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHOR
}
}
-XubString SdrObject::GetWinkStr(long nWink, FASTBOOL bNoDegChar) const
+XubString SdrObject::GetWinkStr(long nWink, int bNoDegChar) const
{
XubString aStr;
if (pModel!=NULL) {
@@ -1124,7 +1124,7 @@ XubString SdrObject::GetWinkStr(long nWink, FASTBOOL bNoDegChar) const
return aStr;
}
-XubString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/, FASTBOOL bNoUnitChars) const
+XubString SdrObject::GetMetrStr(long nVal, MapUnit /*eWantMap*/, int bNoUnitChars) const
{
XubString aStr;
if (pModel!=NULL) {
@@ -1168,17 +1168,17 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
{
// create connections if connector, will be cleaned up when
// deleting the connector again
- SdrObject* pLeft = pEdgeObj->GetConnectedNode(TRUE);
- SdrObject* pRight = pEdgeObj->GetConnectedNode(FALSE);
+ SdrObject* pLeft = pEdgeObj->GetConnectedNode(sal_True);
+ SdrObject* pRight = pEdgeObj->GetConnectedNode(sal_False);
if(pLeft)
{
- pClone->ConnectToNode(TRUE, pLeft);
+ pClone->ConnectToNode(sal_True, pLeft);
}
if(pRight)
{
- pClone->ConnectToNode(FALSE, pRight);
+ pClone->ConnectToNode(sal_False, pRight);
}
}
@@ -1279,14 +1279,14 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const
Rectangle aRect(aTmpRect);
const SdrHdl* pHdl=rDrag.GetHdl();
SdrHdlKind eHdl=pHdl==NULL ? HDL_MOVE : pHdl->GetKind();
- FASTBOOL bEcke=(eHdl==HDL_UPLFT || eHdl==HDL_UPRGT || eHdl==HDL_LWLFT || eHdl==HDL_LWRGT);
- FASTBOOL bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho();
- FASTBOOL bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho();
+ int bEcke=(eHdl==HDL_UPLFT || eHdl==HDL_UPRGT || eHdl==HDL_LWLFT || eHdl==HDL_LWRGT);
+ int bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho();
+ int bBigOrtho=bEcke && bOrtho && rDrag.GetView()->IsBigOrtho();
Point aPos(rDrag.GetNow());
- FASTBOOL bLft=(eHdl==HDL_UPLFT || eHdl==HDL_LEFT || eHdl==HDL_LWLFT);
- FASTBOOL bRgt=(eHdl==HDL_UPRGT || eHdl==HDL_RIGHT || eHdl==HDL_LWRGT);
- FASTBOOL bTop=(eHdl==HDL_UPRGT || eHdl==HDL_UPPER || eHdl==HDL_UPLFT);
- FASTBOOL bBtm=(eHdl==HDL_LWRGT || eHdl==HDL_LOWER || eHdl==HDL_LWLFT);
+ int bLft=(eHdl==HDL_UPLFT || eHdl==HDL_LEFT || eHdl==HDL_LWLFT);
+ int bRgt=(eHdl==HDL_UPRGT || eHdl==HDL_RIGHT || eHdl==HDL_LWRGT);
+ int bTop=(eHdl==HDL_UPRGT || eHdl==HDL_UPPER || eHdl==HDL_UPLFT);
+ int bBtm=(eHdl==HDL_LWRGT || eHdl==HDL_LOWER || eHdl==HDL_LWLFT);
if (bLft) aTmpRect.Left() =aPos.X();
if (bRgt) aTmpRect.Right() =aPos.X();
if (bTop) aTmpRect.Top() =aPos.Y();
@@ -1298,8 +1298,8 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const
long nYMul=aTmpRect.Bottom()-aTmpRect.Top();
long nXDiv=nWdt0;
long nYDiv=nHgt0;
- FASTBOOL bXNeg=(nXMul<0)!=(nXDiv<0);
- FASTBOOL bYNeg=(nYMul<0)!=(nYDiv<0);
+ int bXNeg=(nXMul<0)!=(nXDiv<0);
+ int bYNeg=(nYMul<0)!=(nYDiv<0);
nXMul=Abs(nXMul);
nYMul=Abs(nYMul);
nXDiv=Abs(nXDiv);
@@ -1311,7 +1311,7 @@ Rectangle SdrObject::ImpDragCalcRect(const SdrDragStat& rDrag) const
nXDiv=aXFact.GetDenominator();
nYDiv=aYFact.GetDenominator();
if (bEcke) { // Eckpunkthandles
- FASTBOOL bUseX=(aXFact<aYFact) != bBigOrtho;
+ int bUseX=(aXFact<aYFact) != bBigOrtho;
if (bUseX) {
long nNeed=long(BigInt(nHgt0)*BigInt(nXMul)/BigInt(nXDiv));
if (bYNeg) nNeed=-nNeed;
@@ -1401,17 +1401,17 @@ basegfx::B2DPolyPolygon SdrObject::getSpecialDragPoly(const SdrDragStat& /*rDrag
////////////////////////////////////////////////////////////////////////////////////////////////////
// Create
-FASTBOOL SdrObject::BegCreate(SdrDragStat& rStat)
+int SdrObject::BegCreate(SdrDragStat& rStat)
{
rStat.SetOrtho4Possible();
Rectangle aRect1(rStat.GetStart(), rStat.GetNow());
aRect1.Justify();
rStat.SetActionRect(aRect1);
aOutRect = aRect1;
- return TRUE;
+ return sal_True;
}
-FASTBOOL SdrObject::MovCreate(SdrDragStat& rStat)
+int SdrObject::MovCreate(SdrDragStat& rStat)
{
rStat.TakeCreateRect(aOutRect);
rStat.SetActionRect(aOutRect);
@@ -1423,12 +1423,12 @@ FASTBOOL SdrObject::MovCreate(SdrDragStat& rStat)
// cause no further prolems
//
// SetBoundRectDirty();
- // bSnapRectDirty=TRUE;
+ // bSnapRectDirty=sal_True;
- return TRUE;
+ return sal_True;
}
-FASTBOOL SdrObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+int SdrObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
rStat.TakeCreateRect(aOutRect);
aOutRect.Justify();
@@ -1444,9 +1444,9 @@ void SdrObject::BrkCreate(SdrDragStat& /*rStat*/)
{
}
-FASTBOOL SdrObject::BckCreate(SdrDragStat& /*rStat*/)
+int SdrObject::BckCreate(SdrDragStat& /*rStat*/)
{
- return FALSE;
+ return sal_False;
}
basegfx::B2DPolyPolygon SdrObject::TakeCreatePoly(const SdrDragStat& rDrag) const
@@ -1475,8 +1475,8 @@ void SdrObject::NbcMove(const Size& rSiz)
void SdrObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
- FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
- FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
+ int bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
+ int bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
if (bXMirr || bYMirr) {
Point aRef1(GetSnapRect().Center());
if (bXMirr) {
@@ -1496,7 +1496,7 @@ void SdrObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti
void SdrObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
{
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
aOutRect.Move(-rRef.X(),-rRef.Y());
Rectangle R(aOutRect);
if (sn==1.0 && cs==0.0) { // 90deg
@@ -1519,12 +1519,12 @@ void SdrObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
aOutRect.Justify(); // Sicherheitshalber
SetRectsDirty();
NbcRotateGluePoints(rRef,nWink,sn,cs);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
}
void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2)
{
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
aOutRect.Move(-rRef1.X(),-rRef1.Y());
Rectangle R(aOutRect);
long dx=rRef2.X()-rRef1.X();
@@ -1550,14 +1550,14 @@ void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2)
aOutRect.Justify(); // Sicherheitshalber
SetRectsDirty();
NbcMirrorGluePoints(rRef1,rRef2);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
}
-void SdrObject::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+void SdrObject::NbcShear(const Point& rRef, long nWink, double tn, int bVShear)
{
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
NbcShearGluePoints(rRef,nWink,tn,bVShear);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
}
void SdrObject::Move(const Size& rSiz)
@@ -1606,7 +1606,7 @@ void SdrObject::Mirror(const Point& rRef1, const Point& rRef2)
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
}
-void SdrObject::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+void SdrObject::Shear(const Point& rRef, long nWink, double tn, int bVShear)
{
if (nWink!=0) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
@@ -1720,7 +1720,7 @@ long SdrObject::GetRotateAngle() const
return 0;
}
-long SdrObject::GetShearAngle(FASTBOOL /*bVertical*/) const
+long SdrObject::GetShearAngle(int /*bVertical*/) const
{
return 0;
}
@@ -1764,14 +1764,14 @@ void SdrObject::NbcSetPoint(const Point& /*rPnt*/, sal_uInt32 /*i*/)
{
}
-FASTBOOL SdrObject::HasTextEdit() const
+int SdrObject::HasTextEdit() const
{
- return FALSE;
+ return sal_False;
}
sal_Bool SdrObject::BegTextEdit(SdrOutliner& /*rOutl*/)
{
- return FALSE;
+ return sal_False;
}
void SdrObject::EndTextEdit(SdrOutliner& /*rOutl*/)
@@ -1823,8 +1823,8 @@ void SdrObject::BurnInStyleSheetAttributes()
SdrObjUserData* SdrObject::ImpGetMacroUserData() const
{
SdrObjUserData* pData=NULL;
- USHORT nAnz=GetUserDataCount();
- for (USHORT nNum=nAnz; nNum>0 && pData==NULL;) {
+ sal_uInt16 nAnz=GetUserDataCount();
+ for (sal_uInt16 nNum=nAnz; nNum>0 && pData==NULL;) {
nNum--;
pData=GetUserData(nNum);
if (!pData->HasMacro(this)) pData=NULL;
@@ -1832,10 +1832,10 @@ SdrObjUserData* SdrObject::ImpGetMacroUserData() const
return pData;
}
-FASTBOOL SdrObject::HasMacro() const
+int SdrObject::HasMacro() const
{
SdrObjUserData* pData=ImpGetMacroUserData();
- return pData!=NULL ? pData->HasMacro(this) : FALSE;
+ return pData!=NULL ? pData->HasMacro(this) : sal_False;
}
SdrObject* SdrObject::CheckMacroHit(const SdrObjMacroHitRec& rRec) const
@@ -1891,13 +1891,13 @@ void SdrObject::PaintMacro(OutputDevice& rOut, const Rectangle& rDirtyRect, cons
}
}
-FASTBOOL SdrObject::DoMacro(const SdrObjMacroHitRec& rRec)
+int SdrObject::DoMacro(const SdrObjMacroHitRec& rRec)
{
SdrObjUserData* pData=ImpGetMacroUserData();
if (pData!=NULL) {
return pData->DoMacro(rRec,this);
}
- return FALSE;
+ return sal_False;
}
XubString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const
@@ -2060,41 +2060,41 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
Point aRef1(rSnap.Center());
Point aRef2(aRef1); aRef2.Y()++;
const SfxPoolItem *pPoolItem=NULL;
- if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,sal_True,&pPoolItem)==SFX_ITEM_SET) {
aRef1.X()=((const SdrTransformRef1XItem*)pPoolItem)->GetValue();
}
- if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,sal_True,&pPoolItem)==SFX_ITEM_SET) {
aRef1.Y()=((const SdrTransformRef1YItem*)pPoolItem)->GetValue();
}
- if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,sal_True,&pPoolItem)==SFX_ITEM_SET) {
aRef2.X()=((const SdrTransformRef2XItem*)pPoolItem)->GetValue();
}
- if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,sal_True,&pPoolItem)==SFX_ITEM_SET) {
aRef2.Y()=((const SdrTransformRef2YItem*)pPoolItem)->GetValue();
}
Rectangle aNewSnap(rSnap);
- if (rAttr.GetItemState(SDRATTR_MOVEX,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_MOVEX,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrMoveXItem*)pPoolItem)->GetValue();
aNewSnap.Move(n,0);
}
- if (rAttr.GetItemState(SDRATTR_MOVEY,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_MOVEY,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrMoveYItem*)pPoolItem)->GetValue();
aNewSnap.Move(0,n);
}
- if (rAttr.GetItemState(SDRATTR_ONEPOSITIONX,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ONEPOSITIONX,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrOnePositionXItem*)pPoolItem)->GetValue();
aNewSnap.Move(n-aNewSnap.Left(),0);
}
- if (rAttr.GetItemState(SDRATTR_ONEPOSITIONY,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ONEPOSITIONY,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrOnePositionYItem*)pPoolItem)->GetValue();
aNewSnap.Move(0,n-aNewSnap.Top());
}
- if (rAttr.GetItemState(SDRATTR_ONESIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ONESIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrOneSizeWidthItem*)pPoolItem)->GetValue();
aNewSnap.Right()=aNewSnap.Left()+n;
}
- if (rAttr.GetItemState(SDRATTR_ONESIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ONESIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrOneSizeHeightItem*)pPoolItem)->GetValue();
aNewSnap.Bottom()=aNewSnap.Top()+n;
}
@@ -2106,15 +2106,15 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
}
}
- if (rAttr.GetItemState(SDRATTR_SHEARANGLE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_SHEARANGLE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrShearAngleItem*)pPoolItem)->GetValue();
n-=GetShearAngle();
if (n!=0) {
double nTan=tan(n*nPi180);
- NbcShear(aRef1,n,nTan,FALSE);
+ NbcShear(aRef1,n,nTan,sal_False);
}
}
- if (rAttr.GetItemState(SDRATTR_ROTATEANGLE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ROTATEANGLE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrRotateAngleItem*)pPoolItem)->GetValue();
n-=GetRotateAngle();
if (n!=0) {
@@ -2123,28 +2123,28 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
NbcRotate(aRef1,n,nSin,nCos);
}
}
- if (rAttr.GetItemState(SDRATTR_ROTATEONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_ROTATEONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrRotateOneItem*)pPoolItem)->GetValue();
double nSin=sin(n*nPi180);
double nCos=cos(n*nPi180);
NbcRotate(aRef1,n,nSin,nCos);
}
- if (rAttr.GetItemState(SDRATTR_HORZSHEARONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_HORZSHEARONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrHorzShearOneItem*)pPoolItem)->GetValue();
double nTan=tan(n*nPi180);
- NbcShear(aRef1,n,nTan,FALSE);
+ NbcShear(aRef1,n,nTan,sal_False);
}
- if (rAttr.GetItemState(SDRATTR_VERTSHEARONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_VERTSHEARONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrVertShearOneItem*)pPoolItem)->GetValue();
double nTan=tan(n*nPi180);
- NbcShear(aRef1,n,nTan,TRUE);
+ NbcShear(aRef1,n,nTan,sal_True);
}
- if (rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
bool b=((const SdrObjMoveProtectItem*)pPoolItem)->GetValue();
SetMoveProtect(b);
}
- if (rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
bool b=((const SdrObjSizeProtectItem*)pPoolItem)->GetValue();
SetResizeProtect(b);
}
@@ -2153,25 +2153,25 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
if( IsMoveProtect() )
SetResizeProtect( true );
- if (rAttr.GetItemState(SDRATTR_OBJPRINTABLE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_OBJPRINTABLE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
bool b=((const SdrObjPrintableItem*)pPoolItem)->GetValue();
SetPrintable(b);
}
- if (rAttr.GetItemState(SDRATTR_OBJVISIBLE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_OBJVISIBLE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
bool b=((const SdrObjVisibleItem*)pPoolItem)->GetValue();
SetVisible(b);
}
SdrLayerID nLayer=SDRLAYER_NOTFOUND;
- if (rAttr.GetItemState(SDRATTR_LAYERID,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_LAYERID,sal_True,&pPoolItem)==SFX_ITEM_SET) {
nLayer=((const SdrLayerIdItem*)pPoolItem)->GetValue();
}
- if (rAttr.GetItemState(SDRATTR_LAYERNAME,TRUE,&pPoolItem)==SFX_ITEM_SET && pModel!=NULL) {
+ if (rAttr.GetItemState(SDRATTR_LAYERNAME,sal_True,&pPoolItem)==SFX_ITEM_SET && pModel!=NULL) {
XubString aLayerName=((const SdrLayerNameItem*)pPoolItem)->GetValue();
const SdrLayerAdmin* pLayAd=pPage!=NULL ? &pPage->GetLayerAdmin() : pModel!=NULL ? &pModel->GetLayerAdmin() : NULL;
if (pLayAd!=NULL) {
- const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName, TRUE);
+ const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName, sal_True);
if (pLayer!=NULL) {
nLayer=pLayer->GetID();
}
@@ -2182,16 +2182,16 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
NbcSetLayer(nLayer);
}
- if (rAttr.GetItemState(SDRATTR_OBJECTNAME,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_OBJECTNAME,sal_True,&pPoolItem)==SFX_ITEM_SET) {
XubString aName=((const SdrObjectNameItem*)pPoolItem)->GetValue();
SetName(aName);
}
Rectangle aNewLogic(rLogic);
- if (rAttr.GetItemState(SDRATTR_LOGICSIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_LOGICSIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrLogicSizeWidthItem*)pPoolItem)->GetValue();
aNewLogic.Right()=aNewLogic.Left()+n;
}
- if (rAttr.GetItemState(SDRATTR_LOGICSIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_LOGICSIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) {
long n=((const SdrLogicSizeHeightItem*)pPoolItem)->GetValue();
aNewLogic.Bottom()=aNewLogic.Top()+n;
}
@@ -2200,10 +2200,10 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
}
Fraction aResizeX(1,1);
Fraction aResizeY(1,1);
- if (rAttr.GetItemState(SDRATTR_RESIZEXONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_RESIZEXONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
aResizeX*=((const SdrResizeXOneItem*)pPoolItem)->GetValue();
}
- if (rAttr.GetItemState(SDRATTR_RESIZEYONE,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_RESIZEYONE,sal_True,&pPoolItem)==SFX_ITEM_SET) {
aResizeY*=((const SdrResizeYOneItem*)pPoolItem)->GetValue();
}
if (aResizeX!=Fraction(1,1) || aResizeY!=Fraction(1,1)) {
@@ -2211,13 +2211,13 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr)
}
}
-void lcl_SetItem(SfxItemSet& rAttr, FASTBOOL bMerge, const SfxPoolItem& rItem)
+void lcl_SetItem(SfxItemSet& rAttr, int bMerge, const SfxPoolItem& rItem)
{
- if (bMerge) rAttr.MergeValue(rItem,TRUE);
+ if (bMerge) rAttr.MergeValue(rItem,sal_True);
else rAttr.Put(rItem);
}
-void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, FASTBOOL bMerge) const
+void SdrObject::TakeNotPersistAttr(SfxItemSet& rAttr, int bMerge) const
{
const Rectangle& rSnap=GetSnapRect();
const Rectangle& rLogic=GetLogicRect();
@@ -2291,12 +2291,12 @@ void SdrObject::NbcSetStyleSheet(SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRe
// Das Broadcasting beim Setzen der Attribute wird vom AttrObj gemanagt
////////////////////////////////////////////////////////////////////////////////////////////////////
-FASTBOOL SdrObject::IsNode() const
+int SdrObject::IsNode() const
{
- return TRUE;
+ return sal_True;
}
-SdrGluePoint SdrObject::GetVertexGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrObject::GetVertexGluePoint(sal_uInt16 nPosNum) const
{
// #i41936# Use SnapRect for default GluePoints
const Rectangle aR(GetSnapRect());
@@ -2312,12 +2312,12 @@ SdrGluePoint SdrObject::GetVertexGluePoint(USHORT nPosNum) const
aPt -= aR.Center();
SdrGluePoint aGP(aPt);
- aGP.SetPercent(FALSE);
+ aGP.SetPercent(sal_False);
return aGP;
}
-SdrGluePoint SdrObject::GetCornerGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrObject::GetCornerGluePoint(sal_uInt16 nPosNum) const
{
Rectangle aR(GetCurrentBoundRect());
Point aPt;
@@ -2329,7 +2329,7 @@ SdrGluePoint SdrObject::GetCornerGluePoint(USHORT nPosNum) const
}
aPt-=GetSnapRect().Center();
SdrGluePoint aGP(aPt);
- aGP.SetPercent(FALSE);
+ aGP.SetPercent(sal_False);
return aGP;
}
@@ -2354,7 +2354,7 @@ SdrGluePointList* SdrObject::ForceGluePointList()
return pPlusData->pGluePoints;
}
-void SdrObject::SetGlueReallyAbsolute(FASTBOOL bOn)
+void SdrObject::SetGlueReallyAbsolute(int bOn)
{
// erst Const-Aufruf um zu sehen, ob
// ueberhaupt Klebepunkte da sind
@@ -2387,7 +2387,7 @@ void SdrObject::NbcMirrorGluePoints(const Point& rRef1, const Point& rRef2)
}
}
-void SdrObject::NbcShearGluePoints(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+void SdrObject::NbcShearGluePoints(const Point& rRef, long nWink, double tn, int bVShear)
{
// erst Const-Aufruf um zu sehen, ob
// ueberhaupt Klebepunkte da sind
@@ -2398,27 +2398,27 @@ void SdrObject::NbcShearGluePoints(const Point& rRef, long nWink, double tn, FAS
}
}
-FASTBOOL SdrObject::IsEdge() const
+int SdrObject::IsEdge() const
{
- return FALSE;
+ return sal_False;
}
-void SdrObject::ConnectToNode(FASTBOOL /*bTail1*/, SdrObject* /*pObj*/)
+void SdrObject::ConnectToNode(int /*bTail1*/, SdrObject* /*pObj*/)
{
}
-void SdrObject::DisconnectFromNode(FASTBOOL /*bTail1*/)
+void SdrObject::DisconnectFromNode(int /*bTail1*/)
{
}
-SdrObject* SdrObject::GetConnectedNode(FASTBOOL /*bTail1*/) const
+SdrObject* SdrObject::GetConnectedNode(int /*bTail1*/) const
{
return NULL;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash) const
+SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash) const
{
bool bNoChange(true);
@@ -2479,7 +2479,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas
aSet.Put(XLineWidthItem(0L));
aSet.Put(XLineStyleItem(XLINE_NONE));
Color aColorLine = ((const XLineColorItem&)(aSet.Get(XATTR_LINECOLOR))).GetColorValue();
- UINT16 nTransLine = ((const XLineTransparenceItem&)(aSet.Get(XATTR_LINETRANSPARENCE))).GetValue();
+ sal_uInt16 nTransLine = ((const XLineTransparenceItem&)(aSet.Get(XATTR_LINETRANSPARENCE))).GetValue();
aSet.Put(XFillColorItem(XubString(), aColorLine));
aSet.Put(XFillStyleItem(XFILL_SOLID));
aSet.Put(XFillTransparenceItem(nTransLine));
@@ -2592,7 +2592,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas
}
// convert this path object to contour object, even when it is a group
-SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash) const
+SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash) const
{
if(pRet->ISA(SdrObjGroup))
{
@@ -2600,7 +2600,7 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash)
SdrObject* pGroup = new SdrObjGroup;
pGroup->SetModel(pRet->GetModel());
- for(UINT32 a=0;a<pObjList2->GetObjCount();a++)
+ for(sal_uInt32 a=0;a<pObjList2->GetObjCount();a++)
{
SdrObject* pIterObj = pObjList2->GetObj(a);
pGroup->GetSubList()->NbcInsertObject(ConvertToContourObj(pIterObj, bForceLineDash));
@@ -2634,7 +2634,7 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash)
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrObject* SdrObject::ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const
+SdrObject* SdrObject::ConvertToPolyObj(sal_Bool bBezier, sal_Bool bLineToArea) const
{
SdrObject* pRet = DoConvertToPolyObj(bBezier);
@@ -2656,7 +2656,7 @@ SdrObject* SdrObject::ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrObject* SdrObject::DoConvertToPolyObj(BOOL /*bBezier*/) const
+SdrObject* SdrObject::DoConvertToPolyObj(sal_Bool /*bBezier*/) const
{
return NULL;
}
@@ -2731,19 +2731,19 @@ void SdrObject::SetVisible(sal_Bool bVisible)
////////////////////////////////////////////////////////////////////////////////////////////////////
-USHORT SdrObject::GetUserDataCount() const
+sal_uInt16 SdrObject::GetUserDataCount() const
{
if (pPlusData==NULL || pPlusData->pUserDataList==NULL) return 0;
return pPlusData->pUserDataList->GetUserDataCount();
}
-SdrObjUserData* SdrObject::GetUserData(USHORT nNum) const
+SdrObjUserData* SdrObject::GetUserData(sal_uInt16 nNum) const
{
if (pPlusData==NULL || pPlusData->pUserDataList==NULL) return NULL;
return pPlusData->pUserDataList->GetUserData(nNum);
}
-void SdrObject::InsertUserData(SdrObjUserData* pData, USHORT nPos)
+void SdrObject::InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos)
{
if (pData!=NULL) {
ImpForcePlusData();
@@ -2754,9 +2754,9 @@ void SdrObject::InsertUserData(SdrObjUserData* pData, USHORT nPos)
}
}
-void SdrObject::DeleteUserData(USHORT nNum)
+void SdrObject::DeleteUserData(sal_uInt16 nNum)
{
- USHORT nAnz=GetUserDataCount();
+ sal_uInt16 nAnz=GetUserDataCount();
if (nNum<nAnz) {
pPlusData->pUserDataList->DeleteUserData(nNum);
if (nAnz==1) {
@@ -2856,7 +2856,7 @@ void SdrObject::MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, S
}
}
-sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const
+sal_Bool SdrObject::IsTransparent( sal_Bool /*bCheckForAlphaChannel*/) const
{
bool bRet = false;
@@ -2873,7 +2873,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const
( ( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) &&
( (const XFillFloatTransparenceItem&) rAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled() ) )
{
- bRet = TRUE;
+ bRet = sal_True;
}
else if( pO->ISA( SdrGrafObj ) )
{
@@ -2881,7 +2881,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const
if( ( (const SdrGrafTransparenceItem&) rAttr.Get( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ||
( pGrafObj->GetGraphicType() == GRAPHIC_BITMAP && pGrafObj->GetGraphic().GetBitmapEx().IsAlpha() ) )
{
- bRet = TRUE;
+ bRet = sal_True;
}
}
}
@@ -2895,7 +2895,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const
( ( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) &&
( (const XFillFloatTransparenceItem&) rAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled() ) )
{
- bRet = TRUE;
+ bRet = sal_True;
}
else if( ISA( SdrGrafObj ) )
{
@@ -3157,7 +3157,7 @@ void SdrObject::SetContextWritingMode( const sal_Int16 /*_nContextWritingMode*/
//
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel)
+SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel)
{
nInventor=nInvent;
nIdentifier=nIdent;
@@ -3168,7 +3168,7 @@ SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, S
pNewData=NULL;
}
-SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1)
+SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1)
{
nInventor=nInvent;
nIdentifier=nIdent;
@@ -3179,7 +3179,7 @@ SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1)
pNewData=NULL;
}
-SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* pPage, SdrModel* pModel)
+SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel)
{
if(pModel == NULL && pPage != NULL)
pModel = pPage->GetModel();
@@ -3189,37 +3189,37 @@ SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage*
{
switch (nIdent)
{
- case USHORT(OBJ_NONE ): pObj=new SdrObject; break;
- case USHORT(OBJ_GRUP ): pObj=new SdrObjGroup; break;
- case USHORT(OBJ_LINE ): pObj=new SdrPathObj(OBJ_LINE ); break;
- case USHORT(OBJ_POLY ): pObj=new SdrPathObj(OBJ_POLY ); break;
- case USHORT(OBJ_PLIN ): pObj=new SdrPathObj(OBJ_PLIN ); break;
- case USHORT(OBJ_PATHLINE ): pObj=new SdrPathObj(OBJ_PATHLINE ); break;
- case USHORT(OBJ_PATHFILL ): pObj=new SdrPathObj(OBJ_PATHFILL ); break;
- case USHORT(OBJ_FREELINE ): pObj=new SdrPathObj(OBJ_FREELINE ); break;
- case USHORT(OBJ_FREEFILL ): pObj=new SdrPathObj(OBJ_FREEFILL ); break;
- case USHORT(OBJ_PATHPOLY ): pObj=new SdrPathObj(OBJ_POLY ); break;
- case USHORT(OBJ_PATHPLIN ): pObj=new SdrPathObj(OBJ_PLIN ); break;
- case USHORT(OBJ_EDGE ): pObj=new SdrEdgeObj; break;
- case USHORT(OBJ_RECT ): pObj=new SdrRectObj; break;
- case USHORT(OBJ_CIRC ): pObj=new SdrCircObj(OBJ_CIRC ); break;
- case USHORT(OBJ_SECT ): pObj=new SdrCircObj(OBJ_SECT ); break;
- case USHORT(OBJ_CARC ): pObj=new SdrCircObj(OBJ_CARC ); break;
- case USHORT(OBJ_CCUT ): pObj=new SdrCircObj(OBJ_CCUT ); break;
- case USHORT(OBJ_TEXT ): pObj=new SdrRectObj(OBJ_TEXT ); break;
- case USHORT(OBJ_TEXTEXT ): pObj=new SdrRectObj(OBJ_TEXTEXT ); break;
- case USHORT(OBJ_TITLETEXT ): pObj=new SdrRectObj(OBJ_TITLETEXT ); break;
- case USHORT(OBJ_OUTLINETEXT): pObj=new SdrRectObj(OBJ_OUTLINETEXT); break;
- case USHORT(OBJ_MEASURE ): pObj=new SdrMeasureObj; break;
- case USHORT(OBJ_GRAF ): pObj=new SdrGrafObj; break;
- case USHORT(OBJ_OLE2 ): pObj=new SdrOle2Obj; break;
- case USHORT(OBJ_FRAME ): pObj=new SdrOle2Obj(TRUE); break;
- case USHORT(OBJ_CAPTION ): pObj=new SdrCaptionObj; break;
- case USHORT(OBJ_PAGE ): pObj=new SdrPageObj; break;
- case USHORT(OBJ_UNO ): pObj=new SdrUnoObj(String()); break;
- case USHORT(OBJ_CUSTOMSHAPE ): pObj=new SdrObjCustomShape(); break;
- case USHORT(OBJ_MEDIA ): pObj=new SdrMediaObj(); break;
- case USHORT(OBJ_TABLE ): pObj=new ::sdr::table::SdrTableObj(pModel); break;
+ case sal_uInt16(OBJ_NONE ): pObj=new SdrObject; break;
+ case sal_uInt16(OBJ_GRUP ): pObj=new SdrObjGroup; break;
+ case sal_uInt16(OBJ_LINE ): pObj=new SdrPathObj(OBJ_LINE ); break;
+ case sal_uInt16(OBJ_POLY ): pObj=new SdrPathObj(OBJ_POLY ); break;
+ case sal_uInt16(OBJ_PLIN ): pObj=new SdrPathObj(OBJ_PLIN ); break;
+ case sal_uInt16(OBJ_PATHLINE ): pObj=new SdrPathObj(OBJ_PATHLINE ); break;
+ case sal_uInt16(OBJ_PATHFILL ): pObj=new SdrPathObj(OBJ_PATHFILL ); break;
+ case sal_uInt16(OBJ_FREELINE ): pObj=new SdrPathObj(OBJ_FREELINE ); break;
+ case sal_uInt16(OBJ_FREEFILL ): pObj=new SdrPathObj(OBJ_FREEFILL ); break;
+ case sal_uInt16(OBJ_PATHPOLY ): pObj=new SdrPathObj(OBJ_POLY ); break;
+ case sal_uInt16(OBJ_PATHPLIN ): pObj=new SdrPathObj(OBJ_PLIN ); break;
+ case sal_uInt16(OBJ_EDGE ): pObj=new SdrEdgeObj; break;
+ case sal_uInt16(OBJ_RECT ): pObj=new SdrRectObj; break;
+ case sal_uInt16(OBJ_CIRC ): pObj=new SdrCircObj(OBJ_CIRC ); break;
+ case sal_uInt16(OBJ_SECT ): pObj=new SdrCircObj(OBJ_SECT ); break;
+ case sal_uInt16(OBJ_CARC ): pObj=new SdrCircObj(OBJ_CARC ); break;
+ case sal_uInt16(OBJ_CCUT ): pObj=new SdrCircObj(OBJ_CCUT ); break;
+ case sal_uInt16(OBJ_TEXT ): pObj=new SdrRectObj(OBJ_TEXT ); break;
+ case sal_uInt16(OBJ_TEXTEXT ): pObj=new SdrRectObj(OBJ_TEXTEXT ); break;
+ case sal_uInt16(OBJ_TITLETEXT ): pObj=new SdrRectObj(OBJ_TITLETEXT ); break;
+ case sal_uInt16(OBJ_OUTLINETEXT): pObj=new SdrRectObj(OBJ_OUTLINETEXT); break;
+ case sal_uInt16(OBJ_MEASURE ): pObj=new SdrMeasureObj; break;
+ case sal_uInt16(OBJ_GRAF ): pObj=new SdrGrafObj; break;
+ case sal_uInt16(OBJ_OLE2 ): pObj=new SdrOle2Obj; break;
+ case sal_uInt16(OBJ_FRAME ): pObj=new SdrOle2Obj(sal_True); break;
+ case sal_uInt16(OBJ_CAPTION ): pObj=new SdrCaptionObj; break;
+ case sal_uInt16(OBJ_PAGE ): pObj=new SdrPageObj; break;
+ case sal_uInt16(OBJ_UNO ): pObj=new SdrUnoObj(String()); break;
+ case sal_uInt16(OBJ_CUSTOMSHAPE ): pObj=new SdrObjCustomShape(); break;
+ case sal_uInt16(OBJ_MEDIA ): pObj=new SdrMediaObj(); break;
+ case sal_uInt16(OBJ_TABLE ): pObj=new ::sdr::table::SdrTableObj(pModel); break;
}
}
@@ -3253,13 +3253,13 @@ SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage*
return pObj;
}
-SdrObjUserData* SdrObjFactory::MakeNewObjUserData(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1)
+SdrObjUserData* SdrObjFactory::MakeNewObjUserData(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1)
{
SdrObjUserData* pData=NULL;
if (nInvent==SdrInventor) {
switch (nIdent)
{
- case USHORT(SDRUSERDATA_OBJTEXTLINK) : pData=new ImpSdrObjTextLinkUserData((SdrTextObj*)pObj1); break;
+ case sal_uInt16(SDRUSERDATA_OBJTEXTLINK) : pData=new ImpSdrObjTextLinkUserData((SdrTextObj*)pObj1); break;
}
}
if (pData==NULL) {
diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx
index fd9ee15b8f2c..f410f1ecb08e 100644
--- a/svx/source/svdraw/svdocapt.cxx
+++ b/svx/source/svdraw/svdocapt.cxx
@@ -77,23 +77,23 @@ public:
long nEscAbs;
long nLineLen;
SdrCaptionEscDir eEscDir;
- FASTBOOL bFitLineLen;
- FASTBOOL bEscRel;
- FASTBOOL bFixedAngle;
+ int bFitLineLen;
+ int bEscRel;
+ int bFixedAngle;
public:
ImpCaptParams()
{
eType =SDRCAPT_TYPE3;
- bFixedAngle=FALSE;
+ bFixedAngle=sal_False;
nAngle =4500;
nGap =0;
eEscDir =SDRCAPT_ESCHORIZONTAL;
- bEscRel =TRUE;
+ bEscRel =sal_True;
nEscRel =5000;
nEscAbs =0;
nLineLen =0;
- bFitLineLen=TRUE;
+ bFitLineLen=sal_True;
}
void CalcEscPos(const Point& rTail, const Rectangle& rRect, Point& rPt, EscDir& rDir) const;
};
@@ -115,7 +115,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi
nY+=rRect.Top();
Point aBestPt;
EscDir eBestDir=LKS;
- FASTBOOL bTryH=eEscDir==SDRCAPT_ESCBESTFIT;
+ int bTryH=eEscDir==SDRCAPT_ESCBESTFIT;
if (!bTryH) {
if (eType!=SDRCAPT_TYPE1) {
bTryH=eEscDir==SDRCAPT_ESCHORIZONTAL;
@@ -123,7 +123,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi
bTryH=eEscDir==SDRCAPT_ESCVERTICAL;
}
}
- FASTBOOL bTryV=eEscDir==SDRCAPT_ESCBESTFIT;
+ int bTryV=eEscDir==SDRCAPT_ESCBESTFIT;
if (!bTryV) {
if (eType!=SDRCAPT_TYPE1) {
bTryV=eEscDir==SDRCAPT_ESCVERTICAL;
@@ -135,7 +135,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi
if (bTryH) {
Point aLft(rRect.Left()-nGap,nY);
Point aRgt(rRect.Right()+nGap,nY);
- FASTBOOL bLft=(aTl.X()-aLft.X()<aRgt.X()-aTl.X());
+ int bLft=(aTl.X()-aLft.X()<aRgt.X()-aTl.X());
if (bLft) {
eBestDir=LKS;
aBestPt=aLft;
@@ -147,7 +147,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi
if (bTryV) {
Point aTop(nX,rRect.Top()-nGap);
Point aBtm(nX,rRect.Bottom()+nGap);
- FASTBOOL bTop=(aTl.Y()-aTop.Y()<aBtm.Y()-aTl.Y());
+ int bTop=(aTl.Y()-aTop.Y()<aBtm.Y()-aTl.Y());
Point aBest2;
EscDir eBest2;
if (bTop) {
@@ -157,7 +157,7 @@ void ImpCaptParams::CalcEscPos(const Point& rTailPt, const Rectangle& rRect, Poi
eBest2=UNT;
aBest2=aBtm;
}
- FASTBOOL bTakeIt=eEscDir!=SDRCAPT_ESCBESTFIT;
+ int bTakeIt=eEscDir!=SDRCAPT_ESCBESTFIT;
if (!bTakeIt) {
BigInt aHorX(aBestPt.X()-aTl.X()); aHorX*=aHorX;
BigInt aHorY(aBestPt.Y()-aTl.Y()); aHorY*=aHorY;
@@ -201,24 +201,24 @@ TYPEINIT1(SdrCaptionObj,SdrRectObj);
SdrCaptionObj::SdrCaptionObj():
SdrRectObj(OBJ_TEXT),
aTailPoly(3), // Default Groesse: 3 Punkte = 2 Linien
- mbSpecialTextBoxShadow(FALSE),
- mbFixedTail(FALSE)
+ mbSpecialTextBoxShadow(sal_False),
+ mbFixedTail(sal_False)
{
}
SdrCaptionObj::SdrCaptionObj(const Rectangle& rRect):
SdrRectObj(OBJ_TEXT,rRect),
aTailPoly(3), // Default Groesse: 3 Punkte = 2 Linien
- mbSpecialTextBoxShadow(FALSE),
- mbFixedTail(FALSE)
+ mbSpecialTextBoxShadow(sal_False),
+ mbFixedTail(sal_False)
{
}
SdrCaptionObj::SdrCaptionObj(const Rectangle& rRect, const Point& rTail):
SdrRectObj(OBJ_TEXT,rRect),
aTailPoly(3), // Default Groesse: 3 Punkte = 2 Linien
- mbSpecialTextBoxShadow(FALSE),
- mbFixedTail(FALSE)
+ mbSpecialTextBoxShadow(sal_False),
+ mbFixedTail(sal_False)
{
aTailPoly[0]=maFixedTailPos=rTail;
}
@@ -229,25 +229,25 @@ SdrCaptionObj::~SdrCaptionObj()
void SdrCaptionObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed=FALSE;
- rInfo.bRotate90Allowed =FALSE;
- rInfo.bMirrorFreeAllowed=FALSE;
- rInfo.bMirror45Allowed =FALSE;
- rInfo.bMirror90Allowed =FALSE;
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
- rInfo.bShearAllowed =FALSE;
- rInfo.bEdgeRadiusAllowed=FALSE;
- rInfo.bCanConvToPath =TRUE;
- rInfo.bCanConvToPoly =TRUE;
- rInfo.bCanConvToPathLineToArea=FALSE;
- rInfo.bCanConvToPolyLineToArea=FALSE;
+ rInfo.bRotateFreeAllowed=sal_False;
+ rInfo.bRotate90Allowed =sal_False;
+ rInfo.bMirrorFreeAllowed=sal_False;
+ rInfo.bMirror45Allowed =sal_False;
+ rInfo.bMirror90Allowed =sal_False;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
+ rInfo.bShearAllowed =sal_False;
+ rInfo.bEdgeRadiusAllowed=sal_False;
+ rInfo.bCanConvToPath =sal_True;
+ rInfo.bCanConvToPoly =sal_True;
+ rInfo.bCanConvToPathLineToArea=sal_False;
+ rInfo.bCanConvToPolyLineToArea=sal_False;
rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
}
-UINT16 SdrCaptionObj::GetObjIdentifier() const
+sal_uInt16 SdrCaptionObj::GetObjIdentifier() const
{
- return UINT16(OBJ_CAPTION);
+ return sal_uInt16(OBJ_CAPTION);
}
void SdrCaptionObj::operator=(const SdrObject& rObj)
@@ -557,9 +557,9 @@ void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, Polygon& rPoly, Rect
}
}
-FASTBOOL SdrCaptionObj::BegCreate(SdrDragStat& rStat)
+int SdrCaptionObj::BegCreate(SdrDragStat& rStat)
{
- if (aRect.IsEmpty()) return FALSE; // Create z.Zt. nur mit vorgegebenen Rect
+ if (aRect.IsEmpty()) return sal_False; // Create z.Zt. nur mit vorgegebenen Rect
ImpCaptParams aPara;
ImpGetCaptParams(aPara);
@@ -567,10 +567,10 @@ FASTBOOL SdrCaptionObj::BegCreate(SdrDragStat& rStat)
aTailPoly[0]=rStat.GetStart();
ImpCalcTail(aPara,aTailPoly,aRect);
rStat.SetActionRect(aRect);
- return TRUE;
+ return sal_True;
}
-FASTBOOL SdrCaptionObj::MovCreate(SdrDragStat& rStat)
+int SdrCaptionObj::MovCreate(SdrDragStat& rStat)
{
ImpCaptParams aPara;
ImpGetCaptParams(aPara);
@@ -578,11 +578,11 @@ FASTBOOL SdrCaptionObj::MovCreate(SdrDragStat& rStat)
ImpCalcTail(aPara,aTailPoly,aRect);
rStat.SetActionRect(aRect);
SetBoundRectDirty();
- bSnapRectDirty=TRUE;
- return TRUE;
+ bSnapRectDirty=sal_True;
+ return sal_True;
}
-FASTBOOL SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+int SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
ImpCaptParams aPara;
ImpGetCaptParams(aPara);
@@ -592,9 +592,9 @@ FASTBOOL SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointAnz()>=2);
}
-FASTBOOL SdrCaptionObj::BckCreate(SdrDragStat& /*rStat*/)
+int SdrCaptionObj::BckCreate(SdrDragStat& /*rStat*/)
{
- return FALSE;
+ return sal_False;
}
void SdrCaptionObj::BrkCreate(SdrDragStat& /*rStat*/)
@@ -755,18 +755,18 @@ void SdrCaptionObj::RestGeoData(const SdrObjGeoData& rGeo)
aTailPoly=rCGeo.aTailPoly;
}
-SdrObject* SdrCaptionObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrCaptionObj::DoConvertToPolyObj(sal_Bool bBezier) const
{ // #42334# - Convert implementiert
SdrObject* pRect=SdrRectObj::DoConvertToPolyObj(bBezier);
SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), sal_False, bBezier);
SdrObject* pRet=(pTail!=NULL) ? pTail : pRect;
if (pTail!=NULL && pRect!=NULL) {
- FASTBOOL bInsRect=TRUE;
- FASTBOOL bInsTail=TRUE;
+ int bInsRect=sal_True;
+ int bInsTail=sal_True;
SdrObjList* pOL=pTail->GetSubList();
- if (pOL!=NULL) { pRet=pRect; bInsTail=FALSE; }
+ if (pOL!=NULL) { pRet=pRect; bInsTail=sal_False; }
if (pOL==NULL) pOL=pRect->GetSubList();
- if (pOL!=NULL) { pRet=pRect; bInsRect=FALSE; }
+ if (pOL!=NULL) { pRet=pRect; bInsRect=sal_False; }
if (pOL==NULL) {
SdrObjGroup* pGrp=new SdrObjGroup;
pOL=pGrp->GetSubList();
diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx
index d28039cf1989..5a5ee11061e4 100644
--- a/svx/source/svdraw/svdocirc.cxx
+++ b/svx/source/svdraw/svdocirc.cxx
@@ -152,27 +152,27 @@ SdrCircObj::~SdrCircObj()
void SdrCircObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- FASTBOOL bCanConv=!HasText() || ImpCanConvTextToCurve();
- rInfo.bEdgeRadiusAllowed = FALSE;
+ int bCanConv=!HasText() || ImpCanConvTextToCurve();
+ rInfo.bEdgeRadiusAllowed = sal_False;
rInfo.bCanConvToPath=bCanConv;
rInfo.bCanConvToPoly=bCanConv;
rInfo.bCanConvToContour = !IsFontwork() && (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
}
-UINT16 SdrCircObj::GetObjIdentifier() const
+sal_uInt16 SdrCircObj::GetObjIdentifier() const
{
- return UINT16(meCircleKind);
+ return sal_uInt16(meCircleKind);
}
-FASTBOOL SdrCircObj::PaintNeedsXPolyCirc() const
+int SdrCircObj::PaintNeedsXPolyCirc() const
{
// XPoly ist notwendig fuer alle gedrehten Ellipsenobjekte,
// fuer alle Kreis- und Ellipsenabschnitte
// und wenn nicht WIN dann (erstmal) auch fuer Kreis-/Ellipsenausschnitte
// und Kreis-/Ellipsenboegen (wg. Genauigkeit)
- FASTBOOL bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || meCircleKind==OBJ_CCUT;
+ int bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || meCircleKind==OBJ_CCUT;
// Wenn nicht Win, dann fuer alle ausser Vollkreis (erstmal!!!)
- if (meCircleKind!=OBJ_CIRC) bNeed=TRUE;
+ if (meCircleKind!=OBJ_CIRC) bNeed=sal_True;
const SfxItemSet& rSet = GetObjectItemSet();
if(!bNeed)
@@ -209,7 +209,7 @@ FASTBOOL SdrCircObj::PaintNeedsXPolyCirc() const
}
if(!bNeed && meCircleKind != OBJ_CIRC && nStartWink == nEndWink)
- bNeed=TRUE; // Weil sonst Vollkreis gemalt wird
+ bNeed=sal_True; // Weil sonst Vollkreis gemalt wird
return bNeed;
}
@@ -295,7 +295,7 @@ void SdrCircObj::RecalcXPoly()
void SdrCircObj::TakeObjNameSingul(XubString& rName) const
{
- USHORT nID=STR_ObjNameSingulCIRC;
+ sal_uInt16 nID=STR_ObjNameSingulCIRC;
if (aRect.GetWidth()==aRect.GetHeight() && aGeo.nShearWink==0) {
switch (meCircleKind) {
case OBJ_CIRC: nID=STR_ObjNameSingulCIRC; break;
@@ -327,7 +327,7 @@ void SdrCircObj::TakeObjNameSingul(XubString& rName) const
void SdrCircObj::TakeObjNamePlural(XubString& rName) const
{
- USHORT nID=STR_ObjNamePluralCIRC;
+ sal_uInt16 nID=STR_ObjNamePluralCIRC;
if (aRect.GetWidth()==aRect.GetHeight() && aGeo.nShearWink==0) {
switch (meCircleKind) {
case OBJ_CIRC: nID=STR_ObjNamePluralCIRC; break;
@@ -375,7 +375,7 @@ struct ImpCircUser : public SdrDragStatUserData
long nStart;
long nEnd;
long nWink;
- FASTBOOL bRight; // noch nicht implementiert
+ int bRight; // noch nicht implementiert
public:
ImpCircUser()
@@ -384,7 +384,7 @@ public:
nWdt(0),
nStart(0),
nEnd(0),
- bRight(FALSE)
+ bRight(sal_False)
{}
void SetCreateParams(SdrDragStat& rStat);
};
@@ -595,7 +595,7 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
nWink = pU->nEnd;
}
- aStr += GetWinkStr(nWink,FALSE);
+ aStr += GetWinkStr(nWink,sal_False);
aStr += sal_Unicode(')');
}
@@ -612,7 +612,7 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const
ImpTakeDescriptionStr(STR_DragCircAngle, aStr);
aStr.AppendAscii(" (");
- aStr += GetWinkStr(nWink,FALSE);
+ aStr += GetWinkStr(nWink,sal_False);
aStr += sal_Unicode(')');
return aStr;
@@ -690,7 +690,7 @@ void SdrCircObj::ImpSetCreateParams(SdrDragStat& rStat) const
pU->SetCreateParams(rStat);
}
-FASTBOOL SdrCircObj::BegCreate(SdrDragStat& rStat)
+int SdrCircObj::BegCreate(SdrDragStat& rStat)
{
rStat.SetOrtho4Possible();
Rectangle aRect1(rStat.GetStart(), rStat.GetNow());
@@ -698,10 +698,10 @@ FASTBOOL SdrCircObj::BegCreate(SdrDragStat& rStat)
rStat.SetActionRect(aRect1);
aRect = aRect1;
ImpSetCreateParams(rStat);
- return TRUE;
+ return sal_True;
}
-FASTBOOL SdrCircObj::MovCreate(SdrDragStat& rStat)
+int SdrCircObj::MovCreate(SdrDragStat& rStat)
{
ImpSetCreateParams(rStat);
ImpCircUser* pU=(ImpCircUser*)rStat.GetUser();
@@ -711,7 +711,7 @@ FASTBOOL SdrCircObj::MovCreate(SdrDragStat& rStat)
nStartWink=pU->nStart;
nEndWink=pU->nEnd;
SetBoundRectDirty();
- bSnapRectDirty=TRUE;
+ bSnapRectDirty=sal_True;
SetXPolyDirty();
// #i103058# push current angle settings to ItemSet to
@@ -721,14 +721,14 @@ FASTBOOL SdrCircObj::MovCreate(SdrDragStat& rStat)
ImpSetCircInfoToAttr();
}
- return TRUE;
+ return sal_True;
}
-FASTBOOL SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+int SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
ImpSetCreateParams(rStat);
ImpCircUser* pU=(ImpCircUser*)rStat.GetUser();
- FASTBOOL bRet=FALSE;
+ int bRet=sal_False;
if (eCmd==SDRCREATE_FORCEEND && rStat.GetPointAnz()<4) meCircleKind=OBJ_CIRC;
if (meCircleKind==OBJ_CIRC) {
bRet=rStat.GetPointAnz()>=2;
@@ -765,7 +765,7 @@ void SdrCircObj::BrkCreate(SdrDragStat& rStat)
rStat.SetUser(NULL);
}
-FASTBOOL SdrCircObj::BckCreate(SdrDragStat& rStat)
+int SdrCircObj::BckCreate(SdrDragStat& rStat)
{
rStat.SetNoSnap(rStat.GetPointAnz()>=3);
rStat.SetOrtho4Possible(rStat.GetPointAnz()<3);
@@ -823,12 +823,12 @@ void SdrCircObj::NbcMove(const Size& aSiz)
void SdrCircObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
long nWink0=aGeo.nDrehWink;
- FASTBOOL bNoShearRota=(aGeo.nDrehWink==0 && aGeo.nShearWink==0);
+ int bNoShearRota=(aGeo.nDrehWink==0 && aGeo.nShearWink==0);
SdrTextObj::NbcResize(rRef,xFact,yFact);
bNoShearRota|=(aGeo.nDrehWink==0 && aGeo.nShearWink==0);
if (meCircleKind!=OBJ_CIRC) {
- FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
- FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
+ int bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
+ int bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
if (bXMirr || bYMirr) {
// bei bXMirr!=bYMirr muessten eigentlich noch die beiden
// Linienende vertauscht werden. Das ist jedoch mal wieder
@@ -872,7 +872,7 @@ void SdrCircObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
ImpSetCircInfoToAttr();
}
-void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear)
{
SdrTextObj::NbcShear(rRef,nWink,tn,bVShear);
SetXPolyDirty();
@@ -882,7 +882,7 @@ void SdrCircObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVS
void SdrCircObj::NbcMirror(const Point& rRef1, const Point& rRef2)
{
//long nWink0=aGeo.nDrehWink;
- FASTBOOL bFreeMirr=meCircleKind!=OBJ_CIRC;
+ int bFreeMirr=meCircleKind!=OBJ_CIRC;
Point aTmpPt1;
Point aTmpPt2;
if (bFreeMirr) { // bei freier Spiegelachse einige Vorbereitungen Treffen
@@ -1098,8 +1098,8 @@ void SdrCircObj::ImpSetAttrToCircInfo()
sal_Int32 nNewStart = ((SdrCircStartAngleItem&)rSet.Get(SDRATTR_CIRCSTARTANGLE)).GetValue();
sal_Int32 nNewEnd = ((SdrCircEndAngleItem&)rSet.Get(SDRATTR_CIRCENDANGLE)).GetValue();
- BOOL bKindChg = meCircleKind != eNewKind;
- BOOL bWinkChg = nNewStart != nStartWink || nNewEnd != nEndWink;
+ sal_Bool bKindChg = meCircleKind != eNewKind;
+ sal_Bool bWinkChg = nNewStart != nStartWink || nNewEnd != nEndWink;
if(bKindChg || bWinkChg)
{
@@ -1155,7 +1155,7 @@ void SdrCircObj::ImpSetCircInfoToAttr()
}
}
-SdrObject* SdrCircObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrCircObj::DoConvertToPolyObj(sal_Bool bBezier) const
{
const sal_Bool bFill(OBJ_CARC == meCircleKind ? sal_False : sal_True);
const basegfx::B2DPolygon aCircPolygon(ImpCalcXPolyCirc(meCircleKind, aRect, nStartWink, nEndWink));
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index c7bbc5fab761..f0857b8d9e9b 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -68,31 +68,31 @@ void SdrObjConnection::ResetVars()
nConId=0;
nXDist=0;
nYDist=0;
- bBestConn=TRUE;
- bBestVertex=TRUE;
- bXDistOvr=FALSE;
- bYDistOvr=FALSE;
- bAutoVertex=FALSE;
- bAutoCorner=FALSE;
+ bBestConn=sal_True;
+ bBestVertex=sal_True;
+ bXDistOvr=sal_False;
+ bYDistOvr=sal_False;
+ bAutoVertex=sal_False;
+ bAutoCorner=sal_False;
}
-FASTBOOL SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, FASTBOOL bSetAbsPos) const
+int SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, int bSetAbsPos) const
{
- FASTBOOL bRet=FALSE;
+ int bRet=sal_False;
if (pObj!=NULL) { // Ein Obj muss schon angedockt sein!
if (bAutoVertex) {
rGP=pObj->GetVertexGluePoint(nConId);
- bRet=TRUE;
+ bRet=sal_True;
} else if (bAutoCorner) {
rGP=pObj->GetCornerGluePoint(nConId);
- bRet=TRUE;
+ bRet=sal_True;
} else {
const SdrGluePointList* pGPL=pObj->GetGluePointList();
if (pGPL!=NULL) {
- USHORT nNum=pGPL->FindGluePoint(nConId);
+ sal_uInt16 nNum=pGPL->FindGluePoint(nConId);
if (nNum!=SDRGLUEPOINT_NOTFOUND) {
rGP=(*pGPL)[nNum];
- bRet=TRUE;
+ bRet=sal_True;
}
}
}
@@ -117,7 +117,7 @@ Point& SdrEdgeInfoRec::ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode)
return aMiddleLine;
}
-USHORT SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const
+sal_uInt16 SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const
{
switch (eLineCode) {
case OBJ1LINE2 : return 1;
@@ -129,10 +129,10 @@ USHORT SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon&
return 0;
}
-FASTBOOL SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const
+int SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const
{
- USHORT nIdx=ImpGetPolyIdx(eLineCode,rXP);
- FASTBOOL bHorz=nAngle1==0 || nAngle1==18000;
+ sal_uInt16 nIdx=ImpGetPolyIdx(eLineCode,rXP);
+ int bHorz=nAngle1==0 || nAngle1==18000;
if (eLineCode==OBJ2LINE2 || eLineCode==OBJ2LINE3) {
nIdx=rXP.GetPointCount()-nIdx; // #36314#
bHorz=nAngle2==0 || nAngle2==18000; // #52000#
@@ -185,16 +185,16 @@ SdrEdgeObj::SdrEdgeObj()
// #110649#
mbBoundRectCalculationRunning(sal_False)
{
- bClosedObj=FALSE;
- bIsEdge=TRUE;
+ bClosedObj=sal_False;
+ bIsEdge=sal_True;
pEdgeTrack=new XPolygon;
}
SdrEdgeObj::~SdrEdgeObj()
{
- DisconnectFromNode(TRUE);
- DisconnectFromNode(FALSE);
+ DisconnectFromNode(sal_True);
+ DisconnectFromNode(sal_False);
delete pEdgeTrack;
}
@@ -243,8 +243,8 @@ void SdrEdgeObj::ImpSetAttrToEdgeInfo()
}
else if(eKind == SDREDGE_THREELINES)
{
- BOOL bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
- BOOL bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
+ sal_Bool bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
+ sal_Bool bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
if(bHor1)
{
@@ -314,8 +314,8 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr()
}
else if(eKind == SDREDGE_THREELINES)
{
- BOOL bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
- BOOL bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
+ sal_Bool bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000;
+ sal_Bool bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000;
n = 2;
nVals[0] = bHor1 ? aEdgeInfo.aObj1Line2.X() : aEdgeInfo.aObj1Line2.Y();
@@ -364,24 +364,24 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr()
void SdrEdgeObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed=FALSE;
- rInfo.bRotate90Allowed =FALSE;
- rInfo.bMirrorFreeAllowed=FALSE;
- rInfo.bMirror45Allowed =FALSE;
- rInfo.bMirror90Allowed =FALSE;
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
- rInfo.bShearAllowed =FALSE;
- rInfo.bEdgeRadiusAllowed=FALSE;
- FASTBOOL bCanConv=!HasText() || ImpCanConvTextToCurve();
+ rInfo.bRotateFreeAllowed=sal_False;
+ rInfo.bRotate90Allowed =sal_False;
+ rInfo.bMirrorFreeAllowed=sal_False;
+ rInfo.bMirror45Allowed =sal_False;
+ rInfo.bMirror90Allowed =sal_False;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
+ rInfo.bShearAllowed =sal_False;
+ rInfo.bEdgeRadiusAllowed=sal_False;
+ int bCanConv=!HasText() || ImpCanConvTextToCurve();
rInfo.bCanConvToPath=bCanConv;
rInfo.bCanConvToPoly=bCanConv;
rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
}
-UINT16 SdrEdgeObj::GetObjIdentifier() const
+sal_uInt16 SdrEdgeObj::GetObjIdentifier() const
{
- return UINT16(OBJ_EDGE);
+ return sal_uInt16(OBJ_EDGE);
}
const Rectangle& SdrEdgeObj::GetCurrentBoundRect() const
@@ -414,20 +414,20 @@ void SdrEdgeObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
rRect=GetSnapRect();
}
-FASTBOOL SdrEdgeObj::IsNode() const
+int SdrEdgeObj::IsNode() const
{
- return TRUE;
+ return sal_True;
}
-SdrGluePoint SdrEdgeObj::GetVertexGluePoint(USHORT nNum) const
+SdrGluePoint SdrEdgeObj::GetVertexGluePoint(sal_uInt16 nNum) const
{
Point aPt;
- USHORT nPntAnz=pEdgeTrack->GetPointCount();
+ sal_uInt16 nPntAnz=pEdgeTrack->GetPointCount();
if (nPntAnz>0)
{
Point aOfs = GetSnapRect().Center();
- if (nNum==2 && GetConnectedNode(TRUE)==NULL) aPt=(*pEdgeTrack)[0];
- else if (nNum==3 && GetConnectedNode(FALSE)==NULL) aPt=(*pEdgeTrack)[nPntAnz-1];
+ if (nNum==2 && GetConnectedNode(sal_True)==NULL) aPt=(*pEdgeTrack)[0];
+ else if (nNum==3 && GetConnectedNode(sal_False)==NULL) aPt=(*pEdgeTrack)[nPntAnz-1];
else {
if ((nPntAnz & 1) ==1) {
aPt=(*pEdgeTrack)[nPntAnz/2];
@@ -443,11 +443,11 @@ SdrGluePoint SdrEdgeObj::GetVertexGluePoint(USHORT nNum) const
aPt-=aOfs;
}
SdrGluePoint aGP(aPt);
- aGP.SetPercent(FALSE);
+ aGP.SetPercent(sal_False);
return aGP;
}
-SdrGluePoint SdrEdgeObj::GetCornerGluePoint(USHORT nNum) const
+SdrGluePoint SdrEdgeObj::GetCornerGluePoint(sal_uInt16 nNum) const
{
return GetVertexGluePoint(nNum);
}
@@ -462,12 +462,12 @@ SdrGluePointList* SdrEdgeObj::ForceGluePointList()
return NULL; // Keine benutzerdefinierten Klebepunkte fuer Verbinder #31671#
}
-FASTBOOL SdrEdgeObj::IsEdge() const
+int SdrEdgeObj::IsEdge() const
{
- return TRUE;
+ return sal_True;
}
-void SdrEdgeObj::ConnectToNode(FASTBOOL bTail1, SdrObject* pObj)
+void SdrEdgeObj::ConnectToNode(int bTail1, SdrObject* pObj)
{
SdrObjConnection& rCon=GetConnection(bTail1);
DisconnectFromNode(bTail1);
@@ -478,7 +478,7 @@ void SdrEdgeObj::ConnectToNode(FASTBOOL bTail1, SdrObject* pObj)
}
}
-void SdrEdgeObj::DisconnectFromNode(FASTBOOL bTail1)
+void SdrEdgeObj::DisconnectFromNode(int bTail1)
{
SdrObjConnection& rCon=GetConnection(bTail1);
if (rCon.pObj!=NULL) {
@@ -487,24 +487,24 @@ void SdrEdgeObj::DisconnectFromNode(FASTBOOL bTail1)
}
}
-SdrObject* SdrEdgeObj::GetConnectedNode(FASTBOOL bTail1) const
+SdrObject* SdrEdgeObj::GetConnectedNode(int bTail1) const
{
SdrObject* pObj=GetConnection(bTail1).pObj;
if (pObj!=NULL && (pObj->GetPage()!=pPage || !pObj->IsInserted())) pObj=NULL;
return pObj;
}
-FASTBOOL SdrEdgeObj::CheckNodeConnection(FASTBOOL bTail1) const
+int SdrEdgeObj::CheckNodeConnection(int bTail1) const
{
- FASTBOOL bRet=FALSE;
+ int bRet=sal_False;
const SdrObjConnection& rCon=GetConnection(bTail1);
- USHORT nPtAnz=pEdgeTrack->GetPointCount();
+ sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount();
if (rCon.pObj!=NULL && rCon.pObj->GetPage()==pPage && nPtAnz!=0) {
const SdrGluePointList* pGPL=rCon.pObj->GetGluePointList();
- USHORT nConAnz=pGPL==NULL ? 0 : pGPL->GetCount();
- USHORT nGesAnz=nConAnz+8;
- Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[USHORT(nPtAnz-1)]);
- for (USHORT i=0; i<nGesAnz && !bRet; i++) {
+ sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount();
+ sal_uInt16 nGesAnz=nConAnz+8;
+ Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[sal_uInt16(nPtAnz-1)]);
+ for (sal_uInt16 i=0; i<nGesAnz && !bRet; i++) {
if (i<nConAnz) { // UserDefined
bRet=aTail==(*pGPL)[i].GetAbsolutePos(*rCon.pObj);
} else if (i<nConAnz+4) { // Vertex
@@ -519,9 +519,9 @@ FASTBOOL SdrEdgeObj::CheckNodeConnection(FASTBOOL bTail1) const
return bRet;
}
-void SdrEdgeObj::ImpSetTailPoint(FASTBOOL bTail1, const Point& rPt)
+void SdrEdgeObj::ImpSetTailPoint(int bTail1, const Point& rPt)
{
- USHORT nPtAnz=pEdgeTrack->GetPointCount();
+ sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount();
if (nPtAnz==0) {
(*pEdgeTrack)[0]=rPt;
(*pEdgeTrack)[1]=rPt;
@@ -529,7 +529,7 @@ void SdrEdgeObj::ImpSetTailPoint(FASTBOOL bTail1, const Point& rPt)
if (!bTail1) (*pEdgeTrack)[1]=rPt;
else { (*pEdgeTrack)[1]=(*pEdgeTrack)[0]; (*pEdgeTrack)[0]=rPt; }
} else {
- if (!bTail1) (*pEdgeTrack)[USHORT(nPtAnz-1)]=rPt;
+ if (!bTail1) (*pEdgeTrack)[sal_uInt16(nPtAnz-1)]=rPt;
else (*pEdgeTrack)[0]=rPt;
}
ImpRecalcEdgeTrack();
@@ -597,7 +597,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack()
}
}
-USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const
+sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const
{
if (pObj==NULL) return SDRESC_ALL;
Rectangle aR(pObj->GetSnapRect());
@@ -605,14 +605,14 @@ USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const
long dyo=rPt.Y()-aR.Top();
long dxr=aR.Right()-rPt.X();
long dyu=aR.Bottom()-rPt.Y();
- FASTBOOL bxMitt=Abs(dxl-dxr)<2;
- FASTBOOL byMitt=Abs(dyo-dyu)<2;
+ int bxMitt=Abs(dxl-dxr)<2;
+ int byMitt=Abs(dyo-dyu)<2;
long dx=Min(dxl,dxr);
long dy=Min(dyo,dyu);
- FASTBOOL bDiag=Abs(dx-dy)<2;
+ int bDiag=Abs(dx-dy)<2;
if (bxMitt && byMitt) return SDRESC_ALL; // In der Mitte
if (bDiag) { // diagonal
- USHORT nRet=0;
+ sal_uInt16 nRet=0;
if (byMitt) nRet|=SDRESC_VERT;
if (bxMitt) nRet|=SDRESC_HORZ;
if (dxl<dxr) { // Links
@@ -635,20 +635,20 @@ USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const
}
}
-FASTBOOL SdrEdgeObj::ImpStripPolyPoints(XPolygon& /*rXP*/) const
+int SdrEdgeObj::ImpStripPolyPoints(XPolygon& /*rXP*/) const
{
// fehlende Implementation !!!
- return FALSE;
+ return sal_False;
}
XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rMeeting) const
{
XPolygon aXP;
aXP.Insert(XPOLY_APPEND,rStPt,XPOLY_NORMAL);
- FASTBOOL bRts=nEscAngle==0;
- FASTBOOL bObn=nEscAngle==9000;
- FASTBOOL bLks=nEscAngle==18000;
- FASTBOOL bUnt=nEscAngle==27000;
+ int bRts=nEscAngle==0;
+ int bObn=nEscAngle==9000;
+ int bLks=nEscAngle==18000;
+ int bUnt=nEscAngle==27000;
Point aP1(rStPt); // erstmal den Pflichtabstand
if (bLks) aP1.X()=rRect.Left();
@@ -656,7 +656,7 @@ XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, cons
if (bObn) aP1.Y()=rRect.Top();
if (bUnt) aP1.Y()=rRect.Bottom();
- FASTBOOL bFinish=FALSE;
+ int bFinish=sal_False;
if (!bFinish) {
Point aP2(aP1); // Und nun den Pflichtabstand ggf. bis auf Meetinghoehe erweitern
if (bLks && rMeeting.X()<=aP2.X()) aP2.X()=rMeeting.X();
@@ -707,7 +707,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
{
Point aPt1,aPt2;
SdrGluePoint aGP1,aGP2;
- USHORT nEsc1=SDRESC_ALL,nEsc2=SDRESC_ALL;
+ sal_uInt16 nEsc1=SDRESC_ALL,nEsc2=SDRESC_ALL;
Rectangle aBoundRect1;
Rectangle aBoundRect2;
Rectangle aBewareRect1;
@@ -715,7 +715,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
// Erstmal die alten Endpunkte wiederholen
if (rTrack0.GetPointCount()!=0) {
aPt1=rTrack0[0];
- USHORT nSiz=rTrack0.GetPointCount();
+ sal_uInt16 nSiz=rTrack0.GetPointCount();
nSiz--;
aPt2=rTrack0[nSiz];
} else {
@@ -724,8 +724,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
aPt2=aOutRect.BottomRight();
}
}
- FASTBOOL bCon1=rCon1.pObj!=NULL && rCon1.pObj->GetPage()==pPage && rCon1.pObj->IsInserted();
- FASTBOOL bCon2=rCon2.pObj!=NULL && rCon2.pObj->GetPage()==pPage && rCon2.pObj->IsInserted();
+ int bCon1=rCon1.pObj!=NULL && rCon1.pObj->GetPage()==pPage && rCon1.pObj->IsInserted();
+ int bCon2=rCon2.pObj!=NULL && rCon2.pObj->GetPage()==pPage && rCon2.pObj->IsInserted();
const SfxItemSet& rSet = GetObjectItemSet();
if (bCon1) {
@@ -777,36 +777,36 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
aBewareRect2=aBoundRect2;
}
XPolygon aBestXP;
- ULONG nBestQual=0xFFFFFFFF;
+ sal_uIntPtr nBestQual=0xFFFFFFFF;
SdrEdgeInfoRec aBestInfo;
- FASTBOOL bAuto1=bCon1 && rCon1.bBestVertex;
- FASTBOOL bAuto2=bCon2 && rCon2.bBestVertex;
- if (bAuto1) rCon1.bAutoVertex=TRUE;
- if (bAuto2) rCon2.bAutoVertex=TRUE;
- USHORT nBestAuto1=0;
- USHORT nBestAuto2=0;
- USHORT nAnz1=bAuto1 ? 4 : 1;
- USHORT nAnz2=bAuto2 ? 4 : 1;
- for (USHORT nNum1=0; nNum1<nAnz1; nNum1++) {
+ int bAuto1=bCon1 && rCon1.bBestVertex;
+ int bAuto2=bCon2 && rCon2.bBestVertex;
+ if (bAuto1) rCon1.bAutoVertex=sal_True;
+ if (bAuto2) rCon2.bAutoVertex=sal_True;
+ sal_uInt16 nBestAuto1=0;
+ sal_uInt16 nBestAuto2=0;
+ sal_uInt16 nAnz1=bAuto1 ? 4 : 1;
+ sal_uInt16 nAnz2=bAuto2 ? 4 : 1;
+ for (sal_uInt16 nNum1=0; nNum1<nAnz1; nNum1++) {
if (bAuto1) rCon1.nConId=nNum1;
- if (bCon1 && rCon1.TakeGluePoint(aGP1,TRUE)) {
+ if (bCon1 && rCon1.TakeGluePoint(aGP1,sal_True)) {
aPt1=aGP1.GetPos();
nEsc1=aGP1.GetEscDir();
if (nEsc1==SDRESC_SMART) nEsc1=ImpCalcEscAngle(rCon1.pObj,aPt1-rCon1.aObjOfs);
}
- for (USHORT nNum2=0; nNum2<nAnz2; nNum2++) {
+ for (sal_uInt16 nNum2=0; nNum2<nAnz2; nNum2++) {
if (bAuto2) rCon2.nConId=nNum2;
- if (bCon2 && rCon2.TakeGluePoint(aGP2,TRUE)) {
+ if (bCon2 && rCon2.TakeGluePoint(aGP2,sal_True)) {
aPt2=aGP2.GetPos();
nEsc2=aGP2.GetEscDir();
if (nEsc2==SDRESC_SMART) nEsc2=ImpCalcEscAngle(rCon2.pObj,aPt2-rCon2.aObjOfs);
}
for (long nA1=0; nA1<36000; nA1+=9000) {
- USHORT nE1=nA1==0 ? SDRESC_RIGHT : nA1==9000 ? SDRESC_TOP : nA1==18000 ? SDRESC_LEFT : nA1==27000 ? SDRESC_BOTTOM : 0;
+ sal_uInt16 nE1=nA1==0 ? SDRESC_RIGHT : nA1==9000 ? SDRESC_TOP : nA1==18000 ? SDRESC_LEFT : nA1==27000 ? SDRESC_BOTTOM : 0;
for (long nA2=0; nA2<36000; nA2+=9000) {
- USHORT nE2=nA2==0 ? SDRESC_RIGHT : nA2==9000 ? SDRESC_TOP : nA2==18000 ? SDRESC_LEFT : nA2==27000 ? SDRESC_BOTTOM : 0;
+ sal_uInt16 nE2=nA2==0 ? SDRESC_RIGHT : nA2==9000 ? SDRESC_TOP : nA2==18000 ? SDRESC_LEFT : nA2==27000 ? SDRESC_BOTTOM : 0;
if ((nEsc1&nE1)!=0 && (nEsc2&nE2)!=0) {
- ULONG nQual=0;
+ sal_uIntPtr nQual=0;
SdrEdgeInfoRec aInfo;
if (pInfo!=NULL) aInfo=*pInfo;
XPolygon aXP(ImpCalcEdgeTrack(aPt1,nA1,aBoundRect1,aBewareRect1,aPt2,nA2,aBoundRect2,aBewareRect2,&nQual,&aInfo));
@@ -830,22 +830,22 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection&
XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1,
const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2,
- ULONG* pnQuality, SdrEdgeInfoRec* pInfo) const
+ sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const
{
SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetObjectItem(SDRATTR_EDGEKIND))).GetValue();
- FASTBOOL bRts1=nAngle1==0;
- FASTBOOL bObn1=nAngle1==9000;
- FASTBOOL bLks1=nAngle1==18000;
- FASTBOOL bUnt1=nAngle1==27000;
- FASTBOOL bHor1=bLks1 || bRts1;
- FASTBOOL bVer1=bObn1 || bUnt1;
- FASTBOOL bRts2=nAngle2==0;
- FASTBOOL bObn2=nAngle2==9000;
- FASTBOOL bLks2=nAngle2==18000;
- FASTBOOL bUnt2=nAngle2==27000;
- FASTBOOL bHor2=bLks2 || bRts2;
- FASTBOOL bVer2=bObn2 || bUnt2;
- FASTBOOL bInfo=pInfo!=NULL;
+ int bRts1=nAngle1==0;
+ int bObn1=nAngle1==9000;
+ int bLks1=nAngle1==18000;
+ int bUnt1=nAngle1==27000;
+ int bHor1=bLks1 || bRts1;
+ int bVer1=bObn1 || bUnt1;
+ int bRts2=nAngle2==0;
+ int bObn2=nAngle2==9000;
+ int bLks2=nAngle2==18000;
+ int bUnt2=nAngle2==27000;
+ int bHor2=bLks2 || bRts2;
+ int bVer2=bObn2 || bUnt2;
+ int bInfo=pInfo!=NULL;
if (bInfo) {
pInfo->cOrthoForm=0;
pInfo->nAngle1=nAngle1;
@@ -861,8 +861,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
Rectangle aBewareRect1(rBewareRect1);
Rectangle aBewareRect2(rBewareRect2);
Point aMeeting((aPt1.X()+aPt2.X()+1)/2,(aPt1.Y()+aPt2.Y()+1)/2);
- FASTBOOL bMeetingXMid=TRUE;
- FASTBOOL bMeetingYMid=TRUE;
+ int bMeetingXMid=sal_True;
+ int bMeetingYMid=sal_True;
if (eKind==SDREDGE_ONELINE) {
XPolygon aXP(2);
aXP[0]=rPt1;
@@ -907,8 +907,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
}
return aXP;
}
- USHORT nIntersections=0;
- FASTBOOL bForceMeeting=FALSE; // Muss die Linie durch den MeetingPoint laufen?
+ sal_uInt16 nIntersections=0;
+ int bForceMeeting=sal_False; // Muss die Linie durch den MeetingPoint laufen?
{
Point aC1(aBewareRect1.Center());
Point aC2(aBewareRect2.Center());
@@ -946,9 +946,9 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
long nXMax=Max(aBewareRect1.Right(),aBewareRect2.Right());
long nYMin=Min(aBewareRect1.Top(),aBewareRect2.Top());
long nYMax=Max(aBewareRect1.Bottom(),aBewareRect2.Bottom());
- //FASTBOOL bBoundOverlap=aBoundRect1.Right()>aBoundRect2.Left() && aBoundRect1.Left()<aBoundRect2.Right() &&
+ //int bBoundOverlap=aBoundRect1.Right()>aBoundRect2.Left() && aBoundRect1.Left()<aBoundRect2.Right() &&
aBoundRect1.Bottom()>aBoundRect2.Top() && aBoundRect1.Top()<aBoundRect2.Bottom();
- FASTBOOL bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() &&
+ int bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() &&
aBewareRect1.Bottom()>aBewareRect2.Top() && aBewareRect1.Top()<aBewareRect2.Bottom();
unsigned nMainCase=3;
if (nAngle1==nAngle2) nMainCase=1;
@@ -957,29 +957,29 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
if (bVer1) aMeeting.X()=(aPt1.X()+aPt2.X()+1)/2; // ist hier besser, als der
if (bHor1) aMeeting.Y()=(aPt1.Y()+aPt2.Y()+1)/2; // Mittelpunkt des Freiraums
// bX1Ok bedeutet, dass die Vertikale, die aus Obj1 austritt, keinen Konflikt mit Obj2 bildet, ...
- FASTBOOL bX1Ok=aPt1.X()<=aBewareRect2.Left() || aPt1.X()>=aBewareRect2.Right();
- FASTBOOL bX2Ok=aPt2.X()<=aBewareRect1.Left() || aPt2.X()>=aBewareRect1.Right();
- FASTBOOL bY1Ok=aPt1.Y()<=aBewareRect2.Top() || aPt1.Y()>=aBewareRect2.Bottom();
- FASTBOOL bY2Ok=aPt2.Y()<=aBewareRect1.Top() || aPt2.Y()>=aBewareRect1.Bottom();
+ int bX1Ok=aPt1.X()<=aBewareRect2.Left() || aPt1.X()>=aBewareRect2.Right();
+ int bX2Ok=aPt2.X()<=aBewareRect1.Left() || aPt2.X()>=aBewareRect1.Right();
+ int bY1Ok=aPt1.Y()<=aBewareRect2.Top() || aPt1.Y()>=aBewareRect2.Bottom();
+ int bY2Ok=aPt2.Y()<=aBewareRect1.Top() || aPt2.Y()>=aBewareRect1.Bottom();
if (bLks1 && (bY1Ok || aBewareRect1.Left()<aBewareRect2.Right()) && (bY2Ok || aBewareRect2.Left()<aBewareRect1.Right())) {
aMeeting.X()=nXMin;
- bMeetingXMid=FALSE;
+ bMeetingXMid=sal_False;
}
if (bRts1 && (bY1Ok || aBewareRect1.Right()>aBewareRect2.Left()) && (bY2Ok || aBewareRect2.Right()>aBewareRect1.Left())) {
aMeeting.X()=nXMax;
- bMeetingXMid=FALSE;
+ bMeetingXMid=sal_False;
}
if (bObn1 && (bX1Ok || aBewareRect1.Top()<aBewareRect2.Bottom()) && (bX2Ok || aBewareRect2.Top()<aBewareRect1.Bottom())) {
aMeeting.Y()=nYMin;
- bMeetingYMid=FALSE;
+ bMeetingYMid=sal_False;
}
if (bUnt1 && (bX1Ok || aBewareRect1.Bottom()>aBewareRect2.Top()) && (bX2Ok || aBewareRect2.Bottom()>aBewareRect1.Top())) {
aMeeting.Y()=nYMax;
- bMeetingYMid=FALSE;
+ bMeetingYMid=sal_False;
}
} else if (nMainCase==2) {
// Fall 2:
- bForceMeeting=TRUE;
+ bForceMeeting=sal_True;
if (bHor1) { // beide waagerecht
/* 9 Moeglichkeiten: */
/* 2.1 Gegenueber, Ueberschneidung */
@@ -1014,27 +1014,27 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
// Ueberschneidung auf der Y-Achse. Faelle 2.1, 2.8, 2.9
if (aBewR1.Right()>aBewR2.Left()) {
// Faelle 2.8, 2.9
- // Fall 2.8 ist immer Aussenrumlauf (bDirect=FALSE).
+ // Fall 2.8 ist immer Aussenrumlauf (bDirect=sal_False).
// Fall 2.9 kann auch Direktverbindung sein (bei geringer
// Ueberschneidung der BewareRects ohne Ueberschneidung der
// Boundrects wenn die Linienaustritte sonst das BewareRect
// des jeweils anderen Objekts verletzen wuerden.
- FASTBOOL bCase29Direct=FALSE;
- FASTBOOL bCase29=aBewR1.Right()>aBewR2.Left();
+ int bCase29Direct=sal_False;
+ int bCase29=aBewR1.Right()>aBewR2.Left();
if (aBndR1.Right()<=aBndR2.Left()) { // Fall 2.9 und keine Boundrectueberschneidung
if ((aPt1.Y()>aBewareRect2.Top() && aPt1.Y()<aBewareRect2.Bottom()) ||
(aPt2.Y()>aBewareRect1.Top() && aPt2.Y()<aBewareRect1.Bottom())) {
- bCase29Direct=TRUE;
+ bCase29Direct=sal_True;
}
}
if (!bCase29Direct) {
- FASTBOOL bObenLang=Abs(nYMin-aMeeting.Y())<=Abs(nYMax-aMeeting.Y());
+ int bObenLang=Abs(nYMin-aMeeting.Y())<=Abs(nYMax-aMeeting.Y());
if (bObenLang) {
aMeeting.Y()=nYMin;
} else {
aMeeting.Y()=nYMax;
}
- bMeetingYMid=FALSE;
+ bMeetingYMid=sal_False;
if (bCase29) {
// und nun noch dafuer sorgen, dass das
// umzingelte Obj nicht durchquert wird
@@ -1043,7 +1043,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
} else {
aMeeting.X()=aBewR1.Left();
}
- bMeetingXMid=FALSE;
+ bMeetingXMid=sal_False;
}
} else {
// Direkte Verbindung (3-Linien Z-Verbindung), da
@@ -1074,27 +1074,27 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
// Ueberschneidung auf der Y-Achse. Faelle 2.1, 2.8, 2.9
if (aBewR1.Bottom()>aBewR2.Top()) {
// Faelle 2.8, 2.9
- // Fall 2.8 ist immer Aussenrumlauf (bDirect=FALSE).
+ // Fall 2.8 ist immer Aussenrumlauf (bDirect=sal_False).
// Fall 2.9 kann auch Direktverbindung sein (bei geringer
// Ueberschneidung der BewareRects ohne Ueberschneidung der
// Boundrects wenn die Linienaustritte sonst das BewareRect
// des jeweils anderen Objekts verletzen wuerden.
- FASTBOOL bCase29Direct=FALSE;
- FASTBOOL bCase29=aBewR1.Bottom()>aBewR2.Top();
+ int bCase29Direct=sal_False;
+ int bCase29=aBewR1.Bottom()>aBewR2.Top();
if (aBndR1.Bottom()<=aBndR2.Top()) { // Fall 2.9 und keine Boundrectueberschneidung
if ((aPt1.X()>aBewareRect2.Left() && aPt1.X()<aBewareRect2.Right()) ||
(aPt2.X()>aBewareRect1.Left() && aPt2.X()<aBewareRect1.Right())) {
- bCase29Direct=TRUE;
+ bCase29Direct=sal_True;
}
}
if (!bCase29Direct) {
- FASTBOOL bLinksLang=Abs(nXMin-aMeeting.X())<=Abs(nXMax-aMeeting.X());
+ int bLinksLang=Abs(nXMin-aMeeting.X())<=Abs(nXMax-aMeeting.X());
if (bLinksLang) {
aMeeting.X()=nXMin;
} else {
aMeeting.X()=nXMax;
}
- bMeetingXMid=FALSE;
+ bMeetingXMid=sal_False;
if (bCase29) {
// und nun noch dafuer sorgen, dass das
// umzingelte Obj nicht durchquert wird
@@ -1103,7 +1103,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
} else {
aMeeting.Y()=aBewR1.Top();
}
- bMeetingYMid=FALSE;
+ bMeetingYMid=sal_False;
}
} else {
// Direkte Verbindung (3-Linien Z-Verbindung), da
@@ -1174,9 +1174,9 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
(((bRts2 && aTmpR2.Right ()<=aPt1.X()) || (bLks2 && aTmpR2.Left()>=aPt1.X())) &&
((bUnt1 && aTmpR1.Bottom()<=aPt2.Y()) || (bObn1 && aTmpR1.Top ()>=aPt2.Y())))) {
// Fall 3.2 trifft zu: Verbindung mit lediglich 2 Linien
- bForceMeeting=TRUE;
- bMeetingXMid=FALSE;
- bMeetingYMid=FALSE;
+ bForceMeeting=sal_True;
+ bMeetingXMid=sal_False;
+ bMeetingYMid=sal_False;
if (bHor1) {
aMeeting.X()=aPt2.X();
aMeeting.Y()=aPt1.Y();
@@ -1196,34 +1196,34 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
((bUnt1 && aBewareRect1.Bottom()>aBewareRect2.Top ()) ||
(bObn1 && aBewareRect1.Top ()<aBewareRect2.Bottom())))) {
// Fall 3.3
- bForceMeeting=TRUE;
- if (bRts1 || bRts2) { aMeeting.X()=nXMax; bMeetingXMid=FALSE; }
- if (bLks1 || bLks2) { aMeeting.X()=nXMin; bMeetingXMid=FALSE; }
- if (bUnt1 || bUnt2) { aMeeting.Y()=nYMax; bMeetingYMid=FALSE; }
- if (bObn1 || bObn2) { aMeeting.Y()=nYMin; bMeetingYMid=FALSE; }
+ bForceMeeting=sal_True;
+ if (bRts1 || bRts2) { aMeeting.X()=nXMax; bMeetingXMid=sal_False; }
+ if (bLks1 || bLks2) { aMeeting.X()=nXMin; bMeetingXMid=sal_False; }
+ if (bUnt1 || bUnt2) { aMeeting.Y()=nYMax; bMeetingYMid=sal_False; }
+ if (bObn1 || bObn2) { aMeeting.Y()=nYMin; bMeetingYMid=sal_False; }
}
}
}
XPolygon aXP1(ImpCalcObjToCenter(aPt1,nAngle1,aBewareRect1,aMeeting));
XPolygon aXP2(ImpCalcObjToCenter(aPt2,nAngle2,aBewareRect2,aMeeting));
- USHORT nXP1Anz=aXP1.GetPointCount();
- USHORT nXP2Anz=aXP2.GetPointCount();
+ sal_uInt16 nXP1Anz=aXP1.GetPointCount();
+ sal_uInt16 nXP2Anz=aXP2.GetPointCount();
if (bInfo) {
pInfo->nObj1Lines=nXP1Anz; if (nXP1Anz>1) pInfo->nObj1Lines--;
pInfo->nObj2Lines=nXP2Anz; if (nXP2Anz>1) pInfo->nObj2Lines--;
}
Point aEP1(aXP1[nXP1Anz-1]);
Point aEP2(aXP2[nXP2Anz-1]);
- FASTBOOL bInsMeetingPoint=aEP1.X()!=aEP2.X() && aEP1.Y()!=aEP2.Y();
- FASTBOOL bHorzE1=aEP1.Y()==aXP1[nXP1Anz-2].Y(); // letzte Linie von XP1 horizontal?
- FASTBOOL bHorzE2=aEP2.Y()==aXP2[nXP2Anz-2].Y(); // letzte Linie von XP2 horizontal?
+ int bInsMeetingPoint=aEP1.X()!=aEP2.X() && aEP1.Y()!=aEP2.Y();
+ int bHorzE1=aEP1.Y()==aXP1[nXP1Anz-2].Y(); // letzte Linie von XP1 horizontal?
+ int bHorzE2=aEP2.Y()==aXP2[nXP2Anz-2].Y(); // letzte Linie von XP2 horizontal?
if (aEP1==aEP2 && (bHorzE1 && bHorzE2 && aEP1.Y()==aEP2.Y()) || (!bHorzE1 && !bHorzE2 && aEP1.X()==aEP2.X())) {
// Sonderbehandlung fuer 'I'-Verbinder
nXP1Anz--; aXP1.Remove(nXP1Anz,1);
nXP2Anz--; aXP2.Remove(nXP2Anz,1);
- bMeetingXMid=FALSE;
- bMeetingYMid=FALSE;
+ bMeetingXMid=sal_False;
+ bMeetingYMid=sal_False;
}
if (bInsMeetingPoint) {
aXP1.Insert(XPOLY_APPEND,aMeeting,XPOLY_NORMAL);
@@ -1248,13 +1248,13 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
// Dies wird die Mittellinie.
pInfo->nMiddleLine=nXP1Anz-1;
}
- USHORT nNum=aXP2.GetPointCount();
+ sal_uInt16 nNum=aXP2.GetPointCount();
if (aXP1[nXP1Anz-1]==aXP2[nXP2Anz-1] && nXP1Anz>1 && nXP2Anz>1) nNum--;
while (nNum>0) {
nNum--;
aXP1.Insert(XPOLY_APPEND,aXP2[nNum],XPOLY_NORMAL);
}
- USHORT nPntAnz=aXP1.GetPointCount();
+ sal_uInt16 nPntAnz=aXP1.GetPointCount();
char cForm=0;
if (bInfo || pnQuality!=NULL) {
cForm='?';
@@ -1301,26 +1301,26 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
}
}
if (pnQuality!=NULL) {
- ULONG nQual=0;
- ULONG nQual0=nQual; // Ueberlaeufe vorbeugen
- FASTBOOL bOverflow=FALSE;
+ sal_uIntPtr nQual=0;
+ sal_uIntPtr nQual0=nQual; // Ueberlaeufe vorbeugen
+ int bOverflow=sal_False;
Point aPt0(aXP1[0]);
- for (USHORT nPntNum=1; nPntNum<nPntAnz; nPntNum++) {
+ for (sal_uInt16 nPntNum=1; nPntNum<nPntAnz; nPntNum++) {
Point aPt1b(aXP1[nPntNum]);
nQual+=Abs(aPt1b.X()-aPt0.X())+Abs(aPt1b.Y()-aPt0.Y());
- if (nQual<nQual0) bOverflow=TRUE;
+ if (nQual<nQual0) bOverflow=sal_True;
nQual0=nQual;
aPt0=aPt1b;
}
- USHORT nTmp=nPntAnz;
+ sal_uInt16 nTmp=nPntAnz;
if (cForm=='Z') {
nTmp=2; // Z-Form hat gute Qualitaet (nTmp=2 statt 4)
- ULONG n1=Abs(aXP1[1].X()-aXP1[0].X())+Abs(aXP1[1].Y()-aXP1[0].Y());
- ULONG n2=Abs(aXP1[2].X()-aXP1[1].X())+Abs(aXP1[2].Y()-aXP1[1].Y());
- ULONG n3=Abs(aXP1[3].X()-aXP1[2].X())+Abs(aXP1[3].Y()-aXP1[2].Y());
+ sal_uIntPtr n1=Abs(aXP1[1].X()-aXP1[0].X())+Abs(aXP1[1].Y()-aXP1[0].Y());
+ sal_uIntPtr n2=Abs(aXP1[2].X()-aXP1[1].X())+Abs(aXP1[2].Y()-aXP1[1].Y());
+ sal_uIntPtr n3=Abs(aXP1[3].X()-aXP1[2].X())+Abs(aXP1[3].Y()-aXP1[2].Y());
// fuer moeglichst gleichlange Linien sorgen
- ULONG nBesser=0;
+ sal_uIntPtr nBesser=0;
n1+=n3;
n3=n2/4;
if (n1>=n2) nBesser=6;
@@ -1331,8 +1331,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
}
if (nTmp>=3) {
nQual0=nQual;
- nQual+=(ULONG)nTmp*0x01000000;
- if (nQual<nQual0 || nTmp>15) bOverflow=TRUE;
+ nQual+=(sal_uIntPtr)nTmp*0x01000000;
+ if (nQual<nQual0 || nTmp>15) bOverflow=sal_True;
}
if (nPntAnz>=2) { // Austrittswinkel nochmal pruefen
Point aP1(aXP1[1]); aP1-=aXP1[0];
@@ -1351,13 +1351,13 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
aBewareRect1=rBewareRect1;
aBewareRect2=rBewareRect2;
- for (USHORT i=0; i<nPntAnz; i++) {
+ for (sal_uInt16 i=0; i<nPntAnz; i++) {
Point aPt1b(aXP1[i]);
- FASTBOOL b1=aPt1b.X()>aBewareRect1.Left() && aPt1b.X()<aBewareRect1.Right() &&
+ int b1=aPt1b.X()>aBewareRect1.Left() && aPt1b.X()<aBewareRect1.Right() &&
aPt1b.Y()>aBewareRect1.Top() && aPt1b.Y()<aBewareRect1.Bottom();
- FASTBOOL b2=aPt1b.X()>aBewareRect2.Left() && aPt1b.X()<aBewareRect2.Right() &&
+ int b2=aPt1b.X()>aBewareRect2.Left() && aPt1b.X()<aBewareRect2.Right() &&
aPt1b.Y()>aBewareRect2.Top() && aPt1b.Y()<aBewareRect2.Bottom();
- USHORT nInt0=nIntersections;
+ sal_uInt16 nInt0=nIntersections;
if (i==0 || i==nPntAnz-1) {
if (b1 && b2) nIntersections++;
} else {
@@ -1386,15 +1386,15 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
}
if (nPntAnz<=1) nIntersections++;
nQual0=nQual;
- nQual+=(ULONG)nIntersections*0x10000000;
- if (nQual<nQual0 || nIntersections>15) bOverflow=TRUE;
+ nQual+=(sal_uIntPtr)nIntersections*0x10000000;
+ if (nQual<nQual0 || nIntersections>15) bOverflow=sal_True;
if (bOverflow || nQual==0xFFFFFFFF) nQual=0xFFFFFFFE;
*pnQuality=nQual;
}
if (bInfo) { // nun die Linienversaetze auf aXP1 anwenden
if (pInfo->nMiddleLine!=0xFFFF) {
- USHORT nIdx=pInfo->ImpGetPolyIdx(MIDDLELINE,aXP1);
+ sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(MIDDLELINE,aXP1);
if (pInfo->ImpIsHorzLine(MIDDLELINE,aXP1)) {
aXP1[nIdx].Y()+=pInfo->aMiddleLine.Y();
aXP1[nIdx+1].Y()+=pInfo->aMiddleLine.Y();
@@ -1404,7 +1404,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
}
}
if (pInfo->nObj1Lines>=2) {
- USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE2,aXP1);
+ sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE2,aXP1);
if (pInfo->ImpIsHorzLine(OBJ1LINE2,aXP1)) {
aXP1[nIdx].Y()+=pInfo->aObj1Line2.Y();
aXP1[nIdx+1].Y()+=pInfo->aObj1Line2.Y();
@@ -1414,7 +1414,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
}
}
if (pInfo->nObj1Lines>=3) {
- USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE3,aXP1);
+ sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE3,aXP1);
if (pInfo->ImpIsHorzLine(OBJ1LINE3,aXP1)) {
aXP1[nIdx].Y()+=pInfo->aObj1Line3.Y();
aXP1[nIdx+1].Y()+=pInfo->aObj1Line3.Y();
@@ -1424,7 +1424,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
}
}
if (pInfo->nObj2Lines>=2) {
- USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE2,aXP1);
+ sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE2,aXP1);
if (pInfo->ImpIsHorzLine(OBJ2LINE2,aXP1)) {
aXP1[nIdx].Y()+=pInfo->aObj2Line2.Y();
aXP1[nIdx+1].Y()+=pInfo->aObj2Line2.Y();
@@ -1434,7 +1434,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
}
}
if (pInfo->nObj2Lines>=3) {
- USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE3,aXP1);
+ sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE3,aXP1);
if (pInfo->ImpIsHorzLine(OBJ2LINE3,aXP1)) {
aXP1[nIdx].Y()+=pInfo->aObj2Line3.Y();
aXP1[nIdx+1].Y()+=pInfo->aObj2Line3.Y();
@@ -1552,11 +1552,11 @@ je Objekt variiert von 0-3:
void __EXPORT SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
{
SfxSimpleHint* pSimple=PTR_CAST(SfxSimpleHint,&rHint);
- ULONG nId=pSimple==0 ? 0 : pSimple->GetId();
- FASTBOOL bDataChg=nId==SFX_HINT_DATACHANGED;
- FASTBOOL bDying=nId==SFX_HINT_DYING;
- FASTBOOL bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC;
- FASTBOOL bObj2=aCon2.pObj!=NULL && aCon2.pObj->GetBroadcaster()==&rBC;
+ sal_uIntPtr nId=pSimple==0 ? 0 : pSimple->GetId();
+ int bDataChg=nId==SFX_HINT_DATACHANGED;
+ int bDying=nId==SFX_HINT_DYING;
+ int bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC;
+ int bObj2=aCon2.pObj!=NULL && aCon2.pObj->GetBroadcaster()==&rBC;
if (bDying && (bObj1 || bObj2)) {
// #35605# Dying vorher abfangen, damit AttrObj nicht
// wg. vermeintlicher Vorlagenaenderung rumbroadcastet
@@ -1713,10 +1713,10 @@ sal_uInt32 SdrEdgeObj::GetHdlCount() const
}
else if (eKind==SDREDGE_THREELINES && nPntAnz == 4L)
{
- if(GetConnectedNode(TRUE))
+ if(GetConnectedNode(sal_True))
nHdlAnz++;
- if(GetConnectedNode(FALSE))
+ if(GetConnectedNode(sal_False))
nHdlAnz++;
}
}
@@ -1731,10 +1731,10 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const
if (nPntAnz!=0) {
if (nHdlNum==0) {
pHdl=new ImpEdgeHdl((*pEdgeTrack)[0],HDL_POLY);
- if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(TRUE);
+ if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(sal_True);
} else if (nHdlNum==1) {
- pHdl=new ImpEdgeHdl((*pEdgeTrack)[USHORT(nPntAnz-1)],HDL_POLY);
- if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(TRUE);
+ pHdl=new ImpEdgeHdl((*pEdgeTrack)[sal_uInt16(nPntAnz-1)],HDL_POLY);
+ if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(sal_True);
} else {
SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetObjectItem(SDRATTR_EDGEKIND))).GetValue();
if (eKind==SDREDGE_ORTHOLINES || eKind==SDREDGE_BEZIER) {
@@ -1774,7 +1774,7 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const
}
} else if (eKind==SDREDGE_THREELINES) {
sal_uInt32 nNum(nHdlNum);
- if (GetConnectedNode(TRUE)==NULL) nNum++;
+ if (GetConnectedNode(sal_True)==NULL) nNum++;
Point aPos((*pEdgeTrack)[(sal_uInt16)nNum-1]);
pHdl=new ImpEdgeHdl(aPos,HDL_POLY);
if (nNum==2) ((ImpEdgeHdl*)pHdl)->SetLineCode(OBJ1LINE2);
@@ -1904,7 +1904,7 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat)
// force recalc EdgeTrack
*pEdgeTrack = ImpCalcEdgeTrack(*pEdgeTrack, aCon1, aCon2, &aEdgeInfo);
- bEdgeTrackDirty=FALSE;
+ bEdgeTrackDirty=sal_False;
// save EdgeInfos and mark object as user modified
ImpSetEdgeInfoToAttr();
@@ -2004,42 +2004,42 @@ basegfx::B2DPolygon SdrEdgeObj::ImplAddConnectorOverlay(SdrDragMethod& rDragMeth
return aResult;
}
-FASTBOOL SdrEdgeObj::BegCreate(SdrDragStat& rDragStat)
+int SdrEdgeObj::BegCreate(SdrDragStat& rDragStat)
{
- rDragStat.SetNoSnap(TRUE);
+ rDragStat.SetNoSnap(sal_True);
pEdgeTrack->SetPointCount(2);
(*pEdgeTrack)[0]=rDragStat.GetStart();
(*pEdgeTrack)[1]=rDragStat.GetNow();
if (rDragStat.GetPageView()!=NULL) {
ImpFindConnector(rDragStat.GetStart(),*rDragStat.GetPageView(),aCon1,this);
- ConnectToNode(TRUE,aCon1.pObj);
+ ConnectToNode(sal_True,aCon1.pObj);
}
*pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
- return TRUE;
+ return sal_True;
}
-FASTBOOL SdrEdgeObj::MovCreate(SdrDragStat& rDragStat)
+int SdrEdgeObj::MovCreate(SdrDragStat& rDragStat)
{
- USHORT nMax=pEdgeTrack->GetPointCount();
+ sal_uInt16 nMax=pEdgeTrack->GetPointCount();
(*pEdgeTrack)[nMax-1]=rDragStat.GetNow();
if (rDragStat.GetPageView()!=NULL) {
ImpFindConnector(rDragStat.GetNow(),*rDragStat.GetPageView(),aCon2,this);
rDragStat.GetView()->SetConnectMarker(aCon2,*rDragStat.GetPageView());
}
SetBoundRectDirty();
- bSnapRectDirty=TRUE;
- ConnectToNode(FALSE,aCon2.pObj);
+ bSnapRectDirty=sal_True;
+ ConnectToNode(sal_False,aCon2.pObj);
*pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo);
- bEdgeTrackDirty=FALSE;
- return TRUE;
+ bEdgeTrackDirty=sal_False;
+ return sal_True;
}
-FASTBOOL SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd)
+int SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd)
{
- FASTBOOL bOk=(eCmd==SDRCREATE_FORCEEND || rDragStat.GetPointAnz()>=2);
+ int bOk=(eCmd==SDRCREATE_FORCEEND || rDragStat.GetPointAnz()>=2);
if (bOk) {
- ConnectToNode(TRUE,aCon1.pObj);
- ConnectToNode(FALSE,aCon2.pObj);
+ ConnectToNode(sal_True,aCon1.pObj);
+ ConnectToNode(sal_False,aCon2.pObj);
if (rDragStat.GetView()!=NULL) {
rDragStat.GetView()->HideConnectMarker();
}
@@ -2049,12 +2049,12 @@ FASTBOOL SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd)
return bOk;
}
-FASTBOOL SdrEdgeObj::BckCreate(SdrDragStat& rDragStat)
+int SdrEdgeObj::BckCreate(SdrDragStat& rDragStat)
{
if (rDragStat.GetView()!=NULL) {
rDragStat.GetView()->HideConnectMarker();
}
- return FALSE;
+ return sal_False;
}
void SdrEdgeObj::BrkCreate(SdrDragStat& rDragStat)
@@ -2076,15 +2076,15 @@ Pointer SdrEdgeObj::GetCreatePointer() const
return Pointer(POINTER_DRAW_CONNECT);
}
-FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut)
+int SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut)
{
rCon.ResetVars();
if (pOut==NULL) pOut=rPV.GetView().GetFirstOutputDevice(); // GetWin(0);
- if (pOut==NULL) return FALSE;
+ if (pOut==NULL) return sal_False;
SdrObjList* pOL=rPV.GetObjList();
const SetOfByte& rVisLayer=rPV.GetVisibleLayers();
// Sensitiver Bereich der Konnektoren ist doppelt so gross wie die Handles:
- USHORT nMarkHdSiz=rPV.GetView().GetMarkHdlSizePixel();
+ sal_uInt16 nMarkHdSiz=rPV.GetView().GetMarkHdlSizePixel();
Size aHalfConSiz(nMarkHdSiz,nMarkHdSiz);
aHalfConSiz=pOut->PixelToLogic(aHalfConSiz);
Size aHalfCenterSiz(2*aHalfConSiz.Width(),2*aHalfConSiz.Height());
@@ -2093,13 +2093,13 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV,
aMouseRect.Top() -=aHalfConSiz.Height();
aMouseRect.Right() +=aHalfConSiz.Width();
aMouseRect.Bottom()+=aHalfConSiz.Height();
- USHORT nBoundHitTol=(USHORT)aHalfConSiz.Width()/2; if (nBoundHitTol==0) nBoundHitTol=1;
- ULONG no=pOL->GetObjCount();
- FASTBOOL bFnd=FALSE;
+ sal_uInt16 nBoundHitTol=(sal_uInt16)aHalfConSiz.Width()/2; if (nBoundHitTol==0) nBoundHitTol=1;
+ sal_uIntPtr no=pOL->GetObjCount();
+ int bFnd=sal_False;
SdrObjConnection aTestCon;
SdrObjConnection aBestCon;
- FASTBOOL bTestBoundHit=FALSE;
- //FASTBOOL bBestBoundHit=FALSE;
+ int bTestBoundHit=sal_False;
+ //int bBestBoundHit=sal_False;
while (no>0 && !bFnd) {
// Problem: Gruppenobjekt mit verschiedenen Layern liefert LayerID 0 !!!!
@@ -2112,43 +2112,43 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV,
Rectangle aObjBound(pObj->GetCurrentBoundRect());
if (aObjBound.IsOver(aMouseRect)) {
aTestCon.ResetVars();
- bTestBoundHit=FALSE;
- FASTBOOL bEdge=HAS_BASE(SdrEdgeObj,pObj); // kein BestCon fuer Edge
+ bTestBoundHit=sal_False;
+ int bEdge=HAS_BASE(SdrEdgeObj,pObj); // kein BestCon fuer Edge
// Die Userdefined Konnektoren haben absolute Prioritaet.
// Danach kommt Vertex, Corner und Mitte(Best) gleich priorisiert.
// Zum Schluss kommt noch ein HitTest aufs Obj.
const SdrGluePointList* pGPL=pObj->GetGluePointList();
- USHORT nConAnz=pGPL==NULL ? 0 : pGPL->GetCount();
- USHORT nGesAnz=nConAnz+9;
- FASTBOOL bUserFnd=FALSE;
- ULONG nBestDist=0xFFFFFFFF;
- for (USHORT i=0; i<nGesAnz; i++)
+ sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount();
+ sal_uInt16 nGesAnz=nConAnz+9;
+ int bUserFnd=sal_False;
+ sal_uIntPtr nBestDist=0xFFFFFFFF;
+ for (sal_uInt16 i=0; i<nGesAnz; i++)
{
- FASTBOOL bUser=i<nConAnz;
- FASTBOOL bVertex=i>=nConAnz+0 && i<nConAnz+4;
- FASTBOOL bCorner=i>=nConAnz+4 && i<nConAnz+8;
- FASTBOOL bCenter=i==nConAnz+8;
- FASTBOOL bOk=FALSE;
+ int bUser=i<nConAnz;
+ int bVertex=i>=nConAnz+0 && i<nConAnz+4;
+ int bCorner=i>=nConAnz+4 && i<nConAnz+8;
+ int bCenter=i==nConAnz+8;
+ int bOk=sal_False;
Point aConPos;
- USHORT nConNum=i;
+ sal_uInt16 nConNum=i;
if (bUser) {
const SdrGluePoint& rGP=(*pGPL)[nConNum];
aConPos=rGP.GetAbsolutePos(*pObj);
nConNum=rGP.GetId();
- bOk=TRUE;
+ bOk=sal_True;
} else if (bVertex && !bUserFnd) {
nConNum=nConNum-nConAnz;
if (rPV.GetView().IsAutoVertexConnectors()) {
SdrGluePoint aPt(pObj->GetVertexGluePoint(nConNum));
aConPos=aPt.GetAbsolutePos(*pObj);
- bOk=TRUE;
+ bOk=sal_True;
} else i+=3;
} else if (bCorner && !bUserFnd) {
nConNum-=nConAnz+4;
if (rPV.GetView().IsAutoCornerConnectors()) {
SdrGluePoint aPt(pObj->GetCornerGluePoint(nConNum));
aConPos=aPt.GetAbsolutePos(*pObj);
- bOk=TRUE;
+ bOk=sal_True;
} else i+=3;
}
else if (bCenter && !bUserFnd && !bEdge)
@@ -2160,20 +2160,20 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV,
// Edges nicht!
nConNum=0;
aConPos=aObjBound.Center();
- bOk=TRUE;
+ bOk=sal_True;
}
}
if (bOk && aMouseRect.IsInside(aConPos)) {
- if (bUser) bUserFnd=TRUE;
- bFnd=TRUE;
- ULONG nDist=(ULONG)Abs(aConPos.X()-rPt.X())+(ULONG)Abs(aConPos.Y()-rPt.Y());
+ if (bUser) bUserFnd=sal_True;
+ bFnd=sal_True;
+ sal_uIntPtr nDist=(sal_uIntPtr)Abs(aConPos.X()-rPt.X())+(sal_uIntPtr)Abs(aConPos.Y()-rPt.Y());
if (nDist<nBestDist) {
nBestDist=nDist;
aTestCon.pObj=pObj;
aTestCon.nConId=nConNum;
aTestCon.bAutoCorner=bCorner;
aTestCon.bAutoVertex=bVertex;
- aTestCon.bBestConn=FALSE; // bCenter;
+ aTestCon.bBestConn=sal_False; // bCenter;
aTestCon.bBestVertex=bCenter;
}
}
@@ -2188,9 +2188,9 @@ FASTBOOL SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV,
// Suppress default connect at object inside bound
if(!pThis || !pThis->GetSuppressDefaultConnect())
{
- bFnd=TRUE;
+ bFnd=sal_True;
aTestCon.pObj=pObj;
- aTestCon.bBestConn=TRUE;
+ aTestCon.bBestConn=sal_True;
}
}
if (bFnd) {
@@ -2261,7 +2261,7 @@ void SdrEdgeObj::NbcResize(const Point& rRefPnt, const Fraction& aXFact, const F
}
}
-SdrObject* SdrEdgeObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrEdgeObj::DoConvertToPolyObj(sal_Bool bBezier) const
{
basegfx::B2DPolyPolygon aPolyPolygon;
aPolyPolygon.append(pEdgeTrack->getB2DPolygon());
@@ -2279,7 +2279,7 @@ sal_uInt32 SdrEdgeObj::GetSnapPointCount() const
Point SdrEdgeObj::GetSnapPoint(sal_uInt32 i) const
{
((SdrEdgeObj*)this)->ImpUndirtyEdgeTrack();
- USHORT nAnz=pEdgeTrack->GetPointCount();
+ sal_uInt16 nAnz=pEdgeTrack->GetPointCount();
if (i==0) return (*pEdgeTrack)[0];
else return (*pEdgeTrack)[nAnz-1];
}
@@ -2297,7 +2297,7 @@ sal_uInt32 SdrEdgeObj::GetPointCount() const
Point SdrEdgeObj::GetPoint(sal_uInt32 i) const
{
((SdrEdgeObj*)this)->ImpUndirtyEdgeTrack();
- USHORT nAnz=pEdgeTrack->GetPointCount();
+ sal_uInt16 nAnz=pEdgeTrack->GetPointCount();
if (0L == i)
return (*pEdgeTrack)[0];
else
@@ -2308,7 +2308,7 @@ void SdrEdgeObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i)
{
// ToDo: Umconnekten fehlt noch
ImpUndirtyEdgeTrack();
- USHORT nAnz=pEdgeTrack->GetPointCount();
+ sal_uInt16 nAnz=pEdgeTrack->GetPointCount();
if (0L == i)
(*pEdgeTrack)[0]=rPnt;
if (1L == i)
@@ -2364,7 +2364,7 @@ void SdrEdgeObj::RestGeoData(const SdrObjGeoData& rGeo)
aEdgeInfo =rEGeo.aEdgeInfo;
}
-Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const
+Point SdrEdgeObj::GetTailPoint( sal_Bool bTail ) const
{
if( pEdgeTrack && pEdgeTrack->GetPointCount()!=0)
{
@@ -2375,7 +2375,7 @@ Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const
}
else
{
- const USHORT nSiz = rTrack0.GetPointCount() - 1;
+ const sal_uInt16 nSiz = rTrack0.GetPointCount() - 1;
return rTrack0[nSiz];
}
}
@@ -2389,7 +2389,7 @@ Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const
}
-void SdrEdgeObj::SetTailPoint( BOOL bTail, const Point& rPt )
+void SdrEdgeObj::SetTailPoint( sal_Bool bTail, const Point& rPt )
{
ImpSetTailPoint( bTail, rPt );
SetChanged();
@@ -2427,12 +2427,12 @@ void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */
nIndex = 0;
}
- rConn1.SetConnectorId( (USHORT)nIndex );
+ rConn1.SetConnectorId( (sal_uInt16)nIndex );
SetChanged();
SetRectsDirty();
ImpRecalcEdgeTrack();
- // bEdgeTrackDirty=TRUE;
+ // bEdgeTrackDirty=sal_True;
}
/** this method is used by the api to return a glue point id for a connection.
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index b299d4c7a2ef..a271eaca5792 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -93,7 +93,7 @@ const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilt
{
Graphic aGraphic;
- SfxMedium xMed( rFileName, STREAM_STD_READ, TRUE );
+ SfxMedium xMed( rFileName, STREAM_STD_READ, sal_True );
xMed.DownLoad();
SvStream* pInStrm = xMed.GetInStream();
@@ -102,7 +102,7 @@ const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilt
pInStrm->Seek( STREAM_SEEK_TO_BEGIN );
GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
- const USHORT nFilter = rFilterName.Len() && pGF->GetImportFormatCount()
+ const sal_uInt16 nFilter = rFilterName.Len() && pGF->GetImportFormatCount()
? pGF->GetImportFormatNumber( rFilterName )
: GRFILTER_FORMAT_DONTKNOW;
@@ -135,7 +135,7 @@ public:
const ::com::sun::star::uno::Any & rValue );
void DataChanged( const Graphic& rGraphic );
- BOOL Connect() { return 0 != GetRealObject(); }
+ sal_Bool Connect() { return 0 != GetRealObject(); }
void UpdateAsynchron();
void RemoveGraphicUpdater();
};
@@ -215,7 +215,7 @@ SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj)
, pGrafObj( pObj )
, pGraphicUpdater( NULL )
{
- SetSynchron( FALSE );
+ SetSynchron( sal_False );
}
// -----------------------------------------------------------------------------
@@ -325,11 +325,11 @@ TYPEINIT1(SdrGrafObj,SdrRectObj);
SdrGrafObj::SdrGrafObj()
: SdrRectObj(),
pGraphicLink ( NULL ),
- bMirrored ( FALSE )
+ bMirrored ( sal_False )
{
pGraphic = new GraphicObject;
pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
- bNoShear = TRUE;
+ bNoShear = sal_True;
// #111096#
mbGrafAnimationAllowed = sal_True;
@@ -348,11 +348,11 @@ SdrGrafObj::SdrGrafObj()
SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect)
: SdrRectObj ( rRect ),
pGraphicLink ( NULL ),
- bMirrored ( FALSE )
+ bMirrored ( sal_False )
{
pGraphic = new GraphicObject( rGrf );
pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
- bNoShear = TRUE;
+ bNoShear = sal_True;
// #111096#
mbGrafAnimationAllowed = sal_True;
@@ -371,11 +371,11 @@ SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect)
SdrGrafObj::SdrGrafObj( const Graphic& rGrf )
: SdrRectObj(),
pGraphicLink ( NULL ),
- bMirrored ( FALSE )
+ bMirrored ( sal_False )
{
pGraphic = new GraphicObject( rGrf );
pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT );
- bNoShear = TRUE;
+ bNoShear = sal_True;
// #111096#
mbGrafAnimationAllowed = sal_True;
@@ -447,7 +447,7 @@ const Graphic& SdrGrafObj::GetGraphic() const
// -----------------------------------------------------------------------------
-Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const
+Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const
{
// #107947# Refactored most of the code to GraphicObject, where
// everybody can use e.g. the cropping functionality
@@ -455,8 +455,8 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const
GraphicType eType = GetGraphicType();
MapMode aDestMap( pModel->GetScaleUnit(), Point(), pModel->GetScaleFraction(), pModel->GetScaleFraction() );
const Size aDestSize( GetLogicRect().GetSize() );
- const BOOL bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0;
- const BOOL bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) &&
+ const sal_Bool bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0;
+ const sal_Bool bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) &&
( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_NONE != eType );
// #104115# Need cropping info earlier
@@ -472,9 +472,9 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const
if( bMirror )
{
- USHORT nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 );
- FASTBOOL bHMirr = nMirrorCase == 2 || nMirrorCase == 4;
- FASTBOOL bVMirr = nMirrorCase == 3 || nMirrorCase == 4;
+ sal_uInt16 nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 );
+ int bHMirr = nMirrorCase == 2 || nMirrorCase == 4;
+ int bVMirr = nMirrorCase == 3 || nMirrorCase == 4;
aActAttr.SetMirrorFlags( ( bHMirr ? BMP_MIRROR_HORZ : 0 ) | ( bVMirr ? BMP_MIRROR_VERT : 0 ) );
}
@@ -657,35 +657,35 @@ void SdrGrafObj::ReleaseGraphicLink()
void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- FASTBOOL bAnim = pGraphic->IsAnimated();
- FASTBOOL bNoPresGrf = ( pGraphic->GetType() != GRAPHIC_NONE ) && !bEmptyPresObj;
+ int bAnim = pGraphic->IsAnimated();
+ int bNoPresGrf = ( pGraphic->GetType() != GRAPHIC_NONE ) && !bEmptyPresObj;
rInfo.bResizeFreeAllowed = aGeo.nDrehWink % 9000 == 0 ||
aGeo.nDrehWink % 18000 == 0 ||
aGeo.nDrehWink % 27000 == 0;
- rInfo.bResizePropAllowed = TRUE;
+ rInfo.bResizePropAllowed = sal_True;
rInfo.bRotateFreeAllowed = bNoPresGrf && !bAnim;
rInfo.bRotate90Allowed = bNoPresGrf && !bAnim;
rInfo.bMirrorFreeAllowed = bNoPresGrf && !bAnim;
rInfo.bMirror45Allowed = bNoPresGrf && !bAnim;
rInfo.bMirror90Allowed = !bEmptyPresObj;
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
- rInfo.bShearAllowed = FALSE;
- rInfo.bEdgeRadiusAllowed=FALSE;
- rInfo.bCanConvToPath = FALSE;
- rInfo.bCanConvToPathLineToArea = FALSE;
- rInfo.bCanConvToPolyLineToArea = FALSE;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
+ rInfo.bShearAllowed = sal_False;
+ rInfo.bEdgeRadiusAllowed=sal_False;
+ rInfo.bCanConvToPath = sal_False;
+ rInfo.bCanConvToPathLineToArea = sal_False;
+ rInfo.bCanConvToPolyLineToArea = sal_False;
rInfo.bCanConvToPoly = !IsEPS();
rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
}
// -----------------------------------------------------------------------------
-UINT16 SdrGrafObj::GetObjIdentifier() const
+sal_uInt16 SdrGrafObj::GetObjIdentifier() const
{
- return UINT16( OBJ_GRAF );
+ return sal_uInt16( OBJ_GRAF );
}
// -----------------------------------------------------------------------------
@@ -726,7 +726,7 @@ void SdrGrafObj::TakeObjNameSingul(XubString& rName) const
{
case GRAPHIC_BITMAP:
{
- const USHORT nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
+ const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPTRANSLNK : STR_ObjNameSingulGRAFBMPTRANS ) :
( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPLNK : STR_ObjNameSingulGRAFBMP ) );
@@ -765,7 +765,7 @@ void SdrGrafObj::TakeObjNamePlural( XubString& rName ) const
{
case GRAPHIC_BITMAP:
{
- const USHORT nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
+ const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ?
( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPTRANSLNK : STR_ObjNamePluralGRAFBMPTRANS ) :
( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPLNK : STR_ObjNamePluralGRAFBMP ) );
@@ -884,8 +884,8 @@ void SdrGrafObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
{
SdrRectObj::NbcResize( rRef, xFact, yFact );
- FASTBOOL bMirrX = xFact.GetNumerator() < 0;
- FASTBOOL bMirrY = yFact.GetNumerator() < 0;
+ int bMirrX = xFact.GetNumerator() < 0;
+ int bMirrY = yFact.GetNumerator() < 0;
if( bMirrX != bMirrY )
bMirrored = !bMirrored;
@@ -908,7 +908,7 @@ void SdrGrafObj::NbcMirror(const Point& rRef1, const Point& rRef2)
// -----------------------------------------------------------------------------
-void SdrGrafObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+void SdrGrafObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear)
{
SdrRectObj::NbcRotate( rRef, nWink, tn, bVShear );
}
@@ -924,7 +924,7 @@ void SdrGrafObj::NbcSetSnapRect(const Rectangle& rRect)
void SdrGrafObj::NbcSetLogicRect( const Rectangle& rRect)
{
- //FASTBOOL bChg=rRect.GetSize()!=aRect.GetSize();
+ //int bChg=rRect.GetSize()!=aRect.GetSize();
SdrRectObj::NbcSetLogicRect(rRect);
}
@@ -950,7 +950,7 @@ void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo)
{
//long nDrehMerk = aGeo.nDrehWink;
//long nShearMerk = aGeo.nShearWink;
- //FASTBOOL bMirrMerk = bMirrored;
+ //int bMirrMerk = bMirrored;
Size aSizMerk( aRect.GetSize() );
SdrRectObj::RestGeoData(rGeo);
@@ -962,8 +962,8 @@ void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo)
void SdrGrafObj::SetPage( SdrPage* pNewPage )
{
- FASTBOOL bRemove = pNewPage == NULL && pPage != NULL;
- FASTBOOL bInsert = pNewPage != NULL && pPage == NULL;
+ int bRemove = pNewPage == NULL && pPage != NULL;
+ int bInsert = pNewPage != NULL && pPage == NULL;
if( bRemove )
{
@@ -985,7 +985,7 @@ void SdrGrafObj::SetPage( SdrPage* pNewPage )
void SdrGrafObj::SetModel( SdrModel* pNewModel )
{
- FASTBOOL bChg = pNewModel != pModel;
+ int bChg = pNewModel != pModel;
if( bChg )
{
@@ -1026,7 +1026,7 @@ void SdrGrafObj::StopAnimation(OutputDevice* /*pOutDev*/, long /*nExtraData*/)
// -----------------------------------------------------------------------------
-FASTBOOL SdrGrafObj::HasGDIMetaFile() const
+int SdrGrafObj::HasGDIMetaFile() const
{
return( pGraphic->GetType() == GRAPHIC_GDIMETAFILE );
}
@@ -1041,7 +1041,7 @@ const GDIMetaFile* SdrGrafObj::GetGDIMetaFile() const
// -----------------------------------------------------------------------------
-SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier) const
{
SdrObject* pRetval = NULL;
@@ -1058,7 +1058,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const
aFilter.SetScaleRect(GetSnapRect());
aFilter.SetLayer(GetLayer());
- UINT32 nInsAnz = aFilter.DoImport(GetTransformedGraphic().GetGDIMetaFile(), *pGrp->GetSubList(), 0);
+ sal_uInt32 nInsAnz = aFilter.DoImport(GetTransformedGraphic().GetGDIMetaFile(), *pGrp->GetSubList(), 0);
if(nInsAnz)
{
pRetval = pGrp;
@@ -1104,7 +1104,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const
Bitmap aBitmap( GetTransformedGraphic().GetBitmap() );
XOBitmap aXBmp(aBitmap, XBITMAP_STRETCH);
aSet.Put(XFillBitmapItem(String(), aXBmp));
- aSet.Put(XFillBmpTileItem(FALSE));
+ aSet.Put(XFillBmpTileItem(sal_False));
pRetval->SetMergedItemSet(aSet);
}
@@ -1142,7 +1142,7 @@ void SdrGrafObj::ImpSetAttrToGrafInfo()
aGrafInfo.SetChannelG( ( (SdrGrafGreenItem&) rSet.Get( SDRATTR_GRAFGREEN ) ).GetValue() );
aGrafInfo.SetChannelB( ( (SdrGrafBlueItem&) rSet.Get( SDRATTR_GRAFBLUE ) ).GetValue() );
aGrafInfo.SetGamma( ( (SdrGrafGamma100Item&) rSet.Get( SDRATTR_GRAFGAMMA ) ).GetValue() * 0.01 );
- aGrafInfo.SetTransparency( (BYTE) FRound( Min( nTrans, (USHORT) 100 ) * 2.55 ) );
+ aGrafInfo.SetTransparency( (sal_uInt8) FRound( Min( nTrans, (sal_uInt16) 100 ) * 2.55 ) );
aGrafInfo.SetInvert( ( (SdrGrafInvertItem&) rSet.Get( SDRATTR_GRAFINVERT ) ).GetValue() );
aGrafInfo.SetDrawMode( ( (SdrGrafModeItem&) rSet.Get( SDRATTR_GRAFMODE ) ).GetValue() );
aGrafInfo.SetCrop( rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom() );
@@ -1161,7 +1161,7 @@ void SdrGrafObj::ImpSetGrafInfoToAttr()
SetObjectItem( SdrGrafGreenItem( aGrafInfo.GetChannelG() ) );
SetObjectItem( SdrGrafBlueItem( aGrafInfo.GetChannelB() ) );
SetObjectItem( SdrGrafGamma100Item( FRound( aGrafInfo.GetGamma() * 100.0 ) ) );
- SetObjectItem( SdrGrafTransparenceItem( (USHORT) FRound( aGrafInfo.GetTransparency() / 2.55 ) ) );
+ SetObjectItem( SdrGrafTransparenceItem( (sal_uInt16) FRound( aGrafInfo.GetTransparency() / 2.55 ) ) );
SetObjectItem( SdrGrafInvertItem( aGrafInfo.IsInvert() ) );
SetObjectItem( SdrGrafModeItem( aGrafInfo.GetDrawMode() ) );
SetObjectItem( SdrGrafCropItem( aGrafInfo.GetLeftCrop(), aGrafInfo.GetTopCrop(), aGrafInfo.GetRightCrop(), aGrafInfo.GetBottomCrop() ) );
@@ -1234,7 +1234,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
// ## test only if there are VOCs other than the preview renderer
if(!GetViewContact().HasViewObjectContacts(true))
{
- const ULONG nSwapMode = pModel->GetSwapGraphicsMode();
+ const sal_uIntPtr nSwapMode = pModel->GetSwapGraphicsMode();
if( ( pGraphic->HasUserData() || pGraphicLink ) &&
( nSwapMode & SDR_SWAPGRAPHICSMODE_PURGE ) )
@@ -1266,7 +1266,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO )
{
SdrDocumentStreamInfo aStreamInfo;
- aStreamInfo.mbDeleteAfterUse = FALSE;
+ aStreamInfo.mbDeleteAfterUse = sal_False;
aStreamInfo.maUserData = pGraphic->GetUserData();
SvStream* pStream = pModel->GetDocumentStream( aStreamInfo );
@@ -1384,7 +1384,7 @@ Reference< XInputStream > SdrGrafObj::getInputStream()
{
SdrDocumentStreamInfo aStreamInfo;
- aStreamInfo.mbDeleteAfterUse = FALSE;
+ aStreamInfo.mbDeleteAfterUse = sal_False;
aStreamInfo.maUserData = pGraphic->GetUserData();
SvStream* pStream = pModel->GetDocumentStream( aStreamInfo );
diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx
index 56c49ac7ddee..06372cd153a5 100644
--- a/svx/source/svdraw/svdogrp.cxx
+++ b/svx/source/svdraw/svdogrp.cxx
@@ -100,10 +100,10 @@ SdrObjGroup::SdrObjGroup()
pSub=new SdrObjList(NULL,NULL);
pSub->SetOwnerObj(this);
pSub->SetListKind(SDROBJLIST_GROUPOBJ);
- bRefPoint=FALSE;
+ bRefPoint=sal_False;
nDrehWink=0;
nShearWink=0;
- bClosedObj=FALSE;
+ bClosedObj=sal_False;
}
@@ -114,51 +114,51 @@ SdrObjGroup::~SdrObjGroup()
void SdrObjGroup::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bNoContortion=FALSE;
+ rInfo.bNoContortion=sal_False;
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
SdrObjTransformInfoRec aInfo;
pObj->TakeObjInfo(aInfo);
- if (!aInfo.bMoveAllowed ) rInfo.bMoveAllowed =FALSE;
- if (!aInfo.bResizeFreeAllowed ) rInfo.bResizeFreeAllowed =FALSE;
- if (!aInfo.bResizePropAllowed ) rInfo.bResizePropAllowed =FALSE;
- if (!aInfo.bRotateFreeAllowed ) rInfo.bRotateFreeAllowed =FALSE;
- if (!aInfo.bRotate90Allowed ) rInfo.bRotate90Allowed =FALSE;
- if (!aInfo.bMirrorFreeAllowed ) rInfo.bMirrorFreeAllowed =FALSE;
- if (!aInfo.bMirror45Allowed ) rInfo.bMirror45Allowed =FALSE;
- if (!aInfo.bMirror90Allowed ) rInfo.bMirror90Allowed =FALSE;
- if (!aInfo.bShearAllowed ) rInfo.bShearAllowed =FALSE;
- if (!aInfo.bEdgeRadiusAllowed ) rInfo.bEdgeRadiusAllowed =FALSE;
- if (!aInfo.bNoOrthoDesired ) rInfo.bNoOrthoDesired =FALSE;
- if (aInfo.bNoContortion ) rInfo.bNoContortion =TRUE;
- if (!aInfo.bCanConvToPath ) rInfo.bCanConvToPath =FALSE;
+ if (!aInfo.bMoveAllowed ) rInfo.bMoveAllowed =sal_False;
+ if (!aInfo.bResizeFreeAllowed ) rInfo.bResizeFreeAllowed =sal_False;
+ if (!aInfo.bResizePropAllowed ) rInfo.bResizePropAllowed =sal_False;
+ if (!aInfo.bRotateFreeAllowed ) rInfo.bRotateFreeAllowed =sal_False;
+ if (!aInfo.bRotate90Allowed ) rInfo.bRotate90Allowed =sal_False;
+ if (!aInfo.bMirrorFreeAllowed ) rInfo.bMirrorFreeAllowed =sal_False;
+ if (!aInfo.bMirror45Allowed ) rInfo.bMirror45Allowed =sal_False;
+ if (!aInfo.bMirror90Allowed ) rInfo.bMirror90Allowed =sal_False;
+ if (!aInfo.bShearAllowed ) rInfo.bShearAllowed =sal_False;
+ if (!aInfo.bEdgeRadiusAllowed ) rInfo.bEdgeRadiusAllowed =sal_False;
+ if (!aInfo.bNoOrthoDesired ) rInfo.bNoOrthoDesired =sal_False;
+ if (aInfo.bNoContortion ) rInfo.bNoContortion =sal_True;
+ if (!aInfo.bCanConvToPath ) rInfo.bCanConvToPath =sal_False;
if(!aInfo.bCanConvToContour)
- rInfo.bCanConvToContour = FALSE;
+ rInfo.bCanConvToContour = sal_False;
- if (!aInfo.bCanConvToPoly ) rInfo.bCanConvToPoly =FALSE;
- if (!aInfo.bCanConvToPathLineToArea) rInfo.bCanConvToPathLineToArea=FALSE;
- if (!aInfo.bCanConvToPolyLineToArea) rInfo.bCanConvToPolyLineToArea=FALSE;
+ if (!aInfo.bCanConvToPoly ) rInfo.bCanConvToPoly =sal_False;
+ if (!aInfo.bCanConvToPathLineToArea) rInfo.bCanConvToPathLineToArea=sal_False;
+ if (!aInfo.bCanConvToPolyLineToArea) rInfo.bCanConvToPolyLineToArea=sal_False;
}
if (nObjAnz==0) {
- rInfo.bRotateFreeAllowed=FALSE;
- rInfo.bRotate90Allowed =FALSE;
- rInfo.bMirrorFreeAllowed=FALSE;
- rInfo.bMirror45Allowed =FALSE;
- rInfo.bMirror90Allowed =FALSE;
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
- rInfo.bShearAllowed =FALSE;
- rInfo.bEdgeRadiusAllowed=FALSE;
- rInfo.bNoContortion =TRUE;
+ rInfo.bRotateFreeAllowed=sal_False;
+ rInfo.bRotate90Allowed =sal_False;
+ rInfo.bMirrorFreeAllowed=sal_False;
+ rInfo.bMirror45Allowed =sal_False;
+ rInfo.bMirror90Allowed =sal_False;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
+ rInfo.bShearAllowed =sal_False;
+ rInfo.bEdgeRadiusAllowed=sal_False;
+ rInfo.bNoContortion =sal_True;
}
if(nObjAnz != 1)
{
// only allowed if single object selected
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
}
}
@@ -169,21 +169,21 @@ void SdrObjGroup::SetBoundRectDirty()
// not re-creatable view data
}
-UINT16 SdrObjGroup::GetObjIdentifier() const
+sal_uInt16 SdrObjGroup::GetObjIdentifier() const
{
- return UINT16(OBJ_GRUP);
+ return sal_uInt16(OBJ_GRUP);
}
SdrLayerID SdrObjGroup::GetLayer() const
{
- FASTBOOL b1st=TRUE;
+ int b1st=sal_True;
SdrLayerID nLay=SdrLayerID(SdrObject::GetLayer());
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrLayerID nLay1=pOL->GetObj(i)->GetLayer();
- if (b1st) { nLay=nLay1; b1st=FALSE; }
+ if (b1st) { nLay=nLay1; b1st=sal_False; }
else if (nLay1!=nLay) return 0;
}
return nLay;
@@ -194,8 +194,8 @@ void SdrObjGroup::NbcSetLayer(SdrLayerID nLayer)
{
SdrObject::NbcSetLayer(nLayer);
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
pOL->GetObj(i)->NbcSetLayer(nLayer);
}
}
@@ -245,7 +245,7 @@ void SdrObjGroup::SetModel(SdrModel* pNewModel)
}
-FASTBOOL SdrObjGroup::HasRefPoint() const
+int SdrObjGroup::HasRefPoint() const
{
return bRefPoint;
}
@@ -259,7 +259,7 @@ Point SdrObjGroup::GetRefPoint() const
void SdrObjGroup::SetRefPoint(const Point& rPnt)
{
- bRefPoint=TRUE;
+ bRefPoint=sal_True;
aRefPoint=rPnt;
}
@@ -385,9 +385,9 @@ bool SdrObjGroup::beginSpecialDrag(SdrDragStat& /*rDrag*/) const
}
-FASTBOOL SdrObjGroup::BegCreate(SdrDragStat& /*rStat*/)
+int SdrObjGroup::BegCreate(SdrDragStat& /*rStat*/)
{
- return FALSE;
+ return sal_False;
}
@@ -397,7 +397,7 @@ long SdrObjGroup::GetRotateAngle() const
}
-long SdrObjGroup::GetShearAngle(FASTBOOL /*bVertical*/) const
+long SdrObjGroup::GetShearAngle(int /*bVertical*/) const
{
return nShearWink;
}
@@ -434,8 +434,8 @@ void SdrObjGroup::NbcMove(const Size& rSiz)
MovePoint(aRefPoint,rSiz);
if (pSub->GetObjCount()!=0) {
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
pObj->NbcMove(rSiz);
}
@@ -448,8 +448,8 @@ void SdrObjGroup::NbcMove(const Size& rSiz)
void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
- FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
- FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
+ int bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
+ int bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
if (bXMirr || bYMirr) {
Point aRef1(GetSnapRect().Center());
if (bXMirr) {
@@ -466,8 +466,8 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
ResizePoint(aRefPoint,rRef,xFact,yFact);
if (pSub->GetObjCount()!=0) {
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
pObj->NbcResize(rRef,xFact,yFact);
}
@@ -480,48 +480,48 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
void SdrObjGroup::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
{
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
nDrehWink=NormAngle360(nDrehWink+nWink);
RotatePoint(aRefPoint,rRef,sn,cs);
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
pObj->NbcRotate(rRef,nWink,sn,cs);
}
NbcRotateGluePoints(rRef,nWink,sn,cs);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
}
void SdrObjGroup::NbcMirror(const Point& rRef1, const Point& rRef2)
{
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!!
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
pObj->NbcMirror(rRef1,rRef2);
}
NbcMirrorGluePoints(rRef1,rRef2);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
}
-void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, int bVShear)
{
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
nShearWink+=nWink;
ShearPoint(aRefPoint,rRef,tn);
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
pObj->NbcShear(rRef,nWink,tn,bVShear);
}
NbcShearGluePoints(rRef,nWink,tn,bVShear);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
}
@@ -531,8 +531,8 @@ void SdrObjGroup::NbcSetAnchorPos(const Point& rPnt)
Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y());
MovePoint(aRefPoint,aSiz);
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG i=0; i<nObjAnz; i++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
pObj->NbcSetAnchorPos(rPnt);
}
@@ -578,8 +578,8 @@ void SdrObjGroup::Move(const Size& rSiz)
if (pSub->GetObjCount()!=0) {
// #32383# Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- ULONG i;
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ sal_uIntPtr i;
for (i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
if (pObj->IsEdgeObj()) pObj->Move(rSiz);
@@ -604,8 +604,8 @@ void SdrObjGroup::Move(const Size& rSiz)
void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
if (xFact.GetNumerator()!=xFact.GetDenominator() || yFact.GetNumerator()!=yFact.GetDenominator()) {
- FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
- FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
+ int bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
+ int bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
if (bXMirr || bYMirr) {
Point aRef1(GetSnapRect().Center());
if (bXMirr) {
@@ -624,8 +624,8 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
if (pSub->GetObjCount()!=0) {
// #32383# Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- ULONG i;
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ sal_uIntPtr i;
for (i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
if (pObj->IsEdgeObj()) pObj->Resize(rRef,xFact,yFact);
@@ -650,14 +650,14 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio
void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
{
if (nWink!=0) {
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
nDrehWink=NormAngle360(nDrehWink+nWink);
RotatePoint(aRefPoint,rRef,sn,cs);
// #32383# Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- ULONG i;
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ sal_uIntPtr i;
for (i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
if (pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs);
@@ -667,7 +667,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
if (!pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs);
}
NbcRotateGluePoints(rRef,nWink,sn,cs);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
SetChanged();
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -677,13 +677,13 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs)
void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
{
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!!
// #32383# Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- ULONG i;
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ sal_uIntPtr i;
for (i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
if (pObj->IsEdgeObj()) pObj->Mirror(rRef1,rRef2);
@@ -693,24 +693,24 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2)
if (!pObj->IsEdgeObj()) pObj->Mirror(rRef1,rRef2);
}
NbcMirrorGluePoints(rRef1,rRef2);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
SetChanged();
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
}
-void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, int bVShear)
{
if (nWink!=0) {
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
nShearWink+=nWink;
ShearPoint(aRefPoint,rRef,tn);
// #32383# Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- ULONG i;
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ sal_uIntPtr i;
for (i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
if (pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear);
@@ -720,7 +720,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShe
if (!pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear);
}
NbcShearGluePoints(rRef,nWink,tn,bVShear);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
SetChanged();
BroadcastObjectChange();
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
@@ -731,14 +731,14 @@ void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShe
void SdrObjGroup::SetAnchorPos(const Point& rPnt)
{
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
- FASTBOOL bChg=aAnchor!=rPnt;
+ int bChg=aAnchor!=rPnt;
aAnchor=rPnt;
Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y());
MovePoint(aRefPoint,aSiz);
// #32383# Erst die Verbinder verschieben, dann den Rest
SdrObjList* pOL=pSub;
- ULONG nObjAnz=pOL->GetObjCount();
- ULONG i;
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ sal_uIntPtr i;
for (i=0; i<nObjAnz; i++) {
SdrObject* pObj=pOL->GetObj(i);
if (pObj->IsEdgeObj()) pObj->SetAnchorPos(rPnt);
@@ -780,12 +780,12 @@ void SdrObjGroup::ReformatText()
pSub->ReformatAllTextObjects();
}
-SdrObject* SdrObjGroup::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrObjGroup::DoConvertToPolyObj(sal_Bool bBezier) const
{
SdrObject* pGroup = new SdrObjGroup;
pGroup->SetModel(GetModel());
- for(UINT32 a=0;a<pSub->GetObjCount();a++)
+ for(sal_uInt32 a=0;a<pSub->GetObjCount();a++)
{
SdrObject* pIterObj = pSub->GetObj(a);
SdrObject* pResult = pIterObj->DoConvertToPolyObj(bBezier);
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index ade79ec70878..f4de0ea2726d 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -79,8 +79,8 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe
{
rStr.Erase();
Fraction aMeasureScale(1, 1);
- BOOL bTextRota90(FALSE);
- BOOL bShowUnit(FALSE);
+ sal_Bool bTextRota90(sal_False);
+ sal_Bool bShowUnit(sal_False);
FieldUnit eMeasureUnit(FUNIT_NONE);
FieldUnit eModUIUnit(FUNIT_NONE);
@@ -104,7 +104,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe
if(eMeasureUnit == FUNIT_NONE)
eMeasureUnit = eModUIUnit;
- INT32 nLen(GetLen(aPt2 - aPt1));
+ sal_Int32 nLen(GetLen(aPt2 - aPt1));
Fraction aFact(1,1);
if(eMeasureUnit != eModUIUnit)
@@ -124,7 +124,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe
nLen = BigMulDiv(nLen, aFact.GetNumerator(), aFact.GetDenominator());
}
- pModel->TakeMetricStr(nLen, rStr, TRUE, nNumDigits);
+ pModel->TakeMetricStr(nLen, rStr, sal_True, nNumDigits);
if(!aFact.IsValid())
{
@@ -215,7 +215,7 @@ sdr::contact::ViewContact* SdrMeasureObj::CreateObjectSpecificViewContact()
TYPEINIT1(SdrMeasureObj,SdrTextObj);
SdrMeasureObj::SdrMeasureObj():
- bTextDirty(FALSE)
+ bTextDirty(sal_False)
{
// #i25616#
mbSupportTextIndentingOnLineWidthChange = sal_False;
@@ -224,7 +224,7 @@ SdrMeasureObj::SdrMeasureObj():
SdrMeasureObj::SdrMeasureObj(const Point& rPt1, const Point& rPt2):
aPt1(rPt1),
aPt2(rPt2),
- bTextDirty(FALSE)
+ bTextDirty(sal_False)
{
// #i25616#
mbSupportTextIndentingOnLineWidthChange = sal_False;
@@ -236,31 +236,31 @@ SdrMeasureObj::~SdrMeasureObj()
void SdrMeasureObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bSelectAllowed =TRUE;
- rInfo.bMoveAllowed =TRUE;
- rInfo.bResizeFreeAllowed=TRUE;
- rInfo.bResizePropAllowed=TRUE;
- rInfo.bRotateFreeAllowed=TRUE;
- rInfo.bRotate90Allowed =TRUE;
- rInfo.bMirrorFreeAllowed=TRUE;
- rInfo.bMirror45Allowed =TRUE;
- rInfo.bMirror90Allowed =TRUE;
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
- rInfo.bShearAllowed =TRUE;
- rInfo.bEdgeRadiusAllowed=FALSE;
- rInfo.bNoOrthoDesired =TRUE;
- rInfo.bNoContortion =FALSE;
- rInfo.bCanConvToPath =FALSE;
- rInfo.bCanConvToPoly =TRUE;
- rInfo.bCanConvToPathLineToArea=FALSE;
- rInfo.bCanConvToPolyLineToArea=FALSE;
+ rInfo.bSelectAllowed =sal_True;
+ rInfo.bMoveAllowed =sal_True;
+ rInfo.bResizeFreeAllowed=sal_True;
+ rInfo.bResizePropAllowed=sal_True;
+ rInfo.bRotateFreeAllowed=sal_True;
+ rInfo.bRotate90Allowed =sal_True;
+ rInfo.bMirrorFreeAllowed=sal_True;
+ rInfo.bMirror45Allowed =sal_True;
+ rInfo.bMirror90Allowed =sal_True;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
+ rInfo.bShearAllowed =sal_True;
+ rInfo.bEdgeRadiusAllowed=sal_False;
+ rInfo.bNoOrthoDesired =sal_True;
+ rInfo.bNoContortion =sal_False;
+ rInfo.bCanConvToPath =sal_False;
+ rInfo.bCanConvToPoly =sal_True;
+ rInfo.bCanConvToPathLineToArea=sal_False;
+ rInfo.bCanConvToPolyLineToArea=sal_False;
rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
}
-UINT16 SdrMeasureObj::GetObjIdentifier() const
+sal_uInt16 SdrMeasureObj::GetObjIdentifier() const
{
- return (UINT16)OBJ_MEASURE;
+ return (sal_uInt16)OBJ_MEASURE;
}
struct ImpMeasureRec : public SdrDragStatUserData
@@ -275,17 +275,17 @@ struct ImpMeasureRec : public SdrDragStatUserData
long nHelplineDist;
long nHelpline1Len;
long nHelpline2Len;
- FASTBOOL bBelowRefEdge;
- FASTBOOL bTextRota90;
- FASTBOOL bTextUpsideDown;
+ int bBelowRefEdge;
+ int bTextRota90;
+ int bTextUpsideDown;
long nMeasureOverhang;
FieldUnit eMeasureUnit;
Fraction aMeasureScale;
- FASTBOOL bShowUnit;
+ int bShowUnit;
String aFormatString;
- FASTBOOL bTextAutoAngle;
+ int bTextAutoAngle;
long nTextAutoAngleView;
- FASTBOOL bTextIsFixedAngle;
+ int bTextIsFixedAngle;
long nTextFixedAngle;
};
@@ -312,7 +312,7 @@ struct ImpMeasurePoly
double nLineCos;
double nHlpSin;
double nHlpCos;
- USHORT nMainlineAnz;
+ sal_uInt16 nMainlineAnz;
SdrMeasureTextHPos eUsedTextHPos;
SdrMeasureTextVPos eUsedTextVPos;
long nLineWdt2; // Halbe Strichstaerke
@@ -321,11 +321,11 @@ struct ImpMeasurePoly
long nArrow1Wdt; // Breite des 1. Pfeils
long nArrow2Wdt; // Breite des 2. Pfeils
long nShortLineLen; // Linienlaenge, wenn PfeileAussen
- FASTBOOL bArrow1Center; // Pfeil 1 zentriert?
- FASTBOOL bArrow2Center; // Pfeil 2 zentriert?
- FASTBOOL bAutoUpsideDown; // UpsideDown durch Automatik
- FASTBOOL bPfeileAussen;
- FASTBOOL bBreakedLine;
+ int bArrow1Center; // Pfeil 1 zentriert?
+ int bArrow2Center; // Pfeil 2 zentriert?
+ int bAutoUpsideDown; // UpsideDown durch Automatik
+ int bPfeileAussen;
+ int bBreakedLine;
};
void SdrMeasureObj::ImpTakeAttr(ImpMeasureRec& rRec) const
@@ -389,7 +389,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
rPol.nArrow2Wdt=0;
long nArrowNeed=0;
long nShortLen=0;
- FASTBOOL bPfeileAussen=FALSE;
+ int bPfeileAussen=sal_False;
const SfxItemSet& rSet = GetObjectItemSet();
sal_Int32 nLineWdt = ((XLineWidthItem&)(rSet.Get(XATTR_LINEWIDTH))).GetValue(); // Strichstaerke
@@ -413,35 +413,35 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
// nArrowLen ist bei bCenter bereits halbiert
// Bei 2 Pfeilen a 4mm ist unter 10mm Schluss.
nArrowNeed=nArrow1Len+nArrow2Len+(nArrow1Wdt+nArrow2Wdt)/2;
- if (rPol.nLineLen<nArrowNeed) bPfeileAussen=TRUE;
+ if (rPol.nLineLen<nArrowNeed) bPfeileAussen=sal_True;
nShortLen=(nArrow1Len+nArrow1Wdt + nArrow2Len+nArrow2Wdt) /2;
rPol.eUsedTextHPos=rRec.eWantTextHPos;
rPol.eUsedTextVPos=rRec.eWantTextVPos;
if (rPol.eUsedTextVPos==SDRMEASURE_TEXTVAUTO) rPol.eUsedTextVPos=SDRMEASURE_ABOVE;
- FASTBOOL bBrkLine=rPol.eUsedTextVPos==SDRMEASURETEXT_BREAKEDLINE;
+ int bBrkLine=rPol.eUsedTextVPos==SDRMEASURETEXT_BREAKEDLINE;
if (rPol.eUsedTextVPos==SDRMEASURETEXT_VERTICALCENTERED)
{
OutlinerParaObject* pOutlinerParaObject = SdrTextObj::GetOutlinerParaObject();
if (pOutlinerParaObject!=NULL && pOutlinerParaObject->GetTextObject().GetParagraphCount()==1)
{
- bBrkLine=TRUE; // Unterbrochene Linie, wenn nur 1 Absatz.
+ bBrkLine=sal_True; // Unterbrochene Linie, wenn nur 1 Absatz.
}
}
rPol.bBreakedLine=bBrkLine;
if (rPol.eUsedTextHPos==SDRMEASURE_TEXTHAUTO) { // bei zu breitem Text diesen eventuell nach aussen schieben
- FASTBOOL bOutside=FALSE;
+ int bOutside=sal_False;
long nNeedSiz=!rRec.bTextRota90 ? rPol.aTextSize.Width() : rPol.aTextSize.Height();
- if (nNeedSiz>rPol.nLineLen) bOutside=TRUE; // Text passt nicht in die Mitte
+ if (nNeedSiz>rPol.nLineLen) bOutside=sal_True; // Text passt nicht in die Mitte
if (bBrkLine) {
- if (nNeedSiz+nArrowNeed>rPol.nLineLen) bPfeileAussen=TRUE; // Text passt in die Mitte, wenn die Pfeile nach aussen kommen
+ if (nNeedSiz+nArrowNeed>rPol.nLineLen) bPfeileAussen=sal_True; // Text passt in die Mitte, wenn die Pfeile nach aussen kommen
} else {
long nSmallNeed=nArrow1Len+nArrow2Len+(nArrow1Wdt+nArrow2Wdt)/2/4;
- if (nNeedSiz+nSmallNeed>rPol.nLineLen) bPfeileAussen=TRUE; // Text passt in die Mitte, wenn die Pfeile nach aussen kommen
+ if (nNeedSiz+nSmallNeed>rPol.nLineLen) bPfeileAussen=sal_True; // Text passt in die Mitte, wenn die Pfeile nach aussen kommen
}
rPol.eUsedTextHPos=bOutside ? SDRMEASURE_TEXTLEFTOUTSIDE : SDRMEASURE_TEXTINSIDE;
}
- if (rPol.eUsedTextHPos!=SDRMEASURE_TEXTINSIDE) bPfeileAussen=TRUE;
+ if (rPol.eUsedTextHPos!=SDRMEASURE_TEXTINSIDE) bPfeileAussen=sal_True;
rPol.nArrow1Wdt=nArrow1Wdt;
rPol.nArrow2Wdt=nArrow2Wdt;
rPol.nShortLineLen=nShortLen;
@@ -461,12 +461,12 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly&
rPol.nTextWink=rPol.nLineWink;
if (rRec.bTextRota90) rPol.nTextWink+=9000;
- rPol.bAutoUpsideDown=FALSE;
+ rPol.bAutoUpsideDown=sal_False;
if (rRec.bTextAutoAngle) {
long nTmpWink=NormAngle360(rPol.nTextWink-rRec.nTextAutoAngleView);
if (nTmpWink>=18000) {
rPol.nTextWink+=18000;
- rPol.bAutoUpsideDown=TRUE;
+ rPol.bAutoUpsideDown=sal_True;
}
}
@@ -581,8 +581,8 @@ basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol)
return aRetval;
}
-FASTBOOL SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
- FASTBOOL bEdit,
+int SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
+ int bEdit,
Color*& rpTxtColor, Color*& rpFldColor, XubString& rRet) const
{
const SvxFieldData* pField=rField.GetField();
@@ -596,7 +596,7 @@ FASTBOOL SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara,
rpFldColor=NULL;
}
}
- return TRUE;
+ return sal_True;
} else {
return SdrTextObj::CalcFieldValue(rField,nPara,nPos,bEdit,rpTxtColor,rpFldColor,rRet);
}
@@ -628,14 +628,14 @@ void SdrMeasureObj::UndirtyText() const
rOutliner.SetText(*pOutlinerParaObject);
}
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
rOutliner.UpdateFields();
Size aSiz(rOutliner.CalcTextSize());
rOutliner.Clear();
// 3x casting auf nonconst
((SdrMeasureObj*)this)->aTextSize=aSiz;
- ((SdrMeasureObj*)this)->bTextSizeDirty=FALSE;
- ((SdrMeasureObj*)this)->bTextDirty=FALSE;
+ ((SdrMeasureObj*)this)->bTextSizeDirty=sal_False;
+ ((SdrMeasureObj*)this)->bTextDirty=sal_False;
}
}
@@ -667,9 +667,9 @@ void SdrMeasureObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
}
Point aTextPos;
- FASTBOOL bRota90=aRec.bTextRota90;
- FASTBOOL bUpsideDown=aRec.bTextUpsideDown!=aMPol.bAutoUpsideDown;
- FASTBOOL bBelowRefEdge=aRec.bBelowRefEdge;
+ int bRota90=aRec.bTextRota90;
+ int bUpsideDown=aRec.bTextUpsideDown!=aMPol.bAutoUpsideDown;
+ int bBelowRefEdge=aRec.bBelowRefEdge;
SdrMeasureTextHPos eMH=aMPol.eUsedTextHPos;
SdrMeasureTextVPos eMV=aMPol.eUsedTextVPos;
if (!bRota90) {
@@ -910,9 +910,9 @@ void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) c
const SdrHdl* pHdl=rDrag.GetHdl();
sal_uInt32 nHdlNum(pHdl->GetObjHdlNum());
- FASTBOOL bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho();
- FASTBOOL bBigOrtho=bOrtho && rDrag.GetView()->IsBigOrtho();
- FASTBOOL bBelow=rRec.bBelowRefEdge;
+ int bOrtho=rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho();
+ int bBigOrtho=bOrtho && rDrag.GetView()->IsBigOrtho();
+ int bBelow=rRec.bBelowRefEdge;
Point aPt(rDrag.GetNow());
switch (nHdlNum) {
@@ -929,22 +929,22 @@ void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) c
if (bOrtho) rRec.nHelpline1Len=rRec.nHelpline2Len;
} break;
case 2: case 3: {
- FASTBOOL bAnf=nHdlNum==2;
+ int bAnf=nHdlNum==2;
Point& rMov=bAnf ? rRec.aPt1 : rRec.aPt2;
Point aMov(rMov);
Point aFix(bAnf ? rRec.aPt2 : rRec.aPt1);
if (bOrtho) {
long ndx0=aMov.X()-aFix.X();
long ndy0=aMov.Y()-aFix.Y();
- FASTBOOL bHLin=ndy0==0;
- FASTBOOL bVLin=ndx0==0;
+ int bHLin=ndy0==0;
+ int bVLin=ndx0==0;
if (!bHLin || !bVLin) { // sonst ist aPt1==aPt2
long ndx=aPt.X()-aFix.X();
long ndy=aPt.Y()-aFix.Y();
double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0;
double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0;
- FASTBOOL bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho);
- FASTBOOL bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho);
+ int bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho);
+ int bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho);
if (bHor) ndy=long(ndy0*nXFact);
if (bVer) ndx=long(ndx0*nYFact);
aPt=aFix;
@@ -971,16 +971,16 @@ void SdrMeasureObj::ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) c
////////////////////////////////////////////////////////////////////////////////////////////////////
-FASTBOOL SdrMeasureObj::BegCreate(SdrDragStat& rStat)
+int SdrMeasureObj::BegCreate(SdrDragStat& rStat)
{
rStat.SetOrtho8Possible();
aPt1=rStat.GetStart();
aPt2=rStat.GetNow();
SetTextDirty();
- return TRUE;
+ return sal_True;
}
-FASTBOOL SdrMeasureObj::MovCreate(SdrDragStat& rStat)
+int SdrMeasureObj::MovCreate(SdrDragStat& rStat)
{
SdrView* pView=rStat.GetView();
aPt1=rStat.GetStart();
@@ -991,20 +991,20 @@ FASTBOOL SdrMeasureObj::MovCreate(SdrDragStat& rStat)
}
SetTextDirty();
SetBoundRectDirty();
- bSnapRectDirty=TRUE;
- return TRUE;
+ bSnapRectDirty=sal_True;
+ return sal_True;
}
-FASTBOOL SdrMeasureObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+int SdrMeasureObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
SetTextDirty();
SetRectsDirty();
return (eCmd==SDRCREATE_FORCEEND || rStat.GetPointAnz()>=2);
}
-FASTBOOL SdrMeasureObj::BckCreate(SdrDragStat& /*rStat*/)
+int SdrMeasureObj::BckCreate(SdrDragStat& /*rStat*/)
{
- return FALSE;
+ return sal_False;
}
void SdrMeasureObj::BrkCreate(SdrDragStat& /*rStat*/)
@@ -1073,7 +1073,7 @@ void SdrMeasureObj::NbcMirror(const Point& rRef1, const Point& rRef2)
SetRectsDirty();
}
-void SdrMeasureObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+void SdrMeasureObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear)
{
SdrTextObj::NbcShear(rRef,nWink,tn,bVShear);
ShearPoint(aPt1,rRef,tn,bVShear);
@@ -1158,7 +1158,7 @@ void SdrMeasureObj::RestGeoData(const SdrObjGeoData& rGeo)
SetTextDirty();
}
-SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier) const
{
// get XOR Poly as base
XPolyPolygon aTmpPolyPolygon(TakeXorPoly());
@@ -1174,8 +1174,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const
// prepare parameters
basegfx::B2DPolyPolygon aPolyPoly;
SdrPathObj* pPath;
- UINT16 nCount(aTmpPolyPolygon.Count());
- UINT16 nLoopStart(0);
+ sal_uInt16 nCount(aTmpPolyPolygon.Count());
+ sal_uInt16 nLoopStart(0);
if(nCount == 3)
{
@@ -1196,8 +1196,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const
{
// four lines, middle line with gap, so there are two lines used
// which have one arrow each
- //INT32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
- INT32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
+ //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
+ sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
aSet.Put(XLineEndWidthItem(0L));
aPolyPoly.clear();
@@ -1227,8 +1227,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const
else if(nCount == 5)
{
// five lines, first two are the outer ones
- //INT32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
- INT32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
+ //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue();
+ sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue();
aSet.Put(XLineEndWidthItem(0L));
@@ -1298,8 +1298,8 @@ void SdrMeasureObj::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject)
SetTextDirty(); // Text neu berechnen!
}
-void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText,
- Rectangle* pAnchorRect, BOOL bLineWidth ) const
+void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText,
+ Rectangle* pAnchorRect, sal_Bool bLineWidth ) const
{
if (bTextDirty) UndirtyText();
SdrTextObj::TakeTextRect( rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth );
@@ -1317,7 +1317,7 @@ void SdrMeasureObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle
SdrTextObj::TakeTextEditArea(pPaperMin,pPaperMax,pViewInit,pViewMin);
}
-USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const
+sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const
{
if (bTextDirty) UndirtyText();
ImpMeasureRec aRec;
@@ -1329,9 +1329,9 @@ USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const
SdrTextVertAdjust eTV=GetTextVerticalAdjust();
SdrMeasureTextHPos eMH=aMPol.eUsedTextHPos;
SdrMeasureTextVPos eMV=aMPol.eUsedTextVPos;
- FASTBOOL bTextRota90=aRec.bTextRota90;
- //FASTBOOL bTextUpsideDown=aRec.bTextUpsideDown;
- FASTBOOL bBelowRefEdge=aRec.bBelowRefEdge;
+ int bTextRota90=aRec.bTextRota90;
+ //int bTextUpsideDown=aRec.bTextUpsideDown;
+ int bBelowRefEdge=aRec.bBelowRefEdge;
// bTextUpsideDown muss hier noch ausgewertet werden!!!!
if (!bTextRota90) {
@@ -1369,7 +1369,7 @@ USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const
else if (eTV==SDRTEXTVERTADJUST_BOTTOM) eRet=ANCHOR_BOTTOM_HCENTER;
else eRet=ANCHOR_VCENTER_HCENTER;
}
- return (USHORT)eRet;
+ return (sal_uInt16)eRet;
}
//////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 216783663603..814f41e1921d 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -397,7 +397,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI()
xParentFrame->setActiveFrame( xOwnFrame );
OLEObjCache& rObjCache = GetSdrGlobalData().GetOLEObjCache();
- const ULONG nCount = rObjCache.Count();
+ const sal_uIntPtr nCount = rObjCache.Count();
for(sal_Int32 i = nCount-1 ; i >= 0;--i)
{
SdrOle2Obj* pObj = reinterpret_cast<SdrOle2Obj*>(rObjCache.GetObject(i));
@@ -627,7 +627,7 @@ SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject):
::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ),
pObj(pObject)
{
- SetSynchron( FALSE );
+ SetSynchron( sal_False );
}
// -----------------------------------------------------------------------------
@@ -752,29 +752,29 @@ sdr::contact::ViewContact* SdrOle2Obj::CreateObjectSpecificViewContact()
TYPEINIT1(SdrOle2Obj,SdrRectObj);
DBG_NAME(SdrOle2Obj)
-SdrOle2Obj::SdrOle2Obj(FASTBOOL bFrame_) : m_bTypeAsked(false)
+SdrOle2Obj::SdrOle2Obj(int bFrame_) : m_bTypeAsked(false)
,m_bChart(false)
{
DBG_CTOR( SdrOle2Obj,NULL);
- bInDestruction = FALSE;
+ bInDestruction = sal_False;
Init();
bFrame=bFrame_;
}
// -----------------------------------------------------------------------------
-SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFrame_)
+SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, int bFrame_)
: xObjRef( rNewObjRef )
, m_bTypeAsked(false)
, m_bChart(false)
{
DBG_CTOR( SdrOle2Obj,NULL);
- bInDestruction = FALSE;
+ bInDestruction = sal_False;
Init();
bFrame=bFrame_;
if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
- SetResizeProtect(TRUE);
+ SetResizeProtect(sal_True);
// #108759# For math objects, set closed state to transparent
if( ImplIsMathObj( xObjRef.GetObject() ) )
@@ -783,20 +783,20 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, FASTBOOL bFram
// -----------------------------------------------------------------------------
-SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, FASTBOOL bFrame_)
+SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, int bFrame_)
: xObjRef( rNewObjRef )
, m_bTypeAsked(false)
, m_bChart(false)
{
DBG_CTOR( SdrOle2Obj,NULL);
- bInDestruction = FALSE;
+ bInDestruction = sal_False;
Init();
mpImpl->aPersistName = rNewObjName;
bFrame=bFrame_;
if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
- SetResizeProtect(TRUE);
+ SetResizeProtect(sal_True);
// #108759# For math objects, set closed state to transparent
if( ImplIsMathObj( xObjRef.GetObject() ) )
@@ -805,21 +805,21 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStrin
// -----------------------------------------------------------------------------
-SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, FASTBOOL bFrame_)
+SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubString& rNewObjName, const Rectangle& rNewRect, int bFrame_)
: SdrRectObj(rNewRect)
, xObjRef( rNewObjRef )
, m_bTypeAsked(false)
, m_bChart(false)
{
DBG_CTOR( SdrOle2Obj,NULL);
- bInDestruction = FALSE;
+ bInDestruction = sal_False;
Init();
mpImpl->aPersistName = rNewObjName;
bFrame=bFrame_;
if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
- SetResizeProtect(TRUE);
+ SetResizeProtect(sal_True);
// #108759# For math objects, set closed state to transparent
if( ImplIsMathObj( xObjRef.GetObject() ) )
@@ -836,7 +836,7 @@ void SdrOle2Obj::Init()
mpImpl->pGraphicObject=NULL;
mpImpl->pLightClient = 0;
- xObjRef.Lock( TRUE );
+ xObjRef.Lock( sal_True );
}
// -----------------------------------------------------------------------------
@@ -844,7 +844,7 @@ void SdrOle2Obj::Init()
SdrOle2Obj::~SdrOle2Obj()
{
DBG_DTOR( SdrOle2Obj,NULL);
- bInDestruction = TRUE;
+ bInDestruction = sal_True;
if ( mpImpl->mbConnected )
Disconnect();
@@ -911,7 +911,7 @@ void SdrOle2Obj::SetGraphic(const Graphic* pGrf)
// -----------------------------------------------------------------------------
-FASTBOOL SdrOle2Obj::IsEmpty() const
+int SdrOle2Obj::IsEmpty() const
{
return !(xObjRef.is());
}
@@ -1123,7 +1123,7 @@ void SdrOle2Obj::Connect_Impl()
{
xObjRef.AssignToContainer( &rContainer, mpImpl->aPersistName );
mpImpl->mbConnected = true;
- xObjRef.Lock( TRUE );
+ xObjRef.Lock( sal_True );
}
}
@@ -1174,7 +1174,7 @@ void SdrOle2Obj::Connect_Impl()
pModel->GetRefDevice()->GetOutDevType() == OUTDEV_PRINTER)
{
// Kein RefDevice oder RefDevice kein Printer
- BOOL bModified = (*ppObjRef)->IsModified();
+ sal_Bool bModified = (*ppObjRef)->IsModified();
Printer* pPrinter = (Printer*) pModel->GetRefDevice();
(*ppObjRef)->OnDocumentPrinterChanged( pPrinter );
(*ppObjRef)->SetModified( bModified );
@@ -1419,8 +1419,8 @@ void SdrOle2Obj::SetModel(SdrModel* pNewModel)
void SdrOle2Obj::SetPage(SdrPage* pNewPage)
{
- FASTBOOL bRemove=pNewPage==NULL && pPage!=NULL;
- FASTBOOL bInsert=pNewPage!=NULL && pPage==NULL;
+ int bRemove=pNewPage==NULL && pPage!=NULL;
+ int bInsert=pNewPage!=NULL && pPage==NULL;
if (bRemove && mpImpl->mbConnected )
Disconnect();
@@ -1442,7 +1442,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
// MBA: the caller of the method is responsible to control the old object, it will not be closed here
// Otherwise WW8 import crashes because it tranfers control to OLENode by this method
if ( xObjRef.GetObject().is() )
- xObjRef.Lock( FALSE );
+ xObjRef.Lock( sal_False );
// MBA: avoid removal of object in Disconnect! It is definitely a HACK to call SetObjRef(0)!
// This call will try to close the objects; so if anybody else wants to keep it, it must be locked by a CloseListener
@@ -1459,7 +1459,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta
DELETEZ( pGraphic );
if ( (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) )
- SetResizeProtect(TRUE);
+ SetResizeProtect(sal_True);
// #108759# For math objects, set closed state to transparent
if( ImplIsMathObj( rNewObjRef ) )
@@ -1557,28 +1557,28 @@ String SdrOle2Obj::GetPersistName() const
void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed=FALSE;
- rInfo.bRotate90Allowed =FALSE;
- rInfo.bMirrorFreeAllowed=FALSE;
- rInfo.bMirror45Allowed =FALSE;
- rInfo.bMirror90Allowed =FALSE;
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
- rInfo.bShearAllowed =FALSE;
- rInfo.bEdgeRadiusAllowed=FALSE;
- rInfo.bNoOrthoDesired =FALSE;
- rInfo.bCanConvToPath =FALSE;
- rInfo.bCanConvToPoly =FALSE;
- rInfo.bCanConvToPathLineToArea=FALSE;
- rInfo.bCanConvToPolyLineToArea=FALSE;
- rInfo.bCanConvToContour = FALSE;
+ rInfo.bRotateFreeAllowed=sal_False;
+ rInfo.bRotate90Allowed =sal_False;
+ rInfo.bMirrorFreeAllowed=sal_False;
+ rInfo.bMirror45Allowed =sal_False;
+ rInfo.bMirror90Allowed =sal_False;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
+ rInfo.bShearAllowed =sal_False;
+ rInfo.bEdgeRadiusAllowed=sal_False;
+ rInfo.bNoOrthoDesired =sal_False;
+ rInfo.bCanConvToPath =sal_False;
+ rInfo.bCanConvToPoly =sal_False;
+ rInfo.bCanConvToPathLineToArea=sal_False;
+ rInfo.bCanConvToPolyLineToArea=sal_False;
+ rInfo.bCanConvToContour = sal_False;
}
// -----------------------------------------------------------------------------
-UINT16 SdrOle2Obj::GetObjIdentifier() const
+sal_uInt16 SdrOle2Obj::GetObjIdentifier() const
{
- return bFrame ? UINT16(OBJ_FRAME) : UINT16(OBJ_OLE2);
+ return bFrame ? sal_uInt16(OBJ_FRAME) : sal_uInt16(OBJ_OLE2);
}
// -----------------------------------------------------------------------------
@@ -1980,23 +1980,23 @@ sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xOb
// -----------------------------------------------------------------------------
-BOOL SdrOle2Obj::Unload()
+sal_Bool SdrOle2Obj::Unload()
{
- BOOL bUnloaded = FALSE;
+ sal_Bool bUnloaded = sal_False;
if( xObjRef.is() )
{
//TODO/LATER: no refcounting tricks anymore!
//"customers" must register as state change listeners
//Nicht notwendig im Doc DTor (MM)
- //ULONG nRefCount = (*ppObjRef)->GetRefCount();
+ //sal_uIntPtr nRefCount = (*ppObjRef)->GetRefCount();
// prevent Unload if there are external references
//if( nRefCount > 2 )
- // return FALSE;
+ // return sal_False;
//DBG_ASSERT( nRefCount == 2, "Wrong RefCount for unload" );
}
else
- bUnloaded = TRUE;
+ bUnloaded = sal_True;
if ( pModel && xObjRef.is() )
{
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index b3f61c7b0813..ab190826b4ba 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -80,7 +80,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); }
using namespace sdr;
-inline USHORT GetPrevPnt(USHORT nPnt, USHORT nPntMax, FASTBOOL bClosed)
+inline sal_uInt16 GetPrevPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, int bClosed)
{
if (nPnt>0) {
nPnt--;
@@ -91,7 +91,7 @@ inline USHORT GetPrevPnt(USHORT nPnt, USHORT nPntMax, FASTBOOL bClosed)
return nPnt;
}
-inline USHORT GetNextPnt(USHORT nPnt, USHORT nPntMax, FASTBOOL bClosed)
+inline sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, int bClosed)
{
nPnt++;
if (nPnt>nPntMax || (bClosed && nPnt>=nPntMax)) nPnt=0;
@@ -101,45 +101,45 @@ inline USHORT GetNextPnt(USHORT nPnt, USHORT nPntMax, FASTBOOL bClosed)
struct ImpSdrPathDragData : public SdrDragStatUserData
{
XPolygon aXP; // Ausschnitt aud dem Originalpolygon
- FASTBOOL bValid; // FALSE = zu wenig Punkte
- FASTBOOL bClosed; // geschlossenes Objekt?
- USHORT nPoly; // Nummer des Polygons im PolyPolygon
- USHORT nPnt; // Punktnummer innerhalb des obigen Polygons
- USHORT nPntAnz; // Punktanzahl des Polygons
- USHORT nPntMax; // Maximaler Index
- FASTBOOL bBegPnt; // Gedraggter Punkt ist der Anfangspunkt einer Polyline
- FASTBOOL bEndPnt; // Gedraggter Punkt ist der Endpunkt einer Polyline
- USHORT nPrevPnt; // Index des vorherigen Punkts
- USHORT nNextPnt; // Index des naechsten Punkts
- FASTBOOL bPrevIsBegPnt; // Vorheriger Punkt ist Anfangspunkt einer Polyline
- FASTBOOL bNextIsEndPnt; // Folgepunkt ist Endpunkt einer Polyline
- USHORT nPrevPrevPnt; // Index des vorvorherigen Punkts
- USHORT nNextNextPnt; // Index des uebernaechsten Punkts
- FASTBOOL bControl; // Punkt ist ein Kontrollpunkt
- FASTBOOL bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
- FASTBOOL bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
- FASTBOOL bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
- FASTBOOL bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
- USHORT nPrevPrevPnt0;
- USHORT nPrevPnt0;
- USHORT nPnt0;
- USHORT nNextPnt0;
- USHORT nNextNextPnt0;
- FASTBOOL bEliminate; // Punkt loeschen? (wird von MovDrag gesetzt)
+ int bValid; // sal_False = zu wenig Punkte
+ int bClosed; // geschlossenes Objekt?
+ sal_uInt16 nPoly; // Nummer des Polygons im PolyPolygon
+ sal_uInt16 nPnt; // Punktnummer innerhalb des obigen Polygons
+ sal_uInt16 nPntAnz; // Punktanzahl des Polygons
+ sal_uInt16 nPntMax; // Maximaler Index
+ int bBegPnt; // Gedraggter Punkt ist der Anfangspunkt einer Polyline
+ int bEndPnt; // Gedraggter Punkt ist der Endpunkt einer Polyline
+ sal_uInt16 nPrevPnt; // Index des vorherigen Punkts
+ sal_uInt16 nNextPnt; // Index des naechsten Punkts
+ int bPrevIsBegPnt; // Vorheriger Punkt ist Anfangspunkt einer Polyline
+ int bNextIsEndPnt; // Folgepunkt ist Endpunkt einer Polyline
+ sal_uInt16 nPrevPrevPnt; // Index des vorvorherigen Punkts
+ sal_uInt16 nNextNextPnt; // Index des uebernaechsten Punkts
+ int bControl; // Punkt ist ein Kontrollpunkt
+ int bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
+ int bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
+ int bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
+ int bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
+ sal_uInt16 nPrevPrevPnt0;
+ sal_uInt16 nPrevPnt0;
+ sal_uInt16 nPnt0;
+ sal_uInt16 nNextPnt0;
+ sal_uInt16 nNextNextPnt0;
+ int bEliminate; // Punkt loeschen? (wird von MovDrag gesetzt)
// ##
- BOOL mbMultiPointDrag;
+ sal_Bool mbMultiPointDrag;
const XPolyPolygon maOrig;
XPolyPolygon maMove;
Container maHandles;
public:
- ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, BOOL bMuPoDr, const SdrDragStat& rDrag);
+ ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, sal_Bool bMuPoDr, const SdrDragStat& rDrag);
void ResetPoly(const SdrPathObj& rPO);
- BOOL IsMultiPointDrag() const { return mbMultiPointDrag; }
+ sal_Bool IsMultiPointDrag() const { return mbMultiPointDrag; }
};
-ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, BOOL bMuPoDr, const SdrDragStat& rDrag)
+ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, sal_Bool bMuPoDr, const SdrDragStat& rDrag)
: aXP(5),
mbMultiPointDrag(bMuPoDr),
maOrig(rPO.GetPathPoly()),
@@ -163,11 +163,11 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl
}
maMove = maOrig;
- bValid = TRUE;
+ bValid = sal_True;
}
else
{
- bValid=FALSE;
+ bValid=sal_False;
bClosed=rPO.IsClosed(); // geschlossenes Objekt?
nPoly=(sal_uInt16)rHdl.GetPolyNum(); // Nummer des Polygons im PolyPolygon
nPnt=(sal_uInt16)rHdl.GetPointNum(); // Punktnummer innerhalb des obigen Polygons
@@ -192,10 +192,10 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl
if (!bPrevIsBegPnt) nPrevPrevPnt=GetPrevPnt(nPrevPnt,nPntMax,bClosed);
if (!bNextIsEndPnt) nNextNextPnt=GetNextPnt(nNextPnt,nPntMax,bClosed);
bControl=rHdl.IsPlusHdl(); // Punkt ist ein Kontrollpunkt
- bIsPrevControl=FALSE; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
- bIsNextControl=FALSE; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
- bPrevIsControl=FALSE; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
- bNextIsControl=FALSE; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
+ bIsPrevControl=sal_False; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
+ bIsNextControl=sal_False; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
+ bPrevIsControl=sal_False; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
+ bNextIsControl=sal_False; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
if (bControl) {
bIsPrevControl=aTmpXP.IsControl(nPrevPnt);
bIsNextControl=!bIsPrevControl;
@@ -213,9 +213,9 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl
nPnt=2;
nNextPnt=3;
nNextNextPnt=4;
- bEliminate=FALSE;
+ bEliminate=sal_False;
ResetPoly(rPO);
- bValid=TRUE;
+ bValid=sal_True;
}
}
@@ -249,37 +249,37 @@ struct ImpPathCreateUser : public SdrDragStatUserData
long nCircRadius;
long nCircStWink;
long nCircRelWink;
- FASTBOOL bBezier;
- FASTBOOL bBezHasCtrl0;
- FASTBOOL bCurve;
- FASTBOOL bCircle;
- FASTBOOL bAngleSnap;
- FASTBOOL bLine;
- FASTBOOL bLine90;
- FASTBOOL bRect;
- FASTBOOL bMixedCreate;
- USHORT nBezierStartPoint;
+ int bBezier;
+ int bBezHasCtrl0;
+ int bCurve;
+ int bCircle;
+ int bAngleSnap;
+ int bLine;
+ int bLine90;
+ int bRect;
+ int bMixedCreate;
+ sal_uInt16 nBezierStartPoint;
SdrObjKind eStartKind;
SdrObjKind eAktKind;
public:
ImpPathCreateUser(): nCircRadius(0),nCircStWink(0),nCircRelWink(0),
- bBezier(FALSE),bBezHasCtrl0(FALSE),bCurve(FALSE),bCircle(FALSE),bAngleSnap(FALSE),bLine(FALSE),bLine90(FALSE),bRect(FALSE),
- bMixedCreate(FALSE),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { }
+ bBezier(sal_False),bBezHasCtrl0(sal_False),bCurve(sal_False),bCircle(sal_False),bAngleSnap(sal_False),bLine(sal_False),bLine90(sal_False),bRect(sal_False),
+ bMixedCreate(sal_False),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { }
- void ResetFormFlags() { bBezier=FALSE; bCurve=FALSE; bCircle=FALSE; bLine=FALSE; bRect=FALSE; }
- FASTBOOL IsFormFlag() const { return bBezier || bCurve || bCircle || bLine || bRect; }
+ void ResetFormFlags() { bBezier=sal_False; bCurve=sal_False; bCircle=sal_False; bLine=sal_False; bRect=sal_False; }
+ int IsFormFlag() const { return bBezier || bCurve || bCircle || bLine || bRect; }
XPolygon GetFormPoly() const;
- FASTBOOL CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, FASTBOOL bMouseDown);
+ int CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, int bMouseDown);
XPolygon GetBezierPoly() const;
- //FASTBOOL CalcCurve(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { return FALSE; }
+ //int CalcCurve(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { return sal_False; }
XPolygon GetCurvePoly() const { return XPolygon(); }
- FASTBOOL CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView);
+ int CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView);
XPolygon GetCirclePoly() const;
- FASTBOOL CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView);
+ int CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView);
Point CalcLine(const Point& rCsr, long nDirX, long nDirY, SdrView* pView) const;
XPolygon GetLinePoly() const;
- FASTBOOL CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView);
+ int CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView);
XPolygon GetRectPoly() const;
};
@@ -293,9 +293,9 @@ XPolygon ImpPathCreateUser::GetFormPoly() const
return XPolygon();
}
-FASTBOOL ImpPathCreateUser::CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, FASTBOOL bMouseDown)
+int ImpPathCreateUser::CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, int bMouseDown)
{
- FASTBOOL bRet=TRUE;
+ int bRet=sal_True;
aBezStart=rP1;
aBezCtrl1=rP1+rDir;
aBezCtrl2=rP2;
@@ -318,7 +318,7 @@ XPolygon ImpPathCreateUser::GetBezierPoly() const
return aXP;
}
-FASTBOOL ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView)
+int ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView)
{
long nTangAngle=GetAngle(rDir);
aCircStart=rP1;
@@ -329,7 +329,7 @@ FASTBOOL ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const
long dAngle=GetAngle(Point(dx,dy))-nTangAngle;
dAngle=NormAngle360(dAngle);
long nTmpAngle=NormAngle360(9000-dAngle);
- FASTBOOL bRet=nTmpAngle!=9000 && nTmpAngle!=27000;
+ int bRet=nTmpAngle!=9000 && nTmpAngle!=27000;
long nRad=0;
if (bRet) {
double cs=cos(nTmpAngle*nPi180);
@@ -351,7 +351,7 @@ FASTBOOL ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const
if (bAngleSnap) {
long nSA=pView->GetSnapAngle();
if (nSA!=0) { // Winkelfang
- FASTBOOL bNeg=nCircRelWink<0;
+ int bNeg=nCircRelWink<0;
if (bNeg) nCircRelWink=-nCircRelWink;
nCircRelWink+=nSA/2;
nCircRelWink/=nSA;
@@ -361,7 +361,7 @@ FASTBOOL ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const
}
}
nCircRadius=nRad;
- if (nRad==0 || Abs(nCircRelWink)<5) bRet=FALSE;
+ if (nRad==0 || Abs(nCircRelWink)<5) bRet=sal_False;
bCircle=bRet;
return bRet;
}
@@ -370,17 +370,17 @@ XPolygon ImpPathCreateUser::GetCirclePoly() const
{
if (nCircRelWink>=0) {
XPolygon aXP(aCircCenter,nCircRadius,nCircRadius,
- USHORT((nCircStWink+5)/10),USHORT((nCircStWink+nCircRelWink+5)/10),FALSE);
+ sal_uInt16((nCircStWink+5)/10),sal_uInt16((nCircStWink+nCircRelWink+5)/10),sal_False);
aXP[0]=aCircStart; aXP.SetFlags(0,XPOLY_SMOOTH);
if (!bAngleSnap) aXP[aXP.GetPointCount()-1]=aCircEnd;
return aXP;
} else {
XPolygon aXP(aCircCenter,nCircRadius,nCircRadius,
- USHORT(NormAngle360(nCircStWink+nCircRelWink+5)/10),USHORT((nCircStWink+5)/10),FALSE);
- USHORT nAnz=aXP.GetPointCount();
- for (USHORT nNum=nAnz/2; nNum>0;) {
+ sal_uInt16(NormAngle360(nCircStWink+nCircRelWink+5)/10),sal_uInt16((nCircStWink+5)/10),sal_False);
+ sal_uInt16 nAnz=aXP.GetPointCount();
+ for (sal_uInt16 nNum=nAnz/2; nNum>0;) {
nNum--; // XPoly Punktreihenfolge umkehren
- USHORT n2=nAnz-nNum-1;
+ sal_uInt16 n2=nAnz-nNum-1;
Point aPt(aXP[nNum]);
aXP[nNum]=aXP[n2];
aXP[n2]=aPt;
@@ -395,8 +395,8 @@ Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, Sdr
{
long x=aCsr.X(),x1=x,x2=x;
long y=aCsr.Y(),y1=y,y2=y;
- FASTBOOL bHLin=nDirY==0;
- FASTBOOL bVLin=nDirX==0;
+ int bHLin=nDirY==0;
+ int bVLin=nDirX==0;
if (bHLin) y=0;
else if (bVLin) x=0;
else {
@@ -413,12 +413,12 @@ Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, Sdr
return Point(x,y);
}
-FASTBOOL ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView)
+int ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView)
{
aLineStart=rP1;
aLineEnd=rP2;
- bLine90=FALSE;
- if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bLine=FALSE; return FALSE; }
+ bLine90=sal_False;
+ if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bLine=sal_False; return sal_False; }
Point aTmpPt(rP2-rP1);
long nDirX=rDir.X();
long nDirY=rDir.Y();
@@ -431,8 +431,8 @@ FASTBOOL ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const P
} else { // rechtwinkliger Uebergang
aLineEnd+=aP2;
}
- bLine=TRUE;
- return TRUE;
+ bLine=sal_True;
+ return sal_True;
}
XPolygon ImpPathCreateUser::GetLinePoly() const
@@ -443,19 +443,19 @@ XPolygon ImpPathCreateUser::GetLinePoly() const
return aXP;
}
-FASTBOOL ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView)
+int ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView)
{
aRectP1=rP1;
aRectP2=rP1;
aRectP3=rP2;
- if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bRect=FALSE; return FALSE; }
+ if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bRect=sal_False; return sal_False; }
Point aTmpPt(rP2-rP1);
long nDirX=rDir.X();
long nDirY=rDir.Y();
long x=aTmpPt.X();
long y=aTmpPt.Y();
- FASTBOOL bHLin=nDirY==0;
- FASTBOOL bVLin=nDirX==0;
+ int bHLin=nDirY==0;
+ int bVLin=nDirX==0;
if (bHLin) y=0;
else if (bVLin) x=0;
else {
@@ -477,7 +477,7 @@ FASTBOOL ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const P
long dy1=aRectP2.Y()-aRectP1.Y(); long dy1a=Abs(dy1);
long dx2=aRectP3.X()-aRectP2.X(); long dx2a=Abs(dx2);
long dy2=aRectP3.Y()-aRectP2.Y(); long dy2a=Abs(dy2);
- FASTBOOL b1MoreThan2=dx1a+dy1a>dx2a+dy2a;
+ int b1MoreThan2=dx1a+dy1a>dx2a+dy2a;
if (b1MoreThan2 != pView->IsBigOrtho()) {
long xtemp=dy2a-dx1a; if (dx1<0) xtemp=-xtemp;
long ytemp=dx2a-dy1a; if (dy1<0) ytemp=-ytemp;
@@ -492,8 +492,8 @@ FASTBOOL ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const P
aRectP3.Y()+=ytemp;
}
}
- bRect=TRUE;
- return TRUE;
+ bRect=sal_True;
+ return sal_True;
}
XPolygon ImpPathCreateUser::GetRectPoly() const
@@ -528,10 +528,10 @@ public:
basegfx::B2DPolyPolygon getSpecialDragPoly(const SdrDragStat& rDrag) const;
// create stuff
- FASTBOOL BegCreate(SdrDragStat& rStat);
- FASTBOOL MovCreate(SdrDragStat& rStat);
- FASTBOOL EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
- FASTBOOL BckCreate(SdrDragStat& rStat);
+ int BegCreate(SdrDragStat& rStat);
+ int MovCreate(SdrDragStat& rStat);
+ int EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd);
+ int BckCreate(SdrDragStat& rStat);
void BrkCreate(SdrDragStat& rStat);
Pointer GetCreatePointer() const;
@@ -568,12 +568,12 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const
{
const SdrHdl* pHdl=rDrag.GetHdl();
if(!pHdl)
- return FALSE;
+ return sal_False;
- BOOL bMultiPointDrag(TRUE);
+ sal_Bool bMultiPointDrag(sal_True);
if(aPathPolygon[(sal_uInt16)pHdl->GetPolyNum()].IsControl((sal_uInt16)pHdl->GetPointNum()))
- bMultiPointDrag = FALSE;
+ bMultiPointDrag = sal_False;
if(bMultiPointDrag)
{
@@ -594,7 +594,7 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const
}
if(nSelectedPoints <= 1)
- bMultiPointDrag = FALSE;
+ bMultiPointDrag = sal_False;
}
((ImpPathForDragAndCreate*)this)->mpSdrPathDragData = new ImpSdrPathDragData(mrSdrPathObject,*pHdl,bMultiPointDrag,rDrag);
@@ -632,7 +632,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
const XPolygon& rOrig = mpSdrPathDragData->maOrig[nPolyIndex];
XPolygon& rMove = mpSdrPathDragData->maMove[nPolyIndex];
const sal_uInt16 nPointCount(rOrig.GetPointCount());
- BOOL bClosed(rOrig[0] == rOrig[nPointCount-1]);
+ sal_Bool bClosed(rOrig[0] == rOrig[nPointCount-1]);
// move point itself
rMove[nPointIndex] = rOrig[nPointIndex] + aDelta;
@@ -669,30 +669,30 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
mpSdrPathDragData->ResetPoly(mrSdrPathObject);
// Div. Daten lokal Kopieren fuer weniger Code und schnelleren Zugriff
- FASTBOOL bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt?
- USHORT nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des obigen Polygons
- FASTBOOL bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline
- FASTBOOL bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline
- USHORT nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts
- USHORT nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts
- FASTBOOL bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline
- FASTBOOL bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline
- USHORT nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts
- USHORT nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts
- FASTBOOL bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt
- //FASTBOOL bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
- FASTBOOL bIsNextControl=mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
- FASTBOOL bPrevIsControl=mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
- FASTBOOL bNextIsControl=mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
+ int bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt?
+ sal_uInt16 nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des obigen Polygons
+ int bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline
+ int bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline
+ sal_uInt16 nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts
+ sal_uInt16 nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts
+ int bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline
+ int bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline
+ sal_uInt16 nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts
+ sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts
+ int bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt
+ //int bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
+ int bIsNextControl=mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
+ int bPrevIsControl=mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
+ int bNextIsControl=mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
// Ortho bei Linien/Polygonen = Winkel beibehalten
if (!bControl && rDrag.GetView()!=NULL && rDrag.GetView()->IsOrtho()) {
- FASTBOOL bBigOrtho=rDrag.GetView()->IsBigOrtho();
+ int bBigOrtho=rDrag.GetView()->IsBigOrtho();
Point aPos(rDrag.GetNow()); // die aktuelle Position
Point aPnt(mpSdrPathDragData->aXP[nPnt]); // der gedraggte Punkt
- USHORT nPnt1=0xFFFF,nPnt2=0xFFFF; // seine Nachbarpunkte
+ sal_uInt16 nPnt1=0xFFFF,nPnt2=0xFFFF; // seine Nachbarpunkte
Point aNeuPos1,aNeuPos2; // die neuen Alternativen fuer aPos
- FASTBOOL bPnt1=FALSE,bPnt2=FALSE; // die neuen Alternativen gueltig?
+ int bPnt1=sal_False,bPnt2=sal_False; // die neuen Alternativen gueltig?
if (!bClosed && mpSdrPathDragData->nPntAnz>=2) { // Mind. 2 Pt bei Linien
if (!bBegPnt) nPnt1=nPrevPnt;
if (!bEndPnt) nPnt2=nNextPnt;
@@ -705,16 +705,16 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
Point aPnt1=mpSdrPathDragData->aXP[nPnt1];
long ndx0=aPnt.X()-aPnt1.X();
long ndy0=aPnt.Y()-aPnt1.Y();
- FASTBOOL bHLin=ndy0==0;
- FASTBOOL bVLin=ndx0==0;
+ int bHLin=ndy0==0;
+ int bVLin=ndx0==0;
if (!bHLin || !bVLin) {
long ndx=aPos.X()-aPnt1.X();
long ndy=aPos.Y()-aPnt1.Y();
- bPnt1=TRUE;
+ bPnt1=sal_True;
double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0;
double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0;
- FASTBOOL bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho);
- FASTBOOL bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho);
+ int bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho);
+ int bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho);
if (bHor) ndy=long(ndy0*nXFact);
if (bVer) ndx=long(ndx0*nYFact);
aNeuPos1=aPnt1;
@@ -726,16 +726,16 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
Point aPnt2=mpSdrPathDragData->aXP[nPnt2];
long ndx0=aPnt.X()-aPnt2.X();
long ndy0=aPnt.Y()-aPnt2.Y();
- FASTBOOL bHLin=ndy0==0;
- FASTBOOL bVLin=ndx0==0;
+ int bHLin=ndy0==0;
+ int bVLin=ndx0==0;
if (!bHLin || !bVLin) {
long ndx=aPos.X()-aPnt2.X();
long ndy=aPos.Y()-aPnt2.Y();
- bPnt2=TRUE;
+ bPnt2=sal_True;
double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0;
double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0;
- FASTBOOL bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho);
- FASTBOOL bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho);
+ int bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho);
+ int bVer=bVLin || (!bHLin && (nXFact<=nYFact)==bBigOrtho);
if (bHor) ndy=long(ndy0*nXFact);
if (bVer) ndx=long(ndx0*nYFact);
aNeuPos2=aPnt2;
@@ -751,7 +751,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
nX1+=nY1; // Korrekturabstand zum Quadrat
nX2+=nY2; // Korrekturabstand zum Quadrat
// Die Alternative mit dem geringeren Korrekturbedarf gewinnt
- if (nX1<nX2) bPnt2=FALSE; else bPnt1=FALSE;
+ if (nX1<nX2) bPnt2=sal_False; else bPnt1=sal_False;
}
if (bPnt1) rDrag.Now()=aNeuPos1;
if (bPnt2) rDrag.Now()=aNeuPos2;
@@ -800,8 +800,8 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const
// Nun symmetrische PlusHandles etc. checken
if (bControl) { // Faelle 5,6,7,8
- USHORT nSt=nPnt; // der zugehoerige Stuetzpunkt
- USHORT nFix=nPnt; // der gegenueberliegende Kontrollpunkt
+ sal_uInt16 nSt=nPnt; // der zugehoerige Stuetzpunkt
+ sal_uInt16 nFix=nPnt; // der gegenueberliegende Kontrollpunkt
if (bIsNextControl) { // Wenn der naechste ein Kontrollpunkt ist, muss der vorh. der Stuetzpunkt sein
nSt=nPrevPnt;
nFix=nPrevPrevPnt;
@@ -912,8 +912,8 @@ bool ImpPathForDragAndCreate::endPathDrag(SdrDragStat& rDrag)
{ // #40549#
Point aLinePt1_(aPathPolygon[0][0]);
Point aLinePt2_(aPathPolygon[0][1]);
- FASTBOOL bXMirr=(aLinePt1_.X()>aLinePt2_.X())!=(aLinePt1.X()>aLinePt2.X());
- FASTBOOL bYMirr=(aLinePt1_.Y()>aLinePt2_.Y())!=(aLinePt1.Y()>aLinePt2.Y());
+ int bXMirr=(aLinePt1_.X()>aLinePt2_.X())!=(aLinePt1.X()>aLinePt2.X());
+ int bYMirr=(aLinePt1_.Y()>aLinePt2_.Y())!=(aLinePt1.Y()>aLinePt2.Y());
if (bXMirr || bYMirr) {
Point aRef1(mrSdrPathObject.GetSnapRect().Center());
if (bXMirr) {
@@ -976,26 +976,26 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
mrSdrPathObject.GetModel()->TakeWinkStr(Abs(pU->nCircRelWink), aMetr);
aStr += aMetr;
aStr.AppendAscii(" r=");
- mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, TRUE);
+ mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, sal_True);
aStr += aMetr;
}
aStr.AppendAscii("dx=");
- mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr, TRUE);
+ mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr, sal_True);
aStr += aMetr;
aStr.AppendAscii(" dy=");
- mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr, TRUE);
+ mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr, sal_True);
aStr += aMetr;
if(!IsFreeHand(meObjectKind))
{
- INT32 nLen(GetLen(aNow));
+ sal_Int32 nLen(GetLen(aNow));
aStr.AppendAscii(" l=");
- mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE);
+ mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
aStr += aMetr;
- INT32 nWink(GetAngle(aNow));
+ sal_Int32 nWink(GetAngle(aNow));
aStr += sal_Unicode(' ');
mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
aStr += aMetr;
@@ -1050,19 +1050,19 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
aStr = String();
aStr.AppendAscii("dx=");
- mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(), aMetr, TRUE);
+ mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(), aMetr, sal_True);
aStr += aMetr;
aStr.AppendAscii(" dy=");
- mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(), aMetr, TRUE);
+ mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(), aMetr, sal_True);
aStr += aMetr;
if(!pDragData->IsMultiPointDrag())
{
- UINT16 nPntNum((sal_uInt16)pHdl->GetPointNum());
+ sal_uInt16 nPntNum((sal_uInt16)pHdl->GetPointNum());
const XPolygon& rXPoly = aPathPolygon[(sal_uInt16)rDrag.GetHdl()->GetPolyNum()];
- UINT16 nPntAnz((sal_uInt16)rXPoly.GetPointCount());
- BOOL bClose(IsClosed(meObjectKind));
+ sal_uInt16 nPntAnz((sal_uInt16)rXPoly.GetPointCount());
+ sal_Bool bClose(IsClosed(meObjectKind));
if(bClose)
nPntAnz--;
@@ -1070,7 +1070,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
if(pHdl->IsPlusHdl())
{
// Hebel
- UINT16 nRef(nPntNum);
+ sal_uInt16 nRef(nPntNum);
if(rXPoly.IsControl(nPntNum + 1))
nRef--;
@@ -1079,31 +1079,31 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
aNow -= rXPoly[nRef];
- INT32 nLen(GetLen(aNow));
+ sal_Int32 nLen(GetLen(aNow));
aStr.AppendAscii(" l=");
- mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE);
+ mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
aStr += aMetr;
- INT32 nWink(GetAngle(aNow));
+ sal_Int32 nWink(GetAngle(aNow));
aStr += sal_Unicode(' ');
mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
aStr += aMetr;
}
else if(nPntAnz > 1)
{
- UINT16 nPntMax(nPntAnz - 1);
+ sal_uInt16 nPntMax(nPntAnz - 1);
Point aPt1,aPt2;
- BOOL bIsClosed(IsClosed(meObjectKind));
- BOOL bPt1(nPntNum > 0);
- BOOL bPt2(nPntNum < nPntMax);
+ sal_Bool bIsClosed(IsClosed(meObjectKind));
+ sal_Bool bPt1(nPntNum > 0);
+ sal_Bool bPt2(nPntNum < nPntMax);
if(bIsClosed && nPntAnz > 2)
{
- bPt1 = TRUE;
- bPt2 = TRUE;
+ bPt1 = sal_True;
+ bPt2 = sal_True;
}
- UINT16 nPt1,nPt2;
+ sal_uInt16 nPt1,nPt2;
if(nPntNum > 0)
nPt1 = nPntNum - 1;
@@ -1116,22 +1116,22 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
nPt2 = 0;
if(bPt1 && rXPoly.IsControl(nPt1))
- bPt1 = FALSE; // Keine Anzeige
+ bPt1 = sal_False; // Keine Anzeige
if(bPt2 && rXPoly.IsControl(nPt2))
- bPt2 = FALSE; // von Bezierdaten
+ bPt2 = sal_False; // von Bezierdaten
if(bPt1)
{
Point aPt(aNow);
aPt -= rXPoly[nPt1];
- INT32 nLen(GetLen(aPt));
+ sal_Int32 nLen(GetLen(aPt));
aStr.AppendAscii(" l=");
- mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE);
+ mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
aStr += aMetr;
- INT32 nWink(GetAngle(aPt));
+ sal_Int32 nWink(GetAngle(aPt));
aStr += sal_Unicode(' ');
mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
aStr += aMetr;
@@ -1147,12 +1147,12 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag)
Point aPt(aNow);
aPt -= rXPoly[nPt2];
- INT32 nLen(GetLen(aPt));
+ sal_Int32 nLen(GetLen(aPt));
aStr.AppendAscii("l=");
- mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE);
+ mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True);
aStr += aMetr;
- INT32 nWink(GetAngle(aPt));
+ sal_Int32 nWink(GetAngle(aPt));
aStr += sal_Unicode(' ');
mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr);
aStr += aMetr;
@@ -1188,22 +1188,22 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra
return aRetval.getB2DPolyPolygon();
}
// Div. Daten lokal Kopieren fuer weniger Code und schnelleren Zugriff
- FASTBOOL bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt?
- USHORT nPntAnz =mpSdrPathDragData->nPntAnz ; // Punktanzahl
- USHORT nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des Polygons
- FASTBOOL bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline
- FASTBOOL bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline
- USHORT nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts
- USHORT nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts
- FASTBOOL bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline
- FASTBOOL bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline
- USHORT nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts
- USHORT nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts
- FASTBOOL bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt
- //FASTBOOL bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
- FASTBOOL bIsNextControl=mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
- FASTBOOL bPrevIsControl=mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
- FASTBOOL bNextIsControl=mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
+ int bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt?
+ sal_uInt16 nPntAnz =mpSdrPathDragData->nPntAnz ; // Punktanzahl
+ sal_uInt16 nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des Polygons
+ int bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline
+ int bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline
+ sal_uInt16 nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts
+ sal_uInt16 nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts
+ int bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline
+ int bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline
+ sal_uInt16 nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts
+ sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts
+ int bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt
+ //int bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt
+ int bIsNextControl=mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt
+ int bPrevIsControl=mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt
+ int bNextIsControl=mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt
XPolygon aXPoly(mpSdrPathDragData->aXP);
XPolygon aLine1(2);
XPolygon aLine2(2);
@@ -1264,7 +1264,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra
}
if (bClosed) { // "Birnenproblem": 2 Linien, 1 Kurve, alles Smooth, Punkt zw. beiden Linien wird gedraggt
if (aXPoly.GetPointCount()>nPntAnz && aXPoly.IsControl(1)) {
- USHORT a=aXPoly.GetPointCount();
+ sal_uInt16 a=aXPoly.GetPointCount();
aXPoly[a-2]=aXPoly[2]; aXPoly.SetFlags(a-2,aXPoly.GetFlags(2));
aXPoly[a-1]=aXPoly[3]; aXPoly.SetFlags(a-1,aXPoly.GetFlags(3));
aXPoly.Remove(0,3);
@@ -1281,18 +1281,18 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra
return aRetval.getB2DPolyPolygon();
}
-FASTBOOL ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat)
+int ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat)
{
bool bFreeHand(IsFreeHand(meObjectKind));
rStat.SetNoSnap(bFreeHand);
rStat.SetOrtho8Possible();
aPathPolygon.Clear();
- mbCreating=TRUE;
- FASTBOOL bMakeStartPoint=TRUE;
+ mbCreating=sal_True;
+ int bMakeStartPoint=sal_True;
SdrView* pView=rStat.GetView();
if (pView!=NULL && pView->IsUseIncompatiblePathCreateInterface() &&
(meObjectKind==OBJ_POLY || meObjectKind==OBJ_PLIN || meObjectKind==OBJ_PATHLINE || meObjectKind==OBJ_PATHFILL)) {
- bMakeStartPoint=FALSE;
+ bMakeStartPoint=sal_False;
}
aPathPolygon.Insert(XPolygon());
aPathPolygon[0][0]=rStat.GetStart();
@@ -1303,18 +1303,18 @@ FASTBOOL ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat)
pU->eStartKind=meObjectKind;
pU->eAktKind=meObjectKind;
rStat.SetUser(pU);
- return TRUE;
+ return sal_True;
}
-FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
+int ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
{
ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser();
SdrView* pView=rStat.GetView();
XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1];
if (pView!=NULL && pView->IsCreateMode()) {
// ggf. auf anderes CreateTool umschalten
- UINT16 nIdent;
- UINT32 nInvent;
+ sal_uInt16 nIdent;
+ sal_uInt32 nInvent;
pView->TakeCurrentObj(nIdent,nInvent);
if (nInvent==SdrInventor && pU->eAktKind!=(SdrObjKind)nIdent) {
SdrObjKind eNewKind=(SdrObjKind)nIdent;
@@ -1326,7 +1326,7 @@ FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
case OBJ_FREELINE: case OBJ_FREEFILL:
case OBJ_SPLNLINE: case OBJ_SPLNFILL: {
pU->eAktKind=eNewKind;
- pU->bMixedCreate=TRUE;
+ pU->bMixedCreate=sal_True;
pU->nBezierStartPoint=rXPoly.GetPointCount();
if (pU->nBezierStartPoint>0) pU->nBezierStartPoint--;
} break;
@@ -1334,7 +1334,7 @@ FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
} // switch
}
}
- USHORT nActPoint=rXPoly.GetPointCount();
+ sal_uInt16 nActPoint=rXPoly.GetPointCount();
if (aPathPolygon.Count()>1 && rStat.IsMouseDown() && nActPoint<2) {
rXPoly[0]=rStat.GetPos0();
rXPoly[1]=rStat.GetNow();
@@ -1343,7 +1343,7 @@ FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
if (nActPoint==0) {
rXPoly[0]=rStat.GetPos0();
} else nActPoint--;
- FASTBOOL bFreeHand=IsFreeHand(pU->eAktKind);
+ int bFreeHand=IsFreeHand(pU->eAktKind);
rStat.SetNoSnap(bFreeHand /*|| (pU->bMixed && pU->eAktKind==OBJ_LINE)*/);
rStat.SetOrtho8Possible(pU->eAktKind!=OBJ_CARC && pU->eAktKind!=OBJ_RECT && (!pU->bMixedCreate || pU->eAktKind!=OBJ_LINE));
Point aActMerk(rXPoly[nActPoint]);
@@ -1370,7 +1370,7 @@ FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
Point aPt1(rStat.Now());
long dx=aPt0.X()-aPt1.X(); if (dx<0) dx=-dx;
long dy=aPt0.Y()-aPt1.Y(); if (dy<0) dy=-dy;
- if (dx<nMinDist && dy<nMinDist) return FALSE;
+ if (dx<nMinDist && dy<nMinDist) return sal_False;
// folgendes ist aus EndCreate kopiert (nur kleine Modifikationen)
// und sollte dann mal in eine Methode zusammengefasst werden:
@@ -1410,24 +1410,24 @@ FASTBOOL ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat)
pU->CalcRect(rXPoly[nActPoint-1],rXPoly[nActPoint],rXPoly[nActPoint-1]-rXPoly[nActPoint-2],pView);
}
- return TRUE;
+ return sal_True;
}
-FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+int ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser();
- FASTBOOL bRet=FALSE;
+ int bRet=sal_False;
SdrView* pView=rStat.GetView();
- FASTBOOL bIncomp=pView!=NULL && pView->IsUseIncompatiblePathCreateInterface();
+ int bIncomp=pView!=NULL && pView->IsUseIncompatiblePathCreateInterface();
XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1];
- USHORT nActPoint=rXPoly.GetPointCount()-1;
+ sal_uInt16 nActPoint=rXPoly.GetPointCount()-1;
Point aAktMerk(rXPoly[nActPoint]);
rXPoly[nActPoint]=rStat.Now();
if (!pU->bMixedCreate && pU->eStartKind==OBJ_LINE) {
if (rStat.GetPointAnz()>=2) eCmd=SDRCREATE_FORCEEND;
bRet=eCmd==SDRCREATE_FORCEEND;
if (bRet) {
- mbCreating=FALSE;
+ mbCreating=sal_False;
delete pU;
rStat.SetUser(NULL);
}
@@ -1438,7 +1438,7 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCm
if (rStat.GetPointAnz()>=2) eCmd=SDRCREATE_FORCEEND;
bRet=eCmd==SDRCREATE_FORCEEND;
if (bRet) {
- mbCreating=FALSE;
+ mbCreating=sal_False;
delete pU;
rStat.SetUser(NULL);
}
@@ -1462,15 +1462,15 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCm
} else {
if (nActPoint==1 && IsBezier(pU->eAktKind) && !pU->bBezHasCtrl0) {
pU->aBezControl0=rStat.GetNow();;
- pU->bBezHasCtrl0=TRUE;
+ pU->bBezHasCtrl0=sal_True;
nActPoint--;
}
if (pU->IsFormFlag()) {
- USHORT nPtAnz0=rXPoly.GetPointCount();
+ sal_uInt16 nPtAnz0=rXPoly.GetPointCount();
rXPoly.Remove(nActPoint-1,2); // die letzten beiden Punkte entfernen und durch die Form ersetzen
rXPoly.Insert(XPOLY_APPEND,pU->GetFormPoly());
- USHORT nPtAnz1=rXPoly.GetPointCount();
- for (USHORT i=nPtAnz0+1; i<nPtAnz1-1; i++) { // Damit BckAction richtig funktioniert
+ sal_uInt16 nPtAnz1=rXPoly.GetPointCount();
+ for (sal_uInt16 i=nPtAnz0+1; i<nPtAnz1-1; i++) { // Damit BckAction richtig funktioniert
if (!rXPoly.IsControl(i)) rStat.NextPoint();
}
nActPoint=rXPoly.GetPointCount()-1;
@@ -1481,7 +1481,7 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCm
}
if (eCmd==SDRCREATE_NEXTOBJECT) {
if (rXPoly.GetPointCount()>=2) {
- pU->bBezHasCtrl0=FALSE;
+ pU->bBezHasCtrl0=sal_False;
// nur einzelnes Polygon kann offen sein, deshalb schliessen
rXPoly[nActPoint]=rXPoly[0];
XPolygon aXP;
@@ -1491,12 +1491,12 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCm
}
}
- USHORT nPolyAnz=aPathPolygon.Count();
+ sal_uInt16 nPolyAnz=aPathPolygon.Count();
if (nPolyAnz!=0) {
// den letzten Punkt ggf. wieder loeschen
if (eCmd==SDRCREATE_FORCEEND) {
XPolygon& rXP=aPathPolygon[nPolyAnz-1];
- USHORT nPtAnz=rXP.GetPointCount();
+ sal_uInt16 nPtAnz=rXP.GetPointCount();
if (nPtAnz>=2) {
if (!rXP.IsControl(nPtAnz-2)) {
if (rXP[nPtAnz-1]==rXP[nPtAnz-2]) {
@@ -1509,10 +1509,10 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCm
}
}
}
- for (USHORT nPolyNum=nPolyAnz; nPolyNum>0;) {
+ for (sal_uInt16 nPolyNum=nPolyAnz; nPolyNum>0;) {
nPolyNum--;
XPolygon& rXP=aPathPolygon[nPolyNum];
- USHORT nPtAnz=rXP.GetPointCount();
+ sal_uInt16 nPtAnz=rXP.GetPointCount();
// Polygone mit zu wenig Punkten werden geloescht
if (nPolyNum<nPolyAnz-1 || eCmd==SDRCREATE_FORCEEND) {
if (nPtAnz<2) aPathPolygon.Remove(nPolyNum);
@@ -1522,19 +1522,19 @@ FASTBOOL ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCm
pU->ResetFormFlags();
bRet=eCmd==SDRCREATE_FORCEEND;
if (bRet) {
- mbCreating=FALSE;
+ mbCreating=sal_False;
delete pU;
rStat.SetUser(NULL);
}
return bRet;
}
-FASTBOOL ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat)
+int ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat)
{
ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser();
if (aPathPolygon.Count()>0) {
XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1];
- USHORT nActPoint=rXPoly.GetPointCount();
+ sal_uInt16 nActPoint=rXPoly.GetPointCount();
if (nActPoint>0) {
nActPoint--;
// Das letzte Stueck einer Bezierkurve wird erstmal zu 'ner Linie
@@ -1558,7 +1558,7 @@ FASTBOOL ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat)
}
if (aPathPolygon.Count()>0) {
XPolygon& rLocalXPoly=aPathPolygon[aPathPolygon.Count()-1];
- USHORT nLocalActPoint=rLocalXPoly.GetPointCount();
+ sal_uInt16 nLocalActPoint=rLocalXPoly.GetPointCount();
if (nLocalActPoint>0) {
nLocalActPoint--;
rLocalXPoly[nLocalActPoint]=rStat.Now();
@@ -1573,7 +1573,7 @@ void ImpPathForDragAndCreate::BrkCreate(SdrDragStat& rStat)
{
ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser();
aPathPolygon.Clear();
- mbCreating=FALSE;
+ mbCreating=sal_False;
delete pU;
rStat.SetUser(NULL);
}
@@ -1844,7 +1844,7 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose)
default: break;
}
- bClosedObj = TRUE;
+ bClosedObj = sal_True;
}
else
{
@@ -1857,7 +1857,7 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose)
default: break;
}
- bClosedObj = FALSE;
+ bClosedObj = sal_False;
}
ImpForceKind();
@@ -1865,20 +1865,20 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose)
void SdrPathObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bNoContortion=FALSE;
+ rInfo.bNoContortion=sal_False;
- FASTBOOL bCanConv = !HasText() || ImpCanConvTextToCurve();
- FASTBOOL bIsPath = IsBezier() || IsSpline();
+ int bCanConv = !HasText() || ImpCanConvTextToCurve();
+ int bIsPath = IsBezier() || IsSpline();
- rInfo.bEdgeRadiusAllowed = FALSE;
+ rInfo.bEdgeRadiusAllowed = sal_False;
rInfo.bCanConvToPath = bCanConv && !bIsPath;
rInfo.bCanConvToPoly = bCanConv && bIsPath;
rInfo.bCanConvToContour = !IsFontwork() && (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
}
-UINT16 SdrPathObj::GetObjIdentifier() const
+sal_uInt16 SdrPathObj::GetObjIdentifier() const
{
- return USHORT(meKind);
+ return sal_uInt16(meKind);
}
void SdrPathObj::operator=(const SdrObject& rObj)
@@ -2060,16 +2060,16 @@ void SdrPathObj::AddToHdlList(SdrHdlList& rHdlList) const
{
// keep old stuff to be able to keep old SdrHdl stuff, too
const XPolyPolygon aOldPathPolygon(GetPathPoly());
- USHORT nPolyCnt=aOldPathPolygon.Count();
- FASTBOOL bClosed=IsClosed();
- USHORT nIdx=0;
+ sal_uInt16 nPolyCnt=aOldPathPolygon.Count();
+ int bClosed=IsClosed();
+ sal_uInt16 nIdx=0;
- for (USHORT i=0; i<nPolyCnt; i++) {
+ for (sal_uInt16 i=0; i<nPolyCnt; i++) {
const XPolygon& rXPoly=aOldPathPolygon.GetObject(i);
- USHORT nPntCnt=rXPoly.GetPointCount();
+ sal_uInt16 nPntCnt=rXPoly.GetPointCount();
if (bClosed && nPntCnt>1) nPntCnt--;
- for (USHORT j=0; j<nPntCnt; j++) {
+ for (sal_uInt16 j=0; j<nPntCnt; j++) {
if (rXPoly.GetFlags(j)!=XPOLY_CONTROL) {
const Point& rPnt=rXPoly[j];
SdrHdl* pHdl=new SdrHdl(rPnt,HDL_POLY);
@@ -2153,7 +2153,7 @@ SdrHdl* SdrPathObj::GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlusNum) const
}
pHdl->SetSourceHdlNum(rHdl.GetSourceHdlNum());
- pHdl->SetPlusHdl(TRUE);
+ pHdl->SetPlusHdl(sal_True);
}
}
}
@@ -2241,20 +2241,20 @@ basegfx::B2DPolyPolygon SdrPathObj::getSpecialDragPoly(const SdrDragStat& rDrag)
////////////////////////////////////////////////////////////////////////////////////////////////////
-FASTBOOL SdrPathObj::BegCreate(SdrDragStat& rStat)
+int SdrPathObj::BegCreate(SdrDragStat& rStat)
{
impDeleteDAC();
return impGetDAC().BegCreate(rStat);
}
-FASTBOOL SdrPathObj::MovCreate(SdrDragStat& rStat)
+int SdrPathObj::MovCreate(SdrDragStat& rStat)
{
return impGetDAC().MovCreate(rStat);
}
-FASTBOOL SdrPathObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+int SdrPathObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
- FASTBOOL bRetval(impGetDAC().EndCreate(rStat, eCmd));
+ int bRetval(impGetDAC().EndCreate(rStat, eCmd));
if(bRetval && mpDAC)
{
@@ -2299,7 +2299,7 @@ FASTBOOL SdrPathObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
return bRetval;
}
-FASTBOOL SdrPathObj::BckCreate(SdrDragStat& rStat)
+int SdrPathObj::BckCreate(SdrDragStat& rStat)
{
return impGetDAC().BckCreate(rStat);
}
@@ -2382,7 +2382,7 @@ void SdrPathObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
SdrTextObj::NbcRotate(rRef,nWink,sn,cs);
}
-void SdrPathObj::NbcShear(const Point& rRefPnt, long nAngle, double fTan, FASTBOOL bVShear)
+void SdrPathObj::NbcShear(const Point& rRefPnt, long nAngle, double fTan, int bVShear)
{
basegfx::B2DHomMatrix aTrans(basegfx::tools::createTranslateB2DHomMatrix(-rRefPnt.X(), -rRefPnt.Y()));
@@ -2739,7 +2739,7 @@ SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index)
return pNewObj;
}
-SdrObject* SdrPathObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrPathObj::DoConvertToPolyObj(sal_Bool bBezier) const
{
// #i89784# check for FontWork with activated HideContour
const drawinglayer::attribute::SdrTextAttribute aText(
diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 84dab2cfb165..e2f96b5178b5 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -79,14 +79,14 @@ TYPEINIT1(SdrRectObj,SdrTextObj);
SdrRectObj::SdrRectObj()
: mpXPoly(0L)
{
- bClosedObj=TRUE;
+ bClosedObj=sal_True;
}
SdrRectObj::SdrRectObj(const Rectangle& rRect)
: SdrTextObj(rRect),
mpXPoly(NULL)
{
- bClosedObj=TRUE;
+ bClosedObj=sal_True;
}
SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind)
@@ -96,7 +96,7 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind)
DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT ||
eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
"SdrRectObj::SdrRectObj(SdrObjKind) ist nur fuer Textrahmen gedacht");
- bClosedObj=TRUE;
+ bClosedObj=sal_True;
}
SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect)
@@ -106,17 +106,17 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect)
DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT ||
eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
"SdrRectObj::SdrRectObj(SdrObjKind,...) ist nur fuer Textrahmen gedacht");
- bClosedObj=TRUE;
+ bClosedObj=sal_True;
}
-SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat)
+SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
: SdrTextObj(eNewTextKind,rNewRect,rInput,rBaseURL,eFormat),
mpXPoly(NULL)
{
DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT ||
eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT,
"SdrRectObj::SdrRectObj(SdrObjKind,...) ist nur fuer Textrahmen gedacht");
- bClosedObj=TRUE;
+ bClosedObj=sal_True;
}
SdrRectObj::~SdrRectObj()
@@ -136,9 +136,9 @@ void SdrRectObj::SetXPolyDirty()
}
}
-FASTBOOL SdrRectObj::PaintNeedsXPoly(long nEckRad) const
+int SdrRectObj::PaintNeedsXPoly(long nEckRad) const
{
- FASTBOOL bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || nEckRad!=0;
+ int bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || nEckRad!=0;
return bNeed;
}
@@ -183,26 +183,26 @@ const XPolygon& SdrRectObj::GetXPoly() const
void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- FASTBOOL bNoTextFrame=!IsTextFrame();
+ int bNoTextFrame=!IsTextFrame();
rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0;
- rInfo.bResizePropAllowed=TRUE;
- rInfo.bRotateFreeAllowed=TRUE;
- rInfo.bRotate90Allowed =TRUE;
+ rInfo.bResizePropAllowed=sal_True;
+ rInfo.bRotateFreeAllowed=sal_True;
+ rInfo.bRotate90Allowed =sal_True;
rInfo.bMirrorFreeAllowed=bNoTextFrame;
rInfo.bMirror45Allowed =bNoTextFrame;
rInfo.bMirror90Allowed =bNoTextFrame;
// allow transparence
- rInfo.bTransparenceAllowed = TRUE;
+ rInfo.bTransparenceAllowed = sal_True;
// gradient depends on fillstyle
XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
rInfo.bShearAllowed =bNoTextFrame;
- rInfo.bEdgeRadiusAllowed=TRUE;
+ rInfo.bEdgeRadiusAllowed=sal_True;
- FASTBOOL bCanConv=!HasText() || ImpCanConvTextToCurve();
+ int bCanConv=!HasText() || ImpCanConvTextToCurve();
if (bCanConv && !bNoTextFrame && !HasText()) {
bCanConv=HasFill() || HasLine();
}
@@ -211,10 +211,10 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
}
-UINT16 SdrRectObj::GetObjIdentifier() const
+sal_uInt16 SdrRectObj::GetObjIdentifier() const
{
- if (IsTextFrame()) return UINT16(eTextKind);
- else return UINT16(OBJ_RECT);
+ if (IsTextFrame()) return sal_uInt16(eTextKind);
+ else return sal_uInt16(OBJ_RECT);
}
void SdrRectObj::TakeUnrotatedSnapRect(Rectangle& rRect) const
@@ -243,7 +243,7 @@ void SdrRectObj::TakeObjNameSingul(XubString& rName) const
}
else
{
- USHORT nResId=STR_ObjNameSingulRECT;
+ sal_uInt16 nResId=STR_ObjNameSingulRECT;
if (aGeo.nShearWink!=0) {
nResId+=4; // Parallelogramm oder Raute
// Raute ist nicht, weil Shear die vertikalen Kanten verlaengert!
@@ -269,7 +269,7 @@ void SdrRectObj::TakeObjNamePlural(XubString& rName) const
{
if (IsTextFrame()) SdrTextObj::TakeObjNamePlural(rName);
else {
- USHORT nResId=STR_ObjNamePluralRECT;
+ sal_uInt16 nResId=STR_ObjNamePluralRECT;
if (aGeo.nShearWink!=0) {
nResId+=4; // Parallelogramm oder Raute
} else {
@@ -509,7 +509,7 @@ void SdrRectObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
SetXPolyDirty();
}
-void SdrRectObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+void SdrRectObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear)
{
SdrTextObj::NbcShear(rRef,nWink,tn,bVShear);
SetXPolyDirty();
@@ -521,7 +521,7 @@ void SdrRectObj::NbcMirror(const Point& rRef1, const Point& rRef2)
SetXPolyDirty();
}
-FASTBOOL SdrRectObj::DoMacro(const SdrObjMacroHitRec& rRec)
+int SdrRectObj::DoMacro(const SdrObjMacroHitRec& rRec)
{
return SdrTextObj::DoMacro(rRec);
}
@@ -531,9 +531,9 @@ XubString SdrRectObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const
return SdrTextObj::GetMacroPopupComment(rRec);
}
-SdrGluePoint SdrRectObj::GetVertexGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrRectObj::GetVertexGluePoint(sal_uInt16 nPosNum) const
{
- INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
+ sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
// #i25616#
if(!LineIsOutsideGeometry())
@@ -553,13 +553,13 @@ SdrGluePoint SdrRectObj::GetVertexGluePoint(USHORT nPosNum) const
if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
aPt-=GetSnapRect().Center();
SdrGluePoint aGP(aPt);
- aGP.SetPercent(FALSE);
+ aGP.SetPercent(sal_False);
return aGP;
}
-SdrGluePoint SdrRectObj::GetCornerGluePoint(USHORT nPosNum) const
+SdrGluePoint SdrRectObj::GetCornerGluePoint(sal_uInt16 nPosNum) const
{
- INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
+ sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue();
// #i25616#
if(!LineIsOutsideGeometry())
@@ -579,11 +579,11 @@ SdrGluePoint SdrRectObj::GetCornerGluePoint(USHORT nPosNum) const
if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos);
aPt-=GetSnapRect().Center();
SdrGluePoint aGP(aPt);
- aGP.SetPercent(FALSE);
+ aGP.SetPercent(sal_False);
return aGP;
}
-SdrObject* SdrRectObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrRectObj::DoConvertToPolyObj(sal_Bool bBezier) const
{
XPolygon aXP(ImpCalcXPoly(aRect,GetEckenradius()));
{ // #40608# Nur Uebergangsweise bis zum neuen TakeContour()
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 7b9185ca7d3b..bafbefb8ae33 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -116,15 +116,15 @@ SdrTextObj::SdrTextObj()
pFormTextBoundRect(NULL),
eTextKind(OBJ_TEXT)
{
- bTextSizeDirty=FALSE;
- bTextFrame=FALSE;
- bNoShear=FALSE;
- bNoRotate=FALSE;
- bNoMirror=FALSE;
- bDisableAutoWidthOnDragging=FALSE;
+ bTextSizeDirty=sal_False;
+ bTextFrame=sal_False;
+ bNoShear=sal_False;
+ bNoRotate=sal_False;
+ bNoMirror=sal_False;
+ bDisableAutoWidthOnDragging=sal_False;
// #101684#
- mbInEditMode = FALSE;
+ mbInEditMode = sal_False;
// #111096#
mbTextHidden = sal_False;
@@ -146,16 +146,16 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect)
pEdtOutl(NULL),
pFormTextBoundRect(NULL)
{
- bTextSizeDirty=FALSE;
- bTextFrame=FALSE;
- bNoShear=FALSE;
- bNoRotate=FALSE;
- bNoMirror=FALSE;
- bDisableAutoWidthOnDragging=FALSE;
+ bTextSizeDirty=sal_False;
+ bTextFrame=sal_False;
+ bNoShear=sal_False;
+ bNoRotate=sal_False;
+ bNoMirror=sal_False;
+ bDisableAutoWidthOnDragging=sal_False;
ImpJustifyRect(aRect);
// #101684#
- mbInEditMode = FALSE;
+ mbInEditMode = sal_False;
// #111096#
mbTextHidden = sal_False;
@@ -177,15 +177,15 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind)
pFormTextBoundRect(NULL),
eTextKind(eNewTextKind)
{
- bTextSizeDirty=FALSE;
- bTextFrame=TRUE;
- bNoShear=TRUE;
- bNoRotate=FALSE;
- bNoMirror=TRUE;
- bDisableAutoWidthOnDragging=FALSE;
+ bTextSizeDirty=sal_False;
+ bTextFrame=sal_True;
+ bNoShear=sal_True;
+ bNoRotate=sal_False;
+ bNoMirror=sal_True;
+ bDisableAutoWidthOnDragging=sal_False;
// #101684#
- mbInEditMode = FALSE;
+ mbInEditMode = sal_False;
// #111096#
mbTextHidden = sal_False;
@@ -208,16 +208,16 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect)
pFormTextBoundRect(NULL),
eTextKind(eNewTextKind)
{
- bTextSizeDirty=FALSE;
- bTextFrame=TRUE;
- bNoShear=TRUE;
- bNoRotate=FALSE;
- bNoMirror=TRUE;
- bDisableAutoWidthOnDragging=FALSE;
+ bTextSizeDirty=sal_False;
+ bTextFrame=sal_True;
+ bNoShear=sal_True;
+ bNoRotate=sal_False;
+ bNoMirror=sal_True;
+ bDisableAutoWidthOnDragging=sal_False;
ImpJustifyRect(aRect);
// #101684#
- mbInEditMode = FALSE;
+ mbInEditMode = sal_False;
// #111096#
mbTextHidden = sal_False;
@@ -232,7 +232,7 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect)
mbSupportTextIndentingOnLineWidthChange = sal_True;
}
-SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat)
+SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
: SdrAttrObj(),
aRect(rNewRect),
mpText(NULL),
@@ -240,18 +240,18 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStr
pFormTextBoundRect(NULL),
eTextKind(eNewTextKind)
{
- bTextSizeDirty=FALSE;
- bTextFrame=TRUE;
- bNoShear=TRUE;
- bNoRotate=FALSE;
- bNoMirror=TRUE;
- bDisableAutoWidthOnDragging=FALSE;
+ bTextSizeDirty=sal_False;
+ bTextFrame=sal_True;
+ bNoShear=sal_True;
+ bNoRotate=sal_False;
+ bNoMirror=sal_True;
+ bDisableAutoWidthOnDragging=sal_False;
ImpJustifyRect(aRect);
NbcSetText(rInput, rBaseURL, eFormat);
// #101684#
- mbInEditMode = FALSE;
+ mbInEditMode = sal_False;
// #111096#
mbTextHidden = sal_False;
@@ -294,7 +294,7 @@ void SdrTextObj::FitFrameToTextSize()
{
SdrOutliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetPaperSize(Size(aRect.Right()-aRect.Left(),aRect.Bottom()-aRect.Top()));
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
rOutliner.SetText(*pText->GetOutlinerParaObject());
Rectangle aTextRect;
Size aNewSize(rOutliner.CalcTextSize());
@@ -316,7 +316,7 @@ void SdrTextObj::NbcSetText(const XubString& rStr)
SdrOutliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetStyleSheet( 0, GetStyleSheet());
//OutputDevice* pRef1=rOutliner.GetRefDevice();
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
rOutliner.SetText(rStr,rOutliner.GetParagraph( 0 ));
OutlinerParaObject* pNewText=rOutliner.CreateParaObject();
Size aSiz(rOutliner.CalcTextSize());
@@ -324,7 +324,7 @@ void SdrTextObj::NbcSetText(const XubString& rStr)
rOutliner.Clear();
NbcSetOutlinerParaObject(pNewText);
aTextSize=aSiz;
- bTextSizeDirty=FALSE;
+ bTextSizeDirty=sal_False;
}
void SdrTextObj::SetText(const XubString& rStr)
@@ -340,21 +340,21 @@ void SdrTextObj::SetText(const XubString& rStr)
//}
}
-void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat)
+void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
{
SdrOutliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetStyleSheet( 0, GetStyleSheet());
rOutliner.Read(rInput,rBaseURL,eFormat);
OutlinerParaObject* pNewText=rOutliner.CreateParaObject();
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
Size aSiz(rOutliner.CalcTextSize());
rOutliner.Clear();
NbcSetOutlinerParaObject(pNewText);
aTextSize=aSiz;
- bTextSizeDirty=FALSE;
+ bTextSizeDirty=sal_False;
}
-void SdrTextObj::SetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat)
+void SdrTextObj::SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
{
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
// #110094#-14 SendRepaintBroadcast();
@@ -374,24 +374,24 @@ const Size& SdrTextObj::GetTextSize() const
{
SdrOutliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetText(*pText->GetOutlinerParaObject());
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
aSiz=rOutliner.CalcTextSize();
rOutliner.Clear();
}
// 2x casting auf nonconst
((SdrTextObj*)this)->aTextSize=aSiz;
- ((SdrTextObj*)this)->bTextSizeDirty=FALSE;
+ ((SdrTextObj*)this)->bTextSizeDirty=sal_False;
}
return aTextSize;
}
-FASTBOOL SdrTextObj::IsAutoGrowHeight() const
+int SdrTextObj::IsAutoGrowHeight() const
{
if(!bTextFrame)
- return FALSE; // AutoGrow nur bei TextFrames
+ return sal_False; // AutoGrow nur bei TextFrames
const SfxItemSet& rSet = GetObjectItemSet();
- BOOL bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
+ sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue();
if(bRet)
{
@@ -403,23 +403,23 @@ FASTBOOL SdrTextObj::IsAutoGrowHeight() const
if(eDirection == SDRTEXTANI_UP || eDirection == SDRTEXTANI_DOWN)
{
- bRet = FALSE;
+ bRet = sal_False;
}
}
}
return bRet;
}
-FASTBOOL SdrTextObj::IsAutoGrowWidth() const
+int SdrTextObj::IsAutoGrowWidth() const
{
if(!bTextFrame)
- return FALSE; // AutoGrow nur bei TextFrames
+ return sal_False; // AutoGrow nur bei TextFrames
const SfxItemSet& rSet = GetObjectItemSet();
- BOOL bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
+ sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue();
// #101684#
- BOOL bInEditMOde = IsInEditMode();
+ sal_Bool bInEditMOde = IsInEditMode();
if(!bInEditMOde && bRet)
{
@@ -431,7 +431,7 @@ FASTBOOL SdrTextObj::IsAutoGrowWidth() const
if(eDirection == SDRTEXTANI_LEFT || eDirection == SDRTEXTANI_RIGHT)
{
- bRet = FALSE;
+ bRet = sal_False;
}
}
}
@@ -451,7 +451,7 @@ SdrTextHorzAdjust SdrTextObj::GetTextHorizontalAdjust(const SfxItemSet& rSet) co
SdrTextHorzAdjust eRet = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue();
// #101684#
- BOOL bInEditMode = IsInEditMode();
+ sal_Bool bInEditMode = IsInEditMode();
if(!bInEditMode && eRet == SDRTEXTHORZADJUST_BLOCK)
{
@@ -483,7 +483,7 @@ SdrTextVertAdjust SdrTextObj::GetTextVerticalAdjust(const SfxItemSet& rSet) cons
// #103516# Take care for vertical text animation here
SdrTextVertAdjust eRet = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue();
- BOOL bInEditMode = IsInEditMode();
+ sal_Bool bInEditMode = IsInEditMode();
// #103516# Take care for vertical text animation here
if(!bInEditMode && eRet == SDRTEXTVERTADJUST_BLOCK)
@@ -523,24 +523,24 @@ void SdrTextObj::ImpCheckShear()
void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- FASTBOOL bNoTextFrame=!IsTextFrame();
+ int bNoTextFrame=!IsTextFrame();
rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0;
- rInfo.bResizePropAllowed=TRUE;
- rInfo.bRotateFreeAllowed=TRUE;
- rInfo.bRotate90Allowed =TRUE;
+ rInfo.bResizePropAllowed=sal_True;
+ rInfo.bRotateFreeAllowed=sal_True;
+ rInfo.bRotate90Allowed =sal_True;
rInfo.bMirrorFreeAllowed=bNoTextFrame;
rInfo.bMirror45Allowed =bNoTextFrame;
rInfo.bMirror90Allowed =bNoTextFrame;
// allow transparence
- rInfo.bTransparenceAllowed = TRUE;
+ rInfo.bTransparenceAllowed = sal_True;
// gradient depends on fillstyle
XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
rInfo.bShearAllowed =bNoTextFrame;
- rInfo.bEdgeRadiusAllowed=TRUE;
- FASTBOOL bCanConv=ImpCanConvTextToCurve();
+ rInfo.bEdgeRadiusAllowed=sal_True;
+ int bCanConv=ImpCanConvTextToCurve();
rInfo.bCanConvToPath =bCanConv;
rInfo.bCanConvToPoly =bCanConv;
rInfo.bCanConvToPathLineToArea=bCanConv;
@@ -548,9 +548,9 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary());
}
-UINT16 SdrTextObj::GetObjIdentifier() const
+sal_uInt16 SdrTextObj::GetObjIdentifier() const
{
- return USHORT(eTextKind);
+ return sal_uInt16(eTextKind);
}
bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner )
@@ -559,7 +559,7 @@ bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner )
if(pOutliner)
{
Paragraph* p1stPara=pOutliner->GetParagraph( 0 );
- ULONG nParaAnz=pOutliner->GetParagraphCount();
+ sal_uIntPtr nParaAnz=pOutliner->GetParagraphCount();
if(p1stPara==NULL)
nParaAnz=0;
@@ -577,16 +577,16 @@ bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner )
return bRet;
}
-FASTBOOL SdrTextObj::HasEditText() const
+int SdrTextObj::HasEditText() const
{
return HasTextImpl( pEdtOutl );
}
void SdrTextObj::SetPage(SdrPage* pNewPage)
{
- FASTBOOL bRemove=pNewPage==NULL && pPage!=NULL;
- FASTBOOL bInsert=pNewPage!=NULL && pPage==NULL;
- FASTBOOL bLinked=IsLinkedText();
+ int bRemove=pNewPage==NULL && pPage!=NULL;
+ int bInsert=pNewPage!=NULL && pPage==NULL;
+ int bLinked=IsLinkedText();
if (bLinked && bRemove) {
ImpLinkAbmeldung();
@@ -632,23 +632,23 @@ void SdrTextObj::SetModel(SdrModel* pNewModel)
}
}
-FASTBOOL SdrTextObj::NbcSetEckenradius(long nRad)
+int SdrTextObj::NbcSetEckenradius(long nRad)
{
SetObjectItem(SdrEckenradiusItem(nRad));
- return TRUE;
+ return sal_True;
}
-FASTBOOL SdrTextObj::NbcSetAutoGrowHeight(bool bAuto)
+int SdrTextObj::NbcSetAutoGrowHeight(bool bAuto)
{
if(bTextFrame)
{
SetObjectItem(SdrTextAutoGrowHeightItem(bAuto));
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
-FASTBOOL SdrTextObj::NbcSetMinTextFrameHeight(long nHgt)
+int SdrTextObj::NbcSetMinTextFrameHeight(long nHgt)
{
if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // SJ: #i44922#
{
@@ -658,36 +658,36 @@ FASTBOOL SdrTextObj::NbcSetMinTextFrameHeight(long nHgt)
// bDisableAutoHeightOnDragging if vertical.
if(IsVerticalWriting() && bDisableAutoWidthOnDragging)
{
- bDisableAutoWidthOnDragging = FALSE;
- SetObjectItem(SdrTextAutoGrowHeightItem(FALSE));
+ bDisableAutoWidthOnDragging = sal_False;
+ SetObjectItem(SdrTextAutoGrowHeightItem(sal_False));
}
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
-FASTBOOL SdrTextObj::NbcSetMaxTextFrameHeight(long nHgt)
+int SdrTextObj::NbcSetMaxTextFrameHeight(long nHgt)
{
if(bTextFrame)
{
SetObjectItem(SdrTextMaxFrameHeightItem(nHgt));
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
-FASTBOOL SdrTextObj::NbcSetAutoGrowWidth(bool bAuto)
+int SdrTextObj::NbcSetAutoGrowWidth(bool bAuto)
{
if(bTextFrame)
{
SetObjectItem(SdrTextAutoGrowWidthItem(bAuto));
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
-FASTBOOL SdrTextObj::NbcSetMinTextFrameWidth(long nWdt)
+int SdrTextObj::NbcSetMinTextFrameWidth(long nWdt)
{
if( bTextFrame && ( !pModel || !pModel->isLocked() ) ) // SJ: #i44922#
{
@@ -697,36 +697,36 @@ FASTBOOL SdrTextObj::NbcSetMinTextFrameWidth(long nWdt)
// when not vertical.
if(!IsVerticalWriting() && bDisableAutoWidthOnDragging)
{
- bDisableAutoWidthOnDragging = FALSE;
- SetObjectItem(SdrTextAutoGrowWidthItem(FALSE));
+ bDisableAutoWidthOnDragging = sal_False;
+ SetObjectItem(SdrTextAutoGrowWidthItem(sal_False));
}
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
-FASTBOOL SdrTextObj::NbcSetMaxTextFrameWidth(long nWdt)
+int SdrTextObj::NbcSetMaxTextFrameWidth(long nWdt)
{
if(bTextFrame)
{
SetObjectItem(SdrTextMaxFrameWidthItem(nWdt));
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
-FASTBOOL SdrTextObj::NbcSetFitToSize(SdrFitToSizeType eFit)
+int SdrTextObj::NbcSetFitToSize(SdrFitToSizeType eFit)
{
if(bTextFrame)
{
SetObjectItem(SdrTextFitToSizeTypeItem(eFit));
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
-void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, BOOL bLineWidth ) const
+void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const
{
basegfx::B2DPolyPolygon aXorPolyPolygon(TakeXorPoly());
basegfx::B2DPolyPolygon* pContourPolyPolygon = 0L;
@@ -761,7 +761,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho
{
// #86258# force shadow off
SdrObject* pCopy = Clone();
- pCopy->SetMergedItem(SdrShadowItem(FALSE));
+ pCopy->SetMergedItem(SdrShadowItem(sal_False));
*pContourPolyPolygon = pCopy->TakeContour();
SdrObject::Free( pCopy );
}
@@ -795,7 +795,7 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const
long nUpperDist=GetTextUpperDistance();
long nLowerDist=GetTextLowerDistance();
Rectangle aAnkRect(aRect); // Rect innerhalb dem geankert wird
- FASTBOOL bFrame=IsTextFrame();
+ int bFrame=IsTextFrame();
if (!bFrame) {
TakeUnrotatedSnapRect(aAnkRect);
}
@@ -824,8 +824,8 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const
rAnchorRect=aAnkRect;
}
-void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText,
- Rectangle* pAnchorRect, BOOL bLineWidth ) const
+void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText,
+ Rectangle* pAnchorRect, sal_Bool bLineWidth ) const
{
Rectangle aAnkRect; // Rect innerhalb dem geankert wird
TakeTextAnchorRect(aAnkRect);
@@ -835,11 +835,11 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS
SdrTextAniDirection eAniDirection=GetTextAniDirection();
SdrFitToSizeType eFit=GetFitToSize();
- FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
- FASTBOOL bContourFrame=IsContourTextFrame();
+ int bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
+ int bContourFrame=IsContourTextFrame();
- FASTBOOL bFrame=IsTextFrame();
- ULONG nStat0=rOutliner.GetControlWord();
+ int bFrame=IsTextFrame();
+ sal_uIntPtr nStat0=rOutliner.GetControlWord();
Size aNullSize;
if (!bContourFrame)
{
@@ -858,7 +858,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS
long nHgt=nAnkHgt;
// #101684#
- BOOL bInEditMode = IsInEditMode();
+ sal_Bool bInEditMode = IsInEditMode();
if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE))
{
@@ -893,7 +893,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS
if (pPara)
{
- BOOL bHitTest = FALSE;
+ sal_Bool bHitTest = sal_False;
if( pModel )
bHitTest = &pModel->GetHitTestOutliner() == &rOutliner;
@@ -907,7 +907,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS
rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
}
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
rOutliner.SetText(*pPara);
}
}
@@ -919,7 +919,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FAS
if (pEdtOutl && !bNoEditText && pPara)
delete pPara;
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
rOutliner.SetControlWord(nStat0);
if( pText )
@@ -999,7 +999,7 @@ OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const
void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& rTextRect, const Rectangle& rAnchorRect, Fraction& rFitXKorreg) const
{
OutputDevice* pOut = rOutliner.GetRefDevice();
- BOOL bNoStretching(FALSE);
+ sal_Bool bNoStretching(sal_False);
if(pOut && pOut->GetOutDevType() == OUTDEV_PRINTER)
{
@@ -1011,7 +1011,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r
pMtf = NULL;
if(pMtf)
- pMtf->Pause(TRUE);
+ pMtf->Pause(sal_True);
Font aFontMerk(pOut->GetFont());
Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ) );
@@ -1025,7 +1025,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r
pOut->SetFont(aFontMerk);
if(pMtf)
- pMtf->Pause(FALSE);
+ pMtf->Pause(sal_False);
bNoStretching = (aSize1 == aSize2);
@@ -1034,12 +1034,12 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r
// Und das finden wir nicht so schoen.
if(aSize2.Height() >= aSize1.Height() * 2)
{
- bNoStretching = TRUE;
+ bNoStretching = sal_True;
}
#endif
}
unsigned nLoopCount=0;
- FASTBOOL bNoMoreLoop=FALSE;
+ int bNoMoreLoop=sal_False;
long nXDiff0=0x7FFFFFFF;
long nWantWdt=rAnchorRect.Right()-rAnchorRect.Left();
long nIsWdt=rTextRect.Right()-rTextRect.Left();
@@ -1055,43 +1055,43 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Rectangle& r
long nX=(nWantWdt*100) /nIsWdt; // X-Stretching berechnen
long nY=(nWantHgt*100) /nIsHgt; // Y-Stretching berechnen
- FASTBOOL bChkX=TRUE;
- FASTBOOL bChkY=TRUE;
+ int bChkX=sal_True;
+ int bChkY=sal_True;
if (bNoStretching) { // #35762# evtl. nur proportional moeglich
- if (nX>nY) { nX=nY; bChkX=FALSE; }
- else { nY=nX; bChkY=FALSE; }
+ if (nX>nY) { nX=nY; bChkX=sal_False; }
+ else { nY=nX; bChkY=sal_False; }
}
while (nLoopCount<5 && !bNoMoreLoop) {
if (nX<0) nX=-nX;
- if (nX<1) { nX=1; bNoMoreLoop=TRUE; }
- if (nX>65535) { nX=65535; bNoMoreLoop=TRUE; }
+ if (nX<1) { nX=1; bNoMoreLoop=sal_True; }
+ if (nX>65535) { nX=65535; bNoMoreLoop=sal_True; }
if (nY<0) nY=-nY;
- if (nY<1) { nY=1; bNoMoreLoop=TRUE; }
- if (nY>65535) { nY=65535; bNoMoreLoop=TRUE; }
+ if (nY<1) { nY=1; bNoMoreLoop=sal_True; }
+ if (nY>65535) { nY=65535; bNoMoreLoop=sal_True; }
// exception, there is no text yet (horizontal case)
if(nIsWdt <= 1)
{
nX = nY;
- bNoMoreLoop = TRUE;
+ bNoMoreLoop = sal_True;
}
// #87877# exception, there is no text yet (vertical case)
if(nIsHgt <= 1)
{
nY = nX;
- bNoMoreLoop = TRUE;
+ bNoMoreLoop = sal_True;
}
- rOutliner.SetGlobalCharStretching((USHORT)nX,(USHORT)nY);
+ rOutliner.SetGlobalCharStretching((sal_uInt16)nX,(sal_uInt16)nY);
nLoopCount++;
Size aSiz(rOutliner.CalcTextSize());
long nXDiff=aSiz.Width()-nWantWdt;
rFitXKorreg=Fraction(nWantWdt,aSiz.Width());
if (((nXDiff>=nXTolMi || !bChkX) && nXDiff<=nXTolPl) || nXDiff==nXDiff0/*&& Abs(nYDiff)<=nYTol*/) {
- bNoMoreLoop=TRUE;
+ bNoMoreLoop=sal_True;
} else {
// Stretchingfaktoren korregieren
long nMul=nWantWdt;
@@ -1272,10 +1272,10 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeContour() const
Rectangle aAnchor2;
Rectangle aR;
- TakeTextRect(rOutliner,aR,FALSE,&aAnchor2);
+ TakeTextRect(rOutliner,aR,sal_False,&aAnchor2);
rOutliner.Clear();
SdrFitToSizeType eFit=GetFitToSize();
- FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
+ int bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
if (bFitToSize) aR=aAnchor2;
Polygon aPol(aR);
if (aGeo.nDrehWink!=0) RotatePoly(aPol,aR.TopLeft(),aGeo.nSin,aGeo.nCos);
@@ -1320,7 +1320,7 @@ Point SdrTextObj::GetSnapPoint(sal_uInt32 i) const
void SdrTextObj::ImpCheckMasterCachable()
{
- bNotMasterCachable=FALSE;
+ bNotMasterCachable=sal_False;
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
@@ -1346,14 +1346,14 @@ void SdrTextObj::ImpCheckMasterCachable()
// #101029#: Extracted from ImpGetDrawOutliner()
void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const
{
- rOutl.SetUpdateMode(FALSE);
- USHORT nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
+ rOutl.SetUpdateMode(sal_False);
+ sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
if ( !IsOutlText() )
nOutlinerMode = OUTLINERMODE_TEXTOBJECT;
rOutl.Init( nOutlinerMode );
rOutl.SetGlobalCharStretching(100,100);
- ULONG nStat=rOutl.GetControlWord();
+ sal_uIntPtr nStat=rOutl.GetControlWord();
nStat&=~(EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE);
rOutl.SetControlWord(nStat);
Size aNullSize;
@@ -1382,7 +1382,7 @@ boost::shared_ptr< SdrOutliner > SdrTextObj::CreateDrawOutliner()
}
// #101029#: Extracted from Paint()
-void SdrTextObj::ImpSetupDrawOutlinerForPaint( FASTBOOL bContourFrame,
+void SdrTextObj::ImpSetupDrawOutlinerForPaint( int bContourFrame,
SdrOutliner& rOutliner,
Rectangle& rTextRect,
Rectangle& rAnchorRect,
@@ -1395,13 +1395,13 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( FASTBOOL bContourFrame,
SdrFitToSizeType eFit=GetFitToSize();
if (eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES)
{
- ULONG nStat=rOutliner.GetControlWord();
+ sal_uIntPtr nStat=rOutliner.GetControlWord();
nStat|=EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE;
rOutliner.SetControlWord(nStat);
}
}
rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue());
- TakeTextRect(rOutliner, rTextRect, FALSE, &rAnchorRect);
+ TakeTextRect(rOutliner, rTextRect, sal_False, &rAnchorRect);
rPaintRect = rTextRect;
if (!bContourFrame)
@@ -1428,7 +1428,7 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint
Rectangle aAnchorRect;
Fraction aFitXKorreg(1,1);
- FASTBOOL bContourFrame=IsContourTextFrame();
+ int bContourFrame=IsContourTextFrame();
ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXKorreg );
@@ -1578,7 +1578,7 @@ void SdrTextObj::ForceOutlinerParaObject()
SdrText* pText = getActiveText();
if( pText && (pText->GetOutlinerParaObject() == 0) )
{
- USHORT nOutlMode = OUTLINERMODE_TEXTOBJECT;
+ sal_uInt16 nOutlMode = OUTLINERMODE_TEXTOBJECT;
if( IsTextFrame() && eTextKind == OBJ_OUTLINETEXT )
nOutlMode = OUTLINERMODE_OUTLINEOBJECT;
@@ -1810,7 +1810,7 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b
GeoStat aGeoStat;
aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0);
aGeoStat.RecalcTan();
- Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, FALSE);
+ Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False);
}
// rotation?
@@ -1866,21 +1866,21 @@ long SdrTextObj::GetMaxTextFrameWidth() const
return ((SdrTextMaxFrameWidthItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_MAXFRAMEWIDTH))).GetValue();
}
-FASTBOOL SdrTextObj::IsFontwork() const
+int SdrTextObj::IsFontwork() const
{
- return (bTextFrame) ? FALSE // Default ist FALSE
+ return (bTextFrame) ? sal_False // Default ist FALSE
: ((XFormTextStyleItem&)(GetObjectItemSet().Get(XATTR_FORMTXTSTYLE))).GetValue()!=XFT_NONE;
}
-FASTBOOL SdrTextObj::IsHideContour() const
+int SdrTextObj::IsHideContour() const
{
- return (bTextFrame) ? FALSE // Default ist: Nein, kein HideContour; HideContour nicht bei TextFrames
+ return (bTextFrame) ? sal_False // Default ist: Nein, kein HideContour; HideContour nicht bei TextFrames
: ((XFormTextHideFormItem&)(GetObjectItemSet().Get(XATTR_FORMTXTHIDEFORM))).GetValue();
}
-FASTBOOL SdrTextObj::IsContourTextFrame() const
+int SdrTextObj::IsContourTextFrame() const
{
- return (bTextFrame) ? FALSE // ContourFrame nicht bei normalen TextFrames
+ return (bTextFrame) ? sal_False // ContourFrame nicht bei normalen TextFrames
: ((SdrTextContourFrameItem&)(GetObjectItemSet().Get(SDRATTR_TEXT_CONTOURFRAME))).GetValue();
}
@@ -2070,20 +2070,20 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem)
// Konzept des TextObjekts:
// ~~~~~~~~~~~~~~~~~~~~~~~~
// Attribute/Varianten:
-// - BOOL Textrahmen / beschriftetes Zeichenobjekt
-// - BOOL FontWork (wenn nicht Textrahmen und nicht ContourTextFrame)
-// - BOOL ContourTextFrame (wenn nicht Textrahmen und nicht Fontwork)
+// - sal_Bool Textrahmen / beschriftetes Zeichenobjekt
+// - sal_Bool FontWork (wenn nicht Textrahmen und nicht ContourTextFrame)
+// - sal_Bool ContourTextFrame (wenn nicht Textrahmen und nicht Fontwork)
// - long Drehwinkel (wenn nicht FontWork)
// - long Textrahmenabstaende (wenn nicht FontWork)
-// - BOOL FitToSize (wenn nicht FontWork)
-// - BOOL AutoGrowingWidth/Height (wenn nicht FitToSize und nicht FontWork)
+// - sal_Bool FitToSize (wenn nicht FontWork)
+// - sal_Bool AutoGrowingWidth/Height (wenn nicht FitToSize und nicht FontWork)
// - long Min/MaxFrameWidth/Height (wenn AutoGrowingWidth/Height)
// - enum Horizontale Textverankerung Links,Mitte,Rechts,Block,Stretch(ni)
// - enum Vertikale Textverankerung Oben,Mitte,Unten,Block,Stretch(ni)
// - enum Laufschrift (wenn nicht FontWork)
//
-// Jedes abgeleitete Objekt ist entweder ein Textrahmen (bTextFrame=TRUE)
-// oder ein beschriftetes Zeichenobjekt (bTextFrame=FALSE).
+// Jedes abgeleitete Objekt ist entweder ein Textrahmen (bTextFrame=sal_True)
+// oder ein beschriftetes Zeichenobjekt (bTextFrame=sal_False).
//
// Defaultverankerung von Textrahmen:
// SDRTEXTHORZADJUST_BLOCK, SDRTEXTVERTADJUST_TOP
@@ -2111,8 +2111,8 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem)
// ContourTextFrame:
// - long Drehwinkel
// - long Textrahmenabstaende spaeter vielleicht
-// - BOOL FitToSize spaeter vielleicht
-// - BOOL AutoGrowingWidth/Height viel spaeter vielleicht
+// - sal_Bool FitToSize spaeter vielleicht
+// - sal_Bool AutoGrowingWidth/Height viel spaeter vielleicht
// - long Min/MaxFrameWidth/Height viel spaeter vielleicht
// - enum Horizontale Textverankerung spaeter vielleicht, erstmal Links, Absatz zentr.
// - enum Vertikale Textverankerung spaeter vielleicht, erstmal oben
diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx
index 178af85d2cf4..72de016703bd 100644
--- a/svx/source/svdraw/svdotextpathdecomposition.cxx
+++ b/svx/source/svdraw/svdotextpathdecomposition.cxx
@@ -568,7 +568,7 @@ namespace
}
}
- // consume from portion // no += here, xub_StrLen is USHORT and the compiler will gererate a warning here
+ // consume from portion // no += here, xub_StrLen is sal_uInt16 and the compiler will gererate a warning here
nUsedTextLength = nUsedTextLength + nNextGlyphLen;
// consume from polygon
diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx
index 8b6dab72d5e9..18117fbdc8ac 100644
--- a/svx/source/svdraw/svdotxat.cxx
+++ b/svx/source/svdraw/svdotxat.cxx
@@ -75,19 +75,19 @@
//
////////////////////////////////////////////////////////////////////////////////////////////////////
-FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt, FASTBOOL bWdt) const
+int SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHgt, int bWdt) const
{
if (bTextFrame && pModel!=NULL && !rR.IsEmpty())
{
SdrFitToSizeType eFit=GetFitToSize();
- FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
- FASTBOOL bWdtGrow=bWdt && IsAutoGrowWidth();
- FASTBOOL bHgtGrow=bHgt && IsAutoGrowHeight();
+ int bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
+ int bWdtGrow=bWdt && IsAutoGrowWidth();
+ int bHgtGrow=bHgt && IsAutoGrowHeight();
SdrTextAniKind eAniKind=GetTextAniKind();
SdrTextAniDirection eAniDir=GetTextAniDirection();
- FASTBOOL bScroll=eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE;
- FASTBOOL bHScroll=bScroll && (eAniDir==SDRTEXTANI_LEFT || eAniDir==SDRTEXTANI_RIGHT);
- FASTBOOL bVScroll=bScroll && (eAniDir==SDRTEXTANI_UP || eAniDir==SDRTEXTANI_DOWN);
+ int bScroll=eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE;
+ int bHScroll=bScroll && (eAniDir==SDRTEXTANI_LEFT || eAniDir==SDRTEXTANI_RIGHT);
+ int bVScroll=bScroll && (eAniDir==SDRTEXTANI_UP || eAniDir==SDRTEXTANI_DOWN);
if (!bFitToSize && (bWdtGrow || bHgtGrow))
{
Rectangle aR0(rR);
@@ -122,7 +122,7 @@ FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt,
if (aSiz.Height()<2) aSiz.Height()=2; // Mindestgroesse 2
// #101684#
- BOOL bInEditMode = IsInEditMode();
+ sal_Bool bInEditMode = IsInEditMode();
if(!bInEditMode)
{
@@ -143,7 +143,7 @@ FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt,
} else {
Outliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetPaperSize(aSiz);
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
// !!! hier sollte ich wohl auch noch mal die Optimierung mit
// bPortionInfoChecked usw einbauen
OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject();
@@ -172,8 +172,8 @@ FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt,
if (nHgt<1) nHgt=1; // nVDist kann auch negativ sein
long nWdtGrow=nWdt-(rR.Right()-rR.Left());
long nHgtGrow=nHgt-(rR.Bottom()-rR.Top());
- if (nWdtGrow==0) bWdtGrow=FALSE;
- if (nHgtGrow==0) bHgtGrow=FALSE;
+ if (nWdtGrow==0) bWdtGrow=sal_False;
+ if (nHgtGrow==0) bHgtGrow=sal_False;
if (bWdtGrow || bHgtGrow) {
if (bWdtGrow) {
SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust();
@@ -203,16 +203,16 @@ FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHgt,
aD2-=aD1;
rR.Move(aD2.X(),aD2.Y());
}
- return TRUE;
+ return sal_True;
}
}
}
- return FALSE;
+ return sal_False;
}
-FASTBOOL SdrTextObj::NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt)
+int SdrTextObj::NbcAdjustTextFrameWidthAndHeight(int bHgt, int bWdt)
{
- FASTBOOL bRet=AdjustTextFrameWidthAndHeight(aRect,bHgt,bWdt);
+ int bRet=AdjustTextFrameWidthAndHeight(aRect,bHgt,bWdt);
if (bRet) {
SetRectsDirty();
if (HAS_BASE(SdrRectObj,this)) { // mal wieder 'nen Hack
@@ -225,10 +225,10 @@ FASTBOOL SdrTextObj::NbcAdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bW
return bRet;
}
-FASTBOOL SdrTextObj::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt)
+int SdrTextObj::AdjustTextFrameWidthAndHeight(int bHgt, int bWdt)
{
Rectangle aNeuRect(aRect);
- FASTBOOL bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt);
+ int bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt);
if (bRet) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
// #110094#-14 SendRepaintBroadcast();
@@ -262,22 +262,22 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
const EditTextObject& rTextObj=pOutlinerParaObject->GetTextObject();
XubString aStyleName;
SfxStyleFamily eStyleFam;
- USHORT nParaAnz=rTextObj.GetParagraphCount();
+ sal_uInt16 nParaAnz=rTextObj.GetParagraphCount();
- for(UINT16 nParaNum(0); nParaNum < nParaAnz; nParaNum++)
+ for(sal_uInt16 nParaNum(0); nParaNum < nParaAnz; nParaNum++)
{
rTextObj.GetStyleSheet(nParaNum, aStyleName, eStyleFam);
if(aStyleName.Len())
{
- XubString aFam = UniString::CreateFromInt32((UINT16)eStyleFam);
+ XubString aFam = UniString::CreateFromInt32((sal_uInt16)eStyleFam);
aFam.Expand(5);
aStyleName += sal_Unicode('|');
aStyleName += aFam;
- BOOL bFnd(FALSE);
- UINT32 nNum(aStyles.Count());
+ sal_Bool bFnd(sal_False);
+ sal_uInt32 nNum(aStyles.Count());
while(!bFnd && nNum > 0)
{
@@ -295,7 +295,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
}
// nun die Strings im Container durch StyleSheet* ersetzten
- ULONG nNum=aStyles.Count();
+ sal_uIntPtr nNum=aStyles.Count();
while (nNum>0) {
nNum--;
XubString* pName=(XubString*)aStyles.GetObject(nNum);
@@ -306,8 +306,8 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
aFam.Erase(0,1);
aFam.EraseTrailingChars();
- // UNICODE: USHORT nFam=USHORT(aFam);
- UINT16 nFam = (UINT16)aFam.ToInt32();
+ // UNICODE: sal_uInt16 nFam=sal_uInt16(aFam);
+ sal_uInt16 nFam = (sal_uInt16)aFam.ToInt32();
SfxStyleFamily eFam=(SfxStyleFamily)nFam;
SfxStyleSheetBase* pStyleBase=pStylePool->Find(*pName,eFam);
@@ -323,7 +323,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
nNum=GetBroadcasterCount();
while (nNum>0) {
nNum--;
- SfxBroadcaster* pBroadcast=GetBroadcasterJOE((USHORT)nNum);
+ SfxBroadcaster* pBroadcast=GetBroadcasterJOE((sal_uInt16)nNum);
SfxStyleSheet* pStyle=PTR_CAST(SfxStyleSheet,pBroadcast);
if (pStyle!=NULL && pStyle!=GetStyleSheet()) { // Sonderbehandlung fuer den StyleSheet des Objekts
if (aStyles.GetPos(pStyle)==CONTAINER_ENTRY_NOTFOUND) {
@@ -337,7 +337,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners()
nNum--;
SfxStyleSheet* pStyle=(SfxStyleSheet*)aStyles.GetObject(nNum);
// StartListening soll selbst nachsehen, ob hier nicht evtl. schon gehorcht wird
- StartListening(*pStyle,TRUE);
+ StartListening(*pStyle,sal_True);
}
}
}
@@ -383,13 +383,13 @@ void SdrTextObj::NbcResizeTextAttributes(const Fraction& xFact, const Fraction&
if (nAbsHgt>0xFFFF) nAbsHgt=0xFFFF;
// und nun attributieren
- SetObjectItem(SvxCharScaleWidthItem( (USHORT) nRelWdt, EE_CHAR_FONTWIDTH));
- SetObjectItem(SvxFontHeightItem(nAbsHgt,(USHORT)nRelHgt, EE_CHAR_FONTHEIGHT));
+ SetObjectItem(SvxCharScaleWidthItem( (sal_uInt16) nRelWdt, EE_CHAR_FONTWIDTH));
+ SetObjectItem(SvxFontHeightItem(nAbsHgt,(sal_uInt16)nRelHgt, EE_CHAR_FONTHEIGHT));
// Zeichen- und Absatzattribute innerhalb des OutlinerParaObjects
Outliner& rOutliner=ImpGetDrawOutliner();
rOutliner.SetPaperSize(Size(LONG_MAX,LONG_MAX));
rOutliner.SetText(*pOutlinerParaObject);
- rOutliner.DoStretchChars((USHORT)nX,(USHORT)nY);
+ rOutliner.DoStretchChars((sal_uInt16)nX,(sal_uInt16)nY);
OutlinerParaObject* pNewPara=rOutliner.CreateParaObject();
NbcSetOutlinerParaObject(pNewPara);
rOutliner.Clear();
@@ -452,7 +452,7 @@ bool SdrTextObj::HasText() const
if( pOPO )
{
const EditTextObject& rETO = pOPO->GetTextObject();
- USHORT nParaCount = rETO.GetParagraphCount();
+ sal_uInt16 nParaCount = rETO.GetParagraphCount();
if( nParaCount > 0 )
bHasText = (nParaCount > 1) || (rETO.GetText( 0 ).Len() != 0);
diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx
index 6f749a297aef..dd01c7cb6d02 100644
--- a/svx/source/svdraw/svdotxed.cxx
+++ b/svx/source/svdraw/svdotxed.cxx
@@ -52,11 +52,11 @@
//
////////////////////////////////////////////////////////////////////////////////////////////////////
-FASTBOOL SdrTextObj::HasTextEdit() const
+int SdrTextObj::HasTextEdit() const
{
// lt. Anweisung von MB duerfen gelinkte Textobjekte nun doch
// geaendert werden (kein automatisches Reload)
- return TRUE;
+ return sal_True;
}
sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
@@ -65,21 +65,21 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
pEdtOutl=&rOutl;
// #101684#
- mbInEditMode = TRUE;
+ mbInEditMode = sal_True;
- USHORT nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
+ sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT;
if ( !IsOutlText() )
nOutlinerMode = OUTLINERMODE_TEXTOBJECT;
rOutl.Init( nOutlinerMode );
rOutl.SetRefDevice( pModel->GetRefDevice() );
SdrFitToSizeType eFit=GetFitToSize();
- FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
- FASTBOOL bContourFrame=IsContourTextFrame();
+ int bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
+ int bContourFrame=IsContourTextFrame();
ImpSetTextEditParams();
if (!bContourFrame) {
- ULONG nStat=rOutl.GetControlWord();
+ sal_uIntPtr nStat=rOutl.GetControlWord();
nStat|=EE_CNTRL_AUTOPAGESIZE;
if (bFitToSize) nStat|=EE_CNTRL_STRETCHING; else nStat&=~EE_CNTRL_STRETCHING;
rOutl.SetControlWord(nStat);
@@ -116,8 +116,8 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
{
Rectangle aAnchorRect;
Rectangle aTextRect;
- TakeTextRect(rOutl, aTextRect, FALSE,
- &aAnchorRect/* #97097# give TRUE here, not FALSE */);
+ TakeTextRect(rOutl, aTextRect, sal_False,
+ &aAnchorRect/* #97097# give sal_True here, not sal_False */);
Fraction aFitXKorreg(1,1);
ImpSetCharStretching(rOutl,aTextRect,aAnchorRect,aFitXKorreg);
}
@@ -127,7 +127,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
// #78476# also repaint when animated text is put to edit mode
// to not make appear the text double
// #111096# should now repaint automatically.
- // BOOL bIsAnimated(pPlusData && pPlusData->pAnimator);
+ // sal_Bool bIsAnimated(pPlusData && pPlusData->pAnimator);
if(aGeo.nDrehWink || IsFontwork() /*|| bIsAnimated*/)
{
@@ -147,7 +147,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl)
void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const
{
SdrFitToSizeType eFit=GetFitToSize();
- FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
+ int bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
Size aPaperMin,aPaperMax;
Rectangle aViewInit;
TakeTextAnchorRect(aViewInit);
@@ -190,7 +190,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
SdrTextAniDirection eAniDirection=GetTextAniDirection();
// #101684#
- BOOL bInEditMode = IsInEditMode();
+ sal_Bool bInEditMode = IsInEditMode();
if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE))
{
@@ -274,26 +274,26 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
// need to end edit mode early since SetOutlinerParaObject already
// uses GetCurrentBoundRect() which needs to take the text into account
// to work correct
- mbInEditMode = FALSE;
+ mbInEditMode = sal_False;
SetOutlinerParaObject(pNewText);
}
pEdtOutl = NULL;
rOutl.Clear();
- UINT32 nStat = rOutl.GetControlWord();
+ sal_uInt32 nStat = rOutl.GetControlWord();
nStat &= ~EE_CNTRL_AUTOPAGESIZE;
rOutl.SetControlWord(nStat);
// #101684#
- mbInEditMode = FALSE;
+ mbInEditMode = sal_False;
}
-USHORT SdrTextObj::GetOutlinerViewAnchorMode() const
+sal_uInt16 SdrTextObj::GetOutlinerViewAnchorMode() const
{
SdrTextHorzAdjust eH=GetTextHorizontalAdjust();
SdrTextVertAdjust eV=GetTextVerticalAdjust();
EVAnchorMode eRet=ANCHOR_TOP_LEFT;
- if (IsContourTextFrame()) return (USHORT)eRet;
+ if (IsContourTextFrame()) return (sal_uInt16)eRet;
if (eH==SDRTEXTHORZADJUST_LEFT) {
if (eV==SDRTEXTVERTADJUST_TOP) {
eRet=ANCHOR_TOP_LEFT;
@@ -319,32 +319,32 @@ USHORT SdrTextObj::GetOutlinerViewAnchorMode() const
eRet=ANCHOR_VCENTER_HCENTER;
}
}
- return (USHORT)eRet;
+ return (sal_uInt16)eRet;
}
void SdrTextObj::ImpSetTextEditParams() const
{
if (pEdtOutl!=NULL) {
- FASTBOOL bUpdMerk=pEdtOutl->GetUpdateMode();
- if (bUpdMerk) pEdtOutl->SetUpdateMode(FALSE);
+ int bUpdMerk=pEdtOutl->GetUpdateMode();
+ if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_False);
Size aPaperMin;
Size aPaperMax;
Rectangle aEditArea;
TakeTextEditArea(&aPaperMin,&aPaperMax,&aEditArea,NULL);
//SdrFitToSizeType eFit=GetFitToSize();
- //FASTBOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
- FASTBOOL bContourFrame=IsContourTextFrame();
+ //int bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
+ int bContourFrame=IsContourTextFrame();
//EVAnchorMode eAM=(EVAnchorMode)GetOutlinerViewAnchorMode();
- //ULONG nViewAnz=pEdtOutl->GetViewCount();
+ //sal_uIntPtr nViewAnz=pEdtOutl->GetViewCount();
pEdtOutl->SetMinAutoPaperSize(aPaperMin);
pEdtOutl->SetMaxAutoPaperSize(aPaperMax);
pEdtOutl->SetPaperSize(Size());
if (bContourFrame) {
Rectangle aAnchorRect;
TakeTextAnchorRect(aAnchorRect);
- ImpSetContourPolygon(*pEdtOutl,aAnchorRect, TRUE);
+ ImpSetContourPolygon(*pEdtOutl,aAnchorRect, sal_True);
}
- if (bUpdMerk) pEdtOutl->SetUpdateMode(TRUE);
+ if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_True);
}
}
diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx
index fe21621c1b9a..575ff909e4dd 100644
--- a/svx/source/svdraw/svdotxfl.cxx
+++ b/svx/source/svdraw/svdotxfl.cxx
@@ -33,7 +33,7 @@
#include <svx/svdotext.hxx>
#include <svx/svdfield.hxx>
-static BOOL bInit = FALSE;
+static sal_Bool bInit = sal_False;
// Do not remove this, it is still used in src536a!
void SdrRegisterFieldClasses()
@@ -44,15 +44,15 @@ void SdrRegisterFieldClasses()
SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxHeaderField);
SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxFooterField);
SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxDateTimeField);
- bInit = TRUE;
+ bInit = sal_True;
}
}
///////////////////////////////////////////////////////////////////////////////////////////////// */
-FASTBOOL SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, USHORT /*nPara*/, USHORT /*nPos*/,
- FASTBOOL /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const
+int SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/,
+ int /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const
{
- return FALSE;
+ return sal_False;
}
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 57bcc7a22ae8..e350f451aca7 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -78,7 +78,7 @@ public:
virtual void DataChanged( const String& rMimeType,
const ::com::sun::star::uno::Any & rValue );
- BOOL Connect() { return 0 != SvBaseLink::GetRealObject(); }
+ sal_Bool Connect() { return 0 != SvBaseLink::GetRealObject(); }
};
ImpSdrObjTextLink::~ImpSdrObjTextLink()
@@ -101,7 +101,7 @@ void ImpSdrObjTextLink::Closed()
void ImpSdrObjTextLink::DataChanged( const String& /*rMimeType*/,
const ::com::sun::star::uno::Any & /*rValue */)
{
- FASTBOOL bForceReload=FALSE;
+ int bForceReload=sal_False;
SdrModel* pModel = pSdrObj ? pSdrObj->GetModel() : 0;
sfx2::LinkManager* pLinkManager= pModel ? pModel->GetLinkManager() : 0;
if( pLinkManager )
@@ -119,7 +119,7 @@ void ImpSdrObjTextLink::DataChanged( const String& /*rMimeType*/,
pData->aFileName = aFile;
pData->aFilterName = aFilter;
pSdrObj->SetChanged();
- bForceReload = TRUE;
+ bForceReload = sal_True;
}
}
}
@@ -198,8 +198,8 @@ void SdrTextObj::SetTextLink(const String& rFileName, const String& rFilterName,
void SdrTextObj::ReleaseTextLink()
{
ImpLinkAbmeldung();
- USHORT nAnz=GetUserDataCount();
- for (USHORT nNum=nAnz; nNum>0;) {
+ sal_uInt16 nAnz=GetUserDataCount();
+ for (sal_uInt16 nNum=nAnz; nNum>0;) {
nNum--;
SdrObjUserData* pData=GetUserData(nNum);
if (pData->GetInventor()==SdrInventor && pData->GetId()==SDRUSERDATA_OBJTEXTLINK) {
@@ -208,20 +208,20 @@ void SdrTextObj::ReleaseTextLink()
}
}
-FASTBOOL SdrTextObj::ReloadLinkedText( FASTBOOL bForceLoad)
+int SdrTextObj::ReloadLinkedText( int bForceLoad)
{
ImpSdrObjTextLinkUserData* pData = GetLinkUserData();
- FASTBOOL bRet = TRUE;
+ int bRet = sal_True;
if( pData )
{
::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get();
DateTime aFileDT;
- BOOL bExists = FALSE, bLoad = FALSE;
+ sal_Bool bExists = sal_False, bLoad = sal_False;
if( pBroker )
{
- bExists = TRUE;
+ bExists = sal_True;
try
{
@@ -237,14 +237,14 @@ FASTBOOL SdrTextObj::ReloadLinkedText( FASTBOOL bForceLoad)
}
catch( ... )
{
- bExists = FALSE;
+ bExists = sal_False;
}
}
if( bExists )
{
if( bForceLoad )
- bLoad = TRUE;
+ bLoad = sal_True;
else
bLoad = ( aFileDT > pData->aFileDate0 );
@@ -260,10 +260,10 @@ FASTBOOL SdrTextObj::ReloadLinkedText( FASTBOOL bForceLoad)
return bRet;
}
-FASTBOOL SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/, rtl_TextEncoding eCharSet)
+int SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/, rtl_TextEncoding eCharSet)
{
INetURLObject aFileURL( rFileName );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( aFileURL.GetProtocol() == INET_PROT_NOT_VALID )
{
@@ -288,14 +288,14 @@ FASTBOOL SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterNa
cRTF[4] = 0;
pIStm->Read(cRTF, 5);
- BOOL bRTF = cRTF[0] == '{' && cRTF[1] == '\\' && cRTF[2] == 'r' && cRTF[3] == 't' && cRTF[4] == 'f';
+ sal_Bool bRTF = cRTF[0] == '{' && cRTF[1] == '\\' && cRTF[2] == 'r' && cRTF[3] == 't' && cRTF[4] == 'f';
pIStm->Seek(0);
if( !pIStm->GetError() )
{
- SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::NO_DECODE ), sal::static_int_cast< USHORT >( bRTF ? EE_FORMAT_RTF : EE_FORMAT_TEXT ) );
- bRet = TRUE;
+ SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::NO_DECODE ), sal::static_int_cast< sal_uInt16 >( bRTF ? EE_FORMAT_RTF : EE_FORMAT_TEXT ) );
+ bRet = sal_True;
}
delete pIStm;
@@ -307,8 +307,8 @@ FASTBOOL SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterNa
ImpSdrObjTextLinkUserData* SdrTextObj::GetLinkUserData() const
{
ImpSdrObjTextLinkUserData* pData=NULL;
- USHORT nAnz=GetUserDataCount();
- for (USHORT nNum=nAnz; nNum>0 && pData==NULL;) {
+ sal_uInt16 nAnz=GetUserDataCount();
+ for (sal_uInt16 nNum=nAnz; nNum>0 && pData==NULL;) {
nNum--;
pData=(ImpSdrObjTextLinkUserData*)GetUserData(nNum);
if (pData->GetInventor()!=SdrInventor || pData->GetId()!=SDRUSERDATA_OBJTEXTLINK) {
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 4559dacb31d8..2ffce73671ad 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -125,7 +125,7 @@ long SdrTextObj::GetRotateAngle() const
return aGeo.nDrehWink;
}
-long SdrTextObj::GetShearAngle(FASTBOOL /*bVertical*/) const
+long SdrTextObj::GetShearAngle(int /*bVertical*/) const
{
return aGeo.nShearWink;
}
@@ -140,14 +140,14 @@ void SdrTextObj::NbcMove(const Size& rSiz)
void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
- FASTBOOL bNoShearMerk=aGeo.nShearWink==0;
- FASTBOOL bRota90Merk=bNoShearMerk && aGeo.nDrehWink % 9000 ==0;
+ int bNoShearMerk=aGeo.nShearWink==0;
+ int bRota90Merk=bNoShearMerk && aGeo.nDrehWink % 9000 ==0;
long nHDist=GetTextLeftDistance()+GetTextRightDistance();
long nVDist=GetTextUpperDistance()+GetTextLowerDistance();
long nTWdt0=aRect.GetWidth ()-1-nHDist; if (nTWdt0<0) nTWdt0=0;
long nTHgt0=aRect.GetHeight()-1-nVDist; if (nTHgt0<0) nTHgt0=0;
- FASTBOOL bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
- FASTBOOL bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
+ int bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
+ int bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
if (bXMirr || bYMirr) {
Point aRef1(GetSnapRect().Center());
if (bXMirr) {
@@ -205,7 +205,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
}
if (bRota90Merk) {
- FASTBOOL bRota90=aGeo.nDrehWink % 9000 ==0;
+ int bRota90=aGeo.nDrehWink % 9000 ==0;
if (!bRota90) { // Scheinbar Rundungsfehler: Korregieren
long a=NormAngle360(aGeo.nDrehWink);
if (a<4500) a=0;
@@ -239,7 +239,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
{
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
long dx=aRect.Right()-aRect.Left();
long dy=aRect.Bottom()-aRect.Top();
Point aP(aRect.TopLeft());
@@ -258,18 +258,18 @@ void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs)
}
SetRectsDirty();
NbcRotateGluePoints(rRef,nWink,sn,cs);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
}
-void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear)
{
- SetGlueReallyAbsolute(TRUE);
+ SetGlueReallyAbsolute(sal_True);
// #75889# when this is a SdrPathObj aRect maybe not initialized
Polygon aPol(Rect2Poly(aRect.IsEmpty() ? GetSnapRect() : aRect, aGeo));
- USHORT nPointCount=aPol.GetSize();
- for (USHORT i=0; i<nPointCount; i++) {
+ sal_uInt16 nPointCount=aPol.GetSize();
+ for (sal_uInt16 i=0; i<nPointCount; i++) {
ShearPoint(aPol[i],rRef,tn,bVShear);
}
Poly2Rect(aPol,aRect,aGeo);
@@ -280,22 +280,22 @@ void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVS
ImpCheckShear();
SetRectsDirty();
NbcShearGluePoints(rRef,nWink,tn,bVShear);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
}
void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
{
- SetGlueReallyAbsolute(TRUE);
- FASTBOOL bNoShearMerk=aGeo.nShearWink==0;
- FASTBOOL bRota90Merk=FALSE;
+ SetGlueReallyAbsolute(sal_True);
+ int bNoShearMerk=aGeo.nShearWink==0;
+ int bRota90Merk=sal_False;
if (bNoShearMerk &&
(rRef1.X()==rRef2.X() || rRef1.Y()==rRef2.Y() ||
Abs(rRef1.X()-rRef2.X())==Abs(rRef1.Y()-rRef2.Y()))) {
bRota90Merk=aGeo.nDrehWink % 9000 ==0;
}
Polygon aPol(Rect2Poly(aRect,aGeo));
- USHORT i;
- USHORT nPntAnz=aPol.GetSize();
+ sal_uInt16 i;
+ sal_uInt16 nPntAnz=aPol.GetSize();
for (i=0; i<nPntAnz; i++) {
MirrorPoint(aPol[i],rRef1,rRef2);
}
@@ -309,7 +309,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
Poly2Rect(aPol,aRect,aGeo);
if (bRota90Merk) {
- FASTBOOL bRota90=aGeo.nDrehWink % 9000 ==0;
+ int bRota90=aGeo.nDrehWink % 9000 ==0;
if (bRota90Merk && !bRota90) { // Scheinbar Rundungsfehler: Korregieren
long a=NormAngle360(aGeo.nDrehWink);
if (a<4500) a=0;
@@ -333,7 +333,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
ImpCheckShear();
SetRectsDirty();
NbcMirrorGluePoints(rRef1,rRef2);
- SetGlueReallyAbsolute(FALSE);
+ SetGlueReallyAbsolute(sal_False);
}
//////////////////////////////////////////////////////////////////////////////
@@ -461,7 +461,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const
//////////////////////////////////////////////////////////////////////////////
-SdrObject* SdrTextObj::DoConvertToPolyObj(BOOL bBezier) const
+SdrObject* SdrTextObj::DoConvertToPolyObj(sal_Bool bBezier) const
{
return ImpConvertContainedTextToSdrPathObjs(!bBezier);
}
@@ -515,7 +515,7 @@ SdrObject* SdrTextObj::ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPol
return pPathObj;
}
-SdrObject* SdrTextObj::ImpConvertAddText(SdrObject* pObj, FASTBOOL bBezier) const
+SdrObject* SdrTextObj::ImpConvertAddText(SdrObject* pObj, int bBezier) const
{
if(!ImpCanConvTextToCurve())
{
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index 894a5c72926f..ed6c2170a5f2 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -164,11 +164,11 @@ namespace
TYPEINIT1(SdrUnoObj, SdrRectObj);
-SdrUnoObj::SdrUnoObj(const String& rModelName, BOOL _bOwnUnoControlModel)
+SdrUnoObj::SdrUnoObj(const String& rModelName, sal_Bool _bOwnUnoControlModel)
: m_pImpl( new SdrUnoObjDataHolder ),
bOwnUnoControlModel( _bOwnUnoControlModel )
{
- bIsUnoObj = TRUE;
+ bIsUnoObj = sal_True;
m_pImpl->pEventListener = new SdrControlEventListenerImpl(this);
@@ -179,11 +179,11 @@ SdrUnoObj::SdrUnoObj(const String& rModelName, BOOL _bOwnUnoControlModel)
SdrUnoObj::SdrUnoObj(const String& rModelName,
const uno::Reference< lang::XMultiServiceFactory >& rxSFac,
- BOOL _bOwnUnoControlModel)
+ sal_Bool _bOwnUnoControlModel)
: m_pImpl( new SdrUnoObjDataHolder ),
bOwnUnoControlModel( _bOwnUnoControlModel )
{
- bIsUnoObj = TRUE;
+ bIsUnoObj = sal_True;
m_pImpl->pEventListener = new SdrControlEventListenerImpl(this);
@@ -227,26 +227,26 @@ void SdrUnoObj::SetPage(SdrPage* pNewPage)
void SdrUnoObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bRotateFreeAllowed = FALSE;
- rInfo.bRotate90Allowed = FALSE;
- rInfo.bMirrorFreeAllowed = FALSE;
- rInfo.bMirror45Allowed = FALSE;
- rInfo.bMirror90Allowed = FALSE;
- rInfo.bTransparenceAllowed = FALSE;
- rInfo.bGradientAllowed = FALSE;
- rInfo.bShearAllowed = FALSE;
- rInfo.bEdgeRadiusAllowed = FALSE;
- rInfo.bNoOrthoDesired = FALSE;
- rInfo.bCanConvToPath = FALSE;
- rInfo.bCanConvToPoly = FALSE;
- rInfo.bCanConvToPathLineToArea = FALSE;
- rInfo.bCanConvToPolyLineToArea = FALSE;
- rInfo.bCanConvToContour = FALSE;
+ rInfo.bRotateFreeAllowed = sal_False;
+ rInfo.bRotate90Allowed = sal_False;
+ rInfo.bMirrorFreeAllowed = sal_False;
+ rInfo.bMirror45Allowed = sal_False;
+ rInfo.bMirror90Allowed = sal_False;
+ rInfo.bTransparenceAllowed = sal_False;
+ rInfo.bGradientAllowed = sal_False;
+ rInfo.bShearAllowed = sal_False;
+ rInfo.bEdgeRadiusAllowed = sal_False;
+ rInfo.bNoOrthoDesired = sal_False;
+ rInfo.bCanConvToPath = sal_False;
+ rInfo.bCanConvToPoly = sal_False;
+ rInfo.bCanConvToPathLineToArea = sal_False;
+ rInfo.bCanConvToPolyLineToArea = sal_False;
+ rInfo.bCanConvToContour = sal_False;
}
-UINT16 SdrUnoObj::GetObjIdentifier() const
+sal_uInt16 SdrUnoObj::GetObjIdentifier() const
{
- return UINT16(OBJ_UNO);
+ return sal_uInt16(OBJ_UNO);
}
void SdrUnoObj::SetContextWritingMode( const sal_Int16 _nContextWritingMode )
diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx
index 79e74a3382b8..2da5e803f3f6 100644
--- a/svx/source/svdraw/svdoutl.cxx
+++ b/svx/source/svdraw/svdoutl.cxx
@@ -41,7 +41,7 @@ DBG_NAME(SdrOutliner)
|* Ctor
|*
\************************************************************************/
-SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, USHORT nMode )
+SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode )
: Outliner( pItemPool, nMode ),
//mpPaintInfoRec( NULL )
mpVisualizedPage(0)
@@ -70,15 +70,15 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj )
{
if( pObj && pObj != mpTextObj.get() )
{
- SetUpdateMode(FALSE);
- USHORT nOutlinerMode2 = OUTLINERMODE_OUTLINEOBJECT;
+ SetUpdateMode(sal_False);
+ sal_uInt16 nOutlinerMode2 = OUTLINERMODE_OUTLINEOBJECT;
if ( !pObj->IsOutlText() )
nOutlinerMode2 = OUTLINERMODE_TEXTOBJECT;
Init( nOutlinerMode2 );
SetGlobalCharStretching(100,100);
- ULONG nStat = GetControlWord();
+ sal_uIntPtr nStat = GetControlWord();
nStat &= ~( EE_CNTRL_STRETCHING | EE_CNTRL_AUTOPAGESIZE );
SetControlWord(nStat);
@@ -108,14 +108,14 @@ void SdrOutliner::SetTextObjNoInit( const SdrTextObj* pObj )
|*
|*
\************************************************************************/
-XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos,
+XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos,
Color*& rpTxtColor, Color*& rpFldColor)
{
- FASTBOOL bOk = FALSE;
+ int bOk = sal_False;
XubString aRet;
if(mpTextObj.is())
- bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, FALSE, rpTxtColor, rpFldColor, aRet);
+ bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, sal_False, rpTxtColor, rpFldColor, aRet);
if (!bOk)
aRet = Outliner::CalcFieldValue(rField, nPara, nPos, rpTxtColor, rpFldColor);
diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx
index 429b459d3271..afa2a23bb93d 100644
--- a/svx/source/svdraw/svdoutlinercache.cxx
+++ b/svx/source/svdraw/svdoutlinercache.cxx
@@ -33,7 +33,7 @@
#include <svx/svdoutl.hxx>
#include <svx/svdmodel.hxx>
-extern SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pModel );
+extern SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pModel );
SdrOutlinerCache::SdrOutlinerCache( SdrModel* pModel )
: mpModel( pModel ),
@@ -85,7 +85,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner )
{
if( pOutliner )
{
- USHORT nOutlMode = pOutliner->GetOutlinerMode();
+ sal_uInt16 nOutlMode = pOutliner->GetOutlinerMode();
if( (OUTLINERMODE_OUTLINEOBJECT == nOutlMode) && (NULL == mpModeOutline) )
{
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index c97af7abc37c..e1a04f83d725 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -60,7 +60,7 @@ TYPEINIT1(SdrVirtObj,SdrObject);
SdrVirtObj::SdrVirtObj(SdrObject& rNewObj):
rRefObj(rNewObj)
{
- bVirtObj=TRUE; // Ja, ich bin ein virtuelles Objekt
+ bVirtObj=sal_True; // Ja, ich bin ein virtuelles Objekt
rRefObj.AddReference(*this);
bClosedObj=rRefObj.IsClosedObj();
}
@@ -69,7 +69,7 @@ SdrVirtObj::SdrVirtObj(SdrObject& rNewObj, const Point& rAnchorPos):
rRefObj(rNewObj)
{
aAnchor=rAnchorPos;
- bVirtObj=TRUE; // Ja, ich bin ein virtuelles Objekt
+ bVirtObj=sal_True; // Ja, ich bin ein virtuelles Objekt
rRefObj.AddReference(*this);
bClosedObj=rRefObj.IsClosedObj();
}
@@ -119,12 +119,12 @@ void SdrVirtObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
rRefObj.TakeObjInfo(rInfo);
}
-UINT32 SdrVirtObj::GetObjInventor() const
+sal_uInt32 SdrVirtObj::GetObjInventor() const
{
return rRefObj.GetObjInventor();
}
-UINT16 SdrVirtObj::GetObjIdentifier() const
+sal_uInt16 SdrVirtObj::GetObjIdentifier() const
{
return rRefObj.GetObjIdentifier();
}
@@ -197,7 +197,7 @@ void SdrVirtObj::TakeObjNamePlural(XubString& rName) const
void operator +=(PolyPolygon& rPoly, const Point& rOfs)
{
if (rOfs.X()!=0 || rOfs.Y()!=0) {
- USHORT i,j;
+ sal_uInt16 i,j;
for (j=0; j<rPoly.Count(); j++) {
Polygon aP1(rPoly.GetObject(j));
for (i=0; i<aP1.GetSize(); i++) {
@@ -347,22 +347,22 @@ String SdrVirtObj::getSpecialDragComment(const SdrDragStat& rDrag) const
////////////////////////////////////////////////////////////////////////////////////////////////////
-FASTBOOL SdrVirtObj::BegCreate(SdrDragStat& rStat)
+int SdrVirtObj::BegCreate(SdrDragStat& rStat)
{
return rRefObj.BegCreate(rStat);
}
-FASTBOOL SdrVirtObj::MovCreate(SdrDragStat& rStat)
+int SdrVirtObj::MovCreate(SdrDragStat& rStat)
{
return rRefObj.MovCreate(rStat);
}
-FASTBOOL SdrVirtObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+int SdrVirtObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
return rRefObj.EndCreate(rStat,eCmd);
}
-FASTBOOL SdrVirtObj::BckCreate(SdrDragStat& rStat)
+int SdrVirtObj::BckCreate(SdrDragStat& rStat)
{
return rRefObj.BckCreate(rStat);
}
@@ -404,7 +404,7 @@ void SdrVirtObj::NbcMirror(const Point& rRef1, const Point& rRef2)
SetRectsDirty();
}
-void SdrVirtObj::NbcShear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+void SdrVirtObj::NbcShear(const Point& rRef, long nWink, double tn, int bVShear)
{
rRefObj.NbcShear(rRef-aAnchor,nWink,tn,bVShear);
SetRectsDirty();
@@ -452,7 +452,7 @@ void SdrVirtObj::Mirror(const Point& rRef1, const Point& rRef2)
SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0);
}
-void SdrVirtObj::Shear(const Point& rRef, long nWink, double tn, FASTBOOL bVShear)
+void SdrVirtObj::Shear(const Point& rRef, long nWink, double tn, int bVShear)
{
if (nWink!=0) {
Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect();
@@ -531,7 +531,7 @@ long SdrVirtObj::GetRotateAngle() const
return rRefObj.GetRotateAngle();
}
-long SdrVirtObj::GetShearAngle(FASTBOOL bVertical) const
+long SdrVirtObj::GetShearAngle(int bVertical) const
{
return rRefObj.GetShearAngle(bVertical);
}
@@ -620,7 +620,7 @@ void SdrVirtObj::ReformatText()
////////////////////////////////////////////////////////////////////////////////////////////////////
-FASTBOOL SdrVirtObj::HasMacro() const
+int SdrVirtObj::HasMacro() const
{
return rRefObj.HasMacro();
}
@@ -640,7 +640,7 @@ void SdrVirtObj::PaintMacro(OutputDevice& rOut, const Rectangle& rDirtyRect, con
rRefObj.PaintMacro(rOut,rDirtyRect,rRec); // Todo: Positionsversatz
}
-FASTBOOL SdrVirtObj::DoMacro(const SdrObjMacroHitRec& rRec)
+int SdrVirtObj::DoMacro(const SdrObjMacroHitRec& rRec)
{
return rRefObj.DoMacro(rRec); // Todo: Positionsversatz
}
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index 26190c18aa60..d2a12ece7702 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -111,8 +111,8 @@ SdrObjList::SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewU
pModel=pNewModel;
pPage=pNewPage;
pUpList=pNewUpList;
- bObjOrdNumsDirty=FALSE;
- bRectsDirty=FALSE;
+ bObjOrdNumsDirty=sal_False;
+ bRectsDirty=sal_False;
pOwnerObj=NULL;
eListKind=SDROBJLIST_UNKNOWN;
}
@@ -127,8 +127,8 @@ SdrObjList::SdrObjList(const SdrObjList& rSrcList):
pModel=NULL;
pPage=NULL;
pUpList=NULL;
- bObjOrdNumsDirty=FALSE;
- bRectsDirty=FALSE;
+ bObjOrdNumsDirty=sal_False;
+ bRectsDirty=sal_False;
pOwnerObj=NULL;
eListKind=SDROBJLIST_UNKNOWN;
*this=rSrcList;
@@ -157,12 +157,12 @@ void SdrObjList::operator=(const SdrObjList& rSrcList)
void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
{
Clear();
- bObjOrdNumsDirty=FALSE;
- bRectsDirty =FALSE;
- ULONG nCloneErrCnt=0;
- ULONG nAnz=rSrcList.GetObjCount();
+ bObjOrdNumsDirty=sal_False;
+ bRectsDirty =sal_False;
+ sal_uIntPtr nCloneErrCnt=0;
+ sal_uIntPtr nAnz=rSrcList.GetObjCount();
SdrInsertReason aReason(SDRREASON_COPY);
- ULONG no;
+ sal_uIntPtr no;
for (no=0; no<nAnz; no++) {
SdrObject* pSO=rSrcList.GetObj(no);
@@ -184,15 +184,15 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
// Aehnliche Implementation an folgenden Stellen:
// void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
// SdrModel* SdrExchangeView::GetMarkedObjModel() const
- // FASTBOOL SdrExchangeView::Paste(const SdrModel& rMod,...)
+ // int SdrExchangeView::Paste(const SdrModel& rMod,...)
// void SdrEditView::CopyMarked()
if (nCloneErrCnt==0) {
for (no=0; no<nAnz; no++) {
const SdrObject* pSrcOb=rSrcList.GetObj(no);
SdrEdgeObj* pSrcEdge=PTR_CAST(SdrEdgeObj,pSrcOb);
if (pSrcEdge!=NULL) {
- SdrObject* pSrcNode1=pSrcEdge->GetConnectedNode(TRUE);
- SdrObject* pSrcNode2=pSrcEdge->GetConnectedNode(FALSE);
+ SdrObject* pSrcNode1=pSrcEdge->GetConnectedNode(sal_True);
+ SdrObject* pSrcNode2=pSrcEdge->GetConnectedNode(sal_False);
if (pSrcNode1!=NULL && pSrcNode1->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode1=NULL; // Listenuebergreifend
if (pSrcNode2!=NULL && pSrcNode2->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode2=NULL; // ist (noch) nicht
if (pSrcNode1!=NULL || pSrcNode2!=NULL) {
@@ -200,19 +200,19 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
SdrEdgeObj* pDstEdge=PTR_CAST(SdrEdgeObj,pEdgeObjTmp);
if (pDstEdge!=NULL) {
if (pSrcNode1!=NULL) {
- ULONG nDstNode1=pSrcNode1->GetOrdNum();
+ sal_uIntPtr nDstNode1=pSrcNode1->GetOrdNum();
SdrObject* pDstNode1=GetObj(nDstNode1);
if (pDstNode1!=NULL) { // Sonst grober Fehler!
- pDstEdge->ConnectToNode(TRUE,pDstNode1);
+ pDstEdge->ConnectToNode(sal_True,pDstNode1);
} else {
DBG_ERROR("SdrObjList::operator=(): pDstNode1==NULL!");
}
}
if (pSrcNode2!=NULL) {
- ULONG nDstNode2=pSrcNode2->GetOrdNum();
+ sal_uIntPtr nDstNode2=pSrcNode2->GetOrdNum();
SdrObject* pDstNode2=GetObj(nDstNode2);
if (pDstNode2!=NULL) { // Node war sonst wohl nicht markiert
- pDstEdge->ConnectToNode(FALSE,pDstNode2);
+ pDstEdge->ConnectToNode(sal_False,pDstNode2);
} else {
DBG_ERROR("SdrObjList::operator=(): pDstNode2==NULL!");
}
@@ -289,8 +289,8 @@ void SdrObjList::SetPage(SdrPage* pNewPage)
{
if (pPage!=pNewPage) {
pPage=pNewPage;
- ULONG nAnz=GetObjCount();
- for (ULONG no=0; no<nAnz; no++) {
+ sal_uIntPtr nAnz=GetObjCount();
+ for (sal_uIntPtr no=0; no<nAnz; no++) {
SdrObject* pObj=GetObj(no);
pObj->SetPage(pPage);
}
@@ -306,8 +306,8 @@ void SdrObjList::SetModel(SdrModel* pNewModel)
{
if (pModel!=pNewModel) {
pModel=pNewModel;
- ULONG nAnz=GetObjCount();
- for (ULONG i=0; i<nAnz; i++) {
+ sal_uIntPtr nAnz=GetObjCount();
+ for (sal_uIntPtr i=0; i<nAnz; i++) {
SdrObject* pObj=GetObj(i);
pObj->SetModel(pModel);
}
@@ -316,20 +316,20 @@ void SdrObjList::SetModel(SdrModel* pNewModel)
void SdrObjList::RecalcObjOrdNums()
{
- ULONG nAnz=GetObjCount();
- for (ULONG no=0; no<nAnz; no++) {
+ sal_uIntPtr nAnz=GetObjCount();
+ for (sal_uIntPtr no=0; no<nAnz; no++) {
SdrObject* pObj=GetObj(no);
pObj->SetOrdNum(no);
}
- bObjOrdNumsDirty=FALSE;
+ bObjOrdNumsDirty=sal_False;
}
void SdrObjList::RecalcRects()
{
aOutRect=Rectangle();
aSnapRect=aOutRect;
- ULONG nAnz=GetObjCount();
- ULONG i;
+ sal_uIntPtr nAnz=GetObjCount();
+ sal_uIntPtr i;
for (i=0; i<nAnz; i++) {
SdrObject* pObj=GetObj(i);
if (i==0) {
@@ -344,7 +344,7 @@ void SdrObjList::RecalcRects()
void SdrObjList::SetRectsDirty()
{
- bRectsDirty=TRUE;
+ bRectsDirty=sal_True;
if (pUpList!=NULL) pUpList->SetRectsDirty();
}
@@ -358,16 +358,16 @@ void SdrObjList::impChildInserted(SdrObject& rChild) const
}
}
-void SdrObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* /*pReason*/)
+void SdrObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* /*pReason*/)
{
DBG_ASSERT(pObj!=NULL,"SdrObjList::NbcInsertObject(NULL)");
if (pObj!=NULL) {
DBG_ASSERT(!pObj->IsInserted(),"ZObjekt hat bereits Inserted-Status");
- ULONG nAnz=GetObjCount();
+ sal_uIntPtr nAnz=GetObjCount();
if (nPos>nAnz) nPos=nAnz;
InsertObjectIntoContainer(*pObj,nPos);
- if (nPos<nAnz) bObjOrdNumsDirty=TRUE;
+ if (nPos<nAnz) bObjOrdNumsDirty=sal_True;
pObj->SetOrdNum(nPos);
pObj->SetObjList(this);
pObj->SetPage(pPage);
@@ -380,11 +380,11 @@ void SdrObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRea
aOutRect.Union(pObj->GetCurrentBoundRect());
aSnapRect.Union(pObj->GetSnapRect());
}
- pObj->SetInserted(TRUE); // Ruft u.a. den UserCall
+ pObj->SetInserted(sal_True); // Ruft u.a. den UserCall
}
}
-void SdrObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason)
+void SdrObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason)
{
DBG_ASSERT(pObj!=NULL,"SdrObjList::InsertObject(NULL)");
@@ -427,7 +427,7 @@ void SdrObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason
}
}
-SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum)
+SdrObject* SdrObjList::NbcRemoveObject(sal_uIntPtr nObjNum)
{
if (nObjNum >= maList.size())
{
@@ -435,7 +435,7 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum)
return NULL;
}
- ULONG nAnz=GetObjCount();
+ sal_uIntPtr nAnz=GetObjCount();
SdrObject* pObj=maList[nObjNum];
RemoveObjectFromContainer(nObjNum);
@@ -445,12 +445,12 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum)
DBG_ASSERT(pObj!=NULL,"Object zum Removen nicht gefunden");
if (pObj!=NULL) {
DBG_ASSERT(pObj->IsInserted(),"ZObjekt hat keinen Inserted-Status");
- pObj->SetInserted(FALSE); // Ruft u.a. den UserCall
+ pObj->SetInserted(sal_False); // Ruft u.a. den UserCall
pObj->SetObjList(NULL);
pObj->SetPage(NULL);
if (!bObjOrdNumsDirty) { // Optimierung fuer den Fall, dass das letzte Obj rausgenommen wird
- if (nObjNum!=ULONG(nAnz-1)) {
- bObjOrdNumsDirty=TRUE;
+ if (nObjNum!=sal_uIntPtr(nAnz-1)) {
+ bObjOrdNumsDirty=sal_True;
}
}
SetRectsDirty();
@@ -458,7 +458,7 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum)
return pObj;
}
-SdrObject* SdrObjList::RemoveObject(ULONG nObjNum)
+SdrObject* SdrObjList::RemoveObject(sal_uIntPtr nObjNum)
{
if (nObjNum >= maList.size())
{
@@ -466,7 +466,7 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum)
return NULL;
}
- ULONG nAnz=GetObjCount();
+ sal_uIntPtr nAnz=GetObjCount();
SdrObject* pObj=maList[nObjNum];
RemoveObjectFromContainer(nObjNum);
@@ -486,12 +486,12 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum)
}
pModel->SetChanged();
}
- pObj->SetInserted(FALSE); // Ruft u.a. den UserCall
+ pObj->SetInserted(sal_False); // Ruft u.a. den UserCall
pObj->SetObjList(NULL);
pObj->SetPage(NULL);
if (!bObjOrdNumsDirty) { // Optimierung fuer den Fall, dass das letzte Obj rausgenommen wird
- if (nObjNum!=ULONG(nAnz-1)) {
- bObjOrdNumsDirty=TRUE;
+ if (nObjNum!=sal_uIntPtr(nAnz-1)) {
+ bObjOrdNumsDirty=sal_True;
}
}
SetRectsDirty();
@@ -506,7 +506,7 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum)
return pObj;
}
-SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
+SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum)
{
if (nObjNum >= maList.size() || pNewObj == NULL)
{
@@ -519,7 +519,7 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
DBG_ASSERT(pObj!=NULL,"SdrObjList::ReplaceObject: Object zum Removen nicht gefunden");
if (pObj!=NULL) {
DBG_ASSERT(pObj->IsInserted(),"SdrObjList::ReplaceObject: ZObjekt hat keinen Inserted-Status");
- pObj->SetInserted(FALSE);
+ pObj->SetInserted(sal_False);
pObj->SetObjList(NULL);
pObj->SetPage(NULL);
ReplaceObjectInContainer(*pNewObj,nObjNum);
@@ -535,13 +535,13 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
// evtl. existing parent visualisations
impChildInserted(*pNewObj);
- pNewObj->SetInserted(TRUE);
+ pNewObj->SetInserted(sal_True);
SetRectsDirty();
}
return pObj;
}
-SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
+SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum)
{
if (nObjNum >= maList.size())
{
@@ -566,7 +566,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
pModel->Broadcast(aHint);
}
}
- pObj->SetInserted(FALSE);
+ pObj->SetInserted(sal_False);
pObj->SetObjList(NULL);
pObj->SetPage(NULL);
ReplaceObjectInContainer(*pNewObj,nObjNum);
@@ -582,7 +582,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
// evtl. existing parent visualisations
impChildInserted(*pNewObj);
- pNewObj->SetInserted(TRUE);
+ pNewObj->SetInserted(sal_True);
if (pModel!=NULL) {
// Hier muss ein anderer Broadcast her!
if (pNewObj->GetPage()!=NULL) {
@@ -597,7 +597,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
return pObj;
}
-SdrObject* SdrObjList::NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum)
+SdrObject* SdrObjList::NbcSetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum)
{
if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size())
{
@@ -620,12 +620,12 @@ SdrObject* SdrObjList::NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum)
pObj->ActionChanged();
pObj->SetOrdNum(nNewObjNum);
- bObjOrdNumsDirty=TRUE;
+ bObjOrdNumsDirty=sal_True;
}
return pObj;
}
-SdrObject* SdrObjList::SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum)
+SdrObject* SdrObjList::SetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum)
{
if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size())
{
@@ -647,7 +647,7 @@ SdrObject* SdrObjList::SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum)
pObj->ActionChanged();
pObj->SetOrdNum(nNewObjNum);
- bObjOrdNumsDirty=TRUE;
+ bObjOrdNumsDirty=sal_True;
if (pModel!=NULL)
{
// Hier muss ein anderer Broadcast her!
@@ -662,7 +662,7 @@ const Rectangle& SdrObjList::GetAllObjSnapRect() const
{
if (bRectsDirty) {
((SdrObjList*)this)->RecalcRects();
- ((SdrObjList*)this)->bRectsDirty=FALSE;
+ ((SdrObjList*)this)->bRectsDirty=sal_False;
}
return aSnapRect;
}
@@ -677,15 +677,15 @@ const Rectangle& SdrObjList::GetAllObjBoundRect() const
if (bRectsDirty || aOutRect.IsEmpty())
{
((SdrObjList*)this)->RecalcRects();
- ((SdrObjList*)this)->bRectsDirty=FALSE;
+ ((SdrObjList*)this)->bRectsDirty=sal_False;
}
return aOutRect;
}
void SdrObjList::NbcReformatAllTextObjects()
{
- ULONG nAnz=GetObjCount();
- ULONG nNum=0;
+ sal_uIntPtr nAnz=GetObjCount();
+ sal_uIntPtr nNum=0;
Printer* pPrinter = NULL;
@@ -750,7 +750,7 @@ void SdrObjList::BurnInStyleSheetAttributes()
}
}
-ULONG SdrObjList::GetObjCount() const
+sal_uIntPtr SdrObjList::GetObjCount() const
{
return maList.size();
}
@@ -758,7 +758,7 @@ ULONG SdrObjList::GetObjCount() const
-SdrObject* SdrObjList::GetObj(ULONG nNum) const
+SdrObject* SdrObjList::GetObj(sal_uIntPtr nNum) const
{
if (nNum >= maList.size())
{
@@ -772,18 +772,18 @@ SdrObject* SdrObjList::GetObj(ULONG nNum) const
-FASTBOOL SdrObjList::IsReadOnly() const
+int SdrObjList::IsReadOnly() const
{
- FASTBOOL bRet=FALSE;
+ int bRet=sal_False;
if (pPage!=NULL && pPage!=this) bRet=pPage->IsReadOnly();
return bRet;
}
-ULONG SdrObjList::CountAllObjects() const
+sal_uIntPtr SdrObjList::CountAllObjects() const
{
- ULONG nCnt=GetObjCount();
- ULONG nAnz=nCnt;
- for (USHORT nNum=0; nNum<nAnz; nNum++) {
+ sal_uIntPtr nCnt=GetObjCount();
+ sal_uIntPtr nAnz=nCnt;
+ for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) {
SdrObjList* pSubOL=GetObj(nNum)->GetSubList();
if (pSubOL!=NULL) {
nCnt+=pSubOL->CountAllObjects();
@@ -794,8 +794,8 @@ ULONG SdrObjList::CountAllObjects() const
void SdrObjList::ForceSwapInObjects() const
{
- ULONG nObjAnz=GetObjCount();
- for (ULONG nObjNum=nObjAnz; nObjNum>0;) {
+ sal_uIntPtr nObjAnz=GetObjCount();
+ for (sal_uIntPtr nObjNum=nObjAnz; nObjNum>0;) {
SdrObject* pObj=GetObj(--nObjNum);
SdrGrafObj* pGrafObj=PTR_CAST(SdrGrafObj,pObj);
if (pGrafObj!=NULL) {
@@ -810,8 +810,8 @@ void SdrObjList::ForceSwapInObjects() const
void SdrObjList::ForceSwapOutObjects() const
{
- ULONG nObjAnz=GetObjCount();
- for (ULONG nObjNum=nObjAnz; nObjNum>0;) {
+ sal_uIntPtr nObjAnz=GetObjCount();
+ for (sal_uIntPtr nObjNum=nObjAnz; nObjNum>0;) {
SdrObject* pObj=GetObj(--nObjNum);
SdrGrafObj* pGrafObj=PTR_CAST(SdrGrafObj,pObj);
if (pGrafObj!=NULL) {
@@ -832,7 +832,7 @@ void SdrObjList::FlattenGroups()
UnGroupObj(i);
}
-void SdrObjList::UnGroupObj( ULONG nObjNum )
+void SdrObjList::UnGroupObj( sal_uIntPtr nObjNum )
{
// if the given object is no group, this method is a noop
SdrObject* pUngroupObj = GetObj( nObjNum );
@@ -1054,7 +1054,7 @@ void SdrObjList::InsertObjectIntoContainer (
maList.push_back(&rObject);
else
maList.insert(maList.begin()+nInsertPosition, &rObject);
- bObjOrdNumsDirty=TRUE;
+ bObjOrdNumsDirty=sal_True;
}
@@ -1091,7 +1091,7 @@ void SdrObjList::ReplaceObjectInContainer (
}
maList[nObjectPosition] = &rNewObject;
- bObjOrdNumsDirty=TRUE;
+ bObjOrdNumsDirty=sal_True;
}
@@ -1120,7 +1120,7 @@ void SdrObjList::RemoveObjectFromContainer (
}
maList.erase(maList.begin()+nObjectPosition);
- bObjOrdNumsDirty=TRUE;
+ bObjOrdNumsDirty=sal_True;
}
@@ -1130,8 +1130,8 @@ void SdrObjList::RemoveObjectFromContainer (
void SdrPageGridFrameList::Clear()
{
- USHORT nAnz=GetCount();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=GetCount();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
delete GetObject(i);
}
aList.Clear();
@@ -1534,7 +1534,7 @@ Size SdrPage::GetSize() const
return Size(nWdt,nHgt);
}
-INT32 SdrPage::GetWdt() const
+sal_Int32 SdrPage::GetWdt() const
{
return nWdt;
}
@@ -1559,12 +1559,12 @@ Orientation SdrPage::GetOrientation() const
return eRet;
}
-INT32 SdrPage::GetHgt() const
+sal_Int32 SdrPage::GetHgt() const
{
return nHgt;
}
-void SdrPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr)
+void SdrPage::SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 nLwr)
{
bool bChanged(false);
@@ -1598,7 +1598,7 @@ void SdrPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr)
}
}
-void SdrPage::SetLftBorder(INT32 nBorder)
+void SdrPage::SetLftBorder(sal_Int32 nBorder)
{
if(nBordLft != nBorder)
{
@@ -1607,7 +1607,7 @@ void SdrPage::SetLftBorder(INT32 nBorder)
}
}
-void SdrPage::SetUppBorder(INT32 nBorder)
+void SdrPage::SetUppBorder(sal_Int32 nBorder)
{
if(nBordUpp != nBorder)
{
@@ -1616,7 +1616,7 @@ void SdrPage::SetUppBorder(INT32 nBorder)
}
}
-void SdrPage::SetRgtBorder(INT32 nBorder)
+void SdrPage::SetRgtBorder(sal_Int32 nBorder)
{
if(nBordRgt != nBorder)
{
@@ -1625,7 +1625,7 @@ void SdrPage::SetRgtBorder(INT32 nBorder)
}
}
-void SdrPage::SetLwrBorder(INT32 nBorder)
+void SdrPage::SetLwrBorder(sal_Int32 nBorder)
{
if(nBordLwr != nBorder)
{
@@ -1634,22 +1634,22 @@ void SdrPage::SetLwrBorder(INT32 nBorder)
}
}
-INT32 SdrPage::GetLftBorder() const
+sal_Int32 SdrPage::GetLftBorder() const
{
return nBordLft;
}
-INT32 SdrPage::GetUppBorder() const
+sal_Int32 SdrPage::GetUppBorder() const
{
return nBordUpp;
}
-INT32 SdrPage::GetRgtBorder() const
+sal_Int32 SdrPage::GetRgtBorder() const
{
return nBordRgt;
}
-INT32 SdrPage::GetLwrBorder() const
+sal_Int32 SdrPage::GetLwrBorder() const
{
return nBordLwr;
}
@@ -1709,17 +1709,17 @@ void SdrPage::SetPageNum(sal_uInt16 nNew)
}
}
-USHORT SdrPage::GetPageNum() const
+sal_uInt16 SdrPage::GetPageNum() const
{
if (!mbInserted)
return 0;
if (mbMaster) {
if (pModel && pModel->IsMPgNumsDirty())
- ((SdrModel*)pModel)->RecalcPageNums(TRUE);
+ ((SdrModel*)pModel)->RecalcPageNums(sal_True);
} else {
if (pModel && pModel->IsPagNumsDirty())
- ((SdrModel*)pModel)->RecalcPageNums(FALSE);
+ ((SdrModel*)pModel)->RecalcPageNums(sal_False);
}
return nPageNum;
}
@@ -1859,13 +1859,13 @@ SfxStyleSheet* SdrPage::GetTextStyleSheetForObject( SdrObject* pObj ) const
return pObj->GetStyleSheet();
}
-FASTBOOL SdrPage::HasTransparentObjects( BOOL bCheckForAlphaChannel ) const
+int SdrPage::HasTransparentObjects( sal_Bool bCheckForAlphaChannel ) const
{
- FASTBOOL bRet = FALSE;
+ int bRet = sal_False;
- for( ULONG n = 0, nCount = GetObjCount(); ( n < nCount ) && !bRet; n++ )
+ for( sal_uIntPtr n = 0, nCount = GetObjCount(); ( n < nCount ) && !bRet; n++ )
if( GetObj( n )->IsTransparent( bCheckForAlphaChannel ) )
- bRet = TRUE;
+ bRet = sal_True;
return bRet;
}
@@ -1936,12 +1936,12 @@ void SdrPage::ActionChanged() const
}
// NYI: Dummy implementations for declarations in svdpage.hxx
-Bitmap SdrPage::GetBitmap(const SetOfByte& /*rVisibleLayers*/, FASTBOOL /*bTrimBorders*/) const
+Bitmap SdrPage::GetBitmap(const SetOfByte& /*rVisibleLayers*/, int /*bTrimBorders*/) const
{
DBG_ASSERT(0, "SdrPage::GetBitmap(): not yet implemented.");
return Bitmap();
}
-GDIMetaFile SdrPage::GetMetaFile(const SetOfByte& /*rVisibleLayers*/, FASTBOOL /*bTrimBorders*/)
+GDIMetaFile SdrPage::GetMetaFile(const SetOfByte& /*rVisibleLayers*/, int /*bTrimBorders*/)
{
DBG_ASSERT(0, "SdrPage::GetMetaFile(): not yet implemented.");
return GDIMetaFile();
diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx
index 1758cd92745b..f41000da49bd 100644
--- a/svx/source/svdraw/svdpagv.cxx
+++ b/svx/source/svdraw/svdpagv.cxx
@@ -330,9 +330,9 @@ void SdrPageView::PaintOutlinerView(OutputDevice* pOut, const Rectangle& rRect)
if (GetView().pTextEditOutliner==NULL) return;
//const SdrObject* pTextObjTmp=GetView().GetTextEditObject();
//const SdrTextObj* pText=PTR_CAST(SdrTextObj,pTextObjTmp);
- //FASTBOOL bTextFrame=pText!=NULL && pText->IsTextFrame();
- ULONG nViewAnz=GetView().pTextEditOutliner->GetViewCount();
- for (ULONG i=0; i<nViewAnz; i++) {
+ //int bTextFrame=pText!=NULL && pText->IsTextFrame();
+ sal_uIntPtr nViewAnz=GetView().pTextEditOutliner->GetViewCount();
+ for (sal_uIntPtr i=0; i<nViewAnz; i++) {
OutlinerView* pOLV=GetView().pTextEditOutliner->GetView(i);
if (pOLV->GetWindow()==pOut) {
GetView().ImpPaintOutlinerView(*pOLV, rRect);
@@ -497,7 +497,7 @@ void SdrPageView::SetDesignMode( bool _bDesignMode ) const
////////////////////////////////////////////////////////////////////////////////////////////////////
#ifdef OS2
-#define RGBCOLOR(r,g,b) ((ULONG)(((BYTE)(b) | ((USHORT)(g)<<8)) | (((ULONG)(BYTE)(r))<<16)))
+#define RGBCOLOR(r,g,b) ((sal_uIntPtr)(((sal_uInt8)(b) | ((sal_uInt16)(g)<<8)) | (((sal_uIntPtr)(sal_uInt8)(r))<<16)))
#endif
void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor)
@@ -550,8 +550,8 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
Size aMinDotDist(rOut.PixelToLogic(Size(nMinDotPix,nMinDotPix)));
//Size a3PixSiz(rOut.PixelToLogic(Size(2,2)));
Size aMinLinDist(rOut.PixelToLogic(Size(nMinLinPix,nMinLinPix)));
- FASTBOOL bHoriSolid=nx2<aMinDotDist.Width();
- FASTBOOL bVertSolid=ny2<aMinDotDist.Height();
+ int bHoriSolid=nx2<aMinDotDist.Width();
+ int bVertSolid=ny2<aMinDotDist.Height();
// Linienabstand vergroessern (mind. 4 Pixel)
// Vergroesserung: *2 *5 *10 *20 *50 *100 ...
int nTgl=0;
@@ -586,10 +586,10 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
//if (nx2<a2PixSiz.Width()) nx2=nx1;
//if (ny2<a2PixSiz.Height()) ny2=ny1;
- FASTBOOL bHoriFine=nx2<nx1;
- FASTBOOL bVertFine=ny2<ny1;
- FASTBOOL bHoriLines=bHoriSolid || bHoriFine || !bVertFine;
- FASTBOOL bVertLines=bVertSolid || bVertFine;
+ int bHoriFine=nx2<nx1;
+ int bVertFine=ny2<ny1;
+ int bHoriLines=bHoriSolid || bHoriFine || !bVertFine;
+ int bVertLines=bVertSolid || bVertFine;
Color aColorMerk( rOut.GetLineColor() );
rOut.SetLineColor( aColor );
@@ -604,11 +604,11 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
long y1=GetPage()->GetUppBorder()+1+nWrX;
long y2=GetPage()->GetHgt()-GetPage()->GetLwrBorder()-1+nWrY;
const SdrPageGridFrameList* pFrames=GetPage()->GetGridFrameList(this,NULL);
- //USHORT nBufSiz=1024; // 4k Buffer = max. 512 Punkte
+ //sal_uInt16 nBufSiz=1024; // 4k Buffer = max. 512 Punkte
// #90353# long* pBuf = NULL;
- USHORT nGridPaintAnz=1;
+ sal_uInt16 nGridPaintAnz=1;
if (pFrames!=NULL) nGridPaintAnz=pFrames->GetCount();
- for (USHORT nGridPaintNum=0; nGridPaintNum<nGridPaintAnz; nGridPaintNum++) {
+ for (sal_uInt16 nGridPaintNum=0; nGridPaintNum<nGridPaintAnz; nGridPaintNum++) {
if (pFrames!=NULL) {
const SdrPageGridFrame& rGF=(*pFrames)[nGridPaintNum];
nWrX=rGF.GetPaperRect().Left();
@@ -649,13 +649,13 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
{
if( bHoriLines )
{
- ULONG nGridFlags = ( bHoriSolid ? GRID_HORZLINES : GRID_DOTS );
- UINT16 nSteps = sal_uInt16(nx1 / nx2);
- UINT32 nRestPerStepMul1000 = nSteps ? ( ((nx1 * 1000L)/ nSteps) - (nx2 * 1000L) ) : 0;
- UINT32 nStepOffset = 0;
- UINT16 nPointOffset = 0;
+ sal_uIntPtr nGridFlags = ( bHoriSolid ? GRID_HORZLINES : GRID_DOTS );
+ sal_uInt16 nSteps = sal_uInt16(nx1 / nx2);
+ sal_uInt32 nRestPerStepMul1000 = nSteps ? ( ((nx1 * 1000L)/ nSteps) - (nx2 * 1000L) ) : 0;
+ sal_uInt32 nStepOffset = 0;
+ sal_uInt16 nPointOffset = 0;
- for(UINT16 a=0;a<nSteps;a++)
+ for(sal_uInt16 a=0;a<nSteps;a++)
{
// Zeichnen
rOut.DrawGrid(
@@ -674,13 +674,13 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C
if( bVertLines )
{
- ULONG nGridFlags = ( bVertSolid ? GRID_VERTLINES : GRID_DOTS );
- UINT16 nSteps = sal_uInt16(ny1 / ny2);
- UINT32 nRestPerStepMul1000 = nSteps ? ( ((ny1 * 1000L)/ nSteps) - (ny2 * 1000L) ) : 0;
- UINT32 nStepOffset = 0;
- UINT16 nPointOffset = 0;
+ sal_uIntPtr nGridFlags = ( bVertSolid ? GRID_VERTLINES : GRID_DOTS );
+ sal_uInt16 nSteps = sal_uInt16(ny1 / ny2);
+ sal_uInt32 nRestPerStepMul1000 = nSteps ? ( ((ny1 * 1000L)/ nSteps) - (ny2 * 1000L) ) : 0;
+ sal_uInt32 nStepOffset = 0;
+ sal_uInt16 nPointOffset = 0;
- for(UINT16 a=0;a<nSteps;a++)
+ for(sal_uInt16 a=0;a<nSteps;a++)
{
// Zeichnen
rOut.DrawGrid(
@@ -806,7 +806,7 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const
{
// Der Layer muss sichtbar und darf nicht gesperrt sein
SdrLayerID nL = pObj->GetLayer();
- return (aLayerVisi.IsSet(BYTE(nL)) && !aLayerLock.IsSet(BYTE(nL)));
+ return (aLayerVisi.IsSet(sal_uInt8(nL)) && !aLayerLock.IsSet(sal_uInt8(nL)));
}
}
@@ -823,7 +823,7 @@ void SdrPageView::SetPageOrigin(const Point& rOrg)
}
}
-void SdrPageView::ImpInvalidateHelpLineArea(USHORT nNum) const
+void SdrPageView::ImpInvalidateHelpLineArea(sal_uInt16 nNum) const
{
if (GetView().IsHlplVisible() && nNum<aHelpLines.GetCount()) {
const SdrHelpLine& rHL=aHelpLines[nNum];
@@ -853,14 +853,14 @@ void SdrPageView::SetHelpLines(const SdrHelpLineList& rHLL)
InvalidateAllWin();
}
-void SdrPageView::SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine)
+void SdrPageView::SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine)
{
if (nNum<aHelpLines.GetCount() && aHelpLines[nNum]!=rNewHelpLine) {
- FASTBOOL bNeedRedraw=TRUE;
+ int bNeedRedraw=sal_True;
if (aHelpLines[nNum].GetKind()==rNewHelpLine.GetKind()) {
switch (rNewHelpLine.GetKind()) {
- case SDRHELPLINE_VERTICAL : if (aHelpLines[nNum].GetPos().X()==rNewHelpLine.GetPos().X()) bNeedRedraw=FALSE; break;
- case SDRHELPLINE_HORIZONTAL: if (aHelpLines[nNum].GetPos().Y()==rNewHelpLine.GetPos().Y()) bNeedRedraw=FALSE; break;
+ case SDRHELPLINE_VERTICAL : if (aHelpLines[nNum].GetPos().X()==rNewHelpLine.GetPos().X()) bNeedRedraw=sal_False; break;
+ case SDRHELPLINE_HORIZONTAL: if (aHelpLines[nNum].GetPos().Y()==rNewHelpLine.GetPos().Y()) bNeedRedraw=sal_False; break;
default: break;
} // switch
}
@@ -870,7 +870,7 @@ void SdrPageView::SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine)
}
}
-void SdrPageView::DeleteHelpLine(USHORT nNum)
+void SdrPageView::DeleteHelpLine(sal_uInt16 nNum)
{
if (nNum<aHelpLines.GetCount()) {
ImpInvalidateHelpLineArea(nNum);
@@ -878,7 +878,7 @@ void SdrPageView::DeleteHelpLine(USHORT nNum)
}
}
-void SdrPageView::InsertHelpLine(const SdrHelpLine& rHL, USHORT nNum)
+void SdrPageView::InsertHelpLine(const SdrHelpLine& rHL, sal_uInt16 nNum)
{
if (nNum>aHelpLines.GetCount()) nNum=aHelpLines.GetCount();
aHelpLines.Insert(rHL,nNum);
@@ -961,7 +961,7 @@ void SdrPageView::LeaveOneGroup()
{
if(GetAktGroup())
{
- BOOL bGlueInvalidate = (GetView().ImpIsGlueVisible());
+ sal_Bool bGlueInvalidate = (GetView().ImpIsGlueVisible());
if(bGlueInvalidate)
GetView().GlueInvalidate();
@@ -999,7 +999,7 @@ void SdrPageView::LeaveAllGroup()
{
if(GetAktGroup())
{
- BOOL bGlueInvalidate = (GetView().ImpIsGlueVisible());
+ sal_Bool bGlueInvalidate = (GetView().ImpIsGlueVisible());
if(bGlueInvalidate)
GetView().GlueInvalidate();
@@ -1033,9 +1033,9 @@ void SdrPageView::LeaveAllGroup()
}
}
-USHORT SdrPageView::GetEnteredLevel() const
+sal_uInt16 SdrPageView::GetEnteredLevel() const
{
- USHORT nAnz=0;
+ sal_uInt16 nAnz=0;
SdrObject* pGrp=GetAktGroup();
while (pGrp!=NULL) {
nAnz++;
@@ -1062,7 +1062,7 @@ XubString SdrPageView::GetActualGroupName() const
XubString SdrPageView::GetActualPathName(sal_Unicode cSep) const
{
XubString aStr;
- BOOL bNamFnd(FALSE);
+ sal_Bool bNamFnd(sal_False);
SdrObject* pGrp = GetAktGroup();
while(pGrp)
@@ -1072,7 +1072,7 @@ XubString SdrPageView::GetActualPathName(sal_Unicode cSep) const
if(!aStr1.Len())
aStr1 += sal_Unicode('?');
else
- bNamFnd = TRUE;
+ bNamFnd = sal_True;
aStr += aStr1;
pGrp = pGrp->GetUpGroup();
diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx
index 1d74ed119c33..79776559a738 100644
--- a/svx/source/svdraw/svdpntv.cxx
+++ b/svx/source/svdraw/svdpntv.cxx
@@ -222,23 +222,23 @@ void SdrPaintView::ImpClearVars()
#ifdef DBG_UTIL
pItemBrowser=NULL;
#endif
- bPageVisible=TRUE;
- bPageBorderVisible=TRUE;
- bBordVisible=TRUE;
- bGridVisible=TRUE;
- bGridFront =FALSE;
- bHlplVisible=TRUE;
- bHlplFront =TRUE;
- bGlueVisible=FALSE;
- bGlueVisible2=FALSE;
- bGlueVisible3=FALSE;
- bGlueVisible4=FALSE;
- bSwapAsynchron=FALSE;
- bPrintPreview=FALSE;
- mbPreviewRenderer=FALSE;
+ bPageVisible=sal_True;
+ bPageBorderVisible=sal_True;
+ bBordVisible=sal_True;
+ bGridVisible=sal_True;
+ bGridFront =sal_False;
+ bHlplVisible=sal_True;
+ bHlplFront =sal_True;
+ bGlueVisible=sal_False;
+ bGlueVisible2=sal_False;
+ bGlueVisible3=sal_False;
+ bGlueVisible4=sal_False;
+ bSwapAsynchron=sal_False;
+ bPrintPreview=sal_False;
+ mbPreviewRenderer=sal_False;
eAnimationMode = SDR_ANIMATION_ANIMATE;
- bAnimationPause = FALSE;
+ bAnimationPause = sal_False;
nHitTolPix=2;
nMinMovPix=3;
@@ -246,16 +246,16 @@ void SdrPaintView::ImpClearVars()
nMinMovLog=0;
pActualOutDev=NULL;
pDragWin=NULL;
- bRestoreColors=TRUE;
+ bRestoreColors=sal_True;
pDefaultStyleSheet=NULL;
- bSomeObjChgdFlag=FALSE;
+ bSomeObjChgdFlag=sal_False;
nGraphicManagerDrawMode = GRFMGR_DRAW_STANDARD;
aComeBackTimer.SetTimeout(1);
aComeBackTimer.SetTimeoutHdl(LINK(this,SdrPaintView,ImpComeBackHdl));
String aNam; // System::GetUserName() just return an empty string
if (pMod)
- SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), TRUE);
+ SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), sal_True);
aNam.ToUpperAscii();
@@ -285,7 +285,7 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut)
}
// Flag zur Visualisierung von Gruppen
- bVisualizeEnteredGroup = TRUE;
+ bVisualizeEnteredGroup = sal_True;
maColorConfig.AddListener(this);
onChangeColorConfig();
@@ -330,14 +330,14 @@ void __EXPORT SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
return;
}
- BOOL bObjChg=!bSomeObjChgdFlag; // TRUE= auswerten fuer ComeBack-Timer
+ sal_Bool bObjChg=!bSomeObjChgdFlag; // sal_True= auswerten fuer ComeBack-Timer
if (bObjChg) {
SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint);
if (pSdrHint!=NULL) {
SdrHintKind eKind=pSdrHint->GetKind();
if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) {
if (bObjChg) {
- bSomeObjChgdFlag=TRUE;
+ bSomeObjChgdFlag=sal_True;
aComeBackTimer.Start();
}
}
@@ -367,7 +367,7 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_
IMPL_LINK_INLINE_START(SdrPaintView,ImpComeBackHdl,Timer*,EMPTYARG)
{
if (bSomeObjChgdFlag) {
- bSomeObjChgdFlag=FALSE;
+ bSomeObjChgdFlag=sal_False;
ModelHasChanged();
}
return 0;
@@ -407,7 +407,7 @@ void SdrPaintView::ModelHasChanged()
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrPaintView::IsAction() const
+sal_Bool SdrPaintView::IsAction() const
{
return IsEncirclement();
}
@@ -461,9 +461,9 @@ SdrPageView* SdrPaintView::GetTextEditPageView() const
////////////////////////////////////////////////////////////////////////////////////////////////////
-USHORT SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const
+sal_uInt16 SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const
{
- if (nMinMov>=0) return USHORT(nMinMov);
+ if (nMinMov>=0) return sal_uInt16(nMinMov);
if (pOut==NULL)
{
pOut = GetFirstOutputDevice();
@@ -475,9 +475,9 @@ USHORT SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut)
}
}
-USHORT SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const
+sal_uInt16 SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const
{
- if (nHitTol>=0) return USHORT(nHitTol);
+ if (nHitTol>=0) return sal_uInt16(nHitTol);
if (pOut==NULL)
{
pOut = GetFirstOutputDevice();
@@ -492,8 +492,8 @@ USHORT SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut)
void SdrPaintView::TheresNewMapMode()
{
if (pActualOutDev!=NULL) {
- nHitTolLog=(USHORT)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nHitTolPix,0)).Width();
- nMinMovLog=(USHORT)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nMinMovPix,0)).Width();
+ nHitTolLog=(sal_uInt16)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nHitTolPix,0)).Width();
+ nMinMovLog=(sal_uInt16)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nMinMovPix,0)).Width();
}
}
@@ -643,7 +643,7 @@ void SdrPaintView::DeleteWindowFromPaintView(OutputDevice* pOldWin)
#endif
}
-void SdrPaintView::SetLayerVisible(const XubString& rName, BOOL bShow)
+void SdrPaintView::SetLayerVisible(const XubString& rName, sal_Bool bShow)
{
if(mpPageView)
{
@@ -663,7 +663,7 @@ bool SdrPaintView::IsLayerVisible(const XubString& rName) const
return false;
}
-void SdrPaintView::SetAllLayersVisible(BOOL bShow)
+void SdrPaintView::SetAllLayersVisible(sal_Bool bShow)
{
if(mpPageView)
{
@@ -673,7 +673,7 @@ void SdrPaintView::SetAllLayersVisible(BOOL bShow)
InvalidateAllWin();
}
-void SdrPaintView::SetLayerLocked(const XubString& rName, BOOL bLock)
+void SdrPaintView::SetLayerLocked(const XubString& rName, sal_Bool bLock)
{
if(mpPageView)
{
@@ -691,7 +691,7 @@ bool SdrPaintView::IsLayerLocked(const XubString& rName) const
return false;
}
-void SdrPaintView::SetAllLayersLocked(BOOL bLock)
+void SdrPaintView::SetAllLayersLocked(sal_Bool bLock)
{
if(mpPageView)
{
@@ -699,7 +699,7 @@ void SdrPaintView::SetAllLayersLocked(BOOL bLock)
}
}
-void SdrPaintView::SetLayerPrintable(const XubString& rName, BOOL bPrn)
+void SdrPaintView::SetLayerPrintable(const XubString& rName, sal_Bool bPrn)
{
if(mpPageView)
{
@@ -717,7 +717,7 @@ bool SdrPaintView::IsLayerPrintable(const XubString& rName) const
return false;
}
-void SdrPaintView::SetAllLayersPrintable(BOOL bPrn)
+void SdrPaintView::SetAllLayersPrintable(sal_Bool bPrn)
{
if(mpPageView)
{
@@ -1070,9 +1070,9 @@ void SdrPaintView::ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/)
+sal_Bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/)
{
- return FALSE;
+ return sal_False;
}
void SdrPaintView::GlueInvalidate() const
@@ -1090,8 +1090,8 @@ void SdrPaintView::GlueInvalidate() const
if(mpPageView)
{
const SdrObjList* pOL=mpPageView->GetObjList();
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
const SdrObject* pObj=pOL->GetObj(nObjNum);
const SdrGluePointList* pGPL=pObj->GetGluePointList();
if (pGPL!=NULL && pGPL->GetCount()!=0) {
@@ -1118,7 +1118,7 @@ void SdrPaintView::InvalidateAllWin()
}
}
-void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, BOOL bPlus1Pix)
+void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix)
{
const sal_uInt32 nWindowCount(PaintWindowCount());
@@ -1193,12 +1193,12 @@ bool SdrPaintView::IsGroupEntered() const
return false;
}
-void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL /*bReplaceAll*/)
+void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/)
{
// bReplaceAll hat hier keinerlei Wirkung
- BOOL bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
+ sal_Bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
const SfxPoolItem *pPoolItem=NULL;
- if (rAttr.GetItemState(SDRATTR_LAYERID,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_LAYERID,sal_True,&pPoolItem)==SFX_ITEM_SET) {
SdrLayerID nLayerId=((const SdrLayerIdItem*)pPoolItem)->GetValue();
const SdrLayer* pLayer=pMod->GetLayerAdmin().GetLayerPerID(nLayerId);
if (pLayer!=NULL) {
@@ -1206,35 +1206,35 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL /*bRep
else aAktLayer=pLayer->GetName();
}
}
- if (rAttr.GetItemState(SDRATTR_LAYERNAME,TRUE,&pPoolItem)==SFX_ITEM_SET) {
+ if (rAttr.GetItemState(SDRATTR_LAYERNAME,sal_True,&pPoolItem)==SFX_ITEM_SET) {
if (bMeasure) aMeasureLayer=((const SdrLayerNameItem*)pPoolItem)->GetValue();
else aAktLayer=((const SdrLayerNameItem*)pPoolItem)->GetValue();
}
}
-void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, BOOL /*bOnlyHardAttr*/) const
+void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const
{
// bOnlyHardAttr hat hier keinerlei Wirkung
- BOOL bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
+ sal_Bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool();
const XubString& aNam=bMeasure?aMeasureLayer:aAktLayer;
rAttr.Put(SdrLayerNameItem(aNam));
- SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,TRUE);
+ SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,sal_True);
if (nLayer!=SDRLAYER_NOTFOUND) {
rAttr.Put(SdrLayerIdItem(nLayer));
}
}
-void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll)
+void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll)
{
#ifdef DBG_UTIL
{
- BOOL bHasEEFeatureItems=FALSE;
+ sal_Bool bHasEEFeatureItems=sal_False;
SfxItemIter aIter(rAttr);
const SfxPoolItem* pItem=aIter.FirstItem();
while (!bHasEEFeatureItems && pItem!=NULL) {
if (!IsInvalidItem(pItem)) {
- USHORT nW=pItem->Which();
- if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=TRUE;
+ sal_uInt16 nW=pItem->Which();
+ if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=sal_True;
}
pItem=aIter.NextItem();
}
@@ -1255,7 +1255,7 @@ void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll)
#endif
}
-void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
{
if (pDefaultStyleSheet)
EndListening(*pDefaultStyleSheet);
@@ -1265,9 +1265,9 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRe
if (pStyleSheet!=NULL && !bDontRemoveHardAttr) {
SfxWhichIter aIter(pStyleSheet->GetItemSet());
- USHORT nWhich=aIter.FirstWhich();
+ sal_uInt16 nWhich=aIter.FirstWhich();
while (nWhich!=0) {
- if (pStyleSheet->GetItemSet().GetItemState(nWhich,TRUE)==SFX_ITEM_SET) {
+ if (pStyleSheet->GetItemSet().GetItemState(nWhich,sal_True)==SFX_ITEM_SET) {
aDefaultAttr.ClearItem(nWhich);
}
nWhich=aIter.NextWhich();
@@ -1279,49 +1279,49 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRe
}
/* new interface src537 */
-BOOL SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
{
if(bOnlyHardAttr || !pDefaultStyleSheet)
{
- rTargetSet.Put(aDefaultAttr, FALSE);
+ rTargetSet.Put(aDefaultAttr, sal_False);
}
else
{
// sonst DefStyleSheet dazumergen
- rTargetSet.Put(pDefaultStyleSheet->GetItemSet(), FALSE);
- rTargetSet.Put(aDefaultAttr, FALSE);
+ rTargetSet.Put(pDefaultStyleSheet->GetItemSet(), sal_False);
+ rTargetSet.Put(aDefaultAttr, sal_False);
}
MergeNotPersistDefaultAttr(rTargetSet, bOnlyHardAttr);
- return TRUE;
+ return sal_True;
}
-BOOL SdrPaintView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll)
+sal_Bool SdrPaintView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll)
{
SetDefaultAttr(rSet,bReplaceAll);
- return TRUE;
+ return sal_True;
}
-SfxStyleSheet* SdrPaintView::GetStyleSheet() const // SfxStyleSheet* SdrPaintView::GetStyleSheet(BOOL& rOk) const
+SfxStyleSheet* SdrPaintView::GetStyleSheet() const // SfxStyleSheet* SdrPaintView::GetStyleSheet(sal_Bool& rOk) const
{
- //rOk=TRUE;
+ //rOk=sal_True;
return GetDefaultStyleSheet();
}
-BOOL SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr)
+sal_Bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr)
{
SetDefaultStyleSheet(pStyleSheet,bDontRemoveHardAttr);
- return TRUE;
+ return sal_True;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
#ifdef DBG_UTIL
-void SdrPaintView::ShowItemBrowser(BOOL bShow)
+void SdrPaintView::ShowItemBrowser(sal_Bool bShow)
{
if (bShow) {
if (pItemBrowser==NULL) {
pItemBrowser=new SdrItemBrowser(*(SdrView*)this);
- pItemBrowser->SetFloatingMode(TRUE);
+ pItemBrowser->SetFloatingMode(sal_True);
}
pItemBrowser->Show();
pItemBrowser->GrabFocus();
@@ -1343,12 +1343,12 @@ void SdrPaintView::MakeVisible(const Rectangle& rRect, Window& rWin)
if( aActualSize.Height() > 0 && aActualSize.Width() > 0 )
{
Size aNewSize(rRect.GetSize());
- BOOL bNewScale=FALSE;
- BOOL bNeedMoreX=aNewSize.Width()>aActualSize.Width();
- BOOL bNeedMoreY=aNewSize.Height()>aActualSize.Height();
+ sal_Bool bNewScale=sal_False;
+ sal_Bool bNeedMoreX=aNewSize.Width()>aActualSize.Width();
+ sal_Bool bNeedMoreY=aNewSize.Height()>aActualSize.Height();
if (bNeedMoreX || bNeedMoreY)
{
- bNewScale=TRUE;
+ bNewScale=sal_True;
// Neuen MapMode (Size+Org) setzen und dabei alles invalidieren
Fraction aXFact(aNewSize.Width(),aActualSize.Width());
Fraction aYFact(aNewSize.Height(),aActualSize.Height());
@@ -1388,7 +1388,7 @@ void SdrPaintView::DoConnect(SdrOle2Obj* /*pOleObj*/)
{
}
-void SdrPaintView::SetAnimationEnabled( BOOL bEnable )
+void SdrPaintView::SetAnimationEnabled( sal_Bool bEnable )
{
SetAnimationMode( bEnable ? SDR_ANIMATION_ANIMATE : SDR_ANIMATION_DISABLE );
}
diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx
index 3a3942319661..64c9d35cb6cf 100644
--- a/svx/source/svdraw/svdpoev.cxx
+++ b/svx/source/svdraw/svdpoev.cxx
@@ -51,8 +51,8 @@ void SdrPolyEditView::ImpResetPolyPossibilityFlags()
{
eMarkedPointsSmooth=SDRPATHSMOOTH_DONTCARE;
eMarkedSegmentsKind=SDRPATHSEGMENT_DONTCARE;
- bSetMarkedPointsSmoothPossible=FALSE;
- bSetMarkedSegmentsKindPossible=FALSE;
+ bSetMarkedPointsSmoothPossible=sal_False;
+ bSetMarkedSegmentsKindPossible=sal_False;
}
void SdrPolyEditView::ImpClearVars()
@@ -73,7 +73,7 @@ SdrPolyEditView::~SdrPolyEditView()
void SdrPolyEditView::ImpCheckPolyPossibilities()
{
ImpResetPolyPossibilityFlags();
- const ULONG nMarkAnz(GetMarkedObjectCount());
+ const sal_uIntPtr nMarkAnz(GetMarkedObjectCount());
if(nMarkAnz && !ImpIsFrameHandles())
{
@@ -84,7 +84,7 @@ void SdrPolyEditView::ImpCheckPolyPossibilities()
bool bSegmFuz(false);
basegfx::B2VectorContinuity eSmooth = basegfx::CONTINUITY_NONE;
- for(ULONG nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++)
+ for(sal_uIntPtr nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++)
{
SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
CheckPolyPossibilitiesHelper( pM, b1stSmooth, b1stSegm, bCurve, bSmoothFuz, bSegmFuz, eSmooth );
@@ -214,9 +214,9 @@ void SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind)
const bool bUndo = IsUndoEnabled();
if( bUndo )
BegUndo(ImpGetResStr(STR_EditSetPointsSmooth), GetDescriptionOfMarkedPoints());
- ULONG nMarkAnz(GetMarkedObjectCount());
+ sal_uIntPtr nMarkAnz(GetMarkedObjectCount());
- for(ULONG nMarkNum(nMarkAnz); nMarkNum > 0L;)
+ for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;)
{
nMarkNum--;
SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
@@ -249,9 +249,9 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
const bool bUndo = IsUndoEnabled();
if( bUndo )
BegUndo(ImpGetResStr(STR_EditSetSegmentsKind), GetDescriptionOfMarkedPoints());
- ULONG nMarkAnz(GetMarkedObjectCount());
+ sal_uIntPtr nMarkAnz(GetMarkedObjectCount());
- for(ULONG nMarkNum(nMarkAnz); nMarkNum > 0L;)
+ for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;)
{
nMarkNum--;
SdrMark* pM = GetSdrMarkByIndex(nMarkNum);
@@ -275,7 +275,7 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind)
}
}
-BOOL SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const
+sal_Bool SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const
{
ForcePossibilities();
return bSetMarkedPointsSmoothPossible;
@@ -287,7 +287,7 @@ SdrPathSmoothKind SdrPolyEditView::GetMarkedPointsSmooth() const
return eMarkedPointsSmooth;
}
-BOOL SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const
+sal_Bool SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const
{
ForcePossibilities();
return bSetMarkedSegmentsKindPossible;
@@ -299,7 +299,7 @@ SdrPathSegmentKind SdrPolyEditView::GetMarkedSegmentsKind() const
return eMarkedSegmentsKind;
}
-BOOL SdrPolyEditView::IsDeleteMarkedPointsPossible() const
+sal_Bool SdrPolyEditView::IsDeleteMarkedPointsPossible() const
{
return HasMarkedPoints();
}
@@ -310,7 +310,7 @@ void SdrPolyEditView::DeleteMarkedPoints()
{
BrkAction();
SortMarkedObjects();
- ULONG nMarkAnz=GetMarkedObjectCount();
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
const bool bUndo = IsUndoEnabled();
if( bUndo )
@@ -319,7 +319,7 @@ void SdrPolyEditView::DeleteMarkedPoints()
BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_DELETE);
}
- for (ULONG nMarkNum=nMarkAnz; nMarkNum>0;)
+ for (sal_uIntPtr nMarkNum=nMarkAnz; nMarkNum>0;)
{
nMarkNum--;
SdrMark* pM=GetSdrMarkByIndex(nMarkNum);
@@ -400,7 +400,7 @@ void SdrPolyEditView::RipUpAtMarkedPoints()
pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1, &aReason);
if( bUndo )
AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj));
- MarkObj(pNeuObj, pM->GetPageView(), FALSE, TRUE);
+ MarkObj(pNeuObj, pM->GetPageView(), sal_False, sal_True);
}
if(nNewPt0Idx)
@@ -555,7 +555,7 @@ void SdrPolyEditView::ShutMarkedObjects()
CloseMarkedObjects();
}
-void SdrPolyEditView::CloseMarkedObjects(BOOL bToggle, BOOL bOpen) // , long nOpenDistance)
+void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen) // , long nOpenDistance)
{
if (AreObjectsMarked())
{
@@ -564,12 +564,12 @@ void SdrPolyEditView::CloseMarkedObjects(BOOL bToggle, BOOL bOpen) // , long nOp
BegUndo(ImpGetResStr(STR_EditShut),GetDescriptionOfMarkedPoints());
bool bChg=false;
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pO=pM->GetMarkedSdrObj();
- BOOL bClosed=pO->IsClosedObj();
+ sal_Bool bClosed=pO->IsClosedObj();
if (pO->IsPolyObj() && (bClosed==bOpen) || bToggle)
{
if( bUndo )
@@ -605,13 +605,13 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void*
{
const bool bUndo = IsUndoEnabled();
- ULONG nMarkAnz=GetMarkedObjectCount();
- for (ULONG nm=0; nm<nMarkAnz; nm++)
+ sal_uIntPtr nMarkAnz=GetMarkedObjectCount();
+ for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++)
{
SdrMark* pM=GetSdrMarkByIndex(nm);
SdrObject* pObj=pM->GetMarkedSdrObj();
const SdrUShortCont* pPts=pM->GetMarkedPoints();
- ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
+ sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount();
SdrPathObj* pPath=PTR_CAST(SdrPathObj,pObj);
if (nPtAnz!=0 && pPath!=NULL)
{
@@ -685,7 +685,7 @@ static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const vo
void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz, bool bCopy)
{
- bCopy=FALSE; // noch nicht implementiert
+ bCopy=sal_False; // noch nicht implementiert
ForceUndirtyMrkPnt();
XubString aStr(ImpGetResStr(STR_EditMove));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -707,7 +707,7 @@ static void ImpResize(Point& rPt, Point* pC1, Point* pC2, const void* p1, const
void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy)
{
- bCopy=FALSE; // noch nicht implementiert
+ bCopy=sal_False; // noch nicht implementiert
ForceUndirtyMrkPnt();
XubString aStr(ImpGetResStr(STR_EditResize));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
@@ -729,7 +729,7 @@ static void ImpRotate(Point& rPt, Point* pC1, Point* pC2, const void* p1, const
void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nWink, bool bCopy)
{
- bCopy=FALSE; // noch nicht implementiert
+ bCopy=sal_False; // noch nicht implementiert
ForceUndirtyMrkPnt();
XubString aStr(ImpGetResStr(STR_EditResize));
if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy);
diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx
index a58081ad0ee0..d44be3d6bab0 100644
--- a/svx/source/svdraw/svdsnpv.cxx
+++ b/svx/source/svdraw/svdsnpv.cxx
@@ -203,29 +203,29 @@ void ImplHelpLineOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition)
void SdrSnapView::ClearVars()
{
nMagnSizPix=4;
- bSnapEnab=TRUE;
- bGridSnap=TRUE;
- bSnapTo1Pix=TRUE;
- bBordSnap=TRUE;
- bHlplSnap=TRUE;
- bOFrmSnap=TRUE;
- bOPntSnap=FALSE;
- bOConSnap=TRUE;
- bMoveMFrmSnap=TRUE;
- bMoveOFrmSnap=TRUE;
- bMoveOPntSnap=TRUE;
- bMoveOConSnap=TRUE;
- bMoveSnapOnlyTopLeft=FALSE;
- bOrtho=FALSE;
- bBigOrtho=TRUE;
+ bSnapEnab=sal_True;
+ bGridSnap=sal_True;
+ bSnapTo1Pix=sal_True;
+ bBordSnap=sal_True;
+ bHlplSnap=sal_True;
+ bOFrmSnap=sal_True;
+ bOPntSnap=sal_False;
+ bOConSnap=sal_True;
+ bMoveMFrmSnap=sal_True;
+ bMoveOFrmSnap=sal_True;
+ bMoveOPntSnap=sal_True;
+ bMoveOConSnap=sal_True;
+ bMoveSnapOnlyTopLeft=sal_False;
+ bOrtho=sal_False;
+ bBigOrtho=sal_True;
nSnapAngle=1500;
- bAngleSnapEnab=FALSE;
- bMoveOnlyDragging=FALSE;
- bSlantButShear=FALSE;
- bCrookNoContortion=FALSE;
+ bAngleSnapEnab=sal_False;
+ bMoveOnlyDragging=sal_False;
+ bSlantButShear=sal_False;
+ bCrookNoContortion=sal_False;
eCrookMode=SDRCROOK_ROTATE;
- bHlplFixed=FALSE;
- bEliminatePolyPoints=FALSE;
+ bHlplFixed=sal_False;
+ bEliminatePolyPoints=sal_False;
nEliminatePolyPointLimitAngle=0;
// #114409#-1 Migrate PageOrigin
@@ -257,7 +257,7 @@ SdrSnapView::~SdrSnapView()
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrSnapView::IsAction() const
+sal_Bool SdrSnapView::IsAction() const
{
return IsSetPageOrg() || IsDragHelpLine() || SdrPaintView::IsAction();
}
@@ -317,14 +317,14 @@ Point SdrSnapView::GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const
}
#define NOT_SNAPPED 0x7FFFFFFF
-USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
+sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
{
if (!bSnapEnab) return SDRSNAP_NOTSNAPPED;
- BOOL bPVOfs=FALSE;
+ sal_Bool bPVOfs=sal_False;
long x=rPnt.X();
long y=rPnt.Y();
if (pPV==NULL) {
- bPVOfs=TRUE;
+ bPVOfs=sal_True;
pPV=GetSdrPageView();
if (pPV==NULL) return SDRSNAP_NOTSNAPPED;
}
@@ -337,8 +337,8 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
if (bHlplVisible && bHlplSnap && !IsDragHelpLine())
{
const SdrHelpLineList& rHLL=pPV->GetHelpLines();
- USHORT nAnz=rHLL.GetCount();
- for (USHORT i=nAnz; i>0;) {
+ sal_uInt16 nAnz=rHLL.GetCount();
+ for (sal_uInt16 i=nAnz; i>0;) {
i--;
const SdrHelpLine& rHL=rHLL[i];
const Point& rPos=rHL.GetPos();
@@ -381,11 +381,11 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
a=y- ys ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // rechte Papierkante
}
if (bOFrmSnap || bOPntSnap /*|| (bConnVisible && bOConSnap)*/) {
- ULONG nMaxPointSnapCount=200;
- ULONG nMaxFrameSnapCount=200;
+ sal_uIntPtr nMaxPointSnapCount=200;
+ sal_uIntPtr nMaxFrameSnapCount=200;
// #97981# go back to IM_DEEPNOGROUPS runthrough for snap to object comparisons
- SdrObjListIter aIter(*pPV->GetPage(),/*IM_FLAT*/IM_DEEPNOGROUPS,TRUE);
+ SdrObjListIter aIter(*pPV->GetPage(),/*IM_FLAT*/IM_DEEPNOGROUPS,sal_True);
while (aIter.IsMore() && (nMaxPointSnapCount>0 || nMaxFrameSnapCount>0)) {
SdrObject* pO=aIter.Next();
@@ -461,7 +461,7 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
dy = 0;
}
}
- BOOL bRet=SDRSNAP_NOTSNAPPED;
+ sal_Bool bRet=SDRSNAP_NOTSNAPPED;
if (dx==NOT_SNAPPED) dx=0; else bRet|=SDRSNAP_XSNAPPED;
if (dy==NOT_SNAPPED) dy=0; else bRet|=SDRSNAP_YSNAPPED;
rPnt.X()=x+dx;
@@ -472,7 +472,7 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const
void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const
{
Point aPt(rPt);
- USHORT nRet=SnapPos(aPt,pPV);
+ sal_uInt16 nRet=SnapPos(aPt,pPV);
aPt-=rPt;
if ((nRet & SDRSNAP_XSNAPPED) !=0) {
if (bXSnapped) {
@@ -481,7 +481,7 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes
}
} else {
nBestXSnap=aPt.X();
- bXSnapped=TRUE;
+ bXSnapped=sal_True;
}
}
if ((nRet & SDRSNAP_YSNAPPED) !=0) {
@@ -491,17 +491,17 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes
}
} else {
nBestYSnap=aPt.Y();
- bYSnapped=TRUE;
+ bYSnapped=sal_True;
}
}
}
-USHORT SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const
+sal_uInt16 SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const
{
long nBestXSnap=0;
long nBestYSnap=0;
- bool bXSnapped=FALSE;
- bool bYSnapped=FALSE;
+ bool bXSnapped=sal_False;
+ bool bYSnapped=sal_False;
CheckSnap(rRect.TopLeft() ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
if (!bMoveSnapOnlyTopLeft) {
CheckSnap(rRect.TopRight() ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped);
@@ -510,7 +510,7 @@ USHORT SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, lon
}
rDX=nBestXSnap;
rDY=nBestYSnap;
- USHORT nRet=0;
+ sal_uInt16 nRet=0;
if (bXSnapped) nRet+=SDRSNAP_XSNAPPED;
if (bYSnapped) nRet+=SDRSNAP_YSNAPPED;
return nRet;
@@ -575,7 +575,7 @@ void SdrSnapView::BrkSetPageOrg()
////////////////////////////////////////////////////////////////////////////////////////////////////
-sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, USHORT& rnHelpLineNum, SdrPageView*& rpPV) const
+sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const
{
rpPV=NULL;
nTol=ImpGetHitTolLogic(nTol,&rOut);
@@ -584,7 +584,7 @@ sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDe
if(pPV)
{
Point aPnt(rPnt);
- USHORT nIndex=pPV->GetHelpLines().HitTest(aPnt,USHORT(nTol),rOut);
+ sal_uInt16 nIndex=pPV->GetHelpLines().HitTest(aPnt,sal_uInt16(nTol),rOut);
if (nIndex!=SDRHELPLINE_NOTFOUND) {
rpPV=pPV;
rnHelpLineNum=nIndex;
@@ -595,7 +595,7 @@ sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDe
}
// start HelpLine drag for new HelpLine
-sal_Bool SdrSnapView::BegDragHelpLine(USHORT nHelpLineNum, SdrPageView* pPV)
+sal_Bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV)
{
sal_Bool bRet(sal_False);
diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx
index 29018b6084ea..aefe1706b871 100644
--- a/svx/source/svdraw/svdtext.cxx
+++ b/svx/source/svdraw/svdtext.cxx
@@ -76,7 +76,7 @@ void SdrText::CheckPortionInfo( SdrOutliner& rOutliner )
void SdrText::ReformatText()
{
- mbPortionInfoChecked=FALSE;
+ mbPortionInfoChecked=sal_False;
mpOutlinerParaObject->ClearPortionInfo();
}
@@ -140,19 +140,19 @@ void SdrText::SetModel( SdrModel* pNewModel )
if( mpOutlinerParaObject && pOldModel!=NULL && pNewModel!=NULL)
{
- bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, TRUE) == SFX_ITEM_SET;
+ bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, sal_True) == SFX_ITEM_SET;
MapUnit aOldUnit(pOldModel->GetScaleUnit());
MapUnit aNewUnit(pNewModel->GetScaleUnit());
- FASTBOOL bScaleUnitChanged=aNewUnit!=aOldUnit;
+ int bScaleUnitChanged=aNewUnit!=aOldUnit;
// und nun dem OutlinerParaObject einen neuen Pool verpassen
// !!! Hier muss noch DefTab und RefDevice der beiden Models
// !!! verglichen werden und dann ggf. AutoGrow zuschlagen !!!
// !!! fehlende Implementation !!!
- ULONG nOldFontHgt=pOldModel->GetDefaultFontHeight();
- ULONG nNewFontHgt=pNewModel->GetDefaultFontHeight();
- BOOL bDefHgtChanged=nNewFontHgt!=nOldFontHgt;
- BOOL bSetHgtItem=bDefHgtChanged && !bHgtSet;
+ sal_uIntPtr nOldFontHgt=pOldModel->GetDefaultFontHeight();
+ sal_uIntPtr nNewFontHgt=pNewModel->GetDefaultFontHeight();
+ sal_Bool bDefHgtChanged=nNewFontHgt!=nOldFontHgt;
+ sal_Bool bSetHgtItem=bDefHgtChanged && !bHgtSet;
if (bSetHgtItem)
{ // #32665#
// zunaechst das HeightItem festklopfen, damit
@@ -172,7 +172,7 @@ void SdrText::SetModel( SdrModel* pNewModel )
// Funktioniert nicht richtig:
// Geht am Outliner leider nur in %
// double nPercFloat=double(aMetricFactor)*100+0.5;
- // USHORT nPerc=(USHORT)nPercFloat;
+ // sal_uInt16 nPerc=(sal_uInt16)nPercFloat;
// rOutliner.DoStretchChars(100,nPerc);
if (bSetHgtItem)
@@ -184,12 +184,12 @@ void SdrText::SetModel( SdrModel* pNewModel )
}
SetOutlinerParaObject(rOutliner.CreateParaObject()); // #34494#
mpOutlinerParaObject->ClearPortionInfo();
- mbPortionInfoChecked=FALSE;
+ mbPortionInfoChecked=sal_False;
rOutliner.Clear();
}
}
-void SdrText::ForceOutlinerParaObject( USHORT nOutlMode )
+void SdrText::ForceOutlinerParaObject( sal_uInt16 nOutlMode )
{
if( mpModel && !mpOutlinerParaObject )
{
diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx
index ad4cf3763241..6841f074154b 100644
--- a/svx/source/svdraw/svdtrans.cxx
+++ b/svx/source/svdraw/svdtrans.cxx
@@ -51,7 +51,7 @@ void MoveXPoly(XPolyPolygon& rPoly, const Size& S)
////////////////////////////////////////////////////////////////////////////////////////////////////
-void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, const Fraction& ryFact, FASTBOOL bNoJustify)
+void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, const Fraction& ryFact, int bNoJustify)
{
Fraction xFact(rxFact);
Fraction yFact(ryFact);
@@ -93,32 +93,32 @@ void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, con
void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
- USHORT nAnz=rPoly.GetSize();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.GetSize();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
ResizePoint(rPoly[i],rRef,xFact,yFact);
}
}
void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
- USHORT nAnz=rPoly.GetPointCount();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.GetPointCount();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
ResizePoint(rPoly[i],rRef,xFact,yFact);
}
}
void ResizePoly(PolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
- USHORT nAnz=rPoly.Count();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.Count();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
ResizePoly(rPoly[i],rRef,xFact,yFact);
}
}
void ResizeXPoly(XPolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact)
{
- USHORT nAnz=rPoly.Count();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.Count();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
ResizeXPoly(rPoly[i],rRef,xFact,yFact);
}
}
@@ -127,39 +127,39 @@ void ResizeXPoly(XPolyPolygon& rPoly, const Point& rRef, const Fraction& xFact,
void RotatePoly(Polygon& rPoly, const Point& rRef, double sn, double cs)
{
- USHORT nAnz=rPoly.GetSize();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.GetSize();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
RotatePoint(rPoly[i],rRef,sn,cs);
}
}
void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs)
{
- USHORT nAnz=rPoly.GetPointCount();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.GetPointCount();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
RotatePoint(rPoly[i],rRef,sn,cs);
}
}
void RotatePoly(PolyPolygon& rPoly, const Point& rRef, double sn, double cs)
{
- USHORT nAnz=rPoly.Count();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.Count();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
RotatePoly(rPoly[i],rRef,sn,cs);
}
}
void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs)
{
- USHORT nAnz=rPoly.Count();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.Count();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
RotateXPoly(rPoly[i],rRef,sn,cs);
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-void MirrorRect(Rectangle& rRect, const Point& /*rRef1*/, const Point& /*rRef2*/, FASTBOOL bNoJustify)
+void MirrorRect(Rectangle& rRect, const Point& /*rRef1*/, const Point& /*rRef2*/, int bNoJustify)
{
// !!! fehlende Implementation !!!
if (!bNoJustify) rRect.Justify();
@@ -202,66 +202,66 @@ void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2)
void MirrorPoly(Polygon& rPoly, const Point& rRef1, const Point& rRef2)
{
- USHORT nAnz=rPoly.GetSize();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.GetSize();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
MirrorPoint(rPoly[i],rRef1,rRef2);
}
}
void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2)
{
- USHORT nAnz=rPoly.GetPointCount();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.GetPointCount();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
MirrorPoint(rPoly[i],rRef1,rRef2);
}
}
void MirrorPoly(PolyPolygon& rPoly, const Point& rRef1, const Point& rRef2)
{
- USHORT nAnz=rPoly.Count();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.Count();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
MirrorPoly(rPoly[i],rRef1,rRef2);
}
}
void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2)
{
- USHORT nAnz=rPoly.Count();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.Count();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
MirrorXPoly(rPoly[i],rRef1,rRef2);
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////
-void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear)
+void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, int bVShear)
{
- USHORT nAnz=rPoly.GetSize();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.GetSize();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
ShearPoint(rPoly[i],rRef,tn,bVShear);
}
}
-void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear)
+void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, int bVShear)
{
- USHORT nAnz=rPoly.GetPointCount();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.GetPointCount();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
ShearPoint(rPoly[i],rRef,tn,bVShear);
}
}
-void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear)
+void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, int bVShear)
{
- USHORT nAnz=rPoly.Count();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.Count();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
ShearPoly(rPoly[i],rRef,tn,bVShear);
}
}
-void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVShear)
+void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, int bVShear)
{
- USHORT nAnz=rPoly.Count();
- for (USHORT i=0; i<nAnz; i++) {
+ sal_uInt16 nAnz=rPoly.Count();
+ for (sal_uInt16 i=0; i<nAnz; i++) {
ShearXPoly(rPoly[i],rRef,tn,bVShear);
}
}
@@ -279,10 +279,10 @@ void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, FASTBOOL bVSh
////////////////////////////////////////////////////////////////////////////////////////////////////
double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter,
- const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert)
+ const Point& rRad, double& rSin, double& rCos, int bVert)
{
- FASTBOOL bC1=pC1!=NULL;
- FASTBOOL bC2=pC2!=NULL;
+ int bC1=pC1!=NULL;
+ int bC2=pC2!=NULL;
long x0=rPnt.X();
long y0=rPnt.Y();
long cx=rCenter.X();
@@ -333,10 +333,10 @@ double CrookRotateXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCent
}
double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter,
- const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert)
+ const Point& rRad, double& rSin, double& rCos, int bVert)
{
- FASTBOOL bC1=pC1!=NULL;
- FASTBOOL bC2=pC2!=NULL;
+ int bC1=pC1!=NULL;
+ int bC2=pC2!=NULL;
long x0=rPnt.X();
long y0=rPnt.Y();
long dx1=0,dy1=0;
@@ -388,11 +388,11 @@ double CrookSlantXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCente
}
double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCenter,
- const Point& rRad, double& rSin, double& rCos, FASTBOOL bVert,
+ const Point& rRad, double& rSin, double& rCos, int bVert,
const Rectangle rRefRect)
{
- //FASTBOOL bC1=pC1!=NULL;
- //FASTBOOL bC2=pC2!=NULL;
+ //int bC1=pC1!=NULL;
+ //int bC2=pC2!=NULL;
//long x0=rPnt.X();
long y0=rPnt.Y();
CrookSlantXPoint(rPnt,pC1,pC2,rCenter,rRad,rSin,rCos,bVert);
@@ -403,7 +403,7 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen
long nBtm=rRefRect.Bottom();
long nHgt=nBtm-nTop;
long dy=rPnt.Y()-y0;
- //FASTBOOL bOben=rRad.Y()<0;
+ //int bOben=rRad.Y()<0;
double a=((double)(y0-nTop))/nHgt;
a*=dy;
rPnt.Y()=y0+Round(a);
@@ -412,11 +412,11 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen
////////////////////////////////////////////////////////////////////////////////////////////////////
-void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert)
+void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, int bVert)
{
double nSin,nCos;
- USHORT nPointAnz=rPoly.GetPointCount();
- USHORT i=0;
+ sal_uInt16 nPointAnz=rPoly.GetPointCount();
+ sal_uInt16 i=0;
while (i<nPointAnz) {
Point* pPnt=&rPoly[i];
Point* pC1=NULL;
@@ -435,11 +435,11 @@ void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, F
}
}
-void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert)
+void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, int bVert)
{
double nSin,nCos;
- USHORT nPointAnz=rPoly.GetPointCount();
- USHORT i=0;
+ sal_uInt16 nPointAnz=rPoly.GetPointCount();
+ sal_uInt16 i=0;
while (i<nPointAnz) {
Point* pPnt=&rPoly[i];
Point* pC1=NULL;
@@ -458,11 +458,11 @@ void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FA
}
}
-void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert, const Rectangle rRefRect)
+void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, int bVert, const Rectangle rRefRect)
{
double nSin,nCos;
- USHORT nPointAnz=rPoly.GetPointCount();
- USHORT i=0;
+ sal_uInt16 nPointAnz=rPoly.GetPointCount();
+ sal_uInt16 i=0;
while (i<nPointAnz) {
Point* pPnt=&rPoly[i];
Point* pC1=NULL;
@@ -483,26 +483,26 @@ void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad,
////////////////////////////////////////////////////////////////////////////////////////////////////
-void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert)
+void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, int bVert)
{
- USHORT nPolyAnz=rPoly.Count();
- for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
+ sal_uInt16 nPolyAnz=rPoly.Count();
+ for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
CrookRotatePoly(rPoly[nPolyNum],rCenter,rRad,bVert);
}
}
-void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert)
+void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, int bVert)
{
- USHORT nPolyAnz=rPoly.Count();
- for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
+ sal_uInt16 nPolyAnz=rPoly.Count();
+ for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
CrookSlantPoly(rPoly[nPolyNum],rCenter,rRad,bVert);
}
}
-void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, FASTBOOL bVert, const Rectangle rRefRect)
+void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, int bVert, const Rectangle rRefRect)
{
- USHORT nPolyAnz=rPoly.Count();
- for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
+ sal_uInt16 nPolyAnz=rPoly.Count();
+ for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) {
CrookStretchPoly(rPoly[nPolyNum],rCenter,rRad,bVert,rRefRect);
}
}
@@ -537,7 +537,7 @@ long NormAngle360(long a)
return a;
}
-USHORT GetAngleSector(long nWink)
+sal_uInt16 GetAngleSector(long nWink)
{
while (nWink<0) nWink+=36000;
while (nWink>=36000) nWink-=36000;
@@ -644,7 +644,7 @@ void Poly2Rect(const Polygon& rPol, Rectangle& rRect, GeoStat& rGeo)
nShW-=27000; // ShearWink wird zur Senkrechten gemessen
nShW=-nShW; // Negieren, denn '+' ist Rechtskursivierung
- FASTBOOL bMirr=aPt3.Y()<0;
+ int bMirr=aPt3.Y()<0;
if (bMirr) { // "Punktetausch" bei Spiegelung
nHgt=-nHgt;
nShW+=18000;
@@ -666,7 +666,7 @@ void Poly2Rect(const Polygon& rPol, Rectangle& rRect, GeoStat& rGeo)
////////////////////////////////////////////////////////////////////////////////////////////////////
-void OrthoDistance8(const Point& rPt0, Point& rPt, FASTBOOL bBigOrtho)
+void OrthoDistance8(const Point& rPt0, Point& rPt, int bBigOrtho)
{
long dx=rPt.X()-rPt0.X();
long dy=rPt.Y()-rPt0.Y();
@@ -682,7 +682,7 @@ void OrthoDistance8(const Point& rPt0, Point& rPt, FASTBOOL bBigOrtho)
}
}
-void OrthoDistance4(const Point& rPt0, Point& rPt, FASTBOOL bBigOrtho)
+void OrthoDistance4(const Point& rPt0, Point& rPt, int bBigOrtho)
{
long dx=rPt.X()-rPt0.X();
long dy=rPt.Y()-rPt0.Y();
@@ -716,17 +716,17 @@ long BigMulDiv(long nVal, long nMul, long nDiv)
void Kuerzen(Fraction& rF, unsigned nDigits)
{
- INT32 nMul=rF.GetNumerator();
- INT32 nDiv=rF.GetDenominator();
- FASTBOOL bNeg=FALSE;
+ sal_Int32 nMul=rF.GetNumerator();
+ sal_Int32 nDiv=rF.GetDenominator();
+ int bNeg=sal_False;
if (nMul<0) { nMul=-nMul; bNeg=!bNeg; }
if (nDiv<0) { nDiv=-nDiv; bNeg=!bNeg; }
if (nMul==0 || nDiv==0) return;
- UINT32 a;
- a=UINT32(nMul); unsigned nMulZ=0; // Fuehrende Nullen zaehlen
+ sal_uInt32 a;
+ a=sal_uInt32(nMul); unsigned nMulZ=0; // Fuehrende Nullen zaehlen
while (a<0x00800000) { nMulZ+=8; a<<=8; }
while (a<0x80000000) { nMulZ++; a<<=1; }
- a=UINT32(nDiv); unsigned nDivZ=0; // Fuehrende Nullen zaehlen
+ a=sal_uInt32(nDiv); unsigned nDivZ=0; // Fuehrende Nullen zaehlen
while (a<0x00800000) { nDivZ+=8; a<<=8; }
while (a<0x80000000) { nDivZ++; a<<=1; }
// Anzahl der verwendeten Digits bestimmen
@@ -809,8 +809,8 @@ FrPair GetMapFactor(MapUnit eS, MapUnit eD)
if (eS==eD) return FrPair(1,1,1,1);
FrPair aS(GetInchOrMM(eS));
FrPair aD(GetInchOrMM(eD));
- FASTBOOL bSInch=IsInch(eS);
- FASTBOOL bDInch=IsInch(eD);
+ int bSInch=IsInch(eS);
+ int bDInch=IsInch(eD);
FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y());
if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); }
if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); }
@@ -821,8 +821,8 @@ FrPair GetMapFactor(MapUnit eS, FieldUnit eD)
{
FrPair aS(GetInchOrMM(eS));
FrPair aD(GetInchOrMM(eD));
- FASTBOOL bSInch=IsInch(eS);
- FASTBOOL bDInch=IsInch(eD);
+ int bSInch=IsInch(eS);
+ int bDInch=IsInch(eD);
FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y());
if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); }
if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); }
@@ -833,8 +833,8 @@ FrPair GetMapFactor(FieldUnit eS, MapUnit eD)
{
FrPair aS(GetInchOrMM(eS));
FrPair aD(GetInchOrMM(eD));
- FASTBOOL bSInch=IsInch(eS);
- FASTBOOL bDInch=IsInch(eD);
+ int bSInch=IsInch(eS);
+ int bDInch=IsInch(eD);
FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y());
if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); }
if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); }
@@ -846,8 +846,8 @@ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD)
if (eS==eD) return FrPair(1,1,1,1);
FrPair aS(GetInchOrMM(eS));
FrPair aD(GetInchOrMM(eD));
- FASTBOOL bSInch=IsInch(eS);
- FASTBOOL bDInch=IsInch(eD);
+ int bSInch=IsInch(eS);
+ int bDInch=IsInch(eD);
FrPair aRet(aD.X()/aS.X(),aD.Y()/aS.Y());
if (bSInch && !bDInch) { aRet.X()*=Fraction(127,5); aRet.Y()*=Fraction(127,5); }
if (!bSInch && bDInch) { aRet.X()*=Fraction(5,127); aRet.Y()*=Fraction(5,127); }
@@ -863,22 +863,22 @@ FrPair GetMapFactor(FieldUnit eS, FieldUnit eD)
// 1 yd = 3 ft = 36" = 914,4mm
// 1 ft = 12 " = 1" = 304,8mm
-void GetMeterOrInch(MapUnit eMU, short& rnKomma, long& rnMul, long& rnDiv, FASTBOOL& rbMetr, FASTBOOL& rbInch)
+void GetMeterOrInch(MapUnit eMU, short& rnKomma, long& rnMul, long& rnDiv, int& rbMetr, int& rbInch)
{
rnMul=1; rnDiv=1;
short nKomma=0;
- FASTBOOL bMetr=FALSE,bInch=FALSE;
+ int bMetr=sal_False,bInch=sal_False;
switch (eMU) {
// Metrisch
- case MAP_100TH_MM : bMetr=TRUE; nKomma=5; break;
- case MAP_10TH_MM : bMetr=TRUE; nKomma=4; break;
- case MAP_MM : bMetr=TRUE; nKomma=3; break;
- case MAP_CM : bMetr=TRUE; nKomma=2; break;
+ case MAP_100TH_MM : bMetr=sal_True; nKomma=5; break;
+ case MAP_10TH_MM : bMetr=sal_True; nKomma=4; break;
+ case MAP_MM : bMetr=sal_True; nKomma=3; break;
+ case MAP_CM : bMetr=sal_True; nKomma=2; break;
// Inch
- case MAP_1000TH_INCH: bInch=TRUE; nKomma=3; break;
- case MAP_100TH_INCH : bInch=TRUE; nKomma=2; break;
- case MAP_10TH_INCH : bInch=TRUE; nKomma=1; break;
- case MAP_INCH : bInch=TRUE; nKomma=0; break;
+ case MAP_1000TH_INCH: bInch=sal_True; nKomma=3; break;
+ case MAP_100TH_INCH : bInch=sal_True; nKomma=2; break;
+ case MAP_10TH_INCH : bInch=sal_True; nKomma=1; break;
+ case MAP_INCH : bInch=sal_True; nKomma=0; break;
case MAP_POINT : bInch=TRUE; rnDiv=72; break; // 1Pt = 1/72"
case MAP_TWIP : bInch=TRUE; rnDiv=144; nKomma=1; break; // 1Twip = 1/1440"
// Sonstiges
@@ -893,19 +893,19 @@ void GetMeterOrInch(MapUnit eMU, short& rnKomma, long& rnMul, long& rnDiv, FASTB
rbInch=bInch;
}
-void GetMeterOrInch(FieldUnit eFU, short& rnKomma, long& rnMul, long& rnDiv, FASTBOOL& rbMetr, FASTBOOL& rbInch)
+void GetMeterOrInch(FieldUnit eFU, short& rnKomma, long& rnMul, long& rnDiv, int& rbMetr, int& rbInch)
{
rnMul=1; rnDiv=1;
short nKomma=0;
- FASTBOOL bMetr=FALSE,bInch=FALSE;
+ int bMetr=sal_False,bInch=sal_False;
switch (eFU) {
case FUNIT_NONE : break;
// Metrisch
- case FUNIT_100TH_MM : bMetr=TRUE; nKomma=5; break;
- case FUNIT_MM : bMetr=TRUE; nKomma=3; break;
- case FUNIT_CM : bMetr=TRUE; nKomma=2; break;
- case FUNIT_M : bMetr=TRUE; nKomma=0; break;
- case FUNIT_KM : bMetr=TRUE; nKomma=-3; break;
+ case FUNIT_100TH_MM : bMetr=sal_True; nKomma=5; break;
+ case FUNIT_MM : bMetr=sal_True; nKomma=3; break;
+ case FUNIT_CM : bMetr=sal_True; nKomma=2; break;
+ case FUNIT_M : bMetr=sal_True; nKomma=0; break;
+ case FUNIT_KM : bMetr=sal_True; nKomma=-3; break;
// Inch
case FUNIT_TWIP : bInch=TRUE; rnDiv=144; nKomma=1; break; // 1Twip = 1/1440"
case FUNIT_POINT : bInch=TRUE; rnDiv=72; break; // 1Pt = 1/72"
@@ -925,7 +925,7 @@ void GetMeterOrInch(FieldUnit eFU, short& rnKomma, long& rnMul, long& rnDiv, FAS
void SdrFormatter::Undirty()
{
if (aScale.GetNumerator()==0 || aScale.GetDenominator()==0) aScale=Fraction(1,1);
- FASTBOOL bSrcMetr,bSrcInch,bDstMetr,bDstInch;
+ int bSrcMetr,bSrcInch,bDstMetr,bDstInch;
long nMul1,nDiv1,nMul2,nDiv2;
short nKomma1,nKomma2;
// Zunaechst normalisieren auf m bzw. "
@@ -960,7 +960,7 @@ void SdrFormatter::Undirty()
nMul_=nMul1;
nDiv_=nDiv1;
nKomma_=nKomma1;
- bDirty=FALSE;
+ bDirty=sal_False;
}
@@ -976,7 +976,7 @@ void SdrFormatter::TakeStr(long nVal, XubString& rStr) const
}
// Hier fallen trotzdem evtl. Nachkommastellen weg, wg. MulDiv statt Real
- BOOL bNeg(nVal < 0);
+ sal_Bool bNeg(nVal < 0);
SvtSysLocale aSysLoc;
const LocaleDataWrapper& rLoc = aSysLoc.GetLocaleData();
diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx
index a20ebd9baf65..6f4d5b192eac 100644
--- a/svx/source/svdraw/svdundo.cxx
+++ b/svx/source/svdraw/svdundo.cxx
@@ -57,7 +57,7 @@ static void ImplUnmarkObject( SdrObject* pObj )
SdrViewIter aIter( pObj );
for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() )
{
- pView->MarkObj( pObj, pView->GetSdrPageView(), TRUE );
+ pView->MarkObj( pObj, pView->GetSdrPageView(), sal_True );
}
}
@@ -65,11 +65,11 @@ static void ImplUnmarkObject( SdrObject* pObj )
TYPEINIT1(SdrUndoAction,SfxUndoAction);
-BOOL SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const
+sal_Bool SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const
{
SdrView* pV=PTR_CAST(SdrView,&rView);
if (pV!=NULL) return CanSdrRepeat(*pV);
- return FALSE;
+ return sal_False;
}
void SdrUndoAction::Repeat(SfxRepeatTarget& rView)
@@ -88,7 +88,7 @@ XubString SdrUndoAction::GetRepeatComment(SfxRepeatTarget& rView) const
bool SdrUndoAction::CanSdrRepeat(SdrView& /*rView*/) const
{
- return FALSE;
+ return sal_False;
}
void SdrUndoAction::SdrRepeat(SdrView& /*rView*/)
@@ -122,7 +122,7 @@ SdrUndoGroup::~SdrUndoGroup()
void SdrUndoGroup::Clear()
{
- for (ULONG nu=0; nu<GetActionCount(); nu++) {
+ for (sal_uIntPtr nu=0; nu<GetActionCount(); nu++) {
SdrUndoAction* pAct=GetAction(nu);
delete pAct;
}
@@ -136,12 +136,12 @@ void SdrUndoGroup::AddAction(SdrUndoAction* pAct)
void SdrUndoGroup::push_front( SdrUndoAction* pAct )
{
- aBuf.Insert(pAct, (ULONG)0 );
+ aBuf.Insert(pAct, (sal_uIntPtr)0 );
}
void SdrUndoGroup::Undo()
{
- for (ULONG nu=GetActionCount(); nu>0;) {
+ for (sal_uIntPtr nu=GetActionCount(); nu>0;) {
nu--;
SdrUndoAction* pAct=GetAction(nu);
pAct->Undo();
@@ -150,7 +150,7 @@ void SdrUndoGroup::Undo()
void SdrUndoGroup::Redo()
{
- for (ULONG nu=0; nu<GetActionCount(); nu++) {
+ for (sal_uIntPtr nu=0; nu<GetActionCount(); nu++) {
SdrUndoAction* pAct=GetAction(nu);
pAct->Redo();
}
@@ -170,14 +170,14 @@ XubString SdrUndoGroup::GetComment() const
bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const
{
switch (eFunction) {
- case SDRREPFUNC_OBJ_NONE : return FALSE;
+ case SDRREPFUNC_OBJ_NONE : return sal_False;
case SDRREPFUNC_OBJ_DELETE : return rView.AreObjectsMarked();
- case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: return rView.IsCombinePossible(FALSE);
- case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : return rView.IsCombinePossible(TRUE);
- case SDRREPFUNC_OBJ_DISMANTLE_POLYS : return rView.IsDismantlePossible(FALSE);
- case SDRREPFUNC_OBJ_DISMANTLE_LINES : return rView.IsDismantlePossible(TRUE);
- case SDRREPFUNC_OBJ_CONVERTTOPOLY : return rView.IsConvertToPolyObjPossible(FALSE);
- case SDRREPFUNC_OBJ_CONVERTTOPATH : return rView.IsConvertToPathObjPossible(FALSE);
+ case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: return rView.IsCombinePossible(sal_False);
+ case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : return rView.IsCombinePossible(sal_True);
+ case SDRREPFUNC_OBJ_DISMANTLE_POLYS : return rView.IsDismantlePossible(sal_False);
+ case SDRREPFUNC_OBJ_DISMANTLE_LINES : return rView.IsDismantlePossible(sal_True);
+ case SDRREPFUNC_OBJ_CONVERTTOPOLY : return rView.IsConvertToPolyObjPossible(sal_False);
+ case SDRREPFUNC_OBJ_CONVERTTOPATH : return rView.IsConvertToPathObjPossible(sal_False);
case SDRREPFUNC_OBJ_GROUP : return rView.IsGroupPossible();
case SDRREPFUNC_OBJ_UNGROUP : return rView.IsUnGroupPossible();
case SDRREPFUNC_OBJ_PUTTOTOP : return rView.IsToTopPossible();
@@ -188,7 +188,7 @@ bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const
case SDRREPFUNC_OBJ_IMPORTMTF : return rView.IsImportMtfPossible();
default: break;
} // switch
- return FALSE;
+ return sal_False;
}
void SdrUndoGroup::SdrRepeat(SdrView& rView)
@@ -198,10 +198,10 @@ void SdrUndoGroup::SdrRepeat(SdrView& rView)
case SDRREPFUNC_OBJ_DELETE : rView.DeleteMarked(); break;
case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: rView.CombineMarkedObjects(sal_False); break;
case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : rView.CombineMarkedObjects(sal_True); break;
- case SDRREPFUNC_OBJ_DISMANTLE_POLYS : rView.DismantleMarkedObjects(FALSE); break;
- case SDRREPFUNC_OBJ_DISMANTLE_LINES : rView.DismantleMarkedObjects(TRUE); break;
- case SDRREPFUNC_OBJ_CONVERTTOPOLY : rView.ConvertMarkedToPolyObj(FALSE); break;
- case SDRREPFUNC_OBJ_CONVERTTOPATH : rView.ConvertMarkedToPathObj(FALSE); break;
+ case SDRREPFUNC_OBJ_DISMANTLE_POLYS : rView.DismantleMarkedObjects(sal_False); break;
+ case SDRREPFUNC_OBJ_DISMANTLE_LINES : rView.DismantleMarkedObjects(sal_True); break;
+ case SDRREPFUNC_OBJ_CONVERTTOPOLY : rView.ConvertMarkedToPolyObj(sal_False); break;
+ case SDRREPFUNC_OBJ_CONVERTTOPATH : rView.ConvertMarkedToPathObj(sal_False); break;
case SDRREPFUNC_OBJ_GROUP : rView.GroupMarked(); break;
case SDRREPFUNC_OBJ_UNGROUP : rView.UnGroupMarked(); break;
case SDRREPFUNC_OBJ_PUTTOTOP : rView.PutMarkedToTop(); break;
@@ -245,7 +245,7 @@ SdrUndoObj::SdrUndoObj(SdrObject& rNewObj):
{
}
-void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, USHORT nStrCacheID, String& rStr, FASTBOOL bRepeat )
+void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, int bRepeat )
{
rStr = ImpGetResStr(nStrCacheID);
sal_Char aSearchText[] = "%1";
@@ -271,7 +271,7 @@ void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, US
}
}
-void SdrUndoObj::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, FASTBOOL bRepeat) const
+void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, int bRepeat) const
{
if ( pObj )
GetDescriptionStringForObject( *pObj, nStrCacheID, rStr, bRepeat );
@@ -294,7 +294,7 @@ void SdrUndoObj::ImpShowPageOfThisObject()
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1, FASTBOOL bSaveText)
+SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, int bStyleSheet1, int bSaveText)
: SdrUndoObj(rNewObj),
pUndoSet(NULL),
pRedoSet(NULL),
@@ -302,7 +302,7 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1, FASTBO
pUndoStyleSheet(NULL),
pRedoStyleSheet(NULL),
pRepeatStyleSheet(NULL),
- bHaveToTakeRedoSet(TRUE),
+ bHaveToTakeRedoSet(sal_True),
pTextUndo(NULL),
// #i8508#
@@ -313,8 +313,8 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, FASTBOOL bStyleSheet1, FASTBO
bStyleSheet = bStyleSheet1;
SdrObjList* pOL = rNewObj.GetSubList();
- BOOL bIsGroup(pOL!=NULL && pOL->GetObjCount());
- BOOL bIs3DScene(bIsGroup && pObj->ISA(E3dScene));
+ sal_Bool bIsGroup(pOL!=NULL && pOL->GetObjCount());
+ sal_Bool bIs3DScene(bIsGroup && pObj->ISA(E3dScene));
if(bIsGroup)
{
@@ -379,7 +379,7 @@ void SdrUndoAttrObj::SetRepeatAttr(const SfxItemSet& rSet)
void SdrUndoAttrObj::Undo()
{
E3DModifySceneSnapRectUpdater aUpdater(pObj);
- BOOL bIs3DScene(pObj && pObj->ISA(E3dScene));
+ sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene));
// #94278# Trigger PageChangeCall
ImpShowPageOfThisObject();
@@ -388,7 +388,7 @@ void SdrUndoAttrObj::Undo()
{
if(bHaveToTakeRedoSet)
{
- bHaveToTakeRedoSet = FALSE;
+ bHaveToTakeRedoSet = sal_False;
if(pRedoSet)
{
@@ -413,7 +413,7 @@ void SdrUndoAttrObj::Undo()
if(bStyleSheet)
{
pRedoStyleSheet = pObj->GetStyleSheet();
- pObj->SetStyleSheet(pUndoStyleSheet, TRUE);
+ pObj->SetStyleSheet(pUndoStyleSheet, sal_True);
}
sdr::properties::ItemChangeBroadcaster aItemChange(*pObj);
@@ -480,14 +480,14 @@ void SdrUndoAttrObj::Undo()
void SdrUndoAttrObj::Redo()
{
E3DModifySceneSnapRectUpdater aUpdater(pObj);
- BOOL bIs3DScene(pObj && pObj->ISA(E3dScene));
+ sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene));
if(!pUndoGroup || bIs3DScene)
{
if(bStyleSheet)
{
pUndoStyleSheet = pObj->GetStyleSheet();
- pObj->SetStyleSheet(pRedoStyleSheet, TRUE);
+ pObj->SetStyleSheet(pRedoStyleSheet, sal_True);
}
sdr::properties::ItemChangeBroadcaster aItemChange(*pObj);
@@ -570,7 +570,7 @@ void SdrUndoAttrObj::SdrRepeat(SdrView& rView)
{
if(pRepeatSet)
{
- rView.SetAttrToMarked(*pRepeatSet, FALSE);
+ rView.SetAttrToMarked(*pRepeatSet, sal_False);
}
}
@@ -585,11 +585,11 @@ XubString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const
if(bStyleSheet)
{
- ImpTakeDescriptionStr(STR_EditSetStylesheet, aStr, TRUE);
+ ImpTakeDescriptionStr(STR_EditSetStylesheet, aStr, sal_True);
}
else
{
- ImpTakeDescriptionStr(STR_EditSetAttributes, aStr, TRUE);
+ ImpTakeDescriptionStr(STR_EditSetAttributes, aStr, sal_True);
}
return aStr;
@@ -633,7 +633,7 @@ bool SdrUndoMoveObj::CanSdrRepeat(SdrView& rView) const
XubString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const
{
XubString aStr;
- ImpTakeDescriptionStr(STR_EditMove,aStr,TRUE);
+ ImpTakeDescriptionStr(STR_EditMove,aStr,sal_True);
return aStr;
}
@@ -651,8 +651,8 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj):
// Aha, Gruppenobjekt
// AW: Aber keine 3D-Szene, dann nur fuer die Szene selbst den Undo anlegen
pUndoGroup=new SdrUndoGroup(*pObj->GetModel());
- ULONG nObjAnz=pOL->GetObjCount();
- for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
+ sal_uIntPtr nObjAnz=pOL->GetObjCount();
+ for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) {
pUndoGroup->AddAction(new SdrUndoGeoObj(*pOL->GetObj(nObjNum)));
}
} else {
@@ -720,7 +720,7 @@ XubString SdrUndoGeoObj::GetComment() const
SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect)
: SdrUndoObj(rNewObj),
- bOwner(FALSE),
+ bOwner(sal_False),
pView(NULL),
pPageView(NULL)
{
@@ -737,7 +737,7 @@ SdrUndoObjList::~SdrUndoObjList()
if (pObj!=NULL && IsOwner())
{
// Attribute muessen wieder in den regulaeren Pool
- SetOwner(FALSE);
+ SetOwner(sal_False);
// nun loeschen
SdrObject::Free( pObj );
@@ -855,14 +855,14 @@ void SdrUndoDelObj::Undo()
{
SdrUndoRemoveObj::Undo();
DBG_ASSERT(IsOwner(),"UndoDeleteObj: pObj gehoert nicht der UndoAction");
- SetOwner(FALSE);
+ SetOwner(sal_False);
}
void SdrUndoDelObj::Redo()
{
SdrUndoRemoveObj::Redo();
DBG_ASSERT(!IsOwner(),"RedoDeleteObj: pObj gehoert bereits der UndoAction");
- SetOwner(TRUE);
+ SetOwner(sal_True);
}
XubString SdrUndoDelObj::GetComment() const
@@ -885,7 +885,7 @@ bool SdrUndoDelObj::CanSdrRepeat(SdrView& rView) const
XubString SdrUndoDelObj::GetSdrRepeatComment(SdrView& /*rView*/) const
{
XubString aStr;
- ImpTakeDescriptionStr(STR_EditDelete,aStr,TRUE);
+ ImpTakeDescriptionStr(STR_EditDelete,aStr,sal_True);
return aStr;
}
@@ -895,14 +895,14 @@ void SdrUndoNewObj::Undo()
{
SdrUndoInsertObj::Undo();
DBG_ASSERT(!IsOwner(),"RedoNewObj: pObj gehoert bereits der UndoAction");
- SetOwner(TRUE);
+ SetOwner(sal_True);
}
void SdrUndoNewObj::Redo()
{
SdrUndoInsertObj::Redo();
DBG_ASSERT(IsOwner(),"RedoNewObj: pObj gehoert nicht der UndoAction");
- SetOwner(FALSE);
+ SetOwner(sal_False);
}
String SdrUndoNewObj::GetComment( const SdrObject& _rForObject )
@@ -921,11 +921,11 @@ XubString SdrUndoNewObj::GetComment() const
SdrUndoReplaceObj::SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1, bool bOrdNumDirect)
: SdrUndoObj(rOldObj1),
- bOldOwner(FALSE),
- bNewOwner(FALSE),
+ bOldOwner(sal_False),
+ bNewOwner(sal_False),
pNewObj(&rNewObj1)
{
- SetOldOwner(TRUE);
+ SetOldOwner(sal_True);
pObjList=pObj->GetObjList();
if (bOrdNumDirect) {
@@ -940,7 +940,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj()
if (pObj!=NULL && IsOldOwner())
{
// Attribute muessen wieder in den regulaeren Pool
- SetOldOwner(FALSE);
+ SetOldOwner(sal_False);
// nun loeschen
SdrObject::Free( pObj );
@@ -948,7 +948,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj()
if (pNewObj!=NULL && IsNewOwner())
{
// Attribute muessen wieder in den regulaeren Pool
- SetNewOwner(FALSE);
+ SetNewOwner(sal_False);
// nun loeschen
SdrObject::Free( pNewObj );
@@ -964,8 +964,8 @@ void SdrUndoReplaceObj::Undo()
{
DBG_ASSERT(!pObj->IsInserted(),"SdrUndoReplaceObj::Undo(): Altes Objekt ist bereits inserted!");
DBG_ASSERT(pNewObj->IsInserted(),"SdrUndoReplaceObj::Undo(): Neues Objekt ist nicht inserted!");
- SetOldOwner(FALSE);
- SetNewOwner(TRUE);
+ SetOldOwner(sal_False);
+ SetNewOwner(sal_True);
ImplUnmarkObject( pNewObj );
pObjList->ReplaceObject(pObj,nOrdNum);
@@ -982,8 +982,8 @@ void SdrUndoReplaceObj::Redo()
{
DBG_ASSERT(!pNewObj->IsInserted(),"SdrUndoReplaceObj::Redo(): Neues Objekt ist bereits inserted!");
DBG_ASSERT(pObj->IsInserted(),"SdrUndoReplaceObj::Redo(): Altes Objekt ist nicht inserted!");
- SetOldOwner(TRUE);
- SetNewOwner(FALSE);
+ SetOldOwner(sal_True);
+ SetNewOwner(sal_False);
ImplUnmarkObject( pObj );
pObjList->ReplaceObject(pNewObj,nOrdNum);
@@ -1041,7 +1041,7 @@ void SdrUndoObjectLayerChange::Redo()
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, UINT32 nOldOrdNum1, UINT32 nNewOrdNum1):
+SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1):
SdrUndoObj(rNewObj),
nOldOrdNum(nOldOrdNum1),
nNewOrdNum(nNewOrdNum1)
@@ -1087,8 +1087,8 @@ SdrUndoObjSetText::SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText)
: SdrUndoObj(rNewObj)
, pOldText(NULL)
, pNewText(NULL)
-, bNewTextAvailable(FALSE)
-, bEmptyPresObj(FALSE)
+, bNewTextAvailable(sal_False)
+, bEmptyPresObj(sal_False)
, mnText(nText)
{
SdrText* pText = static_cast< SdrTextObj*>( &rNewObj )->getText(mnText);
@@ -1113,7 +1113,7 @@ void SdrUndoObjSetText::AfterSetText()
SdrText* pText = static_cast< SdrTextObj*>( pObj )->getText(mnText);
if( pText && pText->GetOutlinerParaObject() )
pNewText = new OutlinerParaObject(*pText->GetOutlinerParaObject());
- bNewTextAvailable=TRUE;
+ bNewTextAvailable=sal_True;
}
}
@@ -1185,8 +1185,8 @@ void SdrUndoObjSetText::SdrRepeat(SdrView& rView)
rView.BegUndo(aStr);
}
- ULONG nAnz=rML.GetMarkCount();
- for (ULONG nm=0; nm<nAnz; nm++)
+ sal_uIntPtr nAnz=rML.GetMarkCount();
+ for (sal_uIntPtr nm=0; nm<nAnz; nm++)
{
SdrObject* pObj2=rML.GetMark(nm)->GetMarkedSdrObj();
SdrTextObj* pTextObj=PTR_CAST(SdrTextObj,pObj2);
@@ -1209,9 +1209,9 @@ void SdrUndoObjSetText::SdrRepeat(SdrView& rView)
bool SdrUndoObjSetText::CanSdrRepeat(SdrView& rView) const
{
- FASTBOOL bOk=FALSE;
+ int bOk=sal_False;
if (bNewTextAvailable && rView.AreObjectsMarked()) {
- bOk=TRUE;
+ bOk=sal_True;
}
return bOk;
}
@@ -1319,12 +1319,12 @@ String SdrUndoObjStrAttr::GetComment() const
////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrUndoLayer::SdrUndoLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel):
+SdrUndoLayer::SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel):
SdrUndoAction(rNewModel),
pLayer(rNewLayerAdmin.GetLayer(nLayerNum)),
pLayerAdmin(&rNewLayerAdmin),
nNum(nLayerNum),
- bItsMine(FALSE)
+ bItsMine(sal_False)
{
}
@@ -1340,7 +1340,7 @@ SdrUndoLayer::~SdrUndoLayer()
void SdrUndoNewLayer::Undo()
{
DBG_ASSERT(!bItsMine,"SdrUndoNewLayer::Undo(): Layer gehoert bereits der UndoAction");
- bItsMine=TRUE;
+ bItsMine=sal_True;
#ifdef DBG_UTIL
SdrLayer* pCmpLayer=
#endif
@@ -1351,7 +1351,7 @@ void SdrUndoNewLayer::Undo()
void SdrUndoNewLayer::Redo()
{
DBG_ASSERT(bItsMine,"SdrUndoNewLayer::Undo(): Layer gehoert nicht der UndoAction");
- bItsMine=FALSE;
+ bItsMine=sal_False;
pLayerAdmin->InsertLayer(pLayer,nNum);
}
@@ -1365,14 +1365,14 @@ XubString SdrUndoNewLayer::GetComment() const
void SdrUndoDelLayer::Undo()
{
DBG_ASSERT(bItsMine,"SdrUndoDelLayer::Undo(): Layer gehoert nicht der UndoAction");
- bItsMine=FALSE;
+ bItsMine=sal_False;
pLayerAdmin->InsertLayer(pLayer,nNum);
}
void SdrUndoDelLayer::Redo()
{
DBG_ASSERT(!bItsMine,"SdrUndoDelLayer::Undo(): Layer gehoert bereits der UndoAction");
- bItsMine=TRUE;
+ bItsMine=sal_True;
#ifdef DBG_UTIL
SdrLayer* pCmpLayer=
#endif
@@ -1432,7 +1432,7 @@ SdrUndoPage::SdrUndoPage(SdrPage& rNewPg)
{
}
-void SdrUndoPage::ImpInsertPage(USHORT nNum)
+void SdrUndoPage::ImpInsertPage(sal_uInt16 nNum)
{
DBG_ASSERT(!mrPage.IsInserted(),"SdrUndoPage::ImpInsertPage(): mrPage ist bereits Inserted");
if (!mrPage.IsInserted()) {
@@ -1444,7 +1444,7 @@ void SdrUndoPage::ImpInsertPage(USHORT nNum)
}
}
-void SdrUndoPage::ImpRemovePage(USHORT nNum)
+void SdrUndoPage::ImpRemovePage(sal_uInt16 nNum)
{
DBG_ASSERT(mrPage.IsInserted(),"SdrUndoPage::ImpRemovePage(): mrPage ist nicht Inserted");
if (mrPage.IsInserted()) {
@@ -1458,7 +1458,7 @@ void SdrUndoPage::ImpRemovePage(USHORT nNum)
}
}
-void SdrUndoPage::ImpMovePage(USHORT nOldNum, USHORT nNewNum)
+void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum)
{
DBG_ASSERT(mrPage.IsInserted(),"SdrUndoPage::ImpMovePage(): mrPage ist nicht Inserted");
if (mrPage.IsInserted()) {
@@ -1470,7 +1470,7 @@ void SdrUndoPage::ImpMovePage(USHORT nOldNum, USHORT nNewNum)
}
}
-void SdrUndoPage::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT /*n*/, FASTBOOL /*bRepeat*/) const
+void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 /*n*/, int /*bRepeat*/) const
{
rStr=ImpGetResStr(nStrCacheID);
}
@@ -1479,7 +1479,7 @@ void SdrUndoPage::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USH
SdrUndoPageList::SdrUndoPageList(SdrPage& rNewPg):
SdrUndoPage(rNewPg),
- bItsMine(FALSE)
+ bItsMine(sal_False)
{
nPageNum=rNewPg.GetPageNum();
}
@@ -1498,7 +1498,7 @@ SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg):
SdrUndoPageList(rNewPg),
pUndoGroup(NULL)
{
- bItsMine = TRUE;
+ bItsMine = sal_True;
// Und nun ggf. die MasterPage-Beziehungen merken
if(mrPage.IsMasterPage())
@@ -1541,7 +1541,7 @@ void SdrUndoDelPage::Undo()
pUndoGroup->Undo();
}
DBG_ASSERT(bItsMine,"UndoDeletePage: mrPage gehoert nicht der UndoAction");
- bItsMine=FALSE;
+ bItsMine=sal_False;
}
void SdrUndoDelPage::Redo()
@@ -1549,20 +1549,20 @@ void SdrUndoDelPage::Redo()
ImpRemovePage(nPageNum);
// Die MasterPage-Beziehungen werden ggf. von selbst geloesst
DBG_ASSERT(!bItsMine,"RedoDeletePage: mrPage gehoert bereits der UndoAction");
- bItsMine=TRUE;
+ bItsMine=sal_True;
}
XubString SdrUndoDelPage::GetComment() const
{
XubString aStr;
- ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,FALSE);
+ ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False);
return aStr;
}
XubString SdrUndoDelPage::GetSdrRepeatComment(SdrView& /*rView*/) const
{
XubString aStr;
- ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,FALSE);
+ ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False);
return aStr;
}
@@ -1572,7 +1572,7 @@ void SdrUndoDelPage::SdrRepeat(SdrView& /*rView*/)
bool SdrUndoDelPage::CanSdrRepeat(SdrView& /*rView*/) const
{
- return FALSE;
+ return sal_False;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1581,20 +1581,20 @@ void SdrUndoNewPage::Undo()
{
ImpRemovePage(nPageNum);
DBG_ASSERT(!bItsMine,"UndoNewPage: mrPage gehoert bereits der UndoAction");
- bItsMine=TRUE;
+ bItsMine=sal_True;
}
void SdrUndoNewPage::Redo()
{
ImpInsertPage(nPageNum);
DBG_ASSERT(bItsMine,"RedoNewPage: mrPage gehoert nicht der UndoAction");
- bItsMine=FALSE;
+ bItsMine=sal_False;
}
XubString SdrUndoNewPage::GetComment() const
{
XubString aStr;
- ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0,FALSE);
+ ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0,sal_False);
return aStr;
}
@@ -1603,14 +1603,14 @@ XubString SdrUndoNewPage::GetComment() const
XubString SdrUndoCopyPage::GetComment() const
{
XubString aStr;
- ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,FALSE);
+ ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False);
return aStr;
}
XubString SdrUndoCopyPage::GetSdrRepeatComment(SdrView& /*rView*/) const
{
XubString aStr;
- ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,FALSE);
+ ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False);
return aStr;
}
@@ -1621,7 +1621,7 @@ void SdrUndoCopyPage::SdrRepeat(SdrView& /*rView*/)
bool SdrUndoCopyPage::CanSdrRepeat(SdrView& /*rView*/) const
{
- return FALSE;
+ return sal_False;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1639,7 +1639,7 @@ void SdrUndoSetPageNum::Redo()
XubString SdrUndoSetPageNum::GetComment() const
{
XubString aStr;
- ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0,FALSE);
+ ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0,sal_False);
return aStr;
}
@@ -1695,7 +1695,7 @@ void SdrUndoPageRemoveMasterPage::Redo()
XubString SdrUndoPageRemoveMasterPage::GetComment() const
{
XubString aStr;
- ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0,FALSE);
+ ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0,sal_False);
return aStr;
}
@@ -1740,7 +1740,7 @@ void SdrUndoPageChangeMasterPage::Redo()
XubString SdrUndoPageChangeMasterPage::GetComment() const
{
XubString aStr;
- ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0,FALSE);
+ ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0,sal_False);
return aStr;
}
@@ -1764,32 +1764,32 @@ SdrUndoAction* SdrUndoFactory::CreateUndoGeoObject( SdrObject& rObject )
SdrUndoAction* SdrUndoFactory::CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText )
{
- return new SdrUndoAttrObj( rObject, bStyleSheet1 ? TRUE : FALSE, bSaveText ? TRUE : FALSE );
+ return new SdrUndoAttrObj( rObject, bStyleSheet1 ? sal_True : sal_False, bSaveText ? sal_True : sal_False );
}
SdrUndoAction* SdrUndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect )
{
- return new SdrUndoRemoveObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+ return new SdrUndoRemoveObj( rObject, bOrdNumDirect ? sal_True : sal_False );
}
SdrUndoAction* SdrUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool bOrdNumDirect )
{
- return new SdrUndoInsertObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+ return new SdrUndoInsertObj( rObject, bOrdNumDirect ? sal_True : sal_False );
}
SdrUndoAction* SdrUndoFactory::CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect )
{
- return new SdrUndoDelObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+ return new SdrUndoDelObj( rObject, bOrdNumDirect ? sal_True : sal_False );
}
SdrUndoAction* SdrUndoFactory::CreateUndoNewObject( SdrObject& rObject, bool bOrdNumDirect )
{
- return new SdrUndoNewObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+ return new SdrUndoNewObj( rObject, bOrdNumDirect ? sal_True : sal_False );
}
SdrUndoAction* SdrUndoFactory::CreateUndoCopyObject( SdrObject& rObject, bool bOrdNumDirect )
{
- return new SdrUndoCopyObj( rObject, bOrdNumDirect ? TRUE : FALSE );
+ return new SdrUndoCopyObj( rObject, bOrdNumDirect ? sal_True : sal_False );
}
SdrUndoAction* SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1)
@@ -1799,7 +1799,7 @@ SdrUndoAction* SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_u
SdrUndoAction* SdrUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect )
{
- return new SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ? TRUE : FALSE );
+ return new SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ? sal_True : sal_False );
}
SdrUndoAction* SdrUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer )
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 1320aef9b17b..f53d1009b805 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -76,20 +76,20 @@ SdrViewEvent::SdrViewEvent()
nMouseCode(0),
nHlplIdx(0),
nGlueId(0),
- bMouseDown(FALSE),
- bMouseUp(FALSE),
- bDoubleHdlSize(FALSE),
- bIsAction(FALSE),
- bIsTextEdit(FALSE),
- bTextEditHit(FALSE),
- bAddMark(FALSE),
- bUnmark(FALSE),
- bPrevNextMark(FALSE),
- bMarkPrev(FALSE),
- bInsPointNewObj(FALSE),
- bDragWithCopy(FALSE),
- bCaptureMouse(FALSE),
- bReleaseMouse(FALSE)
+ bMouseDown(sal_False),
+ bMouseUp(sal_False),
+ bDoubleHdlSize(sal_False),
+ bIsAction(sal_False),
+ bIsTextEdit(sal_False),
+ bTextEditHit(sal_False),
+ bAddMark(sal_False),
+ bUnmark(sal_False),
+ bPrevNextMark(sal_False),
+ bMarkPrev(sal_False),
+ bInsPointNewObj(sal_False),
+ bDragWithCopy(sal_False),
+ bCaptureMouse(sal_False),
+ bReleaseMouse(sal_False)
{
}
@@ -175,12 +175,12 @@ TYPEINIT1(SdrView,SdrCreateView);
SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut)
: SdrCreateView(pModel1,pOut),
- bNoExtendedMouseDispatcher(FALSE),
- bNoExtendedKeyDispatcher(FALSE),
- bNoExtendedCommandDispatcher(FALSE),
+ bNoExtendedMouseDispatcher(sal_False),
+ bNoExtendedKeyDispatcher(sal_False),
+ bNoExtendedCommandDispatcher(sal_False),
mbMasterPagePaintCaching(sal_False)
{
- bTextEditOnObjectsWithoutTextIfTextTool=FALSE;
+ bTextEditOnObjectsWithoutTextIfTextTool=sal_False;
maAccessibilityOptions.AddListener(this);
@@ -192,12 +192,12 @@ SdrView::~SdrView()
maAccessibilityOptions.RemoveListener(this);
}
-BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
+sal_Bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
{
SetActualWin(pWin);
- BOOL bRet=SdrCreateView::KeyInput(rKEvt,pWin);
+ sal_Bool bRet=SdrCreateView::KeyInput(rKEvt,pWin);
if (!bRet && !IsExtendedKeyInputDispatcherEnabled()) {
- bRet=TRUE;
+ bRet=sal_True;
switch (rKEvt.GetKeyCode().GetFullFunction()) {
case KEYFUNC_CUT : Cut(); break;
case KEYFUNC_COPY : Yank(); break;
@@ -221,7 +221,7 @@ BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
case KEY_BACKSPACE+KEY_MOD2+KEY_SHIFT: pMod->Redo(); break;
case KEY_REPEAT: case KEY_BACKSPACE+KEY_MOD2+KEY_MOD1: pMod->Repeat(*this); break;
case KEY_MOD1+KEY_A: MarkAll(); break;
- default: bRet=FALSE;
+ default: bRet=sal_False;
} // switch
}
} // switch
@@ -235,11 +235,11 @@ BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin)
return bRet;
}
-BOOL SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
{
SetActualWin(pWin);
- if (rMEvt.IsLeft()) aDragStat.SetMouseDown(TRUE);
- BOOL bRet=SdrCreateView::MouseButtonDown(rMEvt,pWin);
+ if (rMEvt.IsLeft()) aDragStat.SetMouseDown(sal_True);
+ sal_Bool bRet=SdrCreateView::MouseButtonDown(rMEvt,pWin);
if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) {
SdrViewEvent aVEvt;
PickAnything(rMEvt,SDRMOUSEBUTTONDOWN,aVEvt);
@@ -248,12 +248,12 @@ BOOL SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin)
return bRet;
}
-BOOL SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
{
SetActualWin(pWin);
- if (rMEvt.IsLeft()) aDragStat.SetMouseDown(FALSE);
- BOOL bAction=IsAction();
- BOOL bRet=!bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin);
+ if (rMEvt.IsLeft()) aDragStat.SetMouseDown(sal_False);
+ sal_Bool bAction=IsAction();
+ sal_Bool bRet=!bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin);
if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) {
SdrViewEvent aVEvt;
PickAnything(rMEvt,SDRMOUSEBUTTONUP,aVEvt);
@@ -262,15 +262,15 @@ BOOL SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin)
return bRet;
}
-BOOL SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
+sal_Bool SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
{
SetActualWin(pWin);
aDragStat.SetMouseDown(rMEvt.IsLeft());
- BOOL bRet=SdrCreateView::MouseMove(rMEvt,pWin);
+ sal_Bool bRet=SdrCreateView::MouseMove(rMEvt,pWin);
if (!IsExtendedMouseEventDispatcherEnabled() && !IsTextEditInSelectionMode()) {
SdrViewEvent aVEvt;
PickAnything(rMEvt,SDRMOUSEMOVE,aVEvt);
- if (DoMouseEvent(aVEvt)) bRet=TRUE;
+ if (DoMouseEvent(aVEvt)) bRet=sal_True;
}
// #87792# Removed code which did let the mouse snap on object
@@ -279,26 +279,26 @@ BOOL SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin)
return bRet;
}
-BOOL SdrView::Command(const CommandEvent& rCEvt, Window* pWin)
+sal_Bool SdrView::Command(const CommandEvent& rCEvt, Window* pWin)
{
SetActualWin(pWin);
- BOOL bRet=SdrCreateView::Command(rCEvt,pWin);
+ sal_Bool bRet=SdrCreateView::Command(rCEvt,pWin);
return bRet;
}
/* new interface src537 */
-BOOL SdrView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const
+sal_Bool SdrView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const
{
return SdrCreateView::GetAttributes(rTargetSet, bOnlyHardAttr);
}
SfxStyleSheet* SdrView::GetStyleSheet() const
{
- //BOOL bOk=FALSE;
+ //sal_Bool bOk=sal_False;
return SdrCreateView::GetStyleSheet(); //bOk);
}
-SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, USHORT nEventKind, SdrViewEvent& rVEvt) const
+SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, sal_uInt16 nEventKind, SdrViewEvent& rVEvt) const
{
rVEvt.bMouseDown=nEventKind==SDRMOUSEBUTTONDOWN;
rVEvt.bMouseUp=nEventKind==SDRMOUSEBUTTONUP;
@@ -352,30 +352,30 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
// #i73628# Use a non-changeable copy of he logic pos
const Point aLocalLogicPosition(rLogicPos);
- BOOL bEditMode=IsEditMode();
- BOOL bPointMode=bEditMode && HasMarkablePoints();
- BOOL bGluePointMode=IsGluePointEditMode();
- BOOL bInsPolyPt=bPointMode && IsInsObjPointMode() && IsInsObjPointPossible();
- BOOL bInsGluePt=bGluePointMode && IsInsGluePointMode() && IsInsGluePointPossible();
- BOOL bIsTextEdit=IsTextEdit();
- BOOL bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/);
- BOOL bTextEditSel=IsTextEditInSelectionMode();
- BOOL bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
- BOOL bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
- BOOL bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
+ sal_Bool bEditMode=IsEditMode();
+ sal_Bool bPointMode=bEditMode && HasMarkablePoints();
+ sal_Bool bGluePointMode=IsGluePointEditMode();
+ sal_Bool bInsPolyPt=bPointMode && IsInsObjPointMode() && IsInsObjPointPossible();
+ sal_Bool bInsGluePt=bGluePointMode && IsInsGluePointMode() && IsInsGluePointPossible();
+ sal_Bool bIsTextEdit=IsTextEdit();
+ sal_Bool bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/);
+ sal_Bool bTextEditSel=IsTextEditInSelectionMode();
+ sal_Bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
+ sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
+ sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
SdrHitKind eHit=SDRHIT_NONE;
SdrHdl* pHdl=pOut!=NULL && !bTextEditSel ? PickHandle(aLocalLogicPosition) : NULL;
SdrPageView* pPV=NULL;
SdrObject* pObj=NULL;
SdrObject* pHitObj=NULL;
- USHORT nHitPassNum=0;
- USHORT nHlplIdx=0;
- USHORT nGlueId=0;
- BOOL bUnmarkedObjHit=FALSE;
+ sal_uInt16 nHitPassNum=0;
+ sal_uInt16 nHlplIdx=0;
+ sal_uInt16 nGlueId=0;
+ sal_Bool bUnmarkedObjHit=sal_False;
if (bTextEditHit || bTextEditSel)
{
eHit=SDRHIT_TEXTEDIT;
- bTextEditHit=TRUE;
+ bTextEditHit=sal_True;
}
else if (pHdl!=NULL)
{
@@ -429,7 +429,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
break;
}
}
- bUnmarkedObjHit=TRUE;
+ bUnmarkedObjHit=sal_True;
}
else if (bEditMode && IsHlplVisible() && !IsHlplFront() && pOut!=NULL && PickHelpLine(aLocalLogicPosition,nHitTolLog,*pOut,nHlplIdx,pPV))
{
@@ -438,8 +438,8 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
if (IsMacroMode() && eHit==SDRHIT_UNMARKEDOBJECT)
{
bool bRoot=pObj->HasMacro();
- BOOL bDeep=pObj!=pHitObj && pHitObj->HasMacro();
- BOOL bMid=FALSE; // Gruppierte Gruppe mit Macro getroffen?
+ sal_Bool bDeep=pObj!=pHitObj && pHitObj->HasMacro();
+ sal_Bool bMid=sal_False; // Gruppierte Gruppe mit Macro getroffen?
SdrObject* pMidObj=NULL;
if (pObj!=pHitObj)
{
@@ -450,7 +450,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
{
if (pObjTmp->HasMacro())
{
- bMid=TRUE;
+ bMid=sal_True;
pMidObj=pObjTmp;
}
pObjTmp=pObjTmp->GetUpGroup();
@@ -496,14 +496,14 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
if( pTextObj->GetModel() )
pOutliner = &pTextObj->GetModel()->GetHitTestOutliner();
- pTextObj->TakeTextRect( *pOutliner, aTextRect, FALSE, &aAnchor, FALSE );
+ pTextObj->TakeTextRect( *pOutliner, aTextRect, sal_False, &aAnchor, sal_False );
// #i73628# Use a text-relative position for hit test in hit test outliner
Point aTemporaryTextRelativePosition(aLocalLogicPosition - aTextRect.TopLeft());
// FitToSize berueksichtigen
SdrFitToSizeType eFit=pTextObj->GetFitToSize();
- BOOL bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
+ sal_Bool bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES);
if (bFitToSize) {
Fraction aX(aTextRect.GetWidth()-1,aAnchor.GetWidth()-1);
Fraction aY(aTextRect.GetHeight()-1,aAnchor.GetHeight()-1);
@@ -570,7 +570,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
// TextEdit an Objekten im gesperrten Layer
if (pPV->GetLockedLayers().IsSet(pHitObj->GetLayer()))
{
- bTEHit=FALSE;
+ bTEHit=sal_False;
}
if (bTEHit)
@@ -586,12 +586,12 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
pObj=NULL;
pPV=NULL;
}
- BOOL bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
- BOOL bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
- BOOL bMouseDown=rVEvt.bMouseDown;
- BOOL bMouseUp=rVEvt.bMouseUp;
+ sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
+ sal_Bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
+ sal_Bool bMouseDown=rVEvt.bMouseDown;
+ sal_Bool bMouseUp=rVEvt.bMouseUp;
SdrEventKind eEvent=SDREVENT_NONE;
- BOOL bIsAction=IsAction();
+ sal_Bool bIsAction=IsAction();
if (bIsAction)
{
@@ -660,21 +660,21 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
else if (eHit==SDRHIT_HANDLE)
{
eEvent=SDREVENT_BEGDRAGOBJ; // Mark+Drag,AddMark+Drag,DeepMark+Drag,Unmark
- BOOL bGlue=pHdl->GetKind()==HDL_GLUE;
- BOOL bPoly=!bGlue && IsPointMarkable(*pHdl);
- BOOL bMarked=bGlue || bPoly && pHdl->IsSelected();
+ sal_Bool bGlue=pHdl->GetKind()==HDL_GLUE;
+ sal_Bool bPoly=!bGlue && IsPointMarkable(*pHdl);
+ sal_Bool bMarked=bGlue || bPoly && pHdl->IsSelected();
if (bGlue || bPoly)
{
eEvent=bGlue ? SDREVENT_MARKGLUEPOINT : SDREVENT_MARKPOINT;
if (MODKEY_DeepMark)
{
- rVEvt.bAddMark=TRUE;
- rVEvt.bPrevNextMark=TRUE;
+ rVEvt.bAddMark=sal_True;
+ rVEvt.bPrevNextMark=sal_True;
rVEvt.bMarkPrev=MODKEY_DeepBackw;
}
else if (MODKEY_MultiMark)
{
- rVEvt.bAddMark=TRUE;
+ rVEvt.bAddMark=sal_True;
rVEvt.bUnmark=bMarked; // Toggle
if (bGlue)
{
@@ -780,23 +780,23 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co
return eHit;
}
-BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
+sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
{
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
SdrHitKind eHit=rVEvt.eHit;
Point aLogicPos(rVEvt.aLogicPos);
- BOOL bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
- BOOL bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
- BOOL bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
- BOOL bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
- //BOOL bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
- BOOL bMouseDown=rVEvt.bMouseDown;
- BOOL bMouseUp=rVEvt.bMouseUp;
+ sal_Bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0;
+ sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0;
+ sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0;
+ sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0;
+ //sal_Bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0;
+ sal_Bool bMouseDown=rVEvt.bMouseDown;
+ sal_Bool bMouseUp=rVEvt.bMouseUp;
if (bMouseDown) {
- if (bMouseLeft) aDragStat.SetMouseDown(TRUE);
+ if (bMouseLeft) aDragStat.SetMouseDown(sal_True);
} else if (bMouseUp) {
- if (bMouseLeft) aDragStat.SetMouseDown(FALSE);
+ if (bMouseLeft) aDragStat.SetMouseDown(sal_False);
} else { // ansonsten MoueMove
aDragStat.SetMouseDown(bMouseLeft);
}
@@ -827,13 +827,13 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
// sein muesste (wg. eHit).
}
switch (rVEvt.eEvent) {
- case SDREVENT_NONE: bRet=FALSE; break;
- case SDREVENT_TEXTEDIT: bRet=FALSE; break; // Events an die OutlinerView werden hier nicht beruecksichtigt
- case SDREVENT_MOVACTION: MovAction(aLogicPos); bRet=TRUE; break;
- case SDREVENT_ENDACTION: EndAction(); bRet=TRUE; break;
- case SDREVENT_BCKACTION: BckAction(); bRet=TRUE; break;
- case SDREVENT_BRKACTION: BrkAction(); bRet=TRUE; break;
- case SDREVENT_ENDMARK : EndAction(); bRet=TRUE; break;
+ case SDREVENT_NONE: bRet=sal_False; break;
+ case SDREVENT_TEXTEDIT: bRet=sal_False; break; // Events an die OutlinerView werden hier nicht beruecksichtigt
+ case SDREVENT_MOVACTION: MovAction(aLogicPos); bRet=sal_True; break;
+ case SDREVENT_ENDACTION: EndAction(); bRet=sal_True; break;
+ case SDREVENT_BCKACTION: BckAction(); bRet=sal_True; break;
+ case SDREVENT_BRKACTION: BrkAction(); bRet=sal_True; break;
+ case SDREVENT_ENDMARK : EndAction(); bRet=sal_True; break;
case SDREVENT_BRKMARK : {
BrkAction();
if (!MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark)) {
@@ -843,7 +843,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
// - und ansonsten Objekte
if (!rVEvt.bAddMark) UnmarkAll();
}
- bRet=TRUE;
+ bRet=sal_True;
} break;
case SDREVENT_ENDCREATE: { // ggf. MarkObj
SdrCreateCmd eCmd=SDRCREATE_NEXTPOINT;
@@ -854,7 +854,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
MarkObj(rVEvt.pRootObj,rVEvt.pPV);
if (eHit==SDRHIT_TEXTEDIT)
{
- BOOL bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() &&
+ sal_Bool bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() &&
SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, sal_False, (SdrOutliner*)0L));
if(bRet2)
@@ -869,9 +869,9 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
}
}
}
- bRet=TRUE; // Obj markiert und ggf. TextEdit gestartet
- } else bRet=FALSE; // Create abgebrochen, sonst nix weiter.
- } else bRet=TRUE; // EndCreate mit TRUE returniert
+ bRet=sal_True; // Obj markiert und ggf. TextEdit gestartet
+ } else bRet=sal_False; // Create abgebrochen, sonst nix weiter.
+ } else bRet=sal_True; // EndCreate mit sal_True returniert
} break;
case SDREVENT_ENDDRAG: {
bRet=EndDragObj(IsDragWithCopy());
@@ -879,20 +879,20 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
} break;
case SDREVENT_MARKOBJ: { // + ggf. BegDrag
if (!rVEvt.bAddMark) UnmarkAllObj();
- BOOL bUnmark=rVEvt.bUnmark;
+ sal_Bool bUnmark=rVEvt.bUnmark;
if (rVEvt.bPrevNextMark) {
bRet=MarkNextObj(aLogicPos,nHitTolLog,rVEvt.bMarkPrev);
} else {
SortMarkedObjects();
- ULONG nAnz0=GetMarkedObjectCount();
+ sal_uIntPtr nAnz0=GetMarkedObjectCount();
bRet=MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark);
SortMarkedObjects();
- ULONG nAnz1=GetMarkedObjectCount();
+ sal_uIntPtr nAnz1=GetMarkedObjectCount();
bUnmark=nAnz1<nAnz0;
}
if (!bUnmark) {
BegDragObj(aLogicPos,NULL,(SdrHdl*)NULL,nMinMovLog);
- bRet=TRUE;
+ bRet=sal_True;
}
} break;
case SDREVENT_MARKPOINT: { // + ggf. BegDrag
@@ -904,7 +904,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
}
if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) {
BegDragObj(aLogicPos,NULL,rVEvt.pHdl,nMinMovLog);
- bRet=TRUE;
+ bRet=sal_True;
}
} break;
case SDREVENT_MARKGLUEPOINT: { // + ggf. BegDrag
@@ -917,7 +917,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) {
SdrHdl* pHdl=GetGluePointHdl(rVEvt.pObj,rVEvt.nGlueId);
BegDragObj(aLogicPos,NULL,pHdl,nMinMovLog);
- bRet=TRUE;
+ bRet=sal_True;
}
} break;
case SDREVENT_BEGMARK: bRet=BegMark(aLogicPos,rVEvt.bAddMark,rVEvt.bUnmark); break;
@@ -927,7 +927,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
if (MODKEY_PolyPoly) eCmd=SDRCREATE_NEXTOBJECT;
if (rVEvt.nMouseClicks>1) eCmd=SDRCREATE_FORCEEND;
EndInsObjPoint(eCmd);
- bRet=TRUE;
+ bRet=sal_True;
} break;
case SDREVENT_BEGINSGLUEPOINT: bRet=BegInsGluePoint(aLogicPos); break;
case SDREVENT_BEGDRAGHELPLINE: bRet=BegDragHelpLine(rVEvt.nHlplIdx,rVEvt.pPV); break;
@@ -961,14 +961,14 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
if (bRet && pActualOutDev!=NULL && pActualOutDev->GetOutDevType()==OUTDEV_WINDOW) {
Window* pWin=(Window*)pActualOutDev;
// Maus links gedrueckt?
- BOOL bLeftDown=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseDown;
+ sal_Bool bLeftDown=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseDown;
// Maus links losgelassen?
- BOOL bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp;
+ sal_Bool bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp;
// Maus links gedrueckt oder gehalten?
- BOOL bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp;
+ sal_Bool bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp;
pWin->SetPointer(GetPreferedPointer(rVEvt.aLogicPos,pWin,
rVEvt.nMouseCode & (KEY_SHIFT|KEY_MOD1|KEY_MOD2),bLeftDown1));
- BOOL bAction=IsAction();
+ sal_Bool bAction=IsAction();
if (bLeftDown && bAction) pWin->CaptureMouse();
else if (bLeftUp || (rVEvt.bIsAction && !bAction)) pWin->ReleaseMouse();
}
@@ -976,7 +976,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
}
#include <editeng/outlobj.hxx>
-Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nModifier, BOOL bLeftDown) const
+Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, sal_Bool bLeftDown) const
{
// Actions
if (IsCreateObj())
@@ -1005,7 +1005,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
aHitRec.bDown=bMacroDown;
return pMacroObj->GetMacroPointer(aHitRec);
}
- //USHORT nTol=nHitTolLog;
+ //sal_uInt16 nTol=nHitTolLog;
// TextEdit, ObjEdit, Macro
if (IsTextEdit() && (IsTextEditInSelectionMode() || IsTextEditHit(rMousePos,0/*nTol*/)))
{
@@ -1089,30 +1089,30 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
default: break;
}
- BOOL bMarkHit=eHit==SDRHIT_MARKEDOBJECT;
+ sal_Bool bMarkHit=eHit==SDRHIT_MARKEDOBJECT;
SdrHdl* pHdl=aVEvt.pHdl;
// Nun die Pointer fuer Dragging checken
if (pHdl!=NULL || bMarkHit) {
SdrHdlKind eHdl= pHdl!=NULL ? pHdl->GetKind() : HDL_MOVE;
- BOOL bCorner=pHdl!=NULL && pHdl->IsCornerHdl();
- BOOL bVertex=pHdl!=NULL && pHdl->IsVertexHdl();
- BOOL bMov=eHdl==HDL_MOVE;
+ sal_Bool bCorner=pHdl!=NULL && pHdl->IsCornerHdl();
+ sal_Bool bVertex=pHdl!=NULL && pHdl->IsVertexHdl();
+ sal_Bool bMov=eHdl==HDL_MOVE;
if (bMov && (eDragMode==SDRDRAG_MOVE || eDragMode==SDRDRAG_RESIZE || bMarkedHitMovesAlways)) {
if (!IsMoveAllowed()) return Pointer(POINTER_ARROW); // weil Doppelklick oder Drag&Drop moeglich
return Pointer(POINTER_MOVE);
}
switch (eDragMode) {
case SDRDRAG_ROTATE: {
- if ((bCorner || bMov) && !IsRotateAllowed(TRUE))
+ if ((bCorner || bMov) && !IsRotateAllowed(sal_True))
return Pointer(POINTER_NOTALLOWED);
// Sind 3D-Objekte selektiert?
- BOOL b3DObjSelected = FALSE;
+ sal_Bool b3DObjSelected = sal_False;
#ifndef SVX_LIGHT
- for (UINT32 a=0; !b3DObjSelected && a<GetMarkedObjectCount(); a++) {
+ for (sal_uInt32 a=0; !b3DObjSelected && a<GetMarkedObjectCount(); a++) {
SdrObject* pObj = GetMarkedObjectByIndex(a);
if(pObj && pObj->ISA(E3dObject))
- b3DObjSelected = TRUE;
+ b3DObjSelected = sal_True;
}
#endif
// Falls es um ein 3D-Objekt geht, muss trotz !IsShearAllowed
@@ -1125,7 +1125,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
} break;
case SDRDRAG_SHEAR: case SDRDRAG_DISTORT: {
if (bCorner) {
- if (!IsDistortAllowed(TRUE) && !IsDistortAllowed(FALSE)) return Pointer(POINTER_NOTALLOWED);
+ if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return Pointer(POINTER_NOTALLOWED);
else return Pointer(POINTER_REFHAND);
}
if (bVertex && !IsShearAllowed()) return Pointer(POINTER_NOTALLOWED);
@@ -1138,18 +1138,18 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
if (bCorner || bVertex || bMov) {
SdrHdl* pH1=aHdl.GetHdl(HDL_REF1);
SdrHdl* pH2=aHdl.GetHdl(HDL_REF2);
- BOOL b90=FALSE;
- BOOL b45=FALSE;
+ sal_Bool b90=sal_False;
+ sal_Bool b45=sal_False;
Point aDif;
if (pH1!=NULL && pH2!=NULL) {
aDif=pH2->GetPos()-pH1->GetPos();
b90=(aDif.X()==0) || aDif.Y()==0;
b45=b90 || (Abs(aDif.X())==Abs(aDif.Y()));
}
- BOOL bNo=FALSE;
- if (!IsMirrorAllowed(TRUE,TRUE)) bNo=TRUE; // Spiegeln ueberhaupt nicht erlaubt
- if (!IsMirrorAllowed(FALSE,FALSE) && !b45) bNo=TRUE; // freies Spiegeln nicht erlaubt
- if (!IsMirrorAllowed(TRUE,FALSE) && !b90) bNo=TRUE; // Spiegeln hor/ver erlaubt
+ sal_Bool bNo=sal_False;
+ if (!IsMirrorAllowed(sal_True,TRUE)) bNo=sal_True; // Spiegeln ueberhaupt nicht erlaubt
+ if (!IsMirrorAllowed(sal_False,FALSE) && !b45) bNo=sal_True; // freies Spiegeln nicht erlaubt
+ if (!IsMirrorAllowed(sal_True,sal_False) && !b90) bNo=sal_True; // Spiegeln hor/ver erlaubt
if (bNo) return Pointer(POINTER_NOTALLOWED);
if (b90) {
return Pointer(POINTER_MIRROR);
@@ -1176,7 +1176,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
case SDRDRAG_CROOK: {
if (bCorner || bVertex || bMov) {
- if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE)) return Pointer(POINTER_NOTALLOWED);
+ if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return Pointer(POINTER_NOTALLOWED);
return Pointer(POINTER_CROOK);
}
}
@@ -1187,7 +1187,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
}
default: {
- if ((bCorner || bVertex) && !IsResizeAllowed(TRUE)) return Pointer(POINTER_NOTALLOWED);
+ if ((bCorner || bVertex) && !IsResizeAllowed(sal_True)) return Pointer(POINTER_NOTALLOWED);
}
}
if (pHdl!=NULL) return pHdl->GetPointer();
@@ -1269,7 +1269,7 @@ XubString SdrView::GetStatusText()
ESelection aSel(pTextEditOutlinerView->GetSelection());
long nPar=aSel.nEndPara,nLin=0,nCol=aSel.nEndPos;
if (aSel.nEndPara>0) {
- for (USHORT nParaNum=0; nParaNum<aSel.nEndPara; nParaNum++) {
+ for (sal_uInt16 nParaNum=0; nParaNum<aSel.nEndPara; nParaNum++) {
nLin+=pTextEditOutliner->GetLineCount(nParaNum);
}
}
@@ -1277,18 +1277,18 @@ XubString SdrView::GetStatusText()
// Am Ende einer Zeile eines mehrzeiligen Absatzes wird die Position
// der naechsten Zeile des selben Absatzes angezeigt, so es eine solche
// gibt.
- USHORT nParaLine=0;
- ULONG nParaLineAnz=pTextEditOutliner->GetLineCount(aSel.nEndPara);
- BOOL bBrk=FALSE;
+ sal_uInt16 nParaLine=0;
+ sal_uIntPtr nParaLineAnz=pTextEditOutliner->GetLineCount(aSel.nEndPara);
+ sal_Bool bBrk=sal_False;
while (!bBrk) {
- USHORT nLen=pTextEditOutliner->GetLineLen(aSel.nEndPara,nParaLine);
- BOOL bLastLine=(nParaLine==nParaLineAnz-1);
+ sal_uInt16 nLen=pTextEditOutliner->GetLineLen(aSel.nEndPara,nParaLine);
+ sal_Bool bLastLine=(nParaLine==nParaLineAnz-1);
if (nCol>nLen || (!bLastLine && nCol==nLen)) {
nCol-=nLen;
nLin++;
nParaLine++;
- } else bBrk=TRUE;
- if (nLen==0) bBrk=TRUE; // Sicherheitshalber
+ } else bBrk=sal_True;
+ if (nLen==0) bBrk=sal_True; // Sicherheitshalber
}
aStr.SearchAndReplaceAscii("%1", UniString::CreateFromInt32(nPar + 1));
@@ -1338,14 +1338,14 @@ SdrViewContext SdrView::GetContext() const
if( IsGluePointEditMode() )
return SDRCONTEXT_GLUEPOINTEDIT;
- const ULONG nMarkAnz = GetMarkedObjectCount();
+ const sal_uIntPtr nMarkAnz = GetMarkedObjectCount();
if( HasMarkablePoints() && !IsFrameHandles() )
{
- BOOL bPath=TRUE;
- for( ULONG nMarkNum = 0; nMarkNum < nMarkAnz && bPath; nMarkNum++ )
+ sal_Bool bPath=sal_True;
+ for( sal_uIntPtr nMarkNum = 0; nMarkNum < nMarkAnz && bPath; nMarkNum++ )
if (!GetMarkedObjectByIndex(nMarkNum)->ISA(SdrPathObj))
- bPath=FALSE;
+ bPath=sal_False;
if( bPath )
return SDRCONTEXT_POINTEDIT;
@@ -1353,9 +1353,9 @@ SdrViewContext SdrView::GetContext() const
if( GetMarkedObjectCount() )
{
- BOOL bGraf = TRUE, bMedia = TRUE, bTable = TRUE;
+ sal_Bool bGraf = sal_True, bMedia = sal_True, bTable = sal_True;
- for( ULONG nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); nMarkNum++ )
+ for( sal_uIntPtr nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); nMarkNum++ )
{
const SdrObject* pMarkObj = GetMarkedObjectByIndex( nMarkNum );
DBG_ASSERT( pMarkObj, "SdrView::GetContext(), null pointer in mark list!" );
@@ -1364,13 +1364,13 @@ SdrViewContext SdrView::GetContext() const
continue;
if( !pMarkObj->ISA( SdrGrafObj ) )
- bGraf = FALSE;
+ bGraf = sal_False;
if( !pMarkObj->ISA( SdrMediaObj ) )
- bMedia = FALSE;
+ bMedia = sal_False;
if( !pMarkObj->ISA( ::sdr::table::SdrTableObj ) )
- bTable = FALSE;
+ bTable = sal_False;
}
if( bGraf )
@@ -1411,24 +1411,24 @@ void SdrView::UnmarkAll()
else UnmarkAllObj();
}
-BOOL SdrView::IsAllMarked() const
+sal_Bool SdrView::IsAllMarked() const
{
if (IsTextEdit()) {
return ImpIsTextEditAllSelected();
}
if (IsGluePointEditMode()) {
- ULONG nAnz=GetMarkableGluePointCount();
+ sal_uIntPtr nAnz=GetMarkableGluePointCount();
return nAnz!=0 && nAnz==GetMarkedGluePointCount();
}
if (HasMarkedPoints()) {
- ULONG nAnz=GetMarkablePointCount();
+ sal_uIntPtr nAnz=GetMarkablePointCount();
return nAnz!=0 && nAnz==GetMarkedPointCount();
}
- ULONG nAnz=GetMarkableObjCount();
+ sal_uIntPtr nAnz=GetMarkableObjCount();
return nAnz!=0 && nAnz == GetMarkedObjectCount();
}
-BOOL SdrView::IsMarkPossible() const
+sal_Bool SdrView::IsMarkPossible() const
{
if(IsTextEdit())
{
@@ -1448,10 +1448,10 @@ BOOL SdrView::IsMarkPossible() const
return HasMarkableObj();
}
-BOOL SdrView::IsAllMarkPrevNextPossible() const
+sal_Bool SdrView::IsAllMarkPrevNextPossible() const
{
if (IsTextEdit()) {
- return FALSE;
+ return sal_False;
}
if (IsGluePointEditMode()) {
return HasMarkableGluePoints();
@@ -1462,10 +1462,10 @@ BOOL SdrView::IsAllMarkPrevNextPossible() const
return HasMarkableObj();
}
-BOOL SdrView::MarkNext(BOOL bPrev)
+sal_Bool SdrView::MarkNext(sal_Bool bPrev)
{
if (IsTextEdit()) {
- return FALSE;
+ return sal_False;
}
if (IsGluePointEditMode() && HasMarkedGluePoints()) {
return MarkNextGluePoint(bPrev);
@@ -1476,10 +1476,10 @@ BOOL SdrView::MarkNext(BOOL bPrev)
return MarkNextObj(bPrev);
}
-BOOL SdrView::MarkNext(const Point& rPnt, BOOL bPrev)
+sal_Bool SdrView::MarkNext(const Point& rPnt, sal_Bool bPrev)
{
if (IsTextEdit()) {
- return FALSE;
+ return sal_False;
}
if (IsGluePointEditMode() && HasMarkedGluePoints()) {
//return MarkNextGluePoint(rPnt,bPrev); fehlende Implementation !!!
@@ -1537,9 +1537,9 @@ void SdrView::DeleteMarked()
}
}
-BOOL SdrView::BegMark(const Point& rPnt, BOOL bAddMark, BOOL bUnmark)
+sal_Bool SdrView::BegMark(const Point& rPnt, sal_Bool bAddMark, sal_Bool bUnmark)
{
- if (bUnmark) bAddMark=TRUE;
+ if (bUnmark) bAddMark=sal_True;
if (IsGluePointEditMode()) {
if (!bAddMark) UnmarkAllGluePoints();
return BegMarkGluePoints(rPnt,bUnmark);
@@ -1552,12 +1552,12 @@ BOOL SdrView::BegMark(const Point& rPnt, BOOL bAddMark, BOOL bUnmark)
}
}
-BOOL SdrView::IsDeleteMarkedPossible() const
+sal_Bool SdrView::IsDeleteMarkedPossible() const
{
- if (IsReadOnly()) return FALSE;
- if (IsTextEdit()) return TRUE;
- if (IsGluePointEditMode() && HasMarkedGluePoints()) return TRUE;
- if (HasMarkedPoints()) return TRUE;
+ if (IsReadOnly()) return sal_False;
+ if (IsTextEdit()) return sal_True;
+ if (IsGluePointEditMode() && HasMarkedGluePoints()) return sal_True;
+ if (HasMarkedPoints()) return sal_True;
return IsDeleteMarkedObjPossible();
}
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 181b086988db..dd7275f9cfdc 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -104,34 +104,34 @@ Point SdrExchangeView::GetPastePos(SdrObjList* pLst, OutputDevice* pOut)
return aP;
}
-BOOL SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const
+sal_Bool SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const
{
- BOOL bRet(FALSE);
+ sal_Bool bRet(sal_False);
if(!aMaxWorkArea.IsEmpty())
{
if(rPt.X()<aMaxWorkArea.Left())
{
rPt.X() = aMaxWorkArea.Left();
- bRet = TRUE;
+ bRet = sal_True;
}
if(rPt.X()>aMaxWorkArea.Right())
{
rPt.X() = aMaxWorkArea.Right();
- bRet = TRUE;
+ bRet = sal_True;
}
if(rPt.Y()<aMaxWorkArea.Top())
{
rPt.Y() = aMaxWorkArea.Top();
- bRet = TRUE;
+ bRet = sal_True;
}
if(rPt.Y()>aMaxWorkArea.Bottom())
{
rPt.Y() = aMaxWorkArea.Bottom();
- bRet = TRUE;
+ bRet = sal_True;
}
}
return bRet;
@@ -149,14 +149,14 @@ void SdrExchangeView::ImpGetPasteObjList(Point& /*rPos*/, SdrObjList*& rpLst)
}
}
-BOOL SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const
+sal_Bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const
{
- BOOL bRet=FALSE;
+ sal_Bool bRet=sal_False;
rLayer=0;
if (pObjList!=NULL) {
const SdrPage* pPg=pObjList->GetPage();
if (pPg!=NULL) {
- rLayer=pPg->GetLayerAdmin().GetLayerID(aAktLayer,TRUE);
+ rLayer=pPg->GetLayerAdmin().GetLayerID(aAktLayer,sal_True);
if (rLayer==SDRLAYER_NOTFOUND) rLayer=0;
SdrPageView* pPV = GetSdrPageView();
if (pPV!=NULL) {
@@ -169,50 +169,50 @@ BOOL SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& r
////////////////////////////////////////////////////////////////////////////////////////////////////
-BOOL SdrExchangeView::Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
{
Point aPos(rPos);
ImpGetPasteObjList(aPos,pLst);
ImpLimitToWorkArea( aPos );
- if (pLst==NULL) return FALSE;
+ if (pLst==NULL) return sal_False;
SdrLayerID nLayer;
- if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE;
- BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+ if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
+ sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
if (bUnmark) UnmarkAllObj();
SdrGrafObj* pObj=new SdrGrafObj(Graphic(rMtf));
pObj->SetLayer(nLayer);
ImpPasteObject(pObj,*pLst,aPos,rMtf.GetPrefSize(),rMtf.GetPrefMapMode(),nOptions);
- return TRUE;
+ return sal_True;
}
-BOOL SdrExchangeView::Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
{
Point aPos(rPos);
ImpGetPasteObjList(aPos,pLst);
ImpLimitToWorkArea( aPos );
- if (pLst==NULL) return FALSE;
+ if (pLst==NULL) return sal_False;
SdrLayerID nLayer;
- if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE;
- BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+ if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
+ sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
if (bUnmark) UnmarkAllObj();
SdrGrafObj* pObj=new SdrGrafObj(Graphic(rBmp));
pObj->SetLayer(nLayer);
ImpPasteObject(pObj,*pLst,aPos,rBmp.GetSizePixel(),MapMode(MAP_PIXEL),nOptions);
- return TRUE;
+ return sal_True;
}
-BOOL SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
{
if(!rStr.Len())
- return FALSE;
+ return sal_False;
Point aPos(rPos);
ImpGetPasteObjList(aPos,pLst);
ImpLimitToWorkArea( aPos );
- if (pLst==NULL) return FALSE;
+ if (pLst==NULL) return sal_False;
SdrLayerID nLayer;
- if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE;
- BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+ if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
+ sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
if (bUnmark) UnmarkAllObj();
Rectangle aTextRect(0,0,500,500);
SdrPage* pPage=pLst->GetPage();
@@ -238,18 +238,18 @@ BOOL SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList
MapUnit eMap=pMod->GetScaleUnit();
Fraction aMap=pMod->GetScaleFraction();
ImpPasteObject(pObj,*pLst,aPos,aSiz,MapMode(eMap,Point(0,0),aMap,aMap),nOptions);
- return TRUE;
+ return sal_True;
}
-BOOL SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
{
Point aPos(rPos);
ImpGetPasteObjList(aPos,pLst);
ImpLimitToWorkArea( aPos );
- if (pLst==NULL) return FALSE;
+ if (pLst==NULL) return sal_False;
SdrLayerID nLayer;
- if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE;
- BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+ if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False;
+ sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
if (bUnmark) UnmarkAllObj();
Rectangle aTextRect(0,0,500,500);
SdrPage* pPage=pLst->GetPage();
@@ -296,14 +296,14 @@ BOOL SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, USHORT eFo
}
}
- return TRUE;
+ return sal_True;
}
-BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, UINT32 nOptions)
+sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions)
{
const SdrModel* pSrcMod=&rMod;
if (pSrcMod==pMod)
- return FALSE; // na so geht's ja nun nicht
+ return sal_False; // na so geht's ja nun nicht
const bool bUndo = IsUndoEnabled();
@@ -314,7 +314,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
{
if( bUndo )
EndUndo();
- return TRUE;
+ return sal_True;
}
Point aPos(rPos);
@@ -330,9 +330,9 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
ImpLimitToWorkArea( aPos );
if (pLst==NULL)
- return FALSE;
+ return sal_False;
- BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
+ sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit();
if (bUnmark)
UnmarkAllObj();
@@ -340,7 +340,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
// Dafuer erstmal die Faktoren berechnen
MapUnit eSrcUnit=pSrcMod->GetScaleUnit();
MapUnit eDstUnit=pMod->GetScaleUnit();
- BOOL bResize=eSrcUnit!=eDstUnit;
+ sal_Bool bResize=eSrcUnit!=eDstUnit;
Fraction xResize,yResize;
Point aPt0;
if (bResize)
@@ -350,7 +350,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
yResize=aResize.Y();
}
SdrObjList* pDstLst=pLst;
- USHORT nPg,nPgAnz=pSrcMod->GetPageCount();
+ sal_uInt16 nPg,nPgAnz=pSrcMod->GetPageCount();
for (nPg=0; nPg<nPgAnz; nPg++)
{
const SdrPage* pSrcPg=pSrcMod->GetPage(nPg);
@@ -362,10 +362,10 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
ResizeRect(aR,aPt0,xResize,yResize);
Point aDist(aPos-aR.Center());
Size aSiz(aDist.X(),aDist.Y());
- //ULONG nDstObjAnz0=pDstLst->GetObjCount();
- ULONG nCloneErrCnt=0;
- ULONG nOb,nObAnz=pSrcPg->GetObjCount();
- BOOL bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
+ //sal_uIntPtr nDstObjAnz0=pDstLst->GetObjCount();
+ sal_uIntPtr nCloneErrCnt=0;
+ sal_uIntPtr nOb,nObAnz=pSrcPg->GetObjCount();
+ sal_Bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
// #i13033#
// New mechanism to re-create the connections of cloned connectors
@@ -382,9 +382,9 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
{
if(bResize)
{
- pNeuObj->GetModel()->SetPasteResize(TRUE); // #51139#
+ pNeuObj->GetModel()->SetPasteResize(sal_True); // #51139#
pNeuObj->NbcResize(aPt0,xResize,yResize);
- pNeuObj->GetModel()->SetPasteResize(FALSE); // #51139#
+ pNeuObj->GetModel()->SetPasteResize(sal_False); // #51139#
}
// #i39861#
@@ -408,7 +408,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
}
else
{
- nLayer = rAd.GetLayerID(aAktLayer, TRUE);
+ nLayer = rAd.GetLayerID(aAktLayer, sal_True);
}
if(SDRLAYER_NOTFOUND == nLayer)
@@ -428,7 +428,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
if (bMark) {
// Markhandles noch nicht sofort setzen!
// Das erledigt das ModelHasChanged der MarkView.
- MarkObj(pNeuObj,pMarkPV,FALSE,TRUE);
+ MarkObj(pNeuObj,pMarkPV,sal_False,sal_True);
}
// #i13033#
@@ -470,10 +470,10 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList*
if( bUndo )
EndUndo();
- return TRUE;
+ return sal_True;
}
-BOOL SdrExchangeView::IsExchangeFormatSupported(ULONG nFormat) const
+sal_Bool SdrExchangeView::IsExchangeFormatSupported(sal_uIntPtr nFormat) const
{
return( FORMAT_PRIVATE == nFormat ||
FORMAT_GDIMETAFILE == nFormat ||
@@ -484,7 +484,7 @@ BOOL SdrExchangeView::IsExchangeFormatSupported(ULONG nFormat) const
SOT_FORMATSTR_ID_EDITENGINE == nFormat );
}
-void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, UINT32 nOptions)
+void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions)
{
BigInt nSizX(rSiz.Width());
BigInt nSizY(rSiz.Height());
@@ -524,7 +524,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po
pMarkPV=pPV;
}
- BOOL bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
+ sal_Bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0;
if (bMark)
{ // Obj in der ersten gefundenen PageView markieren
MarkObj(pObj,pMarkPV);
@@ -533,7 +533,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po
////////////////////////////////////////////////////////////////////////////////////////////////////
-Bitmap SdrExchangeView::GetMarkedObjBitmap( BOOL bNoVDevIfOneBmpMarked ) const
+Bitmap SdrExchangeView::GetMarkedObjBitmap( sal_Bool bNoVDevIfOneBmpMarked ) const
{
Bitmap aBmp;
@@ -570,7 +570,7 @@ Bitmap SdrExchangeView::GetMarkedObjBitmap( BOOL bNoVDevIfOneBmpMarked ) const
// -----------------------------------------------------------------------------
-GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( BOOL bNoVDevIfOneMtfMarked ) const
+GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( sal_Bool bNoVDevIfOneMtfMarked ) const
{
GDIMetaFile aMtf;
@@ -608,7 +608,7 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( BOOL bNoVDevIfOneMtfMarked )
Size aDummySize( 2, 2 );
aOut.SetOutputSizePixel( aDummySize );
- aOut.EnableOutput( FALSE );
+ aOut.EnableOutput( sal_False );
aOut.SetMapMode( aMap );
aMtf.Clear();
@@ -649,7 +649,7 @@ Graphic SdrExchangeView::GetAllMarkedGraphic() const
if( ( 1 == GetMarkedObjectCount() ) && GetSdrMarkByIndex( 0 ) )
aRet = SdrExchangeView::GetObjGraphic( pMod, GetMarkedObjectByIndex( 0 ) );
else
- aRet = GetMarkedObjMetaFile( FALSE );
+ aRet = GetMarkedObjMetaFile( sal_False );
}
return aRet;
@@ -691,7 +691,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject*
pModel->GetScaleFraction(),
pModel->GetScaleFraction() );
- aOut.EnableOutput( FALSE );
+ aOut.EnableOutput( sal_False );
aOut.SetMapMode( aMap );
aMtf.Record( &aOut );
pObj->SingleObjectPainter( aOut ); // #110094#-17
@@ -725,7 +725,7 @@ void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const
::std::vector< SdrMark* >& rObjVector1 = aObjVectors[ 0 ];
::std::vector< SdrMark* >& rObjVector2 = aObjVectors[ 1 ];
const SdrLayerAdmin& rLayerAdmin = pMod->GetLayerAdmin();
- const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), FALSE );
+ const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False );
sal_uInt32 n, nCount;
for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ )
@@ -759,7 +759,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
// werde ich sie mir wohl kopieren muessen.
SortMarkedObjects();
SdrModel* pNeuMod=pMod->AllocModel();
- SdrPage* pNeuPag=pNeuMod->AllocPage(FALSE);
+ SdrPage* pNeuPag=pNeuMod->AllocPage(sal_False);
pNeuMod->InsertPage(pNeuPag);
if( !mxSelectionController.is() || !mxSelectionController->GetMarkedObjModel( pNeuPag ) )
@@ -768,7 +768,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
::std::vector< SdrMark* >& rObjVector1 = aObjVectors[ 0 ];
::std::vector< SdrMark* >& rObjVector2 = aObjVectors[ 1 ];
const SdrLayerAdmin& rLayerAdmin = pMod->GetLayerAdmin();
- const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), FALSE );
+ const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False );
sal_uInt32 n, nCount, nCloneErrCnt = 0;
for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ )
@@ -857,38 +857,38 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
// -----------------------------------------------------------------------------
-BOOL SdrExchangeView::Cut( ULONG /*nFormat */)
+sal_Bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */)
{
DBG_ERROR( "SdrExchangeView::Cut: Not supported anymore" );
- return FALSE;
+ return sal_False;
}
// -----------------------------------------------------------------------------
-void SdrExchangeView::CutMarked( ULONG /*nFormat */)
+void SdrExchangeView::CutMarked( sal_uIntPtr /*nFormat */)
{
DBG_ERROR( "SdrExchangeView::CutMarked: Not supported anymore" );
}
// -----------------------------------------------------------------------------
-BOOL SdrExchangeView::Yank(ULONG /*nFormat*/)
+sal_Bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/)
{
DBG_ERROR( "SdrExchangeView::Yank: Not supported anymore" );
- return FALSE;
+ return sal_False;
}
// -----------------------------------------------------------------------------
-void SdrExchangeView::YankMarked(ULONG /*nFormat*/)
+void SdrExchangeView::YankMarked(sal_uIntPtr /*nFormat*/)
{
DBG_ERROR( "YankMarked: Not supported anymore" );
}
// -----------------------------------------------------------------------------
-BOOL SdrExchangeView::Paste(Window* /*pWin*/, ULONG /*nFormat*/)
+sal_Bool SdrExchangeView::Paste(Window* /*pWin*/, sal_uIntPtr /*nFormat*/)
{
DBG_ERROR( "SdrExchangeView::Paste: Not supported anymore" );
- return FALSE;
+ return sal_False;
}
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 0f5467c99721..f6540e304bfc 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -399,7 +399,7 @@ void Cell::mergeContent( const CellRef& xSourceCell )
if( xSourceCell->hasText() )
{
SdrOutliner& rOutliner=rTableObj.ImpGetDrawOutliner();
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
if( hasText() )
{
@@ -657,7 +657,7 @@ sal_Int32 Cell::getMinimumHeight()
{
Outliner& rOutliner=rTableObj.ImpGetDrawOutliner();
rOutliner.SetPaperSize(aSize);
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
ForceOutlinerParaObject( OUTLINERMODE_TEXTOBJECT );
if( GetOutlinerParaObject() )
@@ -1417,7 +1417,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
case XATTR_FILLHATCH:
case XATTR_LINEDASH:
{
- NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID);
+ NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID);
if( ( pItem == NULL ) || ( pItem->GetName().Len() == 0) )
eState = PropertyState_DEFAULT_VALUE;
}
@@ -1432,7 +1432,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th
case XATTR_LINESTART:
case XATTR_FILLFLOATTRANSPARENCE:
{
- NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID);
+ NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID);
if( ( pItem == NULL ) )
eState = PropertyState_DEFAULT_VALUE;
}
diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx
index 4b49088be6e2..e979816fcb8d 100644
--- a/svx/source/table/celleditsource.cxx
+++ b/svx/source/table/celleditsource.cxx
@@ -153,7 +153,7 @@ public:
void lock();
void unlock();
- BOOL IsValid() const;
+ sal_Bool IsValid() const;
Rectangle GetVisArea();
Point LogicToPixel( const Point&, const MapMode& rMapMode );
@@ -320,7 +320,7 @@ void CellEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
case HINT_OBJCHG:
{
- mbDataValid = FALSE; // Text muss neu geholt werden
+ mbDataValid = sal_False; // Text muss neu geholt werden
if( HasView() )
{
@@ -353,7 +353,7 @@ void CellEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this, CellEditSourceImpl, NotifyHdl) );
// #104157# Only now we're really in edit mode
- mbShapeIsEditMode = TRUE;
+ mbShapeIsEditMode = sal_True;
Broadcast( *pSdrHint );
}
@@ -367,7 +367,7 @@ void CellEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
Broadcast( *pSdrHint );
// #104157# We're no longer in edit mode
- mbShapeIsEditMode = FALSE;
+ mbShapeIsEditMode = sal_False;
// remove as listener - outliner might outlive ourselves
if( mpView && mpView->GetTextEditOutliner() )
@@ -800,9 +800,9 @@ void CellEditSourceImpl::unlock()
}
}
-BOOL CellEditSourceImpl::IsValid() const
+sal_Bool CellEditSourceImpl::IsValid() const
{
- return mpView && mpWindow ? TRUE : FALSE;
+ return mpView && mpWindow ? sal_True : sal_False;
}
Rectangle CellEditSourceImpl::GetVisArea()
@@ -997,7 +997,7 @@ void CellEditSource::unlock()
//------------------------------------------------------------------------
-BOOL CellEditSource::IsValid() const
+sal_Bool CellEditSource::IsValid() const
{
return mpImpl->IsValid();
}
diff --git a/svx/source/table/celleditsource.hxx b/svx/source/table/celleditsource.hxx
index 561086106fbf..4d5ccbd43e55 100644
--- a/svx/source/table/celleditsource.hxx
+++ b/svx/source/table/celleditsource.hxx
@@ -71,7 +71,7 @@ public:
void unlock();
// the SvxViewForwarder interface
- virtual BOOL IsValid() const;
+ virtual sal_Bool IsValid() const;
virtual Rectangle GetVisArea() const;
virtual Point LogicToPixel( const Point&, const MapMode& ) const;
virtual Point PixelToLogic( const Point&, const MapMode& ) const;
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 7f9250a90561..2ec740fc1974 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -756,7 +756,7 @@ SdrTableObj::SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int
void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows )
{
- bClosedObj = TRUE;
+ bClosedObj = sal_True;
mpImpl = new SdrTableObjImpl;
mpImpl->acquire();
@@ -1351,16 +1351,16 @@ void SdrTableObj::FitFrameToTextSize()
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::IsAutoGrowHeight() const
+int SdrTableObj::IsAutoGrowHeight() const
{
- return TRUE;
+ return sal_True;
}
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::IsAutoGrowWidth() const
+int SdrTableObj::IsAutoGrowWidth() const
{
- return TRUE;
+ return sal_True;
}
// --------------------------------------------------------------------
@@ -1399,34 +1399,34 @@ void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus )
void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
- rInfo.bResizeFreeAllowed=TRUE;
- rInfo.bResizePropAllowed=TRUE;
- rInfo.bRotateFreeAllowed=FALSE;
- rInfo.bRotate90Allowed =FALSE;
- rInfo.bMirrorFreeAllowed=FALSE;
- rInfo.bMirror45Allowed =FALSE;
- rInfo.bMirror90Allowed =FALSE;
+ rInfo.bResizeFreeAllowed=sal_True;
+ rInfo.bResizePropAllowed=sal_True;
+ rInfo.bRotateFreeAllowed=sal_False;
+ rInfo.bRotate90Allowed =sal_False;
+ rInfo.bMirrorFreeAllowed=sal_False;
+ rInfo.bMirror45Allowed =sal_False;
+ rInfo.bMirror90Allowed =sal_False;
// allow transparence
- rInfo.bTransparenceAllowed = TRUE;
+ rInfo.bTransparenceAllowed = sal_True;
// gradient depends on fillstyle
XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue();
rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT);
- rInfo.bShearAllowed =FALSE;
- rInfo.bEdgeRadiusAllowed=FALSE;
- rInfo.bCanConvToPath =FALSE;
- rInfo.bCanConvToPoly =FALSE;
- rInfo.bCanConvToPathLineToArea=FALSE;
- rInfo.bCanConvToPolyLineToArea=FALSE;
- rInfo.bCanConvToContour = FALSE;
+ rInfo.bShearAllowed =sal_False;
+ rInfo.bEdgeRadiusAllowed=sal_False;
+ rInfo.bCanConvToPath =sal_False;
+ rInfo.bCanConvToPoly =sal_False;
+ rInfo.bCanConvToPathLineToArea=sal_False;
+ rInfo.bCanConvToPolyLineToArea=sal_False;
+ rInfo.bCanConvToContour = sal_False;
}
// --------------------------------------------------------------------
-UINT16 SdrTableObj::GetObjIdentifier() const
+sal_uInt16 SdrTableObj::GetObjIdentifier() const
{
- return static_cast<UINT16>(OBJ_TABLE);
+ return static_cast<sal_uInt16>(OBJ_TABLE);
}
// --------------------------------------------------------------------
@@ -1460,7 +1460,7 @@ void SdrTableObj::SetModel(SdrModel* pNewModel)
// --------------------------------------------------------------------
-void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, BOOL bLineWidth ) const
+void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText, Rectangle* pAnchorRect, sal_Bool bLineWidth ) const
{
if( mpImpl )
TakeTextRect( mpImpl->maEditPos, rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth );
@@ -1468,7 +1468,7 @@ void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, FA
// --------------------------------------------------------------------
-void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, FASTBOOL bNoEditText, Rectangle* pAnchorRect, BOOL /*bLineWidth*/ ) const
+void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, int bNoEditText, Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/ ) const
{
if( !mpImpl )
return;
@@ -1483,7 +1483,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
SdrTextVertAdjust eVAdj=xCell->GetTextVerticalAdjust();
// SdrTextHorzAdjust eHAdj=xCell->GetTextHorizontalAdjust();
- ULONG nStat0=rOutliner.GetControlWord();
+ sal_uIntPtr nStat0=rOutliner.GetControlWord();
Size aNullSize;
nStat0 |= EE_CNTRL_AUTOPAGESIZE;
rOutliner.SetControlWord(nStat0);
@@ -1519,7 +1519,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
if( bHitTest ) // #i33696# take back fix #i27510#
rOutliner.SetTextObj( this );
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
rOutliner.SetText(*pPara);
}
}
@@ -1531,7 +1531,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec
if (pEdtOutl && !bNoEditText && pPara && mpImpl->mxActiveCell == xCell )
delete pPara;
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
rOutliner.SetControlWord(nStat0);
Point aTextPos(aAnkRect.TopLeft());
@@ -1750,7 +1750,7 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size*
// --------------------------------------------------------------------
-USHORT SdrTableObj::GetOutlinerViewAnchorMode() const
+sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const
{
EVAnchorMode eRet=ANCHOR_TOP_LEFT;
CellRef xCell( getActiveCell() );
@@ -1807,7 +1807,7 @@ USHORT SdrTableObj::GetOutlinerViewAnchorMode() const
}
*/
}
- return (USHORT)eRet;
+ return (sal_uInt16)eRet;
}
// --------------------------------------------------------------------
@@ -2044,14 +2044,14 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
// ForceOutlinerParaObject();
- mbInEditMode = TRUE;
+ mbInEditMode = sal_True;
rOutl.Init( OUTLINERMODE_TEXTOBJECT );
rOutl.SetRefDevice( pModel->GetRefDevice() );
// --
- FASTBOOL bUpdMerk=rOutl.GetUpdateMode();
- if (bUpdMerk) rOutl.SetUpdateMode(FALSE);
+ int bUpdMerk=rOutl.GetUpdateMode();
+ if (bUpdMerk) rOutl.SetUpdateMode(sal_False);
Size aPaperMin;
Size aPaperMax;
Rectangle aEditArea;
@@ -2061,10 +2061,10 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl)
rOutl.SetMaxAutoPaperSize(aPaperMax);
rOutl.SetPaperSize(aPaperMax);
- if (bUpdMerk) rOutl.SetUpdateMode(TRUE);
+ if (bUpdMerk) rOutl.SetUpdateMode(sal_True);
//---
- ULONG nStat=rOutl.GetControlWord();
+ sal_uIntPtr nStat=rOutl.GetControlWord();
// nStat &= ~EE_CNTRL_AUTOPAGESIZE;
nStat |= EE_CNTRL_AUTOPAGESIZE;
nStat &=~EE_CNTRL_STRETCHING;
@@ -2093,7 +2093,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
OutlinerParaObject* pNewText = 0;
Paragraph* p1stPara = rOutl.GetParagraph( 0 );
- UINT32 nParaAnz = rOutl.GetParagraphCount();
+ sal_uInt32 nParaAnz = rOutl.GetParagraphCount();
if(p1stPara)
{
@@ -2123,11 +2123,11 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl)
pEdtOutl = 0;
rOutl.Clear();
- UINT32 nStat = rOutl.GetControlWord();
+ sal_uInt32 nStat = rOutl.GetControlWord();
nStat &= ~EE_CNTRL_AUTOPAGESIZE;
rOutl.SetControlWord(nStat);
- mbInEditMode = FALSE;
+ mbInEditMode = sal_False;
}
// --------------------------------------------------------------------
@@ -2212,10 +2212,10 @@ void SdrTableObj::NbcResize(const Point& rRef, const Fraction& xFact, const Frac
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt)
+int SdrTableObj::AdjustTextFrameWidthAndHeight(int bHgt, int bWdt)
{
Rectangle aNeuRect(maLogicRect);
- FASTBOOL bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt);
+ int bRet=AdjustTextFrameWidthAndHeight(aNeuRect,bHgt,bWdt);
if (bRet)
{
Rectangle aBoundRect0;
@@ -2232,10 +2232,10 @@ FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(FASTBOOL bHgt, FASTBOOL bWdt
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHeight, FASTBOOL bWidth) const
+int SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, int bHeight, int bWidth) const
{
if((pModel == NULL) || rR.IsEmpty() || !mpImpl || !mpImpl->mxTable.is() )
- return FALSE;
+ return sal_False;
Rectangle aRectangle( rR );
mpImpl->LayoutTable( aRectangle, !bWidth, !bHeight );
@@ -2243,11 +2243,11 @@ FASTBOOL SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, FASTBOOL bHei
if( aRectangle != rR )
{
rR = aRectangle;
- return TRUE;
+ return sal_True;
}
else
{
- return FALSE;
+ return sal_False;
}
}
@@ -2328,9 +2328,9 @@ bool SdrTableObj::IsRealyEdited() const
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::IsFontwork() const
+int SdrTableObj::IsFontwork() const
{
- return FALSE;
+ return sal_False;
}
// --------------------------------------------------------------------
@@ -2439,8 +2439,8 @@ void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const
rHdlList.AddHdl( pH = new SdrHdl(aRect.BottomCenter(),HDL_LOWER) ); pH->SetMoveOutside( true );
rHdlList.AddHdl( pH = new SdrHdl(aRect.BottomRight(),HDL_LWRGT) ); pH->SetMoveOutside( true );
- ULONG nHdlCount = rHdlList.GetHdlCount();
- for( ULONG nHdl = 0; nHdl < nHdlCount; nHdl++ )
+ sal_uIntPtr nHdlCount = rHdlList.GetHdlCount();
+ for( sal_uIntPtr nHdl = 0; nHdl < nHdlCount; nHdl++ )
rHdlList.GetHdl(nHdl)->SetObj((SdrObject*)this);
}
@@ -2599,19 +2599,19 @@ basegfx::B2DPolyPolygon SdrTableObj::getSpecialDragPoly(const SdrDragStat& rDrag
// Create
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::BegCreate(SdrDragStat& rStat)
+int SdrTableObj::BegCreate(SdrDragStat& rStat)
{
rStat.SetOrtho4Possible();
Rectangle aRect1(rStat.GetStart(), rStat.GetNow());
aRect1.Justify();
rStat.SetActionRect(aRect1);
aRect = aRect1;
- return TRUE;
+ return sal_True;
}
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::MovCreate(SdrDragStat& rStat)
+int SdrTableObj::MovCreate(SdrDragStat& rStat)
{
Rectangle aRect1;
rStat.TakeCreateRect(aRect1);
@@ -2619,13 +2619,13 @@ FASTBOOL SdrTableObj::MovCreate(SdrDragStat& rStat)
rStat.SetActionRect(aRect1);
aRect=aRect1; // fuer ObjName
SetBoundRectDirty();
- bSnapRectDirty=TRUE;
- return TRUE;
+ bSnapRectDirty=sal_True;
+ return sal_True;
}
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
+int SdrTableObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
rStat.TakeCreateRect(aRect);
ImpJustifyRect(aRect);
@@ -2638,9 +2638,9 @@ void SdrTableObj::BrkCreate(SdrDragStat& /*rStat*/)
// --------------------------------------------------------------------
-FASTBOOL SdrTableObj::BckCreate(SdrDragStat& /*rStat*/)
+int SdrTableObj::BckCreate(SdrDragStat& /*rStat*/)
{
- return TRUE;
+ return sal_True;
}
// --------------------------------------------------------------------
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index a4ba47047efe..9452420901a7 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -400,7 +400,7 @@ void SvxTableController::GetState( SfxItemSet& rSet )
// Iterate over all requested items in the set.
SfxWhichIter aIter( rSet );
- USHORT nWhich = aIter.FirstWhich();
+ sal_uInt16 nWhich = aIter.FirstWhich();
while (nWhich)
{
switch (nWhich)
@@ -418,7 +418,7 @@ void SvxTableController::GetState( SfxItemSet& rSet )
if( !pSet )
{
pSet = new SfxItemSet( mxTableObj->GetModel()->GetItemPool() );
- MergeAttrFromSelectedCells(*pSet, FALSE);
+ MergeAttrFromSelectedCells(*pSet, sal_False);
}
SdrTextVertAdjust eAdj = SDRTEXTVERTADJUST_BLOCK;
@@ -504,11 +504,11 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
if( pArgs )
{
const SfxPoolItem* pItem = 0;
- pArgs->GetItemState(nSId, FALSE, &pItem);
+ pArgs->GetItemState(nSId, sal_False, &pItem);
if (pItem)
{
nCount = ((const SfxInt16Item* )pItem)->GetValue();
- if(SFX_ITEM_SET == pArgs->GetItemState(SID_TABLE_PARAM_INSERT_AFTER, TRUE, &pItem))
+ if(SFX_ITEM_SET == pArgs->GetItemState(SID_TABLE_PARAM_INSERT_AFTER, sal_True, &pItem))
bInsertAfter = ((const SfxBoolItem* )pItem)->GetValue();
}
}
@@ -722,14 +722,14 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
if( !pArgs && pTableObj->GetModel() )
{
SfxItemSet aNewAttr( pTableObj->GetModel()->GetItemPool() );
- MergeAttrFromSelectedCells(aNewAttr, FALSE);
+ MergeAttrFromSelectedCells(aNewAttr, sal_False);
// merge drawing layer text distance items into SvxBoxItem used by the dialog
SvxBoxItem aBoxItem( static_cast< const SvxBoxItem& >( aNewAttr.Get( SDRATTR_TABLE_BORDER ) ) );
- aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextLeftDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LEFTDIST))).GetValue()), BOX_LINE_LEFT );
- aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextRightDistItem&)(aNewAttr.Get(SDRATTR_TEXT_RIGHTDIST))).GetValue()), BOX_LINE_RIGHT );
- aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextUpperDistItem&)(aNewAttr.Get(SDRATTR_TEXT_UPPERDIST))).GetValue()), BOX_LINE_TOP );
- aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextLowerDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LOWERDIST))).GetValue()), BOX_LINE_BOTTOM );
+ aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextLeftDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LEFTDIST))).GetValue()), BOX_LINE_LEFT );
+ aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextRightDistItem&)(aNewAttr.Get(SDRATTR_TEXT_RIGHTDIST))).GetValue()), BOX_LINE_RIGHT );
+ aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextUpperDistItem&)(aNewAttr.Get(SDRATTR_TEXT_UPPERDIST))).GetValue()), BOX_LINE_TOP );
+ aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextLowerDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LOWERDIST))).GetValue()), BOX_LINE_BOTTOM );
aNewAttr.Put( aBoxItem );
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
@@ -752,7 +752,7 @@ void SvxTableController::onFormatTable( SfxRequest& rReq )
if( aNewBoxItem.GetDistance( BOX_LINE_BOTTOM ) != aBoxItem.GetDistance( BOX_LINE_BOTTOM ) )
aNewSet.Put(SdrTextLowerDistItem( aNewBoxItem.GetDistance( BOX_LINE_BOTTOM ) ) );
- SetAttrToSelectedCells(aNewSet, FALSE);
+ SetAttrToSelectedCells(aNewSet, sal_False);
}
UpdateTableShape();
}
@@ -843,7 +843,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() );
SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0;
- if( !pTableObj || !pModel || !pArgs || (SFX_ITEM_SET != pArgs->GetItemState(SID_TABLE_STYLE, FALSE)) )
+ if( !pTableObj || !pModel || !pArgs || (SFX_ITEM_SET != pArgs->GetItemState(SID_TABLE_STYLE, sal_False)) )
return;
const SfxStringItem* pArg = dynamic_cast< const SfxStringItem* >( &pArgs->Get( SID_TABLE_STYLE ) );
@@ -882,7 +882,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs )
bool bChanges = false;
const SfxItemSet& rStyleAttribs = xCell->GetStyleSheet()->GetItemSet();
- for ( USHORT nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ )
+ for ( sal_uInt16 nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ )
{
if( (rStyleAttribs.GetItemState( nWhich ) == SFX_ITEM_ON) && (aSet.GetItemState( nWhich ) == SFX_ITEM_ON) )
{
@@ -930,22 +930,22 @@ void SvxTableController::SetTableStyleSettings( const SfxItemSet* pArgs )
const SfxPoolItem *pPoolItem=NULL;
- if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTROWSTYLE, FALSE,&pPoolItem)) )
+ if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTROWSTYLE, sal_False,&pPoolItem)) )
aSettings.mbUseFirstRow = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
- if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTROWSTYLE, FALSE,&pPoolItem)) )
+ if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTROWSTYLE, sal_False,&pPoolItem)) )
aSettings.mbUseLastRow = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
- if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGROWSTYLE, FALSE,&pPoolItem)) )
+ if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGROWSTYLE, sal_False,&pPoolItem)) )
aSettings.mbUseRowBanding = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
- if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTCOLUMNSTYLE, FALSE,&pPoolItem)) )
+ if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTCOLUMNSTYLE, sal_False,&pPoolItem)) )
aSettings.mbUseFirstColumn = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
- if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTCOLUMNSTYLE, FALSE,&pPoolItem)) )
+ if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTCOLUMNSTYLE, sal_False,&pPoolItem)) )
aSettings.mbUseLastColumn = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
- if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGCOLUMNSTYLE, FALSE,&pPoolItem)) )
+ if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGCOLUMNSTYLE, sal_False,&pPoolItem)) )
aSettings.mbUseColumnBanding = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue();
if( aSettings == pTableObj->getTableStyleSettings() )
@@ -1677,7 +1677,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const
if(!pTableObj->GetOutlinerParaObject() && mpView->GetTextEditOutliner())
{
::Outliner* pOutl = mpView->GetTextEditOutliner();
- ULONG nParaAnz = pOutl->GetParagraphCount();
+ sal_uIntPtr nParaAnz = pOutl->GetParagraphCount();
Paragraph* p1stPara = pOutl->GetParagraph( 0 );
if(nParaAnz==1 && p1stPara)
@@ -1703,7 +1703,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const
// create new outliner, owner will be the SdrObjEditView
SdrOutliner* pOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpModel );
if( pTableObj->IsVerticalWriting() )
- pOutl->SetVertical( TRUE );
+ pOutl->SetVertical( sal_True );
if(mpView->SdrBeginTextEdit(pTableObj, pPV, pWindow, sal_True, pOutl))
{
@@ -2020,15 +2020,15 @@ void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnl
{
if(!bOnlyHardAttr)
{
- if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE))
+ if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False))
rAttr.InvalidateItem(nWhich);
else
- rAttr.MergeValue(rSet.Get(nWhich), TRUE);
+ rAttr.MergeValue(rSet.Get(nWhich), sal_True);
}
- else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE))
+ else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False))
{
const SfxPoolItem& rItem = rSet.Get(nWhich);
- rAttr.MergeValue(rItem, TRUE);
+ rAttr.MergeValue(rItem, sal_True);
}
nWhich = aIter.NextWhich();
@@ -2057,7 +2057,7 @@ const sal_uInt16 CELL_LOWER = 0x0080;
// --------------------------------------------------------------------
-static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine* pNew, USHORT nLine )
+static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine* pNew, sal_uInt16 nLine )
{
if( pNew )
{
@@ -2126,14 +2126,14 @@ static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem,
// apply distance to borders
if( pBoxInfoItem->IsValid( VALID_DISTANCE ) )
- for( USHORT nLine = 0; nLine < 4; ++nLine )
+ for( sal_uInt16 nLine = 0; nLine < 4; ++nLine )
rNewFrame.SetDistance( pBoxItem->GetDistance( nLine ), nLine );
}
}
// --------------------------------------------------------------------
-static void ImplSetLineColor( SvxBoxItem& rNewFrame, USHORT nLine, const Color& rColor )
+static void ImplSetLineColor( SvxBoxItem& rNewFrame, sal_uInt16 nLine, const Color& rColor )
{
const SvxBorderLine* pSourceLine = rNewFrame.GetLine( nLine );
if( pSourceLine )
@@ -2220,19 +2220,19 @@ void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr )
if( nRowCount && nColCount )
{
const SvxBoxItem* pBoxItem = 0;
- if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER, FALSE) )
+ if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER, sal_False) )
pBoxItem = dynamic_cast< const SvxBoxItem* >( &rAttr.Get( SDRATTR_TABLE_BORDER ) );
const SvxBoxInfoItem* pBoxInfoItem = 0;
- if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER_INNER, FALSE) )
+ if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER_INNER, sal_False) )
pBoxInfoItem = dynamic_cast< const SvxBoxInfoItem* >( &rAttr.Get( SDRATTR_TABLE_BORDER_INNER ) );
const SvxColorItem* pLineColorItem = 0;
- if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINECOLOR, FALSE) )
+ if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINECOLOR, sal_False) )
pLineColorItem = dynamic_cast< const SvxColorItem* >( &rAttr.Get( SID_FRAME_LINECOLOR ) );
const SvxBorderLine* pBorderLineItem = 0;
- if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINESTYLE, FALSE) )
+ if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINESTYLE, sal_False) )
pBorderLineItem = ((const SvxLineItem&)rAttr.Get( SID_FRAME_LINESTYLE )).GetLine();
if( pBoxInfoItem && !pBoxItem )
@@ -2327,7 +2327,7 @@ void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bR
getSelectedCells( aStart, aEnd );
SfxItemSet aAttr(*rAttr.GetPool(), rAttr.GetRanges());
- aAttr.Put(rAttr, TRUE);
+ aAttr.Put(rAttr, sal_True);
const bool bFrame = (rAttr.GetItemState( SDRATTR_TABLE_BORDER ) == SFX_ITEM_SET) || (rAttr.GetItemState( SDRATTR_TABLE_BORDER_INNER ) == SFX_ITEM_SET);
@@ -2381,8 +2381,8 @@ bool SvxTableController::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAtt
if(pTextEditOutlinerView)
{
// FALSE= InvalidItems nicht al Default, sondern als "Loecher" betrachten
- rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), FALSE);
- rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), FALSE );
+ rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False);
+ rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), sal_False );
}
}
@@ -2534,7 +2534,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo
getSelectedCells( aStart, aEnd );
SfxItemSet aAttr(*rFormatSet.GetPool(), rFormatSet.GetRanges());
- aAttr.Put(rFormatSet, TRUE);
+ aAttr.Put(rFormatSet, sal_True);
const bool bFrame = (rFormatSet.GetItemState( SDRATTR_TABLE_BORDER ) == SFX_ITEM_SET) || (rFormatSet.GetItemState( SDRATTR_TABLE_BORDER_INNER ) == SFX_ITEM_SET);
@@ -2544,7 +2544,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo
aAttr.ClearItem( SDRATTR_TABLE_BORDER_INNER );
}
- const USHORT* pRanges = rFormatSet.GetRanges();
+ const sal_uInt16* pRanges = rFormatSet.GetRanges();
bool bTextOnly = true;
while( *pRanges )
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 7f855752dcf2..643251100cbd 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -927,8 +927,8 @@ bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine
if (!pOther || (pOther == &gEmptyBorder))
return true;
- USHORT nThisSize = pThis->GetOutWidth() + pThis->GetDistance() + pThis->GetInWidth();
- USHORT nOtherSize = pOther->GetOutWidth() + pOther->GetDistance() + pOther->GetInWidth();
+ sal_uInt16 nThisSize = pThis->GetOutWidth() + pThis->GetDistance() + pThis->GetInWidth();
+ sal_uInt16 nOtherSize = pOther->GetOutWidth() + pOther->GetDistance() + pOther->GetInWidth();
if (nThisSize > nOtherSize)
return true;
diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx
index 359089444210..530732796c05 100644
--- a/svx/source/table/tablertfimporter.cxx
+++ b/svx/source/table/tablertfimporter.cxx
@@ -62,7 +62,7 @@ struct RTFCellDefault
{
SfxItemSet maItemSet;
sal_Int32 mnCol;
- USHORT mnTwips; // right border of the cell
+ sal_uInt16 mnTwips; // right border of the cell
sal_Int32 mnColSpan; // MergeCell if >1, merged cells if 0
RTFCellDefault( SfxItemPool* pPool ) : maItemSet( *pPool ), mnCol(0), mnTwips(0 ), mnColSpan(1) {}
@@ -119,7 +119,7 @@ private:
sal_Int32 mnLastWidth;
bool mbNewDef;
- USHORT mnStartPara;
+ sal_uInt16 mnStartPara;
sal_Int32 mnColCnt;
sal_Int32 mnRowCnt;
@@ -151,7 +151,7 @@ SdrTableRTFParser::SdrTableRTFParser( SdrTableObj& rTableObj )
, mpDefMerge( 0 )
, mxTable( rTableObj.getTable() )
{
- mpOutliner->SetUpdateMode(TRUE);
+ mpOutliner->SetUpdateMode(sal_True);
mpOutliner->SetStyleSheet( 0, mrTableObj.GetStyleSheet() );
mpInsDefault = new RTFCellDefault( &mrItemPool );
}
@@ -282,16 +282,16 @@ void SdrTableRTFParser::FillTable()
if( xCell.is() && xCellInfo.get() )
{
const SfxPoolItem *pPoolItem = 0;
- if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,FALSE,&pPoolItem)==SFX_ITEM_SET)
+ if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,sal_False,&pPoolItem)==SFX_ITEM_SET)
xCell->SetMergedItem( *pPoolItem );
String sDebug = mpOutliner->GetText( mpOutliner->GetParagraph( xCellInfo->mnStartPara ), xCellInfo->mnParaCount );
- OutlinerParaObject* pTextObject = mpOutliner->CreateParaObject( (USHORT)xCellInfo->mnStartPara, (USHORT)xCellInfo->mnParaCount );
+ OutlinerParaObject* pTextObject = mpOutliner->CreateParaObject( (sal_uInt16)xCellInfo->mnStartPara, (sal_uInt16)xCellInfo->mnParaCount );
if( pTextObject )
{
SdrOutliner& rOutliner=mrTableObj.ImpGetDrawOutliner();
- rOutliner.SetUpdateMode(TRUE);
+ rOutliner.SetUpdateMode(sal_True);
rOutliner.SetText( *pTextObject );
mrTableObj.NbcSetOutlinerParaObjectForText( rOutliner.CreateParaObject(), xCell.get() );
delete pTextObject;
@@ -316,7 +316,7 @@ void SdrTableRTFParser::NewCellRow()
{
if( mbNewDef )
{
- mbNewDef = FALSE;
+ mbNewDef = sal_False;
maRows.push_back( RTFColumnVectorPtr( new RTFColumnVector() ) );
}
@@ -373,7 +373,7 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo )
break;
case RTF_CELLX: // closes cell default
{
- mbNewDef = TRUE;
+ mbNewDef = sal_True;
mpInsDefault->mnCol = mnColCnt;
maDefaultList.push_back( boost::shared_ptr< RTFCellDefault >( mpInsDefault ) );
@@ -427,10 +427,10 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo )
switch ( pInfo->nToken & ~(0xff | RTF_TABLEDEF) )
{
case RTF_SHADINGDEF:
-// ((SvxRTFParser*)pInfo->pParser)->ReadBackgroundAttr(pInfo->nToken, mpInsDefault->maItemSet, TRUE );
+// ((SvxRTFParser*)pInfo->pParser)->ReadBackgroundAttr(pInfo->nToken, mpInsDefault->maItemSet, sal_True );
break;
case RTF_BRDRDEF:
- ((SvxRTFParser*)pInfo->pParser)->ReadBorderAttr(pInfo->nToken, mpInsDefault->maItemSet, TRUE );
+ ((SvxRTFParser*)pInfo->pParser)->ReadBorderAttr(pInfo->nToken, mpInsDefault->maItemSet, sal_True );
break;
}
}
diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx
index 8bf00c4b0d98..2e5fee9382d6 100644
--- a/svx/source/table/tableundo.hxx
+++ b/svx/source/table/tableundo.hxx
@@ -55,7 +55,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual BOOL Merge( SfxUndoAction *pNextAction );
+ virtual sal_Bool Merge( SfxUndoAction *pNextAction );
void dispose();
virtual void ObjectInDestruction(const SdrObject& rObject);
@@ -172,7 +172,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual BOOL Merge( SfxUndoAction *pNextAction );
+ virtual sal_Bool Merge( SfxUndoAction *pNextAction );
private:
struct Data
@@ -204,7 +204,7 @@ public:
virtual void Undo();
virtual void Redo();
- virtual BOOL Merge( SfxUndoAction *pNextAction );
+ virtual sal_Bool Merge( SfxUndoAction *pNextAction );
private:
struct Data
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index 6475ec5fc1a5..726d0810aab2 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -18,7 +18,7 @@ class SvxColorWindow_Impl : public SfxPopupWindow
using FloatingWindow::StateChanged;
private:
- const USHORT theSlotId;
+ const sal_uInt16 theSlotId;
ValueSet aColorSet;
rtl::OUString maCommand;
@@ -28,11 +28,11 @@ private:
protected:
virtual void Resize();
- virtual BOOL Close();
+ virtual sal_Bool Close();
public:
SvxColorWindow_Impl( const rtl::OUString& rCommand,
- USHORT nSlotId,
+ sal_uInt16 nSlotId,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
const String& rWndTitle,
Window* pParentWindow );
@@ -40,7 +40,7 @@ public:
void StartSelection();
virtual void KeyInput( const KeyEvent& rKEvt );
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
virtual SfxPopupWindow* Clone() const;
};
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 260a2e2e646c..b712bcfe04d2 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -111,7 +111,7 @@ sal_Bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*,
SvxColorValueSet::SvxColorValueSet( Window* _pParent, WinBits nWinStyle ) :
ValueSet( _pParent, nWinStyle ),
DragSourceHelper( this ),
- bLeft (TRUE)
+ bLeft (sal_True)
{
}
@@ -124,7 +124,7 @@ SvxColorValueSet::SvxColorValueSet( Window* _pParent, WinBits nWinStyle ) :
SvxColorValueSet::SvxColorValueSet( Window* _pParent, const ResId& rResId ) :
ValueSet( _pParent, rResId ),
DragSourceHelper( this ),
- bLeft (TRUE)
+ bLeft (sal_True)
{
}
@@ -139,12 +139,12 @@ void SvxColorValueSet::MouseButtonDown( const MouseEvent& rMEvt )
// Fuer Mac noch anders handlen !
if( rMEvt.IsLeft() )
{
- bLeft = TRUE;
+ bLeft = sal_True;
ValueSet::MouseButtonDown( rMEvt );
}
else
{
- bLeft = FALSE;
+ bLeft = sal_False;
MouseEvent aMEvt( rMEvt.GetPosPixel(),
rMEvt.GetClicks(),
rMEvt.GetMode(),
@@ -167,12 +167,12 @@ void SvxColorValueSet::MouseButtonUp( const MouseEvent& rMEvt )
// Fuer Mac noch anders handlen !
if( rMEvt.IsLeft() )
{
- bLeft = TRUE;
+ bLeft = sal_True;
ValueSet::MouseButtonUp( rMEvt );
}
else
{
- bLeft = FALSE;
+ bLeft = sal_False;
MouseEvent aMEvt( rMEvt.GetPosPixel(),
rMEvt.GetClicks(),
rMEvt.GetMode(),
@@ -215,7 +215,7 @@ void SvxColorValueSet::StartDrag( sal_Int8 , const Point& )
void SvxColorValueSet::DoDrag()
{
SfxObjectShell* pDocSh = SfxObjectShell::Current();
- USHORT nItemId = GetItemId( aDragPosPixel );
+ sal_uInt16 nItemId = GetItemId( aDragPosPixel );
if( pDocSh && nItemId )
{
@@ -252,7 +252,7 @@ IMPL_STATIC_LINK(SvxColorValueSet, ExecDragHdl, void*, EMPTYARG)
\************************************************************************/
SvxColorChildWindow::SvxColorChildWindow( Window* _pParent,
- USHORT nId,
+ sal_uInt16 nId,
SfxBindings* pBindings,
SfxChildWinInfo* pInfo ) :
SfxChildWindow( _pParent, nId )
@@ -333,7 +333,7 @@ SvxColorDockingWindow::SvxColorDockingWindow
SetSize();
aColorSet.Show();
- StartListening( *_pBindings, TRUE );
+ StartListening( *_pBindings, sal_True );
}
@@ -390,7 +390,7 @@ void SvxColorDockingWindow::FillValueSet()
Bitmap aBmp( aVD.GetBitmap( Point(), aColorSize ) );
- aColorSet.InsertItem( (USHORT)1, Image(aBmp), SVX_RESSTR( RID_SVXSTR_INVISIBLE ) );
+ aColorSet.InsertItem( (sal_uInt16)1, Image(aBmp), SVX_RESSTR( RID_SVXSTR_INVISIBLE ) );
XColorEntry* pEntry;
nCount = pColorTable->Count();
@@ -398,7 +398,7 @@ void SvxColorDockingWindow::FillValueSet()
for( long i = 0; i < nCount; i++ )
{
pEntry = pColorTable->GetColor( i );
- aColorSet.InsertItem( (USHORT)i+2,
+ aColorSet.InsertItem( (sal_uInt16)i+2,
pEntry->GetColor(), pEntry->GetName() );
}
}
@@ -418,8 +418,8 @@ void SvxColorDockingWindow::SetSize()
aSize.Height() -= 4;
// Zeilen und Spalten berechnen
- nCols = (USHORT) ( aSize.Width() / aItemSize.Width() );
- nLines = (USHORT) ( (float) aSize.Height() / (float) aItemSize.Height() /*+ 0.35*/ );
+ nCols = (sal_uInt16) ( aSize.Width() / aItemSize.Width() );
+ nLines = (sal_uInt16) ( (float) aSize.Height() / (float) aItemSize.Height() /*+ 0.35*/ );
if( nLines == 0 )
nLines++;
@@ -436,7 +436,7 @@ void SvxColorDockingWindow::SetSize()
if( nScrollWidth > 0 )
{
// Spalten mit ScrollBar berechnen
- nCols = (USHORT) ( ( aSize.Width() - nScrollWidth ) / aItemSize.Width() );
+ nCols = (sal_uInt16) ( ( aSize.Width() - nScrollWidth ) / aItemSize.Width() );
}
aColorSet.SetColCount( nCols );
@@ -457,13 +457,13 @@ void SvxColorDockingWindow::SetSize()
|*
\************************************************************************/
-BOOL SvxColorDockingWindow::Close()
+sal_Bool SvxColorDockingWindow::Close()
{
- SfxBoolItem aItem( SID_COLOR_CONTROL, FALSE );
+ SfxBoolItem aItem( SID_COLOR_CONTROL, sal_False );
GetBindings().GetDispatcher()->Execute(
SID_COLOR_CONTROL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
SfxDockingWindow::Close();
- return( TRUE );
+ return( sal_True );
}
/*************************************************************************
@@ -475,7 +475,7 @@ BOOL SvxColorDockingWindow::Close()
IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG )
{
SfxDispatcher* pDispatcher = GetBindings().GetDispatcher();
- USHORT nPos = aColorSet.GetSelectItemId();
+ sal_uInt16 nPos = aColorSet.GetSelectItemId();
Color aColor( aColorSet.GetItemColor( nPos ) );
String aStr( aColorSet.GetItemText( nPos ) );
@@ -490,7 +490,7 @@ IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG )
}
else
{
- BOOL bDone = FALSE;
+ sal_Bool bDone = sal_False;
// Wenn wir eine DrawView haben und uns im TextEdit-Modus befinden,
// wird nicht die Flaechen-, sondern die Textfarbe zugewiesen
@@ -503,7 +503,7 @@ IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG )
SvxColorItem aTextColorItem( aColor, SID_ATTR_CHAR_COLOR );
pDispatcher->Execute(
SID_ATTR_CHAR_COLOR, SFX_CALLMODE_RECORD, &aTextColorItem, 0L );
- bDone = TRUE;
+ bDone = sal_True;
}
}
if ( !bDone )
@@ -581,8 +581,8 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize )
rNewSize.Height() -= 4;
// Spalten und Reihen ermitteln
- nCols = (USHORT) ( (float) rNewSize.Width() / (float) aItemSize.Width() + 0.5 );
- nLines = (USHORT) ( (float) rNewSize.Height() / (float) aItemSize.Height() + 0.5 );
+ nCols = (sal_uInt16) ( (float) rNewSize.Width() / (float) aItemSize.Width() + 0.5 );
+ nLines = (sal_uInt16) ( (float) rNewSize.Height() / (float) aItemSize.Height() + 0.5 );
if( nLines == 0 )
nLines = 1;
@@ -599,7 +599,7 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize )
if( nScrollWidth > 0 )
{
// Spalten mit ScrollBar berechnen
- nCols = (USHORT) ( ( ( (float) rNewSize.Width() - (float) nScrollWidth ) )
+ nCols = (sal_uInt16) ( ( ( (float) rNewSize.Width() - (float) nScrollWidth ) )
/ (float) aItemSize.Width() + 0.5 );
}
if( nCols <= 1 )
@@ -610,7 +610,7 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize )
if( nCount % nCols )
nMaxLines++;
- nLines = sal::static_int_cast< USHORT >(
+ nLines = sal::static_int_cast< sal_uInt16 >(
std::min< long >( nLines, nMaxLines ) );
// Groesse des Windows setzen
@@ -647,7 +647,7 @@ long SvxColorDockingWindow::Notify( NotifyEvent& rNEvt )
if( ( rNEvt.GetType() == EVENT_KEYINPUT ) )
{
KeyEvent aKeyEvt = *rNEvt.GetKeyEvent();
- USHORT nKeyCode = aKeyEvt.GetKeyCode().GetCode();
+ sal_uInt16 nKeyCode = aKeyEvt.GetKeyCode().GetCode();
switch( nKeyCode )
{
case KEY_ESCAPE:
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index e5bc5045c7b3..fb68c8768d49 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -98,7 +98,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rCon
{
SetHelpId( HID_MENU_EXTRUSION_DIRECTION );
- USHORT i;
+ sal_uInt16 i;
for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
{
maImgDirection[i] = Image( SVX_RES( IMG_DIRECTION + i ) );
@@ -111,7 +111,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( svt::ToolboxController& rCon
mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) );
mpDirectionSet->SetColCount( 3 );
- mpDirectionSet->EnableFullItemMode( FALSE );
+ mpDirectionSet->EnableFullItemMode( sal_False );
bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
@@ -144,7 +144,7 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
- for( USHORT i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
+ for( sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; i++ )
{
mpDirectionSet->SetItemImage( i+1, bHighContrast ? maImgDirectionH[ i ] : maImgDirection[ i ] );
}
@@ -160,7 +160,7 @@ void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled
{
if( mpDirectionSet )
{
- USHORT nItemId;
+ sal_uInt16 nItemId;
for( nItemId = DIRECTION_NW; nItemId <= DIRECTION_SE; nItemId++ )
{
if( gSkewList[nItemId] == nSkew )
@@ -406,7 +406,7 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth )
void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit )
{
meUnit = eUnit;
- USHORT nResource = IsMetric( eUnit ) ? RID_SVXSTR_DEPTH_0 : RID_SVXSTR_DEPTH_0_INCH;
+ sal_uInt16 nResource = IsMetric( eUnit ) ? RID_SVXSTR_DEPTH_0 : RID_SVXSTR_DEPTH_0_INCH;
for( int i = 0; i < 5; i++ )
{
@@ -594,7 +594,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr
, msExtrusionLightingDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingDirection" ))
, msExtrusionLightingIntensity( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingIntensity" ))
{
- USHORT i;
+ sal_uInt16 i;
for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ )
{
if( i != FROM_FRONT )
@@ -616,7 +616,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr
mpLightingSet->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) );
mpLightingSet->SetColCount( 3 );
- mpLightingSet->EnableFullItemMode( FALSE );
+ mpLightingSet->EnableFullItemMode( sal_False );
bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
@@ -673,7 +673,7 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
if( !bEnabled )
nDirection = FROM_FRONT;
- USHORT nItemId;
+ sal_uInt16 nItemId;
for( nItemId = FROM_TOP_LEFT; nItemId <= FROM_BOTTOM_RIGHT; nItemId++ )
{
if( nItemId == FROM_FRONT )
@@ -684,11 +684,11 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled )
{
if( bHighContrast )
{
- mpLightingSet->SetItemImage( nItemId + 1, (USHORT)nDirection == nItemId ? maImgLightingOnh[nItemId] : maImgLightingOffh[nItemId] );
+ mpLightingSet->SetItemImage( nItemId + 1, (sal_uInt16)nDirection == nItemId ? maImgLightingOnh[nItemId] : maImgLightingOffh[nItemId] );
}
else
{
- mpLightingSet->SetItemImage( nItemId + 1, (USHORT)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId] );
+ mpLightingSet->SetItemImage( nItemId + 1, (sal_uInt16)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId] );
}
}
}
@@ -990,7 +990,7 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames(
SFX_IMPL_TOOLBOX_CONTROL( ExtrusionColorControl, SvxColorItem );
ExtrusionColorControl::ExtrusionColorControl(
- USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+ sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
: SfxToolBoxControl ( nSlotId, nId, rTbx )
{
rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
@@ -1029,9 +1029,9 @@ SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow()
// -----------------------------------------------------------------------
-void ExtrusionColorControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void ExtrusionColorControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
if( nSID == SID_EXTRUSION_3D_COLOR )
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index 5b740dbef004..1fffd4fbec60 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -66,7 +66,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxFillToolBoxControl, XFillStyleItem );
|*
\************************************************************************/
-SvxFillToolBoxControl::SvxFillToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
pStyleItem ( NULL ),
@@ -77,8 +77,8 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( USHORT nSlotId, USHORT nId, ToolBo
pFillControl ( NULL ),
pFillTypeLB ( NULL ),
pFillAttrLB ( NULL ),
- bUpdate ( FALSE ),
- bIgnoreStatusUpdate( FALSE ),
+ bUpdate ( sal_False ),
+ bIgnoreStatusUpdate( sal_False ),
eLastXFS ( XFILL_NONE )
{
addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillColor" )));
@@ -106,10 +106,10 @@ SvxFillToolBoxControl::~SvxFillToolBoxControl()
void SvxFillToolBoxControl::StateChanged(
- USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
- FASTBOOL bEnableControls = FALSE;
+ int bEnableControls = sal_False;
if ( bIgnoreStatusUpdate )
return;
@@ -135,11 +135,11 @@ void SvxFillToolBoxControl::StateChanged(
pFillTypeLB->Enable();
eLastXFS = pFillTypeLB->GetSelectEntryPos();
- bUpdate = TRUE;
+ bUpdate = sal_True;
XFillStyle eXFS = (XFillStyle)pStyleItem->GetValue();
pFillTypeLB->SelectEntryPos(
- sal::static_int_cast< USHORT >( eXFS ) );
+ sal::static_int_cast< sal_uInt16 >( eXFS ) );
pFillAttrLB->Enable();
}
else if( pStyleItem )
@@ -152,7 +152,7 @@ void SvxFillToolBoxControl::StateChanged(
pColorItem = (XFillColorItem*) pState->Clone();
if( eXFS == XFILL_SOLID )
- bEnableControls = TRUE;
+ bEnableControls = sal_True;
}
else if( nSID == SID_ATTR_FILL_GRADIENT )
{
@@ -160,7 +160,7 @@ void SvxFillToolBoxControl::StateChanged(
pGradientItem = (XFillGradientItem*) pState->Clone();
if( eXFS == XFILL_GRADIENT )
- bEnableControls = TRUE;
+ bEnableControls = sal_True;
}
else if( nSID == SID_ATTR_FILL_HATCH )
{
@@ -168,7 +168,7 @@ void SvxFillToolBoxControl::StateChanged(
pHatchItem = (XFillHatchItem*) pState->Clone();
if( eXFS == XFILL_HATCH )
- bEnableControls = TRUE;
+ bEnableControls = sal_True;
}
else if( nSID == SID_ATTR_FILL_BITMAP )
{
@@ -176,7 +176,7 @@ void SvxFillToolBoxControl::StateChanged(
pBitmapItem = (XFillBitmapItem*) pState->Clone();
if( eXFS == XFILL_BITMAP )
- bEnableControls = TRUE;
+ bEnableControls = sal_True;
}
}
if( bEnableControls )
@@ -184,7 +184,7 @@ void SvxFillToolBoxControl::StateChanged(
//pFillTypeLB->Enable();
pFillAttrLB->Enable();
- bUpdate = TRUE;
+ bUpdate = sal_True;
}
Update( pState );
@@ -197,7 +197,7 @@ void SvxFillToolBoxControl::StateChanged(
pFillTypeLB->SetNoSelection();
pFillAttrLB->Disable();
pFillAttrLB->SetNoSelection();
- bUpdate = FALSE;
+ bUpdate = sal_False;
}
else
{
@@ -211,7 +211,7 @@ void SvxFillToolBoxControl::StateChanged(
( nSID == SID_ATTR_FILL_BITMAP && eXFS == XFILL_BITMAP ) )
{
pFillAttrLB->SetNoSelection();
- //bUpdate = FALSE;
+ //bUpdate = sal_False;
}
}
}
@@ -231,7 +231,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
{
if ( pStyleItem && pState && bUpdate )
{
- bUpdate = FALSE;
+ bUpdate = sal_False;
XFillStyle eXFS = (XFillStyle)pStyleItem->GetValue();
@@ -265,7 +265,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
LISTBOX_ENTRY_NOTFOUND ||
pFillAttrLB->GetSelectEntryColor() != aColor )
{
- USHORT nCount = pFillAttrLB->GetEntryCount();
+ sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
String aTmpStr;
if( nCount > 0 )
{
@@ -281,9 +281,9 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
aTmpStr += aString;
aTmpStr += TMP_STR_END;
- //pFillAttrLB->SetUpdateMode( FALSE );
- USHORT nPos = pFillAttrLB->InsertEntry( aColor, aTmpStr );
- //pFillAttrLB->SetUpdateMode( TRUE );
+ //pFillAttrLB->SetUpdateMode( sal_False );
+ sal_uInt16 nPos = pFillAttrLB->InsertEntry( aColor, aTmpStr );
+ //pFillAttrLB->SetUpdateMode( sal_True );
pFillAttrLB->SelectEntryPos( nPos );
}
// NEU
@@ -303,7 +303,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
// Pruefen, ob Eintrag nicht in der Liste ist
if( pFillAttrLB->GetSelectEntry() != aString )
{
- USHORT nCount = pFillAttrLB->GetEntryCount();
+ sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
String aTmpStr;
if( nCount > 0 )
{
@@ -323,7 +323,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
String aEmptyString = String();
XGradientList aGradientList( aEmptyString );
aGradientList.Insert( pEntry );
- aGradientList.SetDirty( FALSE );
+ aGradientList.SetDirty( sal_False );
Bitmap* pBmp = aGradientList.CreateBitmapForUI( 0 );
if( pBmp )
@@ -353,7 +353,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
// Pruefen, ob Eintrag nicht in der Liste ist
if( pFillAttrLB->GetSelectEntry() != aString )
{
- USHORT nCount = pFillAttrLB->GetEntryCount();
+ sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
String aTmpStr;
if( nCount > 0 )
{
@@ -373,7 +373,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
String aEmptyString = String();
XHatchList aHatchList( aEmptyString );
aHatchList.Insert( pEntry );
- aHatchList.SetDirty( FALSE );
+ aHatchList.SetDirty( sal_False );
Bitmap* pBmp = aHatchList.CreateBitmapForUI( 0 );
if( pBmp )
@@ -410,7 +410,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
// Pruefen, ob Eintrag nicht in der Liste ist
if( pFillAttrLB->GetSelectEntry() != aString )
{
- USHORT nCount = pFillAttrLB->GetEntryCount();
+ sal_uInt16 nCount = pFillAttrLB->GetEntryCount();
String aTmpStr;
if( nCount > 0 )
{
@@ -429,7 +429,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState )
XBitmapEntry* pEntry = new XBitmapEntry( pBitmapItem->GetBitmapValue(), aTmpStr );
XBitmapList aBitmapList( String::CreateFromAscii("TmpList") );
aBitmapList.Insert( pEntry );
- aBitmapList.SetDirty( FALSE );
+ aBitmapList.SetDirty( sal_False );
//Bitmap* pBmp = aBitmapList.GetBitmap( 0 );
//( (ListBox*)pFillAttrLB )->InsertEntry( pEntry->GetName(), *pBmp );
pFillAttrLB->Fill( &aBitmapList );
@@ -677,7 +677,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
{
XFillStyle eXFS = (XFillStyle)pLbFillType->GetSelectEntryPos();
XFillStyleItem aXFillStyleItem( eXFS );
- BOOL bAction = pBox && !pLbFillAttr->IsTravelSelect();
+ sal_Bool bAction = pBox && !pLbFillAttr->IsTravelSelect();
SfxObjectShell* pSh = SfxObjectShell::Current();
if ( bAction )
@@ -689,10 +689,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" ));
aXFillStyleItem.QueryValue( a );
aArgs[0].Value = a;
- ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( TRUE );
+ ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_True );
((SvxFillToolBoxControl*)GetData())->Dispatch(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" )), aArgs );
- ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( FALSE );
+ ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_False );
switch( eXFS )
{
@@ -723,7 +723,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
break;
case XFILL_GRADIENT:
{
- USHORT nPos = pLbFillAttr->GetSelectEntryPos();
+ sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_GRADIENT_LIST ) )
{
@@ -747,7 +747,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
case XFILL_HATCH:
{
- USHORT nPos = pLbFillAttr->GetSelectEntryPos();
+ sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_HATCH_LIST ) )
{
@@ -770,7 +770,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox )
case XFILL_BITMAP:
{
- USHORT nPos = pLbFillAttr->GetSelectEntryPos();
+ sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_BITMAP_LIST ) )
{
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 23f2241ab235..416dc09ca157 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -121,7 +121,7 @@ FontWorkGalleryDialog::~FontWorkGalleryDialog()
void FontWorkGalleryDialog::initfavorites(sal_uInt16 nThemeId, std::vector< Bitmap * >& rFavorites)
{
// Ueber die Gallery werden die Favoriten eingelesen
- ULONG nFavCount = GalleryExplorer::GetSdrObjCount( nThemeId );
+ sal_uIntPtr nFavCount = GalleryExplorer::GetSdrObjCount( nThemeId );
// Gallery thema locken
GalleryExplorer::BeginLocking(nThemeId);
@@ -197,10 +197,10 @@ void FontWorkGalleryDialog::changeText( SdrTextObj* pObj )
{
SdrOutliner& rOutl = mpModel->GetDrawOutliner(pObj);
- USHORT nOutlMode = rOutl.GetMode();
+ sal_uInt16 nOutlMode = rOutl.GetMode();
Size aPaperSize = rOutl.GetPaperSize();
- BOOL bUpdateMode = rOutl.GetUpdateMode();
- rOutl.SetUpdateMode(FALSE);
+ sal_Bool bUpdateMode = rOutl.GetUpdateMode();
+ rOutl.SetUpdateMode(sal_False);
rOutl.SetParaAttribs( 0, rOutl.GetEmptyItemSet() );
// #95114# Always set the object's StyleSheet at the Outliner to
@@ -232,7 +232,7 @@ void FontWorkGalleryDialog::SetSdrObjectRef( SdrObject** ppSdrObject, SdrModel*
void FontWorkGalleryDialog::insertSelectedFontwork()
{
- USHORT nItemId = maCtlFavorites.GetSelectItemId();
+ sal_uInt16 nItemId = maCtlFavorites.GetSelectItemId();
if( nItemId > 0 )
{
@@ -307,7 +307,7 @@ IMPL_LINK( FontWorkGalleryDialog, DoubleClickFavoriteHdl, void*, EMPTYARG )
//------------------------------------------------------------------------
SFX_IMPL_TOOLBOX_CONTROL( FontWorkShapeTypeControl, SfxStringItem );
-FontWorkShapeTypeControl::FontWorkShapeTypeControl( USHORT nSlotId, USHORT nId, ToolBox &rTbx )
+FontWorkShapeTypeControl::FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx )
: SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
@@ -338,7 +338,7 @@ SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow()
// -----------------------------------------------------------------------
-void FontWorkShapeTypeControl::Select( BOOL )
+void FontWorkShapeTypeControl::Select( sal_Bool )
{
}
diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
index 45e76f8ae6e9..1f6195d0da87 100644
--- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx
+++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx
@@ -49,12 +49,12 @@ using namespace ::com::sun::star::beans;
SFX_IMPL_TOOLBOX_CONTROL( FormatPaintBrushToolBoxControl, SfxBoolItem );
-FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
: SfxToolBoxControl( nSlotId, nId, rTbx )
, m_bPersistentCopy(false)
, m_aDoubleClickTimer()
{
- ULONG nDblClkTime = rTbx.GetSettings().GetMouseSettings().GetDoubleClickTime();
+ sal_uIntPtr nDblClkTime = rTbx.GetSettings().GetMouseSettings().GetDoubleClickTime();
m_aDoubleClickTimer.SetTimeoutHdl( LINK(this, FormatPaintBrushToolBoxControl, WaitDoubleClickHdl) );
m_aDoubleClickTimer.SetTimeout(nDblClkTime);
@@ -102,12 +102,12 @@ IMPL_LINK(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl, void*, EMPTYARG )
}
// -----------------------------------------------------------------------
-void FormatPaintBrushToolBoxControl::Select( BOOL )
+void FormatPaintBrushToolBoxControl::Select( sal_Bool )
{
}
// -----------------------------------------------------------------------
-void FormatPaintBrushToolBoxControl::StateChanged( USHORT nSID, SfxItemState eState,
+void FormatPaintBrushToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState )
{
if( ( eState & SFX_ITEM_SET ) == 0 )
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 9f8c023c3b3d..ebad78935d13 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -92,7 +92,7 @@ TYPEINIT1_AUTOFACTORY( TbxImageItem, SfxUInt16Item );
//---------------------------------------------------------
-TbxImageItem::TbxImageItem( USHORT _nWhich, UINT16 nImage ) :
+TbxImageItem::TbxImageItem( sal_uInt16 _nWhich, sal_uInt16 nImage ) :
SfxUInt16Item( _nWhich, nImage )
{
}
@@ -255,11 +255,11 @@ void ImplGrafMetricField::Update( const SfxPoolItem* pItem )
struct CommandToRID
{
const char* pCommand;
- USHORT nResId;
- USHORT nHCResId;
+ sal_uInt16 nResId;
+ sal_uInt16 nHCResId;
};
-static USHORT ImplGetRID( const OUString& aCommand, bool bHighContrast )
+static sal_uInt16 ImplGetRID( const OUString& aCommand, bool bHighContrast )
{
static const CommandToRID aImplCommandToResMap[] =
{
@@ -273,7 +273,7 @@ static USHORT ImplGetRID( const OUString& aCommand, bool bHighContrast )
{ 0, 0, 0 }
};
- USHORT nRID = 0;
+ sal_uInt16 nRID = 0;
sal_Int32 i( 0 );
while ( aImplCommandToResMap[ i ].pCommand )
@@ -307,7 +307,7 @@ protected:
public:
- ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame );
+ ImplGrafControl( Window* pParent, sal_uInt16 nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame );
~ImplGrafControl();
void Update( const SfxPoolItem* pItem ) { maField.Update( pItem ); }
@@ -316,7 +316,7 @@ public:
// -----------------------------------------------------------------------------
-ImplGrafControl::ImplGrafControl( Window* pParent, USHORT, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) :
+ImplGrafControl::ImplGrafControl( Window* pParent, sal_uInt16, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) :
Control( pParent, WB_TABSTOP ),
maImage ( this ),
maField ( this, rCmd, rFrame )
@@ -378,7 +378,7 @@ class ImplGrafModeControl : public ListBox
{
using Window::Update;
private:
- USHORT mnCurPos;
+ sal_uInt16 mnCurPos;
Reference< XFrame > mxFrame;
virtual void Select();
@@ -443,7 +443,7 @@ void ImplGrafModeControl::Select()
long ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt )
{
- USHORT nType = rNEvt.GetType();
+ sal_uInt16 nType = rNEvt.GetType();
if( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
mnCurPos = GetSelectEntryPos();
@@ -526,7 +526,7 @@ private:
DECL_LINK( TbxSelectHdl, void* );
public:
- ImplGrafFilterPopup( USHORT nId, SvxGrafFilterToolBoxControl* pParent,
+ ImplGrafFilterPopup( sal_uInt16 nId, SvxGrafFilterToolBoxControl* pParent,
WindowAlign eAlign,
const ResId& rResIdWin, const ResId& rResIdTbx,
SfxBindings& rBindings );
@@ -541,7 +541,7 @@ public:
// -----------------------------------------------------------------------------
-ImplGrafFilterPopup::ImplGrafFilterPopup( USHORT nId, SvxGrafFilterToolBoxControl* pParent,
+ImplGrafFilterPopup::ImplGrafFilterPopup( sal_uInt16 nId, SvxGrafFilterToolBoxControl* pParent,
WindowAlign eAlign,
const ResId& rResIdWin, const ResId& rResIdTbx ) :
SfxPopupWindow ( nId, rResIdWin ),
@@ -599,7 +599,7 @@ void ImplGrafFilterPopup::PopupModeEnd()
IMPL_LINK( ImplGrafFilterPopup, TbxSelectHdl, void*, EMPTYARG )
{
- const USHORT nSlotId = maTbxMgr.GetToolBox().GetCurItemId();
+ const sal_uInt16 nSlotId = maTbxMgr.GetToolBox().GetCurItemId();
if( IsInPopupMode() )
EndPopupMode();
@@ -617,7 +617,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafFilterToolBoxControl, TbxImageItem );
// -----------------------------------------------------------------------------
-SvxGrafFilterToolBoxControl::SvxGrafFilterToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafFilterToolBoxControl::SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
@@ -632,7 +632,7 @@ SvxGrafFilterToolBoxControl::~SvxGrafFilterToolBoxControl()
// -----------------------------------------------------------------------------
-void SvxGrafFilterToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* )
+void SvxGrafFilterToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* )
{
GetToolBox().EnableItem( GetId(), ( eState != SFX_ITEM_DISABLED ) );
}
@@ -663,7 +663,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafToolBoxControl, SfxVoidItem );
// -----------------------------------------------------------------------------
-SvxGrafToolBoxControl::SvxGrafToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx) :
+SvxGrafToolBoxControl::SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
@@ -678,7 +678,7 @@ SvxGrafToolBoxControl::~SvxGrafToolBoxControl()
// -----------------------------------------------------------------------------
-void SvxGrafToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
ImplGrafControl* pCtrl = (ImplGrafControl*) GetToolBox().GetItemWindow( GetId() );
@@ -715,7 +715,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafRedToolBoxControl, SfxInt16Item );
// -----------------------------------------------------------------------------
-SvxGrafRedToolBoxControl::SvxGrafRedToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafRedToolBoxControl::SvxGrafRedToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SvxGrafToolBoxControl( nSlotId, nId, rTbx )
{
}
@@ -728,7 +728,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafGreenToolBoxControl, SfxInt16Item );
// -----------------------------------------------------------------------------
-SvxGrafGreenToolBoxControl::SvxGrafGreenToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafGreenToolBoxControl::SvxGrafGreenToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SvxGrafToolBoxControl( nSlotId, nId, rTbx )
{
}
@@ -741,7 +741,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafBlueToolBoxControl, SfxInt16Item );
// -----------------------------------------------------------------------------
-SvxGrafBlueToolBoxControl::SvxGrafBlueToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafBlueToolBoxControl::SvxGrafBlueToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SvxGrafToolBoxControl( nSlotId, nId, rTbx )
{
}
@@ -754,7 +754,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafLuminanceToolBoxControl, SfxInt16Item );
// -----------------------------------------------------------------------------
-SvxGrafLuminanceToolBoxControl::SvxGrafLuminanceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafLuminanceToolBoxControl::SvxGrafLuminanceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SvxGrafToolBoxControl( nSlotId, nId, rTbx )
{
}
@@ -767,7 +767,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafContrastToolBoxControl, SfxInt16Item );
// -----------------------------------------------------------------------------
-SvxGrafContrastToolBoxControl::SvxGrafContrastToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafContrastToolBoxControl::SvxGrafContrastToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SvxGrafToolBoxControl( nSlotId, nId, rTbx )
{
}
@@ -780,7 +780,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafGammaToolBoxControl, SfxUInt32Item );
// -----------------------------------------------------------------------------
-SvxGrafGammaToolBoxControl::SvxGrafGammaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafGammaToolBoxControl::SvxGrafGammaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SvxGrafToolBoxControl( nSlotId, nId, rTbx )
{
}
@@ -793,7 +793,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafTransparenceToolBoxControl, SfxUInt16Item );
// -----------------------------------------------------------------------------
-SvxGrafTransparenceToolBoxControl::SvxGrafTransparenceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafTransparenceToolBoxControl::SvxGrafTransparenceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SvxGrafToolBoxControl( nSlotId, nId, rTbx )
{
}
@@ -806,7 +806,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafModeToolBoxControl, SfxUInt16Item );
// -----------------------------------------------------------------------------
-SvxGrafModeToolBoxControl::SvxGrafModeToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxGrafModeToolBoxControl::SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
}
@@ -819,7 +819,7 @@ SvxGrafModeToolBoxControl::~SvxGrafModeToolBoxControl()
// -----------------------------------------------------------------------------
-void SvxGrafModeToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
ImplGrafModeControl* pCtrl = (ImplGrafModeControl*) GetToolBox().GetItemWindow( GetId() );
@@ -869,9 +869,9 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pItem;
- USHORT nSlot = rReq.GetSlot();
+ sal_uInt16 nSlot = rReq.GetSlot();
- if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot, FALSE, &pItem ))
+ if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot, sal_False, &pItem ))
pItem = 0;
switch( nSlot )
@@ -1139,13 +1139,13 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
SfxItemPool& rPool = rView.GetModel()->GetItemPool();
SfxItemSet aAttrSet( rPool );
SfxWhichIter aIter( rSet );
- USHORT nWhich = aIter.FirstWhich();
+ sal_uInt16 nWhich = aIter.FirstWhich();
rView.GetAttributes( aAttrSet );
while( nWhich )
{
- USHORT nSlotId = SfxItemPool::IsWhich( nWhich ) ? rPool.GetSlotId( nWhich ) : nWhich;
+ sal_uInt16 nSlotId = SfxItemPool::IsWhich( nWhich ) ? rPool.GetSlotId( nWhich ) : nWhich;
switch( nSlotId )
{
@@ -1154,7 +1154,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
if( SFX_ITEM_AVAILABLE <= aAttrSet.GetItemState( SDRATTR_GRAFMODE ) )
{
rSet.Put( SfxUInt16Item( nSlotId,
- sal::static_int_cast< UINT16 >( ITEMVALUE( aAttrSet, SDRATTR_GRAFMODE, SdrGrafModeItem ) ) ) );
+ sal::static_int_cast< sal_uInt16 >( ITEMVALUE( aAttrSet, SDRATTR_GRAFMODE, SdrGrafModeItem ) ) ) );
}
}
break;
@@ -1224,9 +1224,9 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
if( SFX_ITEM_AVAILABLE <= aAttrSet.GetItemState( SDRATTR_GRAFTRANSPARENCE ) )
{
const SdrMarkList& rMarkList = rView.GetMarkedObjectList();
- BOOL bEnable = TRUE;
+ sal_Bool bEnable = sal_True;
- for( USHORT i = 0, nCount = (USHORT) rMarkList.GetMarkCount();
+ for( sal_uInt16 i = 0, nCount = (sal_uInt16) rMarkList.GetMarkCount();
( i < nCount ) && bEnable; i++ )
{
SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
@@ -1235,7 +1235,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
( (SdrGrafObj*) pObj )->HasGDIMetaFile() ||
( (SdrGrafObj*) pObj )->IsAnimated() )
{
- bEnable = FALSE;
+ bEnable = sal_False;
}
}
@@ -1251,7 +1251,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
case( SID_ATTR_GRAF_CROP ):
{
const SdrMarkList& rMarkList = rView.GetMarkedObjectList();
- BOOL bDisable = TRUE;
+ sal_Bool bDisable = sal_True;
if( 1 == rMarkList.GetMarkCount() )
{
@@ -1264,7 +1264,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView )
if( ( pGrafObj->GetGraphicType() != GRAPHIC_NONE ) &&
( pGrafObj->GetGraphicType() != GRAPHIC_DEFAULT ) )
{
- bDisable = FALSE;
+ bDisable = sal_False;
}
}
}
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 26b5a508491e..e2891eab1e8d 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -74,7 +74,7 @@ SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinB
meBmpMode ( GetSettings().GetStyleSettings().GetHighContrastMode() ? BMP_COLOR_HIGHCONTRAST : BMP_COLOR_NORMAL ),
nCurPos ( 0 ),
aLogicalSize(40,140),
- bRelease ( TRUE ),
+ bRelease ( sal_True ),
mpSh ( NULL ),
mxFrame ( rFrame )
{
@@ -114,7 +114,7 @@ void SvxLineBox::Select()
if ( !IsTravelSelect() )
{
XLineStyle eXLS;
- USHORT nPos = GetSelectEntryPos();
+ sal_uInt16 nPos = GetSelectEntryPos();
// SfxDispatcher* pDisp = rBindings.GetDispatcher();
//DBG_ASSERT( pDisp, "invalid Dispatcher" );
@@ -177,7 +177,7 @@ void SvxLineBox::Select()
long SvxLineBox::PreNotify( NotifyEvent& rNEvt )
{
- USHORT nType = rNEvt.GetType();
+ sal_uInt16 nType = rNEvt.GetType();
switch(nType)
{
@@ -193,7 +193,7 @@ long SvxLineBox::PreNotify( NotifyEvent& rNEvt )
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
if( pKEvt->GetKeyCode().GetCode() == KEY_TAB)
{
- bRelease = FALSE;
+ bRelease = sal_False;
Select();
}
}
@@ -235,7 +235,7 @@ void SvxLineBox::ReleaseFocus_Impl()
{
if(!bRelease)
{
- bRelease = TRUE;
+ bRelease = sal_True;
return;
}
@@ -302,7 +302,7 @@ SvxColorBox::SvxColorBox(
ColorLB( pParent, nBits ),
nCurPos ( 0 ),
aLogicalSize(45,80),
- bRelease ( TRUE ),
+ bRelease ( sal_True ),
maCommand ( rCommand ),
mxFrame ( rFrame )
{
@@ -383,7 +383,7 @@ void SvxColorBox::Select()
long SvxColorBox::PreNotify( NotifyEvent& rNEvt )
{
- USHORT nType = rNEvt.GetType();
+ sal_uInt16 nType = rNEvt.GetType();
switch(nType)
{
@@ -400,7 +400,7 @@ long SvxColorBox::PreNotify( NotifyEvent& rNEvt )
if( pKEvt->GetKeyCode().GetCode() == KEY_TAB)
{
- bRelease = FALSE;
+ bRelease = sal_False;
Select();
}
}
@@ -456,7 +456,7 @@ void SvxColorBox::ReleaseFocus_Impl()
{
if(!bRelease)
{
- bRelease = TRUE;
+ bRelease = sal_True;
return;
}
@@ -492,7 +492,7 @@ SvxMetricField::SvxMetricField(
SetFirst( 0 );
eDlgUnit = SfxModule::GetCurrentFieldUnit();
- SetFieldUnit( *this, eDlgUnit, FALSE );
+ SetFieldUnit( *this, eDlgUnit, sal_False );
Show();
}
@@ -580,7 +580,7 @@ void SvxMetricField::RefreshDlgUnit()
if ( eDlgUnit != eTmpUnit )
{
eDlgUnit = eTmpUnit;
- SetFieldUnit( *this, eDlgUnit, FALSE );
+ SetFieldUnit( *this, eDlgUnit, sal_False );
}
}
@@ -588,7 +588,7 @@ void SvxMetricField::RefreshDlgUnit()
long SvxMetricField::PreNotify( NotifyEvent& rNEvt )
{
- USHORT nType = rNEvt.GetType();
+ sal_uInt16 nType = rNEvt.GetType();
if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
aCurTxt = GetText();
@@ -612,18 +612,18 @@ long SvxMetricField::Notify( NotifyEvent& rNEvt )
pSh->KeyInput( *pKEvt );
else
{
- FASTBOOL bHandled = FALSE;
+ int bHandled = sal_False;
switch ( rKey.GetCode() )
{
case KEY_RETURN:
Reformat();
- bHandled = TRUE;
+ bHandled = sal_True;
break;
case KEY_ESCAPE:
SetText( aCurTxt );
- bHandled = TRUE;
+ bHandled = sal_True;
break;
}
@@ -658,8 +658,8 @@ void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt )
SvxFillTypeBox::SvxFillTypeBox( Window* pParent, WinBits nBits ) :
FillTypeLB( pParent, nBits | WB_TABSTOP ),
nCurPos ( 0 ),
- bSelect ( FALSE ),
- bRelease(TRUE)
+ bSelect ( sal_False ),
+ bRelease(sal_True)
{
SetSizePixel( LogicToPixel( Size(40, 40 ),MAP_APPFONT ));
Fill();
@@ -677,18 +677,18 @@ SvxFillTypeBox::~SvxFillTypeBox()
long SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt )
{
- USHORT nType = rNEvt.GetType();
+ sal_uInt16 nType = rNEvt.GetType();
if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
nCurPos = GetSelectEntryPos();
else if ( EVENT_LOSEFOCUS == nType
&& Application::GetFocusWindow()
- && !IsWindowOrChild( Application::GetFocusWindow(), TRUE ) )
+ && !IsWindowOrChild( Application::GetFocusWindow(), sal_True ) )
{
if ( !bSelect )
SelectEntryPos( nCurPos );
else
- bSelect = FALSE;
+ bSelect = sal_False;
}
return FillTypeLB::PreNotify( rNEvt );
@@ -710,9 +710,9 @@ long SvxFillTypeBox::Notify( NotifyEvent& rNEvt )
( (Link&)GetSelectHdl() ).Call( this );
break;
case KEY_TAB:
- bRelease = FALSE;
+ bRelease = sal_False;
( (Link&)GetSelectHdl() ).Call( this );
- bRelease = TRUE;
+ bRelease = sal_True;
break;
case KEY_ESCAPE:
@@ -747,7 +747,7 @@ SvxFillAttrBox::SvxFillAttrBox( Window* pParent, WinBits nBits ) :
FillAttrLB( pParent, nBits | WB_TABSTOP ),
nCurPos( 0 ),
- bRelease( TRUE )
+ bRelease( sal_True )
{
SetPosPixel( Point( 90, 0 ) );
@@ -765,7 +765,7 @@ SvxFillAttrBox::~SvxFillAttrBox()
long SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt )
{
- USHORT nType = rNEvt.GetType();
+ sal_uInt16 nType = rNEvt.GetType();
if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
nCurPos = GetSelectEntryPos();
@@ -790,9 +790,9 @@ long SvxFillAttrBox::Notify( NotifyEvent& rNEvt )
nHandled = 1;
break;
case KEY_TAB:
- bRelease = FALSE;
+ bRelease = sal_False;
GetSelectHdl().Call( this );
- bRelease = TRUE;
+ bRelease = sal_True;
break;
case KEY_ESCAPE:
SelectEntryPos( nCurPos );
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 04e7e3dc543a..ff03e87a0997 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -70,8 +70,8 @@ private:
long nMX;
long nMY;
long nTextHeight;
- BOOL bInitialKeyInput;
- BOOL m_bMod1;
+ sal_Bool bInitialKeyInput;
+ sal_Bool m_bMod1;
ToolBox& rTbx;
Reference< XFrame > mxFrame;
rtl::OUString maCommand;
@@ -79,7 +79,7 @@ private:
void UpdateSize_Impl( long nNewCol, long nNewLine);
public:
- TableWindow( USHORT nSlotId,
+ TableWindow( sal_uInt16 nSlotId,
const rtl::OUString& rCmd,
ToolBox& rParentTbx,
const Reference< XFrame >& rFrame );
@@ -93,16 +93,16 @@ public:
virtual void PopupModeEnd();
virtual SfxPopupWindow* Clone() const;
- USHORT GetColCount() const { return (USHORT)nCol; }
- USHORT GetLineCount() const { return (USHORT)nLine; }
+ sal_uInt16 GetColCount() const { return (sal_uInt16)nCol; }
+ sal_uInt16 GetLineCount() const { return (sal_uInt16)nLine; }
};
// -----------------------------------------------------------------------
-TableWindow::TableWindow( USHORT nSlotId, const rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
+TableWindow::TableWindow( sal_uInt16 nSlotId, const rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
SfxPopupWindow( nSlotId, rFrame, WB_SYSTEMWINDOW ),
- bInitialKeyInput(TRUE),
- m_bMod1(FALSE),
+ bInitialKeyInput(sal_True),
+ m_bMod1(sal_False),
rTbx(rParentTbx),
mxFrame( rFrame ),
maCommand( rCmd )
@@ -119,7 +119,7 @@ TableWindow::TableWindow( USHORT nSlotId, const rtl::OUString& rCmd, ToolBox& rP
Font aFont = GetFont();
aFont.SetColor( aLineColor );
aFont.SetFillColor( aFillColor );
- aFont.SetTransparent( FALSE );
+ aFont.SetTransparent( sal_False );
SetFont( aFont );
nCol = 0;
@@ -268,16 +268,16 @@ void TableWindow::UpdateSize_Impl( long nNewCol, long nNewLine)
---------------------------------------------------------------------------*/
void TableWindow::KeyInput( const KeyEvent& rKEvt )
{
- BOOL bHandled = FALSE;
- USHORT nModifier = rKEvt.GetKeyCode().GetModifier();
- USHORT nKey = rKEvt.GetKeyCode().GetCode();
+ sal_Bool bHandled = sal_False;
+ sal_uInt16 nModifier = rKEvt.GetKeyCode().GetModifier();
+ sal_uInt16 nKey = rKEvt.GetKeyCode().GetCode();
if(!nModifier)
{
if( KEY_UP == nKey || KEY_DOWN == nKey ||
KEY_LEFT == nKey || KEY_RIGHT == nKey ||
KEY_ESCAPE == nKey ||KEY_RETURN == nKey )
{
- bHandled = TRUE;
+ bHandled = sal_True;
long nNewCol = nCol;
long nNewLine = nLine;
switch(nKey)
@@ -312,7 +312,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt )
//make sure that a table can initially be created
if(bInitialKeyInput)
{
- bInitialKeyInput = FALSE;
+ bInitialKeyInput = sal_False;
if(!nNewLine)
nNewLine = 1;
if(!nNewCol)
@@ -323,7 +323,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt )
}
else if(KEY_MOD1 == nModifier && KEY_RETURN == nKey)
{
- m_bMod1 = TRUE;
+ m_bMod1 = sal_True;
if(IsMouseCaptured())
ReleaseMouse();
EndPopupMode(FLOATWIN_POPUPMODEEND_CLOSEALL );
@@ -430,7 +430,7 @@ void TableWindow::PopupModeEnd()
if ( !IsPopupModeCanceled() && nCol && nLine )
{
Window* pParent = rTbx.GetParent();
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId));
Reference< XDispatchProvider > xDispatchProvider( mxFrame, UNO_QUERY );
@@ -473,15 +473,15 @@ private:
long nWidth;
long nMX;
long nTextHeight;
- BOOL bInitialKeyInput;
- BOOL m_bMod1;
+ sal_Bool bInitialKeyInput;
+ sal_Bool m_bMod1;
ToolBox& rTbx;
Reference< XFrame > mxFrame;
::rtl::OUString maCommand;
void UpdateSize_Impl( long nNewCol );
public:
- ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame );
+ ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame );
void KeyInput( const KeyEvent& rKEvt );
virtual void MouseMove( const MouseEvent& rMEvt );
@@ -491,15 +491,15 @@ public:
virtual void PopupModeEnd();
virtual SfxPopupWindow* Clone() const;
- USHORT GetColCount() const { return (USHORT)nCol; }
+ sal_uInt16 GetColCount() const { return (sal_uInt16)nCol; }
};
// -----------------------------------------------------------------------
-ColumnsWindow::ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
+ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) :
SfxPopupWindow( nId, rFrame, WB_SYSTEMWINDOW ),
- bInitialKeyInput(TRUE),
- m_bMod1(FALSE),
+ bInitialKeyInput(sal_True),
+ m_bMod1(sal_False),
rTbx(rParentTbx),
mxFrame(rFrame),
maCommand( rCmd )
@@ -516,7 +516,7 @@ ColumnsWindow::ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, ToolBox&
Font aFont( GetFont() );
aFont.SetColor( aLineColor );
aFont.SetFillColor( aFillColor );
- aFont.SetTransparent( FALSE );
+ aFont.SetTransparent( sal_False );
SetFont( aFont );
nCol = 0;
@@ -630,16 +630,16 @@ void ColumnsWindow::MouseButtonDown( const MouseEvent& rMEvt )
---------------------------------------------------------------------------*/
void ColumnsWindow::KeyInput( const KeyEvent& rKEvt )
{
- BOOL bHandled = FALSE;
- USHORT nModifier = rKEvt.GetKeyCode().GetModifier();
- USHORT nKey = rKEvt.GetKeyCode().GetCode();
+ sal_Bool bHandled = sal_False;
+ sal_uInt16 nModifier = rKEvt.GetKeyCode().GetModifier();
+ sal_uInt16 nKey = rKEvt.GetKeyCode().GetCode();
if(!nModifier)
{
if( KEY_LEFT == nKey || KEY_RIGHT == nKey ||
KEY_RETURN == nKey ||KEY_ESCAPE == nKey ||
KEY_UP == nKey)
{
- bHandled = TRUE;
+ bHandled = sal_True;
long nNewCol = nCol;
switch(nKey)
{
@@ -663,7 +663,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt )
//make sure that a table can initially be created
if(bInitialKeyInput)
{
- bInitialKeyInput = FALSE;
+ bInitialKeyInput = sal_False;
if(!nNewCol)
nNewCol = 1;
}
@@ -672,7 +672,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt )
}
else if(KEY_MOD1 == nModifier && KEY_RETURN == nKey)
{
- m_bMod1 = TRUE;
+ m_bMod1 = sal_True;
if(IsMouseCaptured())
ReleaseMouse();
EndPopupMode(FLOATWIN_POPUPMODEEND_CLOSEALL );
@@ -753,7 +753,7 @@ void ColumnsWindow::PopupModeEnd()
{
if ( !IsPopupModeCanceled() && nCol )
{
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
Window* pParent = rTbx.GetParent();
pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId));
@@ -774,9 +774,9 @@ void ColumnsWindow::PopupModeEnd()
// class SvxTableToolBoxControl ------------------------------------------
-SvxTableToolBoxControl::SvxTableToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxTableToolBoxControl::SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
- bEnabled( TRUE )
+ bEnabled( sal_True )
{
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
rTbx.Invalidate();
@@ -821,17 +821,17 @@ SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindowCascading()
// -----------------------------------------------------------------------
-void SvxTableToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
if ( pState && pState->ISA(SfxUInt16Item) )
{
- INT16 nValue = static_cast< const SfxUInt16Item* >( pState )->GetValue();
+ sal_Int16 nValue = static_cast< const SfxUInt16Item* >( pState )->GetValue();
bEnabled = ( nValue != 0 );
}
else
bEnabled = SFX_ITEM_DISABLED != eState;
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
@@ -841,7 +841,7 @@ void SvxTableToolBoxControl::StateChanged( USHORT, SfxItemState eState, const Sf
// class SvxColumnsToolBoxControl ------------------------------------------
-SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
@@ -890,7 +890,7 @@ SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindowCascading()
/* -----------------18.11.99 16:38-------------------
--------------------------------------------------*/
-void SvxColumnsToolBoxControl::StateChanged( USHORT nSID,
+void SvxColumnsToolBoxControl::StateChanged( sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState )
{
diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index 4fe822f94955..9c0a5262ce7a 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -73,49 +73,49 @@ class SvxPopupWindowListBox : public SfxPopupWindow
FixedInfo aInfo;
ListBox * pListBox;
ToolBox & rToolBox;
- BOOL bUserSel;
- USHORT nTbxId;
+ sal_Bool bUserSel;
+ sal_uInt16 nTbxId;
rtl::OUString maCommandURL;
// disallow copy-constructor and assignment-operator
SvxPopupWindowListBox(const int& );
SvxPopupWindowListBox & operator = (const int& );
-// SvxPopupWindowListBox( USHORT nSlotId, ToolBox& rTbx, USHORT nTbxItemId );
+// SvxPopupWindowListBox( sal_uInt16 nSlotId, ToolBox& rTbx, sal_uInt16 nTbxItemId );
public:
- SvxPopupWindowListBox( USHORT nSlotId, const rtl::OUString& rCommandURL, USHORT nTbxId, ToolBox& rTbx );
+ SvxPopupWindowListBox( sal_uInt16 nSlotId, const rtl::OUString& rCommandURL, sal_uInt16 nTbxId, ToolBox& rTbx );
virtual ~SvxPopupWindowListBox();
// SfxPopupWindow
virtual SfxPopupWindow * Clone() const;
virtual void PopupModeEnd();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
void StartSelection();
inline ListBox & GetListBox() { return *pListBox; }
inline FixedInfo & GetInfo() { return aInfo; }
- BOOL IsUserSelected() const { return bUserSel; }
- void SetUserSelected( BOOL bVal ) { bUserSel = bVal; }
+ sal_Bool IsUserSelected() const { return bUserSel; }
+ void SetUserSelected( sal_Bool bVal ) { bUserSel = bVal; }
/*virtual*/Window* GetPreferredKeyInputWindow();
};
/////////////////////////////////////////////////////////////////
-SvxPopupWindowListBox::SvxPopupWindowListBox( USHORT nSlotId, const rtl::OUString& rCommandURL, USHORT nId, ToolBox& rTbx ) :
+SvxPopupWindowListBox::SvxPopupWindowListBox( sal_uInt16 nSlotId, const rtl::OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx ) :
SfxPopupWindow( nSlotId, Reference< XFrame >(), SVX_RES( RID_SVXTBX_UNDO_REDO_CTRL ) ),
aInfo ( this, SVX_RES( FT_NUM_OPERATIONS ) ),
rToolBox ( rTbx ),
- bUserSel ( FALSE ),
+ bUserSel ( sal_False ),
nTbxId ( nId ),
maCommandURL( rCommandURL )
{
DBG_ASSERT( nSlotId == GetId(), "id mismatch" );
pListBox = new ListBox( this, SVX_RES( LB_SVXTBX_UNDO_REDO_CTRL ) );
FreeResource();
- pListBox->EnableMultiSelection( TRUE, TRUE );
+ pListBox->EnableMultiSelection( sal_True, sal_True );
SetBackground( GetSettings().GetStyleSettings().GetDialogColor() );
AddStatusListener( rCommandURL );
}
@@ -149,7 +149,7 @@ void SvxPopupWindowListBox::PopupModeEnd()
void SvxPopupWindowListBox::StateChanged(
- USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
rToolBox.EnableItem( nTbxId, ( SfxToolBoxControl::GetItemState( pState ) != SFX_ITEM_DISABLED) );
SfxPopupWindow::StateChanged( nSID, eState, pState );
@@ -173,7 +173,7 @@ Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow()
SFX_IMPL_TOOLBOX_CONTROL( SvxListBoxControl, SfxStringItem );
-SvxListBoxControl::SvxListBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxListBoxControl::SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx ),
pPopupWin ( 0 )
{
@@ -201,7 +201,7 @@ SfxPopupWindowType SvxListBoxControl::GetPopupWindowType() const
void SvxListBoxControl::StateChanged(
- USHORT, SfxItemState, const SfxPoolItem* pState )
+ sal_uInt16, SfxItemState, const SfxPoolItem* pState )
{
GetToolBox().EnableItem( GetId(),
SFX_ITEM_DISABLED != GetItemState(pState) );
@@ -213,7 +213,7 @@ IMPL_LINK( SvxListBoxControl, PopupModeEndHdl, void *, EMPTYARG )
if( pPopupWin && 0 == pPopupWin->GetPopupModeFlags() &&
pPopupWin->IsUserSelected() )
{
- USHORT nCount = pPopupWin->GetListBox().GetSelectEntryCount();
+ sal_uInt16 nCount = pPopupWin->GetListBox().GetSelectEntryCount();
INetURLObject aObj( m_aCommandURL );
@@ -226,13 +226,13 @@ IMPL_LINK( SvxListBoxControl, PopupModeEndHdl, void *, EMPTYARG )
}
-void SvxListBoxControl::Impl_SetInfo( USHORT nCount )
+void SvxListBoxControl::Impl_SetInfo( sal_uInt16 nCount )
{
DBG_ASSERT( pPopupWin, "NULL pointer, PopupWindow missing" );
// ListBox &rListBox = pPopupWin->GetListBox();
- USHORT nId;
+ sal_uInt16 nId;
if (nCount == 1)
nId = SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTION : RID_SVXSTR_NUM_REDO_ACTION;
else
@@ -250,14 +250,14 @@ IMPL_LINK( SvxListBoxControl, SelectHdl, void *, EMPTYARG )
{
if (pPopupWin)
{
- //pPopupWin->SetUserSelected( FALSE );
+ //pPopupWin->SetUserSelected( sal_False );
ListBox &rListBox = pPopupWin->GetListBox();
if (rListBox.IsTravelSelect())
Impl_SetInfo( rListBox.GetSelectEntryCount() );
else
{
- pPopupWin->SetUserSelected( TRUE );
+ pPopupWin->SetUserSelected( sal_True );
pPopupWin->EndPopupMode( 0 );
}
}
@@ -268,7 +268,7 @@ IMPL_LINK( SvxListBoxControl, SelectHdl, void *, EMPTYARG )
SFX_IMPL_TOOLBOX_CONTROL( SvxUndoRedoControl, SfxStringItem );
-SvxUndoRedoControl::SvxUndoRedoControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxUndoRedoControl::SvxUndoRedoControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
: SvxListBoxControl( nSlotId, nId, rTbx )
{
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
@@ -281,7 +281,7 @@ SvxUndoRedoControl::~SvxUndoRedoControl()
}
void SvxUndoRedoControl::StateChanged(
- USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
if ( nSID == SID_UNDO || nSID == SID_REDO )
{
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 0b7e6fe7182b..3369f1ae8eb5 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -88,13 +88,13 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxLineEndToolBoxControl, SfxBoolItem );
|*
\************************************************************************/
-SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( USHORT nSlotId,
- USHORT nId,
+SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId,
+ sal_uInt16 nId,
ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
pStyleItem ( NULL ),
pDashItem ( NULL ),
- bUpdate ( FALSE )
+ bUpdate ( sal_False )
{
addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" )));
addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DashListState" )));
@@ -112,7 +112,7 @@ SvxLineStyleToolBoxControl::~SvxLineStyleToolBoxControl()
void SvxLineStyleToolBoxControl::StateChanged (
- USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
SvxLineBox* pBox = (SvxLineBox*)GetToolBox().GetItemWindow( GetId() );
@@ -140,7 +140,7 @@ void SvxLineStyleToolBoxControl::StateChanged (
pDashItem = (XLineDashItem*)pState->Clone();
}
- bUpdate = TRUE;
+ bUpdate = sal_True;
Update( pState );
}
else if ( nSID != SID_DASH_LIST )
@@ -157,7 +157,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState )
{
if ( pState && bUpdate )
{
- bUpdate = FALSE;
+ bUpdate = sal_False;
SvxLineBox* pBox = (SvxLineBox*)GetToolBox().GetItemWindow( GetId() );
DBG_ASSERT( pBox, "Window not found!" );
@@ -232,7 +232,7 @@ Window* SvxLineStyleToolBoxControl::CreateItemWindow( Window *pParent )
\************************************************************************/
SvxLineWidthToolBoxControl::SvxLineWidthToolBoxControl(
- USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+ sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" )));
@@ -247,7 +247,7 @@ SvxLineWidthToolBoxControl::~SvxLineWidthToolBoxControl()
//========================================================================
void SvxLineWidthToolBoxControl::StateChanged(
- USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
SvxMetricField* pFld = (SvxMetricField*)
GetToolBox().GetItemWindow( GetId() );
@@ -299,7 +299,7 @@ Window* SvxLineWidthToolBoxControl::CreateItemWindow( Window *pParent )
\************************************************************************/
SvxLineColorToolBoxControl::SvxLineColorToolBoxControl(
- USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+ sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColorTableState" )));
@@ -315,7 +315,7 @@ SvxLineColorToolBoxControl::~SvxLineColorToolBoxControl()
void SvxLineColorToolBoxControl::StateChanged(
- USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
SvxColorBox* pBox = (SvxColorBox*)GetToolBox().GetItemWindow( GetId() );
@@ -377,7 +377,7 @@ Window* SvxLineColorToolBoxControl::CreateItemWindow( Window *pParent )
\************************************************************************/
SvxLineEndWindow::SvxLineEndWindow(
- USHORT nSlotId,
+ sal_uInt16 nSlotId,
const Reference< XFrame >& rFrame,
const String& rWndTitle ) :
SfxPopupWindow( nSlotId,
@@ -388,7 +388,7 @@ SvxLineEndWindow::SvxLineEndWindow(
nCols ( 2 ),
nLines ( 12 ),
nLineEndWidth ( 400 ),
- bPopupMode ( TRUE ),
+ bPopupMode ( sal_True ),
mbInResize ( false ),
mxFrame ( rFrame )
{
@@ -397,7 +397,7 @@ SvxLineEndWindow::SvxLineEndWindow(
}
SvxLineEndWindow::SvxLineEndWindow(
- USHORT nSlotId,
+ sal_uInt16 nSlotId,
const Reference< XFrame >& rFrame,
Window* pParentWindow,
const String& rWndTitle ) :
@@ -410,7 +410,7 @@ SvxLineEndWindow::SvxLineEndWindow(
nCols ( 2 ),
nLines ( 12 ),
nLineEndWidth ( 400 ),
- bPopupMode ( TRUE ),
+ bPopupMode ( sal_True ),
mbInResize ( false ),
mxFrame ( rFrame )
{
@@ -467,7 +467,7 @@ IMPL_LINK( SvxLineEndWindow, SelectHdl, void *, EMPTYARG )
{
XLineEndItem* pLineEndItem = NULL;
XLineStartItem* pLineStartItem = NULL;
- USHORT nId = aLineEndSet.GetSelectItemId();
+ sal_uInt16 nId = aLineEndSet.GetSelectItemId();
if( nId == 1 )
{
@@ -543,7 +543,7 @@ void SvxLineEndWindow::FillValueSet()
DBG_ASSERT( pBmp, "UI-Bitmap wurde nicht erzeugt" );
aBmpSize = pBmp->GetSizePixel();
- aVD.SetOutputSizePixel( aBmpSize, FALSE );
+ aVD.SetOutputSizePixel( aBmpSize, sal_False );
aBmpSize.Width() = aBmpSize.Width() / 2;
Point aPt0( 0, 0 );
Point aPt1( aBmpSize.Width(), 0 );
@@ -562,10 +562,10 @@ void SvxLineEndWindow::FillValueSet()
DBG_ASSERT( pBmp, "UI-Bitmap wurde nicht erzeugt" );
aVD.DrawBitmap( aPt0, *pBmp );
- aLineEndSet.InsertItem( (USHORT)((i+1L)*2L+1L), aVD.GetBitmap( aPt0, aBmpSize ), pEntry->GetName() );
- aLineEndSet.InsertItem( (USHORT)((i+2L)*2L), aVD.GetBitmap( aPt1, aBmpSize ), pEntry->GetName() );
+ aLineEndSet.InsertItem( (sal_uInt16)((i+1L)*2L+1L), aVD.GetBitmap( aPt0, aBmpSize ), pEntry->GetName() );
+ aLineEndSet.InsertItem( (sal_uInt16)((i+2L)*2L), aVD.GetBitmap( aPt1, aBmpSize ), pEntry->GetName() );
}
- nLines = Min( (USHORT)(nCount + 1), (USHORT) MAX_LINES );
+ nLines = Min( (sal_uInt16)(nCount + 1), (sal_uInt16) MAX_LINES );
aLineEndSet.SetLineCount( nLines );
SetSize();
@@ -609,21 +609,21 @@ void __EXPORT SvxLineEndWindow::Resizing( Size& rNewSize )
Size aItemSize = aLineEndSet.CalcItemSizePixel( aBitmapSize ); // -> Member
//Size aOldSize = GetOutputSizePixel(); // fuer Breite
- USHORT nItemCount = aLineEndSet.GetItemCount(); // -> Member
+ sal_uInt16 nItemCount = aLineEndSet.GetItemCount(); // -> Member
// Spalten ermitteln
long nItemW = aItemSize.Width();
long nW = rNewSize.Width();
- nCols = (USHORT) Max( ( (ULONG)(( nW + nItemW ) / ( nItemW * 2 ) )),
- (ULONG) 1L );
+ nCols = (sal_uInt16) Max( ( (sal_uIntPtr)(( nW + nItemW ) / ( nItemW * 2 ) )),
+ (sal_uIntPtr) 1L );
nCols *= 2;
// Reihen ermitteln
long nItemH = aItemSize.Height();
long nH = rNewSize.Height();
- nLines = (USHORT) Max( ( ( nH + nItemH / 2 ) / nItemH ), 1L );
+ nLines = (sal_uInt16) Max( ( ( nH + nItemH / 2 ) / nItemH ), 1L );
- USHORT nMaxCols = nItemCount / nLines;
+ sal_uInt16 nMaxCols = nItemCount / nLines;
if( nItemCount % nLines )
nMaxCols++;
if( nCols > nMaxCols )
@@ -633,9 +633,9 @@ void __EXPORT SvxLineEndWindow::Resizing( Size& rNewSize )
// Keine ungerade Anzahl von Spalten
if( nCols % 2 )
nCols--;
- nCols = Max( nCols, (USHORT) 2 );
+ nCols = Max( nCols, (sal_uInt16) 2 );
- USHORT nMaxLines = nItemCount / nCols;
+ sal_uInt16 nMaxLines = nItemCount / nCols;
if( nItemCount % nCols )
nMaxLines++;
if( nLines > nMaxLines )
@@ -654,7 +654,7 @@ void SvxLineEndWindow::StartSelection()
// -----------------------------------------------------------------------
-BOOL SvxLineEndWindow::Close()
+sal_Bool SvxLineEndWindow::Close()
{
return SfxPopupWindow::Close();
}
@@ -662,7 +662,7 @@ BOOL SvxLineEndWindow::Close()
// -----------------------------------------------------------------------
void SvxLineEndWindow::StateChanged(
- USHORT nSID, SfxItemState, const SfxPoolItem* pState )
+ sal_uInt16 nSID, SfxItemState, const SfxPoolItem* pState )
{
if ( nSID == SID_LINEEND_LIST )
{
@@ -688,7 +688,7 @@ void SvxLineEndWindow::PopupModeEnd()
{
if ( IsVisible() )
{
- bPopupMode = FALSE;
+ bPopupMode = sal_False;
SetSize();
}
SfxPopupWindow::PopupModeEnd();
@@ -701,8 +701,8 @@ void SvxLineEndWindow::SetSize()
//if( !bPopupMode )
if( !IsInPopupMode() )
{
- USHORT nItemCount = aLineEndSet.GetItemCount(); // -> Member
- USHORT nMaxLines = nItemCount / nCols; // -> Member ?
+ sal_uInt16 nItemCount = aLineEndSet.GetItemCount(); // -> Member
+ sal_uInt16 nMaxLines = nItemCount / nCols; // -> Member ?
if( nItemCount % nCols )
nMaxLines++;
@@ -740,7 +740,7 @@ void SvxLineEndWindow::GetFocus (void)
|*
\************************************************************************/
-SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) :
+SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
@@ -766,7 +766,7 @@ SfxPopupWindow* SvxLineEndToolBoxControl::CreatePopupWindow()
{
SvxLineEndWindow* pLineEndWin =
new SvxLineEndWindow( GetId(), m_xFrame, &GetToolBox(), SVX_RESSTR( RID_SVXSTR_LINEEND ) );
- pLineEndWin->StartPopupMode( &GetToolBox(), TRUE );
+ pLineEndWin->StartPopupMode( &GetToolBox(), sal_True );
pLineEndWin->StartSelection();
SetPopupWindow( pLineEndWin );
return pLineEndWin;
@@ -774,9 +774,9 @@ SfxPopupWindow* SvxLineEndToolBoxControl::CreatePopupWindow()
// -----------------------------------------------------------------------
-void SvxLineEndToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* )
+void SvxLineEndToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* )
{
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
diff --git a/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx
index e2a7a535a77f..526f32434c2e 100644
--- a/svx/source/tbxctrls/subtoolboxcontrol.cxx
+++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx
@@ -41,7 +41,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxSubToolBoxControl, SfxUInt16Item );
**********************************************************************/
-SvxSubToolBoxControl::SvxSubToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxSubToolBoxControl::SvxSubToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
: SfxToolBoxControl( nSlotId, nId, rTbx )
{
rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index bd0a39200dd1..5a4362592738 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -103,11 +103,11 @@
#define DELETEZ(p) (delete (p), (p)=NULL)
#endif
// don't make more than 15 entries visible at once
-#define MAX_STYLES_ENTRIES static_cast< USHORT >( 15 )
+#define MAX_STYLES_ENTRIES static_cast< sal_uInt16 >( 15 )
void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet );
void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize );
-BOOL lcl_FontChangedHint( const SfxHint &rHint );
+sal_Bool lcl_FontChangedHint( const SfxHint &rHint );
// namespaces
using ::rtl::OUString;
@@ -138,12 +138,12 @@ class SvxStyleBox_Impl : public ComboBox
{
using Window::IsVisible;
public:
- SvxStyleBox_Impl( Window* pParent, USHORT nSlot, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider,
- const Reference< XFrame >& _xFrame,const String& rClearFormatKey, const String& rMoreKey, BOOL bInSpecialMode );
+ SvxStyleBox_Impl( Window* pParent, sal_uInt16 nSlot, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider,
+ const Reference< XFrame >& _xFrame,const String& rClearFormatKey, const String& rMoreKey, sal_Bool bInSpecialMode );
~SvxStyleBox_Impl();
void SetFamily( SfxStyleFamily eNewFamily );
- inline BOOL IsVisible() { return bVisible; }
+ inline sal_Bool IsVisible() { return bVisible; }
virtual long PreNotify( NotifyEvent& rNEvt );
virtual long Notify( NotifyEvent& rNEvt );
@@ -160,20 +160,20 @@ protected:
virtual void Select();
private:
- USHORT nSlotId;
+ sal_uInt16 nSlotId;
SfxStyleFamily eStyleFamily;
- USHORT nCurSel;
- BOOL bRelease;
+ sal_uInt16 nCurSel;
+ sal_Bool bRelease;
Size aLogicalSize;
Link aVisibilityListener;
- BOOL bVisible;
+ sal_Bool bVisible;
Reference< XDispatchProvider > m_xDispatchProvider;
Reference< XFrame > m_xFrame;
OUString m_aCommand;
String aClearFormatKey;
String aMoreKey;
String sDefaultStyle;
- BOOL bInSpecialMode;
+ sal_Bool bInSpecialMode;
void ReleaseFocus();
};
@@ -191,8 +191,8 @@ private:
Font aCurFont;
Size aLogicalSize;
String aCurText;
- USHORT nFtCount;
- BOOL bRelease;
+ sal_uInt16 nFtCount;
+ sal_Bool bRelease;
Reference< XDispatchProvider > m_xDispatchProvider;
Reference< XFrame > m_xFrame;
@@ -210,7 +210,7 @@ public:
void FillList();
void Update( const SvxFontItem* pFontItem );
- USHORT GetListCount() { return nFtCount; }
+ sal_uInt16 GetListCount() { return nFtCount; }
void Clear() { FontNameBox::Clear(); nFtCount = 0; }
void Fill( const FontList* pList )
{ FontNameBox::Fill( pList );
@@ -230,12 +230,12 @@ public:
class SvxFrmValueSet_Impl : public ValueSet
{
- USHORT nModifier;
+ sal_uInt16 nModifier;
virtual void MouseButtonUp( const MouseEvent& rMEvt );
public:
SvxFrmValueSet_Impl(Window* pParent, WinBits nWinStyle)
: ValueSet(pParent, nWinStyle), nModifier(0) {}
- USHORT GetModifier() const {return nModifier;}
+ sal_uInt16 GetModifier() const {return nModifier;}
};
@@ -260,24 +260,24 @@ private:
protected:
virtual void Resize();
- virtual BOOL Close();
+ virtual sal_Bool Close();
virtual Window* GetPreferredKeyInputWindow();
virtual void GetFocus();
public:
- SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow );
+ SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow );
~SvxFrameWindow_Impl();
void StartSelection();
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindow* Clone() const;
virtual void DataChanged( const DataChangedEvent& rDCEvt );
- inline BOOL IsHighContrast( void ) const;
+ inline sal_Bool IsHighContrast( void ) const;
};
-inline BOOL SvxFrameWindow_Impl::IsHighContrast( void ) const
+inline sal_Bool SvxFrameWindow_Impl::IsHighContrast( void ) const
{
return GetSettings().GetStyleSettings().GetHighContrastMode();
}
@@ -292,20 +292,20 @@ private:
bool m_bIsWriter;
#if _SOLAR__PRIVATE
- void MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& rSize, String& rStr,
+ void MakeLineBitmap( sal_uInt16 nNo, Bitmap& rBmp, const Size& rSize, String& rStr,
const ::Color& rLine, const ::Color& rBack );
DECL_LINK( SelectHdl, void * );
#endif
protected:
virtual void Resize();
- virtual BOOL Close();
+ virtual sal_Bool Close();
virtual Window* GetPreferredKeyInputWindow();
virtual void GetFocus();
virtual void DataChanged( const DataChangedEvent& rDCEvt );
void CreateBitmaps( void );
public:
- SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow );
+ SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow );
void StartSelection();
virtual SfxPopupWindow* Clone() const;
@@ -322,12 +322,12 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener
{
public:
SfxStyleControllerItem_Impl( const Reference< XDispatchProvider >& rDispatchProvider,
- USHORT nSlotId,
+ sal_uInt16 nSlotId,
const rtl::OUString& rCommand,
SvxStyleToolBoxControl& rTbxCtl );
protected:
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState );
private:
SvxStyleToolBoxControl& rControl;
@@ -339,21 +339,21 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener
SvxStyleBox_Impl::SvxStyleBox_Impl(
Window* pParent,
- USHORT nSlot,
+ sal_uInt16 nSlot,
const rtl::OUString& rCommand,
SfxStyleFamily eFamily,
const Reference< XDispatchProvider >& rDispatchProvider,
const Reference< XFrame >& _xFrame,
const String& rClearFormatKey,
const String& rMoreKey,
- BOOL bInSpec) :
+ sal_Bool bInSpec) :
ComboBox( pParent, SVX_RES( RID_SVXTBX_STYLE ) ),
nSlotId ( nSlot ),
eStyleFamily( eFamily ),
- bRelease ( TRUE ),
- bVisible(FALSE),
+ bRelease ( sal_True ),
+ bVisible(sal_False),
m_xDispatchProvider( rDispatchProvider ),
m_xFrame(_xFrame),
m_aCommand ( rCommand ),
@@ -362,7 +362,7 @@ SvxStyleBox_Impl::SvxStyleBox_Impl(
bInSpecialMode ( bInSpec )
{
aLogicalSize = PixelToLogic( GetSizePixel(), MAP_APPFONT );
- EnableAutocomplete( TRUE );
+ EnableAutocomplete( sal_True );
}
SvxStyleBox_Impl::~SvxStyleBox_Impl()
@@ -375,7 +375,7 @@ void SvxStyleBox_Impl::ReleaseFocus()
{
if ( !bRelease )
{
- bRelease = TRUE;
+ bRelease = sal_True;
return;
}
if ( m_xFrame.is() && m_xFrame->getContainerWindow().is() )
@@ -463,7 +463,7 @@ void SvxStyleBox_Impl::SetFamily( SfxStyleFamily eNewFamily )
long SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt )
{
- USHORT nType = rNEvt.GetType();
+ sal_uInt16 nType = rNEvt.GetType();
if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
nCurSel = GetSelectEntryPos();
@@ -484,7 +484,7 @@ long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt )
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
- USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+ sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
switch ( nCode )
{
@@ -492,7 +492,7 @@ long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt )
case KEY_TAB:
{
if ( KEY_TAB == nCode )
- bRelease = FALSE;
+ bRelease = sal_False;
else
nHandled = 1;
Select();
@@ -536,7 +536,7 @@ void SvxStyleBox_Impl::StateChanged( StateChangedType nStateChange )
}
else if ( nStateChange == STATE_CHANGE_INITSHOW )
{
- bVisible = TRUE;
+ bVisible = sal_True;
if ( aVisibilityListener.IsSet() )
aVisibilityListener.Call( this );
}
@@ -554,9 +554,9 @@ IMPL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control*, _pCtrl )
// -----------------------------------------------------------------------
-BOOL GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox )
+sal_Bool GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox )
{
- BOOL bChanged = FALSE;
+ sal_Bool bChanged = sal_False;
const SfxObjectShell* pDocSh = SfxObjectShell::Current();
SvxFontListItem* pFontListItem = NULL;
@@ -568,7 +568,7 @@ BOOL GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox
::std::auto_ptr<FontList> aFontList(new FontList( pBox ));
*ppFontList = aFontList.get();
pBox->SetOwnFontList(aFontList);
- bChanged = TRUE;
+ bChanged = sal_True;
}
if ( pFontListItem )
@@ -581,7 +581,7 @@ BOOL GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox
{
// => "ubernehmen
*ppFontList = pNewFontList;
- bChanged = TRUE;
+ bChanged = sal_True;
}
else
{
@@ -634,7 +634,7 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( Window* pParent, const Reference< XDis
pFontList ( NULL ),
aLogicalSize ( 75,160 ),
nFtCount ( 0 ),
- bRelease ( TRUE ),
+ bRelease ( sal_True ),
m_xDispatchProvider( rDispatchProvider ),
m_xFrame (_xFrame)
{
@@ -674,7 +674,7 @@ void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem )
long SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt )
{
- USHORT nType = rNEvt.GetType();
+ sal_uInt16 nType = rNEvt.GetType();
if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType )
{
@@ -692,7 +692,7 @@ long SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
- USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+ sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
switch ( nCode )
{
@@ -700,7 +700,7 @@ long SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt )
case KEY_TAB:
{
if ( KEY_TAB == nCode )
- bRelease = FALSE;
+ bRelease = sal_False;
else
nHandled = 1;
Select();
@@ -743,7 +743,7 @@ void SvxFontNameBox_Impl::ReleaseFocus_Impl()
{
if ( !bRelease )
{
- bRelease = TRUE;
+ bRelease = sal_True;
return;
}
if ( m_xFrame.is() && m_xFrame->getContainerWindow().is() )
@@ -755,8 +755,8 @@ void SvxFontNameBox_Impl::ReleaseFocus_Impl()
void SvxFontNameBox_Impl::EnableControls_Impl()
{
SvtFontOptions aFontOpt;
- BOOL bEnable = aFontOpt.IsFontHistoryEnabled();
- USHORT nEntries = bEnable ? MAX_MRU_FONTNAME_ENTRIES : 0;
+ sal_Bool bEnable = aFontOpt.IsFontHistoryEnabled();
+ sal_uInt16 nEntries = bEnable ? MAX_MRU_FONTNAME_ENTRIES : 0;
if ( GetMaxMRUCount() != nEntries )
{
// refill in the next GetFocus-Handler
@@ -824,7 +824,7 @@ void SvxFontNameBox_Impl::Select()
#define PALETTE_SIZE (PALETTE_X * PALETTE_Y)
SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
- USHORT nSlotId,
+ sal_uInt16 nSlotId,
const Reference< XFrame >& rFrame,
const String& rWndTitle,
Window* pParentWindow ) :
@@ -839,7 +839,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
SfxObjectShell* pDocSh = SfxObjectShell::Current();
const SfxPoolItem* pItem = NULL;
XColorTable* pColorTable = NULL;
- BOOL bKillTable = FALSE;
+ sal_Bool bKillTable = sal_False;
const Size aSize12( 13, 13 );
if ( pDocSh )
@@ -849,7 +849,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
if ( !pColorTable )
{
pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
- bKillTable = TRUE;
+ bKillTable = sal_True;
}
if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId )
@@ -934,7 +934,7 @@ SfxPopupWindow* SvxColorWindow_Impl::Clone() const
IMPL_LINK( SvxColorWindow_Impl, SelectHdl, void *, EMPTYARG )
{
- USHORT nItemId = aColorSet.GetSelectItemId();
+ sal_uInt16 nItemId = aColorSet.GetSelectItemId();
SvxColorItem aColorItem( aColorSet.GetItemColor( nItemId ), theSlotId );
/* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() calls.
@@ -999,14 +999,14 @@ void SvxColorWindow_Impl::StartSelection()
// -----------------------------------------------------------------------
-BOOL SvxColorWindow_Impl::Close()
+sal_Bool SvxColorWindow_Impl::Close()
{
return SfxPopupWindow::Close();
}
// -----------------------------------------------------------------------
-void SvxColorWindow_Impl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
if (( SFX_ITEM_DISABLED != eState ) && pState )
{
@@ -1053,7 +1053,7 @@ void SvxColorWindow_Impl::StateChanged( USHORT nSID, SfxItemState eState, const
// class SvxFrameWindow_Impl --------------------------------------------------
//========================================================================
-SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
+SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL ) ),
aFrameSet ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ),
@@ -1075,7 +1075,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >&
* abgeschaltet werden
*/
- USHORT i = 0;
+ sal_uInt16 i = 0;
for ( i=1; i<9; i++ )
aFrameSet.InsertItem( i, aImgList.GetImage(i) );
@@ -1126,9 +1126,9 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt )
{
aImgList = ImageList( SVX_RES( IsHighContrast()? RID_SVXIL_FRAME_HC : RID_SVXIL_FRAME ) );
- USHORT nNumOfItems = aFrameSet.GetItemCount();
+ sal_uInt16 nNumOfItems = aFrameSet.GetItemCount();
- for( USHORT i = 1 ; i <= nNumOfItems ; ++i )
+ for( sal_uInt16 i = 1 ; i <= nNumOfItems ; ++i )
aFrameSet.SetItemImage( i, aImgList.GetImage( i ) );
}
}
@@ -1157,9 +1157,9 @@ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG )
*pRight = 0,
*pTop = 0,
*pBottom = 0;
- USHORT nSel = aFrameSet.GetSelectItemId();
- USHORT nModifier = aFrameSet.GetModifier();
- BYTE nValidFlags = 0;
+ sal_uInt16 nSel = aFrameSet.GetSelectItemId();
+ sal_uInt16 nModifier = aFrameSet.GetModifier();
+ sal_uInt8 nValidFlags = 0;
theDefLine.SetOutWidth( DEF_LINE_WIDTH_0 );
switch ( nSel )
@@ -1233,8 +1233,8 @@ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG )
aBorderInner.SetValid( VALID_RIGHT, 0 != (nValidFlags&FRM_VALID_RIGHT ));
aBorderInner.SetValid( VALID_HORI, 0 != (nValidFlags&FRM_VALID_HINNER ));
aBorderInner.SetValid( VALID_VERT, 0 != (nValidFlags&FRM_VALID_VINNER));
- aBorderInner.SetValid( VALID_DISTANCE, TRUE );
- aBorderInner.SetValid( VALID_DISABLE, FALSE );
+ aBorderInner.SetValid( VALID_DISTANCE, sal_True );
+ aBorderInner.SetValid( VALID_DISABLE, sal_False );
if ( IsInPopupMode() )
EndPopupMode();
@@ -1270,7 +1270,7 @@ void SvxFrameWindow_Impl::Resize()
void SvxFrameWindow_Impl::StateChanged(
- USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
if ( pState && nSID == SID_BORDER_REDUCED_MODE)
@@ -1279,24 +1279,24 @@ void SvxFrameWindow_Impl::StateChanged(
if ( pItem )
{
- bParagraphMode = (BOOL)pItem->GetValue();
+ bParagraphMode = (sal_Bool)pItem->GetValue();
//initial calls mustn't insert or remove elements
if(aFrameSet.GetItemCount())
{
- BOOL bTableMode = ( aFrameSet.GetItemCount() == 12 );
- BOOL bResize = FALSE;
+ sal_Bool bTableMode = ( aFrameSet.GetItemCount() == 12 );
+ sal_Bool bResize = sal_False;
if ( bTableMode && bParagraphMode )
{
- for ( USHORT i = 9; i < 13; i++ )
+ for ( sal_uInt16 i = 9; i < 13; i++ )
aFrameSet.RemoveItem(i);
- bResize = TRUE;
+ bResize = sal_True;
}
else if ( !bTableMode && !bParagraphMode )
{
- for ( USHORT i = 9; i < 13; i++ )
+ for ( sal_uInt16 i = 9; i < 13; i++ )
aFrameSet.InsertItem( i, aImgList.GetImage(i) );
- bResize = TRUE;
+ bResize = sal_True;
}
if ( bResize )
@@ -1318,7 +1318,7 @@ void SvxFrameWindow_Impl::StartSelection()
// -----------------------------------------------------------------------
-BOOL SvxFrameWindow_Impl::Close()
+sal_Bool SvxFrameWindow_Impl::Close()
{
return SfxPopupWindow::Close();
}
@@ -1327,7 +1327,7 @@ BOOL SvxFrameWindow_Impl::Close()
// class SvxLineWindow_Impl --------------------------------------------------
//========================================================================
-SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
+SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) :
SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_BORDER | WB_STDFLOATWIN | WB_3DLOOK | WB_DIALOGCONTROL ) ),
@@ -1362,7 +1362,7 @@ SfxPopupWindow* SvxLineWindow_Impl::Clone() const
// -----------------------------------------------------------------------
-void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& rSize, String& rStr,
+void SvxLineWindow_Impl::MakeLineBitmap( sal_uInt16 nNo, Bitmap& rBmp, const Size& rSize, String& rStr,
const ::Color& rLineCol, const ::Color& rBackCol )
{
VirtualDevice aVirDev( *this );
@@ -1388,14 +1388,14 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
aRect.Top() = 5;
aRect.Bottom() = 6;
aVirDev.DrawRect( aRect );
- nLineWidth = (USHORT) DEF_LINE_WIDTH_1/20;
+ nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_1/20;
break;
case 3: // DEF_LINE_WIDTH_2
aRect.Top() = 5;
aRect.Bottom() = 7;
aVirDev.DrawRect( aRect );
- nLineWidth = (USHORT) DEF_LINE_WIDTH_2/20;
+ nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_2/20;
break;
case 4: // DEF_LINE_WIDTH_3
@@ -1403,14 +1403,14 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
aRect.Bottom() = 7;
aVirDev.DrawRect( aRect );
aVirDev.DrawRect( Rectangle( Point(2,4), Point(37,7) ) );
- nLineWidth = (USHORT) DEF_LINE_WIDTH_3/20;
+ nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_3/20;
break;
case 5: // DEF_LINE_WIDTH_4
aRect.Top() = 4;
aRect.Bottom() = 8;
aVirDev.DrawRect( aRect );
- nLineWidth = (USHORT) DEF_LINE_WIDTH_4/20;
+ nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_4/20;
break;
case 6: // DEF_DOUBLE_LINE0
@@ -1420,7 +1420,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
aRect.Top() = 7;
aRect.Bottom() = 7;
aVirDev.DrawRect( aRect );
- nLineWidth = (USHORT) (DEF_DOUBLE_LINE0_OUT+DEF_DOUBLE_LINE0_IN+DEF_DOUBLE_LINE0_DIST)/20;
+ nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE0_OUT+DEF_DOUBLE_LINE0_IN+DEF_DOUBLE_LINE0_DIST)/20;
break;
case 7: // DEF_DOUBLE_LINE7
@@ -1430,7 +1430,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
aRect.Top() = 7;
aRect.Bottom() = 7;
aVirDev.DrawRect( aRect );
- nLineWidth = (USHORT) (DEF_DOUBLE_LINE7_OUT+DEF_DOUBLE_LINE7_IN+DEF_DOUBLE_LINE7_DIST)/20;
+ nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE7_OUT+DEF_DOUBLE_LINE7_IN+DEF_DOUBLE_LINE7_DIST)/20;
break;
case 8: // DEF_DOUBLE_LINE1
@@ -1440,7 +1440,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
aRect.Top() = 7;
aRect.Bottom() = 8;
aVirDev.DrawRect( aRect );
- nLineWidth = (USHORT) (DEF_DOUBLE_LINE1_OUT+DEF_DOUBLE_LINE1_IN+DEF_DOUBLE_LINE1_DIST)/20;
+ nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE1_OUT+DEF_DOUBLE_LINE1_IN+DEF_DOUBLE_LINE1_DIST)/20;
break;
case 9: // DEF_DOUBLE_LINE2
@@ -1450,7 +1450,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
aRect.Top() = 8;
aRect.Bottom() = 10;
aVirDev.DrawRect( aRect );
- nLineWidth = (USHORT) (DEF_DOUBLE_LINE2_OUT+DEF_DOUBLE_LINE2_IN+DEF_DOUBLE_LINE2_DIST)/20;
+ nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE2_OUT+DEF_DOUBLE_LINE2_IN+DEF_DOUBLE_LINE2_DIST)/20;
break;
case 10: // DEF_DOUBLE_LINE8
@@ -1460,7 +1460,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
aRect.Top() = 7;
aRect.Bottom() = 7;
aVirDev.DrawRect( aRect );
- nLineWidth = (USHORT) (DEF_DOUBLE_LINE8_OUT+DEF_DOUBLE_LINE8_IN+DEF_DOUBLE_LINE8_DIST)/20;
+ nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE8_OUT+DEF_DOUBLE_LINE8_IN+DEF_DOUBLE_LINE8_DIST)/20;
break;
case 11: // DEF_DOUBLE_LINE9
@@ -1470,7 +1470,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
aRect.Top() = 8;
aRect.Bottom() = 8;
aVirDev.DrawRect( aRect );
- nLineWidth = (USHORT) (DEF_DOUBLE_LINE9_OUT+DEF_DOUBLE_LINE9_IN+DEF_DOUBLE_LINE9_DIST)/20;
+ nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE9_OUT+DEF_DOUBLE_LINE9_IN+DEF_DOUBLE_LINE9_DIST)/20;
break;
case 12: // DEF_DOUBLE_LINE10
@@ -1480,7 +1480,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
aRect.Top() = 8;
aRect.Bottom() = 8;
aVirDev.DrawRect( aRect );
- nLineWidth = (USHORT) (DEF_DOUBLE_LINE10_OUT+DEF_DOUBLE_LINE10_IN+DEF_DOUBLE_LINE10_DIST)/20;
+ nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE10_OUT+DEF_DOUBLE_LINE10_IN+DEF_DOUBLE_LINE10_DIST)/20;
break;
case 13: // DEF_DOUBLE_LINE3
@@ -1490,7 +1490,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
aRect.Top() = 7;
aRect.Bottom() = 7;
aVirDev.DrawRect( aRect );
- nLineWidth = (USHORT) (DEF_DOUBLE_LINE3_OUT+DEF_DOUBLE_LINE3_IN+DEF_DOUBLE_LINE3_DIST)/20;
+ nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE3_OUT+DEF_DOUBLE_LINE3_IN+DEF_DOUBLE_LINE3_DIST)/20;
break;
case 14: // DEF_DOUBLE_LINE4
@@ -1500,7 +1500,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
aRect.Top() = 6;
aRect.Bottom() = 7;
aVirDev.DrawRect( aRect );
- nLineWidth = (USHORT) (DEF_DOUBLE_LINE4_OUT+DEF_DOUBLE_LINE4_IN+DEF_DOUBLE_LINE4_DIST)/20;
+ nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE4_OUT+DEF_DOUBLE_LINE4_IN+DEF_DOUBLE_LINE4_DIST)/20;
break;
case 15: // DEF_DOUBLE_LINE5
@@ -1510,7 +1510,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
aRect.Top() = 8;
aRect.Bottom() = 9;
aVirDev.DrawRect( aRect );
- nLineWidth = (USHORT) (DEF_DOUBLE_LINE5_OUT+DEF_DOUBLE_LINE5_IN+DEF_DOUBLE_LINE5_DIST)/20;
+ nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE5_OUT+DEF_DOUBLE_LINE5_IN+DEF_DOUBLE_LINE5_DIST)/20;
break;
case 16: // DEF_DOUBLE_LINE6
@@ -1520,7 +1520,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
aRect.Top() = 7;
aRect.Bottom() = 9;
aVirDev.DrawRect( aRect );
- nLineWidth = (USHORT) (DEF_DOUBLE_LINE6_OUT+DEF_DOUBLE_LINE6_IN+DEF_DOUBLE_LINE6_DIST)/20;
+ nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE6_OUT+DEF_DOUBLE_LINE6_IN+DEF_DOUBLE_LINE6_DIST)/20;
break;
default:
@@ -1539,10 +1539,10 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r
IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
{
SvxLineItem aLineItem( SID_FRAME_LINESTYLE );
- USHORT n1 = 0,
+ sal_uInt16 n1 = 0,
n2 = 0,
n3 = 0;
- BOOL bSetLine = TRUE;
+ sal_Bool bSetLine = sal_True;
switch ( aLineSet.GetSelectItemId() )
{
@@ -1587,7 +1587,7 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG )
n3 = DEF_DOUBLE_LINE6_DIST; break;
case 0:
default:
- bSetLine = FALSE;
+ bSetLine = sal_False;
break;
}
if ( bSetLine )
@@ -1634,7 +1634,7 @@ void SvxLineWindow_Impl::StartSelection()
// -----------------------------------------------------------------------
-BOOL SvxLineWindow_Impl::Close()
+sal_Bool SvxLineWindow_Impl::Close()
{
return SfxPopupWindow::Close();
}
@@ -1676,7 +1676,7 @@ void SvxLineWindow_Impl::CreateBitmaps( void )
::Color aBackCol( rStyleSettings.GetWindowColor() );
aLineSet.Clear();
- for( USHORT i = 1 ; i < 17 ; ++i )
+ for( sal_uInt16 i = 1 ; i < 17 ; ++i )
{
MakeLineBitmap( i, aBmp, aBmpSize, aStr, aLineCol, aBackCol );
aLineSet.InsertItem( i, aBmp, aStr );
@@ -1694,7 +1694,7 @@ void SvxLineWindow_Impl::CreateBitmaps( void )
SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl(
const Reference< XDispatchProvider >& rDispatchProvider,
- USHORT nSlotId, // Family-ID
+ sal_uInt16 nSlotId, // Family-ID
const rtl::OUString& rCommand, // .uno: command bound to this item
SvxStyleToolBoxControl& rTbxCtl ) // Controller-Instanz, dem dieses Item zugeordnet ist.
: SfxStatusListener( rDispatchProvider, nSlotId, rCommand ),
@@ -1705,7 +1705,7 @@ SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl(
// -----------------------------------------------------------------------
void SfxStyleControllerItem_Impl::StateChanged(
- USHORT, SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
switch ( GetId() )
{
@@ -1715,7 +1715,7 @@ void SfxStyleControllerItem_Impl::StateChanged(
case SID_STYLE_FAMILY4:
case SID_STYLE_FAMILY5:
{
- const USHORT nIdx = GetId() - SID_STYLE_FAMILY_START;
+ const sal_uInt16 nIdx = GetId() - SID_STYLE_FAMILY_START;
if ( SFX_ITEM_AVAILABLE == eState )
{
@@ -1742,16 +1742,16 @@ struct SvxStyleToolBoxControl::Impl
String aClearForm;
String aMore;
::std::vector< ::rtl::OUString > aDefaultStyles;
- BOOL bListening;
- BOOL bSpecModeWriter;
- BOOL bSpecModeCalc;
+ sal_Bool bListening;
+ sal_Bool bSpecModeWriter;
+ sal_Bool bSpecModeCalc;
inline Impl( void )
:aClearForm ( SVX_RESSTR( RID_SVXSTR_CLEARFORM ) )
,aMore ( SVX_RESSTR( RID_SVXSTR_MORE ) )
- ,bListening ( FALSE )
- ,bSpecModeWriter ( FALSE )
- ,bSpecModeCalc ( FALSE )
+ ,bListening ( sal_False )
+ ,bSpecModeWriter ( sal_False )
+ ,bSpecModeCalc ( sal_False )
{
@@ -1848,14 +1848,14 @@ static const char* StyleSlotToStyleCommand[MAX_FAMILIES] =
};
SvxStyleToolBoxControl::SvxStyleToolBoxControl(
- USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+ sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
: SfxToolBoxControl ( nSlotId, nId, rTbx ),
pStyleSheetPool ( NULL ),
nActFamily ( 0xffff ),
- bListening ( FALSE ),
+ bListening ( sal_False ),
pImpl ( new Impl )
{
- for ( USHORT i=0; i<MAX_FAMILIES; i++ )
+ for ( sal_uInt16 i=0; i<MAX_FAMILIES; i++ )
{
pBoundItems[i] = 0;
m_xBoundItems[i] = Reference< XComponent >();
@@ -1880,7 +1880,7 @@ throw ( Exception, RuntimeException)
{
pImpl->InitializeStyles(m_xFrame->getController()->getModel());
Reference< XDispatchProvider > xDispatchProvider( m_xFrame->getController(), UNO_QUERY );
- for ( USHORT i=0; i<MAX_FAMILIES; i++ )
+ for ( sal_uInt16 i=0; i<MAX_FAMILIES; i++ )
{
pBoundItems[i] = new SfxStyleControllerItem_Impl( xDispatchProvider,
SID_STYLE_FAMILY_START + i,
@@ -1898,7 +1898,7 @@ throw (::com::sun::star::uno::RuntimeException)
{
SfxToolBoxControl::dispose();
- for( USHORT i=0; i<MAX_FAMILIES; i++ )
+ for( sal_uInt16 i=0; i<MAX_FAMILIES; i++ )
{
if ( m_xBoundItems[i].is() )
{
@@ -1964,10 +1964,10 @@ void SvxStyleToolBoxControl::FillStyleBox()
if ( pStyleSheetPool && pBox && nActFamily!=0xffff )
{
const SfxStyleFamily eFamily = GetActFamily();
- USHORT nCount = pStyleSheetPool->Count();
- USHORT i = 0;
+ sal_uInt16 nCount = pStyleSheetPool->Count();
+ sal_uInt16 i = 0;
SfxStyleSheetBase* pStyle = NULL;
- BOOL bDoFill = FALSE;
+ sal_Bool bDoFill = sal_False;
pStyleSheetPool->SetSearchMask( eFamily, SFXSTYLEBIT_USED );
@@ -1980,7 +1980,7 @@ void SvxStyleToolBoxControl::FillStyleBox()
//!!! so the list doesn't show the count
if ( nCount != pBox->GetEntryCount() )
{
- bDoFill = TRUE;
+ bDoFill = sal_True;
}
else
{
@@ -1994,11 +1994,11 @@ void SvxStyleToolBoxControl::FillStyleBox()
if ( bDoFill )
{
- pBox->SetUpdateMode( FALSE );
+ pBox->SetUpdateMode( sal_False );
pBox->Clear();
{
- USHORT _i;
+ sal_uInt16 _i;
sal_uInt32 nCnt = pImpl->aDefaultStyles.size();
bool bInsert;
@@ -2038,9 +2038,9 @@ void SvxStyleToolBoxControl::FillStyleBox()
if( pImpl->bSpecModeWriter || pImpl->bSpecModeCalc )
{
// insert default styles
- USHORT _i;
+ sal_uInt16 _i;
sal_uInt32 nCnt = pImpl->aDefaultStyles.size();
- USHORT nPos = 1;
+ sal_uInt16 nPos = 1;
for( _i = 0 ; _i < nCnt ; ++_i )
{
pBox->InsertEntry( pImpl->aDefaultStyles[_i], nPos );
@@ -2062,10 +2062,10 @@ void SvxStyleToolBoxControl::FillStyleBox()
pBox->SetStyle( nWinBits );
}
- pBox->SetUpdateMode( TRUE );
+ pBox->SetUpdateMode( sal_True );
pBox->SetFamily( eFamily );
- USHORT nLines = Min( pBox->GetEntryCount(), MAX_STYLES_ENTRIES );
+ sal_uInt16 nLines = Min( pBox->GetEntryCount(), MAX_STYLES_ENTRIES );
pBox->SetDropDownLineCount( nLines );
}
}
@@ -2105,7 +2105,7 @@ void SvxStyleToolBoxControl::Update()
if ( pDocShell )
pPool = pDocShell->GetStyleSheetPool();
- USHORT i;
+ sal_uInt16 i;
for ( i=0; i<MAX_FAMILIES; i++ )
if( pFamilyState[i] )
break;
@@ -2149,7 +2149,7 @@ void SvxStyleToolBoxControl::Update()
// -----------------------------------------------------------------------
-void SvxStyleToolBoxControl::SetFamilyState( USHORT nIdx,
+void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx,
const SfxTemplateItem* pItem )
{
DELETEZ( pFamilyState[nIdx] );
@@ -2165,7 +2165,7 @@ void SvxStyleToolBoxControl::SetFamilyState( USHORT nIdx,
IMPL_LINK( SvxStyleToolBoxControl, VisibilityNotification, void*, EMPTYARG )
{
- USHORT i;
+ sal_uInt16 i;
// Call ReBind() && UnBind() according to visibility
SvxStyleBox_Impl* pBox = (SvxStyleBox_Impl*)( GetToolBox().GetItemWindow( GetId() ));
@@ -2190,10 +2190,10 @@ IMPL_LINK( SvxStyleToolBoxControl, VisibilityNotification, void*, EMPTYARG )
void SvxStyleToolBoxControl::StateChanged(
- USHORT , SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
{
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
SvxStyleBox_Impl* pBox = (SvxStyleBox_Impl*)(rTbx.GetItemWindow( nId ));
TriState eTri = STATE_NOCHECK;
@@ -2252,8 +2252,8 @@ Window* SvxStyleToolBoxControl::CreateItemWindow( Window *pParent )
//========================================================================
SvxFontNameToolBoxControl::SvxFontNameToolBoxControl(
- USHORT nSlotId,
- USHORT nId,
+ sal_uInt16 nSlotId,
+ sal_uInt16 nId,
ToolBox& rTbx )
: SfxToolBoxControl( nSlotId, nId, rTbx )
@@ -2264,10 +2264,10 @@ SvxFontNameToolBoxControl::SvxFontNameToolBoxControl(
void SvxFontNameToolBoxControl::StateChanged(
- USHORT , SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
{
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
SvxFontNameBox_Impl* pBox = (SvxFontNameBox_Impl*)(rTbx.GetItemWindow( nId ));
@@ -2313,8 +2313,8 @@ Window* SvxFontNameToolBoxControl::CreateItemWindow( Window *pParent )
//========================================================================
SvxFontColorToolBoxControl::SvxFontColorToolBoxControl(
- USHORT nSlotId,
- USHORT nId,
+ sal_uInt16 nSlotId,
+ sal_uInt16 nId,
ToolBox& rTbx )
: SfxToolBoxControl( nSlotId, nId, rTbx ),
@@ -2361,10 +2361,10 @@ SfxPopupWindow* SvxFontColorToolBoxControl::CreatePopupWindow()
void SvxFontColorToolBoxControl::StateChanged(
- USHORT , SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
{
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
const SvxColorItem* pItem = 0;
@@ -2382,7 +2382,7 @@ void SvxFontColorToolBoxControl::StateChanged(
// class SvxColorToolBoxControl --------------------------------
//========================================================================
-SvxColorToolBoxControl::SvxColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxColorToolBoxControl::SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
{
@@ -2412,7 +2412,7 @@ SfxPopupWindowType SvxColorToolBoxControl::GetPopupWindowType() const
SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow()
{
- USHORT nResId = GetSlotId() == SID_BACKGROUND_COLOR ?
+ sal_uInt16 nResId = GetSlotId() == SID_BACKGROUND_COLOR ?
RID_SVXSTR_BACKGROUND : RID_SVXSTR_COLOR;
SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl(
OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BackgroundColor" )),
@@ -2432,7 +2432,7 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow()
void SvxColorToolBoxControl::StateChanged(
- USHORT , SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
{
const SvxColorItem* pItem = 0;
@@ -2442,7 +2442,7 @@ void SvxColorToolBoxControl::StateChanged(
if ( pItem )
pBtnUpdater->Update( pItem->GetValue() );
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
@@ -2453,8 +2453,8 @@ void SvxColorToolBoxControl::StateChanged(
//========================================================================
SvxFontColorExtToolBoxControl::SvxFontColorExtToolBoxControl(
- USHORT nSlotId,
- USHORT nId,
+ sal_uInt16 nSlotId,
+ sal_uInt16 nId,
ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
@@ -2467,7 +2467,7 @@ SvxFontColorExtToolBoxControl::SvxFontColorExtToolBoxControl(
else
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharBackgroundExt" )));
- USHORT nMode = SID_ATTR_CHAR_COLOR2 == nSlotId
+ sal_uInt16 nMode = SID_ATTR_CHAR_COLOR2 == nSlotId
? TBX_UPDATER_MODE_CHAR_COLOR_NEW : TBX_UPDATER_MODE_CHAR_COLOR_NEW;
pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox(), nMode );
}
@@ -2512,10 +2512,10 @@ SfxPopupWindow* SvxFontColorExtToolBoxControl::CreatePopupWindow()
void SvxFontColorExtToolBoxControl::StateChanged(
- USHORT nSID, SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState )
{
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
const SvxColorItem* pItem = 0;
@@ -2541,7 +2541,7 @@ void SvxFontColorExtToolBoxControl::StateChanged(
// -----------------------------------------------------------------------
-void SvxFontColorExtToolBoxControl::Select( BOOL )
+void SvxFontColorExtToolBoxControl::Select( sal_Bool )
{
OUString aCommand;
OUString aParamName;
@@ -2567,8 +2567,8 @@ void SvxFontColorExtToolBoxControl::Select( BOOL )
//========================================================================
SvxFrameToolBoxControl::SvxFrameToolBoxControl(
- USHORT nSlotId,
- USHORT nId,
+ sal_uInt16 nSlotId,
+ sal_uInt16 nId,
ToolBox& rTbx )
: SfxToolBoxControl( nSlotId, nId, rTbx )
@@ -2601,10 +2601,10 @@ SfxPopupWindow* SvxFrameToolBoxControl::CreatePopupWindow()
void SvxFrameToolBoxControl::StateChanged(
- USHORT, SfxItemState eState, const SfxPoolItem* )
+ sal_uInt16, SfxItemState eState, const SfxPoolItem* )
{
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
@@ -2618,8 +2618,8 @@ void SvxFrameToolBoxControl::StateChanged(
//========================================================================
SvxFrameLineStyleToolBoxControl::SvxFrameLineStyleToolBoxControl(
- USHORT nSlotId,
- USHORT nId,
+ sal_uInt16 nSlotId,
+ sal_uInt16 nId,
ToolBox& rTbx )
: SfxToolBoxControl( nSlotId, nId, rTbx )
@@ -2639,7 +2639,7 @@ SfxPopupWindowType SvxFrameLineStyleToolBoxControl::GetPopupWindowType() const
SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
{
SvxLineWindow_Impl* pLineWin = new SvxLineWindow_Impl( GetSlotId(), m_xFrame, &GetToolBox() );
- pLineWin->StartPopupMode( &GetToolBox(), TRUE );
+ pLineWin->StartPopupMode( &GetToolBox(), sal_True );
pLineWin->StartSelection();
SetPopupWindow( pLineWin );
@@ -2650,9 +2650,9 @@ SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow()
void SvxFrameLineStyleToolBoxControl::StateChanged(
- USHORT , SfxItemState eState, const SfxPoolItem* )
+ sal_uInt16 , SfxItemState eState, const SfxPoolItem* )
{
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
@@ -2666,8 +2666,8 @@ void SvxFrameLineStyleToolBoxControl::StateChanged(
//========================================================================
SvxFrameLineColorToolBoxControl::SvxFrameLineColorToolBoxControl(
- USHORT nSlotId,
- USHORT nId,
+ sal_uInt16 nSlotId,
+ sal_uInt16 nId,
ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
@@ -2713,10 +2713,10 @@ SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow()
void SvxFrameLineColorToolBoxControl::StateChanged(
- USHORT , SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
{
- USHORT nId = GetId();
+ sal_uInt16 nId = GetId();
ToolBox& rTbx = GetToolBox();
rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState );
rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK );
@@ -2753,7 +2753,7 @@ public:
// -----------------------------------------------------------------------
-SvxReloadControllerItem::SvxReloadControllerItem( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxReloadControllerItem::SvxReloadControllerItem( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
: SfxToolBoxControl( nSlotId, nId, rTbx )
, pImpl( new SvxReloadControllerItem_Impl )
{
@@ -2770,7 +2770,7 @@ SvxReloadControllerItem::~SvxReloadControllerItem()
// -----------------------------------------------------------------------
void SvxReloadControllerItem::StateChanged(
- USHORT , SfxItemState eState, const SfxPoolItem* pState )
+ sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState )
{
SfxBoolItem* pItem = PTR_CAST( SfxBoolItem, pState );
ToolBox& rBox = GetToolBox();
@@ -2787,7 +2787,7 @@ void SvxReloadControllerItem::StateChanged(
// class SvxSimpleUndoRedoController -------------------------------------
//========================================================================
-SvxSimpleUndoRedoController::SvxSimpleUndoRedoController( USHORT nSlotId, USHORT nId, ToolBox& rTbx )
+SvxSimpleUndoRedoController::SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx )
:SfxToolBoxControl( nSlotId, nId, rTbx )
{
aDefaultText = rTbx.GetItemText( nId );
@@ -2801,7 +2801,7 @@ SvxSimpleUndoRedoController::~SvxSimpleUndoRedoController()
// -----------------------------------------------------------------------
-void SvxSimpleUndoRedoController::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState )
+void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
{
SfxStringItem* pItem = PTR_CAST( SfxStringItem, pState );
ToolBox& rBox = GetToolBox();
@@ -2837,7 +2837,7 @@ void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemS
// -----------------------------------------------------------------------
-BOOL lcl_FontChangedHint( const SfxHint &rHint )
+sal_Bool lcl_FontChangedHint( const SfxHint &rHint )
{
SfxPoolItemHint *pItemHint = PTR_CAST(SfxPoolItemHint, &rHint);
if ( pItemHint )
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index d9d2dc3e44df..bbb00d0085a0 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -72,7 +72,7 @@ private:
FontHeightToolBoxControl* m_pCtrl;
String m_aCurText;
Size m_aLogicalSize;
- BOOL m_bRelease;
+ sal_Bool m_bRelease;
uno::Reference< frame::XDispatchProvider > m_xDispatchProvider;
uno::Reference< frame::XFrame > m_xFrame;
uno::Reference< awt::XWindow > m_xOldFocusWindow;
@@ -94,7 +94,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl(
m_pCtrl ( &_rCtrl ),
m_aLogicalSize ( 30,100 ),
- m_bRelease ( TRUE ),
+ m_bRelease ( sal_True ),
m_xDispatchProvider ( _rDispatchProvider ),
m_xFrame ( _xFrame )
{
@@ -109,7 +109,7 @@ void SvxFontSizeBox_Impl::ReleaseFocus_Impl()
{
if ( !m_bRelease )
{
- m_bRelease = TRUE;
+ m_bRelease = sal_True;
return;
}
@@ -197,7 +197,7 @@ long SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt )
if ( rNEvt.GetType() == EVENT_KEYINPUT )
{
- USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
+ sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode();
switch ( nCode )
{
@@ -205,7 +205,7 @@ long SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt )
case KEY_TAB:
{
if ( KEY_TAB == nCode )
- m_bRelease = FALSE;
+ m_bRelease = sal_False;
else
nHandled = 1;
Select();
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index e446d3d3b9d5..f2926c38aa5b 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -96,14 +96,14 @@ void FindTextFieldControl::InitControls_Impl()
SetText( SVX_RESSTR( RID_SVXSTR_FINDBAR_FIND ) );
SetControlForeground(GetSettings().GetStyleSettings().GetDisableColor());
- EnableAutocomplete(TRUE, TRUE);
+ EnableAutocomplete(sal_True, sal_True);
}
void FindTextFieldControl::Remember_Impl(const String& rStr)
{
- USHORT nCount = GetEntryCount();
+ sal_uInt16 nCount = GetEntryCount();
- for (USHORT i=0; i<nCount; ++i)
+ for (sal_uInt16 i=0; i<nCount; ++i)
{
if ( rStr == GetEntry(i))
return;
@@ -357,8 +357,8 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< :
ToolBox* pToolBox = (ToolBox*)pWindow;
if ( pToolBox )
{
- USHORT nItemCount = pToolBox->GetItemCount();
- for ( USHORT i=0; i<nItemCount; ++i )
+ sal_uInt16 nItemCount = pToolBox->GetItemCount();
+ for ( sal_uInt16 i=0; i<nItemCount; ++i )
{
::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
if ( sItemCommand.equals( COMMAND_DOWNSEARCH ) )
@@ -528,8 +528,8 @@ void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
ToolBox* pToolBox = (ToolBox*)pWindow;
if ( pToolBox )
{
- USHORT nItemCount = pToolBox->GetItemCount();
- for ( USHORT i=0; i<nItemCount; ++i )
+ sal_uInt16 nItemCount = pToolBox->GetItemCount();
+ for ( sal_uInt16 i=0; i<nItemCount; ++i )
{
::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
if ( sItemCommand.equals( COMMAND_FINDTEXT ) )
@@ -657,8 +657,8 @@ void SAL_CALL UpSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) th
ToolBox* pToolBox = (ToolBox*)pWindow;
if ( pToolBox )
{
- USHORT nItemCount = pToolBox->GetItemCount();
- for ( USHORT i=0; i<nItemCount; ++i )
+ sal_uInt16 nItemCount = pToolBox->GetItemCount();
+ for ( sal_uInt16 i=0; i<nItemCount; ++i )
{
::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
if ( sItemCommand.equals( COMMAND_FINDTEXT ) )
@@ -815,8 +815,8 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css
ToolBox* pToolBox = (ToolBox*)pWindow;
if ( pToolBox )
{
- USHORT nItemCount = pToolBox->GetItemCount();
- for ( USHORT i=0; i<nItemCount; ++i )
+ sal_uInt16 nItemCount = pToolBox->GetItemCount();
+ for ( sal_uInt16 i=0; i<nItemCount; ++i )
{
::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i);
if ( sItemCommand.equalsAscii(".uno:FindText") )
diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx
index e0bcd03b62fc..8b509fdafc50 100644
--- a/svx/source/tbxctrls/tbxalign.cxx
+++ b/svx/source/tbxctrls/tbxalign.cxx
@@ -53,7 +53,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlAlign, SfxAllEnumItem);
|*
\************************************************************************/
-SvxTbxCtlAlign::SvxTbxCtlAlign( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxTbxCtlAlign::SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx )
, m_aSubTbName( RTL_CONSTASCII_USTRINGPARAM( "alignmentbar" ))
, m_aSubTbResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/alignmentbar" ))
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx
index dd96799af0fd..e218f01fac0e 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++ b/svx/source/tbxctrls/tbxcolorupdate.cxx
@@ -47,10 +47,10 @@ namespace svx
//====================================================================
ToolboxButtonColorUpdater::ToolboxButtonColorUpdater(
- USHORT nId,
- USHORT nTbxBtnId,
+ sal_uInt16 nId,
+ sal_uInt16 nTbxBtnId,
ToolBox* ptrTbx,
- USHORT nMode ) :
+ sal_uInt16 nMode ) :
mnDrawMode ( nMode ),
mnBtnId ( nTbxBtnId ),
mnSlotId ( nId ),
@@ -60,7 +60,7 @@ namespace svx
if (mnSlotId == SID_BACKGROUND_COLOR)
mnDrawMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
DBG_ASSERT( ptrTbx, "ToolBox not found :-(" );
- mbWasHiContrastMode = ptrTbx ? ( ptrTbx->GetSettings().GetStyleSettings().GetHighContrastMode() ) : FALSE;
+ mbWasHiContrastMode = ptrTbx ? ( ptrTbx->GetSettings().GetStyleSettings().GetHighContrastMode() ) : sal_False;
Update(mnSlotId == SID_ATTR_CHAR_COLOR2 ? COL_BLACK : COL_GRAY);
}
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index 34969ca00bc2..5943d6d0286d 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star::frame;
// -----------------------------------------------------------------------
-SvxTbxCtlDraw::SvxTbxCtlDraw( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
@@ -68,7 +68,7 @@ SvxTbxCtlDraw::SvxTbxCtlDraw( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
// -----------------------------------------------------------------------
-void SvxTbxCtlDraw::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState )
{
GetToolBox().EnableItem( GetId(), ( eState != SFX_ITEM_DISABLED ) );
@@ -94,7 +94,7 @@ void SvxTbxCtlDraw::toggleToolbox()
Reference< XLayoutManager > xLayoutMgr = getLayoutManager();
if ( xLayoutMgr.is() )
{
- BOOL bCheck = FALSE;
+ sal_Bool bCheck = sal_False;
if ( xLayoutMgr->isElementVisible( m_sToolboxName ) )
{
xLayoutMgr->hideElement( m_sToolboxName );
@@ -102,7 +102,7 @@ void SvxTbxCtlDraw::toggleToolbox()
}
else
{
- bCheck = TRUE;
+ bCheck = sal_True;
xLayoutMgr->createElement( m_sToolboxName );
xLayoutMgr->showElement( m_sToolboxName );
}
@@ -113,7 +113,7 @@ void SvxTbxCtlDraw::toggleToolbox()
// -----------------------------------------------------------------------
-void SvxTbxCtlDraw::Select( BOOL )
+void SvxTbxCtlDraw::Select( sal_Bool )
{
toggleToolbox();
}
diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx
index 14ffdc778361..6f437dfb791e 100644
--- a/svx/source/tbxctrls/verttexttbxctrl.cxx
+++ b/svx/source/tbxctrls/verttexttbxctrl.cxx
@@ -42,22 +42,22 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxVertTextTbxCtrl, SfxBoolItem);
// -----------------------------27.04.01 15:50--------------------------------
-SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx )
{
- SetVert(FALSE);
+ SetVert(sal_False);
addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CTLFontState" )));
}
-SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx )
{
- SetVert(TRUE);
+ SetVert(sal_True);
addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:VerticalTextState" )));
}
/* ---------------------------------------------------------------------------*/
-SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) :
+SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :
SfxToolBoxControl( nSlotId, nId, rTbx ),
bCheckVertical(sal_True)
{
@@ -73,13 +73,13 @@ SvxVertCTLTextTbxCtrl::~SvxVertCTLTextTbxCtrl( )
---------------------------------------------------------------------------*/
void SvxVertCTLTextTbxCtrl::StateChanged(
- USHORT nSID,
+ sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState )
{
SvtLanguageOptions aLangOptions;
- BOOL bCalc = sal_False;
- BOOL bVisible = GetToolBox().IsItemVisible(GetId());
+ sal_Bool bCalc = sal_False;
+ sal_Bool bVisible = GetToolBox().IsItemVisible(GetId());
sal_Bool bEnabled = sal_False;
if ( nSID == SID_VERTICALTEXT_STATE )
bEnabled = aLangOptions.IsVerticalTextEnabled();
@@ -95,7 +95,7 @@ void SvxVertCTLTextTbxCtrl::StateChanged(
{
if(!bVisible)
{
- GetToolBox().ShowItem( GetId(), TRUE );
+ GetToolBox().ShowItem( GetId(), sal_True );
bCalc = sal_True;
}
}
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 74a00bd431c6..41d4a8c824c5 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -578,7 +578,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING;
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
for(i=0; i<nCount; i++)
{
@@ -616,7 +616,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)rReq.GetArgs()->GetItem(SID_ATTR_METRIC))->GetValue();
ExtrusionDepthDialog aDlg( 0L, fDepth, eUnit );
- USHORT nRet = aDlg.Execute();
+ sal_uInt16 nRet = aDlg.Execute();
if( nRet != 0 )
{
fDepth = aDlg.getDepth();
@@ -631,7 +631,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
if( nSID == SID_EXTRUSION_TOOGLE )
{
- static USHORT SidArray[] = {
+ static sal_uInt16 SidArray[] = {
SID_EXTRUSION_TILT_DOWN,
SID_EXTRUSION_TILT_UP,
SID_EXTRUSION_TILT_LEFT,
@@ -656,7 +656,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB
void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
static const rtl::OUString sViewPoint( RTL_CONSTASCII_USTRINGPARAM ( "ViewPoint" ) );
@@ -807,7 +807,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
static const rtl::OUString sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) );
@@ -863,7 +863,7 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
static const rtl::OUString sShadeMode( RTL_CONSTASCII_USTRINGPARAM ( "ShadeMode" ) );
@@ -952,7 +952,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
static const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) );
@@ -1004,7 +1004,7 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet )
if( pSdrView->GetModel() )
{
FieldUnit eUnit = pSdrView->GetModel()->GetUIUnit();
- rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, (USHORT)eUnit ) );
+ rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)eUnit ) );
}
if( bHasCustomShape )
@@ -1032,7 +1032,7 @@ static bool compare_direction( const Direction3D& d1, const Direction3D& d2 )
void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
static const rtl::OUString sFirstLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightDirection" ) );
@@ -1113,7 +1113,7 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
static const rtl::OUString sBrightness( RTL_CONSTASCII_USTRINGPARAM ( "Brightness" ) );
@@ -1181,7 +1181,7 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
static const rtl::OUString sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) );
@@ -1256,7 +1256,7 @@ bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded )
static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) );
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
bool bFound = false;
for(i=0;(i<nCount) && !bFound ; i++)
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 49a4f62609a9..64367edbc85e 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -65,7 +65,7 @@ using namespace ::com::sun::star::uno;
void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
sal_Int32 nAlignment = -1;
for( i = 0; i < nCount; i++ )
@@ -102,7 +102,7 @@ void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet )
void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
sal_Int32 nCharacterSpacing = -1;
for( i = 0; i < nCount; i++ )
@@ -127,7 +127,7 @@ void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet )
void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
sal_Bool bChecked = sal_False;
for( i = 0; i < nCount; i++ )
@@ -146,7 +146,7 @@ void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet )
void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet )
{
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
rtl::OUString aFontWorkShapeType;
@@ -258,7 +258,7 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus )
static const rtl::OUString sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) );
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
sal_Bool bFound = sal_False;
for(i=0;(i<nCount) && !bFound ; i++)
{
@@ -526,7 +526,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
{
sal_Int32 nCharSpacing = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_FONTWORK_CHARACTER_SPACING))->GetValue();
FontworkCharacterSpacingDialog aDlg( 0L, nCharSpacing );
- USHORT nRet = aDlg.Execute();
+ sal_uInt16 nRet = aDlg.Execute();
if( nRet != 0 )
{
SfxInt32Item aItem( SID_FONTWORK_CHARACTER_SPACING, aDlg.getScale() );
@@ -559,7 +559,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT;
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
- ULONG nCount = rMarkList.GetMarkCount(), i;
+ sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
for( i = 0; i < nCount; i++ )
{
SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 4b9e68650180..d4e2d2272c12 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -97,7 +97,7 @@ String DictionaryList::getPropertyTypeName( sal_Int16 nConversionPropertyType )
if(!m_pPropertyTypeNameListBox || !m_pPropertyTypeNameListBox->GetEntryCount())
return String();
- USHORT nPos = static_cast<USHORT>( nConversionPropertyType )-1;
+ sal_uInt16 nPos = static_cast<sal_uInt16>( nConversionPropertyType )-1;
if(nPos<m_pPropertyTypeNameListBox->GetEntryCount())
return m_pPropertyTypeNameListBox->GetEntry(nPos);
return m_pPropertyTypeNameListBox->GetEntry(0);
@@ -260,7 +260,7 @@ bool DictionaryList::hasTerm( const rtl::OUString& rTerm ) const
}
void DictionaryList::addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping
- , sal_Int16 nConversionPropertyType, ULONG nPos )
+ , sal_Int16 nConversionPropertyType, sal_uIntPtr nPos )
{
if( hasTerm( rTerm ) )
return;
@@ -286,9 +286,9 @@ void DictionaryList::deleteEntryOnPos( sal_Int32 nPos )
}
}
-ULONG DictionaryList::deleteEntries( const rtl::OUString& rTerm )
+sal_uIntPtr DictionaryList::deleteEntries( const rtl::OUString& rTerm )
{
- ULONG nPos = LIST_APPEND;
+ sal_uIntPtr nPos = LIST_APPEND;
for( sal_Int32 nN=GetRowCount(); nN--; )
{
DictionaryEntry* pCurEntry = getEntryOnPos( nN );
@@ -355,7 +355,7 @@ void DictionaryList::Resize()
m_pHeaderBar->SetSizePixel( aBarSize );
}
-void DictionaryList::sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ )
+void DictionaryList::sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ )
{
m_nSortColumnIndex=nSortColumnIndex;
if( nSortColumnIndex<3 )
@@ -372,7 +372,7 @@ void DictionaryList::sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ )
GetModel()->SetSortMode(SortNone);
}
-USHORT DictionaryList::getSortColumn() const
+sal_uInt16 DictionaryList::getSortColumn() const
{
return m_nSortColumnIndex;
}
@@ -393,8 +393,8 @@ StringCompare DictionaryList::ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pR
if(pLeftItem != NULL && pRightItem != NULL)
{
- USHORT nLeftKind=pLeftItem->IsA();
- USHORT nRightKind=pRightItem->IsA();
+ sal_uInt16 nLeftKind=pLeftItem->IsA();
+ sal_uInt16 nRightKind=pRightItem->IsA();
if(nRightKind == SV_ITEM_ID_LBOXSTRING &&
nLeftKind == SV_ITEM_ID_LBOXSTRING )
@@ -412,12 +412,12 @@ StringCompare DictionaryList::ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pR
return eCompare;
}
-SvLBoxItem* DictionaryList::getItemAtColumn( SvLBoxEntry* pEntry, USHORT nColumn ) const
+SvLBoxItem* DictionaryList::getItemAtColumn( SvLBoxEntry* pEntry, sal_uInt16 nColumn ) const
{
SvLBoxItem* pItem = NULL;
if( pEntry )
{
- USHORT nCount = pEntry->ItemCount();
+ sal_uInt16 nCount = pEntry->ItemCount();
nColumn++;
if( nTreeFlags & TREEFLAG_CHKBTN )
nColumn++;
@@ -791,12 +791,12 @@ IMPL_LINK( ChineseDictionaryDialog, ModifyHdl, void*, EMPTYARG )
{
if( m_aCB_Reverse.IsChecked() )
{
- ULONG nPos = rReverse.deleteEntries( pE->m_aMapping );
+ sal_uIntPtr nPos = rReverse.deleteEntries( pE->m_aMapping );
nPos = rReverse.deleteEntries( aMapping );
rReverse.addEntry( aMapping, aTerm, nConversionPropertyType, nPos );
}
- ULONG nPos = rActive.deleteEntries( aTerm );
+ sal_uIntPtr nPos = rActive.deleteEntries( aTerm );
rActive.addEntry( aTerm, aMapping, nConversionPropertyType, nPos );
}
}
@@ -869,7 +869,7 @@ IMPL_LINK( ChineseDictionaryDialog, HeaderBarClick, void*, EMPTYARG )
{
if(m_pHeaderBar)
{
- USHORT nId = m_pHeaderBar->GetCurItemId();
+ sal_uInt16 nId = m_pHeaderBar->GetCurItemId();
HeaderBarItemBits nBits = m_pHeaderBar->GetItemBits(nId);
if( nBits & HIB_CLICKABLE )
{
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index afe573330fe8..31b77aa32f04 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -94,14 +94,14 @@ public:
bool hasTerm( const rtl::OUString& rTerm ) const;
void addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping
- , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, ULONG nPos = LIST_APPEND );
- ULONG deleteEntries( const rtl::OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted
+ , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, sal_uIntPtr nPos = LIST_APPEND );
+ sal_uIntPtr deleteEntries( const rtl::OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted
void deleteEntryOnPos( sal_Int32 nPos );
DictionaryEntry* getEntryOnPos( sal_Int32 nPos ) const;
DictionaryEntry* getFirstSelectedEntry() const;
- void sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ );
- USHORT getSortColumn() const;
+ void sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ );
+ sal_uInt16 getSortColumn() const;
virtual void Resize();
@@ -111,7 +111,7 @@ private:
DECL_LINK( CompareHdl, SvSortData* );
StringCompare ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pRight );
- SvLBoxItem* getItemAtColumn( SvLBoxEntry* pEntry, USHORT nColumn ) const;
+ SvLBoxItem* getItemAtColumn( SvLBoxEntry* pEntry, sal_uInt16 nColumn ) const;
public:
::com::sun::star::uno::Reference<
@@ -123,7 +123,7 @@ private:
std::vector< DictionaryEntry* > m_aToBeDeleted;
- USHORT m_nSortColumnIndex;
+ sal_uInt16 m_nSortColumnIndex;
};
class ChineseDictionaryDialog : public ModalDialog
diff --git a/svx/source/unodialogs/textconversiondlgs/resid.cxx b/svx/source/unodialogs/textconversiondlgs/resid.cxx
index d4779aad151f..43a5acc043f6 100644
--- a/svx/source/unodialogs/textconversiondlgs/resid.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/resid.cxx
@@ -42,7 +42,7 @@ static ResMgr* getTextConversionResMgr()
pMgr = ResMgr::CreateResMgr( "textconversiondlgs" );
return pMgr;
}
-TextConversionDlgs_ResId::TextConversionDlgs_ResId(USHORT nId)
+TextConversionDlgs_ResId::TextConversionDlgs_ResId(sal_uInt16 nId)
: ResId( nId, *getTextConversionResMgr() )
{
}
diff --git a/svx/source/unodialogs/textconversiondlgs/resid.hxx b/svx/source/unodialogs/textconversiondlgs/resid.hxx
index ed474b59c32d..d2891870a649 100644
--- a/svx/source/unodialogs/textconversiondlgs/resid.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/resid.hxx
@@ -41,7 +41,7 @@ namespace textconversiondlgs
class TextConversionDlgs_ResId : public ResId
{
public:
- TextConversionDlgs_ResId(USHORT nId);
+ TextConversionDlgs_ResId(sal_uInt16 nId);
};
//.............................................................................
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 440f6c313e20..eb9a7cb8128f 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -179,7 +179,7 @@ namespace svx
virtual sal_Bool SAL_CALL supportsMimeType( const ::rtl::OUString& MimeTypeName ) throw (RuntimeException);
virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames( ) throw (RuntimeException);
- VirtualDevice* CreatePageVDev( SdrPage* pPage, ULONG nWidthPixel, ULONG nHeightPixel ) const;
+ VirtualDevice* CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const;
DECL_LINK( CalcFieldValueHdl, EditFieldInfo* );
@@ -221,7 +221,7 @@ namespace svx
/** creates a bitmap that is optionaly transparent from a metafile
*/
- BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, BOOL bTransparent, const Size* pSize )
+ BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, sal_Bool bTransparent, const Size* pSize )
{
Graphic aGraphic( rMtf );
BitmapEx aBmpEx;
@@ -349,7 +349,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
if( pField && pField->ISA( SvxPageField ) )
{
String aPageNumValue;
- BOOL bUpper = FALSE;
+ sal_Bool bUpper = sal_False;
switch(mpDoc->GetPageNumType())
{
@@ -360,7 +360,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
aPageNumValue += (sal_Unicode)(char)((mnPageNumber - 1) % 26 + 'a');
break;
case SVX_ROMAN_UPPER:
- bUpper = TRUE;
+ bUpper = sal_True;
case SVX_ROMAN_LOWER:
aPageNumValue += SvxNumberFormat::CreateRomanString(mnPageNumber, bUpper);
break;
@@ -391,7 +391,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
@return the returned VirtualDevice is owned by the caller
*/
-VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, ULONG nWidthPixel, ULONG nHeightPixel ) const
+VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const
{
VirtualDevice* pVDev = new VirtualDevice();
MapMode aMM( MAP_100TH_MM );
@@ -422,17 +422,17 @@ VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, ULONG nWidthPixe
pVDev->SetMapMode( aMM );
#ifdef DBG_UTIL
- BOOL bAbort = !
+ sal_Bool bAbort = !
#endif
pVDev->SetOutputSize(aPageSize);
DBG_ASSERT(!bAbort, "virt. Device nicht korrekt erzeugt");
SdrView* pView = new SdrView(mpDoc, pVDev);
- pView->SetPageVisible( FALSE );
- pView->SetBordVisible( FALSE );
- pView->SetGridVisible( FALSE );
- pView->SetHlplVisible( FALSE );
- pView->SetGlueVisible( FALSE );
+ pView->SetPageVisible( sal_False );
+ pView->SetBordVisible( sal_False );
+ pView->SetGridVisible( sal_False );
+ pView->SetHlplVisible( sal_False );
+ pView->SetGlueVisible( sal_False );
pView->ShowSdrPage(pPage);
Region aRegion (Rectangle( aPoint, aPageSize ) );
@@ -719,7 +719,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
aVDev.SetMapMode( aMap );
if( rSettings.mbUseHighContrast )
aVDev.SetDrawMode( aVDev.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
- aVDev.EnableOutput( FALSE );
+ aVDev.EnableOutput( sal_False );
aMtf.Record( &aVDev );
Size aNewSize;
@@ -735,14 +735,14 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
pView = new SdrView( mpDoc, &aVDev );
}
- pView->SetBordVisible( FALSE );
- pView->SetPageVisible( FALSE );
+ pView->SetBordVisible( sal_False );
+ pView->SetPageVisible( sal_False );
pView->ShowSdrPage( pPage );
if ( pView && pPage )
{
- pView->SetBordVisible( FALSE );
- pView->SetPageVisible( FALSE );
+ pView->SetBordVisible( sal_False );
+ pView->SetPageVisible( sal_False );
pView->ShowSdrPage( pPage );
const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() );
@@ -788,7 +788,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
if( rSettings.mbTranslucent )
{
Size aOutSize;
- aGraphic = GetBitmapFromMetaFile( aGraphic.GetGDIMetaFile(), TRUE, CalcSize( rSettings.mnWidth, rSettings.mnHeight, aNewSize, aOutSize ) );
+ aGraphic = GetBitmapFromMetaFile( aGraphic.GetGDIMetaFile(), sal_True, CalcSize( rSettings.mnWidth, rSettings.mnHeight, aNewSize, aOutSize ) );
}
}
}
@@ -887,11 +887,11 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
pMtf->AddAction( new MetaCommentAction(
"XTEXT_SCROLLRECT", 0,
- reinterpret_cast<BYTE const*>(&aScrollRectangle),
+ reinterpret_cast<sal_uInt8 const*>(&aScrollRectangle),
sizeof( Rectangle ) ) );
pMtf->AddAction( new MetaCommentAction(
"XTEXT_PAINTRECT", 0,
- reinterpret_cast<BYTE const*>(&aPaintRectangle),
+ reinterpret_cast<sal_uInt8 const*>(&aPaintRectangle),
sizeof( Rectangle ) ) );
aGraphic = Graphic( *pMtf );
@@ -924,7 +924,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic,
}
}
- aOut.EnableOutput( FALSE );
+ aOut.EnableOutput( sal_False );
aOut.SetMapMode( aMap );
if( rSettings.mbUseHighContrast )
aOut.SetDrawMode( aVDev.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
@@ -1022,7 +1022,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes
// create the output stuff
Graphic aGraphic;
- USHORT nStatus = GetGraphic( aSettings, aGraphic, bVectorType ) ? GRFILTER_OK : GRFILTER_FILTERERROR;
+ sal_uInt16 nStatus = GetGraphic( aSettings, aGraphic, bVectorType ) ? GRFILTER_OK : GRFILTER_FILTERERROR;
if( nStatus == GRFILTER_OK )
{
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index 0ce5b6ca223a..69ee2502c27d 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -46,7 +46,7 @@ using namespace ::rtl;
using namespace ::cppu;
using namespace ::vos;
-SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, USHORT nWhich, BYTE nMemberId ) throw()
+SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw()
: mpModel( pModel ),
mpModelPool( pModel ? &pModel->GetItemPool() : NULL ),
mnWhich( nWhich ), mnMemberId( nMemberId )
@@ -93,11 +93,11 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const OUString& Service
uno::Sequence< OUString > aSNL( getSupportedServiceNames() );
const OUString * pArray = aSNL.getConstArray();
- for( INT32 i = 0; i < aSNL.getLength(); i++ )
+ for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
if( pArray[i] == ServiceName )
- return TRUE;
+ return sal_True;
- return FALSE;
+ return sal_False;
}
void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement )
diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx
index 2f864f6f72d2..995b58fb0cc0 100644
--- a/svx/source/unodraw/UnoNameItemTable.hxx
+++ b/svx/source/unodraw/UnoNameItemTable.hxx
@@ -50,15 +50,15 @@ class SvxUnoNameItemTable : public cppu::WeakImplHelper2< com::sun::star::contai
private:
SdrModel* mpModel;
SfxItemPool* mpModelPool;
- USHORT mnWhich;
- BYTE mnMemberId;
+ sal_uInt16 mnWhich;
+ sal_uInt8 mnMemberId;
ItemPoolVector maItemSetVector;
void SAL_CALL ImplInsertByName( const rtl::OUString& aName, const com::sun::star::uno::Any& aElement );
public:
- SvxUnoNameItemTable( SdrModel* pModel, USHORT nWhich, BYTE nMemberId ) throw();
+ SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw();
virtual ~SvxUnoNameItemTable() throw();
virtual NameOrIndex* createItem() const throw() = 0;
diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx
index eb5cd8ec5231..ab09bbfb475b 100644
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star;
using namespace ::rtl;
using namespace ::cppu;
-const USHORT NON_USER_DEFINED_GLUE_POINTS = 4;
+const sal_uInt16 NON_USER_DEFINED_GLUE_POINTS = 4;
class SvxUnoGluePointAccess : public WeakImplHelper2< container::XIndexContainer, container::XIdentifierContainer >
{
@@ -237,7 +237,7 @@ sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement ) thr
{
SdrGluePoint aSdrGlue;
convert( aUnoGlue, aSdrGlue );
- USHORT nId = pList->Insert( aSdrGlue );
+ sal_uInt16 nId = pList->Insert( aSdrGlue );
// only repaint, no objectchange
mpObject->ActionChanged();
@@ -257,11 +257,11 @@ void SAL_CALL SvxUnoGluePointAccess::removeByIdentifier( sal_Int32 Identifier )
{
if( mpObject.is() && ( Identifier >= NON_USER_DEFINED_GLUE_POINTS ))
{
- const USHORT nId = (USHORT)(Identifier - NON_USER_DEFINED_GLUE_POINTS) + 1;
+ const sal_uInt16 nId = (sal_uInt16)(Identifier - NON_USER_DEFINED_GLUE_POINTS) + 1;
SdrGluePointList* pList = const_cast<SdrGluePointList*>(mpObject->GetGluePointList());
- const USHORT nCount = pList ? pList->GetCount() : 0;
- USHORT i;
+ const sal_uInt16 nCount = pList ? pList->GetCount() : 0;
+ sal_uInt16 i;
for( i = 0; i < nCount; i++ )
{
@@ -290,11 +290,11 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIdentifer( sal_Int32 Identifier, c
if( (Identifier < NON_USER_DEFINED_GLUE_POINTS) || !(aElement >>= aGluePoint))
throw lang::IllegalArgumentException();
- const USHORT nId = (USHORT)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1;
+ const sal_uInt16 nId = (sal_uInt16)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1;
SdrGluePointList* pList = const_cast< SdrGluePointList* >( mpObject->GetGluePointList() );
- const USHORT nCount = pList ? pList->GetCount() : 0;
- USHORT i;
+ const sal_uInt16 nCount = pList ? pList->GetCount() : 0;
+ sal_uInt16 i;
for( i = 0; i < nCount; i++ )
{
if( (*pList)[i].GetId() == nId )
@@ -324,18 +324,18 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier )
if( Identifier < NON_USER_DEFINED_GLUE_POINTS ) // default glue point?
{
- SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (USHORT)Identifier );
+ SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (sal_uInt16)Identifier );
aGluePoint.IsUserDefined = sal_False;
convert( aTempPoint, aGluePoint );
return uno::makeAny( aGluePoint );
}
else
{
- const USHORT nId = (USHORT)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1;
+ const sal_uInt16 nId = (sal_uInt16)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1;
const SdrGluePointList* pList = mpObject->GetGluePointList();
- const USHORT nCount = pList ? pList->GetCount() : 0;
- for( USHORT i = 0; i < nCount; i++ )
+ const sal_uInt16 nCount = pList ? pList->GetCount() : 0;
+ for( sal_uInt16 i = 0; i < nCount; i++ )
{
const SdrGluePoint& rTempPoint = (*pList)[i];
if( rTempPoint.GetId() == nId )
@@ -361,9 +361,9 @@ uno::Sequence< sal_Int32 > SAL_CALL SvxUnoGluePointAccess::getIdentifiers() thro
if( mpObject.is() )
{
const SdrGluePointList* pList = mpObject->GetGluePointList();
- const USHORT nCount = pList ? pList->GetCount() : 0;
+ const sal_uInt16 nCount = pList ? pList->GetCount() : 0;
- USHORT i;
+ sal_uInt16 i;
uno::Sequence< sal_Int32 > aIdSequence( nCount + NON_USER_DEFINED_GLUE_POINTS );
sal_Int32 *pIdentifier = aIdSequence.getArray();
@@ -428,7 +428,7 @@ void SAL_CALL SvxUnoGluePointAccess::removeByIndex( sal_Int32 Index )
Index -= 4;
if( Index >= 0 && Index < pList->GetCount() )
{
- pList->Delete( (USHORT)Index );
+ pList->Delete( (sal_uInt16)Index );
// only repaint, no objectchange
mpObject->ActionChanged();
@@ -457,7 +457,7 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIndex( sal_Int32 Index, const uno:
SdrGluePointList* pList = const_cast< SdrGluePointList* >( mpObject->GetGluePointList() );
if( pList && Index < pList->GetCount() )
{
- SdrGluePoint& rGlue = (*pList)[(USHORT)Index];
+ SdrGluePoint& rGlue = (*pList)[(sal_uInt16)Index];
convert( aUnoGlue, rGlue );
// only repaint, no objectchange
@@ -500,7 +500,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index )
if( Index < 4 ) // default glue point?
{
- SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (USHORT)Index );
+ SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (sal_uInt16)Index );
aGluePoint.IsUserDefined = sal_False;
convert( aTempPoint, aGluePoint );
uno::Any aAny;
@@ -513,7 +513,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index )
const SdrGluePointList* pList = mpObject->GetGluePointList();
if( pList && Index < pList->GetCount() )
{
- const SdrGluePoint& rTempPoint = (*pList)[(USHORT)Index];
+ const SdrGluePoint& rTempPoint = (*pList)[(sal_uInt16)Index];
aGluePoint.IsUserDefined = sal_True;
convert( rTempPoint, aGluePoint );
uno::Any aAny;
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 01375649553b..a46b535a9baf 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -145,11 +145,11 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const OUString& ServiceNa
uno::Sequence< OUString > aSNL( getSupportedServiceNames() );
const OUString * pArray = aSNL.getConstArray();
- for( INT32 i = 0; i < aSNL.getLength(); i++ )
+ for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
if( pArray[i] == ServiceName )
- return TRUE;
+ return sal_True;
- return FALSE;
+ return sal_False;
}
OUString SAL_CALL SvxUnoMarkerTable::getImplementationName() throw( uno::RuntimeException )
@@ -307,7 +307,7 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const
throw container::NoSuchElementException();
}
-static sal_Bool getByNameFromPool( const String& rSearchName, SfxItemPool* pPool, USHORT nWhich, uno::Any& rAny )
+static sal_Bool getByNameFromPool( const String& rSearchName, SfxItemPool* pPool, sal_uInt16 nWhich, uno::Any& rAny )
{
NameOrIndex *pItem;
const sal_uInt32 nSurrogateCount = pPool ? pPool->GetItemCount2( nWhich ) : 0;
@@ -355,7 +355,7 @@ uno::Any SAL_CALL SvxUnoMarkerTable::getByName( const OUString& aApiName )
return aAny;
}
-static void createNamesForPool( SfxItemPool* pPool, USHORT nWhich, std::set< OUString, comphelper::UStringLess >& rNameSet )
+static void createNamesForPool( SfxItemPool* pPool, sal_uInt16 nWhich, std::set< OUString, comphelper::UStringLess >& rNameSet )
{
const sal_uInt32 nSuroCount = pPool->GetItemCount2( nWhich );
sal_uInt32 nSurrogate;
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index 17c32389e311..fd682129b184 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -124,22 +124,22 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
}
default:
{
- const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pEntry->mnHandle) : SFX_MAPUNIT_100TH_MM;
+ const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pEntry->mnHandle) : SFX_MAPUNIT_100TH_MM;
- BYTE nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
+ sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
if( eMapUnit == SFX_MAPUNIT_100TH_MM )
nMemberId &= (~CONVERT_TWIPS);
// DVO, OD 10.10.2003 #i18732#
// Assure, that ID is a Which-ID (it could be a Slot-ID.)
// Thus, convert handle to Which-ID.
- pPool->GetDefaultItem( pPool->GetWhich( (USHORT)pEntry->mnHandle ) ).QueryValue( rValue, nMemberId );
+ pPool->GetDefaultItem( pPool->GetWhich( (sal_uInt16)pEntry->mnHandle ) ).QueryValue( rValue, nMemberId );
}
}
// check for needed metric translation
- const SfxMapUnit eMapUnit = pPool->GetMetric((USHORT)pEntry->mnHandle);
+ const SfxMapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle);
if(pEntry->mnMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
{
SvxUnoConvertToMM( eMapUnit, rValue );
@@ -159,7 +159,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
{
uno::Any aValue( rValue );
- const SfxMapUnit eMapUnit = pPool->GetMetric((USHORT)pEntry->mnHandle);
+ const SfxMapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle);
if(pEntry->mnMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM)
{
SvxUnoConvertFromMM( eMapUnit, aValue );
@@ -193,7 +193,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn
default:
{
::std::auto_ptr<SfxPoolItem> pNewItem( pPool->GetDefaultItem( nWhich ).Clone() );
- BYTE nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
+ sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM);
if( !pPool || (pPool->GetMetric(nWhich) == SFX_MAPUNIT_100TH_MM) )
nMemberId &= (~CONVERT_TWIPS);
@@ -308,7 +308,7 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry*
// OD 10.10.2003 #i18732#
// Assure, that ID is a Which-ID (it could be a Slot-ID.)
// Thus, convert handle to Which-ID.
- const sal_uInt16 nWhich = pPool->GetWhich( (USHORT)pEntry->mnHandle );
+ const sal_uInt16 nWhich = pPool->GetWhich( (sal_uInt16)pEntry->mnHandle );
if ( pPool && pPool != mpDefaultsPool )
{
// OD 13.10.2003 #i18732# - use method <ResetPoolDefaultItem(..)>
@@ -326,7 +326,7 @@ uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry
// using probably incompatible item pool <mpDefaultsPool>
uno::Any aAny;
SfxItemPool* pPool = getModelPool( sal_True );
- const sal_uInt16 nWhich = pPool->GetWhich( (USHORT)pEntry->mnHandle );
+ const sal_uInt16 nWhich = pPool->GetWhich( (sal_uInt16)pEntry->mnHandle );
const SfxPoolItem *pItem = pPool->GetPoolDefaultItem ( nWhich );
pItem->QueryValue( aAny, pEntry->mnMemberId );
@@ -409,11 +409,11 @@ sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const OUString& ServiceName
uno::Sequence< OUString > aSNL( getSupportedServiceNames() );
const OUString * pArray = aSNL.getConstArray();
- for( INT32 i = 0; i < aSNL.getLength(); i++ )
+ for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
if( pArray[i] == ServiceName )
- return TRUE;
+ return sal_True;
- return FALSE;
+ return sal_False;
}
OUString SAL_CALL SvxUnoDrawPool::getImplementationName() throw( uno::RuntimeException )
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index ffc6c28f9fec..134176859447 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -894,7 +894,7 @@ UHashMap::UHashMap( UHashMapEntry* pMap )
// ---------------------------------------------------------------------
-UINT32 UHashMap::getId( const OUString& rCompareString )
+sal_uInt32 UHashMap::getId( const OUString& rCompareString )
{
size_t nHash = rCompareString.hashCode() & (HASHARRAYSIZE-1);
@@ -938,7 +938,7 @@ Svx_CompareMap(const void* pSmaller, const void* pBigger )
SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider()
{
- for(UINT16 i=0;i<SVXMAP_END; i++)
+ for(sal_uInt16 i=0;i<SVXMAP_END; i++)
{
aSetArr[i] = 0;
aMapArr[i] = 0;
@@ -947,23 +947,23 @@ SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider()
SvxUnoPropertyMapProvider::~SvxUnoPropertyMapProvider()
{
- for(UINT16 i=0;i<SVXMAP_END; i++)
+ for(sal_uInt16 i=0;i<SVXMAP_END; i++)
delete aSetArr[i];
}
// ---------------------------------------------------------------------
-/*void SvxUnoPropertyMapProvider::Sort(USHORT nId)
+/*void SvxUnoPropertyMapProvider::Sort(sal_uInt16 nId)
{
SfxItemPropertyMapEntry* pTemp = aMapArr[nId];
- UINT16 i = 0;
+ sal_uInt16 i = 0;
while(pTemp[i].pName) { i++; }
qsort(aMapArr[nId], i, sizeof(SfxItemPropertyMapEntry), Svx_CompareMap);
}*/
// ---------------------------------------------------------------------
-const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(UINT16 nPropertyId)
+const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPropertyId)
{
DBG_ASSERT(nPropertyId < SVXMAP_END, "Id ?" );
if(!aMapArr[nPropertyId]) {
@@ -1002,7 +1002,7 @@ const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(UINT16 nPropert
}
return aMapArr[nPropertyId];
}
-const SvxItemPropertySet* SvxUnoPropertyMapProvider::GetPropertySet(UINT16 nPropertyId, SfxItemPool& rPool)
+const SvxItemPropertySet* SvxUnoPropertyMapProvider::GetPropertySet(sal_uInt16 nPropertyId, SfxItemPool& rPool)
{
if( !aSetArr[nPropertyId] )
aSetArr[nPropertyId] = new SvxItemPropertySet( GetMap( nPropertyId ), rPool );
@@ -1159,10 +1159,10 @@ bool SvxUnoGetResourceRanges( const short nWhich, int& nApiResIds, int& nIntResI
break;
default:
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
/*sal_Int16 SvxUnoGetWhichIdForNamedProperty( const ::rtl::OUString & rPropName )
@@ -1211,29 +1211,29 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount
int i;
for( i = 0; i < nCount; i++ )
{
- USHORT nResId = (USHORT)(nSourceResIds + i);
+ sal_uInt16 nResId = (sal_uInt16)(nSourceResIds + i);
const ResId aRes( SVX_RES(nResId));
const String aCompare( aRes );
if( aShortString == aCompare )
{
- USHORT nNewResId = (USHORT)(nDestResIds + i);
+ sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i);
ResId aNewRes( SVX_RES( nNewResId ));
rString.Replace( 0, aShortString.Len(), String( aNewRes ) );
- return TRUE;
+ return sal_True;
}
else if( rString == aCompare )
{
- USHORT nNewResId = (USHORT)(nDestResIds + i);
+ sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i);
ResId aNewRes( SVX_RES( nNewResId ));
rString = String( aNewRes );
- return TRUE;
+ return sal_True;
}
}
- return FALSE;
+ return sal_False;
}
-static USHORT __READONLY_DATA SvxUnoColorNameDefResId[] =
+static sal_uInt16 __READONLY_DATA SvxUnoColorNameDefResId[] =
{
RID_SVXSTR_BLUEGREY_DEF,
RID_SVXSTR_BLACK_DEF,
@@ -1264,7 +1264,7 @@ static USHORT __READONLY_DATA SvxUnoColorNameDefResId[] =
RID_SVXSTR_COLOR_CHART_DEF
};
-static USHORT __READONLY_DATA SvxUnoColorNameResId[] =
+static sal_uInt16 __READONLY_DATA SvxUnoColorNameResId[] =
{
RID_SVXSTR_BLUEGREY,
RID_SVXSTR_BLACK,
@@ -1295,7 +1295,7 @@ static USHORT __READONLY_DATA SvxUnoColorNameResId[] =
RID_SVXSTR_COLOR_CHART
};
-bool SvxUnoConvertResourceString( USHORT* pSourceResIds, USHORT* pDestResIds, int nCount, String& rString ) throw()
+bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestResIds, int nCount, String& rString ) throw()
{
int i = 0;
@@ -1323,7 +1323,7 @@ void SvxUnogetApiNameForItem( const sal_Int16 nWhich, const String& rInternalNam
if( nWhich == XATTR_LINECOLOR )
{
- if( SvxUnoConvertResourceString( (USHORT*)SvxUnoColorNameResId, (USHORT*)SvxUnoColorNameDefResId, sizeof( SvxUnoColorNameResId ) / sizeof( USHORT ), aNew ) )
+ if( SvxUnoConvertResourceString( (sal_uInt16*)SvxUnoColorNameResId, (sal_uInt16*)SvxUnoColorNameDefResId, sizeof( SvxUnoColorNameResId ) / sizeof( sal_uInt16 ), aNew ) )
{
rApiName = aNew;
return;
@@ -1360,7 +1360,7 @@ void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const rtl::OUString&
if( nWhich == XATTR_LINECOLOR )
{
- if( SvxUnoConvertResourceString( (USHORT*)SvxUnoColorNameDefResId, (USHORT*)SvxUnoColorNameResId, sizeof( SvxUnoColorNameResId ) / sizeof( USHORT ), aNew ) )
+ if( SvxUnoConvertResourceString( (sal_uInt16*)SvxUnoColorNameDefResId, (sal_uInt16*)SvxUnoColorNameResId, sizeof( SvxUnoColorNameResId ) / sizeof( sal_uInt16 ), aNew ) )
{
rInternalName = aNew;
return;
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 057e5f8b7e6c..17709c6197ce 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1717,7 +1717,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const
// normal link
String aFilterName;
const SfxFilter* pSfxFilter = NULL;
- SfxMedium aSfxMedium( aURL, STREAM_READ | STREAM_SHARE_DENYNONE, FALSE );
+ SfxMedium aSfxMedium( aURL, STREAM_READ | STREAM_SHARE_DENYNONE, sal_False );
SFX_APP()->GetFilterMatcher().GuessFilter( aSfxMedium, &pSfxFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE );
@@ -1997,8 +1997,8 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException)
Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() );
Point aRef2( aRef1.X(), aRef1.Y() + 1000 );
- USHORT i;
- USHORT nPntAnz=aPol.GetSize();
+ sal_uInt16 i;
+ sal_uInt16 nPntAnz=aPol.GetSize();
for (i=0; i<nPntAnz; i++)
{
MirrorPoint(aPol[i],aRef1,aRef2);
@@ -2019,8 +2019,8 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException)
Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 );
Point aRef2( aRef1.X() + 1000, aRef1.Y() );
- USHORT i;
- USHORT nPntAnz=aPol.GetSize();
+ sal_uInt16 i;
+ sal_uInt16 nPntAnz=aPol.GetSize();
for (i=0; i<nPntAnz; i++)
{
MirrorPoint(aPol[i],aRef1,aRef2);
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 79d5b7c5dec9..9f906dc59a39 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -285,13 +285,13 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx
Graphic* pGraphic = pObj->GetGraphic();
if( pGraphic )
{
- BOOL bIsWMF = FALSE;
+ sal_Bool bIsWMF = sal_False;
if ( pGraphic->IsLink() )
{
GfxLink aLnk = pGraphic->GetLink();
if ( aLnk.GetType() == GFX_LINK_TYPE_NATIVE_WMF )
{
- bIsWMF = TRUE;
+ bIsWMF = sal_True;
uno::Sequence<sal_Int8> aSeq((sal_Int8*)aLnk.GetData(), (sal_Int32) aLnk.GetDataSize());
rValue <<= aSeq;
}
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 0f1482adaf5d..1c80a547adf9 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1537,7 +1537,7 @@ void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Re
sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName )
{
- SfxItemSet aSet( mpModel->GetItemPool(), (USHORT)nWID, (USHORT)nWID );
+ SfxItemSet aSet( mpModel->GetItemPool(), (sal_uInt16)nWID, (sal_uInt16)nWID );
if( SetFillAttribute( nWID, rName, aSet, mpModel ) )
{
@@ -1722,12 +1722,12 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN
const SfxItemPool* pPool = rSet.GetPool();
const String aSearchName( aName );
- const sal_uInt32 nCount = pPool->GetItemCount2((USHORT)nWID);
+ const sal_uInt32 nCount = pPool->GetItemCount2((sal_uInt16)nWID);
const NameOrIndex* pItem;
for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ )
{
- pItem = (NameOrIndex*)pPool->GetItem2((USHORT)nWID, nSurrogate);
+ pItem = (NameOrIndex*)pPool->GetItem2((sal_uInt16)nWID, nSurrogate);
if( pItem && ( pItem->GetName() == aSearchName ) )
{
rSet.Put( *pItem );
@@ -1756,13 +1756,13 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN
const SfxItemPool& rPool = pModel->GetItemPool();
const String aSearchName( rName );
- const sal_uInt32 nCount = rPool.GetItemCount((USHORT)nWhich);
+ const sal_uInt32 nCount = rPool.GetItemCount((sal_uInt16)nWhich);
const NameOrIndex* pItem = 0;
bool bFound = false;
for( sal_uInt32 nSurrogate = 0; ! bFound && nSurrogate < nCount; nSurrogate++ )
{
- pItem = (NameOrIndex*)rPool.GetItem((USHORT)nWhich, nSurrogate);
+ pItem = (NameOrIndex*)rPool.GetItem((sal_uInt16)nWhich, nSurrogate);
if( pItem && ( pItem->GetName() == aSearchName ) )
{
bFound = true;
@@ -2395,7 +2395,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope
case XATTR_FILLHATCH:
case XATTR_LINEDASH:
{
- NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID);
+ NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID);
if( ( pItem == NULL ) || ( pItem->GetName().Len() == 0) )
eState = beans::PropertyState_DEFAULT_VALUE;
}
@@ -2410,7 +2410,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope
case XATTR_LINESTART:
case XATTR_FILLFLOATTRANSPARENCE:
{
- NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID);
+ NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID);
if( ( pItem == NULL ) )
eState = beans::PropertyState_DEFAULT_VALUE;
}
@@ -2494,7 +2494,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
#ifdef DBG_UTIL
SdrObject* pCheck =
#endif
- pObjList->SetObjectOrdNum( mpObj->GetOrdNum(), (ULONG)nNewOrdNum );
+ pObjList->SetObjectOrdNum( mpObj->GetOrdNum(), (sal_uIntPtr)nNewOrdNum );
DBG_ASSERT( pCheck == mpObj.get(), "GetOrdNum() failed!" );
}
return true;
@@ -2673,7 +2673,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
OUString aLayerName;
if( rValue >>= aLayerName )
{
- const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, TRUE);
+ const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, sal_True);
if( pLayer != NULL )
{
mpObj->SetLayer( pLayer->GetID() );
@@ -2711,7 +2711,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
{
Point aRef1(mpObj->GetSnapRect().Center());
double nTan=tan(nShear*nPi180);
- mpObj->Shear(aRef1,nShear,nTan,FALSE);
+ mpObj->Shear(aRef1,nShear,nTan,sal_False);
return true;
}
}
@@ -3206,13 +3206,13 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper
Graphic* pGraphic = pObj->GetGraphic();
if( pGraphic )
{
- BOOL bIsWMF = FALSE;
+ sal_Bool bIsWMF = sal_False;
if ( pGraphic->IsLink() )
{
GfxLink aLnk = pGraphic->GetLink();
if ( aLnk.GetType() == GFX_LINK_TYPE_NATIVE_WMF )
{
- bIsWMF = TRUE;
+ bIsWMF = sal_True;
uno::Sequence<sal_Int8> aSeq((sal_Int8*)aLnk.GetData(), (sal_Int32) aLnk.GetDataSize());
rValue <<= aSeq;
}
@@ -3423,7 +3423,7 @@ void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException)
}
// #i68523# special handling for Svx3DCharacterModeItem, this is not saved
- // but needs to be TRUE in svx, pool default (false) in sch. Since sch
+ // but needs to be sal_True in svx, pool default (false) in sch. Since sch
// does not load lathe or extrude objects, it is possible to set the items
// here.
// For other solution possibilities, see task description.
@@ -3533,7 +3533,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
if( mpObj.is() && mpObj->GetObjInventor() == SdrInventor)
{
- const UINT16 nIdent = mpObj->GetObjIdentifier();
+ const sal_uInt16 nIdent = mpObj->GetObjIdentifier();
switch(nIdent)
{
@@ -4125,7 +4125,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames()
else if( mpObj.is() && mpObj->GetObjInventor() == FmFormInventor)
{
#if OSL_DEBUG_LEVEL > 0
- const UINT16 nIdent = mpObj->GetObjIdentifier();
+ const sal_uInt16 nIdent = mpObj->GetObjIdentifier();
OSL_ENSURE( nIdent == OBJ_UNO, "SvxShape::_getSupportedServiceNames: FmFormInventor, but no UNO object?" );
#endif
static uno::Sequence< OUString > *pSeq = 0;
diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index 04770faf694b..078acc3b3701 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -105,14 +105,14 @@ private:
SvxDrawOutlinerViewForwarder* mpViewForwarder; // if non-NULL, use GetViewModeTextForwarder text forwarder
css::uno::Reference< css::linguistic2::XLinguServiceManager > m_xLinguServiceManager;
Point maTextOffset;
- BOOL mbDataValid;
- BOOL mbDestroyed;
- BOOL mbIsLocked;
- BOOL mbNeedsUpdate;
- BOOL mbOldUndoMode;
- BOOL mbForwarderIsEditMode; // have to reflect that, since ENDEDIT can happen more often
- BOOL mbShapeIsEditMode; // #104157# only true, if HINT_BEGEDIT was received
- BOOL mbNotificationsDisabled; // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder)
+ sal_Bool mbDataValid;
+ sal_Bool mbDestroyed;
+ sal_Bool mbIsLocked;
+ sal_Bool mbNeedsUpdate;
+ sal_Bool mbOldUndoMode;
+ sal_Bool mbForwarderIsEditMode; // have to reflect that, since ENDEDIT can happen more often
+ sal_Bool mbShapeIsEditMode; // #104157# only true, if HINT_BEGEDIT was received
+ sal_Bool mbNotificationsDisabled; // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder)
XInterface* mpOwner;
SvxUnoTextRangeBaseList maTextRanges;
@@ -157,7 +157,7 @@ public:
void lock();
void unlock();
- BOOL IsValid() const;
+ sal_Bool IsValid() const;
Rectangle GetVisArea();
Point LogicToPixel( const Point&, const MapMode& rMapMode );
@@ -182,14 +182,14 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText
mpOutliner ( NULL ),
mpTextForwarder ( NULL ),
mpViewForwarder ( NULL ),
- mbDataValid ( FALSE ),
- mbDestroyed ( FALSE ),
- mbIsLocked ( FALSE ),
- mbNeedsUpdate ( FALSE ),
- mbOldUndoMode ( FALSE ),
- mbForwarderIsEditMode ( FALSE ),
- mbShapeIsEditMode ( FALSE ),
- mbNotificationsDisabled ( FALSE ),
+ mbDataValid ( sal_False ),
+ mbDestroyed ( sal_False ),
+ mbIsLocked ( sal_False ),
+ mbNeedsUpdate ( sal_False ),
+ mbOldUndoMode ( sal_False ),
+ mbForwarderIsEditMode ( sal_False ),
+ mbShapeIsEditMode ( sal_False ),
+ mbNotificationsDisabled ( sal_False ),
mpOwner( pOwner )
{
DBG_ASSERT( mpObject, "invalid pObject!" );
@@ -220,14 +220,14 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText
mpOutliner ( NULL ),
mpTextForwarder ( NULL ),
mpViewForwarder ( NULL ),
- mbDataValid ( FALSE ),
- mbDestroyed ( FALSE ),
- mbIsLocked ( FALSE ),
- mbNeedsUpdate ( FALSE ),
- mbOldUndoMode ( FALSE ),
- mbForwarderIsEditMode ( FALSE ),
- mbShapeIsEditMode ( TRUE ),
- mbNotificationsDisabled ( FALSE ),
+ mbDataValid ( sal_False ),
+ mbDestroyed ( sal_False ),
+ mbIsLocked ( sal_False ),
+ mbNeedsUpdate ( sal_False ),
+ mbOldUndoMode ( sal_False ),
+ mbForwarderIsEditMode ( sal_False ),
+ mbShapeIsEditMode ( sal_True ),
+ mbNotificationsDisabled ( sal_False ),
mpOwner(0)
{
if( !mpText )
@@ -368,7 +368,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
case HINT_OBJCHG:
{
- mbDataValid = FALSE; // Text muss neu geholt werden
+ mbDataValid = sal_False; // Text muss neu geholt werden
if( HasView() )
{
@@ -400,7 +400,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this, SvxTextEditSourceImpl, NotifyHdl) );
// #104157# Only now we're really in edit mode
- mbShapeIsEditMode = TRUE;
+ mbShapeIsEditMode = sal_True;
Broadcast( *pSdrHint );
}
@@ -412,7 +412,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint )
Broadcast( *pSdrHint );
// #104157# We're no longer in edit mode
- mbShapeIsEditMode = FALSE;
+ mbShapeIsEditMode = sal_False;
// remove as listener - outliner might outlive ourselves
if( mpView && mpView->GetTextEditOutliner() )
@@ -564,7 +564,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
if( mpOutliner == NULL )
{
SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject );
- USHORT nOutlMode = OUTLINERMODE_TEXTOBJECT;
+ sal_uInt16 nOutlMode = OUTLINERMODE_TEXTOBJECT;
if( pTextObj && pTextObj->IsTextFrame() && pTextObj->GetTextKind() == OBJ_OUTLINETEXT )
nOutlMode = OUTLINERMODE_OUTLINEOBJECT;
@@ -637,7 +637,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
// #91254# put text to object and set EmptyPresObj to FALSE
if( mpText && bOwnParaObj && pOutlinerParaObject && mpObject->IsEmptyPresObj() && pTextObj->IsRealyEdited() )
{
- mpObject->SetEmptyPresObj( FALSE );
+ mpObject->SetEmptyPresObj( sal_False );
static_cast< SdrTextObj* >( mpObject)->NbcSetOutlinerParaObjectForText( pOutlinerParaObject, mpText );
// #i103982# Here, due to mpObject->NbcSetOutlinerParaObjectForText, we LOSE ownership of the
@@ -678,7 +678,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder()
}
}
- mbDataValid = TRUE;
+ mbDataValid = sal_True;
if( bOwnParaObj )
delete pOutlinerParaObject;
@@ -911,9 +911,9 @@ void SvxTextEditSourceImpl::unlock()
}
}
-BOOL SvxTextEditSourceImpl::IsValid() const
+sal_Bool SvxTextEditSourceImpl::IsValid() const
{
- return mpView && mpWindow ? TRUE : FALSE;
+ return mpView && mpWindow ? sal_True : sal_False;
}
Rectangle SvxTextEditSourceImpl::GetVisArea()
@@ -1108,7 +1108,7 @@ void SvxTextEditSource::unlock()
mpImpl->unlock();
}
-BOOL SvxTextEditSource::IsValid() const
+sal_Bool SvxTextEditSource::IsValid() const
{
return mpImpl->IsValid();
}
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index a1a7565f314d..7889fcc0f5ff 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -329,8 +329,8 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
Graphic aGraphic;
mpOStm->Seek( 0 );
- USHORT nFormat = GRFILTER_FORMAT_DONTKNOW;
- USHORT pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW;
+ sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW;
+ sal_uInt16 pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW;
GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat );
if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW)
@@ -338,17 +338,17 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
//Read the first two byte to check whether it is a gzipped stream, is so it may be in wmz or emz format
//unzip them and try again
- BYTE sFirstBytes[ 2 ];
+ sal_uInt8 sFirstBytes[ 2 ];
mpOStm->Seek( STREAM_SEEK_TO_END );
- ULONG nStreamLen = mpOStm->Tell();
+ sal_uIntPtr nStreamLen = mpOStm->Tell();
mpOStm->Seek( 0 );
if ( !nStreamLen )
{
SvLockBytes* pLockBytes = mpOStm->GetLockBytes();
if ( pLockBytes )
- pLockBytes->SetSynchronMode( TRUE );
+ pLockBytes->SetSynchronMode( sal_True );
mpOStm->Seek( STREAM_SEEK_TO_END );
nStreamLen = mpOStm->Tell();
@@ -370,7 +370,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
if (aZCodec.EndCompression() && pDest )
{
pDest->Seek( STREAM_SEEK_TO_END );
- ULONG nStreamLen_ = pDest->Tell();
+ sal_uIntPtr nStreamLen_ = pDest->Tell();
if (nStreamLen_)
{
pDest->Seek(0L);
@@ -500,7 +500,7 @@ uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( co
SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName,
const ::rtl::OUString& rPictureStreamName,
- BOOL bTruncate )
+ sal_Bool bTruncate )
{
SvxGraphicHelperStream_Impl aRet;
aRet.xStorage = ImplGetGraphicStorage( rPictureStorageName );
@@ -566,7 +566,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStor
const ::rtl::OUString& rPictureStreamName )
{
Graphic aGraphic;
- SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, FALSE ) );
+ SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, sal_False ) );
if( aStream.xStream.is() )
{
SvStream* pStream = utl::UcbStreamHelper::CreateStream( aStream.xStream );
@@ -589,7 +589,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt
if( aGrfObject.GetType() != GRAPHIC_NONE )
{
- SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, FALSE ) );
+ SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, sal_False ) );
if( aStream.xStream.is() )
{
Graphic aGraphic( (Graphic&) aGrfObject.GetGraphic() );
@@ -638,7 +638,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt
if ( pComment )
{
sal_uInt32 nSize = pComment->GetDataSize();
- const BYTE* pData = pComment->GetData();
+ const sal_uInt8* pData = pComment->GetData();
if ( nSize && pData )
pStream->Write( pData, nSize );
@@ -801,7 +801,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s
void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLStorage,
SvXMLGraphicHelperMode eCreateMode,
- BOOL bDirect )
+ sal_Bool bDirect )
{
mxRootStorage = rXMLStorage;
meCreateMode = eCreateMode;
@@ -812,7 +812,7 @@ void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLSto
SvXMLGraphicHelper* SvXMLGraphicHelper::Create( const uno::Reference < embed::XStorage >& rXMLStorage,
SvXMLGraphicHelperMode eCreateMode,
- BOOL bDirect )
+ sal_Bool bDirect )
{
SvXMLGraphicHelper* pThis = new SvXMLGraphicHelper;
diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx
index c2071d4bd252..b9cd5443f259 100644
--- a/svx/source/xml/xmlxtimp.cxx
+++ b/svx/source/xml/xmlxtimp.cxx
@@ -92,21 +92,21 @@ enum SvxXMLTableImportContextEnum { stice_unknown, stice_color, stice_marker, st
class SvxXMLTableImportContext : public SvXMLImportContext
{
public:
- SvxXMLTableImportContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable,
+ SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable,
sal_Bool bOOoFormat );
virtual ~SvxXMLTableImportContext();
- virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
+ virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList );
SvxXMLXTableImport& getImport() const { return *(SvxXMLXTableImport*)&GetImport(); }
protected:
- void importColor( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
- void importMarker( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
- void importDash( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
- void importHatch( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
- void importGradient( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
- void importBitmap( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+ void importColor( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+ void importMarker( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+ void importDash( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+ void importHatch( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+ void importGradient( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
+ void importBitmap( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName );
private:
uno::Reference< XNameContainer > mxTable;
@@ -116,7 +116,7 @@ private:
///////////////////////////////////////////////////////////////////////
-SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, sal_Bool bOOoFormat )
+SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, sal_Bool bOOoFormat )
: SvXMLImportContext( rImport, nPrfx, rLName ), mxTable( xTable ), meContext( eContext ),
mbOOoFormat( bOOoFormat )
{
@@ -126,7 +126,7 @@ SvxXMLTableImportContext::~SvxXMLTableImportContext()
{
}
-SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& rAttrList )
+SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& rAttrList )
{
if( XML_NAMESPACE_DRAW == nPrefix )
{
@@ -223,7 +223,7 @@ SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( USHORT nPrefix
return new SvXMLImportContext( GetImport(), nPrefix, rLocalName );
}
-void SvxXMLTableImportContext::importColor( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importColor( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
{
(void)nPrfx;
(void)rLocalName;
@@ -252,7 +252,7 @@ void SvxXMLTableImportContext::importColor( USHORT nPrfx, const OUString& rLocal
}
}
-void SvxXMLTableImportContext::importMarker( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importMarker( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
{
(void)nPrfx;
(void)rLocalName;
@@ -268,7 +268,7 @@ void SvxXMLTableImportContext::importMarker( USHORT nPrfx, const OUString& rLoca
}
}
-void SvxXMLTableImportContext::importDash( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importDash( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
{
(void)nPrfx;
(void)rLocalName;
@@ -284,7 +284,7 @@ void SvxXMLTableImportContext::importDash( USHORT nPrfx, const OUString& rLocalN
}
}
-void SvxXMLTableImportContext::importHatch( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importHatch( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
{
(void)nPrfx;
(void)rLocalName;
@@ -300,7 +300,7 @@ void SvxXMLTableImportContext::importHatch( USHORT nPrfx, const OUString& rLocal
}
}
-void SvxXMLTableImportContext::importGradient( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importGradient( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
{
(void)nPrfx;
(void)rLocalName;
@@ -316,7 +316,7 @@ void SvxXMLTableImportContext::importGradient( USHORT nPrfx, const OUString& rLo
}
}
-void SvxXMLTableImportContext::importBitmap( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
+void SvxXMLTableImportContext::importBitmap( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName )
{
(void)nPrfx;
(void)rLocalName;
@@ -373,7 +373,7 @@ sal_Bool SvxXMLXTableImport::load( const OUString& rUrl, const uno::Reference< X
{
do
{
- SfxMedium aMedium( rUrl, STREAM_READ | STREAM_NOCREATE, TRUE );
+ SfxMedium aMedium( rUrl, STREAM_READ | STREAM_NOCREATE, sal_True );
uno::Reference<lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() );
if( !xServiceFactory.is() )
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index 6b3419c7b04e..495fa68fa264 100644
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -129,7 +129,7 @@ BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const Out
// UNX has got problems with 1x1 bitmaps which are transparent (KA 02.11.1998)
#ifdef UNX
const Size aBmpSize( aBmp.GetSizePixel() );
- BOOL bFullTrans = FALSE;
+ sal_Bool bFullTrans = sal_False;
if( aBmpSize.Width() == 1 && aBmpSize.Height() == 1 && rGraphic.IsTransparent() )
{
@@ -139,7 +139,7 @@ BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const Out
if( pMAcc )
{
if( pMAcc->GetColor( 0, 0 ) == BitmapColor( Color( COL_WHITE ) ) )
- bFullTrans = TRUE;
+ bFullTrans = sal_True;
aTrans.ReleaseAccess( pMAcc );
}
@@ -207,7 +207,7 @@ void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev,
const long nBottom = aPixRect.Bottom();
const long nRight = aPixRect.Right();
const long nLeft = nXPos;
- const BOOL bNoSize = ( aPixSize == rBmpEx.GetSizePixel() );
+ const sal_Bool bNoSize = ( aPixSize == rBmpEx.GetSizePixel() );
pOutDev->Push();
pOutDev->SetMapMode( MapMode() );
@@ -239,14 +239,14 @@ void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev,
// ------------------------------------------------------------------------
-Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr, BOOL bVMirr )
+Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr )
{
Animation aNewAnim( rAnimation );
if( bHMirr || bVMirr )
{
const Size& rGlobalSize = aNewAnim.GetDisplaySizePixel();
- ULONG nMirrorFlags = 0L;
+ sal_uIntPtr nMirrorFlags = 0L;
if( bHMirr )
nMirrorFlags |= BMP_MIRROR_HORZ;
@@ -254,7 +254,7 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr,
if( bVMirr )
nMirrorFlags |= BMP_MIRROR_VERT;
- for( USHORT i = 0, nCount = aNewAnim.Count(); i < nCount; i++ )
+ for( sal_uInt16 i = 0, nCount = aNewAnim.Count(); i < nCount; i++ )
{
AnimationBitmap aAnimBmp( aNewAnim.Get( i ) );
@@ -280,7 +280,7 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr,
// ------------------------------------------------------------------------
-Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorFlags )
+Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags )
{
Graphic aRetGraphic;
@@ -318,8 +318,8 @@ Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorF
// ------------------------------------------------------------------------
-USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
- const String& rFilterName, const ULONG nFlags,
+sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
+ const String& rFilterName, const sal_uIntPtr nFlags,
const Size* pMtfSize_100TH_MM )
{
if( rGraphic.GetType() != GRAPHIC_NONE )
@@ -328,8 +328,8 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
Graphic aGraphic;
String aExt;
GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter();
- USHORT nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND;
- BOOL bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
+ sal_uInt16 nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND;
+ sal_Bool bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated();
DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::WriteGraphic(...): invalid URL" );
@@ -370,7 +370,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
aURL.setExtension( aExt );
rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE );
- SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, TRUE );
+ SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, sal_True );
SvStream* pOStm = aMedium.GetOutStream();
if( pOStm && aGfxLink.GetDataSize() && aGfxLink.GetData() )
@@ -493,15 +493,15 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName,
#pragma optimize ( "", off )
#endif
-USHORT XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
- GraphicFilter& rFilter, const USHORT nFormat,
+sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
+ GraphicFilter& rFilter, const sal_uInt16 nFormat,
const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData )
{
DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::ExportGraphic(...): invalid URL" );
- SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, TRUE );
+ SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, sal_True );
SvStream* pOStm = aMedium.GetOutStream();
- USHORT nRet = GRFILTER_IOERROR;
+ sal_uInt16 nRet = GRFILTER_IOERROR;
if( pOStm )
{
@@ -525,11 +525,11 @@ USHORT XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject&
// ------------------------------------------------------------------------
-Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
+Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold )
{
const Size aSize( rBmp.GetSizePixel() );
Bitmap aRetBmp;
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( ( aSize.Width() > 2L ) && ( aSize.Height() > 2L ) )
{
@@ -548,8 +548,8 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
const long nHeight = aSize.Height();
const long nHeight2 = nHeight - 2L;
const long lThres2 = (long) cThreshold * cThreshold;
- const BitmapColor aWhite = (BYTE) pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) );
- const BitmapColor aBlack = (BYTE) pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) );
+ const BitmapColor aWhite = (sal_uInt8) pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) );
+ const BitmapColor aBlack = (sal_uInt8) pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) );
long nSum1;
long nSum2;
long lGray;
@@ -567,18 +567,18 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
{
nXTmp = nX;
- nSum1 = -( nSum2 = lGray = (BYTE) pReadAcc->GetPixel( nY, nXTmp++ ) );
- nSum2 += ( (long) (BYTE) pReadAcc->GetPixel( nY, nXTmp++ ) ) << 1;
+ nSum1 = -( nSum2 = lGray = (sal_uInt8) pReadAcc->GetPixel( nY, nXTmp++ ) );
+ nSum2 += ( (long) (sal_uInt8) pReadAcc->GetPixel( nY, nXTmp++ ) ) << 1;
nSum1 += ( lGray = pReadAcc->GetPixel( nY, nXTmp ) );
nSum2 += lGray;
- nSum1 += ( (long) (BYTE) pReadAcc->GetPixel( nY1, nXTmp ) ) << 1;
- nSum1 -= ( (long) (BYTE) pReadAcc->GetPixel( nY1, nXTmp -= 2 ) ) << 1;
+ nSum1 += ( (long) (sal_uInt8) pReadAcc->GetPixel( nY1, nXTmp ) ) << 1;
+ nSum1 -= ( (long) (sal_uInt8) pReadAcc->GetPixel( nY1, nXTmp -= 2 ) ) << 1;
- nSum1 += ( lGray = -(long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp++ ) );
+ nSum1 += ( lGray = -(long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp++ ) );
nSum2 += lGray;
- nSum2 -= ( (long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp++ ) ) << 1;
- nSum1 += ( lGray = (long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp ) );
+ nSum2 -= ( (long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp++ ) ) << 1;
+ nSum1 += ( lGray = (long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp ) );
nSum2 -= lGray;
if( ( nSum1 * nSum1 + nSum2 * nSum2 ) < lThres2 )
@@ -588,7 +588,7 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
}
}
- bRet = TRUE;
+ bRet = sal_True;
}
aWorkBmp.ReleaseAccess( pReadAcc );
@@ -612,8 +612,8 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold )
// ------------------------------------------------------------------------
-Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
- const BYTE cEdgeDetectThreshold, const Rectangle* pWorkRectPixel )
+Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const sal_uIntPtr nFlags,
+ const sal_uInt8 cEdgeDetectThreshold, const Rectangle* pWorkRectPixel )
{
Bitmap aWorkBmp;
Polygon aRetPoly;
@@ -653,7 +653,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
Point* pPoints1 = NULL;
Point* pPoints2 = NULL;
long nX, nY;
- USHORT nPolyPos = 0;
+ sal_uInt16 nPolyPos = 0;
const BitmapColor aBlack = pAcc->GetBestMatchingColor( Color( COL_BLACK ) );
if( nFlags & XOUTBMP_CONTOUR_VERT )
@@ -674,7 +674,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
nY = nStartY2;
// diese Schleife wird immer gebreaked da hier ja min. ein Pixel ist
- while( TRUE )
+ while( sal_True )
{
if( aBlack == pAcc->GetPixel( nY, nX ) )
{
@@ -711,7 +711,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
nX = nStartX2;
// diese Schleife wird immer gebreaked da hier ja min. ein Pixel ist
- while( TRUE )
+ while( sal_True )
{
if( aBlack == pAcc->GetPixel( nY, nX ) )
{
@@ -731,13 +731,13 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
}
}
- const USHORT nNewSize1 = nPolyPos << 1;
+ const sal_uInt16 nNewSize1 = nPolyPos << 1;
aRetPoly = Polygon( nPolyPos, pPoints1 );
aRetPoly.SetSize( nNewSize1 + 1 );
aRetPoly[ nNewSize1 ] = aRetPoly[ 0 ];
- for( USHORT j = nPolyPos; nPolyPos < nNewSize1; )
+ for( sal_uInt16 j = nPolyPos; nPolyPos < nNewSize1; )
aRetPoly[ nPolyPos++ ] = pPoints2[ --j ];
if( ( fFactorX != 0. ) && ( fFactorY != 0. ) )
@@ -755,14 +755,14 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags,
// - DitherBitmap -
// ----------------
-BOOL DitherBitmap( Bitmap& rBitmap )
+sal_Bool DitherBitmap( Bitmap& rBitmap )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( ( rBitmap.GetBitCount() >= 8 ) && ( Application::GetDefaultDevice()->GetColorCount() < 257 ) )
bRet = rBitmap.Dither( BMP_DITHER_FLOYD );
else
- bRet = FALSE;
+ bRet = sal_False;
return bRet;
}
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index 0e6252ddcb92..3dd39fc10347 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -57,11 +57,11 @@ DBG_NAME(XPolyPolygon);
|*
*************************************************************************/
-ImpXPolygon::ImpXPolygon( USHORT nInitSize, USHORT _nResize )
+ImpXPolygon::ImpXPolygon( sal_uInt16 nInitSize, sal_uInt16 _nResize )
{
pPointAry = NULL;
pFlagAry = NULL;
- bDeleteOldPoints = FALSE;
+ bDeleteOldPoints = sal_False;
nSize = 0;
nResize = _nResize;
nPoints = 0;
@@ -86,7 +86,7 @@ ImpXPolygon::ImpXPolygon( const ImpXPolygon& rImpXPoly )
pPointAry = NULL;
pFlagAry = NULL;
- bDeleteOldPoints = FALSE;
+ bDeleteOldPoints = sal_False;
nSize = 0;
ImpXPolygon::nResize = rImpXPoly.nResize;
nPoints = 0;
@@ -140,7 +140,7 @@ bool ImpXPolygon::operator==(const ImpXPolygon& rImpXPoly) const
|*
|* ImpXPolygon::Resize()
|*
-|* !!! Polygongroesse aendern - wenn bDeletePoints FALSE, dann den
+|* !!! Polygongroesse aendern - wenn bDeletePoints sal_False, dann den
|* Point-Array nicht loeschen, sondern in pOldPointAry sichern und
|* das Flag bDeleteOldPoints setzen. Beim naechsten Zugriff wird
|* das Array dann geloescht.
@@ -152,13 +152,13 @@ bool ImpXPolygon::operator==(const ImpXPolygon& rImpXPoly) const
|*
*************************************************************************/
-void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
+void ImpXPolygon::Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints )
{
if( nNewSize == nSize )
return;
- BYTE* pOldFlagAry = pFlagAry;
- USHORT nOldSize = nSize;
+ sal_uInt8* pOldFlagAry = pFlagAry;
+ sal_uInt16 nOldSize = nSize;
CheckPointDelete();
pOldPointAry = pPointAry;
@@ -176,7 +176,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
memset( pPointAry, 0, nSize*sizeof( Point ) );
// Flag Array erzeugen
- pFlagAry = new BYTE[ nSize ];
+ pFlagAry = new sal_uInt8[ nSize ];
memset( pFlagAry, 0, nSize );
// Eventuell umkopieren
@@ -197,7 +197,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
nPoints = nSize;
}
if ( bDeletePoints ) delete[] (char*) pOldPointAry;
- else bDeleteOldPoints = TRUE;
+ else bDeleteOldPoints = sal_True;
delete[] pOldFlagAry;
}
}
@@ -213,7 +213,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints )
|*
*************************************************************************/
-void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
+void ImpXPolygon::InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount )
{
CheckPointDelete();
@@ -228,7 +228,7 @@ void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
// den Rest nach hinten schieben
if( nPos < nPoints )
{
- USHORT nMove = nPoints - nPos;
+ sal_uInt16 nMove = nPoints - nPos;
memmove( &pPointAry[nPos+nCount], &pPointAry[nPos],
nMove * sizeof(Point) );
memmove( &pFlagAry[nPos+nCount], &pFlagAry[nPos], nMove );
@@ -250,13 +250,13 @@ void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount )
|*
*************************************************************************/
-void ImpXPolygon::Remove( USHORT nPos, USHORT nCount )
+void ImpXPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount )
{
CheckPointDelete();
if( (nPos + nCount) <= nPoints )
{
- USHORT nMove = nPoints - nPos - nCount;
+ sal_uInt16 nMove = nPoints - nPos - nCount;
if( nMove )
{
@@ -281,7 +281,7 @@ void ImpXPolygon::Remove( USHORT nPos, USHORT nCount )
|*
*************************************************************************/
-XPolygon::XPolygon( USHORT nSize, USHORT nResize )
+XPolygon::XPolygon( sal_uInt16 nSize, sal_uInt16 nResize )
{
DBG_CTOR(XPolygon,NULL);
pImpXPolygon = new ImpXPolygon( nSize, nResize );
@@ -318,14 +318,14 @@ XPolygon::XPolygon( const Polygon& rPoly )
{
DBG_CTOR(XPolygon,NULL);
- USHORT nSize = rPoly.GetSize();
+ sal_uInt16 nSize = rPoly.GetSize();
pImpXPolygon = new ImpXPolygon( nSize );
pImpXPolygon->nPoints = nSize;
- for( USHORT i = 0; i < nSize; i++ )
+ for( sal_uInt16 i = 0; i < nSize; i++ )
{
pImpXPolygon->pPointAry[i] = rPoly[i];
- pImpXPolygon->pFlagAry[i] = (BYTE) rPoly.GetFlags( i );
+ pImpXPolygon->pFlagAry[i] = (sal_uInt8) rPoly.GetFlags( i );
}
}
@@ -355,13 +355,13 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
// Faktor fuer Kontrollpunkte der Bezierkurven: 8/3 * (sin(45g) - 0.5)
long nXHdl = (long)(0.552284749 * nRx);
long nYHdl = (long)(0.552284749 * nRy);
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
if ( nRx && nRy )
{
Point aCenter;
- for (USHORT nQuad = 0; nQuad < 4; nQuad++)
+ for (sal_uInt16 nQuad = 0; nQuad < 4; nQuad++)
{
switch ( nQuad )
{
@@ -383,8 +383,8 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
break;
}
GenBezArc(aCenter, nRx, nRy, nXHdl, nYHdl, 0, 900, nQuad, nPos);
- pImpXPolygon->pFlagAry[nPos ] = (BYTE) XPOLY_SMOOTH;
- pImpXPolygon->pFlagAry[nPos+3] = (BYTE) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[nPos ] = (sal_uInt8) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[nPos+3] = (sal_uInt8) XPOLY_SMOOTH;
nPos += 4;
}
}
@@ -410,31 +410,31 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy)
*************************************************************************/
XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
- USHORT nStartAngle, USHORT nEndAngle, BOOL bClose)
+ sal_uInt16 nStartAngle, sal_uInt16 nEndAngle, sal_Bool bClose)
{
DBG_CTOR(XPolygon,NULL);
pImpXPolygon = new ImpXPolygon(17);
nStartAngle %= 3600;
if ( nEndAngle > 3600 ) nEndAngle %= 3600;
- BOOL bFull = (nStartAngle == 0 && nEndAngle == 3600);
+ sal_Bool bFull = (nStartAngle == 0 && nEndAngle == 3600);
// Faktor fuer Kontrollpunkte der Bezierkurven: 8/3 * (sin(45g) - 0.5)
long nXHdl = (long)(0.552284749 * nRx);
long nYHdl = (long)(0.552284749 * nRy);
- USHORT nPos = 0;
- BOOL bLoopEnd = FALSE;
+ sal_uInt16 nPos = 0;
+ sal_Bool bLoopEnd = sal_False;
do
{
- USHORT nA1, nA2;
- USHORT nQuad = nStartAngle / 900;
+ sal_uInt16 nA1, nA2;
+ sal_uInt16 nQuad = nStartAngle / 900;
if ( nQuad == 4 ) nQuad = 0;
bLoopEnd = CheckAngles(nStartAngle, nEndAngle, nA1, nA2);
GenBezArc(rCenter, nRx, nRy, nXHdl, nYHdl, nA1, nA2, nQuad, nPos);
nPos += 3;
if ( !bLoopEnd )
- pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) XPOLY_SMOOTH;
} while ( !bLoopEnd );
@@ -444,8 +444,8 @@ XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy,
if ( bFull )
{
- pImpXPolygon->pFlagAry[0 ] = (BYTE) XPOLY_SMOOTH;
- pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[0 ] = (sal_uInt8) XPOLY_SMOOTH;
+ pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) XPOLY_SMOOTH;
}
pImpXPolygon->nPoints = nPos + 1;
}
@@ -498,7 +498,7 @@ void XPolygon::CheckReference()
|*
*************************************************************************/
-void XPolygon::SetSize( USHORT nNewSize )
+void XPolygon::SetSize( sal_uInt16 nNewSize )
{
CheckReference();
pImpXPolygon->Resize( nNewSize );
@@ -514,7 +514,7 @@ void XPolygon::SetSize( USHORT nNewSize )
|*
*************************************************************************/
-USHORT XPolygon::GetSize() const
+sal_uInt16 XPolygon::GetSize() const
{
pImpXPolygon->CheckPointDelete();
return pImpXPolygon->nSize;
@@ -530,7 +530,7 @@ USHORT XPolygon::GetSize() const
|*
*************************************************************************/
-void XPolygon::SetPointCount( USHORT nPoints )
+void XPolygon::SetPointCount( sal_uInt16 nPoints )
{
pImpXPolygon->CheckPointDelete();
CheckReference();
@@ -540,7 +540,7 @@ void XPolygon::SetPointCount( USHORT nPoints )
if ( nPoints < pImpXPolygon->nPoints )
{
- USHORT nSize = pImpXPolygon->nPoints - nPoints;
+ sal_uInt16 nSize = pImpXPolygon->nPoints - nPoints;
memset( &pImpXPolygon->pPointAry[nPoints], 0, nSize * sizeof( Point ) );
memset( &pImpXPolygon->pFlagAry [nPoints], 0, nSize );
}
@@ -557,7 +557,7 @@ void XPolygon::SetPointCount( USHORT nPoints )
|*
*************************************************************************/
-USHORT XPolygon::GetPointCount() const
+sal_uInt16 XPolygon::GetPointCount() const
{
pImpXPolygon->CheckPointDelete();
return pImpXPolygon->nPoints;
@@ -573,13 +573,13 @@ USHORT XPolygon::GetPointCount() const
|*
*************************************************************************/
-void XPolygon::Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags )
+void XPolygon::Insert( sal_uInt16 nPos, const Point& rPt, XPolyFlags eFlags )
{
CheckReference();
if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
pImpXPolygon->InsertSpace( nPos, 1 );
pImpXPolygon->pPointAry[nPos] = rPt;
- pImpXPolygon->pFlagAry[nPos] = (BYTE)eFlags;
+ pImpXPolygon->pFlagAry[nPos] = (sal_uInt8)eFlags;
}
/*************************************************************************
@@ -592,12 +592,12 @@ void XPolygon::Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags )
|*
*************************************************************************/
-void XPolygon::Insert( USHORT nPos, const XPolygon& rXPoly )
+void XPolygon::Insert( sal_uInt16 nPos, const XPolygon& rXPoly )
{
CheckReference();
if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
- USHORT nPoints = rXPoly.GetPointCount();
+ sal_uInt16 nPoints = rXPoly.GetPointCount();
pImpXPolygon->InsertSpace( nPos, nPoints );
@@ -619,16 +619,16 @@ void XPolygon::Insert( USHORT nPos, const XPolygon& rXPoly )
|*
*************************************************************************/
-void XPolygon::Insert( USHORT nPos, const Polygon& rPoly )
+void XPolygon::Insert( sal_uInt16 nPos, const Polygon& rPoly )
{
CheckReference();
if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints;
- USHORT nPoints = rPoly.GetSize();
+ sal_uInt16 nPoints = rPoly.GetSize();
pImpXPolygon->InsertSpace( nPos, nPoints );
- USHORT i;
+ sal_uInt16 i;
for( i=0; i < nPoints; i++ )
pImpXPolygon->pPointAry[i] = rPoly[i];
@@ -645,7 +645,7 @@ void XPolygon::Insert( USHORT nPos, const Polygon& rPoly )
|*
*************************************************************************/
-void XPolygon::Remove( USHORT nPos, USHORT nCount )
+void XPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount )
{
CheckReference();
pImpXPolygon->Remove( nPos, nCount );
@@ -669,8 +669,8 @@ void XPolygon::Move( long nHorzMove, long nVertMove )
CheckReference();
// Punkte verschieben
- USHORT nCount = pImpXPolygon->nPoints;
- for ( USHORT i = 0; i < nCount; i++ )
+ sal_uInt16 nCount = pImpXPolygon->nPoints;
+ for ( sal_uInt16 i = 0; i < nCount; i++ )
{
Point* pPt = &(pImpXPolygon->pPointAry[i]);
pPt->X() += nHorzMove;
@@ -720,7 +720,7 @@ Rectangle XPolygon::GetBoundRect() const
|*
*************************************************************************/
-const Point& XPolygon::operator[]( USHORT nPos ) const
+const Point& XPolygon::operator[]( sal_uInt16 nPos ) const
{
DBG_ASSERT(nPos < pImpXPolygon->nPoints, "Ungueltiger Index bei const-Arrayzugriff auf XPolygon");
@@ -738,7 +738,7 @@ const Point& XPolygon::operator[]( USHORT nPos ) const
|*
*************************************************************************/
-Point& XPolygon::operator[]( USHORT nPos )
+Point& XPolygon::operator[]( sal_uInt16 nPos )
{
pImpXPolygon->CheckPointDelete();
CheckReference();
@@ -746,7 +746,7 @@ Point& XPolygon::operator[]( USHORT nPos )
if( nPos >= pImpXPolygon->nSize )
{
DBG_ASSERT(pImpXPolygon->nResize, "Ungueltiger Index bei Arrayzugriff auf XPolygon");
- pImpXPolygon->Resize(nPos + 1, FALSE);
+ pImpXPolygon->Resize(nPos + 1, sal_False);
}
if( nPos >= pImpXPolygon->nPoints )
pImpXPolygon->nPoints = nPos + 1;
@@ -789,10 +789,10 @@ XPolygon& XPolygon::operator=( const XPolygon& rXPoly )
|*
*************************************************************************/
-BOOL XPolygon::operator==( const XPolygon& rXPoly ) const
+sal_Bool XPolygon::operator==( const XPolygon& rXPoly ) const
{
pImpXPolygon->CheckPointDelete();
- if (rXPoly.pImpXPolygon==pImpXPolygon) return TRUE;
+ if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_True;
return *rXPoly.pImpXPolygon == *pImpXPolygon;
}
@@ -806,10 +806,10 @@ BOOL XPolygon::operator==( const XPolygon& rXPoly ) const
|*
*************************************************************************/
-BOOL XPolygon::operator!=( const XPolygon& rXPoly ) const
+sal_Bool XPolygon::operator!=( const XPolygon& rXPoly ) const
{
pImpXPolygon->CheckPointDelete();
- if (rXPoly.pImpXPolygon==pImpXPolygon) return FALSE;
+ if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_False;
return *rXPoly.pImpXPolygon != *pImpXPolygon;
}
@@ -823,7 +823,7 @@ BOOL XPolygon::operator!=( const XPolygon& rXPoly ) const
|*
*************************************************************************/
-XPolyFlags XPolygon::GetFlags( USHORT nPos ) const
+XPolyFlags XPolygon::GetFlags( sal_uInt16 nPos ) const
{
pImpXPolygon->CheckPointDelete();
return (XPolyFlags) pImpXPolygon->pFlagAry[nPos];
@@ -839,11 +839,11 @@ XPolyFlags XPolygon::GetFlags( USHORT nPos ) const
|*
*************************************************************************/
-void XPolygon::SetFlags( USHORT nPos, XPolyFlags eFlags )
+void XPolygon::SetFlags( sal_uInt16 nPos, XPolyFlags eFlags )
{
pImpXPolygon->CheckPointDelete();
CheckReference();
- pImpXPolygon->pFlagAry[nPos] = (BYTE) eFlags;
+ pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) eFlags;
}
/*************************************************************************
@@ -856,7 +856,7 @@ void XPolygon::SetFlags( USHORT nPos, XPolyFlags eFlags )
|*
*************************************************************************/
-BOOL XPolygon::IsControl(USHORT nPos) const
+sal_Bool XPolygon::IsControl(sal_uInt16 nPos) const
{
return ( (XPolyFlags) pImpXPolygon->pFlagAry[nPos] == XPOLY_CONTROL );
}
@@ -871,7 +871,7 @@ BOOL XPolygon::IsControl(USHORT nPos) const
|*
*************************************************************************/
-BOOL XPolygon::IsSmooth(USHORT nPos) const
+sal_Bool XPolygon::IsSmooth(sal_uInt16 nPos) const
{
XPolyFlags eFlag = (XPolyFlags) pImpXPolygon->pFlagAry[nPos];
return ( eFlag == XPOLY_SMOOTH || eFlag == XPOLY_SYMMTR );
@@ -887,7 +887,7 @@ BOOL XPolygon::IsSmooth(USHORT nPos) const
|*
*************************************************************************/
-double XPolygon::CalcDistance(USHORT nP1, USHORT nP2)
+double XPolygon::CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2)
{
const Point& rP1 = pImpXPolygon->pPointAry[nP1];
const Point& rP2 = pImpXPolygon->pPointAry[nP2];
@@ -906,7 +906,7 @@ double XPolygon::CalcDistance(USHORT nP1, USHORT nP2)
|*
*************************************************************************/
-void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
+void XPolygon::SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT)
{
Point* pPoints = pImpXPolygon->pPointAry;
double fT2 = fT * fT;
@@ -914,7 +914,7 @@ void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
double fU = 1.0 - fT;
double fU2 = fU * fU;
double fU3 = fU * fU2;
- USHORT nIdx = nPos;
+ sal_uInt16 nIdx = nPos;
short nPosInc, nIdxInc;
if ( bCalcFirst )
@@ -955,8 +955,8 @@ void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT)
/************************************************************************/
void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy,
- long nXHdl, long nYHdl, USHORT nStart, USHORT nEnd,
- USHORT nQuad, USHORT nFirst)
+ long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd,
+ sal_uInt16 nQuad, sal_uInt16 nFirst)
{
Point* pPoints = pImpXPolygon->pPointAry;
pPoints[nFirst ] = rCenter;
@@ -991,29 +991,29 @@ void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy,
pPoints[nFirst+1].X() += nXHdl; pPoints[nFirst+2].Y() += nYHdl;
}
if ( nStart > 0 )
- SubdivideBezier(nFirst, FALSE, (double)nStart / 900);
+ SubdivideBezier(nFirst, sal_False, (double)nStart / 900);
if ( nEnd < 900 )
- SubdivideBezier(nFirst, TRUE, (double)(nEnd-nStart) / (900-nStart));
+ SubdivideBezier(nFirst, sal_True, (double)(nEnd-nStart) / (900-nStart));
SetFlags(nFirst+1, XPOLY_CONTROL);
SetFlags(nFirst+2, XPOLY_CONTROL);
}
/************************************************************************/
-BOOL XPolygon::CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2)
+sal_Bool XPolygon::CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2)
{
if ( nStart == 3600 ) nStart = 0;
if ( nEnd == 0 ) nEnd = 3600;
- USHORT nStPrev = nStart;
- USHORT nMax = (nStart / 900 + 1) * 900;
- USHORT nMin = nMax - 900;
+ sal_uInt16 nStPrev = nStart;
+ sal_uInt16 nMax = (nStart / 900 + 1) * 900;
+ sal_uInt16 nMin = nMax - 900;
if ( nEnd >= nMax || nEnd <= nStart ) nA2 = 900;
else nA2 = nEnd - nMin;
nA1 = nStart - nMin;
nStart = nMax;
- // TRUE zurueck, falls letztes Segment berechnet wurde
+ // sal_True zurueck, falls letztes Segment berechnet wurde
return (nStPrev < nEnd && nStart >= nEnd);
}
@@ -1034,11 +1034,11 @@ BOOL XPolygon::CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2
|*
\************************************************************************/
-void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
+void XPolygon::CalcSmoothJoin(sal_uInt16 nCenter, sal_uInt16 nDrag, sal_uInt16 nPnt)
{
CheckReference();
-// USHORT nMaxPnt = pImpXPolygon->nPoints - 1;
+// sal_uInt16 nMaxPnt = pImpXPolygon->nPoints - 1;
// if ( nCenter == nMaxPnt ) nPnt = 1;
// else if ( nCenter == 0 ) nPnt = nMaxPnt - 1;
@@ -1047,7 +1047,7 @@ void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
// statt dessen nDrag auf der Achse nCenter-nPnt verschieben
if ( !IsControl(nPnt) )
{
- USHORT nTmp = nDrag;
+ sal_uInt16 nTmp = nDrag;
nDrag = nPnt;
nPnt = nTmp;
}
@@ -1081,7 +1081,7 @@ void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt)
|*
\************************************************************************/
-void XPolygon::CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext)
+void XPolygon::CalcTangent(sal_uInt16 nCenter, sal_uInt16 nPrev, sal_uInt16 nNext)
{
CheckReference();
@@ -1119,7 +1119,7 @@ void XPolygon::CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext)
|*
\************************************************************************/
-void XPolygon::PointsToBezier(USHORT nFirst)
+void XPolygon::PointsToBezier(sal_uInt16 nFirst)
{
double nFullLength, nPart1Length, nPart2Length;
double fX0, fY0, fX1, fY1, fX2, fY2, fX3, fY3;
@@ -1202,9 +1202,9 @@ void XPolygon::Translate(const Point& rTrans)
pImpXPolygon->CheckPointDelete();
CheckReference();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
pImpXPolygon->pPointAry[i] += rTrans;
}
@@ -1231,9 +1231,9 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
long nCenterX = rCenter.X();
long nCenterY = rCenter.Y();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point *pPt = &(pImpXPolygon->pPointAry[i]);
nX = pPt->X()-nCenterX;
@@ -1245,9 +1245,9 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
/* und so stand das in einem anderen File auf T:
dass ich am 29-11-1995 gegettet habe. Joe M.
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point P = pImpXPolygon->pPointAry[i] - rCenter;
long X = P.X();
@@ -1270,7 +1270,7 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
|*
*************************************************************************/
-void XPolygon::Rotate(const Point& rCenter, USHORT nAngle)
+void XPolygon::Rotate(const Point& rCenter, sal_uInt16 nAngle)
{
nAngle %= 3600;
@@ -1298,9 +1298,9 @@ void XPolygon::Scale(double fSx, double fSy)
pImpXPolygon->CheckPointDelete();
CheckReference();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point& rPnt = pImpXPolygon->pPointAry[i];
rPnt.X() = (long)(fSx * rPnt.X());
@@ -1324,9 +1324,9 @@ void XPolygon::SlantX(long nYRef, double fSin, double fCos)
pImpXPolygon->CheckPointDelete();
CheckReference();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point& rPnt = pImpXPolygon->pPointAry[i];
long nDy = rPnt.Y() - nYRef;
@@ -1351,9 +1351,9 @@ void XPolygon::SlantY(long nXRef, double fSin, double fCos)
pImpXPolygon->CheckPointDelete();
CheckReference();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point& rPnt = pImpXPolygon->pPointAry[i];
long nDx = rPnt.X() - nXRef;
@@ -1407,9 +1407,9 @@ void XPolygon::Distort(const Rectangle& rRefRect,
X4 = rDistortedRect[2].X();
Y4 = rDistortedRect[2].Y();
- USHORT nPntCnt = pImpXPolygon->nPoints;
+ sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
- for (USHORT i = 0; i < nPntCnt; i++)
+ for (sal_uInt16 i = 0; i < nPntCnt; i++)
{
Point& rPnt = pImpXPolygon->pPointAry[i];
@@ -1487,14 +1487,14 @@ XPolygon::XPolygon(const basegfx::B2DPolygon& rPolygon)
DBG_CTOR(XPolygon,NULL);
const Polygon aSource(rPolygon);
- USHORT nSize = aSource.GetSize();
+ sal_uInt16 nSize = aSource.GetSize();
pImpXPolygon = new ImpXPolygon( nSize );
pImpXPolygon->nPoints = nSize;
- for( USHORT i = 0; i < nSize; i++ )
+ for( sal_uInt16 i = 0; i < nSize; i++ )
{
pImpXPolygon->pPointAry[i] = aSource[i];
- pImpXPolygon->pFlagAry[i] = (BYTE) aSource.GetFlags( i );
+ pImpXPolygon->pFlagAry[i] = (sal_uInt8) aSource.GetFlags( i );
}
}
@@ -1559,11 +1559,11 @@ ImpXPolyPolygon::~ImpXPolyPolygon()
bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const
{
- USHORT nAnz=(USHORT)aXPolyList.Count();
+ sal_uInt16 nAnz=(sal_uInt16)aXPolyList.Count();
const XPolygonList& rCmpList=rImpXPolyPoly.aXPolyList;
- if (nAnz!=(USHORT)rCmpList.Count()) return FALSE;
+ if (nAnz!=(sal_uInt16)rCmpList.Count()) return sal_False;
bool bEq=true;
- for (USHORT i=nAnz; i>0 && bEq;) {
+ for (sal_uInt16 i=nAnz; i>0 && bEq;) {
i--;
bEq= *aXPolyList.GetObject(i) == *rCmpList.GetObject(i);
}
@@ -1580,7 +1580,7 @@ bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const
|*
*************************************************************************/
-XPolyPolygon::XPolyPolygon( USHORT nInitSize, USHORT nResize )
+XPolyPolygon::XPolyPolygon( sal_uInt16 nInitSize, sal_uInt16 nResize )
{
DBG_CTOR(XPolyPolygon,NULL);
pImpXPolyPolygon = new ImpXPolyPolygon( nInitSize, nResize );
@@ -1636,7 +1636,7 @@ XPolyPolygon::XPolyPolygon( const PolyPolygon& rPolyPoly )
DBG_CTOR(XPolyPolygon,NULL);
pImpXPolyPolygon = new ImpXPolyPolygon;
- for (USHORT i = 0; i < rPolyPoly.Count(); i++)
+ for (sal_uInt16 i = 0; i < rPolyPoly.Count(); i++)
pImpXPolyPolygon->aXPolyList.Insert(
new XPolygon(rPolyPoly.GetObject(i)) );
}
@@ -1689,7 +1689,7 @@ void XPolyPolygon::CheckReference()
|*
*************************************************************************/
-void XPolyPolygon::Insert( const XPolygon& rXPoly, USHORT nPos )
+void XPolyPolygon::Insert( const XPolygon& rXPoly, sal_uInt16 nPos )
{
CheckReference();
XPolygon* pXPoly = new XPolygon( rXPoly );
@@ -1706,11 +1706,11 @@ void XPolyPolygon::Insert( const XPolygon& rXPoly, USHORT nPos )
|*
*************************************************************************/
-void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, USHORT nPos )
+void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, sal_uInt16 nPos )
{
CheckReference();
- for (USHORT i = 0; i < rXPolyPoly.Count(); i++)
+ for (sal_uInt16 i = 0; i < rXPolyPoly.Count(); i++)
{
XPolygon* pXPoly = new XPolygon(rXPolyPoly[i]);
pImpXPolyPolygon->aXPolyList.Insert(pXPoly, nPos);
@@ -1729,7 +1729,7 @@ void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, USHORT nPos )
|*
*************************************************************************/
-XPolygon XPolyPolygon::Remove( USHORT nPos )
+XPolygon XPolyPolygon::Remove( sal_uInt16 nPos )
{
CheckReference();
XPolygon* pTmpXPoly = pImpXPolyPolygon->aXPolyList.Remove( nPos );
@@ -1749,7 +1749,7 @@ XPolygon XPolyPolygon::Remove( USHORT nPos )
|*
*************************************************************************/
-XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, USHORT nPos )
+XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, sal_uInt16 nPos )
{
CheckReference();
XPolygon* pXPoly = new XPolygon( rXPoly );
@@ -1770,7 +1770,7 @@ XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, USHORT nPos )
|*
*************************************************************************/
-const XPolygon& XPolyPolygon::GetObject( USHORT nPos ) const
+const XPolygon& XPolyPolygon::GetObject( sal_uInt16 nPos ) const
{
return *(pImpXPolyPolygon->aXPolyList.GetObject( nPos ));
}
@@ -1816,9 +1816,9 @@ void XPolyPolygon::Clear()
|*
*************************************************************************/
-USHORT XPolyPolygon::Count() const
+sal_uInt16 XPolyPolygon::Count() const
{
- return (USHORT)(pImpXPolyPolygon->aXPolyList.Count());
+ return (sal_uInt16)(pImpXPolyPolygon->aXPolyList.Count());
}
@@ -1862,10 +1862,10 @@ void XPolyPolygon::Move( long nHorzMove, long nVertMove )
Rectangle XPolyPolygon::GetBoundRect() const
{
- USHORT nXPoly = (USHORT)pImpXPolyPolygon->aXPolyList.Count();
+ sal_uInt16 nXPoly = (sal_uInt16)pImpXPolyPolygon->aXPolyList.Count();
Rectangle aRect;
- for ( USHORT n = 0; n < nXPoly; n++ )
+ for ( sal_uInt16 n = 0; n < nXPoly; n++ )
{
const XPolygon* pXPoly = pImpXPolyPolygon->aXPolyList.GetObject( n );
aRect.Union( pXPoly->GetBoundRect() );
@@ -1885,7 +1885,7 @@ Rectangle XPolyPolygon::GetBoundRect() const
|*
*************************************************************************/
-XPolygon& XPolyPolygon::operator[]( USHORT nPos )
+XPolygon& XPolyPolygon::operator[]( sal_uInt16 nPos )
{
CheckReference();
return *(pImpXPolyPolygon->aXPolyList.GetObject( nPos ));
@@ -1925,9 +1925,9 @@ XPolyPolygon& XPolyPolygon::operator=( const XPolyPolygon& rXPolyPoly )
|*
*************************************************************************/
-BOOL XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
+sal_Bool XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
{
- if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return TRUE;
+ if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_True;
return *pImpXPolyPolygon == *rXPolyPoly.pImpXPolyPolygon;
}
@@ -1942,9 +1942,9 @@ BOOL XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const
|*
*************************************************************************/
-BOOL XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const
+sal_Bool XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const
{
- if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return FALSE;
+ if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_False;
return *pImpXPolyPolygon != *rXPolyPoly.pImpXPolyPolygon;
}
@@ -1962,7 +1962,7 @@ void XPolyPolygon::Translate(const Point& rTrans)
{
CheckReference();
- for (USHORT i = 0; i < Count(); i++)
+ for (sal_uInt16 i = 0; i < Count(); i++)
pImpXPolyPolygon->aXPolyList.GetObject(i)->Translate(rTrans);
}
@@ -1981,7 +1981,7 @@ void XPolyPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
{
CheckReference();
- for (USHORT i = 0; i < Count(); i++)
+ for (sal_uInt16 i = 0; i < Count(); i++)
pImpXPolyPolygon->aXPolyList.GetObject(i)->Rotate(rCenter, fSin, fCos);
}
@@ -1996,7 +1996,7 @@ void XPolyPolygon::Rotate20()
{
CheckReference();
- for (USHORT i = 0; i < Count(); i++)
+ for (sal_uInt16 i = 0; i < Count(); i++)
pImpXPolyPolygon->aXPolyList.GetObject(i)->Rotate20();
}
@@ -2011,7 +2011,7 @@ void XPolyPolygon::Rotate20()
|*
*************************************************************************/
-void XPolyPolygon::Rotate(const Point& rCenter, USHORT nAngle)
+void XPolyPolygon::Rotate(const Point& rCenter, sal_uInt16 nAngle)
{
nAngle %= 3600;
@@ -2038,7 +2038,7 @@ void XPolyPolygon::Scale(double fSx, double fSy)
{
CheckReference();
- for (USHORT i = 0; i < Count(); i++)
+ for (sal_uInt16 i = 0; i < Count(); i++)
pImpXPolyPolygon->aXPolyList.GetObject(i)->Scale(fSx, fSy);
}
@@ -2057,7 +2057,7 @@ void XPolyPolygon::SlantX(long nYRef, double fSin, double fCos)
{
CheckReference();
- for (USHORT i = 0; i < Count(); i++)
+ for (sal_uInt16 i = 0; i < Count(); i++)
pImpXPolyPolygon->aXPolyList.GetObject(i)->SlantX(nYRef, fSin, fCos);
}
@@ -2076,7 +2076,7 @@ void XPolyPolygon::SlantY(long nXRef, double fSin, double fCos)
{
CheckReference();
- for (USHORT i = 0; i < Count(); i++)
+ for (sal_uInt16 i = 0; i < Count(); i++)
pImpXPolyPolygon->aXPolyList.GetObject(i)->SlantY(nXRef, fSin, fCos);
}
@@ -2101,7 +2101,7 @@ void XPolyPolygon::Distort(const Rectangle& rRefRect,
{
CheckReference();
- for (USHORT i = 0; i < Count(); i++)
+ for (sal_uInt16 i = 0; i < Count(); i++)
pImpXPolyPolygon->aXPolyList.GetObject(i)->Distort(rRefRect,
rDistortedRect);
}
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index f7ce452ea6e8..5df3689e023e 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -75,7 +75,7 @@ using namespace ::com::sun::star;
/************************************************************************/
-#define VCLTOSVCOL( rCol ) (USHORT)((((USHORT)(rCol))<<8)|(rCol))
+#define VCLTOSVCOL( rCol ) (sal_uInt16)((((sal_uInt16)(rCol))<<8)|(rCol))
/************************************************************************/
@@ -107,7 +107,7 @@ long ScaleMetricValue( long nVal, long nMul, long nDiv )
/*************************************************************************
|*
-|* NameOrIndex::NameOrIndex(USHORT nWhich, INT32 nIndex)
+|* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex)
|*
|* Beschreibung
|* Ersterstellung 14.11.94
@@ -115,7 +115,7 @@ long ScaleMetricValue( long nVal, long nMul, long nDiv )
|*
*************************************************************************/
-NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, sal_Int32 nIndex) :
SfxStringItem(_nWhich, aNameOrIndexEmptyString),
nPalIndex(nIndex)
{
@@ -123,7 +123,7 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
/*************************************************************************
|*
-|* NameOrIndex::NameOrIndex(USHORT nWhich, const String& rName)
+|* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, const String& rName)
|*
|* Beschreibung
|* Ersterstellung 14.11.94
@@ -131,7 +131,7 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) :
|*
*************************************************************************/
-NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, const XubString& rName) :
SfxStringItem(_nWhich, rName),
nPalIndex(-1)
{
@@ -139,7 +139,7 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
/*************************************************************************
|*
-|* NameOrIndex::NameOrIndex(USHORT nWhich, SvStream& rIn)
+|* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, SvStream& rIn)
|*
|* Beschreibung
|* Ersterstellung 14.11.94
@@ -147,7 +147,7 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) :
|*
*************************************************************************/
-NameOrIndex::NameOrIndex(USHORT _nWhich, SvStream& rIn) :
+NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, SvStream& rIn) :
SfxStringItem(_nWhich, rIn)
{
rIn >> nPalIndex;
@@ -203,7 +203,7 @@ SfxPoolItem* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 14.11.94
@@ -211,7 +211,7 @@ SfxPoolItem* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new NameOrIndex(Which(), rIn);
}
@@ -226,7 +226,7 @@ SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& NameOrIndex::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
SfxStringItem::Store( rOut, nItemVersion );
rOut << nPalIndex;
@@ -238,7 +238,7 @@ SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const
Argument pPool2 can be null.
If returned string equals NameOrIndex->GetName(), the name was already unique.
*/
-String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, USHORT nPrefixResId, XPropertyList* pDefaults )
+String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, XPropertyList* pDefaults )
{
sal_Bool bForceNew = sal_False;
@@ -368,11 +368,11 @@ TYPEINIT1_AUTOFACTORY(XColorItem, NameOrIndex);
/*************************************************************************
|*
-|* XColorItem::XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor)
+|* XColorItem::XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor)
|*
\************************************************************************/
-XColorItem::XColorItem(USHORT _nWhich, INT32 nIndex, const Color& rTheColor) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, sal_Int32 nIndex, const Color& rTheColor) :
NameOrIndex(_nWhich, nIndex),
aColor(rTheColor)
{
@@ -380,11 +380,11 @@ XColorItem::XColorItem(USHORT _nWhich, INT32 nIndex, const Color& rTheColor) :
/*************************************************************************
|*
-|* XColorItem::XColorItem(USHORT nWhich, const String& rName, const Color& rTheColor)
+|* XColorItem::XColorItem(sal_uInt16 nWhich, const String& rName, const Color& rTheColor)
|*
\************************************************************************/
-XColorItem::XColorItem(USHORT _nWhich, const XubString& rName, const Color& rTheColor) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, const XubString& rName, const Color& rTheColor) :
NameOrIndex(_nWhich, rName),
aColor(rTheColor)
{
@@ -404,11 +404,11 @@ XColorItem::XColorItem(const XColorItem& rItem) :
/*************************************************************************
|*
-|* XColorItem::XColorItem(USHORT nWhich, SvStream& rIn)
+|* XColorItem::XColorItem(sal_uInt16 nWhich, SvStream& rIn)
|*
\************************************************************************/
-XColorItem::XColorItem(USHORT _nWhich, SvStream& rIn) :
+XColorItem::XColorItem(sal_uInt16 _nWhich, SvStream& rIn) :
NameOrIndex(_nWhich, rIn)
{
if (!IsIndex())
@@ -442,11 +442,11 @@ int XColorItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
\************************************************************************/
-SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XColorItem(Which(), rIn);
}
@@ -457,7 +457,7 @@ SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\************************************************************************/
-SvStream& XColorItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XColorItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
@@ -484,13 +484,13 @@ const Color& XColorItem::GetColorValue(const XColorTable* pTable) const
}
-sal_Bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
return sal_True;
}
-sal_Bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
@@ -520,7 +520,7 @@ TYPEINIT1_AUTOFACTORY(XLineStyleItem, SfxEnumItem);
*************************************************************************/
XLineStyleItem::XLineStyleItem(XLineStyle eTheLineStyle) :
- SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< USHORT >(eTheLineStyle))
+ SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< sal_uInt16 >(eTheLineStyle))
{
}
@@ -556,7 +556,7 @@ SfxPoolItem* XLineStyleItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -564,7 +564,7 @@ SfxPoolItem* XLineStyleItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineStyleItem(rIn);
}
@@ -588,9 +588,9 @@ SfxItemPresentation XLineStyleItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
case SFX_ITEM_PRESENTATION_NAMELESS:
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
- switch( (USHORT)GetValue() )
+ switch( (sal_uInt16)GetValue() )
{
case XLINE_NONE:
nId = RID_SVXSTR_INVISIBLE;
@@ -609,14 +609,14 @@ SfxItemPresentation XLineStyleItem::GetPresentation
}
}
-sal_Bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
::com::sun::star::drawing::LineStyle eLS = (::com::sun::star::drawing::LineStyle)GetValue();
rVal <<= eLS;
return sal_True;
}
-sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
::com::sun::star::drawing::LineStyle eLS;
if(!(rVal >>= eLS ))
@@ -628,13 +628,13 @@ sal_Bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
eLS = (::com::sun::star::drawing::LineStyle)nLS;
}
- SetValue( sal::static_int_cast< USHORT >( eLS ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( eLS ) );
return sal_True;
}
//------------------------------------------------------------------------
-USHORT XLineStyleItem::GetValueCount() const
+sal_uInt16 XLineStyleItem::GetValueCount() const
{
return 3;
}
@@ -645,7 +645,7 @@ USHORT XLineStyleItem::GetValueCount() const
// ------------
/*************************************************************************
|*
-|* XDash::XDash(XDashStyle, USHORT, ULONG, USHORT, ULONG, ULONG)
+|* XDash::XDash(XDashStyle, sal_uInt16, sal_uIntPtr, sal_uInt16, sal_uIntPtr, sal_uIntPtr)
|*
|* Beschreibung
|* Ersterstellung 21.11.94
@@ -653,8 +653,8 @@ USHORT XLineStyleItem::GetValueCount() const
|*
*************************************************************************/
-XDash::XDash(XDashStyle eTheDash, USHORT nTheDots, ULONG nTheDotLen,
- USHORT nTheDashes, ULONG nTheDashLen, ULONG nTheDistance) :
+XDash::XDash(XDashStyle eTheDash, sal_uInt16 nTheDots, sal_uIntPtr nTheDotLen,
+ sal_uInt16 nTheDashes, sal_uIntPtr nTheDashLen, sal_uIntPtr nTheDistance) :
eDash(eTheDash),
nDots(nTheDots),
nDotLen(nTheDotLen),
@@ -883,7 +883,7 @@ TYPEINIT1_AUTOFACTORY(XLineDashItem, NameOrIndex);
/*************************************************************************
|*
-|* XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash)
+|* XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -891,7 +891,7 @@ TYPEINIT1_AUTOFACTORY(XLineDashItem, NameOrIndex);
|*
*************************************************************************/
-XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash) :
+XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash) :
NameOrIndex(XATTR_LINEDASH, nIndex),
aDash(rTheDash)
{
@@ -944,9 +944,9 @@ XLineDashItem::XLineDashItem(SvStream& rIn) :
{
if (!IsIndex())
{
- USHORT nSTemp;
- UINT32 nLTemp;
- INT32 nITemp;
+ sal_uInt16 nSTemp;
+ sal_uInt32 nLTemp;
+ sal_Int32 nITemp;
rIn >> nITemp; aDash.SetDashStyle((XDashStyle)nITemp);
rIn >> nSTemp; aDash.SetDots(nSTemp);
@@ -1005,7 +1005,7 @@ int XLineDashItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -1013,7 +1013,7 @@ int XLineDashItem::operator==(const SfxPoolItem& rItem) const
|*
*************************************************************************/
-SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineDashItem(rIn);
}
@@ -1028,18 +1028,18 @@ SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& XLineDashItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
if (!IsIndex())
{
- rOut << (INT32) aDash.GetDashStyle();
+ rOut << (sal_Int32) aDash.GetDashStyle();
rOut << aDash.GetDots();
- rOut << (UINT32) aDash.GetDotLen();
+ rOut << (sal_uInt32) aDash.GetDotLen();
rOut << aDash.GetDashes();
- rOut << (UINT32) aDash.GetDashLen();
- rOut << (UINT32) aDash.GetDistance();
+ rOut << (sal_uInt32) aDash.GetDashLen();
+ rOut << (sal_uInt32) aDash.GetDistance();
}
return rOut;
@@ -1089,22 +1089,22 @@ SfxItemPresentation XLineDashItem::GetPresentation
//------------------------------------------------------------------------
-FASTBOOL XLineDashItem::HasMetrics() const
+int XLineDashItem::HasMetrics() const
{
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------
-FASTBOOL XLineDashItem::ScaleMetrics(long nMul, long nDiv)
+int XLineDashItem::ScaleMetrics(long nMul, long nDiv)
{
aDash.SetDotLen( ScaleMetricValue( aDash.GetDotLen(), nMul, nDiv ) );
aDash.SetDashLen( ScaleMetricValue( aDash.GetDashLen(), nMul, nDiv ) );
aDash.SetDistance( ScaleMetricValue( aDash.GetDistance(), nMul, nDiv ) );
- return TRUE;
+ return sal_True;
}
-sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1118,7 +1118,7 @@ sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
::com::sun::star::drawing::LineDash aLineDash;
const XDash& rXD = GetDashValue();
- aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle());
+ aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
aLineDash.Dots = rXD.GetDots();
aLineDash.DotLen = rXD.GetDotLen();
aLineDash.Dashes = rXD.GetDashes();
@@ -1149,7 +1149,7 @@ sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
::com::sun::star::drawing::LineDash aLineDash;
- aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle());
+ aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle());
aLineDash.Dots = rXD.GetDots();
aLineDash.DotLen = rXD.GetDotLen();
aLineDash.Dashes = rXD.GetDashes();
@@ -1208,7 +1208,7 @@ sal_Bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb
return sal_True;
}
-sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1240,7 +1240,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
{
XDash aXDash;
- aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style)));
+ aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
aXDash.SetDots(aLineDash.Dots);
aXDash.SetDotLen(aLineDash.DotLen);
aXDash.SetDashes(aLineDash.Dashes);
@@ -1276,7 +1276,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
XDash aXDash;
- aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style)));
+ aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style)));
aXDash.SetDots(aLineDash.Dots);
aXDash.SetDotLen(aLineDash.DotLen);
aXDash.SetDashes(aLineDash.Dashes);
@@ -1297,7 +1297,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
return sal_False;
XDash aXDash = GetDashValue();
- aXDash.SetDashStyle((XDashStyle)((UINT16)(nVal)));
+ aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(nVal)));
if((0 == aXDash.GetDots()) && (0 == aXDash.GetDashes()))
aXDash.SetDots(1);
@@ -1354,7 +1354,7 @@ sal_Bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n
return sal_True;
}
-BOOL XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XLineDashItem*)p1)->GetDashValue() == ((XLineDashItem*)p2)->GetDashValue();
}
@@ -1433,7 +1433,7 @@ SfxPoolItem* XLineWidthItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -1441,7 +1441,7 @@ SfxPoolItem* XLineWidthItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineWidthItem(rIn);
}
@@ -1472,7 +1472,7 @@ SfxItemPresentation XLineWidthItem::GetPresentation
}
}
-sal_Bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Int32 nValue = GetValue();
if( 0 != (nMemberId&CONVERT_TWIPS) )
@@ -1482,7 +1482,7 @@ sal_Bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
return sal_True;
}
-sal_Bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Int32 nValue = 0;
rVal >>= nValue;
@@ -1500,7 +1500,7 @@ TYPEINIT1_AUTOFACTORY(XLineColorItem, XColorItem);
/*************************************************************************
|*
-|* XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor)
+|* XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -1508,7 +1508,7 @@ TYPEINIT1_AUTOFACTORY(XLineColorItem, XColorItem);
|*
*************************************************************************/
-XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor) :
+XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_LINECOLOR, nIndex, rTheColor)
{
}
@@ -1560,7 +1560,7 @@ SfxPoolItem* XLineColorItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineColorItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -1568,7 +1568,7 @@ SfxPoolItem* XLineColorItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineColorItem(rIn);
}
@@ -1597,13 +1597,13 @@ SfxItemPresentation XLineColorItem::GetPresentation
}
}
-sal_Bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
return sal_True;
}
-sal_Bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue))
@@ -1719,7 +1719,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartItem, NameOrIndex);
/*************************************************************************
|*
-|* XLineStartItem::XLineStartItem(INT32 nIndex)
+|* XLineStartItem::XLineStartItem(sal_Int32 nIndex)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -1727,7 +1727,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartItem, NameOrIndex);
|*
*************************************************************************/
-XLineStartItem::XLineStartItem(INT32 nIndex)
+XLineStartItem::XLineStartItem(sal_Int32 nIndex)
: NameOrIndex(XATTR_LINESTART, nIndex)
{
}
@@ -1831,7 +1831,7 @@ int XLineStartItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -1839,7 +1839,7 @@ int XLineStartItem::operator==(const SfxPoolItem& rItem) const
|*
*************************************************************************/
-SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineStartItem(rIn);
}
@@ -1854,7 +1854,7 @@ SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& XLineStartItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
@@ -1913,7 +1913,7 @@ SfxItemPresentation XLineStartItem::GetPresentation
}
}
-sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1933,7 +1933,7 @@ sal_Bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
return sal_True;
}
-sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -2191,7 +2191,7 @@ TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex);
/*************************************************************************
|*
-|* XLineEndItem::XLineEndItem(INT32 nIndex)
+|* XLineEndItem::XLineEndItem(sal_Int32 nIndex)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -2199,7 +2199,7 @@ TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex);
|*
*************************************************************************/
-XLineEndItem::XLineEndItem(INT32 nIndex)
+XLineEndItem::XLineEndItem(sal_Int32 nIndex)
: NameOrIndex(XATTR_LINEEND, nIndex)
{
}
@@ -2303,7 +2303,7 @@ int XLineEndItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -2311,7 +2311,7 @@ int XLineEndItem::operator==(const SfxPoolItem& rItem) const
|*
*************************************************************************/
-SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineEndItem(rIn);
}
@@ -2326,7 +2326,7 @@ SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& XLineEndItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XLineEndItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
@@ -2607,7 +2607,7 @@ SfxItemPresentation XLineEndItem::GetPresentation
}
}
-sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -2626,7 +2626,7 @@ sal_Bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMembe
return sal_True;
}
-sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -2663,7 +2663,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartWidthItem, SfxMetricItem);
/*************************************************************************
|*
-|* XLineStartWidthItem::XLineStartWidthItem(INT32 nWidth)
+|* XLineStartWidthItem::XLineStartWidthItem(sal_Int32 nWidth)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -2708,7 +2708,7 @@ SfxPoolItem* XLineStartWidthItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
|* Beschreibung
@@ -2717,7 +2717,7 @@ SfxPoolItem* XLineStartWidthItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineStartWidthItem(rIn);
}
@@ -2748,13 +2748,13 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation
}
}
-sal_Bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
}
-sal_Bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
@@ -2816,7 +2816,7 @@ SfxPoolItem* XLineEndWidthItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -2824,7 +2824,7 @@ SfxPoolItem* XLineEndWidthItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineEndWidthItem(rIn);
}
@@ -2855,13 +2855,13 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation
}
}
-sal_Bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
}
-sal_Bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
@@ -2877,7 +2877,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem);
/*************************************************************************
|*
-|* XLineStartCenterItem::XLineStartCenterItem(BOOL bStartCenter)
+|* XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -2885,7 +2885,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem);
|*
*************************************************************************/
-XLineStartCenterItem::XLineStartCenterItem(BOOL bStartCenter) :
+XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter) :
SfxBoolItem(XATTR_LINESTARTCENTER, bStartCenter)
{
}
@@ -2922,7 +2922,7 @@ SfxPoolItem* XLineStartCenterItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
|* Beschreibung
@@ -2931,7 +2931,7 @@ SfxPoolItem* XLineStartCenterItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineStartCenterItem(rIn);
}
@@ -2961,14 +2961,14 @@ SfxItemPresentation XLineStartCenterItem::GetPresentation
}
}
-sal_Bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
sal_Bool bValue = GetValue();
rVal.setValue( &bValue, ::getCppuBooleanType() );
return sal_True;
}
-sal_Bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
return sal_False;
@@ -2985,7 +2985,7 @@ TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem);
/*************************************************************************
|*
-|* XLineEndCenterItem::XLineEndCenterItem(BOOL bEndCenter)
+|* XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -2993,7 +2993,7 @@ TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem);
|*
*************************************************************************/
-XLineEndCenterItem::XLineEndCenterItem(BOOL bEndCenter) :
+XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter) :
SfxBoolItem(XATTR_LINEENDCENTER, bEndCenter)
{
}
@@ -3030,7 +3030,7 @@ SfxPoolItem* XLineEndCenterItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
|* Beschreibung
@@ -3039,7 +3039,7 @@ SfxPoolItem* XLineEndCenterItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineEndCenterItem(rIn);
}
@@ -3069,14 +3069,14 @@ SfxItemPresentation XLineEndCenterItem::GetPresentation
}
}
-sal_Bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
sal_Bool bValue = GetValue();
rVal.setValue( &bValue, ::getCppuBooleanType() );
return sal_True;
}
-BOOL XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() )
return sal_False;
@@ -3106,7 +3106,7 @@ TYPEINIT1_AUTOFACTORY(XFillStyleItem, SfxEnumItem);
*************************************************************************/
XFillStyleItem::XFillStyleItem(XFillStyle eFillStyle) :
- SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< USHORT >(eFillStyle))
+ SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< sal_uInt16 >(eFillStyle))
{
}
@@ -3142,7 +3142,7 @@ SfxPoolItem* XFillStyleItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -3150,7 +3150,7 @@ SfxPoolItem* XFillStyleItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillStyleItem(rIn);
}
@@ -3175,9 +3175,9 @@ SfxItemPresentation XFillStyleItem::GetPresentation
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
- switch( (USHORT)GetValue() )
+ switch( (sal_uInt16)GetValue() )
{
case XFILL_NONE:
nId = RID_SVXSTR_INVISIBLE;
@@ -3207,13 +3207,13 @@ SfxItemPresentation XFillStyleItem::GetPresentation
//------------------------------------------------------------------------
-USHORT XFillStyleItem::GetValueCount() const
+sal_uInt16 XFillStyleItem::GetValueCount() const
{
return 5;
}
// -----------------------------------------------------------------------
-sal_Bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
::com::sun::star::drawing::FillStyle eFS = (::com::sun::star::drawing::FillStyle)GetValue();
@@ -3223,7 +3223,7 @@ sal_Bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nM
}
// -----------------------------------------------------------------------
-sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
::com::sun::star::drawing::FillStyle eFS;
if(!(rVal >>= eFS))
@@ -3235,7 +3235,7 @@ sal_Bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
eFS = (::com::sun::star::drawing::FillStyle)nFS;
}
- SetValue( sal::static_int_cast< USHORT >( eFS ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( eFS ) );
return sal_True;
}
@@ -3248,7 +3248,7 @@ TYPEINIT1_AUTOFACTORY(XFillColorItem, XColorItem);
/*************************************************************************
|*
-|* XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor)
+|* XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor)
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -3256,7 +3256,7 @@ TYPEINIT1_AUTOFACTORY(XFillColorItem, XColorItem);
|*
*************************************************************************/
-XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor) :
+XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_FILLCOLOR, nIndex, rTheColor)
{
}
@@ -3308,7 +3308,7 @@ SfxPoolItem* XFillColorItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillColorItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -3316,7 +3316,7 @@ SfxPoolItem* XFillColorItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillColorItem(rIn);
}
@@ -3347,7 +3347,7 @@ SfxItemPresentation XFillColorItem::GetPresentation
// -----------------------------------------------------------------------
-sal_Bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetColorValue().GetRGBColor();
@@ -3356,7 +3356,7 @@ sal_Bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nM
// -----------------------------------------------------------------------
-sal_Bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
if(!(rVal >>= nValue ))
@@ -3371,7 +3371,7 @@ sal_Bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
// -----------------------------
TYPEINIT1_AUTOFACTORY(XSecondaryFillColorItem, XColorItem);
-XSecondaryFillColorItem::XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor) :
+XSecondaryFillColorItem::XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
XColorItem(XATTR_SECONDARYFILLCOLOR, nIndex, rTheColor)
{
}
@@ -3391,14 +3391,14 @@ SfxPoolItem* XSecondaryFillColorItem::Clone(SfxItemPool* /*pPool*/) const
return new XSecondaryFillColorItem(*this);
}
-SfxPoolItem* XSecondaryFillColorItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* XSecondaryFillColorItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
{
if ( nVer >= 2 )
return new XSecondaryFillColorItem( rIn );
else
return new XSecondaryFillColorItem( String(), Color(0,184,255) );
}
-USHORT XSecondaryFillColorItem::GetVersion( USHORT /*nFileFormatVersion*/ ) const
+sal_uInt16 XSecondaryFillColorItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const
{
return 2;
}
@@ -3451,7 +3451,7 @@ XGradient::XGradient() :
/*************************************************************************
|*
|* XGradient::XGradient(XGradientStyle, const Color&, const Color&,
-|* long, USHORT, USHORT, USHORT)
+|* long, sal_uInt16, sal_uInt16, sal_uInt16)
|*
|* Beschreibung
|* Ersterstellung 21.11.94
@@ -3460,10 +3460,10 @@ XGradient::XGradient() :
*************************************************************************/
XGradient::XGradient(const Color& rStart, const Color& rEnd,
- XGradientStyle eTheStyle, long nTheAngle, USHORT nXOfs,
- USHORT nYOfs, USHORT nTheBorder,
- USHORT nStartIntens, USHORT nEndIntens,
- USHORT nSteps) :
+ XGradientStyle eTheStyle, long nTheAngle, sal_uInt16 nXOfs,
+ sal_uInt16 nYOfs, sal_uInt16 nTheBorder,
+ sal_uInt16 nStartIntens, sal_uInt16 nEndIntens,
+ sal_uInt16 nSteps) :
eStyle(eTheStyle),
aStartColor(rStart),
aEndColor(rEnd),
@@ -3509,7 +3509,7 @@ TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex);
/*************************************************************************
|*
-|* XFillGradientItem::XFillGradientItem(INT32 nIndex,
+|* XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
|* const XGradient& rTheGradient)
|*
|* Beschreibung
@@ -3518,7 +3518,7 @@ TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex);
|*
*************************************************************************/
-XFillGradientItem::XFillGradientItem(INT32 nIndex,
+XFillGradientItem::XFillGradientItem(sal_Int32 nIndex,
const XGradient& rTheGradient) :
NameOrIndex(XATTR_FILLGRADIENT, nIndex),
aGradient(rTheGradient)
@@ -3569,31 +3569,31 @@ XFillGradientItem::XFillGradientItem(const XFillGradientItem& rItem) :
|*
*************************************************************************/
-XFillGradientItem::XFillGradientItem(SvStream& rIn, USHORT nVer) :
+XFillGradientItem::XFillGradientItem(SvStream& rIn, sal_uInt16 nVer) :
NameOrIndex(XATTR_FILLGRADIENT, rIn),
aGradient(COL_BLACK, COL_WHITE)
{
if (!IsIndex())
{
- USHORT nUSTemp;
- USHORT nRed;
- USHORT nGreen;
- USHORT nBlue;
- INT16 nITemp;
- INT32 nLTemp;
+ sal_uInt16 nUSTemp;
+ sal_uInt16 nRed;
+ sal_uInt16 nGreen;
+ sal_uInt16 nBlue;
+ sal_Int16 nITemp;
+ sal_Int32 nLTemp;
rIn >> nITemp; aGradient.SetGradientStyle((XGradientStyle)nITemp);
rIn >> nRed;
rIn >> nGreen;
rIn >> nBlue;
Color aCol;
- aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+ aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
aGradient.SetStartColor( aCol );
rIn >> nRed;
rIn >> nGreen;
rIn >> nBlue;
- aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+ aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
aGradient.SetEndColor(aCol);
rIn >> nLTemp; aGradient.SetAngle(nLTemp);
rIn >> nUSTemp; aGradient.SetBorder(nUSTemp);
@@ -3659,7 +3659,7 @@ int XFillGradientItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -3667,7 +3667,7 @@ int XFillGradientItem::operator==(const SfxPoolItem& rItem) const
|*
*************************************************************************/
-SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const
{
return new XFillGradientItem(rIn, nVer);
}
@@ -3682,15 +3682,15 @@ SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const
|*
*************************************************************************/
-SvStream& XFillGradientItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillGradientItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
if (!IsIndex())
{
- rOut << (INT16)aGradient.GetGradientStyle();
+ rOut << (sal_Int16)aGradient.GetGradientStyle();
- USHORT nTmp;
+ sal_uInt16 nTmp;
nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetRed() ); rOut << nTmp;
nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetGreen() ); rOut << nTmp;
@@ -3699,7 +3699,7 @@ SvStream& XFillGradientItem::Store( SvStream& rOut, USHORT nItemVersion ) const
nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetGreen() ); rOut << nTmp;
nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetBlue() ); rOut << nTmp;
- rOut << (INT32) aGradient.GetAngle();
+ rOut << (sal_Int32) aGradient.GetAngle();
rOut << aGradient.GetBorder();
rOut << aGradient.GetXOffset();
rOut << aGradient.GetYOffset();
@@ -3733,7 +3733,7 @@ const XGradient& XFillGradientItem::GetGradientValue(const XGradientTable* pTabl
/*************************************************************************
|*
-|* USHORT XFillGradientItem::GetVersion() const
+|* sal_uInt16 XFillGradientItem::GetVersion() const
|*
|* Beschreibung
|* Ersterstellung 01.11.95
@@ -3741,7 +3741,7 @@ const XGradient& XFillGradientItem::GetGradientValue(const XGradientTable* pTabl
|*
*************************************************************************/
-USHORT XFillGradientItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XFillGradientItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
{
// !!! this version number also represents the version number of superclasses
// !!! (e.g. XFillFloatTransparenceItem); if you make any changes here,
@@ -3774,7 +3774,7 @@ SfxItemPresentation XFillGradientItem::GetPresentation
}
// -----------------------------------------------------------------------
-sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
//sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -3788,8 +3788,8 @@ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE n
const XGradient& aXGradient = GetGradientValue();
aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle();
- aGradient2.StartColor = (INT32)aXGradient.GetStartColor().GetColor();
- aGradient2.EndColor = (INT32)aXGradient.GetEndColor().GetColor();
+ aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
+ aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
aGradient2.Angle = (short)aXGradient.GetAngle();
aGradient2.Border = aXGradient.GetBorder();
aGradient2.XOffset = aXGradient.GetXOffset();
@@ -3814,8 +3814,8 @@ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE n
::com::sun::star::awt::Gradient aGradient2;
aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle();
- aGradient2.StartColor = (INT32)aXGradient.GetStartColor().GetColor();
- aGradient2.EndColor = (INT32)aXGradient.GetEndColor().GetColor();
+ aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor();
+ aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor();
aGradient2.Angle = (short)aXGradient.GetAngle();
aGradient2.Border = aXGradient.GetBorder();
aGradient2.XOffset = aXGradient.GetXOffset();
@@ -3854,7 +3854,7 @@ sal_Bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE n
}
// -----------------------------------------------------------------------
-sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -3998,7 +3998,7 @@ sal_Bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY
return sal_True;
}
-BOOL XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillGradientItem*)p1)->GetGradientValue() == ((XFillGradientItem*)p2)->GetGradientValue();
}
@@ -4034,14 +4034,14 @@ TYPEINIT1_AUTOFACTORY( XFillFloatTransparenceItem, XFillGradientItem );
// -----------------------------------------------------------------------------
XFillFloatTransparenceItem::XFillFloatTransparenceItem() :
- bEnabled( FALSE )
+ bEnabled( sal_False )
{
SetWhich( XATTR_FILLFLOATTRANSPARENCE );
}
//------------------------------------------------------------------------
-XFillFloatTransparenceItem::XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem( sal_Int32 nIndex, const XGradient& rGradient, sal_Bool bEnable ) :
XFillGradientItem ( nIndex, rGradient ),
bEnabled ( bEnable )
{
@@ -4050,7 +4050,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( INT32 nIndex, const XGra
//------------------------------------------------------------------------
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XubString& rName, const XGradient& rGradient, BOOL bEnable ) :
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XubString& rName, const XGradient& rGradient, sal_Bool bEnable ) :
XFillGradientItem ( rName, rGradient ),
bEnabled ( bEnable )
{
@@ -4068,7 +4068,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar
//------------------------------------------------------------------------
-//XFillFloatTransparenceItem::XFillFloatTransparenceItem( SvStream& rIn, USHORT nVer ) :
+//XFillFloatTransparenceItem::XFillFloatTransparenceItem( SvStream& rIn, sal_uInt16 nVer ) :
// XFillGradientItem ( rIn, nVer )
//{
// SetWhich( XATTR_FILLFLOATTRANSPARENCE );
@@ -4077,7 +4077,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar
//*************************************************************************
-XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, BOOL bEnable )
+XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, sal_Bool bEnable )
: XFillGradientItem ( -1, rTheGradient ),
bEnabled ( bEnable )
{
@@ -4109,14 +4109,14 @@ SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const
//------------------------------------------------------------------------
-//SfxPoolItem* XFillFloatTransparenceItem::Create( SvStream& rIn, USHORT nVer ) const
+//SfxPoolItem* XFillFloatTransparenceItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
//{
// return( ( 0 == nVer ) ? Clone( NULL ) : new XFillFloatTransparenceItem( rIn, nVer ) );
//}
//------------------------------------------------------------------------
-//SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+//SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
//{
// XFillGradientItem::Store( rOut, nItemVersion );
// rOut << bEnabled;
@@ -4125,7 +4125,7 @@ SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const
//------------------------------------------------------------------------
-USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const
+sal_uInt16 XFillFloatTransparenceItem::GetVersion( sal_uInt16 nFileFormatVersion ) const
{
// !!! if version number of this object must be increased, please !!!
// !!! increase version number of base class XFillGradientItem !!!
@@ -4134,14 +4134,14 @@ USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const
//------------------------------------------------------------------------
-sal_Bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
return XFillGradientItem::QueryValue( rVal, nMemberId );
}
//------------------------------------------------------------------------
-sal_Bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
return XFillGradientItem::PutValue( rVal, nMemberId );
}
@@ -4156,7 +4156,7 @@ SfxItemPresentation XFillFloatTransparenceItem::GetPresentation( SfxItemPrese
return XFillGradientItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, pIntlWrapper );
}
-BOOL XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillFloatTransparenceItem*)p1)->IsEnabled() == ((XFillFloatTransparenceItem*)p2)->IsEnabled() &&
((XFillFloatTransparenceItem*)p1)->GetGradientValue() == ((XFillFloatTransparenceItem*)p2)->GetGradientValue();
@@ -4180,7 +4180,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
// if the given name is not valid, replace it!
if( aUniqueName != GetName() )
{
- return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), TRUE );
+ return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), sal_True );
}
}
}
@@ -4189,7 +4189,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM
// #85953# if disabled, force name to empty string
if(GetName().Len())
{
- return new XFillFloatTransparenceItem(String(), GetGradientValue(), FALSE);
+ return new XFillFloatTransparenceItem(String(), GetGradientValue(), sal_False);
}
}
@@ -4245,7 +4245,7 @@ TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex);
/*************************************************************************
|*
-|* XFillHatchItem::XFillHatchItem(INT32 nIndex,
+|* XFillHatchItem::XFillHatchItem(sal_Int32 nIndex,
|* const XHatch& rTheHatch)
|*
|* Beschreibung
@@ -4254,7 +4254,7 @@ TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex);
|*
*************************************************************************/
-XFillHatchItem::XFillHatchItem(INT32 nIndex,
+XFillHatchItem::XFillHatchItem(sal_Int32 nIndex,
const XHatch& rTheHatch) :
NameOrIndex(XATTR_FILLHATCH, nIndex),
aHatch(rTheHatch)
@@ -4311,11 +4311,11 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) :
{
if (!IsIndex())
{
- USHORT nRed;
- USHORT nGreen;
- USHORT nBlue;
- INT16 nITemp;
- INT32 nLTemp;
+ sal_uInt16 nRed;
+ sal_uInt16 nGreen;
+ sal_uInt16 nBlue;
+ sal_Int16 nITemp;
+ sal_Int32 nLTemp;
rIn >> nITemp; aHatch.SetHatchStyle((XHatchStyle)nITemp);
rIn >> nRed;
@@ -4323,7 +4323,7 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) :
rIn >> nBlue;
Color aCol;
- aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) );
+ aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) );
aHatch.SetColor(aCol);
rIn >> nLTemp; aHatch.SetDistance(nLTemp);
rIn >> nLTemp; aHatch.SetAngle(nLTemp);
@@ -4378,7 +4378,7 @@ int XFillHatchItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 15.11.94
@@ -4386,7 +4386,7 @@ int XFillHatchItem::operator==(const SfxPoolItem& rItem) const
|*
*************************************************************************/
-SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillHatchItem(rIn);
}
@@ -4401,21 +4401,21 @@ SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
*************************************************************************/
-SvStream& XFillHatchItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
if (!IsIndex())
{
- rOut << (INT16)aHatch.GetHatchStyle();
+ rOut << (sal_Int16)aHatch.GetHatchStyle();
- USHORT nTmp;
+ sal_uInt16 nTmp;
nTmp = VCLTOSVCOL( aHatch.GetColor().GetRed() ); rOut << nTmp;
nTmp = VCLTOSVCOL( aHatch.GetColor().GetGreen() ); rOut << nTmp;
nTmp = VCLTOSVCOL( aHatch.GetColor().GetBlue() ); rOut << nTmp;
- rOut << (INT32) aHatch.GetDistance();
- rOut << (INT32) aHatch.GetAngle();
+ rOut << (sal_Int32) aHatch.GetDistance();
+ rOut << (sal_Int32) aHatch.GetAngle();
}
return rOut;
@@ -4465,21 +4465,21 @@ SfxItemPresentation XFillHatchItem::GetPresentation
//------------------------------------------------------------------------
-FASTBOOL XFillHatchItem::HasMetrics() const
+int XFillHatchItem::HasMetrics() const
{
- return TRUE;
+ return sal_True;
}
//------------------------------------------------------------------------
-FASTBOOL XFillHatchItem::ScaleMetrics(long nMul, long nDiv)
+int XFillHatchItem::ScaleMetrics(long nMul, long nDiv)
{
aHatch.SetDistance( ScaleMetricValue( aHatch.GetDistance(), nMul, nDiv ) );
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------
-sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -4543,7 +4543,7 @@ sal_Bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem
}
// -----------------------------------------------------------------------
-sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -4639,7 +4639,7 @@ sal_Bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
return sal_True;
}
-BOOL XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillHatchItem*)p1)->GetHatchValue() == ((XFillHatchItem*)p2)->GetHatchValue();
}
@@ -4686,7 +4686,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextStyleItem, SfxEnumItem);
*************************************************************************/
XFormTextStyleItem::XFormTextStyleItem(XFormTextStyle eTheStyle) :
- SfxEnumItem(XATTR_FORMTXTSTYLE, sal::static_int_cast< USHORT >(eTheStyle))
+ SfxEnumItem(XATTR_FORMTXTSTYLE, sal::static_int_cast< sal_uInt16 >(eTheStyle))
{
}
@@ -4722,7 +4722,7 @@ SfxPoolItem* XFormTextStyleItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 02.02.95 ESO
@@ -4730,7 +4730,7 @@ SfxPoolItem* XFormTextStyleItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextStyleItem(rIn);
}
@@ -4741,7 +4741,7 @@ SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\*************************************************************************/
-USHORT XFormTextStyleItem::GetValueCount() const
+sal_uInt16 XFormTextStyleItem::GetValueCount() const
{
return 5;
}
@@ -4753,7 +4753,7 @@ USHORT XFormTextStyleItem::GetValueCount() const
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
@@ -4766,11 +4766,11 @@ sal_Bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) con
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextStyleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFormTextStyleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
- SetValue(sal::static_int_cast< USHORT >(nValue));
+ SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
return sal_True;
}
@@ -4791,7 +4791,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextAdjustItem, SfxEnumItem);
*************************************************************************/
XFormTextAdjustItem::XFormTextAdjustItem(XFormTextAdjust eTheAdjust) :
- SfxEnumItem(XATTR_FORMTXTADJUST, sal::static_int_cast< USHORT >(eTheAdjust))
+ SfxEnumItem(XATTR_FORMTXTADJUST, sal::static_int_cast< sal_uInt16 >(eTheAdjust))
{
}
@@ -4827,7 +4827,7 @@ SfxPoolItem* XFormTextAdjustItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 02.02.95 ESO
@@ -4835,7 +4835,7 @@ SfxPoolItem* XFormTextAdjustItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextAdjustItem(rIn);
}
@@ -4846,7 +4846,7 @@ SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\*************************************************************************/
-USHORT XFormTextAdjustItem::GetValueCount() const
+sal_uInt16 XFormTextAdjustItem::GetValueCount() const
{
return 4;
}
@@ -4858,7 +4858,7 @@ USHORT XFormTextAdjustItem::GetValueCount() const
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
@@ -4871,11 +4871,11 @@ sal_Bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) co
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
- SetValue(sal::static_int_cast< USHORT >(nValue));
+ SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
return sal_True;
}
@@ -4932,7 +4932,7 @@ SfxPoolItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 02.02.95 ESO
@@ -4940,7 +4940,7 @@ SfxPoolItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextDistanceItem(rIn);
}
@@ -4997,7 +4997,7 @@ SfxPoolItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 02.02.95 ESO
@@ -5005,7 +5005,7 @@ SfxPoolItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextStartItem(rIn);
}
@@ -5017,14 +5017,14 @@ TYPEINIT1_AUTOFACTORY(XFormTextMirrorItem, SfxBoolItem);
/*************************************************************************
|*
-|* XFormTextMirrorItem::XFormTextMirrorItem(BOOL bMirror)
+|* XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror)
|*
|* Ersterstellung 06.02.95 ESO
|* Letzte Aenderung 06.02.95 ESO
|*
*************************************************************************/
-XFormTextMirrorItem::XFormTextMirrorItem(BOOL bMirror) :
+XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror) :
SfxBoolItem(XATTR_FORMTXTMIRROR, bMirror)
{
}
@@ -5059,7 +5059,7 @@ SfxPoolItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
|* Ersterstellung 06.02.95 ESO
@@ -5067,7 +5067,7 @@ SfxPoolItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextMirrorItem(rIn);
}
@@ -5087,7 +5087,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextOutlineItem, SfxBoolItem);
|*
*************************************************************************/
-XFormTextOutlineItem::XFormTextOutlineItem(BOOL bOutline) :
+XFormTextOutlineItem::XFormTextOutlineItem(sal_Bool bOutline) :
SfxBoolItem(XATTR_FORMTXTOUTLINE, bOutline)
{
}
@@ -5122,7 +5122,7 @@ SfxPoolItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
|* Ersterstellung 27.06.95 ESO
@@ -5130,7 +5130,7 @@ SfxPoolItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextOutlineItem(rIn);
}
@@ -5152,7 +5152,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowItem, SfxEnumItem);
XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) :
SfxEnumItem(
- XATTR_FORMTXTSHADOW, sal::static_int_cast< USHORT >(eFormTextShadow))
+ XATTR_FORMTXTSHADOW, sal::static_int_cast< sal_uInt16 >(eFormTextShadow))
{
}
@@ -5188,7 +5188,7 @@ SfxPoolItem* XFormTextShadowItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 27.06.95
@@ -5196,7 +5196,7 @@ SfxPoolItem* XFormTextShadowItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowItem(rIn);
}
@@ -5208,7 +5208,7 @@ SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\*************************************************************************/
-USHORT XFormTextShadowItem::GetValueCount() const
+sal_uInt16 XFormTextShadowItem::GetValueCount() const
{
return 3;
}
@@ -5220,7 +5220,7 @@ USHORT XFormTextShadowItem::GetValueCount() const
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
@@ -5233,11 +5233,11 @@ sal_Bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) co
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextShadowItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFormTextShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
- SetValue(sal::static_int_cast< USHORT >(nValue));
+ SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
return sal_True;
}
@@ -5257,7 +5257,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowColorItem, XColorItem);
|*
*************************************************************************/
-XFormTextShadowColorItem::XFormTextShadowColorItem(INT32 nIndex,
+XFormTextShadowColorItem::XFormTextShadowColorItem(sal_Int32 nIndex,
const Color& rTheColor) :
XColorItem(XATTR_FORMTXTSHDWCOLOR, nIndex, rTheColor)
{
@@ -5311,7 +5311,7 @@ SfxPoolItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 27.06.95
@@ -5319,7 +5319,7 @@ SfxPoolItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowColorItem(rIn);
}
@@ -5376,7 +5376,7 @@ SfxPoolItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 28.06.95 ESO
@@ -5384,7 +5384,7 @@ SfxPoolItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowXValItem(rIn);
}
@@ -5441,7 +5441,7 @@ SfxPoolItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 28.06.95 ESO
@@ -5449,7 +5449,7 @@ SfxPoolItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowYValItem(rIn);
}
@@ -5471,7 +5471,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextStdFormItem, SfxEnumItem);
XFormTextStdFormItem::XFormTextStdFormItem(XFormTextStdForm eFormTextStdForm) :
SfxEnumItem(
- XATTR_FORMTXTSTDFORM, sal::static_int_cast< USHORT >(eFormTextStdForm))
+ XATTR_FORMTXTSTDFORM, sal::static_int_cast< sal_uInt16 >(eFormTextStdForm))
{
}
@@ -5507,7 +5507,7 @@ SfxPoolItem* XFormTextStdFormItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 27.06.95
@@ -5515,7 +5515,7 @@ SfxPoolItem* XFormTextStdFormItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextStdFormItem(rIn);
}
@@ -5527,7 +5527,7 @@ SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
|*
\*************************************************************************/
-USHORT XFormTextStdFormItem::GetValueCount() const
+sal_uInt16 XFormTextStdFormItem::GetValueCount() const
{
return 3;
}
@@ -5539,7 +5539,7 @@ USHORT XFormTextStdFormItem::GetValueCount() const
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
rVal <<= (sal_Int32)GetValue();
return sal_True;
@@ -5552,11 +5552,11 @@ sal_Bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) c
\*************************************************************************/
// #FontWork#
-sal_Bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
sal_Int32 nValue = 0;
rVal >>= nValue;
- SetValue(sal::static_int_cast< USHORT >(nValue));
+ SetValue(sal::static_int_cast< sal_uInt16 >(nValue));
return sal_True;
}
@@ -5575,7 +5575,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextHideFormItem, SfxBoolItem);
|*
*************************************************************************/
-XFormTextHideFormItem::XFormTextHideFormItem(BOOL bHide) :
+XFormTextHideFormItem::XFormTextHideFormItem(sal_Bool bHide) :
SfxBoolItem(XATTR_FORMTXTHIDEFORM, bHide)
{
}
@@ -5610,7 +5610,7 @@ SfxPoolItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, USHORT nVer)
+|* SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 nVer)
|* const
|*
|* Ersterstellung 27.06.95 ESO
@@ -5618,7 +5618,7 @@ SfxPoolItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextHideFormItem(rIn);
}
@@ -5682,7 +5682,7 @@ SfxPoolItem* XLineAttrSetItem::Clone( SfxItemPool* pPool ) const
|*
\************************************************************************/
-SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) const
+SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, sal_uInt16 /*nVersion*/) const
{
SfxItemSet *pSet2 = new SfxItemSet( *GetItemSet().GetPool(),
XATTR_LINE_FIRST, XATTR_LINE_LAST);
@@ -5696,7 +5696,7 @@ SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) c
|*
\************************************************************************/
-SvStream& XLineAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const
+SvStream& XLineAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) const
{
return SfxSetItem::Store( rStream, nItemVersion );
}
@@ -5755,7 +5755,7 @@ SfxPoolItem* XFillAttrSetItem::Clone( SfxItemPool* pPool ) const
|*
\************************************************************************/
-SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) const
+SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, sal_uInt16 /*nVersion*/) const
{
SfxItemSet *pSet2 = new SfxItemSet( *GetItemSet().GetPool(),
XATTR_FILL_FIRST, XATTR_FILL_LAST);
@@ -5769,7 +5769,7 @@ SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) c
|*
\************************************************************************/
-SvStream& XFillAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const
+SvStream& XFillAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) const
{
return SfxSetItem::Store( rStream, nItemVersion );
}
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index 0c8fc3e9cbec..f48a51f22e73 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -52,7 +52,7 @@ TYPEINIT1_AUTOFACTORY(XLineTransparenceItem, SfxUInt16Item);
/*************************************************************************
|*
-|* XLineTransparenceItem::XLineTransparenceItem(USHORT)
+|* XLineTransparenceItem::XLineTransparenceItem(sal_uInt16)
|*
|* Beschreibung
|* Ersterstellung 07.11.95 KA
@@ -60,7 +60,7 @@ TYPEINIT1_AUTOFACTORY(XLineTransparenceItem, SfxUInt16Item);
|*
*************************************************************************/
-XLineTransparenceItem::XLineTransparenceItem(USHORT nLineTransparence) :
+XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) :
SfxUInt16Item(XATTR_LINETRANSPARENCE, nLineTransparence)
{
}
@@ -97,7 +97,7 @@ SfxPoolItem* XLineTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 07.11.95 KA
@@ -105,7 +105,7 @@ SfxPoolItem* XLineTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XLineTransparenceItem(rIn);
}
@@ -130,7 +130,7 @@ SfxItemPresentation XLineTransparenceItem::GetPresentation
rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
rText.AppendAscii(": ");
case SFX_ITEM_PRESENTATION_NAMELESS:
- rText += XubString( UniString::CreateFromInt32((USHORT) GetValue()) );
+ rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue()) );
rText += sal_Unicode('%');
return ePres;
default:
@@ -147,7 +147,7 @@ TYPEINIT1_AUTOFACTORY(XLineJointItem, SfxEnumItem);
// -----------------------------------------------------------------------------
XLineJointItem::XLineJointItem( XLineJoint eLineJoint ) :
- SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< USHORT >(eLineJoint))
+ SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< sal_uInt16 >(eLineJoint))
{
}
@@ -160,14 +160,14 @@ XLineJointItem::XLineJointItem( SvStream& rIn ) :
// -----------------------------------------------------------------------------
-USHORT XLineJointItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XLineJointItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
{
return 1;
}
// -----------------------------------------------------------------------------
-SfxPoolItem* XLineJointItem::Create( SvStream& rIn, USHORT nVer ) const
+SfxPoolItem* XLineJointItem::Create( SvStream& rIn, sal_uInt16 nVer ) const
{
XLineJointItem* pRet = new XLineJointItem( rIn );
@@ -198,7 +198,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres,
case SFX_ITEM_PRESENTATION_COMPLETE:
case SFX_ITEM_PRESENTATION_NAMELESS:
{
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
switch( GetValue() )
{
@@ -238,7 +238,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres,
// -----------------------------------------------------------------------------
-sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const
+sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const
{
::com::sun::star::drawing::LineJoint eJoint = ::com::sun::star::drawing::LineJoint_NONE;
@@ -268,7 +268,7 @@ sal_Bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nM
// -----------------------------------------------------------------------------
-BOOL XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/)
+sal_Bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
{
XLineJoint eJoint = XLINEJOINT_NONE;
::com::sun::star::drawing::LineJoint eUnoJoint;
@@ -300,14 +300,14 @@ BOOL XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM
break;
}
- SetValue( sal::static_int_cast< USHORT >( eJoint ) );
+ SetValue( sal::static_int_cast< sal_uInt16 >( eJoint ) );
return sal_True;
}
// -----------------------------------------------------------------------------
-USHORT XLineJointItem::GetValueCount() const
+sal_uInt16 XLineJointItem::GetValueCount() const
{
// don't forget to update the api interface also
return 5;
@@ -320,7 +320,7 @@ TYPEINIT1_AUTOFACTORY(XFillTransparenceItem, SfxUInt16Item);
/*************************************************************************
|*
-|* XFillTransparenceItem::XFillTransparenceItem(USHORT)
+|* XFillTransparenceItem::XFillTransparenceItem(sal_uInt16)
|*
|* Beschreibung
|* Ersterstellung 07.11.95 KA
@@ -328,7 +328,7 @@ TYPEINIT1_AUTOFACTORY(XFillTransparenceItem, SfxUInt16Item);
|*
*************************************************************************/
-XFillTransparenceItem::XFillTransparenceItem(USHORT nFillTransparence) :
+XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) :
SfxUInt16Item(XATTR_FILLTRANSPARENCE, nFillTransparence)
{
}
@@ -365,7 +365,7 @@ SfxPoolItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 07.11.95 KA
@@ -373,7 +373,7 @@ SfxPoolItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillTransparenceItem(rIn);
}
@@ -398,7 +398,7 @@ SfxItemPresentation XFillTransparenceItem::GetPresentation
rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) );
rText.AppendAscii(": ");
case SFX_ITEM_PRESENTATION_NAMELESS:
- rText += XubString( UniString::CreateFromInt32((USHORT) GetValue() ));
+ rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() ));
rText += sal_Unicode('%');
return ePres;
default:
@@ -413,7 +413,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowTranspItem, SfxUInt16Item);
/*************************************************************************
|*
-|* XFormTextShadowTranspItem::XFormTextShadowTranspItem(USHORT)
+|* XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16)
|*
|* Beschreibung
|* Ersterstellung 09.11.95 KA
@@ -421,7 +421,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowTranspItem, SfxUInt16Item);
|*
*************************************************************************/
-XFormTextShadowTranspItem::XFormTextShadowTranspItem(USHORT nShdwTransparence) :
+XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence) :
SfxUInt16Item(XATTR_FORMTXTSHDWTRANSP, nShdwTransparence)
{
}
@@ -458,7 +458,7 @@ SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 09.11.95 KA
@@ -466,7 +466,7 @@ SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFormTextShadowTranspItem(rIn);
}
@@ -479,7 +479,7 @@ TYPEINIT1_AUTOFACTORY(XGradientStepCountItem, SfxUInt16Item);
/*************************************************************************
|*
-|* XGradientStepCountItem::XGradientStepCountItem( USHORT )
+|* XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 )
|*
|* Beschreibung
|* Ersterstellung 23.01.96 KA
@@ -487,7 +487,7 @@ TYPEINIT1_AUTOFACTORY(XGradientStepCountItem, SfxUInt16Item);
|*
*************************************************************************/
-XGradientStepCountItem::XGradientStepCountItem( USHORT nStepCount ) :
+XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 nStepCount ) :
SfxUInt16Item( XATTR_GRADIENTSTEPCOUNT, nStepCount )
{
}
@@ -524,7 +524,7 @@ SfxPoolItem* XGradientStepCountItem::Clone( SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 23.01.96 KA
@@ -532,7 +532,7 @@ SfxPoolItem* XGradientStepCountItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XGradientStepCountItem( rIn );
}
@@ -557,7 +557,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation
// rText = XubString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) );
// rText += ": ";
case SFX_ITEM_PRESENTATION_NAMELESS:
- rText += XubString( UniString::CreateFromInt32((USHORT) GetValue() ));
+ rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() ));
return ePres;
default:
return SFX_ITEM_PRESENTATION_NONE;
@@ -580,7 +580,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpTileItem, SfxBoolItem );
|*
*************************************************************************/
-XFillBmpTileItem::XFillBmpTileItem( BOOL bTile ) :
+XFillBmpTileItem::XFillBmpTileItem( sal_Bool bTile ) :
SfxBoolItem( XATTR_FILLBMP_TILE, bTile )
{
}
@@ -628,7 +628,7 @@ SfxPoolItem* XFillBmpTileItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpTileItem( rIn );
}
@@ -683,7 +683,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpPosItem, SfxEnumItem );
*************************************************************************/
XFillBmpPosItem::XFillBmpPosItem( RECT_POINT eRP ) :
- SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< USHORT >( eRP ) )
+ SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< sal_uInt16 >( eRP ) )
{
}
@@ -730,7 +730,7 @@ SfxPoolItem* XFillBmpPosItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpPosItem( rIn );
}
@@ -774,7 +774,7 @@ SfxItemPresentation XFillBmpPosItem::GetPresentation
|*
\******************************************************************************/
-USHORT XFillBmpPosItem::GetValueCount() const
+sal_uInt16 XFillBmpPosItem::GetValueCount() const
{
return 9;
}
@@ -843,7 +843,7 @@ SfxPoolItem* XFillBmpSizeXItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpSizeXItem( rIn );
}
@@ -890,7 +890,7 @@ SfxItemPresentation XFillBmpSizeXItem::GetPresentation
|*
\*************************************************************************/
-FASTBOOL XFillBmpSizeXItem::HasMetrics() const
+int XFillBmpSizeXItem::HasMetrics() const
{
return GetValue() > 0L;
}
@@ -959,7 +959,7 @@ SfxPoolItem* XFillBmpSizeYItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpSizeYItem( rIn );
}
@@ -1006,7 +1006,7 @@ SfxItemPresentation XFillBmpSizeYItem::GetPresentation
|*
\*************************************************************************/
-FASTBOOL XFillBmpSizeYItem::HasMetrics() const
+int XFillBmpSizeYItem::HasMetrics() const
{
return GetValue() > 0L;
}
@@ -1027,7 +1027,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpSizeLogItem, SfxBoolItem );
|*
*************************************************************************/
-XFillBmpSizeLogItem::XFillBmpSizeLogItem( BOOL bLog ) :
+XFillBmpSizeLogItem::XFillBmpSizeLogItem( sal_Bool bLog ) :
SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog )
{
}
@@ -1075,7 +1075,7 @@ SfxPoolItem* XFillBmpSizeLogItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpSizeLogItem( rIn );
}
@@ -1129,7 +1129,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetXItem, SfxUInt16Item );
|*
*************************************************************************/
-XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( USHORT nOffX ) :
+XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( sal_uInt16 nOffX ) :
SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETX, nOffX )
{
}
@@ -1177,7 +1177,7 @@ SfxPoolItem* XFillBmpTileOffsetXItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpTileOffsetXItem( rIn );
}
@@ -1231,7 +1231,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetYItem, SfxUInt16Item );
|*
*************************************************************************/
-XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( USHORT nOffY ) :
+XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( sal_uInt16 nOffY ) :
SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, nOffY )
{
}
@@ -1279,7 +1279,7 @@ SfxPoolItem* XFillBmpTileOffsetYItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpTileOffsetYItem( rIn );
}
@@ -1333,7 +1333,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpStretchItem, SfxBoolItem );
|*
*************************************************************************/
-XFillBmpStretchItem::XFillBmpStretchItem( BOOL bStretch ) :
+XFillBmpStretchItem::XFillBmpStretchItem( sal_Bool bStretch ) :
SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch )
{
}
@@ -1381,7 +1381,7 @@ SfxPoolItem* XFillBmpStretchItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpStretchItem( rIn );
}
@@ -1435,7 +1435,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetXItem, SfxUInt16Item );
|*
*************************************************************************/
-XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( USHORT nOffPosX ) :
+XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX ) :
SfxUInt16Item( XATTR_FILLBMP_POSOFFSETX, nOffPosX )
{
}
@@ -1483,7 +1483,7 @@ SfxPoolItem* XFillBmpPosOffsetXItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpPosOffsetXItem( rIn );
}
@@ -1537,7 +1537,7 @@ TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetYItem, SfxUInt16Item );
|*
*************************************************************************/
-XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( USHORT nOffPosY ) :
+XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY ) :
SfxUInt16Item( XATTR_FILLBMP_POSOFFSETY, nOffPosY )
{
}
@@ -1585,7 +1585,7 @@ SfxPoolItem* XFillBmpPosOffsetYItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBmpPosOffsetYItem( rIn );
}
@@ -1630,7 +1630,7 @@ TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem);
/*************************************************************************
|*
-|* XFillBackgroundItem::XFillBackgroundItem( BOOL )
+|* XFillBackgroundItem::XFillBackgroundItem( sal_Bool )
|*
|* Beschreibung
|* Ersterstellung 19.11.96 KA
@@ -1638,7 +1638,7 @@ TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem);
|*
*************************************************************************/
-XFillBackgroundItem::XFillBackgroundItem( BOOL bFill ) :
+XFillBackgroundItem::XFillBackgroundItem( sal_Bool bFill ) :
SfxBoolItem( XATTR_FILLBACKGROUND, bFill )
{
}
@@ -1675,7 +1675,7 @@ SfxPoolItem* XFillBackgroundItem::Clone( SfxItemPool* /*pPool*/) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 23.01.96 KA
@@ -1683,7 +1683,7 @@ SfxPoolItem* XFillBackgroundItem::Clone( SfxItemPool* /*pPool*/) const
|*
*************************************************************************/
-SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, USHORT /*nVer*/) const
+SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const
{
return new XFillBackgroundItem( rIn );
}
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 57c894e00475..874cb35d3e30 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -70,7 +70,7 @@ XOBitmap::XOBitmap() :
eType ( XBITMAP_NONE ),
eStyle ( XBITMAP_STRETCH ),
pPixelArray ( NULL ),
- bGraphicDirty ( FALSE )
+ bGraphicDirty ( sal_False )
{
}
@@ -89,7 +89,7 @@ XOBitmap::XOBitmap( const Bitmap& rBmp, XBitmapStyle eInStyle ) :
eStyle ( eInStyle ),
aGraphicObject ( rBmp ),
pPixelArray ( NULL ),
- bGraphicDirty ( FALSE )
+ bGraphicDirty ( sal_False )
{
}
@@ -108,13 +108,13 @@ XOBitmap::XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eInStyle )
eStyle ( eInStyle ),
aGraphicObject ( rGraphicObject ),
pPixelArray ( NULL ),
- bGraphicDirty ( FALSE )
+ bGraphicDirty ( sal_False )
{
}
/*************************************************************************
|*
-|* XOBitmap::XOBitmap( USHORT* pArray, const Color& aPixelColor,
+|* XOBitmap::XOBitmap( sal_uInt16* pArray, const Color& aPixelColor,
|* const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ),
|* XBitmapStyle eStyle = XBITMAP_TILE )
|*
@@ -124,7 +124,7 @@ XOBitmap::XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eInStyle )
|*
*************************************************************************/
-XOBitmap::XOBitmap( const USHORT* pArray, const Color& rPixelColor,
+XOBitmap::XOBitmap( const sal_uInt16* pArray, const Color& rPixelColor,
const Color& rBckgrColor, const Size& rSize,
XBitmapStyle eInStyle ) :
eStyle ( eInStyle ),
@@ -132,15 +132,15 @@ XOBitmap::XOBitmap( const USHORT* pArray, const Color& rPixelColor,
aArraySize ( rSize ),
aPixelColor ( rPixelColor ),
aBckgrColor ( rBckgrColor ),
- bGraphicDirty ( TRUE )
+ bGraphicDirty ( sal_True )
{
if( aArraySize.Width() == 8 && aArraySize.Height() == 8 )
{
eType = XBITMAP_8X8;
- pPixelArray = new USHORT[ 64 ];
+ pPixelArray = new sal_uInt16[ 64 ];
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
*( pPixelArray + i ) = *( pArray + i );
}
else
@@ -174,9 +174,9 @@ XOBitmap::XOBitmap( const XOBitmap& rXBmp ) :
{
if( eType == XBITMAP_8X8 )
{
- pPixelArray = new USHORT[ 64 ];
+ pPixelArray = new sal_uInt16[ 64 ];
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
*( pPixelArray + i ) = *( rXBmp.pPixelArray + i );
}
}
@@ -222,9 +222,9 @@ XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp )
{
if( eType == XBITMAP_8X8 )
{
- pPixelArray = new USHORT[ 64 ];
+ pPixelArray = new sal_uInt16[ 64 ];
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
*( pPixelArray + i ) = *( rXBmp.pPixelArray + i );
}
}
@@ -251,24 +251,24 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const
aBckgrColor != rXOBitmap.aBckgrColor ||
bGraphicDirty != rXOBitmap.bGraphicDirty )
{
- return( FALSE );
+ return( sal_False );
}
if( pPixelArray && rXOBitmap.pPixelArray )
{
- USHORT nCount = (USHORT) ( aArraySize.Width() * aArraySize.Height() );
- for( USHORT i = 0; i < nCount; i++ )
+ sal_uInt16 nCount = (sal_uInt16) ( aArraySize.Width() * aArraySize.Height() );
+ for( sal_uInt16 i = 0; i < nCount; i++ )
{
if( *( pPixelArray + i ) != *( rXOBitmap.pPixelArray + i ) )
- return( FALSE );
+ return( sal_False );
}
}
- return( TRUE );
+ return( sal_True );
}
/*************************************************************************
|*
-|* void SetPixelArray( const USHORT* pArray )
+|* void SetPixelArray( const sal_uInt16* pArray )
|*
|* Beschreibung
|* Ersterstellung 27.07.95
@@ -276,19 +276,19 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const
|*
*************************************************************************/
-void XOBitmap::SetPixelArray( const USHORT* pArray )
+void XOBitmap::SetPixelArray( const sal_uInt16* pArray )
{
if( eType == XBITMAP_8X8 )
{
if( pPixelArray )
delete []pPixelArray;
- pPixelArray = new USHORT[ 64 ];
+ pPixelArray = new sal_uInt16[ 64 ];
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
*( pPixelArray + i ) = *( pArray + i );
- bGraphicDirty = TRUE;
+ bGraphicDirty = sal_True;
}
else
{
@@ -343,12 +343,12 @@ const GraphicObject& XOBitmap::GetGraphicObject() const
void XOBitmap::Bitmap2Array()
{
VirtualDevice aVD;
- BOOL bPixelColor = FALSE;
+ sal_Bool bPixelColor = sal_False;
const Bitmap aBitmap( GetBitmap() );
- const USHORT nLines = 8; // von Type abhaengig
+ const sal_uInt16 nLines = 8; // von Type abhaengig
if( !pPixelArray )
- pPixelArray = new USHORT[ nLines * nLines ];
+ pPixelArray = new sal_uInt16[ nLines * nLines ];
aVD.SetOutputSizePixel( aBitmap.GetSizePixel() );
aVD.DrawBitmap( Point(), aBitmap );
@@ -356,9 +356,9 @@ void XOBitmap::Bitmap2Array()
// Aufbau des Arrays und Ermittlung der Vorder-, bzw.
// Hintergrundfarbe
- for( USHORT i = 0; i < nLines; i++ )
+ for( sal_uInt16 i = 0; i < nLines; i++ )
{
- for( USHORT j = 0; j < nLines; j++ )
+ for( sal_uInt16 j = 0; j < nLines; j++ )
{
if ( aVD.GetPixel( Point( j, i ) ) == aBckgrColor )
*( pPixelArray + j + i * nLines ) = 0;
@@ -368,7 +368,7 @@ void XOBitmap::Bitmap2Array()
if( !bPixelColor )
{
aPixelColor = aVD.GetPixel( Point( j, i ) );
- bPixelColor = TRUE;
+ bPixelColor = sal_True;
}
}
}
@@ -389,7 +389,7 @@ void XOBitmap::Bitmap2Array()
void XOBitmap::Array2Bitmap()
{
VirtualDevice aVD;
- USHORT nLines = 8; // von Type abhaengig
+ sal_uInt16 nLines = 8; // von Type abhaengig
if( !pPixelArray )
return;
@@ -397,9 +397,9 @@ void XOBitmap::Array2Bitmap()
aVD.SetOutputSizePixel( Size( nLines, nLines ) );
// Aufbau der Bitmap
- for( USHORT i = 0; i < nLines; i++ )
+ for( sal_uInt16 i = 0; i < nLines; i++ )
{
- for( USHORT j = 0; j < nLines; j++ )
+ for( sal_uInt16 j = 0; j < nLines; j++ )
{
if( *( pPixelArray + j + i * nLines ) == 0 )
aVD.DrawPixel( Point( j, i ), aBckgrColor );
@@ -409,7 +409,7 @@ void XOBitmap::Array2Bitmap()
}
aGraphicObject = GraphicObject( aVD.GetBitmap( Point(), Size( nLines, nLines ) ) );
- bGraphicDirty = FALSE;
+ bGraphicDirty = sal_False;
}
// -----------------------
@@ -479,7 +479,7 @@ XFillBitmapItem::XFillBitmapItem(const XFillBitmapItem& rItem) :
|*
*************************************************************************/
-XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
+XFillBitmapItem::XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer ) :
NameOrIndex( XATTR_FILLBITMAP, rIn )
{
if( nVer == 0 )
@@ -508,7 +508,7 @@ XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
{
if (!IsIndex())
{
- INT16 iTmp;
+ sal_Int16 iTmp;
rIn >> iTmp;
aXOBitmap.SetBitmapStyle( (XBitmapStyle) iTmp );
rIn >> iTmp;
@@ -522,10 +522,10 @@ XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) :
}
else if( aXOBitmap.GetBitmapType() == XBITMAP_8X8 )
{
- USHORT* pArray = new USHORT[ 64 ];
+ sal_uInt16* pArray = new sal_uInt16[ 64 ];
Color aColor;
- for( USHORT i = 0; i < 64; i++ )
+ for( sal_uInt16 i = 0; i < 64; i++ )
rIn >> *( pArray + i );
aXOBitmap.SetPixelArray( pArray );
@@ -591,7 +591,7 @@ int XFillBitmapItem::operator==(const SfxPoolItem& rItem) const
/*************************************************************************
|*
-|* SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
+|* SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const
|*
|* Beschreibung
|* Ersterstellung 17.11.94
@@ -599,7 +599,7 @@ int XFillBitmapItem::operator==(const SfxPoolItem& rItem) const
|*
*************************************************************************/
-SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
+SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const
{
return new XFillBitmapItem( rIn, nVer );
}
@@ -614,22 +614,22 @@ SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const
|*
*************************************************************************/
-SvStream& XFillBitmapItem::Store( SvStream& rOut, USHORT nItemVersion ) const
+SvStream& XFillBitmapItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
{
NameOrIndex::Store( rOut, nItemVersion );
if (!IsIndex())
{
- rOut << (INT16) aXOBitmap.GetBitmapStyle();
+ rOut << (sal_Int16) aXOBitmap.GetBitmapStyle();
if( !aXOBitmap.GetBitmap() )
- rOut << (INT16) XBITMAP_NONE;
+ rOut << (sal_Int16) XBITMAP_NONE;
else
{
- rOut << (INT16) aXOBitmap.GetBitmapType();
+ rOut << (sal_Int16) aXOBitmap.GetBitmapType();
if( aXOBitmap.GetBitmapType() == XBITMAP_IMPORT )
{
- const USHORT nOldComprMode = rOut.GetCompressMode();
- USHORT nNewComprMode = nOldComprMode;
+ const sal_uInt16 nOldComprMode = rOut.GetCompressMode();
+ sal_uInt16 nNewComprMode = nOldComprMode;
if( rOut.GetVersion() >= SOFFICE_FILEFORMAT_50 )
nNewComprMode |= COMPRESSMODE_ZBITMAP;
@@ -642,9 +642,9 @@ SvStream& XFillBitmapItem::Store( SvStream& rOut, USHORT nItemVersion ) const
}
else if( aXOBitmap.GetBitmapType() == XBITMAP_8X8 )
{
- USHORT* pArray = aXOBitmap.GetPixelArray();
- for( USHORT i = 0; i < 64; i++ )
- rOut << (USHORT) *( pArray + i );
+ sal_uInt16* pArray = aXOBitmap.GetPixelArray();
+ for( sal_uInt16 i = 0; i < 64; i++ )
+ rOut << (sal_uInt16) *( pArray + i );
rOut << aXOBitmap.GetPixelColor();
rOut << aXOBitmap.GetBackgroundColor();
@@ -676,7 +676,7 @@ const XOBitmap& XFillBitmapItem::GetBitmapValue(const XBitmapTable* pTable) cons
/*************************************************************************
|*
-|* USHORT XFillBitmapItem::GetVersion() const
+|* sal_uInt16 XFillBitmapItem::GetVersion() const
|*
|* Beschreibung
|* Ersterstellung 26.07.95
@@ -684,7 +684,7 @@ const XOBitmap& XFillBitmapItem::GetBitmapValue(const XBitmapTable* pTable) cons
|*
*************************************************************************/
-USHORT XFillBitmapItem::GetVersion( USHORT /*nFileFormatVersion*/) const
+sal_uInt16 XFillBitmapItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const
{
// 2. Version
return( 1 );
@@ -716,7 +716,7 @@ SfxItemPresentation XFillBitmapItem::GetPresentation
//------------------------------------------------------------------------
-sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -782,7 +782,7 @@ sal_Bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMe
//------------------------------------------------------------------------
-sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId )
+sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -865,7 +865,7 @@ sal_Bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE
return (bSetName || bSetURL || bSetBitmap);
}
-BOOL XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
+sal_Bool XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 )
{
return ((XFillBitmapItem*)p1)->GetBitmapValue().GetGraphicObject().GetUniqueID() ==
((XFillBitmapItem*)p2)->GetBitmapValue().GetGraphicObject().GetUniqueID();
diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx
index 8b658918069a..052bc4c8d25a 100644
--- a/svx/source/xoutdev/xexch.cxx
+++ b/svx/source/xoutdev/xexch.cxx
@@ -88,7 +88,7 @@ XFillExchangeData::~XFillExchangeData()
|*
|*
*************************************************************************/
-ULONG XFillExchangeData::RegisterClipboardFormatName()
+sal_uIntPtr XFillExchangeData::RegisterClipboardFormatName()
{
return( SOT_FORMATSTR_ID_XFA );
}
@@ -104,7 +104,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
if( rData.pXFillAttrSetItem )
{
SfxWhichIter aIter( rData.pXFillAttrSetItem->GetItemSet() );
- USHORT nWhich = aIter.FirstWhich();
+ sal_uInt16 nWhich = aIter.FirstWhich();
const SfxPoolItem* pItem;
sal_uInt32 nItemCount = 0;
sal_Size nFirstPos = rOStm.Tell();
@@ -113,10 +113,10 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
while( nWhich )
{
- if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, FALSE, &pItem ) )
+ if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, sal_False, &pItem ) )
{
VersionCompat aCompat( rOStm, STREAM_WRITE );
- const USHORT nItemVersion2 = pItem->GetVersion( (USHORT) rOStm.GetVersion() );
+ const sal_uInt16 nItemVersion2 = pItem->GetVersion( (sal_uInt16) rOStm.GetVersion() );
rOStm << nWhich << nItemVersion2;
pItem->Store( rOStm, nItemVersion2 );
@@ -127,7 +127,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData )
nWhich = aIter.NextWhich();
}
- const ULONG nLastPos = rOStm.Tell();
+ const sal_uIntPtr nLastPos = rOStm.Tell();
rOStm.Seek( nFirstPos );
rOStm << nItemCount;
rOStm.Seek( nLastPos );
@@ -150,7 +150,7 @@ SvStream& operator>>( SvStream& rIStm, XFillExchangeData& rData )
SfxItemSet* pSet = new SfxItemSet ( *rData.pPool, XATTR_FILL_FIRST, XATTR_FILL_LAST );
SfxPoolItem* pNewItem;
sal_uInt32 nItemCount = 0;
- USHORT nWhich, nItemVersion;
+ sal_uInt16 nWhich, nItemVersion;
rIStm >> nItemCount;
diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx
index d61c339f762d..07a1e5bf3ad9 100644
--- a/svx/source/xoutdev/xtabbtmp.cxx
+++ b/svx/source/xoutdev/xtabbtmp.cxx
@@ -72,7 +72,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0
XBitmapTable::XBitmapTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -107,35 +107,35 @@ XBitmapEntry* XBitmapTable::GetBitmap(long nIndex) const
/************************************************************************/
-BOOL XBitmapTable::Load()
+sal_Bool XBitmapTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XBitmapTable::Save()
+sal_Bool XBitmapTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XBitmapTable::Create()
+sal_Bool XBitmapTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XBitmapTable::CreateBitmapsForUI()
+sal_Bool XBitmapTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -152,7 +152,7 @@ Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
XBitmapList::XBitmapList( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyList( rPath, pInPool, nInitSize, nReSize)
{
// pBmpList = new List( nInitSize, nReSize );
@@ -187,18 +187,18 @@ XBitmapEntry* XBitmapList::GetBitmap(long nIndex) const
/************************************************************************/
-BOOL XBitmapList::Load()
+sal_Bool XBitmapList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -209,19 +209,19 @@ BOOL XBitmapList::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXBitmapTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XBitmapList::Save()
+sal_Bool XBitmapList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -236,7 +236,7 @@ BOOL XBitmapList::Save()
/************************************************************************/
// Umgestellt am 27.07.95 auf XBitmap
-BOOL XBitmapList::Create()
+sal_Bool XBitmapList::Create()
{
// Array der Bitmap
//-----------------------
@@ -252,7 +252,7 @@ BOOL XBitmapList::Create()
String aStr( SVX_RES( RID_SVXSTR_BITMAP ) );
Color aColWhite( RGB_Color( COL_WHITE ) );
xub_StrLen nLen;
- USHORT aArray[64];
+ sal_uInt16 aArray[64];
memset( aArray, 0, sizeof( aArray ) );
aStr.AppendAscii(" 1");
@@ -274,19 +274,19 @@ BOOL XBitmapList::Create()
aStr.SetChar(nLen, sal_Unicode('4'));
Insert( new XBitmapEntry( XOBitmap( aArray, RGB_Color( COL_LIGHTBLUE ), aColWhite ), aStr ) );
- return( TRUE );
+ return( sal_True );
}
/************************************************************************/
-BOOL XBitmapList::CreateBitmapsForUI()
+sal_Bool XBitmapList::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XBitmapList::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XBitmapList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 2b3ac7ab850b..7411904b6303 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -73,7 +73,7 @@ static XColorTable* pTable=0;
XColorTable::XColorTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
// ColorTable braucht keine eigene BmpTable
@@ -116,18 +116,18 @@ XColorEntry* XColorTable::GetColor(long nIndex) const
/************************************************************************/
-BOOL XColorTable::Load()
+sal_Bool XColorTable::Load()
{
if( bTableDirty )
{
- bTableDirty = FALSE;
+ bTableDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -138,19 +138,19 @@ BOOL XColorTable::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXColorTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XColorTable::Save()
+sal_Bool XColorTable::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -164,13 +164,13 @@ BOOL XColorTable::Save()
/************************************************************************/
-BOOL XColorTable::Create()
+sal_Bool XColorTable::Create()
{
XubString aStr;
xub_StrLen nLen;
ResMgr& rRes = DIALOG_MGR();
- static USHORT __READONLY_DATA aResId[] =
+ static sal_uInt16 __READONLY_DATA aResId[] =
{
RID_SVXSTR_BLACK,
RID_SVXSTR_BLUE,
@@ -219,7 +219,7 @@ BOOL XColorTable::Create()
COL_WHITE
};
- for( USHORT n = 0; n < 16; ++n )
+ for( sal_uInt16 n = 0; n < 16; ++n )
{
Insert( n, new XColorEntry( Color( aColTab[n] ),
String( ResId( aResId[ n ], rRes )) ) );
@@ -453,14 +453,14 @@ BOOL XColorTable::Create()
/************************************************************************/
-BOOL XColorTable::CreateBitmapsForUI()
+sal_Bool XColorTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -477,7 +477,7 @@ Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
XColorList::XColorList( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyList( rPath, pInPool, nInitSize, nReSize)
{
// pBmpList = new List( nInitSize, nReSize );
@@ -512,35 +512,35 @@ XColorEntry* XColorList::GetColor(long nIndex) const
/************************************************************************/
-BOOL XColorList::Load()
+sal_Bool XColorList::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XColorList::Save()
+sal_Bool XColorList::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XColorList::Create()
+sal_Bool XColorList::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XColorList::CreateBitmapsForUI()
+sal_Bool XColorList::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 3455ed4d3588..dd6bf8f17d19 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -86,7 +86,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
XDashTable::XDashTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -121,35 +121,35 @@ XDashEntry* XDashTable::GetDash(long nIndex) const
/************************************************************************/
-BOOL XDashTable::Load()
+sal_Bool XDashTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XDashTable::Save()
+sal_Bool XDashTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XDashTable::Create()
+sal_Bool XDashTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XDashTable::CreateBitmapsForUI()
+sal_Bool XDashTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -268,18 +268,18 @@ XDashEntry* XDashList::GetDash(long nIndex) const
return (XDashEntry*) XPropertyList::Get(nIndex, 0);
}
-BOOL XDashList::Load()
+sal_Bool XDashList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -290,17 +290,17 @@ BOOL XDashList::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXDashTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
-BOOL XDashList::Save()
+sal_Bool XDashList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -312,7 +312,7 @@ BOOL XDashList::Save()
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
-BOOL XDashList::Create()
+sal_Bool XDashList::Create()
{
XubString aStr( SVX_RES( RID_SVXSTR_LINESTYLE ) );
xub_StrLen nLen;
@@ -325,16 +325,16 @@ BOOL XDashList::Create()
aStr.SetChar(nLen, sal_Unicode('3'));
Insert(new XDashEntry(XDash(XDASH_RECT,2, 50,3,250,120),aStr));
- return( TRUE );
+ return( sal_True );
}
-BOOL XDashList::CreateBitmapsForUI()
+sal_Bool XDashList::CreateBitmapsForUI()
{
impCreate();
for( long i = 0; i < Count(); i++)
{
- Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+ Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
DBG_ASSERT( pBmp, "XDashList: Bitmap(UI) konnte nicht erzeugt werden!" );
if( pBmp )
@@ -343,10 +343,10 @@ BOOL XDashList::CreateBitmapsForUI()
impDestroy();
- return( TRUE );
+ return( sal_True );
}
-Bitmap* XDashList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XDashList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
{
impCreate();
VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index 3a9f24c6d15a..02b35fb27f33 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -83,7 +83,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
XGradientTable::XGradientTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -118,35 +118,35 @@ XGradientEntry* XGradientTable::GetGradient(long nIndex) const
/************************************************************************/
-BOOL XGradientTable::Load()
+sal_Bool XGradientTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XGradientTable::Save()
+sal_Bool XGradientTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XGradientTable::Create()
+sal_Bool XGradientTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XGradientTable::CreateBitmapsForUI()
+sal_Bool XGradientTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -255,18 +255,18 @@ XGradientEntry* XGradientList::GetGradient(long nIndex) const
return( (XGradientEntry*) XPropertyList::Get( nIndex, 0 ) );
}
-BOOL XGradientList::Load()
+sal_Bool XGradientList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -278,17 +278,17 @@ BOOL XGradientList::Load()
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
-BOOL XGradientList::Save()
+sal_Bool XGradientList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -300,7 +300,7 @@ BOOL XGradientList::Save()
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
-BOOL XGradientList::Create()
+sal_Bool XGradientList::Create()
{
XubString aStr( SVX_RES( RID_SVXSTR_GRADIENT ) );
xub_StrLen nLen;
@@ -319,16 +319,16 @@ BOOL XGradientList::Create()
aStr.SetChar(nLen, sal_Unicode('6'));
Insert(new XGradientEntry(XGradient(RGB_Color(COL_MAGENTA),RGB_Color(COL_YELLOW ),XGRAD_RECT , 1900,60,60,50,100,100),aStr));
- return( TRUE );
+ return( sal_True );
}
-BOOL XGradientList::CreateBitmapsForUI()
+sal_Bool XGradientList::CreateBitmapsForUI()
{
impCreate();
for( long i = 0; i < Count(); i++)
{
- Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+ Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
DBG_ASSERT( pBmp, "XGradientList: Bitmap(UI) konnte nicht erzeugt werden!" );
if( pBmp )
@@ -337,10 +337,10 @@ BOOL XGradientList::CreateBitmapsForUI()
impDestroy();
- return( FALSE );
+ return( sal_False );
}
-Bitmap* XGradientList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XGradientList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
{
impCreate();
VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx
index ef5beece8dc8..b62909fda71a 100644
--- a/svx/source/xoutdev/xtabhtch.cxx
+++ b/svx/source/xoutdev/xtabhtch.cxx
@@ -82,7 +82,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
XHatchTable::XHatchTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -117,35 +117,35 @@ XHatchEntry* XHatchTable::GetHatch(long nIndex) const
/************************************************************************/
-BOOL XHatchTable::Load()
+sal_Bool XHatchTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XHatchTable::Save()
+sal_Bool XHatchTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XHatchTable::Create()
+sal_Bool XHatchTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XHatchTable::CreateBitmapsForUI()
+sal_Bool XHatchTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
@@ -264,18 +264,18 @@ XHatchEntry* XHatchList::GetHatch(long nIndex) const
return (XHatchEntry*) XPropertyList::Get(nIndex, 0);
}
-BOOL XHatchList::Load()
+sal_Bool XHatchList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -286,17 +286,17 @@ BOOL XHatchList::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXHatchTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
-BOOL XHatchList::Save()
+sal_Bool XHatchList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -308,7 +308,7 @@ BOOL XHatchList::Save()
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
-BOOL XHatchList::Create()
+sal_Bool XHatchList::Create()
{
XubString aStr( SVX_RES( RID_SVXSTR_HATCH ) );
xub_StrLen nLen;
@@ -321,16 +321,16 @@ BOOL XHatchList::Create()
aStr.SetChar(nLen, sal_Unicode('3'));
Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLUE ),XHATCH_TRIPLE,120, 0),aStr));
- return( TRUE );
+ return( sal_True );
}
-BOOL XHatchList::CreateBitmapsForUI()
+sal_Bool XHatchList::CreateBitmapsForUI()
{
impCreate();
for( long i = 0; i < Count(); i++)
{
- Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+ Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
DBG_ASSERT( pBmp, "XHatchList: Bitmap(UI) konnte nicht erzeugt werden!" );
if( pBmp )
@@ -339,10 +339,10 @@ BOOL XHatchList::CreateBitmapsForUI()
impDestroy();
- return( TRUE );
+ return( sal_True );
}
-Bitmap* XHatchList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XHatchList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
{
impCreate();
VirtualDevice* pVD = mpData->getVirtualDevice();
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index befbe5696db9..e0e0a1c7aa69 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -57,19 +57,19 @@ Color RGB_Color( ColorData nColorName )
XPropertyTable::XPropertyTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
aName ( pszStandard, 8 ),
aPath ( rPath ),
pXPool ( pInPool ),
aTable ( nInitSize, nReSize ),
pBmpTable ( NULL ),
- bTableDirty ( TRUE ),
- bBitmapsDirty ( TRUE ),
- bOwnPool ( FALSE )
+ bTableDirty ( sal_True ),
+ bBitmapsDirty ( sal_True ),
+ bOwnPool ( sal_False )
{
if( !pXPool )
{
- bOwnPool = TRUE;
+ bOwnPool = sal_True;
pXPool = new XOutdevItemPool;
DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
}
@@ -96,7 +96,7 @@ XPropertyTable::~XPropertyTable()
{
XPropertyEntry* pEntry = (XPropertyEntry*)aTable.First();
Bitmap* pBitmap = NULL;
- for (ULONG nIndex = 0; nIndex < aTable.Count(); nIndex++)
+ for (sal_uIntPtr nIndex = 0; nIndex < aTable.Count(); nIndex++)
{
delete pEntry;
pEntry = (XPropertyEntry*)aTable.Next();
@@ -106,7 +106,7 @@ XPropertyTable::~XPropertyTable()
{
pBitmap = (Bitmap*) pBmpTable->First();
- for( ULONG nIndex = 0; nIndex < pBmpTable->Count(); nIndex++ )
+ for( sal_uIntPtr nIndex = 0; nIndex < pBmpTable->Count(); nIndex++ )
{
delete pBitmap;
pBitmap = (Bitmap*) pBmpTable->Next();
@@ -140,7 +140,7 @@ long XPropertyTable::Count() const
{
if( bTableDirty )
{
- // ( (XPropertyTable*) this )->bTableDirty = FALSE; <- im Load()
+ // ( (XPropertyTable*) this )->bTableDirty = sal_False; <- im Load()
if( !( (XPropertyTable*) this )->Load() )
( (XPropertyTable*) this )->Create();
}
@@ -153,15 +153,15 @@ long XPropertyTable::Count() const
|*
*************************************************************************/
-XPropertyEntry* XPropertyTable::Get( long nIndex, USHORT /*nDummy*/) const
+XPropertyEntry* XPropertyTable::Get( long nIndex, sal_uInt16 /*nDummy*/) const
{
if( bTableDirty )
{
- // ( (XPropertyTable*) this )->bTableDirty = FALSE; <- im Load()
+ // ( (XPropertyTable*) this )->bTableDirty = sal_False; <- im Load()
if( !( (XPropertyTable*) this )->Load() )
( (XPropertyTable*) this )->Create();
}
- return (XPropertyEntry*) aTable.GetObject( (ULONG) nIndex );
+ return (XPropertyEntry*) aTable.GetObject( (sal_uIntPtr) nIndex );
}
/*************************************************************************
@@ -174,7 +174,7 @@ long XPropertyTable::Get(const XubString& rName)
{
if( bTableDirty )
{
- // bTableDirty = FALSE;
+ // bTableDirty = sal_False;
if( !Load() )
Create();
}
@@ -201,12 +201,12 @@ Bitmap* XPropertyTable::GetBitmap( long nIndex ) const
{
if( bBitmapsDirty )
{
- ( (XPropertyTable*) this )->bBitmapsDirty = FALSE;
+ ( (XPropertyTable*) this )->bBitmapsDirty = sal_False;
( (XPropertyTable*) this )->CreateBitmapsForUI();
}
- if( pBmpTable->Count() >= (ULONG) nIndex )
- return (Bitmap*) pBmpTable->GetObject( (ULONG) nIndex );
+ if( pBmpTable->Count() >= (sal_uIntPtr) nIndex )
+ return (Bitmap*) pBmpTable->GetObject( (sal_uIntPtr) nIndex );
}
return( NULL );
}
@@ -217,14 +217,14 @@ Bitmap* XPropertyTable::GetBitmap( long nIndex ) const
|*
*************************************************************************/
-BOOL XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
+sal_Bool XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
{
- BOOL bReturn = aTable.Insert( (ULONG) nIndex, pEntry );
+ sal_Bool bReturn = aTable.Insert( (sal_uIntPtr) nIndex, pEntry );
if( pBmpTable && !bBitmapsDirty )
{
- Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
- pBmpTable->Insert( (ULONG) nIndex, pBmp );
+ Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+ pBmpTable->Insert( (sal_uIntPtr) nIndex, pBmp );
}
return bReturn;
}
@@ -237,12 +237,12 @@ BOOL XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry )
XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry )
{
- XPropertyEntry* pOldEntry = (XPropertyEntry*) aTable.Replace( (ULONG) nIndex, pEntry );
+ XPropertyEntry* pOldEntry = (XPropertyEntry*) aTable.Replace( (sal_uIntPtr) nIndex, pEntry );
if( pBmpTable && !bBitmapsDirty )
{
- Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
- Bitmap* pOldBmp = (Bitmap*) pBmpTable->Replace( (ULONG) nIndex, pBmp );
+ Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+ Bitmap* pOldBmp = (Bitmap*) pBmpTable->Replace( (sal_uIntPtr) nIndex, pBmp );
if( pOldBmp )
delete pOldBmp;
}
@@ -255,15 +255,15 @@ XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry )
|*
*************************************************************************/
-XPropertyEntry* XPropertyTable::Remove( long nIndex, USHORT /*nDummy*/)
+XPropertyEntry* XPropertyTable::Remove( long nIndex, sal_uInt16 /*nDummy*/)
{
if( pBmpTable && !bBitmapsDirty )
{
- Bitmap* pOldBmp = (Bitmap*) pBmpTable->Remove( (ULONG) nIndex );
+ Bitmap* pOldBmp = (Bitmap*) pBmpTable->Remove( (sal_uIntPtr) nIndex );
if( pOldBmp )
delete pOldBmp;
}
- return (XPropertyEntry*) aTable.Remove((ULONG)nIndex);
+ return (XPropertyEntry*) aTable.Remove((sal_uIntPtr)nIndex);
}
/************************************************************************/
@@ -289,19 +289,19 @@ void XPropertyTable::SetName( const String& rString )
XPropertyList::XPropertyList( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
aName ( pszStandard, 8 ),
aPath ( rPath ),
pXPool ( pInPool ),
aList ( nInitSize, nReSize ),
pBmpList ( NULL ),
- bListDirty ( TRUE ),
- bBitmapsDirty ( TRUE ),
- bOwnPool ( FALSE )
+ bListDirty ( sal_True ),
+ bBitmapsDirty ( sal_True ),
+ bOwnPool ( sal_False )
{
if( !pXPool )
{
- bOwnPool = TRUE;
+ bOwnPool = sal_True;
pXPool = new XOutdevItemPool;
DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" );
}
@@ -328,7 +328,7 @@ XPropertyList::~XPropertyList()
{
XPropertyEntry* pEntry = (XPropertyEntry*)aList.First();
Bitmap* pBitmap = NULL;
- for( ULONG nIndex = 0; nIndex < aList.Count(); nIndex++ )
+ for( sal_uIntPtr nIndex = 0; nIndex < aList.Count(); nIndex++ )
{
delete pEntry;
pEntry = (XPropertyEntry*)aList.Next();
@@ -338,7 +338,7 @@ XPropertyList::~XPropertyList()
{
pBitmap = (Bitmap*) pBmpList->First();
- for( ULONG nIndex = 0; nIndex < pBmpList->Count(); nIndex++ )
+ for( sal_uIntPtr nIndex = 0; nIndex < pBmpList->Count(); nIndex++ )
{
delete pBitmap;
pBitmap = (Bitmap*) pBmpList->Next();
@@ -372,7 +372,7 @@ long XPropertyList::Count() const
{
if( bListDirty )
{
- // ( (XPropertyList*) this )->bListDirty = FALSE; <- im Load()
+ // ( (XPropertyList*) this )->bListDirty = sal_False; <- im Load()
if( !( (XPropertyList*) this )->Load() )
( (XPropertyList*) this )->Create();
}
@@ -385,15 +385,15 @@ long XPropertyList::Count() const
|*
*************************************************************************/
-XPropertyEntry* XPropertyList::Get( long nIndex, USHORT /*nDummy*/) const
+XPropertyEntry* XPropertyList::Get( long nIndex, sal_uInt16 /*nDummy*/) const
{
if( bListDirty )
{
- // ( (XPropertyList*) this )->bListDirty = FALSE; <- im Load()
+ // ( (XPropertyList*) this )->bListDirty = sal_False; <- im Load()
if( !( (XPropertyList*) this )->Load() )
( (XPropertyList*) this )->Create();
}
- return (XPropertyEntry*) aList.GetObject( (ULONG) nIndex );
+ return (XPropertyEntry*) aList.GetObject( (sal_uIntPtr) nIndex );
}
/*************************************************************************
@@ -406,7 +406,7 @@ long XPropertyList::Get(const XubString& rName)
{
if( bListDirty )
{
- //bListDirty = FALSE;
+ //bListDirty = sal_False;
if( !Load() )
Create();
}
@@ -433,11 +433,11 @@ Bitmap* XPropertyList::GetBitmap( long nIndex ) const
{
if( bBitmapsDirty )
{
- ( (XPropertyList*) this )->bBitmapsDirty = FALSE;
+ ( (XPropertyList*) this )->bBitmapsDirty = sal_False;
( (XPropertyList*) this )->CreateBitmapsForUI();
}
- if( pBmpList->Count() >= (ULONG) nIndex )
- return (Bitmap*) pBmpList->GetObject( (ULONG) nIndex );
+ if( pBmpList->Count() >= (sal_uIntPtr) nIndex )
+ return (Bitmap*) pBmpList->GetObject( (sal_uIntPtr) nIndex );
}
return( NULL );
}
@@ -450,13 +450,13 @@ Bitmap* XPropertyList::GetBitmap( long nIndex ) const
void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex )
{
- aList.Insert( pEntry, (ULONG) nIndex );
+ aList.Insert( pEntry, (sal_uIntPtr) nIndex );
if( pBmpList && !bBitmapsDirty )
{
Bitmap* pBmp = CreateBitmapForUI(
- (ULONG) nIndex < aList.Count() ? nIndex : aList.Count() - 1 );
- pBmpList->Insert( pBmp, (ULONG) nIndex );
+ (sal_uIntPtr) nIndex < aList.Count() ? nIndex : aList.Count() - 1 );
+ pBmpList->Insert( pBmp, (sal_uIntPtr) nIndex );
}
}
@@ -468,12 +468,12 @@ void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex )
XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
{
- XPropertyEntry* pOldEntry = (XPropertyEntry*) aList.Replace( pEntry, (ULONG) nIndex );
+ XPropertyEntry* pOldEntry = (XPropertyEntry*) aList.Replace( pEntry, (sal_uIntPtr) nIndex );
if( pBmpList && !bBitmapsDirty )
{
- Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex );
- Bitmap* pOldBmp = (Bitmap*) pBmpList->Replace( pBmp, (ULONG) nIndex );
+ Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex );
+ Bitmap* pOldBmp = (Bitmap*) pBmpList->Replace( pBmp, (sal_uIntPtr) nIndex );
if( pOldBmp )
delete pOldBmp;
}
@@ -486,15 +486,15 @@ XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex )
|*
*************************************************************************/
-XPropertyEntry* XPropertyList::Remove( long nIndex, USHORT /*nDummy*/)
+XPropertyEntry* XPropertyList::Remove( long nIndex, sal_uInt16 /*nDummy*/)
{
if( pBmpList && !bBitmapsDirty )
{
- Bitmap* pOldBmp = (Bitmap*) pBmpList->Remove( (ULONG) nIndex );
+ Bitmap* pOldBmp = (Bitmap*) pBmpList->Remove( (sal_uIntPtr) nIndex );
if( pOldBmp )
delete pOldBmp;
}
- return (XPropertyEntry*) aList.Remove( (ULONG) nIndex );
+ return (XPropertyEntry*) aList.Remove( (sal_uIntPtr) nIndex );
}
/************************************************************************/
diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx
index ac5dcc739e41..4a984b2a5bfb 100644
--- a/svx/source/xoutdev/xtablend.cxx
+++ b/svx/source/xoutdev/xtablend.cxx
@@ -95,7 +95,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
XLineEndTable::XLineEndTable( const String& rPath,
XOutdevItemPool* pInPool,
- USHORT nInitSize, USHORT nReSize ) :
+ sal_uInt16 nInitSize, sal_uInt16 nReSize ) :
XPropertyTable( rPath, pInPool, nInitSize, nReSize)
{
pBmpTable = new Table( nInitSize, nReSize );
@@ -130,37 +130,37 @@ XLineEndEntry* XLineEndTable::GetLineEnd(long nIndex) const
/************************************************************************/
-BOOL XLineEndTable::Load()
+sal_Bool XLineEndTable::Load()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XLineEndTable::Save()
+sal_Bool XLineEndTable::Save()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-BOOL XLineEndTable::Create()
+sal_Bool XLineEndTable::Create()
{
- return( FALSE );
+ return( sal_False );
}
/************************************************************************/
-Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/)
+Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
{
return( NULL );
}
/************************************************************************/
-BOOL XLineEndTable::CreateBitmapsForUI()
+sal_Bool XLineEndTable::CreateBitmapsForUI()
{
- return( FALSE );
+ return( sal_False );
}
// --------------------
@@ -277,18 +277,18 @@ XLineEndEntry* XLineEndList::GetLineEnd(long nIndex) const
return (XLineEndEntry*) XPropertyList::Get(nIndex, 0);
}
-BOOL XLineEndList::Load()
+sal_Bool XLineEndList::Load()
{
if( bListDirty )
{
- bListDirty = FALSE;
+ bListDirty = sal_False;
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -299,17 +299,17 @@ BOOL XLineEndList::Load()
uno::Reference< container::XNameContainer > xTable( SvxUnoXLineEndTable_createInstance( this ), uno::UNO_QUERY );
return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
- return( FALSE );
+ return( sal_False );
}
-BOOL XLineEndList::Save()
+sal_Bool XLineEndList::Save()
{
INetURLObject aURL( aPath );
if( INET_PROT_NOT_VALID == aURL.GetProtocol() )
{
DBG_ASSERT( !aPath.Len(), "invalid URL" );
- return FALSE;
+ return sal_False;
}
aURL.Append( aName );
@@ -321,7 +321,7 @@ BOOL XLineEndList::Save()
return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable );
}
-BOOL XLineEndList::Create()
+sal_Bool XLineEndList::Create()
{
basegfx::B2DPolygon aTriangle;
aTriangle.append(basegfx::B2DPoint(10.0, 0.0));
@@ -341,16 +341,16 @@ BOOL XLineEndList::Create()
basegfx::B2DPolygon aCircle(basegfx::tools::createPolygonFromCircle(basegfx::B2DPoint(0.0, 0.0), 100.0));
Insert( new XLineEndEntry( basegfx::B2DPolyPolygon(aCircle), SVX_RESSTR( RID_SVXSTR_CIRCLE ) ) );
- return( TRUE );
+ return( sal_True );
}
-BOOL XLineEndList::CreateBitmapsForUI()
+sal_Bool XLineEndList::CreateBitmapsForUI()
{
impCreate();
for( long i = 0; i < Count(); i++)
{
- Bitmap* pBmp = CreateBitmapForUI( i, FALSE );
+ Bitmap* pBmp = CreateBitmapForUI( i, sal_False );
OSL_ENSURE(0 != pBmp, "XLineEndList: Bitmap(UI) could not be created!" );
if( pBmp )
@@ -359,10 +359,10 @@ BOOL XLineEndList::CreateBitmapsForUI()
impDestroy();
- return( TRUE );
+ return( sal_True );
}
-Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, BOOL bDelete )
+Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, sal_Bool bDelete )
{
impCreate();
VirtualDevice* pVD = mpData->getVirtualDevice();