[Libreoffice-commits] core.git: 23 commits - basctl/source chart2/source cui/source dbaccess/source editeng/source filter/source include/editeng include/svx reportdesign/source sc/source sd/source svx/source sw/inc sw/source
Noel Grandin
noel at peralex.com
Mon Mar 10 23:19:52 PDT 2014
basctl/source/dlged/dlgedmod.cxx | 2
chart2/source/controller/main/ChartController_TextEdit.cxx | 6
chart2/source/controller/main/DrawCommandDispatch.cxx | 6
chart2/source/controller/main/ShapeController.cxx | 16
chart2/source/view/main/DrawModelWrapper.cxx | 2
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/dialogs/cuifmsearch.cxx | 2
cui/source/factory/dlgfact.cxx | 34 -
cui/source/factory/dlgfact.hxx | 34 -
cui/source/options/optasian.cxx | 2
cui/source/options/optdict.cxx | 4
cui/source/options/optgdlg.cxx | 8
cui/source/options/optlingu.cxx | 6
cui/source/tabpages/autocdlg.cxx | 2
cui/source/tabpages/chardlg.cxx | 6
cui/source/tabpages/page.cxx | 14
cui/source/tabpages/paragrph.cxx | 10
cui/source/tabpages/textattr.cxx | 2
cui/source/tabpages/tpbitmap.cxx | 4
cui/source/tabpages/tpline.cxx | 4
dbaccess/source/ui/browser/unodatbr.cxx | 2
editeng/source/accessibility/AccessibleContextBase.cxx | 18
filter/source/msfilter/escherex.cxx | 2
filter/source/msfilter/msdffimp.cxx | 14
filter/source/msfilter/svdfppt.cxx | 6
include/editeng/AccessibleContextBase.hxx | 8
include/svx/AccessibleControlShape.hxx | 4
include/svx/AccessibleShape.hxx | 6
include/svx/AccessibleTableShape.hxx | 14
include/svx/AccessibleTextHelper.hxx | 14
include/svx/EnhancedCustomShape2d.hxx | 40 +-
include/svx/EnhancedCustomShapeGeometry.hxx | 8
include/svx/IAccessibleParent.hxx | 4
include/svx/algitem.hxx | 24 -
include/svx/bmpmask.hxx | 6
include/svx/charmap.hxx | 16
include/svx/checklbx.hxx | 6
include/svx/clipboardctl.hxx | 2
include/svx/contdlg.hxx | 4
include/svx/ctredlin.hxx | 84 ++--
include/svx/cube3d.hxx | 10
include/svx/dataaccessdescriptor.hxx | 4
include/svx/dbaexchange.hxx | 10
include/svx/dbaobjectex.hxx | 4
include/svx/dbtoolsclient.hxx | 6
include/svx/deflt3d.hxx | 80 ++--
include/svx/dlgctrl.hxx | 18
include/svx/extrud3d.hxx | 10
include/svx/fillctrl.hxx | 4
include/svx/float3d.hxx | 14
include/svx/fmgridcl.hxx | 12
include/svx/fmgridif.hxx | 22 -
include/svx/fmmodel.hxx | 18
include/svx/fmpage.hxx | 2
include/svx/fmsearch.hxx | 2
include/svx/fmshell.hxx | 16
include/svx/fmsrccfg.hxx | 86 ++--
include/svx/fmsrcimp.hxx | 84 ++--
include/svx/fmtools.hxx | 12
include/svx/fmview.hxx | 10
include/svx/fntctrl.hxx | 2
include/svx/galctrl.hxx | 4
include/svx/gallery.hxx | 32 -
include/svx/gallery1.hxx | 38 +-
include/svx/galmisc.hxx | 14
include/svx/galtheme.hxx | 60 +--
include/svx/graphctl.hxx | 18
include/svx/gridctrl.hxx | 108 ++---
include/svx/hdft.hxx | 8
include/svx/imapdlg.hxx | 4
include/svx/insctrl.hxx | 2
include/svx/ipolypolygoneditorcontroller.hxx | 8
include/svx/itemwin.hxx | 24 -
include/svx/langbox.hxx | 20 -
include/svx/lathe3d.hxx | 12
include/svx/linectrl.hxx | 10
include/svx/nbdtmg.hxx | 62 +--
include/svx/numvset.hxx | 12
include/svx/obj3d.hxx | 18
include/svx/optgrid.hxx | 26 -
include/svx/pagectrl.hxx | 36 -
include/svx/pageitem.hxx | 6
include/svx/paraprev.hxx | 4
include/svx/passwd.hxx | 4
include/svx/polygn3d.hxx | 10
include/svx/relfld.hxx | 14
include/svx/rubydialog.hxx | 6
include/svx/ruler.hxx | 34 -
include/svx/rulritem.hxx | 24 -
include/svx/scene3d.hxx | 20 -
include/svx/sdasitm.hxx | 4
include/svx/sdginitm.hxx | 2
include/svx/sdooitm.hxx | 2
include/svx/sdr/properties/attributeproperties.hxx | 4
include/svx/sdr/properties/captionproperties.hxx | 2
include/svx/sdr/properties/circleproperties.hxx | 2
include/svx/sdr/properties/connectorproperties.hxx | 2
include/svx/sdr/properties/customshapeproperties.hxx | 4
include/svx/sdr/properties/defaultproperties.hxx | 4
include/svx/sdr/properties/e3dcompoundproperties.hxx | 2
include/svx/sdr/properties/e3dproperties.hxx | 2
include/svx/sdr/properties/e3dsceneproperties.hxx | 4
include/svx/sdr/properties/emptyproperties.hxx | 4
include/svx/sdr/properties/graphicproperties.hxx | 2
include/svx/sdr/properties/groupproperties.hxx | 6
include/svx/sdr/properties/measureproperties.hxx | 2
include/svx/sdr/properties/properties.hxx | 8
include/svx/sdr/properties/rectangleproperties.hxx | 2
include/svx/sdr/properties/textproperties.hxx | 2
include/svx/sdr/table/tablecontroller.hxx | 16
include/svx/sdrpaintwindow.hxx | 4
include/svx/sdshitm.hxx | 2
include/svx/sdtagitm.hxx | 4
include/svx/sdtaiitm.hxx | 4
include/svx/sdtcfitm.hxx | 2
include/svx/sdtfchim.hxx | 2
include/svx/sdynitm.hxx | 2
include/svx/sphere3d.hxx | 2
include/svx/srchdlg.hxx | 28 -
include/svx/svdcrtv.hxx | 66 +--
include/svx/svddrgv.hxx | 92 ++--
include/svx/svdedtv.hxx | 138 +++----
include/svx/svdedxv.hxx | 42 +-
include/svx/svdetc.hxx | 14
include/svx/svdglev.hxx | 28 -
include/svx/svdhdl.hxx | 68 +--
include/svx/svdhlpln.hxx | 2
include/svx/svdmark.hxx | 62 +--
include/svx/svdmodel.hxx | 27 -
include/svx/svdmrkv.hxx | 148 +++----
include/svx/svdoashp.hxx | 34 -
include/svx/svdoattr.hxx | 4
include/svx/svdobj.hxx | 12
include/svx/svdocapt.hxx | 12
include/svx/svdocirc.hxx | 2
include/svx/svdoedge.hxx | 40 +-
include/svx/svdograf.hxx | 4
include/svx/svdogrp.hxx | 2
include/svx/svdomeas.hxx | 10
include/svx/svdoole2.hxx | 18
include/svx/svdopath.hxx | 26 -
include/svx/svdorect.hxx | 2
include/svx/svdotable.hxx | 10
include/svx/svdotext.hxx | 46 +-
include/svx/svdouno.hxx | 6
include/svx/svdovirt.hxx | 2
include/svx/svdpage.hxx | 2
include/svx/svdpagv.hxx | 24 -
include/svx/svdpntv.hxx | 78 ++--
include/svx/svdpoev.hxx | 12
include/svx/svdpool.hxx | 2
include/svx/svdsnpv.hxx | 90 ++--
include/svx/svdsob.hxx | 12
include/svx/svdundo.hxx | 6
include/svx/svdview.hxx | 32 -
include/svx/svdviter.hxx | 8
include/svx/svdxcgv.hxx | 18
include/svx/svx3ditems.hxx | 38 +-
include/svx/svxdlg.hxx | 34 -
include/svx/swframeexample.hxx | 8
include/svx/sxcaitm.hxx | 2
include/svx/sxcecitm.hxx | 2
include/svx/sxcllitm.hxx | 2
include/svx/tbcontrl.hxx | 4
include/svx/tbxalign.hxx | 2
include/svx/tbxctl.hxx | 2
include/svx/tbxcustomshapes.hxx | 2
include/svx/txencbox.hxx | 6
include/svx/view3d.hxx | 4
reportdesign/source/core/sdr/RptModel.cxx | 2
reportdesign/source/core/sdr/RptObject.cxx | 4
reportdesign/source/ui/report/ReportSection.cxx | 6
reportdesign/source/ui/report/SectionView.cxx | 4
reportdesign/source/ui/report/ViewsWindow.cxx | 4
reportdesign/source/ui/report/dlgedfunc.cxx | 8
sc/source/core/data/drwlayer.cxx | 2
sc/source/core/data/postit.cxx | 4
sc/source/core/tool/detfunc.cxx | 2
sc/source/filter/excel/xiescher.cxx | 4
sc/source/ui/Accessibility/AccessibleDocument.cxx | 8
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 4
sc/source/ui/Accessibility/AccessibleEditObject.cxx | 2
sc/source/ui/dbgui/scuiasciiopt.cxx | 2
sc/source/ui/drawfunc/drawsh.cxx | 2
sc/source/ui/drawfunc/drawsh2.cxx | 2
sc/source/ui/drawfunc/drawsh5.cxx | 4
sc/source/ui/drawfunc/drtxtob.cxx | 2
sc/source/ui/drawfunc/fuconpol.cxx | 4
sc/source/ui/drawfunc/fudraw.cxx | 8
sc/source/ui/drawfunc/futext.cxx | 10
sc/source/ui/inc/drawview.hxx | 24 -
sc/source/ui/view/drawview.cxx | 18
sc/source/ui/view/notemark.cxx | 2
sc/source/ui/view/tabview5.cxx | 2
sc/source/ui/view/tabvwsh2.cxx | 2
sd/source/core/drawdoc.cxx | 6
sd/source/core/drawdoc3.cxx | 2
sd/source/core/drawdoc4.cxx | 8
sd/source/core/sdpage.cxx | 24 -
sd/source/core/stlpool.cxx | 4
sd/source/filter/ppt/pptin.cxx | 16
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 4
sd/source/ui/animations/CustomAnimationPane.cxx | 2
sd/source/ui/animations/motionpathtag.cxx | 28 -
sd/source/ui/animations/motionpathtag.hxx | 8
sd/source/ui/annotations/annotationtag.cxx | 6
sd/source/ui/app/optsitem.cxx | 8
sd/source/ui/app/sdxfer.cxx | 2
sd/source/ui/dlg/dlgass.cxx | 6
sd/source/ui/docshell/docshel4.cxx | 6
sd/source/ui/func/fucon3d.cxx | 2
sd/source/ui/func/fuconbez.cxx | 8
sd/source/ui/func/fuconcs.cxx | 2
sd/source/ui/func/fuconrec.cxx | 10
sd/source/ui/func/fudraw.cxx | 50 +-
sd/source/ui/func/fuediglu.cxx | 18
sd/source/ui/func/fuexpand.cxx | 2
sd/source/ui/func/fuformatpaintbrush.cxx | 6
sd/source/ui/func/fuinsert.cxx | 2
sd/source/ui/func/fupage.cxx | 2
sd/source/ui/func/fupoor.cxx | 4
sd/source/ui/func/fusel.cxx | 12
sd/source/ui/func/futext.cxx | 44 +-
sd/source/ui/inc/View.hxx | 16
sd/source/ui/inc/drawview.hxx | 2
sd/source/ui/inc/optsitem.hxx | 8
sd/source/ui/table/tablefunction.cxx | 6
sd/source/ui/unoidl/unoobj.cxx | 2
sd/source/ui/unoidl/unopage.cxx | 12
sd/source/ui/view/Outliner.cxx | 4
sd/source/ui/view/drawview.cxx | 2
sd/source/ui/view/drviews1.cxx | 2
sd/source/ui/view/drviews2.cxx | 20 -
sd/source/ui/view/drviews3.cxx | 2
sd/source/ui/view/drviews5.cxx | 4
sd/source/ui/view/drviews7.cxx | 12
sd/source/ui/view/drviewsa.cxx | 4
sd/source/ui/view/drviewse.cxx | 6
sd/source/ui/view/drviewsj.cxx | 16
sd/source/ui/view/frmview.cxx | 12
sd/source/ui/view/sdview.cxx | 28 -
sd/source/ui/view/sdview2.cxx | 4
sd/source/ui/view/sdview3.cxx | 4
sd/source/ui/view/viewoverlaymanager.cxx | 6
sd/source/ui/view/viewshel.cxx | 12
svx/source/accessibility/AccessibleControlShape.cxx | 6
svx/source/accessibility/AccessibleShape.cxx | 20 -
svx/source/accessibility/AccessibleTextHelper.cxx | 10
svx/source/accessibility/ChildrenManagerImpl.cxx | 6
svx/source/accessibility/ChildrenManagerImpl.hxx | 2
svx/source/accessibility/charmapacc.cxx | 2
svx/source/customshapes/EnhancedCustomShape2d.cxx | 24 -
svx/source/customshapes/EnhancedCustomShape3d.cxx | 26 -
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 2
svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 2
svx/source/customshapes/EnhancedCustomShapeGeometry.cxx | 12
svx/source/customshapes/tbxcustomshapes.cxx | 2
svx/source/dialog/_bmpmask.cxx | 6
svx/source/dialog/_contdlg.cxx | 10
svx/source/dialog/charmap.cxx | 32 -
svx/source/dialog/checklbx.cxx | 8
svx/source/dialog/contwnd.cxx | 8
svx/source/dialog/ctredlin.cxx | 102 ++---
svx/source/dialog/dlgctrl.cxx | 12
svx/source/dialog/fntctrl.cxx | 12
svx/source/dialog/graphctl.cxx | 32 -
svx/source/dialog/grfflt.cxx | 4
svx/source/dialog/hdft.cxx | 16
svx/source/dialog/imapdlg.cxx | 14
svx/source/dialog/imapwnd.cxx | 8
svx/source/dialog/langbox.cxx | 16
svx/source/dialog/optgrid.cxx | 26 -
svx/source/dialog/pagectrl.cxx | 24 -
svx/source/dialog/paraprev.cxx | 4
svx/source/dialog/passwd.cxx | 2
svx/source/dialog/relfld.cxx | 20 -
svx/source/dialog/rubydialog.cxx | 10
svx/source/dialog/rulritem.cxx | 28 -
svx/source/dialog/srchdlg.cxx | 66 +--
svx/source/dialog/svxbmpnumvalueset.cxx | 8
svx/source/dialog/svxruler.cxx | 88 ++--
svx/source/dialog/swframeexample.cxx | 2
svx/source/dialog/txencbox.cxx | 8
svx/source/engine3d/cube3d.cxx | 4
svx/source/engine3d/deflt3d.cxx | 26 -
svx/source/engine3d/dragmt3d.cxx | 2
svx/source/engine3d/float3d.cxx | 202 +++++-----
svx/source/engine3d/lathe3d.cxx | 2
svx/source/engine3d/obj3d.cxx | 2
svx/source/engine3d/polygn3d.cxx | 6
svx/source/engine3d/sphere3d.cxx | 2
svx/source/engine3d/svx3ditems.cxx | 38 +-
svx/source/engine3d/view3d.cxx | 36 -
svx/source/engine3d/view3d1.cxx | 2
svx/source/fmcomp/dbaexchange.cxx | 38 +-
svx/source/fmcomp/dbaobjectex.cxx | 14
svx/source/fmcomp/fmgridcl.cxx | 46 +-
svx/source/fmcomp/fmgridif.cxx | 24 -
svx/source/fmcomp/gridctrl.cxx | 206 +++++------
svx/source/form/dataaccessdescriptor.cxx | 4
svx/source/form/dbtoolsclient.cxx | 10
svx/source/form/fmmodel.cxx | 16
svx/source/form/fmpage.cxx | 10
svx/source/form/fmshell.cxx | 12
svx/source/form/fmshimp.cxx | 16
svx/source/form/fmsrccfg.cxx | 22 -
svx/source/form/fmsrcimp.cxx | 112 ++---
svx/source/form/fmtools.cxx | 12
svx/source/form/fmview.cxx | 14
svx/source/form/fmvwimp.cxx | 4
svx/source/form/navigatortree.cxx | 8
svx/source/gallery2/galbrws1.cxx | 2
svx/source/gallery2/galbrws2.cxx | 2
svx/source/gallery2/galctrl.cxx | 6
svx/source/gallery2/galexpl.cxx | 54 +-
svx/source/gallery2/gallery1.cxx | 56 +-
svx/source/gallery2/galmisc.cxx | 40 +-
svx/source/gallery2/galtheme.cxx | 98 ++---
svx/source/items/algitem.cxx | 18
svx/source/items/pageitem.cxx | 2
svx/source/mnuctrls/clipboardctl.cxx | 4
svx/source/sdr/properties/attributeproperties.cxx | 26 -
svx/source/sdr/properties/captionproperties.cxx | 2
svx/source/sdr/properties/circleproperties.cxx | 2
svx/source/sdr/properties/connectorproperties.cxx | 2
svx/source/sdr/properties/customshapeproperties.cxx | 4
svx/source/sdr/properties/defaultproperties.cxx | 6
svx/source/sdr/properties/e3dcompoundproperties.cxx | 2
svx/source/sdr/properties/e3dproperties.cxx | 2
svx/source/sdr/properties/e3dsceneproperties.cxx | 4
svx/source/sdr/properties/emptyproperties.cxx | 6
svx/source/sdr/properties/graphicproperties.cxx | 4
svx/source/sdr/properties/groupproperties.cxx | 8
svx/source/sdr/properties/measureproperties.cxx | 2
svx/source/sdr/properties/properties.cxx | 4
svx/source/sdr/properties/rectangleproperties.cxx | 2
svx/source/sdr/properties/textproperties.cxx | 6
svx/source/sidebar/nbdtmg.cxx | 148 ++++---
svx/source/stbctrls/insctrl.cxx | 2
svx/source/svdraw/svdattr.cxx | 6
svx/source/svdraw/svdcrtv.cxx | 56 +-
svx/source/svdraw/svddrgv.cxx | 110 ++---
svx/source/svdraw/svdedtv.cxx | 58 +--
svx/source/svdraw/svdedtv1.cxx | 80 ++--
svx/source/svdraw/svdedtv2.cxx | 80 ++--
svx/source/svdraw/svdedxv.cxx | 124 +++---
svx/source/svdraw/svdetc.cxx | 24 -
svx/source/svdraw/svdglev.cxx | 63 +--
svx/source/svdraw/svdhdl.cxx | 80 ++--
svx/source/svdraw/svdibrow.cxx | 2
svx/source/svdraw/svdlayer.cxx | 6
svx/source/svdraw/svdmark.cxx | 102 ++---
svx/source/svdraw/svdmodel.cxx | 43 --
svx/source/svdraw/svdmrkv.cxx | 144 +++----
svx/source/svdraw/svdmrkv1.cxx | 112 ++---
svx/source/svdraw/svdoashp.cxx | 128 +++---
svx/source/svdraw/svdoattr.cxx | 6
svx/source/svdraw/svdobj.cxx | 12
svx/source/svdraw/svdocapt.cxx | 12
svx/source/svdraw/svdocirc.cxx | 4
svx/source/svdraw/svdoedge.cxx | 26 -
svx/source/svdraw/svdograf.cxx | 2
svx/source/svdraw/svdogrp.cxx | 2
svx/source/svdraw/svdomeas.cxx | 14
svx/source/svdraw/svdoole2.cxx | 70 +--
svx/source/svdraw/svdopath.cxx | 24 -
svx/source/svdraw/svdorect.cxx | 4
svx/source/svdraw/svdotext.cxx | 162 ++++----
svx/source/svdraw/svdotextpathdecomposition.cxx | 2
svx/source/svdraw/svdotxed.cxx | 14
svx/source/svdraw/svdotxtr.cxx | 8
svx/source/svdraw/svdouno.cxx | 4
svx/source/svdraw/svdovirt.cxx | 2
svx/source/svdraw/svdpagv.cxx | 36 -
svx/source/svdraw/svdpntv.cxx | 38 +-
svx/source/svdraw/svdpoev.cxx | 16
svx/source/svdraw/svdsnpv.cxx | 40 +-
svx/source/svdraw/svdundo.cxx | 34 -
svx/source/svdraw/svdview.cxx | 132 +++----
svx/source/svdraw/svdviter.cxx | 18
svx/source/svdraw/svdxcgv.cxx | 64 +--
svx/source/table/accessiblecell.cxx | 16
svx/source/table/accessiblecell.hxx | 4
svx/source/table/accessibletableshape.cxx | 18
svx/source/table/cell.cxx | 6
svx/source/table/svdotable.cxx | 20 -
svx/source/table/tablecontroller.cxx | 60 +--
svx/source/tbxctrls/fillctrl.cxx | 10
svx/source/tbxctrls/itemwin.cxx | 30 -
svx/source/tbxctrls/linectrl.cxx | 12
svx/source/tbxctrls/tbcontrl.cxx | 8
svx/source/tbxctrls/tbxdrctl.cxx | 2
svx/source/unodraw/unopage.cxx | 4
svx/source/unodraw/unoshap2.cxx | 10
svx/source/unodraw/unoshtxt.cxx | 2
sw/inc/accmap.hxx | 4
sw/source/core/access/accmap.cxx | 8
sw/source/core/doc/docdesc.cxx | 2
sw/source/core/doc/docdraw.cxx | 2
sw/source/core/draw/dcontact.cxx | 2
sw/source/core/draw/drawdoc.cxx | 2
sw/source/core/draw/dview.cxx | 24 -
sw/source/core/frmedt/fecopy.cxx | 2
sw/source/core/frmedt/fefly1.cxx | 4
sw/source/core/frmedt/feshview.cxx | 16
sw/source/core/inc/dview.hxx | 2
sw/source/core/uibase/app/appopt.cxx | 2
sw/source/core/uibase/dialog/SwSpellDialogChildWindow.cxx | 4
sw/source/core/uibase/docvw/SidebarTxtControlAcc.cxx | 4
sw/source/core/uibase/docvw/edtwin.cxx | 2
sw/source/core/uibase/frmdlg/colex.cxx | 16
sw/source/core/uibase/inc/colex.hxx | 8
sw/source/core/uibase/lingu/sdrhhcwrap.cxx | 6
sw/source/core/uibase/misc/redlndlg.cxx | 8
sw/source/core/uibase/ribbar/concustomshape.cxx | 2
sw/source/core/uibase/ribbar/conform.cxx | 8
sw/source/core/uibase/ribbar/conrect.cxx | 10
sw/source/core/uibase/ribbar/drawbase.cxx | 14
sw/source/core/uibase/ribbar/inputwin.cxx | 8
sw/source/core/uibase/shells/drawdlg.cxx | 10
sw/source/core/uibase/shells/drawsh.cxx | 2
sw/source/core/uibase/shells/drwtxtex.cxx | 4
sw/source/core/uibase/shells/drwtxtsh.cxx | 2
sw/source/core/uibase/shells/textdrw.cxx | 2
sw/source/core/uibase/shells/textfld.cxx | 4
sw/source/core/uibase/uiview/pview.cxx | 2
sw/source/core/uibase/uiview/view.cxx | 8
sw/source/core/uibase/uiview/view1.cxx | 8
sw/source/core/uibase/uiview/viewdraw.cxx | 6
sw/source/core/uibase/uiview/viewtab.cxx | 9
sw/source/core/uibase/utlui/content.cxx | 2
sw/source/core/view/viewimp.cxx | 4
sw/source/core/view/viewsh.cxx | 6
sw/source/core/view/vnew.cxx | 2
sw/source/filter/html/htmldraw.cxx | 8
sw/source/filter/ww8/ww8par.cxx | 10
sw/source/ui/config/optcomp.cxx | 2
sw/source/ui/dialog/ascfldlg.cxx | 2
sw/source/ui/dialog/uiregionsw.cxx | 2
sw/source/ui/index/cnttab.cxx | 2
sw/source/ui/misc/srtdlg.cxx | 2
sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 8
442 files changed, 4035 insertions(+), 4039 deletions(-)
New commits:
commit 1b8d1001c4a92c8788266215fdd14e301b0a0d04
Author: Noel Grandin <noel at peralex.com>
Date: Tue Mar 11 08:15:40 2014 +0200
svx: sal_Bool->bool
Change-Id: Ia7db5746fa5d8f60111d10d09865120981956947
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index f4de176..b63fd1cb 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -270,7 +270,7 @@ class SVX_DLLPUBLIC SvxColorExtToolBoxControl : public SfxToolBoxControl
::svx::ToolboxButtonColorUpdater* pBtnUpdater;
Color mLastColor;
- sal_Bool bChoiceFromPalette;
+ bool bChoiceFromPalette;
public:
SFX_DECL_TOOLBOX_CONTROL();
@@ -281,7 +281,7 @@ public:
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
- virtual void Select( sal_Bool bMod1 = sal_False );
+ virtual void Select( bool bMod1 = false );
};
diff --git a/include/svx/tbxalign.hxx b/include/svx/tbxalign.hxx
index f741da4..2526362 100644
--- a/include/svx/tbxalign.hxx
+++ b/include/svx/tbxalign.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC SvxTbxCtlAlign: public SfxToolBoxControl
{
public:
- virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException, std::exception);
diff --git a/include/svx/tbxctl.hxx b/include/svx/tbxctl.hxx
index ba36503..9413a91 100644
--- a/include/svx/tbxctl.hxx
+++ b/include/svx/tbxctl.hxx
@@ -44,7 +44,7 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
- virtual void Select( sal_Bool bMod1 = sal_False );
+ virtual void Select( bool bMod1 = false );
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
diff --git a/include/svx/tbxcustomshapes.hxx b/include/svx/tbxcustomshapes.hxx
index c47457e..578b678 100644
--- a/include/svx/tbxcustomshapes.hxx
+++ b/include/svx/tbxcustomshapes.hxx
@@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SvxTbxCtlCustomShapes : public SfxToolBoxControl
{
public:
using SfxToolBoxControl::Select;
- virtual void Select( sal_Bool bMod1 = sal_False );
+ virtual void Select( bool bMod1 = false );
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index 92bc35b..a63ef94 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -52,7 +52,7 @@ public:
RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
<TRUE/> whenever the box is used in import dialogs. */
void FillFromTextEncodingTable(
- sal_Bool bExcludeImportSubsets = sal_False,
+ bool bExcludeImportSubsets = false,
sal_uInt32 nExcludeInfoFlags = 0,
sal_uInt32 nButIncludeInfoFlags = 0
);
@@ -73,7 +73,7 @@ public:
RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
<TRUE/> whenever the box is used in import dialogs. */
void FillFromDbTextEncodingMap(
- sal_Bool bExcludeImportSubsets = sal_False,
+ bool bExcludeImportSubsets = false,
sal_uInt32 nExcludeInfoFlags = 0,
sal_uInt32 nButIncludeInfoFlags = 0
);
@@ -94,7 +94,7 @@ public:
sal_Int32 nPos = LISTBOX_APPEND );
void SelectTextEncoding( const rtl_TextEncoding nEnc,
- sal_Bool bSelect = sal_True );
+ bool bSelect = true );
rtl_TextEncoding GetSelectTextEncoding() const;
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 04b2483..e622153 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -390,7 +390,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,OUString aDatName,
// *** text encoding ListBox ***
// all encodings allowed, including Unicode, but subsets are excluded
- pLbCharSet->FillFromTextEncodingTable( sal_True );
+ pLbCharSet->FillFromTextEncodingTable( true );
// Insert one "SYSTEM" entry for compatibility in AsciiOptions and system
// independent document linkage.
pLbCharSet->InsertTextEncoding( RTL_TEXTENCODING_DONTKNOW, aCharSetUser );
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index f2dc0af..be13fd2 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -128,7 +128,7 @@ SfxPopupWindow* SvxTbxCtlCustomShapes::CreatePopupWindow()
-void SvxTbxCtlCustomShapes::Select( sal_Bool /*bMod1*/ )
+void SvxTbxCtlCustomShapes::Select( bool /*bMod1*/ )
{
if ( !m_aCommand.isEmpty() )
{
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index a0796d3..331d90b 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -81,7 +81,7 @@ sal_Int32 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
void SvxTextEncodingBox::FillFromTextEncodingTable(
- sal_Bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
+ bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
sal_uInt32 nButIncludeInfoFlags )
{
rtl_TextEncodingInfo aInfo;
@@ -131,7 +131,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
void SvxTextEncodingBox::FillFromDbTextEncodingMap(
- sal_Bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
+ bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
sal_uInt32 nButIncludeInfoFlags )
{
#ifdef DISABLE_DBCONNECTIVITY
@@ -193,7 +193,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
void SvxTextEncodingBox::FillWithMimeAndSelectBest()
{
- FillFromTextEncodingTable( sal_False, 0xffffffff, RTL_TEXTENCODING_INFO_MIME );
+ FillFromTextEncodingTable( false, 0xffffffff, RTL_TEXTENCODING_INFO_MIME );
rtl_TextEncoding nEnc = SvtSysLocale::GetBestMimeEncoding();
SelectTextEncoding( nEnc );
}
@@ -232,7 +232,7 @@ rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const
-void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, sal_Bool bSelect )
+void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, bool bSelect )
{
sal_Int32 nAt = EncodingToPos_Impl( nEnc );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index fd31acf..5a7cec2 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2471,7 +2471,7 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
mLastColor( COL_AUTO )
{
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
- bChoiceFromPalette = sal_False;
+ bChoiceFromPalette = false;
// The following commands are available at the various modules
switch( nSlotId )
@@ -2548,7 +2548,7 @@ SfxPopupWindow* SvxColorExtToolBoxControl::CreatePopupWindow()
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
pColorWin->StartSelection();
SetPopupWindow( pColorWin );
- bChoiceFromPalette = sal_True;
+ bChoiceFromPalette = true;
return pColorWin;
}
@@ -2568,7 +2568,7 @@ void SvxColorExtToolBoxControl::StateChanged(
if (bChoiceFromPalette)
{
- bChoiceFromPalette = sal_False;
+ bChoiceFromPalette = false;
const SvxColorItem* pItem = 0;
if ( SFX_ITEM_DONTCARE != eState )
@@ -2585,7 +2585,7 @@ void SvxColorExtToolBoxControl::StateChanged(
-void SvxColorExtToolBoxControl::Select( sal_Bool )
+void SvxColorExtToolBoxControl::Select( bool )
{
OUString aCommand;
OUString aParamName;
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index cac037a..84ed883 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -101,7 +101,7 @@ void SvxTbxCtlDraw::toggleToolbox()
-void SvxTbxCtlDraw::Select( sal_Bool )
+void SvxTbxCtlDraw::Select( bool )
{
toggleToolbox();
}
commit e60fe3c7443eb2bbfdb57eab6cd9b62896b526af
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 10 16:26:58 2014 +0200
svx: sal_Bool->bool
Change-Id: I25415a15abc5c65eeca106b1f444fb9711e8ce4a
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index b54cda0..b64c7a4 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -434,7 +434,7 @@ void AbstractSpellDialog_Impl::SetLanguage( sal_uInt16 nLang )
pDlg->SetLanguage(nLang);
}
-sal_Bool AbstractSpellDialog_Impl::Close()
+bool AbstractSpellDialog_Impl::Close()
{
return pDlg->Close();
}
@@ -558,7 +558,7 @@ Size AbstractSvxHlinkDlgMarkWnd_Impl::GetSizePixel() const
return pDlg->GetSizePixel();
}
-sal_Bool AbstractSvxHlinkDlgMarkWnd_Impl::IsVisible( ) const
+bool AbstractSvxHlinkDlgMarkWnd_Impl::IsVisible( ) const
{
return (( Window* )pDlg)->IsVisible();
}
@@ -568,12 +568,12 @@ void AbstractSvxHlinkDlgMarkWnd_Impl::Invalidate( sal_uInt16 nFlags )
(( Window* )pDlg)->Invalidate(nFlags);
}
-sal_Bool AbstractSvxHlinkDlgMarkWnd_Impl::MoveTo( Point aNewPos )const
+bool AbstractSvxHlinkDlgMarkWnd_Impl::MoveTo( Point aNewPos )const
{
return pDlg->MoveTo(aNewPos);
}
-sal_Bool AbstractSvxHlinkDlgMarkWnd_Impl::ConnectToDialog( sal_Bool bDoit )const
+bool AbstractSvxHlinkDlgMarkWnd_Impl::ConnectToDialog( bool bDoit )const
{
return pDlg->ConnectToDialog(bDoit);
}
@@ -608,7 +608,7 @@ sal_uInt16 AbstractSvxSearchSimilarityDialog_Impl::GetLonger()
return pDlg->GetLonger();
}
-sal_Bool AbstractSvxSearchSimilarityDialog_Impl::IsRelaxed()
+bool AbstractSvxSearchSimilarityDialog_Impl::IsRelaxed()
{
return pDlg->IsRelaxed();
}
@@ -853,7 +853,7 @@ Window * AbstractSvxHpLinkDlg_Impl::GetWindow()
return (Window *)pDlg;
}
-sal_Bool AbstractSvxHpLinkDlg_Impl::QueryClose()
+bool AbstractSvxHpLinkDlg_Impl::QueryClose()
{
return pDlg->QueryClose();
}
@@ -920,7 +920,7 @@ const SfxItemSet* AbstractSvxPostItDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
}
-void AbstractSvxPostItDialog_Impl::EnableTravel(sal_Bool bNext, sal_Bool bPrev)
+void AbstractSvxPostItDialog_Impl::EnableTravel(bool bNext, bool bPrev)
{
pDlg->EnableTravel( bNext, bPrev );
}
@@ -944,11 +944,11 @@ void AbstractSvxPostItDialog_Impl::HideAuthor()
{
pDlg->HideAuthor();
}
-void AbstractSvxPostItDialog_Impl::SetReadonlyPostIt(sal_Bool bDisable)
+void AbstractSvxPostItDialog_Impl::SetReadonlyPostIt(bool bDisable)
{
pDlg->SetReadonlyPostIt( bDisable );
}
-sal_Bool AbstractSvxPostItDialog_Impl::IsOkEnabled() const
+bool AbstractSvxPostItDialog_Impl::IsOkEnabled() const
{
return pDlg->IsOkEnabled();
}
@@ -1329,7 +1329,7 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDial
}
AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( Window* pParent,
- sal_Bool bRelax,
+ bool bRelax,
sal_uInt16 nOther,
sal_uInt16 nShorter,
sal_uInt16 nLonger)
@@ -1342,7 +1342,7 @@ AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchS
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( Window* pParent,
const SfxItemSet& rCoreSet,
- sal_Bool bEnableSelector)
+ bool bEnableSelector)
{
SfxTabDialog* pDlg = new SvxBorderBackgroundDlg( pParent, rCoreSet, bEnableSelector);
return new CuiAbstractTabDialog_Impl( pDlg );
@@ -1454,13 +1454,13 @@ AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window*
return new AbstractSvxMessDialog_Impl( pDlg );
}
-AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed )
+AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog( Window* pParent, bool bEmptyAllowed )
{
SvxMultiPathDialog* pDlg = new SvxMultiPathDialog( pParent, bEmptyAllowed );
return new AbstractSvxMultiPathDialog_Impl( pDlg );
}
-AbstractSvxMultiFileDialog * AbstractDialogFactory_Impl::CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed )
+AbstractSvxMultiFileDialog * AbstractDialogFactory_Impl::CreateSvxMultiFileDialog( Window* pParent, bool bEmptyAllowed )
{
SvxMultiFileDialog* pDlg = new SvxMultiFileDialog( pParent, bEmptyAllowed );
return new AbstractSvxMultiFileDialog_Impl( pDlg );
@@ -1529,7 +1529,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSmo
}
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (Window* pParent,
- const Graphic& rGraphic, sal_uInt8 nGreyThreshold, sal_Bool bInvert)
+ const Graphic& rGraphic, sal_uInt8 nGreyThreshold, bool bInvert)
{
GraphicFilterDialog* pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert );
return new AbstractGraphicFilterDialog_Impl( pDlg );
@@ -1537,7 +1537,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSol
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (Window* pParent,
const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight,
- sal_Bool bEnhanceEdges)
+ bool bEnhanceEdges)
{
GraphicFilterDialog* pDlg = new GraphicFilterMosaic(pParent, rGraphic, nTileWidth, nTileHeight, bEnhanceEdges);
return new AbstractGraphicFilterDialog_Impl( pDlg );
@@ -1555,7 +1555,7 @@ AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( Wi
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
SdrModel* pModel,
const SdrObject* pObj ,
- sal_Bool bHasObj)
+ bool bHasObj)
{
SfxTabDialog* pDlg = new SvxLineTabDialog( pParent, pAttr, pModel,pObj,bHasObj );
return new CuiAbstractTabDialog_Impl( pDlg );
@@ -1616,7 +1616,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( Window* pParent,
const SfxItemSet& rCoreSet,
- sal_Bool bPrevNext )
+ bool bPrevNext )
{
SvxPostItDialog* pDlg = new SvxPostItDialog( pParent, rCoreSet, bPrevNext );
return new AbstractSvxPostItDialog_Impl( pDlg );
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 4f90936..ee41b25 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -207,7 +207,7 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog
public:
DECL_ABSTDLG_BASE(AbstractSpellDialog_Impl, svx::SpellDialog)
virtual void SetLanguage( sal_uInt16 nLang );
- virtual sal_Bool Close();
+ virtual bool Close();
virtual void Invalidate();
virtual Window* GetWindow();
virtual SfxBindings& GetBindings();
@@ -279,12 +279,12 @@ class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd
{
DECL_ABSTDLG_BASE(AbstractSvxHlinkDlgMarkWnd_Impl,SvxHlinkDlgMarkWnd)
virtual void Hide() SAL_OVERRIDE;
- virtual sal_Bool IsVisible() const ;
+ virtual bool IsVisible() const ;
virtual void Invalidate( sal_uInt16 nFlags = 0 );
virtual void SetSizePixel( const Size& rNewSize );
virtual Size GetSizePixel() const;
- virtual sal_Bool MoveTo ( Point aNewPos )const;
- virtual sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True )const;
+ virtual bool MoveTo( Point aNewPos ) const;
+ virtual bool ConnectToDialog( bool bDoit = true )const;
virtual void RefreshTree ( OUString aStrURL ) ;
virtual void SelectEntry ( OUString aStrMark );
virtual sal_uInt16 SetError( sal_uInt16 nError) ;
@@ -298,7 +298,7 @@ class AbstractSvxSearchSimilarityDialog_Impl :public AbstractSvxSearchSimilarity
virtual sal_uInt16 GetOther();
virtual sal_uInt16 GetShorter();
virtual sal_uInt16 GetLonger();
- virtual sal_Bool IsRelaxed();
+ virtual bool IsRelaxed();
};
class SvxJSearchOptionsDialog;
@@ -424,7 +424,7 @@ class AbstractSvxHpLinkDlg_Impl :public AbstractSvxHpLinkDlg
{
DECL_ABSTDLG_BASE(AbstractSvxHpLinkDlg_Impl,SvxHpLinkDlg)
virtual Window* GetWindow();
- virtual sal_Bool QueryClose();
+ virtual bool QueryClose();
};
class FmSearchDialog;
@@ -489,14 +489,14 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
virtual const SfxItemSet* GetOutputItemSet() const;
virtual void SetPrevHdl( const Link& rLink ) ;
virtual void SetNextHdl( const Link& rLink ) ;
- virtual void EnableTravel(sal_Bool bNext, sal_Bool bPrev) ;
+ virtual void EnableTravel(bool bNext, bool bPrev) ;
virtual OUString GetNote() ;
virtual void SetNote(const OUString& rTxt) ;
virtual void ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) ;
virtual void DontChangeAuthor() ;
virtual void HideAuthor() ;
- virtual void SetReadonlyPostIt(sal_Bool bDisable) ;
- virtual sal_Bool IsOkEnabled() const ;
+ virtual void SetReadonlyPostIt(bool bDisable) ;
+ virtual bool IsOkEnabled() const;
virtual Window * GetWindow();
private:
Link aNextHdl;
@@ -583,7 +583,7 @@ public:
const SfxItemSet& rCoreSet);
virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent,
const SfxItemSet& rCoreSet,
- sal_Bool bEnableSelector = sal_False) ;
+ bool bEnableSelector = false) ;
virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pView,
@@ -620,7 +620,7 @@ public:
SearchAttrItemList& rLst,
const sal_uInt16* pWhRanges);
virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent,
- sal_Bool bRelax,
+ bool bRelax,
sal_uInt16 nOther,
sal_uInt16 nShorter,
sal_uInt16 nLonger);
@@ -643,8 +643,8 @@ public:
virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
const OUString& rText, const OUString& rDesc,
Image* pImg = NULL );
- virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False );
- virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False );
+ virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, bool bEmptyAllowed = false );
+ virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, bool bEmptyAllowed = false );
virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent,
SfxBindings* pBindings,
sal_uInt32 nResId);
@@ -663,10 +663,10 @@ public:
const Graphic& rGraphic, double nRadius);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent,
const Graphic& rGraphic, sal_uInt8 nGreyThreshold,
- sal_Bool bInvert);
+ bool bInvert);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent,
const Graphic& rGraphic, sal_uInt16 nTileWidth, sal_uInt16 nTileHeight,
- sal_Bool bEnhanceEdges);
+ bool bEnhanceEdges);
virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,
const SfxItemSet* pAttr,
SdrModel* pModel,
@@ -674,10 +674,10 @@ public:
virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr,
SdrModel* pModel,
const SdrObject* pObj = NULL,
- sal_Bool bHasObj = sal_True );
+ bool bHasObj = true );
virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent,
const SfxItemSet& rCoreSet,
- sal_Bool bPrevNext = sal_False );
+ bool bPrevNext = false );
// For TabPage
virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId );
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index a67f349..8c5fce0 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -84,7 +84,7 @@ class AbstractSpellDialog : public VclAbstractDialog
{
public:
virtual void SetLanguage( sal_uInt16 nLang ) = 0;
- virtual sal_Bool Close() = 0;
+ virtual bool Close() = 0;
virtual void Invalidate() = 0;
virtual Window* GetWindow() = 0;
virtual SfxBindings& GetBindings() = 0;
@@ -132,8 +132,8 @@ public:
class AbstractSvxHlinkDlgMarkWnd :public VclAbstractDialog
{
public:
- virtual sal_Bool MoveTo ( Point aNewPos )const = 0;
- virtual sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True )const = 0;
+ virtual bool MoveTo ( Point aNewPos )const = 0;
+ virtual bool ConnectToDialog( bool bDoit = true )const = 0;
virtual void RefreshTree ( OUString aStrURL ) = 0;
virtual void SelectEntry ( OUString aStrMark ) = 0;
virtual sal_uInt16 SetError( sal_uInt16 nError) = 0;
@@ -141,7 +141,7 @@ public:
virtual void SetSizePixel( const Size& rNewSize ) = 0;
virtual Size GetSizePixel() const = 0;
virtual void Hide() = 0;
- virtual sal_Bool IsVisible() const = 0;
+ virtual bool IsVisible() const = 0;
virtual void Invalidate( sal_uInt16 nFlags = 0 ) = 0;
};
@@ -159,7 +159,7 @@ public:
virtual sal_uInt16 GetOther() =0 ;
virtual sal_uInt16 GetShorter() =0 ;
virtual sal_uInt16 GetLonger() =0 ;
- virtual sal_Bool IsRelaxed() =0 ;
+ virtual bool IsRelaxed() =0 ;
};
class AbstractSvxJSearchOptionsDialog :public VclAbstractDialog
@@ -236,7 +236,7 @@ class AbstractSvxHpLinkDlg : public VclAbstractDialog
{
public:
virtual Window* GetWindow() = 0;
- virtual sal_Bool QueryClose() = 0;
+ virtual bool QueryClose() = 0;
};
class AbstractFmSearchDialog :public VclAbstractDialog
@@ -276,14 +276,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(sal_Bool bNext, sal_Bool bPrev) = 0;
+ virtual void EnableTravel(bool bNext, bool bPrev) = 0;
virtual OUString GetNote() = 0;
virtual void SetNote(const OUString& rTxt) = 0;
virtual void ShowLastAuthor(const OUString& rAuthor, const OUString& rDate) = 0;
virtual void DontChangeAuthor() = 0;
virtual void HideAuthor() = 0;
- virtual void SetReadonlyPostIt(sal_Bool bDisable) = 0;
- virtual sal_Bool IsOkEnabled() const = 0;
+ virtual void SetReadonlyPostIt(bool bDisable) = 0;
+ virtual bool IsOkEnabled() const = 0;
virtual Window * GetWindow() = 0;
};
@@ -364,13 +364,13 @@ public:
SearchAttrItemList& rLst,
const sal_uInt16* pWhRanges)=0;
virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent,
- sal_Bool bRelax,
+ bool bRelax,
sal_uInt16 nOther,
sal_uInt16 nShorter,
sal_uInt16 nLonger ) = 0;
virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent,
const SfxItemSet& rCoreSet,
- sal_Bool bEnableSelector = sal_False) = 0;
+ bool bEnableSelector = false) = 0;
virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pView,
@@ -402,8 +402,8 @@ public:
const OUString& rText, const OUString& rDesc,
Image* pImg = NULL ) = 0;
- virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ;
- virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ;
+ virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, bool bEmptyAllowed = false ) = 0 ;
+ virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, bool bEmptyAllowed = false ) = 0 ;
virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent,
SfxBindings* pBindings,
sal_uInt32 nResId)=0;
@@ -426,10 +426,10 @@ public:
double nRadius)=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent,
const Graphic& rGraphic,
- sal_uInt8 nGreyThreshold, sal_Bool bInvert)=0;
+ sal_uInt8 nGreyThreshold, bool bInvert)=0;
virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent,
const Graphic& rGraphic,
- sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges)=0;
+ sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges)=0;
virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,
const SfxItemSet* pAttr,
SdrModel* pModel,
@@ -437,7 +437,7 @@ public:
virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
SdrModel* pModel,
const SdrObject* pObj = NULL,
- sal_Bool bHasObj = sal_True )=0;
+ bool bHasObj = true )=0;
virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0;
virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent,
const SfxItemSet& rAttr,
@@ -451,7 +451,7 @@ public:
)=0;
virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent,
const SfxItemSet& rCoreSet,
- sal_Bool bPrevNext = sal_False) = 0;
+ bool bPrevNext = false) = 0;
virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const OUString& rLanguage ) = 0;
virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc() = 0;
diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx
index 07a7c4a..84a421b 100644
--- a/svx/source/dialog/grfflt.cxx
+++ b/svx/source/dialog/grfflt.cxx
@@ -166,7 +166,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic(pWindow, rGraphic, 4, 4, sal_False);
+ AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic(pWindow, rGraphic, 4, 4, false);
DBG_ASSERT(aDlg, "Dialogdiet fail!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -247,7 +247,7 @@ sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObj
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if(pFact)
{
- AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterSolarize(pWindow, rGraphic, 128, sal_False);
+ AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterSolarize(pWindow, rGraphic, 128, false);
DBG_ASSERT(aDlg, "Dialogdiet fail!");
if( aDlg->Execute() == RET_OK )
aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 );
diff --git a/sw/source/core/uibase/misc/redlndlg.cxx b/sw/source/core/uibase/misc/redlndlg.cxx
index a46e9dc..ef31f53 100644
--- a/sw/source/core/uibase/misc/redlndlg.cxx
+++ b/sw/source/core/uibase/misc/redlndlg.cxx
@@ -1077,7 +1077,7 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl)
rRedline.GetRedlineData().GetTimeStamp() ),
SID_ATTR_POSTIT_DATE ));
- AbstractSvxPostItDialog* pDlg = pFact->CreateSvxPostItDialog( pParentDlg, aSet, sal_False );
+ AbstractSvxPostItDialog* pDlg = pFact->CreateSvxPostItDialog( pParentDlg, aSet, false );
OSL_ENSURE(pDlg, "Dialogdiet fail!");
pDlg->HideAuthor();
diff --git a/sw/source/core/uibase/shells/textfld.cxx b/sw/source/core/uibase/shells/textfld.cxx
index 5b336ff..8a8c880 100644
--- a/sw/source/core/uibase/shells/textfld.cxx
+++ b/sw/source/core/uibase/shells/textfld.cxx
@@ -851,7 +851,7 @@ IMPL_LINK( SwTextShell, RedlineNextHdl, AbstractSvxPostItDialog *, pBtn )
pSh->EndAction();
}
- pDlg->EnableTravel(bEnable, sal_True);
+ pDlg->EnableTravel(bEnable, true);
if( pSh->IsCrsrPtAtEnd() )
pSh->SwapPam();
@@ -901,7 +901,7 @@ IMPL_LINK( SwTextShell, RedlinePrevHdl, AbstractSvxPostItDialog *, pBtn )
pSh->EndAction();
}
- pDlg->EnableTravel(sal_True, bEnable);
+ pDlg->EnableTravel(true, bEnable);
pRedline = pSh->GetCurrRedline();
OUString sComment = convertLineEnd(pRedline->GetComment(), GetSystemLineEnd());
commit 2ec560e3e687746735d9debb304e9f64384daa65
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 10 14:58:41 2014 +0200
svx: sal_Bool->bool
Change-Id: I1b692a9ca5f2580b0815b881a33f3eded7267ac1
diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx
index 22aa670..142f01d 100644
--- a/include/svx/svx3ditems.hxx
+++ b/include/svx/svx3ditems.hxx
@@ -62,14 +62,14 @@ public:
class SVX_DLLPUBLIC Svx3DDoubleSidedItem : public SfxBoolItem {
public:
- Svx3DDoubleSidedItem(sal_Bool bVal = 0);
+ Svx3DDoubleSidedItem(bool bVal = false);
};
// #i28528#
// Added extra Item (Bool) for chart2 to be able to show reduced line geometry
class Svx3DReducedLineGeometryItem : public SfxBoolItem {
public:
- Svx3DReducedLineGeometryItem(sal_Bool bVal = 0);
+ Svx3DReducedLineGeometryItem(bool bVal = false);
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
};
@@ -86,7 +86,7 @@ public:
class Svx3DNormalsInvertItem : public SfxBoolItem {
public:
- SVX_DLLPUBLIC Svx3DNormalsInvertItem(sal_Bool bVal = 0);
+ SVX_DLLPUBLIC Svx3DNormalsInvertItem(bool bVal = false);
};
class SVX_DLLPUBLIC Svx3DTextureProjectionXItem : public SfxUInt16Item {
@@ -111,7 +111,7 @@ public:
class Svx3DShadow3DItem : public SfxBoolItem {
public:
- SVX_DLLPUBLIC Svx3DShadow3DItem(sal_Bool bVal = 0);
+ SVX_DLLPUBLIC Svx3DShadow3DItem(bool bVal = false);
};
class Svx3DMaterialColorItem : public SvxColorItem {
@@ -156,7 +156,7 @@ public:
class Svx3DTextureFilterItem : public SfxBoolItem {
public:
- SVX_DLLPUBLIC Svx3DTextureFilterItem(sal_Bool bVal = 0);
+ SVX_DLLPUBLIC Svx3DTextureFilterItem(bool bVal = false);
};
// Svx3D _3DSCENE_ Items
@@ -182,7 +182,7 @@ public:
class Svx3DTwoSidedLightingItem : public SfxBoolItem {
public:
- SVX_DLLPUBLIC Svx3DTwoSidedLightingItem(sal_Bool bVal = 0);
+ SVX_DLLPUBLIC Svx3DTwoSidedLightingItem(bool bVal = false);
};
class SVX_DLLPUBLIC Svx3DLightcolor1Item : public SvxColorItem {
@@ -232,42 +232,42 @@ public:
class SVX_DLLPUBLIC Svx3DLightOnOff1Item : public SfxBoolItem {
public:
- Svx3DLightOnOff1Item(sal_Bool bVal = 1);
+ Svx3DLightOnOff1Item(bool bVal = true);
};
class SVX_DLLPUBLIC Svx3DLightOnOff2Item : public SfxBoolItem {
public:
- Svx3DLightOnOff2Item(sal_Bool bVal = 0);
+ Svx3DLightOnOff2Item(bool bVal = false);
};
class SVX_DLLPUBLIC Svx3DLightOnOff3Item : public SfxBoolItem {
public:
- Svx3DLightOnOff3Item(sal_Bool bVal = 0);
+ Svx3DLightOnOff3Item(bool bVal = false);
};
class SVX_DLLPUBLIC Svx3DLightOnOff4Item : public SfxBoolItem {
public:
- Svx3DLightOnOff4Item(sal_Bool bVal = 0);
+ Svx3DLightOnOff4Item(bool bVal = false);
};
class SVX_DLLPUBLIC Svx3DLightOnOff5Item : public SfxBoolItem {
public:
- Svx3DLightOnOff5Item(sal_Bool bVal = 0);
+ Svx3DLightOnOff5Item(bool bVal = false);
};
class SVX_DLLPUBLIC Svx3DLightOnOff6Item : public SfxBoolItem {
public:
- Svx3DLightOnOff6Item(sal_Bool bVal = 0);
+ Svx3DLightOnOff6Item(bool bVal = false);
};
class SVX_DLLPUBLIC Svx3DLightOnOff7Item : public SfxBoolItem {
public:
- Svx3DLightOnOff7Item(sal_Bool bVal = 0);
+ Svx3DLightOnOff7Item(bool bVal = false);
};
class SVX_DLLPUBLIC Svx3DLightOnOff8Item : public SfxBoolItem {
public:
- Svx3DLightOnOff8Item(sal_Bool bVal = 0);
+ Svx3DLightOnOff8Item(bool bVal = false);
};
class SVX_DLLPUBLIC Svx3DLightDirection1Item : public SvxB3DVectorItem {
@@ -329,7 +329,7 @@ public:
// #107245# Item to replace bExtrudeSmoothed and bLatheSmoothed
class Svx3DSmoothNormalsItem : public SfxBoolItem {
public:
- Svx3DSmoothNormalsItem(sal_Bool bVal = 1);
+ Svx3DSmoothNormalsItem(bool bVal = true);
virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
};
@@ -337,7 +337,7 @@ public:
// #107245# Item to replace bExtrudeSmoothFrontBack and bLatheSmoothFrontBack
class Svx3DSmoothLidsItem : public SfxBoolItem {
public:
- Svx3DSmoothLidsItem(sal_Bool bVal = 0);
+ Svx3DSmoothLidsItem(bool bVal = false);
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 bExtrudeCharacterMode and bLatheCharacterMode
class Svx3DCharacterModeItem : public SfxBoolItem {
public:
- Svx3DCharacterModeItem(sal_Bool bVal = 0);
+ Svx3DCharacterModeItem(bool bVal = false);
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 bExtrudeCloseFront and bLatheCloseFront
class SVX_DLLPUBLIC Svx3DCloseFrontItem : public SfxBoolItem {
public:
- Svx3DCloseFrontItem(sal_Bool bVal = 1);
+ Svx3DCloseFrontItem(bool bVal = true);
SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
};
@@ -361,7 +361,7 @@ public:
// #107245# Item to replace bExtrudeCloseBack and bLatheCloseBack
class SVX_DLLPUBLIC Svx3DCloseBackItem : public SfxBoolItem {
public:
- Svx3DCloseBackItem(sal_Bool bVal = 1);
+ Svx3DCloseBackItem(bool bVal = true);
SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const;
SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
};
diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx
index aba11b5..4619f0d 100644
--- a/include/svx/swframeexample.hxx
+++ b/include/svx/swframeexample.hxx
@@ -57,7 +57,7 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public Window
short nWrap;
short nAnchor;
- sal_Bool bTrans;
+ bool bTrans;
Point aRelPos;
@@ -78,13 +78,13 @@ public:
inline void SetWrap(sal_uInt16 nW) { nWrap = nW; }
- inline void SetHAlign(short nH) { nHAlign = nH; }
+ inline void SetHAlign(short nH) { nHAlign = nH; }
inline void SetHoriRel(short nR) { nHRel = nR; }
- inline void SetVAlign(short nV) { nVAlign = nV; }
+ inline void SetVAlign(short nV) { nVAlign = nV; }
inline void SetVertRel(short nR) { nVRel = nR; }
- inline void SetTransparent(sal_Bool bT) { bTrans = bT; }
+ inline void SetTransparent(bool bT) { bTrans = bT; }
inline void SetAnchor(short nA) { nAnchor = nA; }
void SetRelPos(const Point& rP);
diff --git a/include/svx/sxcaitm.hxx b/include/svx/sxcaitm.hxx
index 9dac27b..7961ff0 100644
--- a/include/svx/sxcaitm.hxx
+++ b/include/svx/sxcaitm.hxx
@@ -31,7 +31,7 @@
class SdrCaptionFixedAngleItem: public SdrOnOffItem {
public:
- SdrCaptionFixedAngleItem(sal_Bool bFix=sal_True): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {}
+ SdrCaptionFixedAngleItem(bool bFix=true): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {}
SdrCaptionFixedAngleItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,rIn) {}
};
diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx
index af4e816..3dc637f 100644
--- a/include/svx/sxcecitm.hxx
+++ b/include/svx/sxcecitm.hxx
@@ -52,7 +52,7 @@ public:
class SdrCaptionEscIsRelItem: public SdrYesNoItem {
public:
- SdrCaptionEscIsRelItem(sal_Bool bRel=sal_True): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {}
+ SdrCaptionEscIsRelItem(bool bRel=true): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {}
SdrCaptionEscIsRelItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONESCISREL,rIn) {}
};
diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx
index a8233ce..159758e 100644
--- a/include/svx/sxcllitm.hxx
+++ b/include/svx/sxcllitm.hxx
@@ -43,7 +43,7 @@ public:
class SdrCaptionFitLineLenItem: public SdrYesNoItem {
public:
- SdrCaptionFitLineLenItem(sal_Bool bBestFit=sal_True): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {}
+ SdrCaptionFitLineLenItem(bool bBestFit=true): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {}
SdrCaptionFitLineLenItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,rIn) {}
};
diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx
index 64e7b52..d0510f5 100644
--- a/sd/source/ui/func/fucon3d.cxx
+++ b/sd/source/ui/func/fucon3d.cxx
@@ -121,7 +121,7 @@ E3dCompoundObject* FuConstruct3dObject::ImpCreateBasic3DShape()
/* this is an open object, therefore it has to be handled double-
sided by default */
- p3DObj->SetMergedItem(Svx3DDoubleSidedItem(sal_True));
+ p3DObj->SetMergedItem(Svx3DDoubleSidedItem(true));
break;
}
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx
index 869eec2..692bec4 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx
@@ -351,7 +351,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
{
aSet.Put( XLineStyleItem( XLINE_SOLID ) );
aSet.Put( XFillStyleItem ( XFILL_NONE ) );
- aSet.Put( Svx3DDoubleSidedItem( sal_True ) );
+ aSet.Put( Svx3DDoubleSidedItem( true ) );
}
else
{
@@ -370,8 +370,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
// get visible
if(bUseTwoFillStyles || (bIsMirroredX && !bIsMirroredY) || (!bIsMirroredX && bIsMirroredY))
{
- aSet.Put( Svx3DDoubleSidedItem( sal_True ) );
- pScene->GetProperties().SetObjectItem( Svx3DTwoSidedLightingItem( sal_True ) );
+ aSet.Put( Svx3DDoubleSidedItem( true ) );
+ pScene->GetProperties().SetObjectItem( Svx3DTwoSidedLightingItem( true ) );
}
}
@@ -544,8 +544,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
if ( bUseExtrusionColor )
p3DObj->SetMergedItem( XFillColorItem( "", ((XSecondaryFillColorItem&)pCustomShape->GetMergedItem( XATTR_SECONDARYFILLCOLOR )).GetColorValue() ) );
p3DObj->SetMergedItem( XFillStyleItem( XFILL_SOLID ) );
- p3DObj->SetMergedItem( Svx3DCloseFrontItem( sal_False ) );
- p3DObj->SetMergedItem( Svx3DCloseBackItem( sal_False ) );
+ p3DObj->SetMergedItem( Svx3DCloseFrontItem( false ) );
+ p3DObj->SetMergedItem( Svx3DCloseBackItem( false ) );
pScene->Insert3DObj( p3DObj );
// #i122777# depth 0 is okay for planes when using double-sided
@@ -567,9 +567,9 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
{
XLineColorItem& rLineColor = (XLineColorItem&)p3DObj->GetMergedItem( XATTR_LINECOLOR );
p3DObj->SetMergedItem( XFillColorItem( "", rLineColor.GetColorValue() ) );
- p3DObj->SetMergedItem( Svx3DDoubleSidedItem( sal_True ) );
- p3DObj->SetMergedItem( Svx3DCloseFrontItem( sal_False ) );
- p3DObj->SetMergedItem( Svx3DCloseBackItem( sal_False ) );
+ p3DObj->SetMergedItem( Svx3DDoubleSidedItem( true ) );
+ p3DObj->SetMergedItem( Svx3DCloseFrontItem( false ) );
+ p3DObj->SetMergedItem( Svx3DCloseBackItem( false ) );
}
pScene->Insert3DObj( p3DObj );
bSceneHasObjects = true;
@@ -702,7 +702,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
sal_uInt8 nSpotLight1 = (sal_uInt8)( fLightIntensity * 255.0 );
basegfx::B3DVector aSpotLight1( aFirstLightDirection.DirectionX, - ( aFirstLightDirection.DirectionY ), -( aFirstLightDirection.DirectionZ ) );
aSpotLight1.normalize();
- pScene->GetProperties().SetObjectItem( Svx3DLightOnOff1Item( sal_True ) );
+ pScene->GetProperties().SetObjectItem( Svx3DLightOnOff1Item( true ) );
Color aAmbientSpot1Color( nSpotLight1, nSpotLight1, nSpotLight1 );
pScene->GetProperties().SetObjectItem( Svx3DLightcolor1Item( aAmbientSpot1Color ) );
pScene->GetProperties().SetObjectItem( Svx3DLightDirection1Item( aSpotLight1 ) );
@@ -710,14 +710,14 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con
sal_uInt8 nSpotLight2 = (sal_uInt8)( fLight2Intensity * 255.0 );
basegfx::B3DVector aSpotLight2( aSecondLightDirection.DirectionX, -aSecondLightDirection.DirectionY, -aSecondLightDirection.DirectionZ );
aSpotLight2.normalize();
- pScene->GetProperties().SetObjectItem( Svx3DLightOnOff2Item( sal_True ) );
+ pScene->GetProperties().SetObjectItem( Svx3DLightOnOff2Item( true ) );
Color aAmbientSpot2Color( nSpotLight2, nSpotLight2, nSpotLight2 );
pScene->GetProperties().SetObjectItem( Svx3DLightcolor2Item( aAmbientSpot2Color ) );
pScene->GetProperties().SetObjectItem( Svx3DLightDirection2Item( aSpotLight2 ) );
sal_uInt8 nSpotLight3 = 70;
basegfx::B3DVector aSpotLight3( 0.0, 0.0, 1.0 );
- pScene->GetProperties().SetObjectItem( Svx3DLightOnOff3Item( sal_True ) );
+ pScene->GetProperties().SetObjectItem( Svx3DLightOnOff3Item( true ) );
Color aAmbientSpot3Color( nSpotLight3, nSpotLight3, nSpotLight3 );
pScene->GetProperties().SetObjectItem( Svx3DLightcolor3Item( aAmbientSpot3Color ) );
pScene->GetProperties().SetObjectItem( Svx3DLightDirection3Item( aSpotLight3 ) );
diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx
index 2c0abf8..8af0931 100644
--- a/svx/source/dialog/swframeexample.cxx
+++ b/svx/source/dialog/swframeexample.cxx
@@ -45,7 +45,7 @@ SvxSwFrameExample::SvxSwFrameExample( Window *pParent, WinBits nStyle ) :
nVRel (RelOrientation::PRINT_AREA),
nWrap (WrapTextMode_NONE),
nAnchor (TextContentAnchorType_AT_PAGE),
- bTrans (sal_False),
+ bTrans (false),
aRelPos (Point(0,0))
{
InitColors_Impl();
diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx
index 38dbdae..68ca6f81 100644
--- a/svx/source/engine3d/svx3ditems.cxx
+++ b/svx/source/engine3d/svx3ditems.cxx
@@ -56,7 +56,7 @@ Svx3DEndAngleItem::Svx3DEndAngleItem(sal_uInt32 nVal)
: SfxUInt32Item(SDRATTR_3DOBJ_END_ANGLE, nVal)
{}
-Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(sal_Bool bVal)
+Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_DOUBLE_SIDED, bVal)
{}
@@ -64,7 +64,7 @@ Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(sal_Bool bVal)
// #i28528#
// Added extra Item (Bool) for chart2 to be able to show reduced line geometry
-Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(sal_Bool bVal)
+Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY, bVal)
{}
@@ -92,7 +92,7 @@ Svx3DNormalsKindItem::Svx3DNormalsKindItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DOBJ_NORMALS_KIND, nVal)
{}
-Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(sal_Bool bVal)
+Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, bVal)
{}
@@ -104,7 +104,7 @@ Svx3DTextureProjectionYItem::Svx3DTextureProjectionYItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_Y, nVal)
{}
-Svx3DShadow3DItem::Svx3DShadow3DItem(sal_Bool bVal)
+Svx3DShadow3DItem::Svx3DShadow3DItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_SHADOW_3D, bVal)
{}
@@ -132,7 +132,7 @@ Svx3DTextureModeItem::Svx3DTextureModeItem(sal_uInt16 nVal)
: SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_MODE, nVal)
{}
-Svx3DTextureFilterItem::Svx3DTextureFilterItem(sal_Bool bVal)
+Svx3DTextureFilterItem::Svx3DTextureFilterItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_TEXTURE_FILTER, bVal)
{}
@@ -148,7 +148,7 @@ Svx3DFocalLengthItem::Svx3DFocalLengthItem(sal_uInt32 nVal)
: SfxUInt32Item(SDRATTR_3DSCENE_FOCAL_LENGTH, nVal)
{}
-Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(sal_Bool bVal)
+Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, bVal)
{}
@@ -188,35 +188,35 @@ Svx3DAmbientcolorItem::Svx3DAmbientcolorItem(const Color& rCol)
: SvxColorItem(rCol, SDRATTR_3DSCENE_AMBIENTCOLOR)
{}
-Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(sal_Bool bVal)
+Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_1, bVal)
{}
-Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(sal_Bool bVal)
+Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_2, bVal)
{}
-Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(sal_Bool bVal)
+Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_3, bVal)
{}
-Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(sal_Bool bVal)
+Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_4, bVal)
{}
-Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(sal_Bool bVal)
+Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_5, bVal)
{}
-Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(sal_Bool bVal)
+Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_6, bVal)
{}
-Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(sal_Bool bVal)
+Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_7, bVal)
{}
-Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(sal_Bool bVal)
+Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(bool bVal)
: SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_8, bVal)
{}
@@ -263,7 +263,7 @@ Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal)
// #107245#
-Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(sal_Bool bVal)
+Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal)
{}
@@ -288,7 +288,7 @@ SfxPoolItem* Svx3DSmoothNormalsItem::Create(SvStream& rIn, sal_uInt16 nItemVersi
// #107245#
-Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(sal_Bool bVal)
+Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal)
{}
@@ -313,7 +313,7 @@ SfxPoolItem* Svx3DSmoothLidsItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
// #107245#
-Svx3DCharacterModeItem::Svx3DCharacterModeItem(sal_Bool bVal)
+Svx3DCharacterModeItem::Svx3DCharacterModeItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal)
{}
@@ -338,7 +338,7 @@ SfxPoolItem* Svx3DCharacterModeItem::Create(SvStream& rIn, sal_uInt16 nItemVersi
// #107245#
-Svx3DCloseFrontItem::Svx3DCloseFrontItem(sal_Bool bVal)
+Svx3DCloseFrontItem::Svx3DCloseFrontItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal)
{}
@@ -363,7 +363,7 @@ SfxPoolItem* Svx3DCloseFrontItem::Create(SvStream& rIn, sal_uInt16 nItemVersion)
// #107245#
-Svx3DCloseBackItem::Svx3DCloseBackItem(sal_Bool bVal)
+Svx3DCloseBackItem::Svx3DCloseBackItem(bool bVal)
: SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal)
{}
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 645adc8..39d47f2 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -728,7 +728,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, boo
aDefault.SetDefaultExtrudeCloseFront(false);
aDefault.SetDefaultExtrudeCloseBack(false);
- aSet.Put(Svx3DDoubleSidedItem(sal_True));
+ aSet.Put(Svx3DDoubleSidedItem(true));
// Set fill attribute
aSet.Put(XFillStyleItem(XFILL_SOLID));
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index e2002c9..26e0468 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -503,7 +503,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > & xS
pObj->SetExtrudePolygon(basegfx::B2DPolyPolygon(aNewPolygon));
// #107245# pObj->SetExtrudeCharacterMode(sal_True);
- pObj->SetMergedItem(Svx3DCharacterModeItem(sal_True));
+ pObj->SetMergedItem(Svx3DCharacterModeItem(true));
}
else if(pNewObj->ISA(E3dLatheObj))
{
@@ -516,7 +516,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > & xS
pObj->SetPolyPoly2D(basegfx::B2DPolyPolygon(aNewPolygon));
// #107245# pObj->SetLatheCharacterMode(sal_True);
- pObj->SetMergedItem(Svx3DCharacterModeItem(sal_True));
+ pObj->SetMergedItem(Svx3DCharacterModeItem(true));
}
}
}
commit 6c97bc47177adc1c51f69f17e77b9fe2aeade122
Author: Noel Grandin <noel at peralex.com>
Date: Mon Mar 10 11:09:59 2014 +0200
svx: sal_Bool->bool
Change-Id: I78da39fc553b2e5040ee6665377ea51a1c4d04d7
diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx
index 4c83b53..e95a628 100644
--- a/basctl/source/dlged/dlgedmod.cxx
+++ b/basctl/source/dlged/dlgedmod.cxx
@@ -29,7 +29,7 @@ DBG_NAME(DlgEdModel)
TYPEINIT1(DlgEdModel,SdrModel);
DlgEdModel::DlgEdModel()
- :SdrModel(NULL, NULL)
+ :SdrModel()
{
DBG_CTOR(DlgEdModel,0);
}
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index ea3b24a..ace308d 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -76,11 +76,11 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
sal_Bool bEdit = m_pDrawViewWrapper->SdrBeginTextEdit( pTextObj
, m_pDrawViewWrapper->GetPageView()
, m_pChartWindow
- , sal_False //bIsNewObj
+ , false //bIsNewObj
, pOutliner
, 0L //pOutlinerView
- , sal_True //bDontDeleteOutliner
- , sal_True //bOnlyOneView
+ , true //bDontDeleteOutliner
+ , true //bOnlyOneView
);
if(bEdit)
{
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index f5cbd24..e16c664 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -262,7 +262,7 @@ void ShapeController::executeDispatch_FormatLine()
sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
if ( bHasMarked )
{
- pDrawViewWrapper->MergeAttrFromMarked( aAttr, sal_False );
+ pDrawViewWrapper->MergeAttrFromMarked( aAttr, false );
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
@@ -275,11 +275,11 @@ void ShapeController::executeDispatch_FormatLine()
const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
if ( bHasMarked )
{
- pDrawViewWrapper->SetAttrToMarked( *pOutAttr, sal_False );
+ pDrawViewWrapper->SetAttrToMarked( *pOutAttr, false );
}
else
{
- pDrawViewWrapper->SetDefaultAttr( *pOutAttr, sal_False );
+ pDrawViewWrapper->SetDefaultAttr( *pOutAttr, false );
}
}
}
@@ -301,7 +301,7 @@ void ShapeController::executeDispatch_FormatArea()
sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
if ( bHasMarked )
{
- pDrawViewWrapper->MergeAttrFromMarked( aAttr, sal_False );
+ pDrawViewWrapper->MergeAttrFromMarked( aAttr, false );
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
@@ -318,11 +318,11 @@ void ShapeController::executeDispatch_FormatArea()
const SfxItemSet* pOutAttr = pDlg->GetOutputItemSet();
if ( bHasMarked )
{
- pDrawViewWrapper->SetAttrToMarked( *pOutAttr, sal_False );
+ pDrawViewWrapper->SetAttrToMarked( *pOutAttr, false );
}
else
{
- pDrawViewWrapper->SetDefaultAttr( *pOutAttr, sal_False );
+ pDrawViewWrapper->SetDefaultAttr( *pOutAttr, false );
}
}
}
@@ -344,7 +344,7 @@ void ShapeController::executeDispatch_TextAttributes()
sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
if ( bHasMarked )
{
- pDrawViewWrapper->MergeAttrFromMarked( aAttr, sal_False );
+ pDrawViewWrapper->MergeAttrFromMarked( aAttr, false );
}
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
@@ -360,7 +360,7 @@ void ShapeController::executeDispatch_TextAttributes()
}
else
{
- pDrawViewWrapper->SetDefaultAttr( *pOutAttr, sal_False );
+ pDrawViewWrapper->SetDefaultAttr( *pOutAttr, false );
}
}
}
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 8fd5bbe..6d6954c 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -103,7 +103,7 @@ namespace chart
{
DrawModelWrapper::DrawModelWrapper( const uno::Reference<uno::XComponentContext>& /*xContext*/ )
- : SdrModel( SvtPathOptions().GetPalettePath() )
+ : SdrModel( SvtPathOptions().GetPalettePath(), NULL, NULL, false, false )
, m_pChartItemPool(0)
, m_xMainDrawPage(0)
, m_xHiddenDrawPage(0)
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 883d7e5..b6529fe 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -314,7 +314,7 @@ void SvxLineTabPage::InitSymbols(MenuButton* pButton)
{
VirtualDevice aVDev;
aVDev.SetMapMode(MapMode(MAP_100TH_MM));
- SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS);
+ SdrModel* pModel = new SdrModel;
pModel->GetItemPool().FreezeIdRanges();
// Page
SdrPage* pPage = new SdrPage( *pModel, false );
@@ -1117,7 +1117,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
VirtualDevice aVDev;
aVDev.SetMapMode(MapMode(MAP_100TH_MM));
- SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS);
+ SdrModel* pModel = new SdrModel;
pModel->GetItemPool().FreezeIdRanges();
SdrPage* pPage = new SdrPage( *pModel, false );
pPage->SetSize(Size(1000,1000));
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index 06652f1..0831b66 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4779,7 +4779,7 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( sal_Bool bFirst )
}
else if ( nGluePointType == com::sun::star::drawing::EnhancedCustomShapeGluePointType::SEGMENTS )
{
- SdrObject* pPoly = pCustoShape->DoConvertToPolyObj( sal_True, true );
+ SdrObject* pPoly = pCustoShape->DoConvertToPolyObj( true, true );
if ( pPoly && pPoly->ISA( SdrPathObj ) )
{
sal_Int16 a, b, nIndex = 0;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 079a165..0169396 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4594,7 +4594,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
Point aRight( aLeft.X() + 1000, aLeft.Y() );
pRet->NbcMirror( aLeft, aRight );
}
- basegfx::B2DPolyPolygon aPoly( SdrObjCustomShape::GetLineGeometry( (SdrObjCustomShape*)pRet, sal_True ) );
+ basegfx::B2DPolyPolygon aPoly( SdrObjCustomShape::GetLineGeometry( (SdrObjCustomShape*)pRet, true ) );
SdrObject::Free( pRet );
pRet = new SdrEdgeObj();
@@ -5218,7 +5218,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
pTextObj->SetModel(pSdrModel);
if (bVerticalText)
- pTextObj->SetVerticalWriting(sal_True);
+ pTextObj->SetVerticalWriting(true);
if (nTextRotationAngle)
{
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index e03866e..5350702 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -62,7 +62,7 @@ public:
E3dCubeObj();
virtual sal_uInt16 GetObjIdentifier() const;
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
virtual E3dCubeObj* Clone() const;
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index 7770b13..02103ca 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -109,7 +109,7 @@ public:
// for copying complete form structures, not only control models
virtual SdrModel* GetMarkedObjModel() const;
using E3dView::Paste;
- virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+ virtual bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
virtual sal_Bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin );
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index ae2f2b2..1c3dbbd 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -94,7 +94,7 @@ private:
virtual E3dLatheObj* Clone() const;
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
// TakeObjName...() is for the display in the UI, for example "3 frames selected".
virtual OUString TakeObjNameSingul() const;
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 18ec02f..1a59ea4 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -138,7 +138,7 @@ protected:
public:
TYPEINFO();
virtual void RecalcSnapRect();
- virtual void SetRectsDirty(sal_Bool bNotMyself = sal_False);
+ virtual void SetRectsDirty(bool bNotMyself = false);
virtual ~E3dObject();
diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx
index bb13937..7769a17 100644
--- a/include/svx/polygn3d.hxx
+++ b/include/svx/polygn3d.hxx
@@ -58,7 +58,7 @@ public:
const basegfx::B2DPolyPolygon& GetPolyTexture2D() const { return aPolyTexture2D; }
virtual sal_uInt16 GetObjIdentifier() const;
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
virtual E3dPolygonObj* Clone() const;
diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx
index b130916..06c6147 100644
--- a/include/svx/sphere3d.hxx
+++ b/include/svx/sphere3d.hxx
@@ -56,7 +56,7 @@ public:
{ return ((const Svx3DVerticalSegmentsItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); }
virtual sal_uInt16 GetObjIdentifier() const;
- virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
+ virtual SdrObject* DoConvertToPolyObj(bool bBezier, bool bAddText) const;
virtual E3dSphereObj* Clone() const;
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index 92af4e1..728f032 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -46,15 +46,15 @@ protected:
Pointer aAktCreatePointer;
- sal_Int32 nAutoCloseDistPix;
- sal_Int32 nFreeHandMinDistPix;
- sal_uInt32 nAktInvent; // set the current ones
- sal_uInt16 nAktIdent; // Obj for re-creating
+ sal_Int32 nAutoCloseDistPix;
+ sal_Int32 nFreeHandMinDistPix;
+ sal_uInt32 nAktInvent; // set the current ones
+ sal_uInt16 nAktIdent; // Obj for re-creating
- unsigned bAutoTextEdit : 1; // Textedit after we start the creation of a text frame
- unsigned b1stPointAsCenter : 1;
- unsigned bUseIncompatiblePathCreateInterface : 1;
- unsigned bAutoClosePolys : 1;
+ bool bAutoTextEdit : 1; // Textedit after we start the creation of a text frame
+ bool b1stPointAsCenter : 1;
+ bool bUseIncompatiblePathCreateInterface : 1;
+ bool bAutoClosePolys : 1;
void ImpClearConnectMarker();
@@ -62,12 +62,12 @@ private:
SVX_DLLPRIVATE void ImpClearVars();
protected:
- sal_Bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut,
+ 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, sal_Bool bFull*/);
- void HideCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/);
- sal_Bool CheckEdgeMode();
+ void ShowCreateObj(/*OutputDevice* pOut, bool bFull*/);
+ void HideCreateObj(/*OutputDevice* pOut, bool bFull*/);
+ bool CheckEdgeMode();
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -75,7 +75,7 @@ protected:
virtual ~SdrCreateView();
public:
- virtual sal_Bool IsAction() const;
+ virtual bool IsAction() const;
virtual void MovAction(const Point& rPnt);
virtual void EndAction();
virtual void BckAction();
@@ -89,9 +89,9 @@ public:
// If the MeasureLayer is not set (empty string), then use the active layer for measuring.
void SetEditMode(SdrViewEditMode eMode) { SdrDragView::SetEditMode(eMode); 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(); }
+ 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(); }
// Determine whether a text tool is activated
bool IsTextTool() const;
@@ -108,32 +108,32 @@ public:
sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; }
// Beginning the regular Create
- 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);
+ bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
+ bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject);
void MovCreateObj(const Point& rPnt);
- sal_Bool EndCreateObj(SdrCreateCmd eCmd);
+ bool EndCreateObj(SdrCreateCmd eCmd);
void BckCreateObj(); // go back one polygon point
void BrkCreateObj();
- sal_Bool IsCreateObj() const { return pAktCreate!=NULL; }
+ bool IsCreateObj() const { return pAktCreate!=NULL; }
SdrObject* GetCreateObj() const { return pAktCreate; }
// BegCreateCaptionObj() creates a SdrCaptionObj (legend item).
// rObjSiz is the initial size of the legend text frame.
// Only the length of the tip is dragged
- sal_Bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
+ bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
// If TextEditAfterCreate is sal_True (the default),
// then after the creation of a TextFrame object (OBJ_TEXT,
// OBJ_TEXTEXT, OBJ_OUTLINERTEXT, OBJ_TITLETEXT, OBJ_CAPTION)
// automatically start a TextEdit (SdrObjEditView: SdrBeginTextEdit)
- sal_Bool IsTextEditAfterCreate() const { return bAutoTextEdit; }
- void SetTextEditAfterCreate(sal_Bool bOn) { bAutoTextEdit = bOn; }
+ bool IsTextEditAfterCreate() const { return bAutoTextEdit; }
+ void SetTextEditAfterCreate(bool bOn) { bAutoTextEdit = bOn; }
// Create a circle/rectangle/text frame with the first Point being
// the center of the object instead of the upper-left corner.
// Persistent flag. Default = FALSE.
- sal_Bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; }
- void SetCreate1stPointAsCenter(sal_Bool bOn) { b1stPointAsCenter = bOn; }
+ bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; }
+ void SetCreate1stPointAsCenter(bool bOn) { b1stPointAsCenter = bOn; }
// For polylines (OBJ_PLIN) and freehand lines (OBJ_FREELINE). If this
// Flag is sal_True, these two types of objects are implicitly closed, and
@@ -141,8 +141,8 @@ public:
// the distance between the start point and end point of the
// Object <= nAutoCloseDistPix pixels.
// Default = TRUE.
- sal_Bool IsAutoClosePolys() const { return bAutoClosePolys; }
- void SetAutoClosePolys(sal_Bool bOn) { bAutoClosePolys=bOn; }
+ bool IsAutoClosePolys() const { return bAutoClosePolys; }
+ void SetAutoClosePolys(bool bOn) { bAutoClosePolys=bOn; }
// Default = 5 Pixel
sal_uInt16 GetAutoCloseDistPix() const { return sal_uInt16(nAutoCloseDistPix); }
@@ -162,18 +162,18 @@ public:
// This flag should be regarded as temporary. The affected applications should
// be changed soon.
// Default = sal_False;
- sal_Bool IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; }
- void SetUseIncompatiblePathCreateInterface(sal_Bool bOn) { bUseIncompatiblePathCreateInterface = bOn; }
+ bool IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; }
+ void SetUseIncompatiblePathCreateInterface(bool bOn) { bUseIncompatiblePathCreateInterface = bOn; }
void SetConnectMarker(const SdrObjConnection& rCon, const SdrPageView& rPV);
void HideConnectMarker();
// Attributes of the object that is in the process of being created
/* new interface src537 */
- sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
+ bool GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAttr=false) const;
- 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);
+ bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll);
+ SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(bool& rOk) const;
+ bool SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr);
};
#endif // INCLUDED_SVX_SVDCRTV_HXX
diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index f7f0bc5..4dfbf79 100644
--- a/include/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
@@ -71,7 +71,7 @@ protected:
virtual void SetMarkHandles();
void ShowDragObj();
void HideDragObj();
- sal_Bool ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, sal_Bool bNewObj, OutputDevice* pOut);
+ bool ImpBegInsObjPoint(bool bIdxZwang, sal_uInt32 nIdx, const Point& rPnt, bool bNewObj, OutputDevice* pOut);
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
@@ -79,7 +79,7 @@ protected:
virtual ~SdrDragView();
public:
- virtual sal_Bool IsAction() const;
+ virtual bool IsAction() const;
virtual void MovAction(const Point& rPnt);
virtual void EndAction();
virtual void BckAction();
@@ -96,68 +96,68 @@ public:
// Bei Returncode sal_False konnte ich die Position nicht bestimmen
// (z.B. Punktverschiebung, Mehrfachselektion, Schieben der
// Spiegelschse, ...)
- sal_Bool TakeDragObjAnchorPos(Point& rPos, sal_Bool bTopRight = sal_False ) const;
+ bool TakeDragObjAnchorPos(Point& rPos, bool bTopRight = 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 sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL);
+ virtual bool BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL);
void MovDragObj(const Point& rPnt);
- sal_Bool EndDragObj(sal_Bool bCopy=sal_False);
+ bool EndDragObj(bool bCopy=false);
void BrkDragObj();
- sal_Bool IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; }
+ bool IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; }
SdrHdl* GetDragHdl() const { return pDragHdl; }
SdrDragMethod* GetDragMethod() const { return mpCurrentSdrDragMethod; }
- sal_Bool IsDraggingPoints() const { return eDragHdl==HDL_POLY; }
- sal_Bool IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; }
+ bool IsDraggingPoints() const { return eDragHdl==HDL_POLY; }
+ bool IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; }
// Wer das beim BegDrag oder mittendrin schon festlegen will.
// (Wird bei jedem BegDrag auf sal_False zurueckgesetzt, also nach
// BegDrag setzen.)
- void SetDragWithCopy(sal_Bool bOn) { bDragWithCopy = bOn; }
- sal_Bool IsDragWithCopy() const { return bDragWithCopy; }
+ void SetDragWithCopy(bool bOn) { bDragWithCopy = bOn; }
+ bool IsDragWithCopy() const { return bDragWithCopy; }
- void SetInsertGluePoint(sal_Bool bOn) { bInsGluePoint = bOn; }
- sal_Bool IsInsertGluePoint() const { return bInsGluePoint; }
+ void SetInsertGluePoint(bool bOn) { bInsGluePoint = bOn; }
+ bool IsInsertGluePoint() const { return bInsGluePoint; }
// Interaktives einfuegen eines neuen Punktes. nIdx=0 => vor dem ersten Punkt.
bool IsInsObjPointPossible() const;
- sal_Bool BegInsObjPoint(const Point& rPnt, sal_Bool bNewObj) { return ImpBegInsObjPoint(sal_False, 0L, rPnt, bNewObj, 0L); }
+ bool BegInsObjPoint(const Point& rPnt, bool bNewObj) { return ImpBegInsObjPoint(false, 0L, rPnt, bNewObj, 0L); }
void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); }
- sal_Bool EndInsObjPoint(SdrCreateCmd eCmd);
+ bool EndInsObjPoint(SdrCreateCmd eCmd);
void BrkInsObjPoint() { BrkDragObj(); }
- sal_Bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; }
+ bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; }
// Fuer die App zum Verwalten des Status. GetPreferredPointer() wird
// spaeter vielleicht einen passenden Pointer dafuer liefern
- void SetInsObjPointMode(sal_Bool bOn) { bInsObjPointMode = bOn; }
- sal_Bool IsInsObjPointMode() const { return bInsObjPointMode; }
+ void SetInsObjPointMode(bool bOn) { bInsObjPointMode = bOn; }
+ bool IsInsObjPointMode() const { return bInsObjPointMode; }
- sal_Bool IsInsGluePointPossible() const;
- sal_Bool BegInsGluePoint(const Point& rPnt);
+ bool IsInsGluePointPossible() const;
+ bool BegInsGluePoint(const Point& rPnt);
void MovInsGluePoint(const Point& rPnt) { MovDragObj(rPnt); }
- sal_Bool EndInsGluePoint() { return EndDragObj(); }
+ bool EndInsGluePoint() { return EndDragObj(); }
void BrkInsGluePoint() { BrkDragObj(); }
- sal_Bool IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; }
+ bool IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; }
// Fuer die App zum Verwalten des Status. GetPreferredPointer() wird
// spaeter vielleicht einen passenden Pointer dafuer liefern
- void SetInsGluePointMode(sal_Bool bOn) { bInsGluePointMode = bOn; }
- sal_Bool IsInsGluePointMode() const { return bInsGluePointMode; }
+ void SetInsGluePointMode(bool bOn) { bInsGluePointMode = bOn; }
+ bool IsInsGluePointMode() const { return bInsGluePointMode; }
// Begrenzungslinien ueber's gesamte Win waehrend des Draggens
// Persistent. Default=FALSE.
- void SetDragStripes(sal_Bool bOn);
- sal_Bool IsDragStripes() const { return bDragStripes; }
+ void SetDragStripes(bool bOn);
+ bool IsDragStripes() const { return bDragStripes; }
// Handles waehrend des Draggens verstecken
- //HMHvoid SetDragHdlHide(sal_Bool bOn);
+ //HMHvoid SetDragHdlHide(bool bOn);
//HMHBOOL IsDragHdlHide() const { return bNoDragHdl; }
// Beim Draggen von Polygonpunkten und Klebepunkten
// die Maus verstecken. Default=FALSE
- void SetMouseHideWhileDraggingPoints(sal_Bool bOn) { bMouseHideWhileDraggingPoints = bOn; }
- sal_Bool IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; }
+ void SetMouseHideWhileDraggingPoints(bool bOn) { bMouseHideWhileDraggingPoints = bOn; }
+ 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,
@@ -166,8 +166,8 @@ public:
// hat diese Einstellung keine Auswirkung.
// Auch waerend des Draggens umschaltbar.
// Default=Off
- void SetNoDragXorPolys(sal_Bool bOn);
- sal_Bool IsNoDragXorPolys() const { return bNoDragXorPolys; }
+ void SetNoDragXorPolys(bool bOn);
+ bool IsNoDragXorPolys() const { return bNoDragXorPolys; }
// Uebersteigt die Anzahl der markierten Objekte den hier eingestellten
// Wert, wird implizit (temporaer) auf NoDragPolys geschaltet.
@@ -190,13 +190,13 @@ public:
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Verbinder an Objektscheitelpunkte ankleben
// Default=sal_True=Ja
- void SetAutoVertexConnectors(sal_Bool bOn) { bAutoVertexCon = bOn; }
- sal_Bool IsAutoVertexConnectors() const { return bAutoVertexCon; }
+ void SetAutoVertexConnectors(bool bOn) { bAutoVertexCon = bOn; }
+ bool IsAutoVertexConnectors() const { return bAutoVertexCon; }
// Verbinder an Objektecken ankleben
// Default=sal_False=Nein
- void SetAutoCornerConnectors(sal_Bool bOn) { bAutoCornerCon = bOn; }
- sal_Bool IsAutoCornerConnectors() const { return bAutoCornerCon; }
+ void SetAutoCornerConnectors(bool bOn) { bAutoCornerCon = bOn; }
+ bool IsAutoCornerConnectors() const { return bAutoCornerCon; }
// Dragging von verbundenen Objekten (Nodes):
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -205,7 +205,7 @@ public:
// Gummibaender sondern komplette Neuberechnunen sind beim Draggen sichtbar.
// Diese detalierte Darstellung ist eh nur beim MoveDrag moeglich.
// Defaultwert ist 10
- sal_Bool IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; }
+ bool IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; }
sal_uInt16 GetDetailedEdgeDraggingLimit() const { return nDetailedEdgeDraggingLimit; }
@@ -214,7 +214,7 @@ public:
// Gemeint sind hier die "Gummibaender", die weniger Rechenzeit benoetigen
// als die kompletten Neuberechnungen beim DetailedEdgeDragging.
// Defaultwert ist 100
- sal_Bool IsRubberEdgeDragging() const { return bRubberEdgeDragging; }
+ bool IsRubberEdgeDragging() const { return bRubberEdgeDragging; }
// Verbinderhandling also zu deutsch wie folgt (bei Defaulteinstellungen):
// - Sind bis max 10 Verbinder betroffen werden diese bei jedem
@@ -230,25 +230,25 @@ public:
// 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(sal_Bool bOn) { bMarkedHitMovesAlways = bOn; }
- sal_Bool IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; }
+ void SetMarkedHitMovesAlways(bool bOn) { bMarkedHitMovesAlways = bOn; }
+ 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(sal_Bool bOn) { bMirrRefDragObj = bOn; }
- sal_Bool IsMirrRefDragObj() const { return bMirrRefDragObj; }
+ void SetMirrRefDragObj(bool bOn) { bMirrRefDragObj = bOn; }
+ bool IsMirrRefDragObj() const { return bMirrRefDragObj; }
- sal_Bool IsOrthoDesired() const;
+ bool IsOrthoDesired() const;
// Beim Resize die Mitte als Referenz
// Default=FALSE.
- sal_Bool IsResizeAtCenter() const { return bResizeAtCenter; }
- void SetResizeAtCenter(sal_Bool bOn) { bResizeAtCenter = bOn; }
+ bool IsResizeAtCenter() const { return bResizeAtCenter; }
+ void SetResizeAtCenter(bool bOn) { bResizeAtCenter = bOn; }
// Symmetrisches Crook
// Default=FALSE.
- sal_Bool IsCrookAtCenter() const { return bCrookAtCenter; }
- void SetCrookAtCenter(sal_Bool bOn) { bCrookAtCenter = bOn; }
+ bool IsCrookAtCenter() const { return bCrookAtCenter; }
+ void SetCrookAtCenter(bool bOn) { bCrookAtCenter = bOn; }
// Begrenzung des Arbeitsbereichs. Die Begrenzung bezieht sich auf die
// View, nicht auf die einzelnen PageViews. Von der View wird diese
@@ -276,7 +276,7 @@ public:
// Rundungsfehler auftreten koennen, wodurch das LimitRect minnimal
// ueberschritten werden koennte...
// Implementiert fuer Move und Resize.
- virtual sal_Bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
+ virtual bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
};
#endif // INCLUDED_SVX_SVDDRGV_HXX
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 376c78d..1331498 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -119,12 +119,12 @@ protected:
void ImpBroadcastEdgesOfMarkedNodes();
// Konvertierung der markierten Objekte in Poly bzw. Bezier.
- void ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea);
+ void ImpConvertTo(bool bPath, 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, sal_Bool bPath, sal_Bool bLineToArea);
+ SdrObject* ImpConvertOneObj(SdrObject* pObj, bool bPath, bool bLineToArea);
// Setzen der beiden Flags bToTopPossible und bToBtmPossible.
// bToTopPossibleDirty und bToBtmPossibleDirty werden dabei gleichzeitig
@@ -135,20 +135,20 @@ protected:
void ImpCopyAttributes(const SdrObject* pSource, SdrObject* pDest) const;
// fuer CombineMarkedObjects
- sal_Bool ImpCanConvertForCombine1(const SdrObject* pObj) const;
- sal_Bool ImpCanConvertForCombine(const SdrObject* pObj) const;
- basegfx::B2DPolyPolygon ImpGetPolyPolygon1(const SdrObject* pObj, sal_Bool bCombine) const;
- basegfx::B2DPolyPolygon ImpGetPolyPolygon(const SdrObject* pObj, sal_Bool bCombine) const;
+ bool ImpCanConvertForCombine1(const SdrObject* pObj) const;
+ bool ImpCanConvertForCombine(const SdrObject* pObj) const;
+ basegfx::B2DPolyPolygon ImpGetPolyPolygon1(const SdrObject* pObj, bool bCombine) const;
+ basegfx::B2DPolyPolygon ImpGetPolyPolygon(const SdrObject* pObj, bool bCombine) const;
basegfx::B2DPolygon ImpCombineToSinglePolygon(const basegfx::B2DPolyPolygon& rPolyPolygon) const;
// 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, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines);
+ bool ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPpolygon, bool bMakeLines) const;
+ bool ImpCanDismantle(const SdrObject* pObj, bool bMakeLines) const;
+ void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, bool bMakeLines);
void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode,
- 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;
+ 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;
void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID);
// Entfernt alle Obj der MarkList aus ihren ObjLists inkl Undo.
@@ -201,24 +201,24 @@ public:
void ForceMarkedObjToAnotherPage();
void ForceMarkedToAnotherPage() { ForceMarkedObjToAnotherPage(); }
- sal_Bool IsReadOnly() const { ForcePossibilities(); return bReadOnly; }
+ bool IsReadOnly() const { ForcePossibilities(); return bReadOnly; }
// Loeschen aller markierten Objekte
void DeleteMarkedObj();
- sal_Bool IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; }
+ 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, sal_Bool bCopy=sal_False);
+ void SetMarkedObjRect(const Rectangle& rRect, bool bCopy=false);
void MoveMarkedObj(const Size& rSiz, bool bCopy=false);
void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false);
void ResizeMultMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, const bool bCopy, const bool bWdh, const bool bHgt);
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(sal_Bool bCopy=sal_False);
- void MirrorMarkedObjVertical(sal_Bool bCopy=sal_False);
+ void MirrorMarkedObjHorizontal(bool bCopy=false);
+ void MirrorMarkedObjVertical(bool bCopy=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);
@@ -226,28 +226,28 @@ public:
// Markierte Objekte kopieren und anstelle der alten markieren
void CopyMarkedObj();
- 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); }
+ 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); }
long GetAllMarkedRotate() const { return GetMarkedObjRotate(); }
- 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); }
+ 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); }
long GetAllMarkedShear() const { return GetMarkedObjShear(); }
- 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 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 CopyMarked() { CopyMarkedObj(); }
- 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;
+ 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;
// Vereinigen mehrerer Objekte zu einem PolyPolygon:
// - Rechtecke/Kreise/Text... werden implizit gewandelt.
@@ -259,7 +259,7 @@ public:
// eine Bitmap oder ein OLE-Objekt, wird die gesamte Gruppe nicht
// beruecksichtigt.
// bNoPolyPoly=TRUE: Alles wird zu einem einzigen Polygon zusammengefasst
- void CombineMarkedObjects(sal_Bool bNoPolyPoly = sal_True);
+ void CombineMarkedObjects(bool bNoPolyPoly = true);
// for combining multiple polygons, with direct support of the modes
// SID_POLY_MERGE, SID_POLY_SUBSTRACT, SID_POLY_INTERSECT
@@ -273,9 +273,9 @@ public:
// Memberobjekten um PathObjs handelt.
// bMakeLines=TRUE: alle Polygone werden in einzelne Linien bzw.
// Beziersegmente zerlegt
- 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;
+ void DismantleMarkedObjects(bool bMakeLines=false);
+ bool IsCombinePossible(bool bNoPolyPoly=false) const;
+ bool IsDismantlePossible(bool bMakeLines=false) const;
// Ein neues bereits fertig konstruiertes Obj einfuegen. Das Obj gehoert
// anschliessend dem Model. Nach dem Einfuegen wird das neue Objekt
@@ -284,7 +284,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.
- sal_Bool InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions=0);
+ bool InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions=0);
// Ein Zeichenobjekt durch ein neues ersetzen. *pNewObj gehoert
// anschliessend mir, *pOldObj wandert ins Undo.
@@ -294,13 +294,13 @@ public:
// ReplaceObject(...);
// EndUndo();
- void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark=sal_True);
+ void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, bool bMark=true);
- 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);
+ 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);
// Geometrische Attribute (Position, Groesse, Drehwinkel)
// Bei der Position wird ein evtl. gesetzter PageOrigin beruecksichtigt.
@@ -315,14 +315,14 @@ public:
SfxStyleSheet* GetStyleSheetFromMarked() const;
// z.Zt. noch ohne Undo :(
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list