diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:49:47 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:49:47 +0100 |
| commit | b2f0133220474fda94f620b1916ba8d9ce839ba9 (patch) | |
| tree | 581aa27c330a2b9a1a5b9a17c7d76f7e583daa02 /svx | |
| parent | e1050cc8589df4dd685d0fae2079dd306d1f09ff (diff) | |
| parent | ee429287783ba7f9fe100cb3b32e64076d39c0c9 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
avmedia/source/framework/mediacontrol.cxx
connectivity/source/commontools/DateConversion.cxx
desktop/source/deployment/registry/component/dp_component.cxx
editeng/inc/editeng/numitem.hxx
editeng/inc/editeng/txtrange.hxx
editeng/source/editeng/editobj.cxx
editeng/source/editeng/editview.cxx
editeng/source/editeng/eehtml.cxx
editeng/source/editeng/impedit3.cxx
editeng/source/editeng/impedit4.cxx
editeng/source/misc/txtrange.cxx
editeng/source/outliner/outlin2.cxx
editeng/source/outliner/outlvw.cxx
framework/source/layoutmanager/layoutmanager.cxx
linguistic/source/lngsvcmgr.hxx
sfx2/source/appl/app.cxx
sfx2/source/appl/app.src
sfx2/source/appl/appbas.cxx
sfx2/source/appl/appcfg.cxx
sfx2/source/appl/appdde.cxx
sfx2/source/appl/appmain.cxx
sfx2/source/appl/appopen.cxx
sfx2/source/appl/appquit.cxx
sfx2/source/appl/appserv.cxx
sfx2/source/appl/childwin.cxx
sfx2/source/appl/fileobj.cxx
sfx2/source/appl/fileobj.hxx
sfx2/source/appl/workwin.cxx
sfx2/source/control/dispatch.cxx
sfx2/source/control/macro.cxx
sfx2/source/control/objface.cxx
sfx2/source/control/request.cxx
sfx2/source/control/shell.cxx
sfx2/source/control/statcach.cxx
sfx2/source/dialog/dinfdlg.cxx
sfx2/source/dialog/dockwin.cxx
sfx2/source/dialog/mailmodel.cxx
sfx2/source/dialog/mailmodelapi.cxx
sfx2/source/dialog/mgetempl.cxx
sfx2/source/dialog/splitwin.cxx
sfx2/source/dialog/styledlg.cxx
sfx2/source/dialog/tabdlg.cxx
sfx2/source/dialog/templdlg.cxx
sfx2/source/dialog/tplcitem.cxx
sfx2/source/dialog/tplpitem.cxx
sfx2/source/doc/doctempl.cxx
sfx2/source/doc/docvor.cxx
sfx2/source/doc/new.cxx
sfx2/source/doc/objcont.cxx
sfx2/source/doc/objserv.cxx
sfx2/source/doc/objxtor.cxx
sfx2/source/inc/appdata.hxx
sfx2/source/inc/helpid.hrc
sfx2/source/inc/sfxlocal.hrc
sfx2/source/inc/statcach.hxx
sfx2/source/inc/templdgi.hxx
sfx2/source/inc/virtmenu.hxx
sfx2/source/inc/workwin.hxx
sfx2/source/menu/mnumgr.cxx
sfx2/source/menu/virtmenu.cxx
sfx2/source/statbar/stbitem.cxx
sfx2/source/view/frame.cxx
sfx2/source/view/frame2.cxx
sfx2/source/view/orgmgr.cxx
sfx2/source/view/printer.cxx
sfx2/source/view/prnmon.cxx
sfx2/source/view/sfxbasecontroller.cxx
sfx2/source/view/viewfrm.cxx
sfx2/source/view/viewfrm2.cxx
sfx2/source/view/viewprn.cxx
sfx2/source/view/viewsh.cxx
svx/inc/svx/svditer.hxx
svx/source/dialog/sdstring.src
svx/source/form/fmpage.cxx
svx/source/form/formcontroller.cxx
svx/source/svdraw/svdcrtv.cxx
svx/source/svdraw/svditer.cxx
svx/source/svdraw/svdview.cxx
xmloff/source/forms/elementimport.cxx
Diffstat (limited to 'svx')
1356 files changed, 18697 insertions, 16902 deletions
diff --git a/svx/inc/makefile.mk b/svx/AllLangResTarget_about.mk index 37a079a68a..0d08c00756 100644..100755 --- a/svx/inc/makefile.mk +++ b/svx/AllLangResTarget_about.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,26 +25,21 @@ # #************************************************************************* -PRJ=.. +$(eval $(call gb_AllLangResTarget_AllLangResTarget,about)) -PRJNAME=svx -TARGET=inc +$(eval $(call gb_AllLangResTarget_set_reslocation,about,svx)) -# --- Settings ----------------------------------------------------- +$(eval $(call gb_AllLangResTarget_add_srs,about,svx/about)) -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk +$(eval $(call gb_SrsTarget_SrsTarget,svx/about)) -# --- Files -------------------------------------------------------- +$(eval $(call gb_SrsTarget_set_include,svx/about,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(SRCDIR)/svx/inc/ \ +)) -LOCALIZE_ME=globlmn_tmpl.hrc - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" +$(eval $(call gb_SrsTarget_add_files,svx/about,\ + svx/source/intro/about_ooo.src \ +)) diff --git a/svx/source/core/makefile.mk b/svx/AllLangResTarget_gal.mk index da874894ba..eb0b5b15c4 100644..100755 --- a/svx/source/core/makefile.mk +++ b/svx/AllLangResTarget_gal.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,23 +25,24 @@ # #************************************************************************* -PRJ=..$/.. +$(eval $(call gb_AllLangResTarget_AllLangResTarget,gal)) -PRJNAME=svx -TARGET=core -ENABLE_EXCEPTIONS=TRUE +$(eval $(call gb_AllLangResTarget_set_reslocation,gal,svx)) -# --- Settings ----------------------------------------------------- +$(eval $(call gb_AllLangResTarget_add_srs,gal,svx/gal)) -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk +$(eval $(call gb_SrsTarget_SrsTarget,svx/gal)) -# --- Files -------------------------------------------------------- +$(eval $(call gb_SrsTarget_set_include,svx/gal,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(SRCDIR)/svx/source/gallery \ + -I$(SRCDIR)/svx/inc/ \ +)) -SLOFILES = \ - $(SLO)$/coreservices.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk +$(eval $(call gb_SrsTarget_add_files,svx/gal,\ + svx/source/gallery2/gallery.src \ + svx/source/gallery2/galtheme.src \ +)) +# vim: set noet sw=4 ts=4: diff --git a/svx/source/sdr/animation/makefile.mk b/svx/AllLangResTarget_ofa.mk index a6750647f5..964b6562b3 100644..100755 --- a/svx/source/sdr/animation/makefile.mk +++ b/svx/AllLangResTarget_ofa.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,22 +25,22 @@ # #************************************************************************* -PRJ=..$/..$/.. +$(eval $(call gb_AllLangResTarget_AllLangResTarget,ofa)) -PRJNAME=svx -TARGET=animation -ENABLE_EXCEPTIONS=TRUE +$(eval $(call gb_AllLangResTarget_set_reslocation,ofa,svx)) -# --- Settings ----------------------------------------------------- +$(eval $(call gb_AllLangResTarget_add_srs,ofa,svx/ofa)) -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk +$(eval $(call gb_SrsTarget_SrsTarget,svx/ofa)) -# --- Files -------------------------------------------------------- +$(eval $(call gb_SrsTarget_set_include,svx/ofa,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(SRCDIR)/svx/inc/ \ +)) -SLOFILES=\ - $(SLO)$/animationstate.obj \ - $(SLO)$/objectanimator.obj \ - $(SLO)$/scheduler.obj +$(eval $(call gb_SrsTarget_add_files,svx/ofa,\ + svx/source/src/errtxt.src \ + svx/source/src/app.src \ +)) -.INCLUDE : target.mk diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk new file mode 100755 index 0000000000..a18852aab1 --- /dev/null +++ b/svx/AllLangResTarget_svx.mk @@ -0,0 +1,136 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,svx)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,svx,svx)) + +$(eval $(call gb_AllLangResTarget_add_srs,svx,\ + svx/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,svx/res)) + +$(eval $(call gb_SrsTarget_set_include,svx/res,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(WORKDIR)/inc \ + -I$(WORKDIR)/inc/svx \ + -I$(SRCDIR)/svx/source/inc \ + -I$(SRCDIR)/svx/source/dialog \ + -I$(SRCDIR)/svx/inc/ \ +)) + +$(eval $(call gb_SrsTarget_add_files,svx/res,\ + svx/source/accessibility/accessibility.src \ + svx/source/dialog/bmpmask.src \ + svx/source/dialog/contdlg.src \ + svx/source/dialog/ctredlin.src \ + svx/source/dialog/dlgctrl.src \ + svx/source/dialog/docrecovery.src \ + svx/source/dialog/fontwork.src \ + svx/source/dialog/frmsel.src \ + svx/source/dialog/hdft.src \ + svx/source/dialog/imapdlg.src \ + svx/source/dialog/langbox.src \ + svx/source/dialog/language.src \ + svx/source/dialog/linkwarn.src \ + svx/source/dialog/optgrid.src \ + svx/source/dialog/passwd.src \ + svx/source/dialog/prtqry.src \ + svx/source/dialog/rubydialog.src \ + svx/source/dialog/ruler.src \ + svx/source/dialog/sdstring.src \ + svx/source/dialog/srchdlg.src \ + svx/source/dialog/svxbmpnumvalueset.src \ + svx/source/dialog/swframeposstrings.src \ + svx/source/dialog/txenctab.src \ + svx/source/dialog/ucsubset.src \ + svx/source/engine3d/float3d.src \ + svx/source/engine3d/string3d.src \ + svx/source/fmcomp/gridctrl.src \ + svx/source/form/datanavi.src \ + svx/source/form/filtnav.src \ + svx/source/form/fmexpl.src \ + svx/source/form/fmstring.src \ + svx/source/form/formshell.src \ + svx/source/items/svxerr.src \ + svx/source/items/svxitems.src \ + svx/source/mnuctrls/mnuctrls.src \ + svx/source/stbctrls/stbctrls.src \ + svx/source/svdraw/svdstr.src \ + svx/source/table/table.src \ + svx/source/tbxctrls/colrctrl.src \ + svx/source/tbxctrls/extrusioncontrols.src \ + svx/source/tbxctrls/fontworkgallery.src \ + svx/source/tbxctrls/grafctrl.src \ + svx/source/tbxctrls/lboxctrl.src \ + svx/source/tbxctrls/linectrl.src \ + svx/source/tbxctrls/tbcontrl.src \ + svx/source/tbxctrls/tbunosearchcontrollers.src \ + svx/source/toolbars/extrusionbar.src \ + svx/source/toolbars/fontworkbar.src \ + svx/source/unodraw/unodraw.src \ +)) + +$(call gb_SrsPartTarget_get_target,svx/source/fmcomp/gridctrl.src) : $(WORKDIR)/inc/svx/globlmn.hrc +$(call gb_SrsPartTarget_get_target,svx/source/form/fmexpl.src) : $(WORKDIR)/inc/svx/globlmn.hrc +$(call gb_SrsPartTarget_get_target,svx/source/form/datanavi.src) : $(WORKDIR)/inc/svx/globlmn.hrc +$(call gb_SrsPartTarget_get_target,svx/source/form/formshell.src) : $(WORKDIR)/inc/svx/globlmn.hrc +$(call gb_SrsTarget_get_clean_target,svx/res) : $(WORKDIR)/inc/svx/globlmn.hrc_clean + +# hack !!! +# just a temporary - globlmn.hrc about to be removed! +ifeq ($(strip $(WITH_LANG)),) +$(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc + echo copying $@ + -mkdir -p $(WORKDIR)/inc/svx + cp $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(WORKDIR)/inc/svx/globlmn.hrc + rm -f $(WORKDIR)/inc/svx/lastrun.mk +else +-include $(WORKDIR)/inc/svx/lastrun.mk +ifneq ($(gb_lastrun_globlmn),MERGED) +.PHONY : $(WORKDIR)/inc/svx/globlmn.hrc +endif +$(WORKDIR)/inc/svx/globlmn.hrc : $(SRCDIR)/svx/inc/globlmn_tmpl.hrc $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf + echo merging $@ + -mkdir -p $(WORKDIR)/inc/svx + rm -f $(WORKDIR)/inc/svx/lastrun.mk + echo gb_lastrun_globlmn:=MERGED > $(WORKDIR)/inc/svx/lastrun.mk + $(call gb_Helper_abbreviate_dirs_native, \ + $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \ + -p svx \ + -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/svx/inc/localize.sdf -l all) +endif + +.PHONY : $(WORKDIR)/inc/svx/globlmn.hrc_clean +$(WORKDIR)/inc/svx/globlmn.hrc_clean : + rm -f $(WORKDIR)/inc/svx/lastrun.mk \ + $(WORKDIR)/inc/svx/globlmn.hrc + + +# vim: set noet sw=4 ts=4: diff --git a/svx/sdi/makefile.mk b/svx/AllLangResTarget_textconversiondlgs.mk index be41593be7..d30ccd4064 100644..100755 --- a/svx/sdi/makefile.mk +++ b/svx/AllLangResTarget_textconversiondlgs.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,33 +25,23 @@ # #************************************************************************* +$(eval $(call gb_AllLangResTarget_AllLangResTarget,textconversiondlgs)) -PRJ=.. +$(eval $(call gb_AllLangResTarget_set_reslocation,textconversiondlgs,svx)) -PRJNAME=svx -TARGET=svxslots +$(eval $(call gb_AllLangResTarget_add_srs,textconversiondlgs,\ + svx/textconversiondlgs \ +)) -# --- Settings ----------------------------------------------------- +$(eval $(call gb_SrsTarget_SrsTarget,svx/textconversiondlgs)) -.INCLUDE : settings.mk +$(eval $(call gb_SrsTarget_set_include,svx/textconversiondlgs,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ + -I$(SRCDIR)/svx/inc/ \ +)) -.IF "$(L10N_framework)"=="" - -SDI1NAME=$(TARGET) -SDI1EXPORT=svx - -# --- Files -------------------------------------------------------- - -SVSDI1DEPEND= \ - $(SOLARINCXDIR)$/sfx2/sfx.sdi \ - $(SOLARINCXDIR)$/sfx2/sfxitems.sdi \ - svxitems.sdi \ - fmslots.sdi \ - svx.sdi \ - xoitems.sdi \ - svxitems.sdi - -# --- Targets ------------------------------------------------------- -.ENDIF -.INCLUDE : target.mk +$(eval $(call gb_SrsTarget_add_files,svx/textconversiondlgs,\ + svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src \ +)) diff --git a/svx/source/fmcomp/makefile.mk b/svx/JunitTest_svx_unoapi.mk index aa4e9eaba1..d6597f85e8 100644..100755 --- a/svx/source/fmcomp/makefile.mk +++ b/svx/JunitTest_svx_unoapi.mk @@ -1,8 +1,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,39 +25,29 @@ # #************************************************************************* -PRJ=..$/.. - -PRJNAME=svx -TARGET=fmcomp -LIBTARGET=NO - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- +$(eval $(call gb_JunitTest_JunitTest,svx_unoapi)) -SRS1NAME=fmcomp -SRC1FILES= \ - gridctrl.src +$(eval $(call gb_JunitTest_set_defs,svx_unoapi,\ + $$(DEFS) \ + -Dorg.openoffice.test.arg.sce=$(SRCDIR)/svx/qa/unoapi/svx.sce \ + -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/svx/qa/unoapi/knownissues.xcl \ + -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/svx/qa/unoapi/testdocuments \ +)) -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/dbaexchange.obj \ - $(SLO)$/gridcols.obj \ - $(SLO)$/gridctrl.obj \ - $(SLO)$/gridcell.obj \ - $(SLO)$/fmgridcl.obj \ - $(SLO)$/fmgridif.obj \ - $(SLO)$/trace.obj \ - $(SLO)$/xmlexchg.obj +$(eval $(call gb_JunitTest_add_jars,svx_unoapi,\ + $(OUTDIR)/bin/OOoRunner.jar \ + $(OUTDIR)/bin/ridl.jar \ + $(OUTDIR)/bin/test.jar \ + $(OUTDIR)/bin/unoil.jar \ + $(OUTDIR)/bin/jurt.jar \ +)) -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/dbaobjectex.obj +$(eval $(call gb_JunitTest_add_sourcefiles,svx_unoapi,\ + svx/qa/unoapi/Test \ +)) -.INCLUDE : target.mk +$(eval $(call gb_JunitTest_add_classes,svx_unoapi,\ + org.openoffice.svx.qa.unoapi.Test \ +)) +# vim: set noet sw=4 ts=4: diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk new file mode 100755 index 0000000000..a2346cf19a --- /dev/null +++ b/svx/Library_svx.mk @@ -0,0 +1,234 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,svx)) + +$(eval $(call gb_Library_set_componentfile,svx,svx/util/svx)) + +$(eval $(call gb_Library_set_include,svx,\ + -I$(SRCDIR)/svx/inc \ + -I$(SRCDIR)/svx/source/inc \ + -I$(SRCDIR)/svx/inc/pch \ + $$(SOLARINC) \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,svx,\ + $$(DEFS) \ + -DSVX_DLLIMPLEMENTATION \ + -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ +)) + +$(eval $(call gb_Library_add_linked_libs,svx,\ + basegfx \ + sb \ + comphelper \ + cppuhelper \ + cppu \ + drawinglayer \ + editeng \ + i18nisolang1 \ + icuuc \ + sal \ + sfx \ + sot \ + svl \ + svt \ + svxcore \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ + xo \ + xcr \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,svx,\ + svx/source/accessibility/AccessibleControlShape \ + svx/source/accessibility/AccessibleEmptyEditSource \ + svx/source/accessibility/AccessibleFrameSelector \ + svx/source/accessibility/AccessibleGraphicShape \ + svx/source/accessibility/AccessibleOLEShape \ + svx/source/accessibility/AccessibleShape \ + svx/source/accessibility/AccessibleShapeInfo \ + svx/source/accessibility/AccessibleShapeTreeInfo \ + svx/source/accessibility/AccessibleTextEventQueue \ + svx/source/accessibility/AccessibleTextHelper \ + svx/source/accessibility/charmapacc \ + svx/source/accessibility/ChildrenManager \ + svx/source/accessibility/ChildrenManagerImpl \ + svx/source/accessibility/DescriptionGenerator \ + svx/source/accessibility/DGColorNameLookUp \ + svx/source/accessibility/GraphCtlAccessibleContext \ + svx/source/accessibility/ShapeTypeHandler \ + svx/source/accessibility/svxrectctaccessiblecontext \ + svx/source/accessibility/SvxShapeTypes \ + svx/source/customshapes/EnhancedCustomShape3d \ + svx/source/customshapes/EnhancedCustomShapeEngine \ + svx/source/customshapes/EnhancedCustomShapeFontWork \ + svx/source/customshapes/EnhancedCustomShapeHandle \ + svx/source/customshapes/tbxcustomshapes \ + svx/source/dialog/_bmpmask \ + svx/source/dialog/charmap \ + svx/source/dialog/connctrl \ + svx/source/dialog/_contdlg \ + svx/source/dialog/contwnd \ + svx/source/dialog/ctredlin \ + svx/source/dialog/databaseregistrationui \ + svx/source/dialog/dialcontrol \ + svx/source/dialog/dlgctl3d \ + svx/source/dialog/dlgctrl \ + svx/source/dialog/docrecovery \ + svx/source/dialog/fntctrl \ + svx/source/dialog/fontlb \ + svx/source/dialog/fontwork \ + svx/source/dialog/framelinkarray \ + svx/source/dialog/frmdirlbox \ + svx/source/dialog/frmsel \ + svx/source/dialog/graphctl \ + svx/source/dialog/grfflt \ + svx/source/dialog/hdft \ + svx/source/dialog/hyperdlg \ + svx/source/dialog/imapdlg \ + svx/source/dialog/imapwnd \ + svx/source/dialog/linkwarn \ + svx/source/dialog/measctrl \ + svx/source/dialog/optgrid \ + svx/source/dialog/orienthelper \ + svx/source/dialog/pagectrl \ + svx/source/dialog/paraprev \ + svx/source/dialog/passwd \ + svx/source/dialog/pfiledlg \ + svx/source/dialog/prtqry \ + svx/source/dialog/relfld \ + svx/source/dialog/rlrcitem \ + svx/source/dialog/rubydialog \ + svx/source/dialog/rulritem \ + svx/source/dialog/SpellDialogChildWindow \ + svx/source/dialog/srchctrl \ + svx/source/dialog/srchdlg \ + svx/source/dialog/strarray \ + svx/source/dialog/svxbmpnumvalueset \ + svx/source/dialog/svxgrahicitem \ + svx/source/dialog/svxruler \ + svx/source/dialog/swframeexample \ + svx/source/dialog/swframeposstrings \ + svx/source/dialog/txencbox \ + svx/source/dialog/txenctab \ + svx/source/dialog/wrapfield \ + svx/source/engine3d/float3d \ + svx/source/fmcomp/dbaobjectex \ + svx/source/form/databaselocationinput \ + svx/source/form/dbcharsethelper \ + svx/source/form/filtnav \ + svx/source/form/fmobjfac \ + svx/source/form/fmPropBrw \ + svx/source/form/fmsrccfg \ + svx/source/form/fmsrcimp \ + svx/source/form/tabwin \ + svx/source/form/tbxform \ + svx/source/items/algitem \ + svx/source/items/hlnkitem \ + svx/source/items/numfmtsh \ + svx/source/items/numinf \ + svx/source/items/ofaitem \ + svx/source/items/pageitem \ + svx/source/items/postattr \ + svx/source/items/rotmodit \ + svx/source/items/SmartTagItem \ + svx/source/items/svxempty \ + svx/source/items/svxerr \ + svx/source/items/viewlayoutitem \ + svx/source/items/zoomitem \ + svx/source/items/zoomslideritem \ + svx/source/mnuctrls/clipboardctl \ + svx/source/mnuctrls/fntctl \ + svx/source/mnuctrls/fntszctl \ + svx/source/mnuctrls/SmartTagCtl \ + svx/source/stbctrls/pszctrl \ + svx/source/stbctrls/insctrl \ + svx/source/stbctrls/selctrl \ + svx/source/stbctrls/xmlsecctrl \ + svx/source/stbctrls/modctrl \ + svx/source/stbctrls/zoomsliderctrl \ + svx/source/stbctrls/zoomctrl \ + svx/source/svdraw/ActionDescriptionProvider \ + svx/source/smarttags/SmartTagMgr \ + svx/source/svdraw/impgrfll \ + svx/source/table/accessiblecell \ + svx/source/table/accessibletableshape \ + svx/source/table/celleditsource \ + svx/source/table/tabledesign \ + svx/source/table/tablertfexporter \ + svx/source/table/tablertfimporter \ + svx/source/tbxctrls/colrctrl \ + svx/source/tbxctrls/fillctrl \ + svx/source/tbxctrls/formatpaintbrushctrl \ + svx/source/tbxctrls/grafctrl \ + svx/source/tbxctrls/itemwin \ + svx/source/tbxctrls/layctrl \ + svx/source/tbxctrls/lboxctrl \ + svx/source/tbxctrls/linectrl \ + svx/source/tbxctrls/subtoolboxcontrol \ + svx/source/tbxctrls/tbunocontroller \ + svx/source/tbxctrls/tbunosearchcontrollers \ + svx/source/tbxctrls/tbxalign \ + svx/source/tbxctrls/tbxcolor \ + svx/source/tbxctrls/tbxdrctl \ + svx/source/tbxctrls/verttexttbxctrl \ + svx/source/unodraw/recoveryui \ + svx/source/unodraw/unoctabl \ + svx/source/unodraw/UnoNamespaceMap \ + svx/source/unodraw/unopool \ + svx/source/unodraw/unoshcol \ + svx/source/unogallery/unogalitem \ + svx/source/unogallery/unogaltheme \ + svx/source/unogallery/unogalthemeprovider \ +)) + +ifeq ($(OS),LINUX) +$(eval $(call gb_Library_add_exception_objects,svx,\ + svx/source/dialog/sendreportunx \ +)) +else +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,svx,\ + advapi32 \ +)) +$(eval $(call gb_Library_add_exception_objects,svx,\ + svx/source/dialog/sendreportw32 \ +)) +else +$(eval $(call gb_Library_add_exception_objects,svx,\ + svx/source/dialog/sendreportgen \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk new file mode 100755 index 0000000000..7cd1a521e7 --- /dev/null +++ b/svx/Library_svxcore.mk @@ -0,0 +1,453 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,svxcore)) + +$(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore)) + +$(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots)) + +$(eval $(call gb_Library_add_package_headers,svxcore,\ + svx_inc \ + svx_sdi \ +)) + +$(eval $(call gb_Library_set_include,svxcore,\ + -I$(SRCDIR)/svx/inc \ + -I$(SRCDIR)/svx/inc/pch \ + -I$(SRCDIR)/svx/source/inc \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(WORKDIR)/SdiTarget/svx/sdi \ +)) + +#BOOST switch in customshapes +#dialog: +#.IF "$(GUI)"=="WNT" +#CFLAGS+= -DUNICODE -D_UNICODE +#.ENDIF + +$(eval $(call gb_Library_set_defs,svxcore,\ + $$(DEFS) \ + -DSVX_DLLIMPLEMENTATION \ + -DBOOST_SPIRIT_USE_OLD_NAMESPACE \ +)) + +$(eval $(call gb_Library_add_linked_libs,svxcore,\ + avmedia \ + basegfx \ + sb \ + comphelper \ + cppuhelper \ + cppu \ + drawinglayer \ + editeng \ + fwe \ + i18nisolang1 \ + icuuc \ + lng \ + sal \ + sfx \ + sot \ + svl \ + svt \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ + xo \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,svxcore,\ + svx/source/core/coreservices \ + svx/source/customshapes/EnhancedCustomShape2d \ + svx/source/customshapes/EnhancedCustomShapeGeometry \ + svx/source/customshapes/EnhancedCustomShapeTypeNames \ + svx/source/dialog/checklbx \ + svx/source/dialog/dialmgr \ + svx/source/dialog/dlgutil \ + svx/source/dialog/framelink \ + svx/source/dialog/langbox \ + svx/source/dialog/simptabl \ + svx/source/dialog/stddlg \ + svx/source/dialog/svxdlg \ + svx/source/engine3d/camera3d \ + svx/source/engine3d/cube3d \ + svx/source/engine3d/deflt3d \ + svx/source/engine3d/dragmt3d \ + svx/source/engine3d/e3dsceneupdater \ + svx/source/engine3d/e3dundo \ + svx/source/engine3d/extrud3d \ + svx/source/engine3d/helperhittest3d \ + svx/source/engine3d/helperminimaldepth3d \ + svx/source/engine3d/lathe3d \ + svx/source/engine3d/obj3d \ + svx/source/engine3d/objfac3d \ + svx/source/engine3d/polygn3d \ + svx/source/engine3d/polysc3d \ + svx/source/engine3d/scene3d \ + svx/source/engine3d/sphere3d \ + svx/source/engine3d/svx3ditems \ + svx/source/engine3d/view3d \ + svx/source/engine3d/view3d1 \ + svx/source/engine3d/viewpt3d2 \ + svx/source/fmcomp/dbaexchange \ + svx/source/fmcomp/fmgridcl \ + svx/source/fmcomp/fmgridif \ + svx/source/fmcomp/gridcell \ + svx/source/fmcomp/gridcols \ + svx/source/fmcomp/gridctrl \ + svx/source/fmcomp/trace \ + svx/source/fmcomp/xmlexchg \ + svx/source/form/dataaccessdescriptor \ + svx/source/form/datalistener \ + svx/source/form/datanavi \ + svx/source/form/dbtoolsclient \ + svx/source/form/delayedevent \ + svx/source/form/fmcontrolbordermanager \ + svx/source/form/fmcontrollayout \ + svx/source/form/fmdmod \ + svx/source/form/fmdocumentclassification \ + svx/source/form/fmdpage \ + svx/source/form/fmexch \ + svx/source/form/fmexpl \ + svx/source/form/fmitems \ + svx/source/form/fmmodel \ + svx/source/form/fmobj \ + svx/source/form/fmpage \ + svx/source/form/fmpgeimp \ + svx/source/form/fmscriptingenv \ + svx/source/form/fmservs \ + svx/source/form/fmshell \ + svx/source/form/fmshimp \ + svx/source/form/fmtextcontroldialogs \ + svx/source/form/fmtextcontrolfeature \ + svx/source/form/fmtextcontrolshell \ + svx/source/form/fmtools \ + svx/source/form/fmundo \ + svx/source/form/fmview \ + svx/source/form/fmvwimp \ + svx/source/form/formcontrolfactory \ + svx/source/form/formcontroller \ + svx/source/form/formcontrolling \ + svx/source/form/formdispatchinterceptor \ + svx/source/form/formfeaturedispatcher \ + svx/source/form/formtoolbars \ + svx/source/form/legacyformcontroller \ + svx/source/form/navigatortree \ + svx/source/form/navigatortreemodel \ + svx/source/form/ParseContext \ + svx/source/form/sdbdatacolumn \ + svx/source/form/sqlparserclient \ + svx/source/form/stringlistresource \ + svx/source/form/typeconversionclient \ + svx/source/form/typemap \ + svx/source/form/xfm_addcondition \ + svx/source/gallery2/codec \ + svx/source/gallery2/galbrws \ + svx/source/gallery2/galbrws1 \ + svx/source/gallery2/galbrws2 \ + svx/source/gallery2/galctrl \ + svx/source/gallery2/galexpl \ + svx/source/gallery2/gallery1 \ + svx/source/gallery2/galmisc \ + svx/source/gallery2/galobj \ + svx/source/gallery2/galtheme \ + svx/source/items/chrtitem \ + svx/source/items/clipfmtitem \ + svx/source/items/customshapeitem \ + svx/source/items/drawitem \ + svx/source/items/e3ditem \ + svx/source/items/grfitem \ + svx/source/sdr/animation/scheduler \ + svx/source/sdr/animation/objectanimator \ + svx/source/sdr/animation/animationstate \ + svx/source/sdr/attribute/sdrlinefillshadowtextattribute \ + svx/source/sdr/attribute/sdrfilltextattribute \ + svx/source/sdr/attribute/sdrshadowtextattribute \ + svx/source/sdr/attribute/sdrtextattribute \ + svx/source/sdr/attribute/sdrlineshadowtextattribute \ + svx/source/sdr/attribute/sdrformtextattribute \ + svx/source/sdr/attribute/sdrformtextoutlineattribute \ + svx/source/sdr/contact/viewobjectcontactofgroup \ + svx/source/sdr/contact/viewobjectcontactofsdrpage \ + svx/source/sdr/contact/viewcontactofpageobj \ + svx/source/sdr/contact/viewcontactofe3d \ + svx/source/sdr/contact/viewcontactofe3dcube \ + svx/source/sdr/contact/viewcontactofsdrmediaobj \ + svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor \ + svx/source/sdr/contact/viewobjectcontactofpageobj \ + svx/source/sdr/contact/viewobjectcontactofe3dscene \ + svx/source/sdr/contact/viewcontactofgraphic \ + svx/source/sdr/contact/viewobjectcontactredirector \ + svx/source/sdr/contact/viewcontactofsdrcircobj \ + svx/source/sdr/contact/viewcontactofgroup \ + svx/source/sdr/contact/viewcontactofunocontrol \ + svx/source/sdr/contact/viewcontactofsdrobjcustomshape \ + svx/source/sdr/contact/viewcontactofsdrobj \ + svx/source/sdr/contact/objectcontact \ + svx/source/sdr/contact/viewcontactoftextobj \ + svx/source/sdr/contact/viewcontactofe3dlathe \ + svx/source/sdr/contact/viewcontactofsdrpage \ + svx/source/sdr/contact/viewcontactofe3dextrude \ + svx/source/sdr/contact/viewcontactofmasterpagedescriptor \ + svx/source/sdr/contact/viewcontact \ + svx/source/sdr/contact/viewcontactofsdrole2obj \ + svx/source/sdr/contact/displayinfo \ + svx/source/sdr/contact/objectcontacttools \ + svx/source/sdr/contact/viewcontactofe3dscene \ + svx/source/sdr/contact/viewcontactofsdrrectobj \ + svx/source/sdr/contact/viewobjectcontactofsdrole2obj \ + svx/source/sdr/contact/viewobjectcontactofunocontrol \ + svx/source/sdr/contact/viewobjectcontactofgraphic \ + svx/source/sdr/contact/sdrmediawindow \ + svx/source/sdr/contact/viewobjectcontactofsdrmediaobj \ + svx/source/sdr/contact/viewcontactofsdrcaptionobj \ + svx/source/sdr/contact/viewcontactofvirtobj \ + svx/source/sdr/contact/viewcontactofe3dsphere \ + svx/source/sdr/contact/viewcontactofe3dpolygon \ + svx/source/sdr/contact/viewcontactofsdredgeobj \ + svx/source/sdr/contact/viewobjectcontact \ + svx/source/sdr/contact/viewobjectcontactofsdrobj \ + svx/source/sdr/contact/objectcontactofpageview \ + svx/source/sdr/contact/viewcontactofsdrpathobj \ + svx/source/sdr/contact/viewcontactofsdrmeasureobj \ + svx/source/sdr/contact/objectcontactofobjlistpainter \ + svx/source/sdr/contact/viewobjectcontactofe3d \ + svx/source/sdr/event/eventhandler \ + svx/source/sdr/overlay/overlayline \ + svx/source/sdr/overlay/overlaycrosshair \ + svx/source/sdr/overlay/overlayrollingrectangle \ + svx/source/sdr/overlay/overlaytriangle \ + svx/source/sdr/overlay/overlayselection \ + svx/source/sdr/overlay/overlayhatchrect \ + svx/source/sdr/overlay/overlaybitmapex \ + svx/source/sdr/overlay/overlaymanagerbuffered \ + svx/source/sdr/overlay/overlayhelpline \ + svx/source/sdr/overlay/overlayanimatedbitmapex \ + svx/source/sdr/overlay/overlaypolypolygon \ + svx/source/sdr/overlay/overlayobjectcell \ + svx/source/sdr/overlay/overlaytools \ + svx/source/sdr/overlay/overlayprimitive2dsequenceobject \ + svx/source/sdr/overlay/overlayobject \ + svx/source/sdr/overlay/overlaymanager \ + svx/source/sdr/overlay/overlayobjectlist \ + svx/source/sdr/primitive2d/sdrellipseprimitive2d \ + svx/source/sdr/primitive2d/sdrprimitivetools \ + svx/source/sdr/primitive2d/sdrtextprimitive2d \ + svx/source/sdr/primitive2d/primitivefactory2d \ + svx/source/sdr/primitive2d/sdrolecontentprimitive2d \ + svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d \ + svx/source/sdr/primitive2d/sdrgrafprimitive2d \ + svx/source/sdr/primitive2d/sdrole2primitive2d \ + svx/source/sdr/primitive2d/sdrpathprimitive2d \ + svx/source/sdr/primitive2d/sdrrectangleprimitive2d \ + svx/source/sdr/primitive2d/sdrcaptionprimitive2d \ + svx/source/sdr/primitive2d/sdrconnectorprimitive2d \ + svx/source/sdr/primitive2d/sdrmeasureprimitive2d \ + svx/source/sdr/primitive2d/sdrattributecreator \ + svx/source/sdr/primitive2d/sdrdecompositiontools \ + svx/source/sdr/primitive3d/sdrattributecreator3d \ + svx/source/sdr/properties/pageproperties \ + svx/source/sdr/properties/e3dsceneproperties \ + svx/source/sdr/properties/itemsettools \ + svx/source/sdr/properties/captionproperties \ + svx/source/sdr/properties/e3dextrudeproperties \ + svx/source/sdr/properties/e3dproperties \ + svx/source/sdr/properties/measureproperties \ + svx/source/sdr/properties/customshapeproperties \ + svx/source/sdr/properties/rectangleproperties \ + svx/source/sdr/properties/groupproperties \ + svx/source/sdr/properties/properties \ + svx/source/sdr/properties/e3dlatheproperties \ + svx/source/sdr/properties/graphicproperties \ + svx/source/sdr/properties/circleproperties \ + svx/source/sdr/properties/emptyproperties \ + svx/source/sdr/properties/e3dsphereproperties \ + svx/source/sdr/properties/defaultproperties \ + svx/source/sdr/properties/textproperties \ + svx/source/sdr/properties/attributeproperties \ + svx/source/sdr/properties/connectorproperties \ + svx/source/sdr/properties/e3dcompoundproperties \ + svx/source/sdr/properties/oleproperties \ + svx/source/svdraw/clonelist \ + svx/source/svdraw/gradtrns \ + svx/source/svdraw/polypolygoneditor \ + svx/source/svdraw/sdrcomment \ + svx/source/svdraw/sdrhittesthelper \ + svx/source/svdraw/sdrmasterpagedescriptor \ + svx/source/svdraw/sdrpagewindow \ + svx/source/svdraw/sdrpaintwindow \ + svx/source/svdraw/selectioncontroller \ + svx/source/svdraw/svdattr \ + svx/source/svdraw/svdcrtv \ + svx/source/svdraw/svddrag \ + svx/source/svdraw/svddrgmt \ + svx/source/svdraw/svddrgv \ + svx/source/svdraw/svdedtv \ + svx/source/svdraw/svdedtv1 \ + svx/source/svdraw/svdedtv2 \ + svx/source/svdraw/svdedxv \ + svx/source/svdraw/svdetc \ + svx/source/svdraw/svdfmtf \ + svx/source/svdraw/svdglev \ + svx/source/svdraw/svdglue \ + svx/source/svdraw/svdhdl \ + svx/source/svdraw/svdhlpln \ + svx/source/svdraw/svdibrow \ + svx/source/svdraw/svditer \ + svx/source/svdraw/svdlayer \ + svx/source/svdraw/svdmark \ + svx/source/svdraw/svdmodel \ + svx/source/svdraw/svdmrkv \ + svx/source/svdraw/svdmrkv1 \ + svx/source/svdraw/svdoashp \ + svx/source/svdraw/svdoattr \ + svx/source/svdraw/svdobj \ + svx/source/svdraw/svdocapt \ + svx/source/svdraw/svdocirc \ + svx/source/svdraw/svdoedge \ + svx/source/svdraw/svdograf \ + svx/source/svdraw/svdogrp \ + svx/source/svdraw/svdomeas \ + svx/source/svdraw/svdomedia \ + svx/source/svdraw/svdoole2 \ + svx/source/svdraw/svdopage \ + svx/source/svdraw/svdopath \ + svx/source/svdraw/svdorect \ + svx/source/svdraw/svdotext \ + svx/source/svdraw/svdotextdecomposition \ + svx/source/svdraw/svdotextpathdecomposition \ + svx/source/svdraw/svdotxat \ + svx/source/svdraw/svdotxdr \ + svx/source/svdraw/svdotxed \ + svx/source/svdraw/svdotxfl \ + svx/source/svdraw/svdotxln \ + svx/source/svdraw/svdotxtr \ + svx/source/svdraw/svdouno \ + svx/source/svdraw/svdoutl \ + svx/source/svdraw/svdoutlinercache \ + svx/source/svdraw/svdovirt \ + svx/source/svdraw/svdpage \ + svx/source/svdraw/svdpagv \ + svx/source/svdraw/svdpntv \ + svx/source/svdraw/svdpoev \ + svx/source/svdraw/svdsnpv \ + svx/source/svdraw/svdtext \ + svx/source/svdraw/svdtrans \ + svx/source/svdraw/svdundo \ + svx/source/svdraw/svdview \ + svx/source/svdraw/svdviter \ + svx/source/svdraw/svdxcgv \ + svx/source/table/cell \ + svx/source/table/cellcursor \ + svx/source/table/cellrange \ + svx/source/table/propertyset \ + svx/source/table/svdotable \ + svx/source/table/tablecolumn \ + svx/source/table/tablecolumns \ + svx/source/table/tablecontroller \ + svx/source/table/tablehandles \ + svx/source/table/tablelayouter \ + svx/source/table/tablemodel \ + svx/source/table/tablerow \ + svx/source/table/tablerows \ + svx/source/table/tableundo \ + svx/source/table/viewcontactoftableobj \ + svx/source/tbxctrls/extrusioncontrols \ + svx/source/tbxctrls/fontworkgallery \ + svx/source/tbxctrls/tbcontrl \ + svx/source/tbxctrls/tbxcolorupdate \ + svx/source/toolbars/extrusionbar \ + svx/source/toolbars/fontworkbar \ + svx/source/unodraw/gluepts \ + svx/source/unodraw/shapepropertynotifier \ + svx/source/unodraw/tableshape \ + svx/source/unodraw/unobtabl \ + svx/source/unodraw/unodtabl \ + svx/source/unodraw/UnoGraphicExporter \ + svx/source/unodraw/unogtabl \ + svx/source/unodraw/unohtabl \ + svx/source/unodraw/unomlstr \ + svx/source/unodraw/unomod \ + svx/source/unodraw/unomtabl \ + svx/source/unodraw/UnoNameItemTable \ + svx/source/unodraw/unopage \ + svx/source/unodraw/unoprov \ + svx/source/unodraw/unoshap2 \ + svx/source/unodraw/unoshap3 \ + svx/source/unodraw/unoshap4 \ + svx/source/unodraw/unoshape \ + svx/source/unodraw/unoshtxt \ + svx/source/unodraw/unottabl \ + svx/source/unodraw/XPropertyTable \ + svx/source/xml/xmleohlp \ + svx/source/xml/xmlexport \ + svx/source/xml/xmlgrhlp \ + svx/source/xml/xmlxtexp \ + svx/source/xml/xmlxtimp \ + svx/source/xoutdev/xattr \ + svx/source/xoutdev/xattr2 \ + svx/source/xoutdev/xattrbmp \ + svx/source/xoutdev/xexch \ + svx/source/xoutdev/_xoutbmp \ + svx/source/xoutdev/_xpoly \ + svx/source/xoutdev/xpool \ + svx/source/xoutdev/xtabbtmp \ + svx/source/xoutdev/xtabcolr \ + svx/source/xoutdev/xtabdash \ + svx/source/xoutdev/xtabgrdt \ + svx/source/xoutdev/xtabhtch \ + svx/source/xoutdev/xtable \ + svx/source/xoutdev/xtablend \ +)) + +# the following source file can't be compiled with optimization by some compilers (crash or endless loop): +# Solaris Sparc with Sun compiler, gcc on MacOSX and Linux PPC +# the latter is currently not supported by gbuild and needs a fix here later +ifeq ($(OS),$(filter-out SOLARIS MACOSX,$(OS))) +$(eval $(call gb_Library_add_exception_objects,svxcore,\ + svx/source/customshapes/EnhancedCustomShapeFunctionParser \ +)) +else +$(eval $(call gb_Library_add_cxxobjects,svxcore,\ + svx/source/customshapes/EnhancedCustomShapeFunctionParser \ + , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \ +)) +endif + +$(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx)) + +$(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\ + $$(INCLUDE) \ + -I$(SRCDIR)/svx/inc \ + -I$(SRCDIR)/svx/sdi \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk new file mode 100755 index 0000000000..03a457b553 --- /dev/null +++ b/svx/Library_textconversiondlgs.mk @@ -0,0 +1,65 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,textconversiondlgs)) + +$(eval $(call gb_Library_set_componentfile,textconversiondlgs,svx/util/textconversiondlgs)) + +$(eval $(call gb_Library_set_include,textconversiondlgs,\ + -I$(SRCDIR)/svx/inc \ + -I$(SRCDIR)/svx/inc/pch \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,textconversiondlgs,\ + $$(DEFS) \ +)) + +$(eval $(call gb_Library_add_linked_libs,textconversiondlgs,\ + comphelper \ + cppuhelper \ + cppu \ + sal \ + svl \ + svt \ + tk \ + tl \ + utl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,textconversiondlgs,\ + svx/source/unodialogs/textconversiondlgs/services \ + svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog \ + svx/source/unodialogs/textconversiondlgs/chinese_translationdialog \ + svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog \ + svx/source/unodialogs/textconversiondlgs/resid \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/svx/source/sdr/primitive3d/makefile.mk b/svx/Makefile index c845cadc90..90947b2e5f 100644..100755 --- a/svx/source/sdr/primitive3d/makefile.mk +++ b/svx/Makefile @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,18 +25,14 @@ # #************************************************************************* -PRJ=..$/..$/.. -PRJNAME=svx -TARGET=primitive3d -ENABLE_EXCEPTIONS=TRUE +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif -# --- Settings ----------------------------------------------------- +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -.INCLUDE : settings.mk +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/sdrattributecreator3d.obj - -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk new file mode 100755 index 0000000000..032f71ffa5 --- /dev/null +++ b/svx/Module_svx.mk @@ -0,0 +1,51 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Module_Module,svx)) + +$(eval $(call gb_Module_add_targets,svx,\ + Library_svx \ + Library_svxcore \ + Library_textconversiondlgs \ + AllLangResTarget_svx \ + AllLangResTarget_ofa \ + AllLangResTarget_gal \ + AllLangResTarget_textconversiondlgs \ + Package_inc \ + Package_sdi \ +)) + +$(eval $(call gb_Module_add_subsequentcheck_targets,svx,\ + JunitTest_svx_unoapi \ +)) + +#todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX +#todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ? +#todo: -DUNICODE and -D_UNICODE on WNT for source/dialog +#todo: globlmn.hrc +#todo: component file +# vim: set noet ts=4 sw=4: diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk new file mode 100755 index 0000000000..d5ffc3cb1a --- /dev/null +++ b/svx/Package_inc.mk @@ -0,0 +1,560 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Package_Package,svx_inc,$(SRCDIR)/svx/inc)) + +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsoitm.hxx,svx/sxsoitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshtitm.hxx,svx/sdshtitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polysc3d.hxx,svx/polysc3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dataaccessdescriptor.hxx,svx/dataaccessdescriptor.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoashp.hxx,svx/svdoashp.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbaobjectex.hxx,svx/dbaobjectex.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeTypeNames.hxx,svx/EnhancedCustomShapeTypeNames.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftdiit.hxx,svx/xftdiit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctl.hxx,svx/fntctl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattr.hxx,svx/svdattr.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/imapdlg.hxx,svx/imapdlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/linkwarn.hxx,svx/linkwarn.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/formatpaintbrushctrl.hxx,svx/formatpaintbrushctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xcolit.hxx,svx/xcolit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftmrit.hxx,svx/xftmrit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxcommands.h,svx/svxcommands.h)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdview.hxx,svx/svdview.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxraitm.hxx,svx/sxraitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxroaitm.hxx,svx/sxroaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleTableShape.hxx,svx/AccessibleTableShape.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmsxy.hxx,svx/xflbmsxy.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgctl3d.hxx,svx/dlgctl3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaiitm.hxx,svx/sdtaiitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtextit.hxx,svx/xtextit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeFunctionParser.hxx,svx/EnhancedCustomShapeFunctionParser.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ucsubset.hxx,svx/ucsubset.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sderitm.hxx,svx/sderitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/obj3d.hxx,svx/obj3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbcharsethelper.hxx,svx/dbcharsethelper.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdangitm.hxx,svx/sdangitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfcrop.hxx,svx/grfcrop.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxtraitm.hxx,svx/sxtraitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/orienthelper.hxx,svx/orienthelper.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxonitm.hxx,svx/sxonitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmpit.hxx,svx/xflbmpit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlineit.hxx,svx/xlineit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagItem.hxx,svx/SmartTagItem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xpoly.hxx,svx/xpoly.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ParseContext.hxx,svx/ParseContext.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numinf.hxx,svx/numinf.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/objfac3d.hxx,svx/objfac3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcolorupdate.hxx,svx/tbxcolorupdate.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdhdl.hxx,svx/svdhdl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdedxv.hxx,svx/svdedxv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagMgr.hxx,svx/SmartTagMgr.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/shapeproperty.hxx,svx/shapeproperty.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galtheme.hxx,svx/galtheme.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/anchorid.hxx,svx/anchorid.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshprp.hxx,svx/unoshprp.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/viewlayoutitem.hxx,svx/viewlayoutitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmmodel.hxx,svx/fmmodel.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/scene3d.hxx,svx/scene3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmgridif.hxx,svx/fmgridif.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdasitm.hxx,svx/sdasitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrgmt.hxx,svx/svddrgmt.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnasit.hxx,svx/xlnasit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlndsit.hxx,svx/xlndsit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framelinkarray.hxx,svx/framelinkarray.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdetc.hxx,svx/svdetc.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmtit.hxx,svx/xflbmtit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtfsitm.hxx,svx/sdtfsitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/txencbox.hxx,svx/txencbox.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3ditem.hxx,svx/e3ditem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xoutbmp.hxx,svx/xoutbmp.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdotable.hxx,svx/svdotable.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshcit.hxx,svx/xftshcit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxlogitm.hxx,svx/sxlogitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxrooitm.hxx,svx/sxrooitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontwork.hxx,svx/fontwork.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcecitm.hxx,svx/sxcecitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdginitm.hxx,svx/sdginitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpntv.hxx,svx/svdpntv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontlb.hxx,svx/fontlb.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfillit0.hxx,svx/xfillit0.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xsflclit.hxx,svx/xsflclit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpageuser.hxx,svx/sdrpageuser.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xbtmpit.hxx,svx/xbtmpit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxids.hrc,svx/svxids.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galmisc.hxx,svx/galmisc.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmfsitm.hxx,svx/sxmfsitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrusioncolorcontrol.hxx,svx/extrusioncolorcontrol.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsrccfg.hxx,svx/fmsrccfg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pageitem.hxx,svx/pageitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpaintwindow.hxx,svx/sdrpaintwindow.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmkitm.hxx,svx/sxmkitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfillit.hxx,svx/xfillit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflftrit.hxx,svx/xflftrit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxopitm.hxx,svx/sxopitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unofill.hxx,svx/unofill.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/drawitem.hxx,svx/drawitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlgrhlp.hxx,svx/xmlgrhlp.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmresids.hrc,svx/fmresids.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomitem.hxx,svx/zoomitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtcfitm.hxx,svx/sdtcfitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdmetitm.hxx,svx/sdmetitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmtools.hxx,svx/fmtools.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntszctl.hxx,svx/fntszctl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsiitm.hxx,svx/sxsiitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxlayitm.hxx,svx/sxlayitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomid.hxx,svx/unomid.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/frmsel.hxx,svx/frmsel.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3dsceneupdater.hxx,svx/e3dsceneupdater.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdcrtv.hxx,svx/svdcrtv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/itemwin.hxx,svx/itemwin.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtfchim.hxx,svx/sdtfchim.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/wrapfield.hxx,svx/wrapfield.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctrl.hxx,svx/fntctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdxcgv.hxx,svx/svdxcgv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbtoolsclient.hxx,svx/dbtoolsclient.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rotmodit.hxx,svx/rotmodit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/layctrl.hxx,svx/layctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rectenum.hxx,svx/rectenum.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdopath.hxx,svx/svdopath.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshtxt.hxx,svx/unoshtxt.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdopage.hxx,svx/svdopage.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftadit.hxx,svx/xftadit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstcit.hxx,svx/xlnstcit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/splitcelldlg.hxx,svx/splitcelldlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdynitm.hxx,svx/sdynitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rulritem.hxx,svx/rulritem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fillctrl.hxx,svx/fillctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SvxShapeTypes.hxx,svx/SvxShapeTypes.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galctrl.hxx,svx/galctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdmod.hxx,svx/fmdmod.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/exthelpid.hrc,svx/exthelpid.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsearch.hxx,svx/fmsearch.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pfiledlg.hxx,svx/pfiledlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmovitm.hxx,svx/sxmovitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmsrcimp.hxx,svx/fmsrcimp.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsalitm.hxx,svx/sxsalitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoole2.hxx,svx/svdoole2.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdsnpv.hxx,svx/svdsnpv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gallery1.hxx,svx/gallery1.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/passwd.hxx,svx/passwd.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xgrscit.hxx,svx/xgrscit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglev.hxx,svx/svdglev.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontworkbar.hxx,svx/fontworkbar.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShapeGeometry.hxx,svx/EnhancedCustomShapeGeometry.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxitems.hrc,svx/svxitems.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmpage.hxx,svx/fmpage.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/srchdlg.hxx,svx/srchdlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcaitm.hxx,svx/sxcaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/subtoolboxcontrol.hxx,svx/subtoolboxcontrol.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdasaitm.hxx,svx/sdasaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbexch.hrc,svx/dbexch.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomaster.hxx,svx/unomaster.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdedtv.hxx,svx/svdedtv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlinjoit.hxx,svx/xlinjoit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmbritm.hxx,svx/sxmbritm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleGraphicShape.hxx,svx/AccessibleGraphicShape.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstit.hxx,svx/xlnstit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/volume3d.hxx,svx/volume3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/scheduler.hxx,svx/sdr/animation/scheduler.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/animationstate.hxx,svx/sdr/animation/animationstate.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/animation/objectanimator.hxx,svx/sdr/animation/objectanimator.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayhelpline.hxx,svx/sdr/overlay/overlayhelpline.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobjectcell.hxx,svx/sdr/overlay/overlayobjectcell.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaymanager.hxx,svx/sdr/overlay/overlaymanager.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx,svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobjectlist.hxx,svx/sdr/overlay/overlayobjectlist.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayhatchrect.hxx,svx/sdr/overlay/overlayhatchrect.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaytools.hxx,svx/sdr/overlay/overlaytools.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayselection.hxx,svx/sdr/overlay/overlayselection.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaytriangle.hxx,svx/sdr/overlay/overlaytriangle.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaypolypolygon.hxx,svx/sdr/overlay/overlaypolypolygon.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaymanagerbuffered.hxx,svx/sdr/overlay/overlaymanagerbuffered.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayrollingrectangle.hxx,svx/sdr/overlay/overlayrollingrectangle.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayline.hxx,svx/sdr/overlay/overlayline.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaycrosshair.hxx,svx/sdr/overlay/overlaycrosshair.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayobject.hxx,svx/sdr/overlay/overlayobject.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx,svx/sdr/overlay/overlayanimatedbitmapex.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/overlay/overlaybitmapex.hxx,svx/sdr/overlay/overlaybitmapex.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/event/eventhandler.hxx,svx/sdr/event/eventhandler.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/itemsettools.hxx,svx/sdr/properties/itemsettools.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/connectorproperties.hxx,svx/sdr/properties/connectorproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dlatheproperties.hxx,svx/sdr/properties/e3dlatheproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/circleproperties.hxx,svx/sdr/properties/circleproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dsphereproperties.hxx,svx/sdr/properties/e3dsphereproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/captionproperties.hxx,svx/sdr/properties/captionproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/customshapeproperties.hxx,svx/sdr/properties/customshapeproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/attributeproperties.hxx,svx/sdr/properties/attributeproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/rectangleproperties.hxx,svx/sdr/properties/rectangleproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/pageproperties.hxx,svx/sdr/properties/pageproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/oleproperties.hxx,svx/sdr/properties/oleproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/textproperties.hxx,svx/sdr/properties/textproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/emptyproperties.hxx,svx/sdr/properties/emptyproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dextrudeproperties.hxx,svx/sdr/properties/e3dextrudeproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/properties.hxx,svx/sdr/properties/properties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/defaultproperties.hxx,svx/sdr/properties/defaultproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dproperties.hxx,svx/sdr/properties/e3dproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/groupproperties.hxx,svx/sdr/properties/groupproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/graphicproperties.hxx,svx/sdr/properties/graphicproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dcompoundproperties.hxx,svx/sdr/properties/e3dcompoundproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/e3dsceneproperties.hxx,svx/sdr/properties/e3dsceneproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/properties/measureproperties.hxx,svx/sdr/properties/measureproperties.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/table/tabledesign.hxx,svx/sdr/table/tabledesign.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/primitiveFactory2d.hxx,svx/sdr/primitive2d/primitiveFactory2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx,svx/sdr/primitive2d/sdrpathprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx,svx/sdr/primitive2d/sdrtextprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrprimitivetools.hxx,svx/sdr/primitive2d/sdrprimitivetools.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx,svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx,svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx,svx/sdr/primitive2d/svx_primitivetypes2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx,svx/sdr/primitive2d/sdrdecompositiontools.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx,svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx,svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx,svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx,svx/sdr/primitive2d/sdrellipseprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx,svx/sdr/primitive2d/sdrole2primitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrattributecreator.hxx,svx/sdr/primitive2d/sdrattributecreator.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx,svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx,svx/sdr/primitive2d/sdrgrafprimitive2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx,svx/sdr/primitive3d/sdrattributecreator3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dextrude.hxx,svx/sdr/contact/viewcontactofe3dextrude.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofvirtobj.hxx,svx/sdr/contact/viewcontactofvirtobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dscene.hxx,svx/sdr/contact/viewcontactofe3dscene.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontacttools.hxx,svx/sdr/contact/objectcontacttools.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontact.hxx,svx/sdr/contact/objectcontact.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofpageobj.hxx,svx/sdr/contact/viewcontactofpageobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dcube.hxx,svx/sdr/contact/viewcontactofe3dcube.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx,svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx,svx/sdr/contact/viewobjectcontactofunocontrol.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontactofpageview.hxx,svx/sdr/contact/objectcontactofpageview.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx,svx/sdr/contact/viewcontactofe3dpolygon.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx,svx/sdr/contact/viewobjectcontactofsdrpage.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx,svx/sdr/contact/viewobjectcontactofsdrobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx,svx/sdr/contact/objectcontactofobjlistpainter.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx,svx/sdr/contact/viewobjectcontactofe3dscene.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontact.hxx,svx/sdr/contact/viewcontact.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx,svx/sdr/contact/viewobjectcontactofpageobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx,svx/sdr/contact/viewcontactofsdrcaptionobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx,svx/sdr/contact/viewcontactofsdrcircobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx,svx/sdr/contact/viewcontactofsdrole2obj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactoftextobj.hxx,svx/sdr/contact/viewcontactoftextobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrpage.hxx,svx/sdr/contact/viewcontactofsdrpage.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofunocontrol.hxx,svx/sdr/contact/viewcontactofunocontrol.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx,svx/sdr/contact/viewcontactofsdredgeobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx,svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofe3d.hxx,svx/sdr/contact/viewobjectcontactofe3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dsphere.hxx,svx/sdr/contact/viewcontactofe3dsphere.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx,svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3d.hxx,svx/sdr/contact/viewcontactofe3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontact.hxx,svx/sdr/contact/viewobjectcontact.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx,svx/sdr/contact/viewcontactofsdrpathobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx,svx/sdr/contact/viewcontactofsdrmediaobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx,svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofe3dlathe.hxx,svx/sdr/contact/viewcontactofe3dlathe.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx,svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofgraphic.hxx,svx/sdr/contact/viewcontactofgraphic.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactredirector.hxx,svx/sdr/contact/viewobjectcontactredirector.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx,svx/sdr/contact/viewobjectcontactofgraphic.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofgroup.hxx,svx/sdr/contact/viewcontactofgroup.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/displayinfo.hxx,svx/sdr/contact/displayinfo.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrobj.hxx,svx/sdr/contact/viewcontactofsdrobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx,svx/sdr/contact/viewcontactofsdrmeasureobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx,svx/sdr/contact/viewcontactofsdrrectobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/contact/viewobjectcontactofgroup.hxx,svx/sdr/contact/viewobjectcontactofgroup.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx,svx/sdr/attribute/sdrformtextoutlineattribute.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrformtextattribute.hxx,svx/sdr/attribute/sdrformtextattribute.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx,svx/sdr/attribute/sdrlineshadowtextattribute.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrfilltextattribute.hxx,svx/sdr/attribute/sdrfilltextattribute.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx,svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrshadowtextattribute.hxx,svx/sdr/attribute/sdrshadowtextattribute.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdr/attribute/sdrtextattribute.hxx,svx/sdr/attribute/sdrtextattribute.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialcontrol.hxx,svx/dialcontrol.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmlhitm.hxx,svx/sxmlhitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/optgenrl.hxx,svx/optgenrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshcol.hxx,svx/unoshcol.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtagitm.hxx,svx/sdtagitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftsfit.hxx,svx/xftsfit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdograf.hxx,svx/svdograf.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/cube3d.hxx,svx/cube3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnwtit.hxx,svx/xlnwtit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoom_def.hxx,svx/zoom_def.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/charmap.hxx,svx/charmap.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/connctrl.hxx,svx/connctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtacitm.hxx,svx/sdtacitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hyperdlg.hxx,svx/hyperdlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxctl.hxx,svx/tbxctl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/f3dchild.hxx,svx/f3dchild.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdogrp.hxx,svx/svdogrp.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/simptabl.hxx,svx/simptabl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxelditm.hxx,svx/sxelditm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomslideritem.hxx,svx/zoomslideritem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshtit.hxx,svx/xftshtit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/float3d.hxx,svx/float3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlntrit.hxx,svx/xlntrit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmodel.hxx,svx/svdmodel.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtext.hxx,svx/svdtext.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleTextHelper.hxx,svx/AccessibleTextHelper.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtayitm.hxx,svx/sdtayitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtmfitm.hxx,svx/sdtmfitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomsliderctrl.hxx,svx/zoomsliderctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polygn3d.hxx,svx/polygn3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglob.hxx,svx/svdglob.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/graphctl.hxx,svx/graphctl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xpool.hxx,svx/xpool.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framelink.hxx,svx/framelink.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoprov.hxx,svx/unoprov.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/checklbx.hxx,svx/checklbx.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/selctrl.hxx,svx/selctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdggaitm.hxx,svx/sdggaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbtoxy.hxx,svx/xflbtoxy.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tabline.hxx,svx/tabline.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpool.hxx,svx/svdpool.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/stddlg.hxx,svx/stddlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/databaseregistrationui.hxx,svx/databaseregistrationui.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xdef.hxx,svx/xdef.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/algitem.hxx,svx/algitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxfiitm.hxx,svx/sxfiitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grfflt.hxx,svx/grfflt.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/databaselocationinput.hxx,svx/databaselocationinput.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmsuitm.hxx,svx/sxmsuitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialmgr.hxx,svx/dialmgr.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xdash.hxx,svx/xdash.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/grafctrl.hxx,svx/grafctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlineit0.hxx,svx/xlineit0.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xfltrit.hxx,svx/xfltrit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/viewpt3d.hxx,svx/viewpt3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbmsli.hxx,svx/xflbmsli.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmoitm.hxx,svx/sxmoitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/htmlmode.hxx,svx/htmlmode.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlsecctrl.hxx,svx/xmlsecctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svx3ditems.hxx,svx/svx3ditems.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/camera3d.hxx,svx/camera3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/measctrl.hxx,svx/measctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdooitm.hxx,svx/sdooitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpage.hxx,svx/svdpage.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdsob.hxx,svx/svdsob.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshcitm.hxx,svx/sdshcitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaitm.hxx,svx/sdtaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtrans.hxx,svx/svdtrans.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgtritm.hxx,svx/sdgtritm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxdraw.hxx,svx/tbxdraw.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdprcitm.hxx,svx/sdprcitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomodel.hxx,svx/unomodel.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleViewForwarderListener.hxx,svx/IAccessibleViewForwarderListener.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdlayer.hxx,svx/svdlayer.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflasit.hxx,svx/xflasit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflclit.hxx,svx/xflclit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxsaitm.hxx,svx/sxsaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/verttexttbxctrl.hxx,svx/verttexttbxctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/contdlg.hxx,svx/contdlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxerr.hxx,svx/svxerr.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpagv.hxx,svx/svdpagv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdocapt.hxx,svx/svdocapt.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdfield.hxx,svx/svdfield.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/relfld.hxx,svx/relfld.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShapeInfo.hxx,svx/AccessibleShapeInfo.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numvset.hxx,svx/numvset.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrcomment.hxx,svx/sdrcomment.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/txenctab.hxx,svx/txenctab.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdorect.hxx,svx/svdorect.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshit.hxx,svx/xftshit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pagectrl.hxx,svx/pagectrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxreoitm.hxx,svx/sxreoitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdtypes.hxx,svx/svdtypes.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ucsubset.hrc,svx/ucsubset.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/pszctrl.hxx,svx/pszctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattrx.hxx,svx/svdattrx.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtditm.hxx,svx/sdtditm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframevalidation.hxx,svx/swframevalidation.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xgrad.hxx,svx/xgrad.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdpoev.hxx,svx/svdpoev.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbckit.hxx,svx/xflbckit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtextit0.hxx,svx/xtextit0.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxreaitm.hxx,svx/sxreaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/lboxctrl.hxx,svx/lboxctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontworkgallery.hxx,svx/fontworkgallery.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ShapeTypeHandler.hxx,svx/ShapeTypeHandler.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdstr.hrc,svx/svdstr.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svditext.hxx,svx/svditext.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxekitm.hxx,svx/sxekitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxgrahicitem.hxx,svx/svxgrahicitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbstit.hxx,svx/xflbstit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/galbrws.hxx,svx/galbrws.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unomod.hxx,svx/unomod.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnclit.hxx,svx/xlnclit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/deflt3d.hxx,svx/deflt3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/e3dundo.hxx,svx/e3dundo.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ChildrenManager.hxx,svx/ChildrenManager.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmgridcl.hxx,svx/fmgridcl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdobj.hxx,svx/svdobj.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtaitm.hxx,svx/sxmtaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/clipboardctl.hxx,svx/clipboardctl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xtable.hxx,svx/xtable.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgcoitm.hxx,svx/sdgcoitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdovirt.hxx,svx/svdovirt.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmshell.hxx,svx/fmshell.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleParent.hxx,svx/IAccessibleParent.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmark.hxx,svx/svdmark.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/strarray.hxx,svx/strarray.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgluitm.hxx,svx/sdgluitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtakitm.hxx,svx/sdtakitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SpellDialogChildWindow.hxx,svx/SpellDialogChildWindow.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xexch.hxx,svx/xexch.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gallery.hxx,svx/gallery.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgctrl.hxx,svx/dlgctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/DescriptionGenerator.hxx,svx/DescriptionGenerator.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xenum.hxx,svx/xenum.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/numfmtsh.hxx,svx/numfmtsh.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmglob.hxx,svx/fmglob.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/framebordertype.hxx,svx/framebordertype.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdomeas.hxx,svx/svdomeas.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/insctrl.hxx,svx/insctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoedge.hxx,svx/svdoedge.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/bmpmask.hxx,svx/bmpmask.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdshitm.hxx,svx/sdshitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddef.hxx,svx/svddef.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbcontrl.hxx,svx/tbcontrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dstribut_enum.hxx,svx/dstribut_enum.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcllitm.hxx,svx/sxcllitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/rubydialog.hxx,svx/rubydialog.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ipolypolygoneditorcontroller.hxx,svx/ipolypolygoneditorcontroller.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleOLEShape.hxx,svx/AccessibleOLEShape.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrusionbar.hxx,svx/extrusionbar.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleControlShape.hxx,svx/AccessibleControlShape.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/paraprev.hxx,svx/paraprev.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftshxy.hxx,svx/xftshxy.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcustomshapes.hxx,svx/tbxcustomshapes.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrhittesthelper.hxx,svx/sdrhittesthelper.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdviter.hxx,svx/svdviter.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ofaitem.hxx,svx/ofaitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/frmdirlbox.hxx,svx/frmdirlbox.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/EnhancedCustomShape2d.hxx,svx/EnhancedCustomShape2d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxoneitm.hxx,svx/sxoneitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/msdffdef.hxx,svx/msdffdef.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globl3d.hxx,svx/globl3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xattr.hxx,svx/xattr.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmuitm.hxx,svx/sxmuitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdsxyitm.hxx,svx/sdsxyitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/postattr.hxx,svx/postattr.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoattr.hxx,svx/svdoattr.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/prtqry.hxx,svx/prtqry.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sphere3d.hxx,svx/sphere3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdomedia.hxx,svx/svdomedia.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflboxy.hxx,svx/xflboxy.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframeposstrings.hxx,svx/swframeposstrings.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svditer.hxx,svx/svditer.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmspitm.hxx,svx/sxmspitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmobjfac.hxx,svx/fmobjfac.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdocirc.hxx,svx/svdocirc.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxdlg.hxx,svx/svxdlg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxenditm.hxx,svx/sxenditm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/def3d.hxx,svx/def3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/UnoNamespaceMap.hxx,svx/UnoNamespaceMap.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxciaitm.hxx,svx/sxciaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/polypolygoneditor.hxx,svx/polypolygoneditor.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgmoitm.hxx,svx/sdgmoitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/linectrl.hxx,svx/linectrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedcit.hxx,svx/xlnedcit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmsitm.hxx,svx/sxmsitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaditm.hxx,svx/sdtaditm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdotext.hxx,svx/svdotext.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/chrtitem.hxx,svx/chrtitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xbitmap.hxx,svx/xbitmap.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxallitm.hxx,svx/sxallitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dlgutil.hxx,svx/dlgutil.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unopage.hxx,svx/unopage.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrag.hxx,svx/svddrag.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShapeTreeInfo.hxx,svx/AccessibleShapeTreeInfo.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcgitm.hxx,svx/sxcgitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedwit.hxx,svx/xlnedwit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdouno.hxx,svx/svdouno.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrmasterpagedescriptor.hxx,svx/sdrmasterpagedescriptor.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxcikitm.hxx,svx/sxcikitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdoutl.hxx,svx/svdoutl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/shapepropertynotifier.hxx,svx/shapepropertynotifier.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxctitm.hxx,svx/sxctitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dbaexchange.hxx,svx/dbaexchange.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtritm.hxx,svx/sxmtritm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrobjectuser.hxx,svx/sdrobjectuser.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/AccessibleShape.hxx,svx/AccessibleShape.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hlnkitem.hxx,svx/hlnkitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xhatch.hxx,svx/xhatch.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/swframeexample.hxx,svx/swframeexample.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnstwit.hxx,svx/xlnstwit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xit.hxx,svx/xit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdhlpln.hxx,svx/svdhlpln.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ctredlin.hxx,svx/ctredlin.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/lathe3d.hxx,svx/lathe3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/optgrid.hxx,svx/optgrid.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/langbox.hxx,svx/langbox.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/clipfmtitem.hxx,svx/clipfmtitem.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xsetit.hxx,svx/xsetit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tabarea.hxx,svx/tabarea.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/SmartTagCtl.hxx,svx/SmartTagCtl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxcolor.hxx,svx/tbxcolor.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdmrkv.hxx,svx/svdmrkv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/modctrl.hxx,svx/modctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoapi.hxx,svx/unoapi.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ruler.hxx,svx/ruler.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrobjectfilter.hxx,svx/sdrobjectfilter.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtfitm.hxx,svx/sxmtfitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdundo.hxx,svx/svdundo.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/hdft.hxx,svx/hdft.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmlexchg.hxx,svx/xmlexchg.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/IAccessibleViewForwarder.hxx,svx/IAccessibleViewForwarder.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/dialogs.hrc,svx/dialogs.hrc)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/extrud3d.hxx,svx/extrud3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unopool.hxx,svx/unopool.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflhtit.hxx,svx/xflhtit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xlnedit.hxx,svx/xlnedit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xmleohlp.hxx,svx/xmleohlp.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ifaceids.hxx,svx/ifaceids.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftouit.hxx,svx/xftouit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/selectioncontroller.hxx,svx/selectioncontroller.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdrpagewindow.hxx,svx/sdrpagewindow.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdgcpitm.hxx,svx/sdgcpitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/view3d.hxx,svx/view3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/unoshape.hxx,svx/unoshape.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflgrit.hxx,svx/xflgrit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/ActionDescriptionProvider.hxx,svx/ActionDescriptionProvider.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/gridctrl.hxx,svx/gridctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/tbxalign.hxx,svx/tbxalign.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svimbase.hxx,svx/svimbase.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/zoomctrl.hxx,svx/zoomctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svddrgv.hxx,svx/svddrgv.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/XPropertyTable.hxx,svx/XPropertyTable.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftstit.hxx,svx/xftstit.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdglue.hxx,svx/svdglue.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/helperhittest3d.hxx,svx/helperhittest3d.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/flagsdef.hxx,svx/flagsdef.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sdtaaitm.hxx,svx/sdtaaitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmview.hxx,svx/fmview.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxdllapi.h,svx/svxdllapi.h)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/colrctrl.hxx,svx/colrctrl.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdpage.hxx,svx/fmdpage.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtpitm.hxx,svx/sxmtpitm.hxx)) +$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globlmn.hrc,globlmn_tmpl.hrc)) + diff --git a/svx/source/sdr/event/makefile.mk b/svx/Package_sdi.mk index ff379af6be..0a43a1ae7b 100644..100755 --- a/svx/source/sdr/event/makefile.mk +++ b/svx/Package_sdi.mk @@ -2,7 +2,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2010 Oracle and/or its affiliates. +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,20 +25,9 @@ # #************************************************************************* -PRJ=..$/..$/.. +$(eval $(call gb_Package_Package,svx_sdi,$(SRCDIR)/svx/sdi)) +$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/svx.sdi,svx.sdi)) +$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/svxitems.sdi,svxitems.sdi)) +$(eval $(call gb_Package_add_file,svx_sdi,inc/svx/xoitems.sdi,xoitems.sdi)) -PRJNAME=svx -TARGET=event -ENABLE_EXCEPTIONS=TRUE -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/eventhandler.obj - -.INCLUDE : target.mk diff --git a/svx/doc/UML/edit_engine_UNO_implementation.zuml b/svx/doc/UML/edit_engine_UNO_implementation.zuml index d0faf5adec..d0faf5adec 100644..100755 --- a/svx/doc/UML/edit_engine_UNO_implementation.zuml +++ b/svx/doc/UML/edit_engine_UNO_implementation.zuml diff --git a/svx/doc/UML/grid_control_implementation.zuml b/svx/doc/UML/grid_control_implementation.zuml Binary files differindex 139cd3fd8b..139cd3fd8b 100644..100755 --- a/svx/doc/UML/grid_control_implementation.zuml +++ b/svx/doc/UML/grid_control_implementation.zuml diff --git a/svx/doc/UML/readme.txt b/svx/doc/UML/readme.txt index 7b9fc0a73a..7b9fc0a73a 100644..100755 --- a/svx/doc/UML/readme.txt +++ b/svx/doc/UML/readme.txt diff --git a/svx/doc/drawing_layer_UNO_objects.odg b/svx/doc/drawing_layer_UNO_objects.odg Binary files differindex 69b0ceb44f..69b0ceb44f 100644..100755 --- a/svx/doc/drawing_layer_UNO_objects.odg +++ b/svx/doc/drawing_layer_UNO_objects.odg diff --git a/svx/inc/accessibility.hrc b/svx/inc/accessibility.hrc index 372bddd215..372bddd215 100644..100755 --- a/svx/inc/accessibility.hrc +++ b/svx/inc/accessibility.hrc diff --git a/svx/inc/dgdefs_.hxx b/svx/inc/dgdefs_.hxx index 18436c3ac4..18436c3ac4 100644..100755 --- a/svx/inc/dgdefs_.hxx +++ b/svx/inc/dgdefs_.hxx diff --git a/svx/inc/dialdll.hxx b/svx/inc/dialdll.hxx index 7d01b3cc9c..7d01b3cc9c 100644..100755 --- a/svx/inc/dialdll.hxx +++ b/svx/inc/dialdll.hxx diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx index 5226f35838..575e415970 100644..100755 --- a/svx/inc/dragmt3d.hxx +++ b/svx/inc/dragmt3d.hxx @@ -88,7 +88,7 @@ public: SdrDragView &rView, const SdrMarkList& rMark, E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ, - BOOL bFull = FALSE); + sal_Bool bFull = sal_False); virtual void TakeSdrDragComment(String& rStr) const; virtual bool BeginSdrDrag(); @@ -119,7 +119,7 @@ public: SdrDragView &rView, const SdrMarkList& rMark, E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ, - BOOL bFull = FALSE); + sal_Bool bFull = sal_False); virtual void MoveSdrDrag(const Point& rPnt); virtual Pointer GetSdrDragPointer() const; @@ -144,7 +144,7 @@ public: const SdrMarkList& rMark, SdrHdlKind eDrgHdl = HDL_MOVE, E3dDragConstraint eConstr = E3DDRAG_CONSTR_XYZ, - BOOL bFull = FALSE); + sal_Bool bFull = sal_False); virtual void MoveSdrDrag(const Point& rPnt); virtual Pointer GetSdrDragPointer() const; diff --git a/svx/inc/drawuiks.hxx b/svx/inc/drawuiks.hxx index 84bc939055..84bc939055 100644..100755 --- a/svx/inc/drawuiks.hxx +++ b/svx/inc/drawuiks.hxx diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx index 475622c3f3..475622c3f3 100644..100755 --- a/svx/inc/extrusiondepthdialog.hxx +++ b/svx/inc/extrusiondepthdialog.hxx diff --git a/svx/inc/float3d.hrc b/svx/inc/float3d.hrc index 18856789be..1ca50e09fa 100644..100755 --- a/svx/inc/float3d.hrc +++ b/svx/inc/float3d.hrc @@ -141,3 +141,6 @@ #define FL_MAT_SPECULAR 123 #define FT_MAT_FAVORITES 124 #define LB_MAT_FAVORITES 125 + +// IAccessibility2 implementation +#define STR_COLOR_LIGHT_PRE 162 diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index f40993facc..5458ab9a04 100644..100755 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -27,91 +27,87 @@ #ifndef _SVX_FMHELP_HRC #define _SVX_FMHELP_HRC -// include ----------------------------------------------------------- -#include <svl/solar.hrc> - -// in solar.hrc -//#define HID_FORMS_START (HID_LIB_START+4000) -//#define HID_FORMS_END (HID_LIB_START+4999) - // Help-Ids -------------------------------------------------------------- -#define HID_DLG_DBMSG ( HID_FORMS_START + 1) -#define HID_FORM_NAVIGATOR ( HID_FORMS_START + 2) -#define HID_FORM_NAVIGATOR_WIN ( HID_FORMS_START + 3) -#define HID_FIELD_SEL ( HID_FORMS_START + 4) -#define HID_FIELD_SEL_WIN ( HID_FORMS_START + 5) -#define HID_FILTER_NAVIGATOR ( HID_FORMS_START + 6) -#define HID_FILTER_NAVIGATOR_WIN ( HID_FORMS_START + 7) -#define HID_FM_DLG_SEARCH ( HID_FORMS_START + 8) -#define HID_SEARCH_TEXT ( HID_FORMS_START + 9) -#define HID_SEARCH_ALLFIELDS ( HID_FORMS_START + 10) -//#define HID_SEARCH_SINGLEFIELD ( HID_FORMS_START + 11) -#define HID_SEARCH_FIELDSELECTION ( HID_FORMS_START + 12) -#define HID_SEARCH_POSITION ( HID_FORMS_START + 13) -#define HID_SEARCH_FORMATTER ( HID_FORMS_START + 14) -#define HID_SEARCH_CASE ( HID_FORMS_START + 15) -#define HID_SEARCH_BACKWARD ( HID_FORMS_START + 16) -#define HID_SEARCH_STARTOVER ( HID_FORMS_START + 17) -#define HID_SEARCH_WILDCARD ( HID_FORMS_START + 18) -#define HID_SEARCH_REGULAR ( HID_FORMS_START + 19) -#define HID_SEARCH_APPROX ( HID_FORMS_START + 20) -#define HID_SEARCH_APPROXSETTINGS ( HID_FORMS_START + 21) -#define HID_SEARCH_BTN_SEARCH ( HID_FORMS_START + 22) -#define HID_SEARCH_BTN_CLOSE ( HID_FORMS_START + 23) -#define HID_CONTROLS_DATE_N_TIME ( HID_FORMS_START + 24) -#define HID_GRID_TRAVEL_FIRST ( HID_FORMS_START + 25) -#define HID_GRID_TRAVEL_PREV ( HID_FORMS_START + 26) -#define HID_GRID_TRAVEL_NEXT ( HID_FORMS_START + 27) -#define HID_GRID_TRAVEL_LAST ( HID_FORMS_START + 28) -#define HID_GRID_TRAVEL_NEW ( HID_FORMS_START + 29) -#define HID_GRID_TRAVEL_ABSOLUTE ( HID_FORMS_START + 30) -#define HID_GRID_NUMBEROFRECORDS ( HID_FORMS_START + 31) -#define UID_SEARCH_RECORDSTATUS ( HID_FORMS_START + 32) -#define UID_FORMPROPBROWSER_FRAME ( HID_FORMS_START + 33) -#define UID_ABSOLUTE_RECORD_WINDOW ( HID_FORMS_START + 34) -#define HID_DATA_NAVIGATOR_WIN ( HID_FORMS_START + 35) -#define HID_XFORMS_ADDDATAITEM_DLG ( HID_FORMS_START + 36) -#define HID_XFORMS_ADDCONDITION_DLG ( HID_FORMS_START + 37) -#define HID_XFORMS_NAMESPACEITEM_DLG ( HID_FORMS_START + 38) -#define HID_XFORMS_NAMESPACEITEM_LIST ( HID_FORMS_START + 39) -#define HID_XFORMS_MANAGENAMESPACE_DLG ( HID_FORMS_START + 40) -//#define HID_TP_XFORMS_INSTANCE ( HID_FORMS_START + 41) -//#define HID_TP_XFORMS_SUBMISSION ( HID_FORMS_START + 42) -//#define HID_TP_XFORMS_BINDING ( HID_FORMS_START + 43) -#define HID_MN_XFORMS_MODELS_ADD ( HID_FORMS_START + 44) -#define HID_MN_XFORMS_MODELS_EDIT ( HID_FORMS_START + 45) -#define HID_MN_XFORMS_MODELS_REMOVE ( HID_FORMS_START + 46) -#define HID_MN_XFORMS_INSTANCES_ADD ( HID_FORMS_START + 47) -#define HID_MN_XFORMS_INSTANCES_EDIT ( HID_FORMS_START + 48) -#define HID_MN_XFORMS_INSTANCES_REMOVE ( HID_FORMS_START + 49) -#define HID_MN_XFORMS_SHOW_DETAILS ( HID_FORMS_START + 50) -#define HID_XFORMS_TOOLBOX ( HID_FORMS_START + 51) -#define HID_XFORMS_TOOLBOX_ITEM_ADD ( HID_FORMS_START + 52) -#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT ( HID_FORMS_START + 53) -#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE ( HID_FORMS_START + 54) -#define HID_XFORMS_TOOLBOX_ITEM_EDIT ( HID_FORMS_START + 55) -#define HID_XFORMS_TOOLBOX_ITEM_REMOVE ( HID_FORMS_START + 56) -#define HID_XFORMS_ITEMS_LIST ( HID_FORMS_START + 57) -#define HID_XFORMS_MODELS_LIST ( HID_FORMS_START + 58) -#define HID_XFORMS_MODELS_MENUBTN ( HID_FORMS_START + 59) -#define HID_XFORMS_INSTANCES_MENUBTN ( HID_FORMS_START + 60) -#define HID_XFORMS_ADDSUBMISSION_DLG ( HID_FORMS_START + 61) -#define HID_XFORMS_ADDMODEL_DLG ( HID_FORMS_START + 62) -#define HID_XFORMS_ADDINSTANCE_DLG ( HID_FORMS_START + 63) -#define HID_XFORMS_MID_INSERT_CONTROL ( HID_FORMS_START + 64) -#define HID_XFORMS_TAB_CONTROL ( HID_FORMS_START + 65) - // if you add a new define here, please adjust the overflow check - // at the end of the file!! - -// ----------------------------------------------------------------------- -// Overflow check -------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_FM_HID_END HID_XFORMS_TAB_CONTROL - -#if ACT_FM_HID_END > HID_FORMS_END -#error Resource overflow in #line, #file -#endif +#define HID_DLG_DBMSG "SVX_HID_DLG_DBMSG" +#define HID_FORM_NAVIGATOR "SVX_HID_FORM_NAVIGATOR" +#define HID_FORM_NAVIGATOR_WIN "SVX_HID_FORM_NAVIGATOR_WIN" +#define HID_FIELD_SEL "SVX_HID_FIELD_SEL" +#define HID_FIELD_SEL_WIN "SVX_HID_FIELD_SEL_WIN" +#define HID_FILTER_NAVIGATOR "SVX_HID_FILTER_NAVIGATOR" +#define HID_FILTER_NAVIGATOR_WIN "SVX_HID_FILTER_NAVIGATOR_WIN" +#define HID_FM_DLG_SEARCH "SVX_HID_FM_DLG_SEARCH" +#define HID_SEARCH_TEXT "SVX_HID_SEARCH_TEXT" +#define HID_SEARCH_ALLFIELDS "SVX_HID_SEARCH_ALLFIELDS" +#define HID_SEARCH_FIELDSELECTION "SVX_HID_SEARCH_FIELDSELECTION" +#define HID_SEARCH_POSITION "SVX_HID_SEARCH_POSITION" +#define HID_SEARCH_FORMATTER "SVX_HID_SEARCH_FORMATTER" +#define HID_SEARCH_CASE "SVX_HID_SEARCH_CASE" +#define HID_SEARCH_BACKWARD "SVX_HID_SEARCH_BACKWARD" +#define HID_SEARCH_STARTOVER "SVX_HID_SEARCH_STARTOVER" +#define HID_SEARCH_WILDCARD "SVX_HID_SEARCH_WILDCARD" +#define HID_SEARCH_REGULAR "SVX_HID_SEARCH_REGULAR" +#define HID_SEARCH_APPROX "SVX_HID_SEARCH_APPROX" +#define HID_SEARCH_APPROXSETTINGS "SVX_HID_SEARCH_APPROXSETTINGS" +#define HID_SEARCH_BTN_SEARCH "SVX_HID_SEARCH_BTN_SEARCH" +#define HID_SEARCH_BTN_CLOSE "SVX_HID_SEARCH_BTN_CLOSE" +#define HID_CONTROLS_DATE_N_TIME "SVX_HID_CONTROLS_DATE_N_TIME" +#define HID_GRID_TRAVEL_FIRST "SVX_HID_GRID_TRAVEL_FIRST" +#define HID_GRID_TRAVEL_PREV "SVX_HID_GRID_TRAVEL_PREV" +#define HID_GRID_TRAVEL_NEXT "SVX_HID_GRID_TRAVEL_NEXT" +#define HID_GRID_TRAVEL_LAST "SVX_HID_GRID_TRAVEL_LAST" +#define HID_GRID_TRAVEL_NEW "SVX_HID_GRID_TRAVEL_NEW" +#define HID_GRID_TRAVEL_ABSOLUTE "SVX_HID_GRID_TRAVEL_ABSOLUTE" +#define HID_GRID_NUMBEROFRECORDS "SVX_HID_GRID_NUMBEROFRECORDS" +#define UID_SEARCH_RECORDSTATUS "SVX_UID_SEARCH_RECORDSTATUS" +#define UID_FORMPROPBROWSER_FRAME "SVX_UID_FORMPROPBROWSER_FRAME" +#define UID_ABSOLUTE_RECORD_WINDOW "SVX_UID_ABSOLUTE_RECORD_WINDOW" +#define HID_DATA_NAVIGATOR_WIN "SVX_HID_DATA_NAVIGATOR_WIN" +#define HID_XFORMS_ADDDATAITEM_DLG "SVX_HID_XFORMS_ADDDATAITEM_DLG" +#define HID_XFORMS_ADDCONDITION_DLG "SVX_HID_XFORMS_ADDCONDITION_DLG" +#define HID_XFORMS_NAMESPACEITEM_DLG "SVX_HID_XFORMS_NAMESPACEITEM_DLG" +#define HID_XFORMS_NAMESPACEITEM_LIST "SVX_HID_XFORMS_NAMESPACEITEM_LIST" +#define HID_XFORMS_MANAGENAMESPACE_DLG "SVX_HID_XFORMS_MANAGENAMESPACE_DLG" +#define HID_MN_XFORMS_MODELS_ADD "SVX_HID_MN_XFORMS_MODELS_ADD" +#define HID_MN_XFORMS_MODELS_EDIT "SVX_HID_MN_XFORMS_MODELS_EDIT" +#define HID_MN_XFORMS_MODELS_REMOVE "SVX_HID_MN_XFORMS_MODELS_REMOVE" +#define HID_MN_XFORMS_INSTANCES_ADD "SVX_HID_MN_XFORMS_INSTANCES_ADD" +#define HID_MN_XFORMS_INSTANCES_EDIT "SVX_HID_MN_XFORMS_INSTANCES_EDIT" +#define HID_MN_XFORMS_INSTANCES_REMOVE "SVX_HID_MN_XFORMS_INSTANCES_REMOVE" +#define HID_MN_XFORMS_SHOW_DETAILS "SVX_HID_MN_XFORMS_SHOW_DETAILS" +#define HID_XFORMS_TOOLBOX "SVX_HID_XFORMS_TOOLBOX" +#define HID_XFORMS_TOOLBOX_ITEM_ADD "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD" +#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT" +#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE" +#define HID_XFORMS_TOOLBOX_ITEM_EDIT "SVX_HID_XFORMS_TOOLBOX_ITEM_EDIT" +#define HID_XFORMS_TOOLBOX_ITEM_REMOVE "SVX_HID_XFORMS_TOOLBOX_ITEM_REMOVE" +#define HID_XFORMS_ITEMS_LIST "SVX_HID_XFORMS_ITEMS_LIST" +#define HID_XFORMS_MODELS_LIST "SVX_HID_XFORMS_MODELS_LIST" +#define HID_XFORMS_MODELS_MENUBTN "SVX_HID_XFORMS_MODELS_MENUBTN" +#define HID_XFORMS_INSTANCES_MENUBTN "SVX_HID_XFORMS_INSTANCES_MENUBTN" +#define HID_XFORMS_ADDSUBMISSION_DLG "SVX_HID_XFORMS_ADDSUBMISSION_DLG" +#define HID_XFORMS_ADDMODEL_DLG "SVX_HID_XFORMS_ADDMODEL_DLG" +#define HID_XFORMS_ADDINSTANCE_DLG "SVX_HID_XFORMS_ADDINSTANCE_DLG" +#define HID_XFORMS_MID_INSERT_CONTROL "SVX_HID_XFORMS_MID_INSERT_CONTROL" +#define HID_XFORMS_TAB_CONTROL "SVX_HID_XFORMS_TAB_CONTROL" +#define HID_FM_DELETEROWS "SVX_HID_FM_DELETEROWS" +#define HID_FM_INSERTCOL "SVX_HID_FM_INSERTCOL" +#define HID_FM_CHANGECOL "SVX_HID_FM_CHANGECOL" +#define HID_FM_DELETECOL "SVX_HID_FM_DELETECOL" +#define HID_FM_HIDECOL "SVX_HID_FM_HIDECOL" +#define HID_FM_SHOWCOLS "SVX_HID_FM_SHOWCOLS" +#define HID_FM_SHOWCOLS_MORE "SVX_HID_FM_SHOWCOLS_MORE" +#define HID_FM_SHOWALLCOLS "SVX_HID_FM_SHOWALLCOLS" +#define HID_FM_DELETE "SVX_HID_FM_DELETE" +#define HID_FM_FILTER_EDIT "SVX_HID_FM_EDIT" +#define HID_FM_FILTER_IS_NULL "SVX_HID_FM_FILTER_IS_NULL" +#define HID_FM_FILTER_IS_NOT_NULL "SVX_HID_FM_IS_NOT_NULL" +#define HID_FM_NEW "SVX_HID_FM_NEW" +#define HID_FM_NEW_FORM "SVX_HID_FM_NEW_FORM" +#define HID_FM_NEW_HIDDEN "SVX_HID_FM_NEW_HIDDEN" +#define HID_FM_RENAME_OBJECT "SVX_HID_FM_RENAME_OBJECT" +#define HID_MENU_FM_TEXTATTRIBUTES_STYLE "SVX_HID_MENU_FM_TEXTATTRIBUTES_STYLE" +#define HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT "SVX_HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT" +#define HID_MENU_FM_TEXTATTRIBUTES_SPACING "SVX_HID_MENU_FM_TEXTATTRIBUTES_SPACING" #endif diff --git a/svx/inc/fontworkgallery.hrc b/svx/inc/fontworkgallery.hrc index 6288c7beea..6288c7beea 100644..100755 --- a/svx/inc/fontworkgallery.hrc +++ b/svx/inc/fontworkgallery.hrc diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index dab48bd18a..20306605a7 100644..100755 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -37,7 +37,7 @@ #include <svtools/transfer.hxx> #include <svl/lstner.hxx> #include <svtools/miscopt.hxx> -#include "galbrws.hxx" +#include "svx/galbrws.hxx" // ---------------------- // - GalleryBrowserMode - @@ -118,18 +118,18 @@ private: FixedLine maSeparator; FixedText maInfoBar; Point maDragStartPos; - ULONG mnCurActionPos; + sal_uIntPtr mnCurActionPos; GalleryBrowserMode meMode; GalleryBrowserMode meLastMode; - BOOL mbCurActionIsLinkage; + sal_Bool mbCurActionIsLinkage; void InitSettings(); - void ImplUpdateViews( USHORT nSelectionId ); + void ImplUpdateViews( sal_uInt16 nSelectionId ); void ImplUpdateInfoBar(); - ULONG ImplGetSelectedItemId( const Point* pSelPosPixel, Point& rSelPos ); - void ImplSelectItemId( ULONG nItemId ); - void ImplExecute( USHORT nId ); + sal_uIntPtr ImplGetSelectedItemId( const Point* pSelPosPixel, Point& rSelPos ); + void ImplSelectItemId( sal_uIntPtr nItemId ); + void ImplExecute( sal_uInt16 nId ); // Control virtual void Resize(); @@ -149,7 +149,7 @@ private: public: - static String GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, ULONG nItemTextFlags ); + static String GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, sal_uIntPtr nItemTextFlags ); public: @@ -168,15 +168,15 @@ public: INetURLObject GetURL() const; String GetFilterName() const; Graphic GetGraphic() const; - BOOL GetVCDrawModel( FmFormModel& rModel ) const; - BOOL IsLinkage() const; + sal_Bool GetVCDrawModel( FmFormModel& rModel ) const; + sal_Bool IsLinkage() const; sal_Int8 AcceptDrop( DropTargetHelper& rTarget, const AcceptDropEvent& rEvt ); sal_Int8 ExecuteDrop( DropTargetHelper& rTarget, const ExecuteDropEvent& rEvt ); void StartDrag( Window* pWindow, const Point* pDragPoint = NULL ); void TogglePreview( Window* pWindow, const Point* pPreviewPoint = NULL ); void ShowContextMenu( Window* pWindow, const Point* pContextPoint = NULL ); - BOOL KeyInput( const KeyEvent& rEvt, Window* pWindow ); + sal_Bool KeyInput( const KeyEvent& rEvt, Window* pWindow ); }; #endif diff --git a/svx/inc/gallery.hrc b/svx/inc/gallery.hrc index 2a02de4ccb..2a02de4ccb 100644..100755 --- a/svx/inc/gallery.hrc +++ b/svx/inc/gallery.hrc diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx index 91de8cf4cf..eb175c0bd6 100644..100755 --- a/svx/inc/galobj.hxx +++ b/svx/inc/galobj.hxx @@ -84,13 +84,13 @@ protected: INetURLObject aURL; String aUserName; String aTitle; - BOOL bIsValid; - BOOL bIsThumbBmp; + sal_Bool bIsValid; + sal_Bool bIsThumbBmp; virtual void WriteData( SvStream& rOut, const String& rDestDir ) const; - virtual void ReadData( SvStream& rIn, UINT16& rReadVersion ); + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ); - BOOL CreateThumb( const Graphic& rGraphic ); + sal_Bool CreateThumb( const Graphic& rGraphic ); public: @@ -98,13 +98,13 @@ public: virtual ~SgaObject() {}; virtual SgaObjKind GetObjKind() const = 0; - virtual UINT16 GetVersion() const = 0; + virtual sal_uInt16 GetVersion() const = 0; virtual Bitmap GetThumbBmp() const { return aThumbBmp; } const GDIMetaFile& GetThumbMtf() const { return aThumbMtf; } const INetURLObject& GetURL() const { return aURL; } - BOOL IsValid() const { return bIsValid; } - BOOL IsThumbBitmap() const { return bIsThumbBmp; } + sal_Bool IsValid() const { return bIsValid; } + sal_Bool IsThumbBitmap() const { return bIsThumbBmp; } const String GetTitle() const; void SetTitle( const String& rTitle ); @@ -124,9 +124,9 @@ private: GalSoundType eSoundType; virtual void WriteData( SvStream& rOut, const String& rDestDir ) const; - virtual void ReadData( SvStream& rIn, UINT16& rReadVersion ); + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ); - virtual UINT16 GetVersion() const { return 6; } + virtual sal_uInt16 GetVersion() const { return 6; } public: @@ -151,12 +151,12 @@ class SgaObjectSvDraw : public SgaObject private: - BOOL CreateThumb( const FmFormModel& rModel ); + sal_Bool CreateThumb( const FmFormModel& rModel ); virtual void WriteData( SvStream& rOut, const String& rDestDir ) const; - virtual void ReadData( SvStream& rIn, UINT16& rReadVersion ); + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ); - virtual UINT16 GetVersion() const { return 5; } + virtual sal_uInt16 GetVersion() const { return 5; } public: @@ -169,7 +169,7 @@ public: public: - static BOOL DrawCentered( OutputDevice* pOut, const FmFormModel& rModel ); + static sal_Bool DrawCentered( OutputDevice* pOut, const FmFormModel& rModel ); }; // ---------------- @@ -183,9 +183,9 @@ private: void Init( const Graphic& rGraphic, const INetURLObject& rURL ); virtual void WriteData( SvStream& rOut, const String& rDestDir ) const; - virtual void ReadData( SvStream& rIn, UINT16& rReadVersion ); + virtual void ReadData( SvStream& rIn, sal_uInt16& rReadVersion ); - virtual UINT16 GetVersion() const { return 5; } + virtual sal_uInt16 GetVersion() const { return 5; } public: diff --git a/svx/inc/galtheme.hrc b/svx/inc/galtheme.hrc index adf0837dbb..adf0837dbb 100644..100755 --- a/svx/inc/galtheme.hrc +++ b/svx/inc/galtheme.hrc diff --git a/svx/inc/globlac.hrc b/svx/inc/globlac.hrc deleted file mode 100644 index b51334d0f8..0000000000 --- a/svx/inc/globlac.hrc +++ /dev/null @@ -1,223 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _GLOBALACC_SRC -#define _GLOBALACC_SRC - -#define ACC_CODE( Id, c, bSh, bM1, bM2 ) \ - AcceleratorItem { Identifier = Id; \ - Key = KeyCode { Code = c ; \ - Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; }; }; - -#define ACC_FUNC( Id, f ) \ - AcceleratorItem { Identifier = Id; \ - Key = KeyCode { Function = f ; }; }; - -#define ACC_KEY( language, c, bSh, bM1, bM2 ) \ - Key[ language ] = KeyCode { Code = c ; \ - Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; }; - -#define ACC_DEF_KEY( c, bSh, bM1, bM2 ) \ - Key = KeyCode { Code = c ; \ - Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; }; - - -#define AI_HELPINDEX ACC_CODE( SID_HELPINDEX, KEY_F1, FALSE, TRUE, FALSE ) - -#define AI_ATTR_CHAR ACC_CODE( SID_ATTR_CHAR, KEY_F2, FALSE, FALSE, FALSE ) -// new shortcut F9 for starting slide-show (see #73417#) -#define AI_PRESENTATION ACC_CODE( SID_PRESENTATION, KEY_F9, FALSE, FALSE, FALSE ) -// formerly used shortcut Ctrl-F2. Still used (in sd) for compatibility -#define AI_PRESENTATION_COMPAT ACC_CODE( SID_PRESENTATION, KEY_F2, FALSE, TRUE, FALSE ) -#define AI_ENTER_GROUP ACC_CODE( SID_ENTER_GROUP, KEY_F3, FALSE, FALSE, FALSE ) -#define AI_COPYOBJECTS ACC_CODE( SID_COPYOBJECTS, KEY_F3, TRUE, FALSE, FALSE ) -#define AI_LEAVE_GROUP ACC_CODE( SID_LEAVE_GROUP, KEY_F3, FALSE, TRUE, FALSE ) -#define AI_ATTR_TRANSFORM ACC_CODE( SID_ATTR_TRANSFORM, KEY_F4, FALSE, FALSE, FALSE ) -#define AI_NAVIGATOR ACC_CODE( SID_NAVIGATOR, KEY_F5, FALSE, FALSE, FALSE ) -#define AI_SPELLING ACC_CODE( SID_SPELL_DIALOG, KEY_F7, FALSE, FALSE, FALSE ) -#define AI_THESAURUS ACC_CODE( SID_THESAURUS, KEY_F7, FALSE, TRUE, FALSE ) -#define AI_BEZIER_EDIT ACC_CODE( SID_BEZIER_EDIT, KEY_F8, FALSE, FALSE, FALSE ) -#define AI_ATTR_TEXT_FITTOSIZE ACC_CODE( SID_ATTR_TEXT_FITTOSIZE, KEY_F8, TRUE, TRUE, FALSE ) -#define AI_STYLE_DESIGNER ACC_CODE( SID_STYLE_DESIGNER, KEY_F11, FALSE, FALSE, FALSE ) -#define AI_OUTLINEMODE ACC_CODE( SID_OUTLINEMODE, KEY_F12, FALSE, FALSE, FALSE ) -#define AI_DRAWINGMODE ACC_CODE( SID_DRAWINGMODE, KEY_F12, FALSE, TRUE, FALSE ) - -#define AI_ATTR_PARA_LINESPACE_10 ACC_CODE( SID_ATTR_PARA_LINESPACE_10, KEY_1, FALSE, TRUE, FALSE ) -#define AI_ATTR_PARA_LINESPACE_20 ACC_CODE( SID_ATTR_PARA_LINESPACE_20, KEY_2, FALSE, TRUE, FALSE ) -#define AI_ATTR_PARA_LINESPACE_15 ACC_CODE( SID_ATTR_PARA_LINESPACE_15, KEY_5, FALSE, TRUE, FALSE ) -#define AI_SHOW_ITEMBROWSER ACC_CODE( SID_SHOW_ITEMBROWSER, KEY_9, TRUE, TRUE, TRUE ) - -#define AI_ATTR_PARA_ADJUST_BLOCK AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_BLOCK;\ - ACC_DEF_KEY( KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( pl , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( ru , KEY_J, FALSE, TRUE, FALSE ) }; - -#define AI_ATTR_PARA_ADJUST_CENTER AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_CENTER;\ - ACC_DEF_KEY( KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_C, TRUE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_J, FALSE, TRUE, FALSE ) }; - -#define AI_ATTR_CHAR_WEIGHT AcceleratorItem { Identifier = SID_ATTR_CHAR_WEIGHT;\ - ACC_DEF_KEY( KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_G, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_N, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_G, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( da , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( pl , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( ru, KEY_B, FALSE, TRUE, FALSE ) }; - -#define AI_SEARCH_DLG AcceleratorItem { Identifier = SID_SEARCH_DLG;\ - ACC_DEF_KEY( KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_G, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_G, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_F, FALSE, TRUE, FALSE ) }; - -#define AI_GROUP ACC_CODE( SID_GROUP, KEY_G, TRUE, TRUE, FALSE ) -#define AI_UNGROUP ACC_CODE( SID_UNGROUP, KEY_G, TRUE, TRUE, TRUE ) - -// Weitersuchen ... -#define AI_SET_SUPER_SCRIPT AcceleratorItem { Identifier = SID_SET_SUPER_SCRIPT;\ - ACC_DEF_KEY( KEY_P, TRUE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_H, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_P, TRUE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_H, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_H, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_H, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_H, FALSE, TRUE, FALSE ) }; - -#define AI_ATTR_CHAR_POSTURE AcceleratorItem { Identifier = SID_ATTR_CHAR_POSTURE;\ - ACC_DEF_KEY( KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_K, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_K, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( da , KEY_K, FALSE, TRUE, FALSE ) \ - ACC_KEY( pl , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( ru , KEY_I, FALSE, TRUE, FALSE ) }; - -#define AI_COMBINE ACC_CODE( SID_COMBINE, KEY_K, TRUE, TRUE, FALSE ) -#define AI_DISMANTLE ACC_CODE( SID_DISMANTLE, KEY_K, TRUE, TRUE, TRUE ) -#define AI_ATTR_PARA_ADJUST_LEFT AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_LEFT;\ - ACC_DEF_KEY( KEY_L, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_L, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_L, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_T, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_G, TRUE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_L, FALSE, TRUE, FALSE ) }; - -#define AI_ATTR_PARA_ADJUST_RIGHT AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_RIGHT;\ - ACC_DEF_KEY( KEY_R, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_R, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_R, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_R, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_D, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_D, TRUE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_R, FALSE, TRUE, FALSE ) }; - -#define AI_SET_SUB_SCRIPT AcceleratorItem { Identifier = SID_SET_SUB_SCRIPT;\ - ACC_DEF_KEY( KEY_B, TRUE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_T, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_B, TRUE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_B, TRUE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_T, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_T, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_P, TRUE, TRUE, FALSE ) }; - -#define AI_ATTR_CHAR_UNDERLINE AcceleratorItem { Identifier = SID_ATTR_CHAR_UNDERLINE;\ - ACC_DEF_KEY( KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( da, KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( pl, KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( ru , KEY_U, FALSE, TRUE, FALSE ) }; - -#define AI_STYLE_CATALOG ACC_CODE( SID_STYLE_CATALOG, KEY_F11, FALSE, TRUE, FALSE ) -#define AI_WIN_FULLSCREEN ACC_CODE( SID_WIN_FULLSCREEN, KEY_J, TRUE, TRUE, FALSE ) - -#define AI_FOCUSURLBOX ACC_CODE( SID_FOCUSURLBOX, KEY_O, TRUE, TRUE, FALSE ) -#define AI_SELECTALL ACC_CODE( SID_SELECTALL, KEY_A, FALSE, TRUE, FALSE ) - -// Anordnung -#define AI_FRAME_TO_TOP ACC_CODE( SID_FRAME_TO_TOP, KEY_ADD, TRUE, TRUE, FALSE ) -#define AI_MOREFRONT ACC_CODE( SID_MOREFRONT, KEY_ADD, FALSE, TRUE, FALSE ) -#define AI_FRAME_TO_BOTTOM ACC_CODE( SID_FRAME_TO_BOTTOM, KEY_SUBTRACT, TRUE, TRUE, FALSE ) -#define AI_MOREBACK ACC_CODE( SID_MOREBACK, KEY_SUBTRACT, FALSE, TRUE, FALSE ) - -// sonstige Acceleratoren -#define AI_NEWDOC ACC_CODE( SID_NEWDOC, KEY_N, TRUE, TRUE, FALSE ) -#define AI_NEWDOCDIRECT ACC_CODE( SID_NEWDOCDIRECT, KEY_N, FALSE, TRUE, FALSE ) -#define AI_OPENDOC ACC_CODE( SID_OPENDOC, KEY_O, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_OPENDOC, KEY_OPEN, FALSE, FALSE, FALSE ) -#define AI_CLOSEWIN ACC_CODE( SID_CLOSEWIN, KEY_W, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_CLOSEWIN, KEY_F4, FALSE, TRUE, FALSE ) -#define AI_SAVEDOC ACC_CODE( SID_SAVEDOC, KEY_S, FALSE, TRUE, FALSE ) -#define AI_PRINTDOC ACC_CODE( SID_PRINTDOC, KEY_P, FALSE, TRUE, FALSE ) -#define AI_QUITAPP ACC_CODE( SID_QUITAPP, KEY_Q, FALSE, TRUE, FALSE ) -#define AI_CUT ACC_CODE( SID_CUT, KEY_X, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_CUT, KEY_DELETE, TRUE, FALSE, FALSE ) \ - ACC_CODE( SID_CUT, KEY_CUT, FALSE, FALSE, FALSE ) -#define AI_COPY ACC_CODE( SID_COPY, KEY_C, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_COPY, KEY_INSERT, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_COPY, KEY_COPY, FALSE, FALSE, FALSE ) -#define AI_PASTE ACC_CODE( SID_PASTE, KEY_V, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_PASTE, KEY_INSERT, TRUE, FALSE, FALSE ) \ - ACC_CODE( SID_PASTE, KEY_PASTE, FALSE, FALSE, FALSE ) -#define AI_UNDO ACC_CODE( SID_UNDO, KEY_Z, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_UNDO, KEY_BACKSPACE, FALSE, FALSE, TRUE ) \ - ACC_CODE( SID_UNDO, KEY_UNDO, FALSE, FALSE, FALSE ) -#define AI_REDO ACC_CODE( SID_REDO, KEY_Y, FALSE, TRUE, FALSE ) -#define AI_REPEAT ACC_CODE( SID_REPEAT, KEY_REPEAT, FALSE, FALSE, FALSE ) -#define AI_DELETE ACC_CODE( SID_DELETE, KEY_DELETE, FALSE, FALSE, FALSE ) - -#endif // _GLOBLACC_SRC - - - - diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index 6d4309e788..1b88228905 100644..100755 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -38,288 +38,242 @@ #define ITEM_FORM_CONTROL_PROPERTIES\ Identifier = SID_FM_CTL_PROPERTIES ; \ Command = ".uno:ControlProperties" ; \ - HelpID = SID_FM_CTL_PROPERTIES ; \ Text [ en-US ] = "Con~trol..." ; \ #define ITEM_FORM_PROPERTIES\ Identifier = SID_FM_PROPERTIES ; \ Command = ".uno:FormProperties" ; \ - HelpID = SID_FM_PROPERTIES ; \ Text [ en-US ] = "For~m..." ; \ #define ITEM_REPLACE_CONTROL\ Identifier = SID_FM_CHANGECONTROLTYPE ;\ Command = ".uno:ChangeControlType" ; \ - HelpID = SID_FM_CHANGECONTROLTYPE ; \ Text [ en-US ] = "~Replace with"; \ #define ITEM_FORMAT_TEMPLATECATALOG \ Identifier = SID_STYLE_CATALOG ; \ Command = ".uno:StyleCatalog" ; \ - HelpID = SID_STYLE_CATALOG ; \ Text [ en-US ] = "~Catalog..." ; \ #define ITEM_FORMAT_TEMPLATE \ Identifier = SID_STYLE_DESIGNER ; \ Command = ".uno:DesignerDialog" ; \ - HelpID = SID_STYLE_DESIGNER ; \ Text [ en-US ] = "St~ylist" ; \ #define ITEM_FORMAT_AUTOFORMAT \ Identifier = SID_AUTOFORMAT ; \ Command = ".uno:AutoFormat" ; \ - HelpID = SID_AUTOFORMAT ; \ Text [ en-US ] = "Auto~Format..." ;\ #define ITEM_FORMAT_CHAR_DLG \ Identifier = SID_CHAR_DLG ; \ Command = ".uno:FontDialog" ; \ - HelpID = SID_CHAR_DLG ; \ Text [ en-US ] = "C~haracter..." ;\ #define ITEM_FORMAT_PARA_DLG \ Identifier = SID_PARA_DLG ; \ Command = ".uno:ParagraphDialog" ; \ - HelpID = SID_PARA_DLG ; \ Text [ en-US ] = "P~aragraph..." ;\ #define ITEM_FORMAT_FONTWORK \ Identifier = SID_FONTWORK ; \ Command = ".uno:FontWork" ; \ - HelpID = SID_FONTWORK ; \ Text [ en-US ] = "F~ontwork" ;\ #define ITEM_EDIT_CUT \ Identifier = SID_CUT ; \ Command = ".uno:Cut" ; \ - HelpID = SID_CUT ; \ Text [ en-US ] = "Cu~t" ;\ #define ITEM_EDIT_COPY \ Identifier = SID_COPY ; \ Command = ".uno:Copy" ; \ - HelpID = SID_COPY ; \ Text [ en-US ] = "~Copy" ;\ #define ITEM_EDIT_DELETE \ Identifier = SID_DELETE ; \ Command = ".uno:Delete" ; \ - HelpID = SID_DELETE ; \ Text [ en-US ] = "~Delete" ;\ #define ITEM_FORMAT_ATTR_CHAR_FONT \ Identifier = SID_ATTR_CHAR_FONT ; \ Command = ".uno:CharFontName" ; \ - HelpID = SID_ATTR_CHAR_FONT ; \ Text [ en-US ] = "Font" ;\ #define ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT \ Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \ Command = ".uno:FontHeight" ; \ - HelpID = SID_ATTR_CHAR_FONTHEIGHT ; \ Text [ en-US ] = "Size" ;\ #define ITEM_FORMAT_ATTR_CHAR_WEIGHT \ Identifier = SID_ATTR_CHAR_WEIGHT ; \ Command = ".uno:Bold" ; \ - HelpID = SID_ATTR_CHAR_WEIGHT ; \ Text [ en-US ] = "Bold" ; \ #define ITEM_FORMAT_ATTR_CHAR_POSTURE \ Identifier = SID_ATTR_CHAR_POSTURE ; \ Command = ".uno:Italic" ; \ - HelpID = SID_ATTR_CHAR_POSTURE ; \ Text [ en-US ] = "Italic" ;\ #define ITEM_FORMAT_ATTR_CHAR_UNDERLINE \ Identifier = SID_ATTR_CHAR_UNDERLINE ; \ Command = ".uno:Underline" ; \ - HelpID = SID_ATTR_CHAR_UNDERLINE ; \ Text [ en-US ] = "Underline" ;\ #define ITEM_FORMAT_ATTR_CHAR_OVERLINE \ Identifier = SID_ATTR_CHAR_OVERLINE ; \ Command = ".uno:Overline" ; \ - HelpID = SID_ATTR_CHAR_OVERLINE ; \ Text [ en-US ] = "Overline" ;\ #define ITEM_FORMAT_ATTR_CHAR_STRIKEOUT \ Identifier = SID_ATTR_CHAR_STRIKEOUT ; \ Command = ".uno:Strikeout" ; \ - HelpID = SID_ATTR_CHAR_STRIKEOUT ; \ Text [ en-US ] = "Strikethrough" ;\ #define ITEM_FORMAT_ATTR_CHAR_SHADOWED \ Identifier = SID_ATTR_CHAR_SHADOWED ; \ Command = ".uno:Shadowed" ; \ - HelpID = SID_ATTR_CHAR_SHADOWED ; \ Text [ en-US ] = "Shadow" ;\ #define ITEM_FORMAT_ATTR_CHAR_CONTOUR \ Identifier = SID_ATTR_CHAR_CONTOUR ; \ Command = ".uno:OutlineFont" ; \ - HelpID = SID_ATTR_CHAR_CONTOUR ; \ Text [ en-US ] = "Outline" ;\ #define ITEM_FORMAT_SET_SUPER_SCRIPT \ Identifier = SID_SET_SUPER_SCRIPT; \ - HelpID = SID_SET_SUPER_SCRIPT; \ + Command = CMD_SID_SET_SUPER_SCRIPT; \ Text [ en-US ] = "Su~perscript"; \ #define ITEM_FORMAT_SET_SUB_SCRIPT \ Identifier = SID_SET_SUB_SCRIPT; \ - HelpID = SID_SET_SUB_SCRIPT; \ + Command = CMD_SID_SET_SUB_SCRIPT; \ Text [ en-US ] = "Su~bscript"; \ #define ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT \ Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ Command = ".uno:LeftPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ Text [ en-US ] = "~Left" ;\ #define ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT \ Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \ Command = ".uno:RightPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ Text [ en-US ] = "~Right" ;\ #define ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER \ Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \ Command = ".uno:CenterPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ Text [ en-US ] = "~Centered" ;\ #define ITEM_FORMAT_ATTR_PARA_ADJUST_BLOCK \ Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ Command = ".uno:JustifyPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ Text [ en-US ] = "Justified" ;\ #define ITEM_FORMAT_PARA_LINESPACE_10 \ Identifier = SID_ATTR_PARA_LINESPACE_10 ; \ Command = ".uno:SpacePara1" ; \ - HelpID = SID_ATTR_PARA_LINESPACE_10 ; \ Text [ en-US ] = "Single" ;\ #define ITEM_FORMAT_PARA_LINESPACE_15 \ Identifier = SID_ATTR_PARA_LINESPACE_15 ; \ Command = ".uno:SpacePara15" ; \ - HelpID = SID_ATTR_PARA_LINESPACE_15 ; \ Text [ en-US ] = "1.5 lines" ;\ #define ITEM_FORMAT_PARA_LINESPACE_20 \ Identifier = SID_ATTR_PARA_LINESPACE_20 ; \ Command = ".uno:SpacePara2" ; \ - HelpID = SID_ATTR_PARA_LINESPACE_20 ; \ Text [ en-US ] = "~Double" ;\ #define ITEM_FORMAT_FRAME_TO_TOP \ Identifier = SID_FRAME_TO_TOP ; \ Command = ".uno:BringToFront" ; \ - HelpID = SID_FRAME_TO_TOP ; \ Text [ en-US ] = "~Bring to Front" ;\ #define ITEM_FORMAT_FRAME_TO_BOTTOM \ Identifier = SID_FRAME_TO_BOTTOM ; \ Command = ".uno:SendToBack" ; \ - HelpID = SID_FRAME_TO_BOTTOM ; \ Text [ en-US ] = "~Send to Back" ;\ #define ITEM_FORMAT_OBJECT_ALIGN \ Identifier = SID_OBJECT_ALIGN ; \ Command = ".uno:ObjectAlign" ; \ - HelpID = SID_OBJECT_ALIGN ; \ Text [ en-US ] = "A~lignment" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_LEFT \ Identifier = SID_OBJECT_ALIGN_LEFT ; \ Command = ".uno:ObjectAlignLeft" ; \ - HelpID = SID_OBJECT_ALIGN_LEFT ; \ Text [ en-US ] = "~Left" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_CENTER \ Identifier = SID_OBJECT_ALIGN_CENTER ; \ Command = ".uno:AlignCenter" ; \ - HelpID = SID_OBJECT_ALIGN_CENTER ; \ Text [ en-US ] = "~Centered" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_RIGHT \ Identifier = SID_OBJECT_ALIGN_RIGHT ; \ Command = ".uno:ObjectAlignRight" ; \ - HelpID = SID_OBJECT_ALIGN_RIGHT ; \ Text [ en-US ] = "~Right" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_UP \ Identifier = SID_OBJECT_ALIGN_UP ; \ Command = ".uno:AlignUp" ; \ - HelpID = SID_OBJECT_ALIGN_UP ; \ Text [ en-US ] = "~Top" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_MIDDLE \ Identifier = SID_OBJECT_ALIGN_MIDDLE ; \ Command = ".uno:AlignMiddle" ; \ - HelpID = SID_OBJECT_ALIGN_MIDDLE ; \ Text [ en-US ] = "C~enter" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_DOWN \ Identifier = SID_OBJECT_ALIGN_DOWN ; \ Command = ".uno:AlignDown" ; \ - HelpID = SID_OBJECT_ALIGN_DOWN ; \ Text [ en-US ] = "~Bottom" ;\ #define ITEM_FORMAT_ATTRIBUTES_LINE \ Identifier = SID_ATTRIBUTES_LINE ; \ Command = ".uno:FormatLine" ; \ - HelpID = SID_ATTRIBUTES_LINE ; \ Text [ en-US ] = "L~ine..." ;\ #define ITEM_FORMAT_ATTRIBUTES_AREA \ Identifier = SID_ATTRIBUTES_AREA ; \ Command = ".uno:FormatArea" ; \ - HelpID = SID_ATTRIBUTES_AREA ; \ Text [ en-US ] = "A~rea..." ;\ #define ITEM_FORMAT_ATTR_TRANSFORM \ Identifier = SID_ATTR_TRANSFORM ; \ Command = ".uno:TransformDialog" ; \ - HelpID = SID_ATTR_TRANSFORM ; \ Text [ en-US ] = "Position and Si~ze..." ;\ #define ITEM_FORMAT_OBJECT_HEAVEN \ Identifier = SID_OBJECT_HEAVEN ; \ Command = ".uno:SetObjectToForeground" ; \ - HelpID = SID_OBJECT_HEAVEN ; \ Text [ en-US ] = "~To Foreground" ;\ #define ITEM_FORMAT_OBJECT_HELL \ Identifier = SID_OBJECT_HELL ; \ Command = ".uno:SetObjectToBackground" ; \ - HelpID = SID_OBJECT_HELL ; \ Text [ en-US ] = "T~o Background" ;\ #define ITEM_FORMAT_BEZIER_EDIT \ Identifier = SID_BEZIER_EDIT ; \ Command = ".uno:ToggleObjectBezierMode" ; \ - HelpID = SID_BEZIER_EDIT ; \ Text [ en-US ] = "Edit ~Points" ;\ #define ITEM_FILE_PICKLIST \ Identifier = SID_PICKLIST ; \ Command = ".uno:PickList" ; \ - HelpID = SID_PICKLIST ; \ Text [ en-US ] = "~File" ; \ #define ITEM_FILE_NEWDOC \ Identifier = SID_NEWDOCDIRECT ; \ Command = ".uno:AddDirect" ; \ - HelpID = SID_NEWDOCDIRECT ; \ Text [ en-US ] = "~New" ;\ #define ITEM_FILE_OPENDOC \ Identifier = SID_OPENDOC ; \ Command = ".uno:Open" ; \ - HelpID = SID_OPENDOC ; \ Text [ en-US ] = "~Open..." ;\ @@ -328,62 +282,52 @@ {\ Identifier = SID_AUTOPILOTMENU ; \ Command = ".uno:AutoPilotMenu" ; \ - HelpID = SID_AUTOPILOTMENU ; \ Text [ en-US ] = "A~utoPilot" ; \ }; #define ITEM_FILE_CLOSEDOC \ Identifier = SID_CLOSEDOC ; \ Command = ".uno:CloseDoc" ; \ - HelpID = SID_CLOSEDOC ; \ Text [ en-US ] = "~Close" ;\ #define ITEM_FILE_SAVEDOC \ Identifier = SID_SAVEDOC ; \ Command = ".uno:Save" ; \ - HelpID = SID_SAVEDOC ; \ Text [ en-US ] = "~Save" ; \ #define ITEM_FILE_SAVEDOCS \ Identifier = SID_SAVEDOCS ; \ Command = ".uno:SaveAll" ; \ - HelpID = SID_SAVEDOCS ; \ Text [ en-US ] = "Sa~ve All" ; \ #define ITEM_FILE_SAVEASDOC \ Identifier = SID_SAVEASDOC ; \ Command = ".uno:SaveAs" ; \ - HelpID = SID_SAVEASDOC ; \ Text [ en-US ] = "Save ~As..." ; \ #define ITEM_FILE_EXPORTDOC \ Identifier = SID_EXPORTDOC ; \ Command = ".uno:ExportTo" ; \ - HelpID = SID_EXPORTDOC ; \ Text [ en-US ] = "Expor~t..." ; \ #define ITEM_FILE_EXPORTDOCASPDF \ Identifier = SID_EXPORTDOCASPDF ; \ Command = ".uno:ExportToPDF" ; \ - HelpID = SID_EXPORTDOCASPDF ; \ Text [ en-US ] = "Export as P~DF..." ; \ #define ITEM_FILE_VERSIONDIALOG \ Identifier = SID_VERSION ; \ Command = ".uno:VersionDialog" ; \ - HelpID = SID_VERSION ; \ Text [ en-US ] = "Versions..." ; \ #define ITEM_FILE_LASTVERSIONDOC \ Identifier = SID_RELOAD ; \ Command = ".uno:Reload" ; \ - HelpID = SID_RELOAD ; \ Text [ en-US ] = "Reload" ;\ #define ITEM_FILE_DOCINFO \ Identifier = SID_DOCINFO ; \ Command = ".uno:SetDocumentProperties" ; \ - HelpID = SID_DOCINFO ; \ Text [ en-US ] = "Propert~ies..." ;\ #define ITEM_FILE_DOCTEMPLATE \ @@ -398,28 +342,24 @@ { \ Identifier = SID_ORGANIZER ; \ Command = ".uno:Organizer" ; \ - HelpId = SID_ORGANIZER ; \ Text [ en-US ] = "~Organize...";\ }; \ MenuItem \ { \ Identifier = SID_TEMPLATE_ADDRESSBOKSOURCE; \ Command = ".uno:AddressBookSource" ; \ - HelpId = SID_TEMPLATE_ADDRESSBOKSOURCE; \ Text [ en-US ] = "~Address Book Source..."; \ }; \ MenuItem \ { \ Identifier = SID_DOCTEMPLATE ; \ Command = ".uno:SaveAsTemplate" ; \ - HelpId = SID_DOCTEMPLATE ; \ Text [ en-US ] = "~Save...";\ }; \ MenuItem \ { \ Identifier = SID_OPENTEMPLATE ; \ Command = ".uno:OpenTemplate" ; \ - HelpId = SID_OPENTEMPLATE ; \ Text [ en-US ] = "~Edit...";\ }; \ }; \ @@ -428,164 +368,138 @@ #define ITEM_FILE_PRINTPREVIEW \ Identifier = SID_PRINTPREVIEW ; \ Command = ".uno:PrintPreview" ; \ - HelpID = SID_PRINTPREVIEW ; \ Text [ en-US ] = "Pa~ge Preview" ;\ #define ITEM_FILE_SETUPPRINTER \ Identifier = SID_SETUPPRINTER ; \ Command = ".uno:PrinterSetup" ; \ - HelpID = SID_SETUPPRINTER ; \ Text [ en-US ] = "P~rinter Settings..." ; \ #define ITEM_FILE_PRINTDOC \ Identifier = SID_PRINTDOC ; \ Command = ".uno:Print" ; \ - HelpID = SID_PRINTDOC ; \ Text [ en-US ] = "~Print..." ; \ #define ITEM_FILE_MAIL_SENDDOC \ Identifier = SID_MAIL_SENDDOC ; \ Command = ".uno:SendMail" ; \ - HelpID = SID_MAIL_SENDDOC ; \ Text [ en-US ] = "Document as ~E-mail..." ; \ #define ITEM_FILE_MAIL_SENDDOCASPDF \ Identifier = SID_MAIL_SENDDOCASPDF ; \ Command = ".uno:SendMailDocAsPDF" ; \ - HelpID = SID_MAIL_SENDDOCASPDF ; \ Text [ en-US ] = "Document as P~DF Attachment..." ; \ #define ITEM_FILE_QUITAPP \ Identifier = SID_QUITAPP ; \ Command = ".uno:Quit" ; \ - HelpID = SID_QUITAPP ; \ Text [ en-US ] = "E~xit" ; \ #define ITEM_FILE_LOGOUT \ Identifier = SID_LOGOUT ; \ Command = ".uno:Logout" ; \ - HelpID = SID_LOGOUT ; \ Text [ en-US ] = "Logout" ; \ #define ITEM_EDIT_UNDO \ Identifier = SID_UNDO ; \ Command = ".uno:UndoAction" ; \ - HelpID = SID_UNDO ; \ Text [ en-US ] = "Undo" ; \ #define ITEM_EDIT_REDO \ Identifier = SID_REDO ; \ Command = ".uno:Redo" ; \ - HelpID = SID_REDO ; \ Text [ en-US ] = "Redo" ; \ #define ITEM_EDIT_REPEAT \ Identifier = SID_REPEAT ; \ Command = ".uno:Repeat" ; \ - HelpID = SID_REPEAT ; \ Text [ en-US ] = "~Repeat" ; \ #define ITEM_EDIT_PASTE \ Identifier = SID_PASTE ; \ Command = ".uno:Paste" ; \ - HelpID = SID_PASTE ; \ Text [ en-US ] = "~Paste" ; \ #define ITEM_EDIT_SELECTALL \ Identifier = SID_SELECTALL ; \ Command = ".uno:SelectAll" ; \ - HelpID = SID_SELECTALL ; \ Text [ en-US ] = "Select ~All" ; \ #define ITEM_EDIT_SEARCH_DLG \ Identifier = SID_SEARCH_DLG ; \ Command = ".uno:SearchDialog" ; \ - HelpID = SID_SEARCH_DLG ; \ Text [ en-US ] = "~Find & Replace..." ; \ #define ITEM_EDIT_NAVIGATOR \ Identifier = SID_NAVIGATOR ; \ Command = ".uno:Navigator" ; \ - HelpID = SID_NAVIGATOR ; \ Text [ en-US ] = "~Navigator" ; \ #define ITEM_EDIT_BIBLIOGRAPHY \ Identifier = SID_COMP_BIBLIOGRAPHY ; \ Command = ".uno:BibliographyComponent" ; \ - HelpID = SID_COMP_BIBLIOGRAPHY ; \ Text [ en-US ] = "~Bibliography Database"; \ #define ITEM_EDIT_PLUGINS_ACTIVE \ Identifier = SID_PLUGINS_ACTIVE ; \ Command = ".uno:PlugInsActive" ; \ - HelpID = SID_PLUGINS_ACTIVE ; \ Text [ en-US ] = "P~lug-in" ; \ #define ITEM_EDIT_IMAP \ Identifier = SID_IMAP ; \ Command = ".uno:ImageMapDialog" ; \ - HelpID = SID_IMAP ; \ Text [ en-US ] = "ImageMap" ; \ #define ITEM_EDIT_OBJECT \ Identifier = SID_OBJECT ; \ Command = ".uno:ObjectMenue" ; \ - HelpID = SID_OBJECT ; \ Text [ en-US ] = "~Object" ; \ #define ITEM_VIEW_ATTR_ZOOM \ Identifier = SID_ATTR_ZOOM ; \ Command = ".uno:Zoom" ; \ - HelpID = SID_ATTR_ZOOM ; \ Text [ en-US ] = "~Zoom..." ; \ #define ITEM_VIEW_TOGGLEFUNCTIONBAR \ Identifier = SID_TOGGLEFUNCTIONBAR ; \ Command = ".uno:FunctionBarVisible" ; \ - HelpID = SID_TOGGLEFUNCTIONBAR ; \ Text [ en-US ] = "~Function Bar" ; \ #define ITEM_VIEW_TOGGLEOBJECTBAR \ Identifier = SID_TOGGLEOBJECTBAR ; \ Command = ".uno:ObjectBarVisible" ; \ - HelpID = SID_TOGGLEOBJECTBAR ; \ Text [ en-US ] = "~Object Bar" ; \ #define ITEM_VIEW_TOGGLEINETBAR \ Identifier = SID_TOGGLEINETBAR ; \ - HelpID = SID_TOGGLEINETBAR ; \ + Command = CMD_SID_TOGGLEINETBAR; \ Text [ en-US ] = "Internet Bar" ; \ #define ITEM_VIEW_TOGGLESTATUSBAR \ Identifier = SID_TOGGLESTATUSBAR ; \ Command = ".uno:StatusBarVisible" ; \ - HelpID = SID_TOGGLESTATUSBAR ; \ Text [ en-US ] = "~Status Bar" ; \ #define ITEM_VIEW_TOGGLEIMESTATUSWINDOW \ Identifier = SID_SHOW_IME_STATUS_WINDOW ; \ Command = ".uno:ShowImeStatusWindow" ; \ - HelpID = SID_SHOW_IME_STATUS_WINDOW ; \ Text [ en-US ] = "~Input Method Status"; \ #define ITEM_VIEW_TASKBAR \ Identifier = SID_TASKBAR ; \ Command = ".uno:TaskBarVisible" ; \ - HelpID = SID_TASKBAR ; \ Text [ en-US ] = "~Status Bar" ; \ #define ITEM_VIEW_COLORBAR \ Identifier = SID_COLOR_CONTROL ; \ Command = ".uno:ColorControl" ; \ - HelpID = SID_COLOR_CONTROL ; \ Text [ en-US ] = "~Color Bar" ; \ #define ITEM_VIEW_FULLSCREEN \ Identifier = SID_WIN_FULLSCREEN ; \ Command = ".uno:FullScreen" ; \ - HelpID = SID_WIN_FULLSCREEN ; \ Text [ en-US ] = "F~ull Screen" ; \ @@ -598,19 +512,16 @@ #define ITEM_VIEW_BROWSER_MODE \ Identifier = SID_BROWSER_MODE ; \ Command = ".uno:BrowseView" ; \ - HelpID = SID_BROWSER_MODE ; \ Text [ en-US ] = "~Online Layout" ; \ #define ITEM_VIEW_BROWSER \ Identifier = SID_BROWSER ; \ Command = ".uno:Beamer" ; \ - HelpID = SID_BROWSER ; \ Text [ en-US ] = "~Beamer" ; \ #define ITEM_INSERT_INSERT_GRAPHIC \ Identifier = SID_INSERT_GRAPHIC ; \ Command = ".uno:InsertGraphic" ; \ - HelpID = SID_INSERT_GRAPHIC ; \ Text [ en-US ] = "~Graphics..." ; \ #define ITEM_INSERT_TWAIN_SELECT \ @@ -618,7 +529,6 @@ {\ Identifier = SID_TWAIN_SELECT ; \ Command = ".uno:TwainSelect" ; \ - HelpID = SID_TWAIN_SELECT ; \ Text [ en-US ] = "~Select Source..." ; \ }; @@ -627,7 +537,6 @@ {\ Identifier = SID_TWAIN_TRANSFER ; \ Command = ".uno:TwainTransfer" ; \ - HelpID = SID_TWAIN_TRANSFER ; \ Text [ en-US ] = "~Request..." ; \ }; @@ -636,7 +545,6 @@ {\ Identifier = SID_SCAN ; \ Command = ".uno:Scan" ; \ - HelpID = SID_SCAN ; \ Text [ en-US ] = "Scan" ; \ SubMenu = Menu\ {\ @@ -651,19 +559,16 @@ #define ITEM_INSERT_INSERT_DIAGRAM \ Identifier = SID_INSERT_DIAGRAM ; \ Command = ".uno:InsertObjectChart" ; \ - HelpID = SID_INSERT_DIAGRAM ; \ Text [ en-US ] = "~Chart..." ; \ #define ITEM_INSERT_GALLERY \ Identifier = SID_GALLERY ; \ Command = ".uno:Gallery" ; \ - HelpID = SID_GALLERY ; \ Text [ en-US ] = "~Gallery" ; \ #define ITEM_INSERT_INSERTDOC \ Identifier = SID_INSERTDOC ; \ Command = ".uno:InsertDoc" ; \ - HelpID = SID_INSERTDOC ; \ Text [ en-US ] = "~File..." ; \ #define TMP_SID_INSERT_PLUGIN \ @@ -671,7 +576,6 @@ {\ Identifier = SID_INSERT_PLUGIN ; \ Command = ".uno:InsertPlugin" ; \ - HelpID = SID_INSERT_PLUGIN ; \ Text [ en-US ] = "~Plug-in..." ; \ }; @@ -680,7 +584,6 @@ {\ Identifier = SID_INSERT_SOUND ; \ Command = ".uno:InsertSound" ; \ - HelpID = SID_INSERT_SOUND ; \ Text [ en-US ] = "~Sound..." ; \ }; @@ -689,27 +592,13 @@ {\ Identifier = SID_INSERT_VIDEO ; \ Command = ".uno:InsertVideo" ; \ - HelpID = SID_INSERT_VIDEO ; \ Text [ en-US ] = "~Video..." ; \ }; -#ifdef SOLAR_JAVA -#define TMP_SID_INSERT_APPLET \ - MenuItem\ - {\ - Identifier = SID_INSERT_APPLET ; \ - Command = ".uno:InsertApplet" ; \ - HelpID = SID_INSERT_APPLET ; \ - Text [ en-US ] = "~Applet..." ; \ - }; -#else -#define TMP_SID_INSERT_APPLET -#endif #define ITEM_INSERT_OBJECT_MN \ MenuItem\ {\ Identifier = SID_MN_INSERT_OBJECT_DLGS ; \ - HelpID = SID_MN_INSERT_OBJECT_DLGS ; \ Command = ".uno:ObjectMenu" ; \ Text [ en-US ] = "~Object" ; \ SubMenu = Menu\ @@ -720,18 +609,15 @@ {\ Identifier = SID_INSERT_OBJECT ; \ Command = ".uno:InsertObject" ; \ - HelpID = SID_INSERT_OBJECT ; \ Text [ en-US ] = "~OLE Object..." ; \ };\ TMP_SID_INSERT_PLUGIN\ TMP_SID_INSERT_SOUND\ TMP_SID_INSERT_VIDEO\ - TMP_SID_INSERT_APPLET\ MenuItem\ {\ Identifier = SID_INSERT_MATH ; \ Command = ".uno:InsertMath" ; \ - HelpID = SID_INSERT_MATH ; \ Text [ en-US ] = "~Formula..." ; \ };\ };\ @@ -742,7 +628,6 @@ MenuItem\ {\ Identifier = SID_MN_INSERT_OBJECT_DLGS ; \ - HelpID = SID_MN_INSERT_OBJECT_DLGS ; \ Command = ".uno:ObjectMenu" ; \ Text [ en-US ] = "~Object" ; \ SubMenu = Menu\ @@ -753,14 +638,12 @@ {\ Identifier = SID_INSERT_OBJECT ; \ Command = ".uno:InsertObject" ; \ - HelpID = SID_INSERT_OBJECT ; \ Text [ en-US ] = "~OLE Object..." ; \ };\ MenuItem\ {\ Identifier = SID_INSERT_MATH ; \ Command = ".uno:InsertMath" ; \ - HelpID = SID_INSERT_MATH ; \ Text [ en-US ] = "~Formula" ; \ };\ };\ @@ -771,7 +654,6 @@ MenuItem\ {\ Identifier = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \ - HelpID = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \ Text [ en-US ] = "~Numbering/Bullets..." ; \ }; @@ -779,7 +661,6 @@ #define ITEM_FORMAT \ Identifier = SID_OBJECTMENU0 ; \ - HelpID = SID_OBJECTMENU0 ; \ Command = ".uno:FormatMenu" ; \ Text [ en-US ] = "F~ormat" ; \ @@ -787,7 +668,6 @@ #define ITEM_TOOLS_MACROS \ Identifier = SID_SCRIPTORGANIZER ; \ - HelpId = SID_SCRIPTORGANIZER ; \ Command = ".uno:ScriptOrganizer" ; \ Text [ en-US ] = "Scripts/Macros" ; \ @@ -803,13 +683,11 @@ { \ Identifier = SID_RECORDMACRO ; \ Command = ".uno:MacroRecorder" ; \ - HelpId = SID_RECORDMACRO ; \ Text [ en-US ] = "Record Macro"; }; \ MenuItem \ { \ Identifier = SID_BASICCHOOSER ; \ Command = ".uno:MacroDialog" ; \ - HelpID = SID_BASICCHOOSER ; \ Text [ en-US ] = "~Macro..." ; \ }; \ }; \ @@ -822,7 +700,6 @@ #define ITEM_TOOLS_CONFIG \ Identifier = SID_CONFIG ; \ Command = ".uno:ConfigureDialog"; \ - HelpID = SID_CONFIG ; \ Text [ en-US ] = "~Configure..." ; \ @@ -831,7 +708,6 @@ {\ Identifier = SID_AUTO_CORRECT_DLG ; \ Command = ".uno:AutoCorrectDlg" ; \ - HelpID = SID_AUTO_CORRECT_DLG ; \ Text [ en-US ] = "~AutoCorrect..." ; \ }; @@ -840,7 +716,6 @@ {\ Identifier = SID_SD_GRAPHIC_OPTIONS ; \ Command = ".uno:SdGraphicOptions" ; \ - HelpID = SID_SD_GRAPHIC_OPTIONS ; \ Text [ en-US ] = "~Drawing..." ; \ }; @@ -849,7 +724,6 @@ {\ Identifier = SID_OPTIONS_TREEDIALOG ; \ Command = ".uno:OptionsTreeDialog" ; \ - HelpID = SID_OPTIONS_TREEDIALOG ; \ Text [ en-US ] = "~Options..." ; \ }; @@ -860,13 +734,11 @@ #define ITEM_WINDOW_MDIWINDOWLIST \ Identifier = SID_MDIWINDOWLIST ; \ Command = ".uno:WindowList" ; \ - HelpID = SID_MDIWINDOWLIST ; \ Text [ en-US ] = "~Window" ; \ #define ITEM_WINDOW_CLONEWIN \ Identifier = SID_NEWWINDOW ; \ Command = ".uno:NewWindow" ; \ - HelpID = SID_NEWWINDOW ; \ Text [ en-US ] = "~New Window" ; \ #define ITEM_WINDOW_CASCADEWINS \ @@ -874,7 +746,6 @@ {\ Identifier = SID_CASCADEWINS ; \ Command = ".uno:Cascade" ; \ - HelpID = SID_CASCADEWINS ; \ Text [ en-US ] = "~Cascade" ; \ }; @@ -883,7 +754,6 @@ {\ Identifier = SID_TILEWINS ; \ Command = ".uno:Tile" ; \ - HelpID = SID_TILEWINS ; \ Text [ en-US ] = "~Tile" ; \ }; @@ -892,7 +762,6 @@ {\ Identifier = SID_HORIZONTALWINS ; \ Command = ".uno:ArrangeHorizontal" ; \ - HelpID = SID_HORIZONTALWINS ; \ Text [ en-US ] = "~Horizontally" ; \ }; @@ -901,14 +770,12 @@ {\ Identifier = SID_VERTICALWINS ; \ Command = ".uno:ArrangeVertical" ; \ - HelpID = SID_VERTICALWINS ; \ Text [ en-US ] = "~Vertically" ; \ }; #define ITEM_WINDOW_CLOSEWIN \ Identifier = SID_CLOSEWIN ; \ Command = ".uno:CloseWin" ; \ - HelpID = SID_CLOSEWIN ; \ Text [ en-US ] = "Close Window" ; \ #define ITEM_HYPERLINK_DIALOG \ @@ -916,7 +783,6 @@ {\ Identifier = SID_HYPERLINK_DIALOG ; \ Command = ".uno:HyperlinkDialog" ; \ - HelpID = SID_HYPERLINK_DIALOG ; \ Text [ en-US ] = "~Hyperlink" ; \ } ; @@ -925,7 +791,6 @@ {\ Identifier = SID_POLY_MERGE ; \ Command = ".uno:Merge" ; \ - HelpID = SID_POLY_MERGE ; \ Text [ en-US ] = "~Merge" ; \ }; #define ITEM_POLY_SUBSTRACT \ @@ -933,7 +798,6 @@ {\ Identifier = SID_POLY_SUBSTRACT ; \ Command = ".uno:Substract" ; \ - HelpID = SID_POLY_SUBSTRACT ; \ Text [ en-US ] = "~Subtract" ; \ }; #define ITEM_POLY_INTERSECT \ @@ -941,7 +805,6 @@ {\ Identifier = SID_POLY_INTERSECT ; \ Command = ".uno:Intersect" ; \ - HelpID = SID_POLY_INTERSECT ; \ Text [ en-US ] = "I~ntersect" ; \ }; @@ -950,7 +813,6 @@ { \ Identifier = SID_POLY_FORMEN ; \ Command = ".uno:PolyFormen" ; \ - HelpID = SID_POLY_FORMEN ; \ Text [ en-US ] = "~Shapes" ; \ SubMenu = Menu \ {\ @@ -1009,43 +871,36 @@ #define ITEM_HELP_HELPMENU \ Identifier = SID_HELPMENU ; \ Command = ".uno:HelpMenu" ; \ - HelpID = SID_HELPMENU ; \ Text [ en-US ] = "~Help" ; \ #define ITEM_HELP_HELPINDEX \ Identifier = SID_HELPINDEX ; \ Command = ".uno:HelpIndex" ; \ - HelpID = SID_HELPINDEX ; \ Text [ en-US ] = "~Contents" ; \ #define ITEM_HELP_HELPONHELP \ Identifier = SID_HELPONHELP ; \ Command = ".uno:HelpOnHelp" ; \ - HelpID = SID_HELPONHELP ; \ Text [ en-US ] = "Using Help" ; \ #define ITEM_HELP_HELP_PI \ Identifier = SID_HELP_PI ; \ Command = ".uno:HelperDialog" ; \ - HelpID = SID_HELP_PI ; \ Text [ en-US ] = "Help ~Agent" ; \ #define ITEM_HELP_HELPTIPS \ Identifier = SID_HELPTIPS ; \ Command = ".uno:HelpTip" ; \ - HelpID = SID_HELPTIPS ; \ Text [ en-US ] = "~Tips" ; \ #define ITEM_HELP_BALLOONHELP \ Identifier = SID_HELPBALLOONS ; \ Command = ".uno:ActiveHelp" ; \ - HelpID = SID_HELPBALLOONS ; \ Text [ en-US ] = "~Extended Tips" ; \ #define ITEM_SHOW_LICENSE \ Identifier = SID_SHOW_LICENSE ; \ Command = ".uno:ShowLicense" ; \ - HelpID = SID_SHOW_LICENSE ; \ Text [ en-US ] = "License information..." ; \ #define ITEM_SHOW_CREDITS \ @@ -1057,14 +912,12 @@ #define ITEM_HELP_ONLINE_REGISTRATION \ Identifier = SID_ONLINE_REGISTRATION ; \ Command = ".uno:OnlineRegistrationDlg" ; \ - HelpID = SID_ONLINE_REGISTRATION ; \ Text [ en-US ] = "~Registration..." ; \ #define ITEM_HELP_ABOUT \ Identifier = SID_ABOUT ; \ Command = ".uno:About" ; \ - HelpID = SID_ABOUT ; \ Text [ en-US ] = "A~bout %PRODUCTNAME..." ; \ /*------------------------------------------------------------------------ @@ -1130,39 +983,33 @@ #define ITEM_POPUP_TEMPLATE_EDIT \ Identifier = SID_STYLE_EDIT ; \ Command = ".uno:EditStyle" ; \ - HelpID = SID_STYLE_EDIT ; \ Text [ en-US ] = "Edit Paragraph Style..." ; \ // Gruppen-/Kombination-Funktionen #define ITEM_POPUP_GROUP \ Identifier = SID_GROUP ; \ Command = ".uno:FormatGroup" ; \ - HelpID = SID_GROUP ; \ Text [ en-US ] = "~Group" ; \ #define ITEM_POPUP_UNGROUP \ Identifier = SID_UNGROUP ; \ Command = ".uno:FormatUngroup" ; \ - HelpID = SID_UNGROUP ; \ Text [ en-US ] = "~Ungroup" ; \ #define ITEM_POPUP_ENTER_GROUP \ Identifier = SID_ENTER_GROUP ; \ Command = ".uno:EnterGroup" ; \ - HelpID = SID_ENTER_GROUP ; \ Text [ en-US ] = "~Edit Group" ; \ #define ITEM_POPUP_LEAVE_GROUP \ Identifier = SID_LEAVE_GROUP ; \ Command = ".uno:LeaveGroup" ; \ - HelpID = SID_LEAVE_GROUP ; \ Text [ en-US ] = "E~xit Group" ; \ #define ITEM_GROUP_MENU \ MenuItem\ {\ Identifier = SID_MN_GROUP ; \ - HelpID = SID_MN_GROUP ; \ Command = ".uno:GroupMenu" ; \ SubMenu = Menu\ {\ @@ -1194,14 +1041,12 @@ { \ Identifier = SID_DATASOURCE_ADMINISTRATION ; \ Command = ".uno:DatasourceAdministration" ; \ - HelpID = SID_DATASOURCE_ADMINISTRATION ; \ Text [ en-US ] = "~Data Sources..." ; \ }; #define ITEM_VIEW_DATA_SOURCE_BROWSER \ Identifier = SID_VIEW_DATA_SOURCE_BROWSER; \ Command = ".uno:ViewDataSourceBrowser" ; \ - HelpID = SID_VIEW_DATA_SOURCE_BROWSER; \ Text [ en-US ] = "~Data Sources" ; \ /*------------------------------------------------------------------------ @@ -1210,112 +1055,92 @@ #define ITEM_TOOLBAR_SET_JUSTIFY_PARA \ Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ Command = ".uno:JustifyPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; #define ITEM_TOOLBAR_NEWDOCDIRECT \ Identifier = SID_NEWDOCDIRECT ; \ Command = ".uno:AddDirect" ; \ - HelpID = SID_NEWDOCDIRECT ; #define ITEM_TOOLBAR_PRINTDOCDIRECT \ Identifier = SID_PRINTDOCDIRECT ; \ Command = ".uno:PrintDefault" ; \ - HelpID = SID_PRINTDOCDIRECT ; #define ITEM_TOOLBAR_INSERT_DRAW \ Identifier = SID_INSERT_DRAW ; \ Command = ".uno:InsertDraw" ; \ - HelpID = SID_INSERT_DRAW ; \ DropDown = TRUE ; #define ITEM_TOOLBAR_CHOOSE_CONTROLS \ Identifier = SID_CHOOSE_CONTROLS ; \ Command = ".uno:ChooseControls" ; \ - HelpID = SID_CHOOSE_CONTROLS ; \ DropDown = TRUE ; #define ITEM_TOOLBAR_AUTOSPELL_CHECK \ Identifier = SID_AUTOSPELL_CHECK ; \ Command = ".uno:SpellOnline" ; \ - HelpID = SID_AUTOSPELL_CHECK ; #define ITEM_TOOLBAR_TEMPLATE_APPLY \ Identifier = SID_STYLE_APPLY ; \ Command = ".uno:StyleApply" ; \ - HelpID = SID_STYLE_APPLY ; #define ITEM_TOOLBAR_ATTR_CHAR_COLOR \ Identifier = SID_ATTR_CHAR_COLOR ; \ Command = ".uno:Color" ; \ - HelpID = SID_ATTR_CHAR_COLOR ;\ DropDown = TRUE ; #define ITEM_TOOLBAR_BACKGROUND_PATTERN \ Identifier = SID_BACKGROUND_PATTERN ; \ Command = ".uno:BackgroundPatternController" ; \ - HelpID = SID_BACKGROUND_PATTERN ;\ DropDown = TRUE ; #define ITEM_TOOLBAR_BACKGROUND_COLOR \ Identifier = SID_BACKGROUND_COLOR ; \ Command = ".uno:BackgroundColor" ; \ - HelpID = SID_BACKGROUND_COLOR ;\ DropDown = TRUE ; #define ITEM_TOOLBAR_ATTR_BORDER \ Identifier = SID_ATTR_BORDER ; \ Command = ".uno:BorderStyle" ; \ - HelpID = SID_ATTR_BORDER ; #define ITEM_TOOLBAR_FRAME_LINESTYLE \ Identifier = SID_FRAME_LINESTYLE ; \ Command = ".uno:LineStyle" ; \ - HelpID = SID_FRAME_LINESTYLE ; #define ITEM_TOOLBAR_FRAME_LINECOLOR \ Identifier = SID_FRAME_LINECOLOR ; \ Command = ".uno:FrameLineColor" ; \ - HelpID = SID_FRAME_LINECOLOR ; #define ITEM_TOOLBAR_SIM_START \ Identifier = SID_SIM_START ; \ Command = ".uno:LaunchStarImage" ; \ - HelpID = SID_SIM_START ; #define ITEM_TOOLBAR_ATTR_LINEEND_STYLE \ Identifier = SID_ATTR_LINEEND_STYLE ; \ Command = ".uno:LineEndStyle" ; \ - HelpID = SID_ATTR_LINEEND_STYLE ; \ DropDown = TRUE ; #define ITEM_TOOLBAR_ATTR_LINE_STYLE \ Identifier = SID_ATTR_LINE_STYLE ; \ Command = ".uno:XLineStyle" ; \ - HelpID = SID_ATTR_LINE_STYLE ; #define ITEM_TOOLBAR_ATTR_LINE_WIDTH \ Identifier = SID_ATTR_LINE_WIDTH ; \ Command = ".uno:LineWidth" ; \ - HelpID = SID_ATTR_LINE_WIDTH ; #define ITEM_TOOLBAR_ATTR_LINE_COLOR \ Identifier = SID_ATTR_LINE_COLOR ; \ Command = ".uno:XLineColor" ; \ - HelpID = SID_ATTR_LINE_COLOR ; #define ITEM_TOOLBAR_ATTR_FILL_STYLE \ Identifier = SID_ATTR_FILL_STYLE ; \ Command = ".uno:FillStyle" ; \ - HelpID = SID_ATTR_FILL_STYLE ; #define ITEM_TOOLBAR_OBJECT_ROTATE \ Identifier = SID_OBJECT_ROTATE ; \ Command = ".uno:ToggleObjectRotateMode" ; \ - HelpID = SID_OBJECT_ROTATE ; #define ITEM_VIEW_OFFICEBAR \ Identifier = SID_GROUPVIEW; \ - HelpID = SID_GROUPVIEW; \ + Command = CMD_SID_GROUPVIEW; \ Text [ en-US ] = "~Office Bar" ; \ @@ -1323,7 +1148,6 @@ MenuItem\ {\ Identifier = SID_MN_SUB_TRANSLITERATE ; \ - HelpID = SID_MN_SUB_TRANSLITERATE ; \ Command = ".uno:TransliterateMenu" ; \ SubMenu = Menu\ {\ @@ -1333,63 +1157,54 @@ {\ Identifier = SID_TRANSLITERATE_SENTENCE_CASE; \ Command = ".uno:ChangeCaseToSentenceCase" ; \ - HelpID = SID_TRANSLITERATE_SENTENCE_CASE; \ Text [ en-US ] = "~Sentence case";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_LOWER; \ Command = ".uno:ChangeCaseToLower" ; \ - HelpID = SID_TRANSLITERATE_LOWER; \ Text [ en-US ] = "~lowercase";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_UPPER ; \ Command = ".uno:ChangeCaseToUpper" ; \ - HelpID = SID_TRANSLITERATE_UPPER ; \ Text [ en-US ] = "~UPPERCASE";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_TITLE_CASE; \ Command = ".uno:ChangeCaseToTitleCase" ; \ - HelpID = SID_TRANSLITERATE_TITLE_CASE; \ Text [ en-US ] = "~Capitalize Every Word";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_TOGGLE_CASE; \ Command = ".uno:ChangeCaseToToggleCase" ; \ - HelpID = SID_TRANSLITERATE_TOGGLE_CASE; \ Text [ en-US ] = "~tOGGLE cASE";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_HALFWIDTH; \ Command = ".uno:ChangeCaseToHalfWidth" ; \ - HelpID = SID_TRANSLITERATE_HALFWIDTH; \ Text [ en-US ] = "H~alf-width";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_FULLWIDTH; \ Command = ".uno:ChangeCaseToFullWidth" ; \ - HelpID = SID_TRANSLITERATE_FULLWIDTH; \ Text [ en-US ] = "Full-width";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_HIRAGANA; \ Command = ".uno:ChangeCaseToHiragana" ; \ - HelpID = SID_TRANSLITERATE_HIRAGANA; \ Text [ en-US ] = "~Hiragana";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_KATAGANA; \ Command = ".uno:ChangeCaseToKatakana" ; \ - HelpID = SID_TRANSLITERATE_KATAGANA; \ Text [ en-US ] = "~Katakana";\ };\ };\ @@ -1399,23 +1214,23 @@ #define ITEM_OPEN_HYPERLINK \ Identifier = SID_OPEN_HYPERLINK ; \ - HelpID = SID_OPEN_HYPERLINK ; \ + Command = CMD_SID_OPEN_HYPERLINK; \ Text [ en-US ] = "~Open Hyperlink" ; \ #define ITEM_OPEN_SMARTTAGMENU \ Identifier = SID_OPEN_SMARTTAGMENU ; \ - HelpID = SID_OPEN_SMARTTAGMENU ; \ + Command = CMD_SID_OPEN_SMARTTAGMENU; \ Text [ en-US ] = "Open ~Smart Tag Menu" ; \ #define ITEM_OPEN_XML_FILTERSETTINGS \ Identifier = SID_OPEN_XML_FILTERSETTINGS ; \ - HelpID = SID_OPEN_XML_FILTERSETTINGS ; \ + Command = CMD_SID_OPEN_XML_FILTERSETTINGS; \ Text [ en-US ] = "~XML Filter Settings..."; \ #define ITEM_HANGUL_HANJA_CONVERSION \ Identifier = SID_HANGUL_HANJA_CONVERSION; \ - HelpId = SID_HANGUL_HANJA_CONVERSION; \ + Command = CMD_SID_HANGUL_HANJA_CONVERSION; \ Text [ en-US ] = "Hangul/Hanja Conversion..."; \ #endif // #ifndef _GLOBLMN_HRC diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index 573f7a9b71..fcab99591f 100644..100755 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -26,270 +26,258 @@ ************************************************************************/ #ifndef _SVX_HELPID_HRC #define _SVX_HELPID_HRC -// include --------------------------------------------------------------- - -#include <svl/solar.hrc> #include <svx/exthelpid.hrc> +#include <svx/svxcommands.h> +#include <sfx2/sfxcommands.h> // Help-Ids -------------------------------------------------------------- -#define HID_ALIGN_TBX (HID_SVX_START + 1) -#define HID_BMPMASK_CTL_PIPETTE (HID_SVX_START + 4) -#define HID_BMPMASK_CTL_QCOL_1 (HID_SVX_START + 5) -#define HID_BMPMASK_TBI_PIPETTE (HID_SVX_START + 6) -#define HID_COLOR_CTL_COLORS (HID_SVX_START + 7) -#define HID_CONTDLG_APPLY (HID_SVX_START + 8) -#define HID_CONTDLG_AUTOCONTOUR (HID_SVX_START + 9) -#define HID_CONTDLG_CIRCLE (HID_SVX_START + 10) -#define HID_CONTDLG_FREEPOLY (HID_SVX_START + 11) -#define HID_CONTDLG_GRAPHWND (HID_SVX_START + 12) -#define HID_CONTDLG_PIPETTE (HID_SVX_START + 13) -#define HID_CONTDLG_POLY (HID_SVX_START + 14) -#define HID_CONTDLG_POLYDELETE (HID_SVX_START + 15) -#define HID_CONTDLG_POLYEDIT (HID_SVX_START + 16) -#define HID_CONTDLG_POLYINSERT (HID_SVX_START + 17) -#define HID_CONTDLG_POLYMOVE (HID_SVX_START + 18) -#define HID_CONTDLG_RECT (HID_SVX_START + 19) -#define HID_CONTDLG_REDO (HID_SVX_START + 20) -#define HID_CONTDLG_SELECT (HID_SVX_START + 21) -#define HID_CONTDLG_TOOLBOX (HID_SVX_START + 22) -#define HID_CONTDLG_UNDO (HID_SVX_START + 23) -#define HID_CONTDLG_WORKPLACE (HID_SVX_START + 24) -#define HID_CTL_FONTWORK_FAVORITES (HID_SVX_START + 25) -#define HID_CTRL3D_HSCROLL (HID_SVX_START + 26) -#define HID_CTRL3D_SWITCHER (HID_SVX_START + 27) -#define HID_CTRL3D_VSCROLL (HID_SVX_START + 28) -#define HID_CTRL_COLOR (HID_SVX_START + 29) -#define HID_DRAWTOOL_TBX (HID_SVX_START + 30) -#define HID_EDITENG_SPELLER_ADDWORD (HID_SVX_START + 31) -#define HID_EDITENG_SPELLER_AUTOCORRECT (HID_SVX_START + 32) -#define HID_EDITENG_SPELLER_IGNORE (HID_SVX_START + 33) -#define HID_EDITENG_SPELLER_PARALANGUAGE (HID_SVX_START + 34) -#define HID_EDITENG_SPELLER_START (HID_SVX_START + 35) -#define HID_EDITENG_SPELLER_WORDLANGUAGE (HID_SVX_START + 36) -#define HID_FILL_ATTR_LISTBOX (HID_SVX_START + 37) -#define HID_FILL_TYPE_LISTBOX (HID_SVX_START + 38) -#define HID_FONTWORK_CTL_FORMS (HID_SVX_START + 39) -#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE (HID_SVX_START + 40) -#define HID_FONTWORK_TBI_ADJUST_CENTER (HID_SVX_START + 41) -#define HID_FONTWORK_TBI_ADJUST_LEFT (HID_SVX_START + 42) -#define HID_FONTWORK_TBI_ADJUST_MIRROR (HID_SVX_START + 43) -#define HID_FONTWORK_TBI_ADJUST_RIGHT (HID_SVX_START + 44) -#define HID_FONTWORK_TBI_OUTLINE (HID_SVX_START + 45) -#define HID_FONTWORK_TBI_SHADOW_NORMAL (HID_SVX_START + 46) -#define HID_FONTWORK_TBI_SHADOW_OFF (HID_SVX_START + 47) -#define HID_FONTWORK_TBI_SHADOW_SLANT (HID_SVX_START + 48) -#define HID_FONTWORK_TBI_SHOWFORM (HID_SVX_START + 49) -#define HID_FONTWORK_TBI_STYLE_OFF (HID_SVX_START + 50) -#define HID_FONTWORK_TBI_STYLE_ROTATE (HID_SVX_START + 51) -#define HID_FONTWORK_TBI_STYLE_SLANTX (HID_SVX_START + 52) -#define HID_FONTWORK_TBI_STYLE_SLANTY (HID_SVX_START + 53) -#define HID_FONTWORK_TBI_STYLE_UPRIGHT (HID_SVX_START + 54) -#define HID_FORMAT_FOOTER (HID_SVX_START + 55) -#define HID_FORMAT_HEADER (HID_SVX_START + 56) +#define HID_ALIGN_TBX "SVX_HID_ALIGN_TBX" +#define HID_BMPMASK_CTL_PIPETTE "SVX_HID_BMPMASK_CTL_PIPETTE" +#define HID_BMPMASK_CTL_QCOL_1 "SVX_HID_BMPMASK_CTL_QCOL_1" +#define HID_BMPMASK_TBI_PIPETTE "SVX_HID_BMPMASK_TBI_PIPETTE" +#define HID_COLOR_CTL_COLORS "SVX_HID_COLOR_CTL_COLORS" +#define HID_CONTDLG_APPLY "SVX_HID_CONTDLG_APPLY" +#define HID_CONTDLG_AUTOCONTOUR "SVX_HID_CONTDLG_AUTOCONTOUR" +#define HID_CONTDLG_CIRCLE "SVX_HID_CONTDLG_CIRCLE" +#define HID_CONTDLG_FREEPOLY "SVX_HID_CONTDLG_FREEPOLY" +#define HID_CONTDLG_GRAPHWND "SVX_HID_CONTDLG_GRAPHWND" +#define HID_CONTDLG_PIPETTE "SVX_HID_CONTDLG_PIPETTE" +#define HID_CONTDLG_POLY "SVX_HID_CONTDLG_POLY" +#define HID_CONTDLG_POLYDELETE "SVX_HID_CONTDLG_POLYDELETE" +#define HID_CONTDLG_POLYEDIT "SVX_HID_CONTDLG_POLYEDIT" +#define HID_CONTDLG_POLYINSERT "SVX_HID_CONTDLG_POLYINSERT" +#define HID_CONTDLG_POLYMOVE "SVX_HID_CONTDLG_POLYMOVE" +#define HID_CONTDLG_RECT "SVX_HID_CONTDLG_RECT" +#define HID_CONTDLG_REDO "SVX_HID_CONTDLG_REDO" +#define HID_CONTDLG_SELECT "SVX_HID_CONTDLG_SELECT" +#define HID_CONTDLG_TOOLBOX "SVX_HID_CONTDLG_TOOLBOX" +#define HID_CONTDLG_UNDO "SVX_HID_CONTDLG_UNDO" +#define HID_CONTDLG_WORKPLACE "SVX_HID_CONTDLG_WORKPLACE" +#define HID_CTL_FONTWORK_FAVORITES "SVX_HID_CTL_FONTWORK_FAVORITES" +#define HID_CTRL3D_HSCROLL "SVX_HID_CTRL3D_HSCROLL" +#define HID_CTRL3D_SWITCHER "SVX_HID_CTRL3D_SWITCHER" +#define HID_CTRL3D_VSCROLL "SVX_HID_CTRL3D_VSCROLL" +#define HID_CTRL_COLOR "SVX_HID_CTRL_COLOR" +#define HID_DRAWTOOL_TBX "SVX_HID_DRAWTOOL_TBX" +#define HID_EDITENG_SPELLER_ADDWORD "SVX_HID_EDITENG_SPELLER_ADDWORD" +#define HID_EDITENG_SPELLER_AUTOCORRECT "SVX_HID_EDITENG_SPELLER_AUTOCORRECT" +#define HID_EDITENG_SPELLER_IGNORE "SVX_HID_EDITENG_SPELLER_IGNORE" +#define HID_EDITENG_SPELLER_PARALANGUAGE "SVX_HID_EDITENG_SPELLER_PARALANGUAGE" +#define HID_EDITENG_SPELLER_START "SVX_HID_EDITENG_SPELLER_START" +#define HID_EDITENG_SPELLER_WORDLANGUAGE "SVX_HID_EDITENG_SPELLER_WORDLANGUAGE" +#define HID_FILL_ATTR_LISTBOX "SVX_HID_FILL_ATTR_LISTBOX" +#define HID_FILL_TYPE_LISTBOX "SVX_HID_FILL_TYPE_LISTBOX" +#define HID_FONTWORK_CTL_FORMS "SVX_HID_FONTWORK_CTL_FORMS" +#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE "SVX_HID_FONTWORK_TBI_ADJUST_AUTOSIZE" +#define HID_FONTWORK_TBI_ADJUST_CENTER "SVX_HID_FONTWORK_TBI_ADJUST_CENTER" +#define HID_FONTWORK_TBI_ADJUST_LEFT "SVX_HID_FONTWORK_TBI_ADJUST_LEFT" +#define HID_FONTWORK_TBI_ADJUST_MIRROR "SVX_HID_FONTWORK_TBI_ADJUST_MIRROR" +#define HID_FONTWORK_TBI_ADJUST_RIGHT "SVX_HID_FONTWORK_TBI_ADJUST_RIGHT" +#define HID_FONTWORK_TBI_OUTLINE "SVX_HID_FONTWORK_TBI_OUTLINE" +#define HID_FONTWORK_TBI_SHADOW_NORMAL "SVX_HID_FONTWORK_TBI_SHADOW_NORMAL" +#define HID_FONTWORK_TBI_SHADOW_OFF "SVX_HID_FONTWORK_TBI_SHADOW_OFF" +#define HID_FONTWORK_TBI_SHADOW_SLANT "SVX_HID_FONTWORK_TBI_SHADOW_SLANT" +#define HID_FONTWORK_TBI_SHOWFORM "SVX_HID_FONTWORK_TBI_SHOWFORM" +#define HID_FONTWORK_TBI_STYLE_OFF "SVX_HID_FONTWORK_TBI_STYLE_OFF" +#define HID_FONTWORK_TBI_STYLE_ROTATE "SVX_HID_FONTWORK_TBI_STYLE_ROTATE" +#define HID_FONTWORK_TBI_STYLE_SLANTX "SVX_HID_FONTWORK_TBI_STYLE_SLANTX" +#define HID_FONTWORK_TBI_STYLE_SLANTY "SVX_HID_FONTWORK_TBI_STYLE_SLANTY" +#define HID_FONTWORK_TBI_STYLE_UPRIGHT "SVX_HID_FONTWORK_TBI_STYLE_UPRIGHT" +#define HID_FORMAT_FOOTER "SVX_HID_FORMAT_FOOTER" +#define HID_FORMAT_HEADER "SVX_HID_FORMAT_HEADER" // free -#define HID_GALLERY_ICONVIEW (HID_SVX_START + 58) -#define HID_GALLERY_LISTVIEW (HID_SVX_START + 59) -#define HID_GALLERY_MN_ADD (HID_SVX_START + 60) -#define HID_GALLERY_MN_ADDMENU (HID_SVX_START + 61) -#define HID_GALLERY_MN_ADD_LINK (HID_SVX_START + 62) -#define HID_GALLERY_MN_BACKGROUND (HID_SVX_START + 63) -#define HID_GALLERY_MN_COPYCLIPBOARD (HID_SVX_START + 64) -#define HID_GALLERY_MN_DELETE (HID_SVX_START + 65) -#define HID_GALLERY_MN_PASTECLIPBOARD (HID_SVX_START + 66) -#define HID_GALLERY_MN_PREVIEW (HID_SVX_START + 67) -#define HID_GALLERY_NEWTHEME (HID_SVX_START + 68) -#define HID_GALLERY_PREVIEW (HID_SVX_START + 69) -#define HID_GALLERY_PROPERTIES (HID_SVX_START + 70) -#define HID_GALLERY_RENAME (HID_SVX_START + 71) -#define HID_GALLERY_THEMELIST (HID_SVX_START + 72) +#define HID_GALLERY_ICONVIEW "SVX_HID_GALLERY_ICONVIEW" +#define HID_GALLERY_LISTVIEW "SVX_HID_GALLERY_LISTVIEW" +#define HID_GALLERY_MN_ADD "SVX_HID_GALLERY_MN_ADD" +#define HID_GALLERY_MN_ADDMENU "SVX_HID_GALLERY_MN_ADDMENU" +#define HID_GALLERY_MN_ADD_LINK "SVX_HID_GALLERY_MN_ADD_LINK" +#define HID_GALLERY_MN_BACKGROUND "SVX_HID_GALLERY_MN_BACKGROUND" +#define HID_GALLERY_MN_COPYCLIPBOARD "SVX_HID_GALLERY_MN_COPYCLIPBOARD" +#define HID_GALLERY_MN_DELETE "SVX_HID_GALLERY_MN_DELETE" +#define HID_GALLERY_MN_PASTECLIPBOARD "SVX_HID_GALLERY_MN_PASTECLIPBOARD" +#define HID_GALLERY_MN_PREVIEW "SVX_HID_GALLERY_MN_PREVIEW" +#define HID_GALLERY_NEWTHEME "SVX_HID_GALLERY_NEWTHEME" +#define HID_GALLERY_PREVIEW "SVX_HID_GALLERY_PREVIEW" +#define HID_GALLERY_PROPERTIES "SVX_HID_GALLERY_PROPERTIES" +#define HID_GALLERY_RENAME "SVX_HID_GALLERY_RENAME" +#define HID_GALLERY_THEMELIST "SVX_HID_GALLERY_THEMELIST" // free -#define HID_GALLERY_WINDOW (HID_SVX_START + 74) -#define HID_GRFFILTER (HID_SVX_START + 75) -#define HID_GRFFILTER_EMBOSS (HID_SVX_START + 76) -#define HID_GRFFILTER_INVERT (HID_SVX_START + 77) -#define HID_GRFFILTER_MOSAIC (HID_SVX_START + 78) -#define HID_GRFFILTER_POPART (HID_SVX_START + 79) -#define HID_GRFFILTER_POSTER (HID_SVX_START + 80) -#define HID_GRFFILTER_REMOVENOISE (HID_SVX_START + 81) -#define HID_GRFFILTER_SEPIA (HID_SVX_START + 82) -#define HID_GRFFILTER_SHARPEN (HID_SVX_START + 83) -#define HID_GRFFILTER_SMOOTH (HID_SVX_START + 84) -#define HID_GRFFILTER_SOBEL (HID_SVX_START + 85) -#define HID_GRFFILTER_SOLARIZE (HID_SVX_START + 86) - -#define HID_IMAPDLG_ACTIVE (HID_SVX_START + 88) -#define HID_IMAPDLG_APPLY (HID_SVX_START + 89) -#define HID_IMAPDLG_CIRCLE (HID_SVX_START + 90) -#define HID_IMAPDLG_FREEPOLY (HID_SVX_START + 91) -#define HID_IMAPDLG_GRAPHWND (HID_SVX_START + 92) -#define HID_IMAPDLG_MACRO (HID_SVX_START + 93) -#define HID_IMAPDLG_OPEN (HID_SVX_START + 94) -#define HID_IMAPDLG_POLY (HID_SVX_START + 95) -#define HID_IMAPDLG_POLYDELETE (HID_SVX_START + 96) -#define HID_IMAPDLG_POLYEDIT (HID_SVX_START + 97) -#define HID_IMAPDLG_POLYINSERT (HID_SVX_START + 98) -#define HID_IMAPDLG_POLYMOVE (HID_SVX_START + 99) -#define HID_IMAPDLG_PROPERTY (HID_SVX_START + 100) -#define HID_IMAPDLG_RECT (HID_SVX_START + 101) -#define HID_IMAPDLG_REDO (HID_SVX_START + 102) -#define HID_IMAPDLG_SAVEAS (HID_SVX_START + 103) -#define HID_IMAPDLG_SELECT (HID_SVX_START + 104) -#define HID_IMAPDLG_TOOLBOX (HID_SVX_START + 105) -#define HID_IMAPDLG_UNDO (HID_SVX_START + 106) -#define HID_MENU_EXTRUSION_DEPTH (HID_SVX_START + 107) -#define HID_MENU_EXTRUSION_DIRECTION (HID_SVX_START + 108) -#define HID_MENU_EXTRUSION_LIGHTING (HID_SVX_START + 109) -#define HID_MENU_EXTRUSION_SURFACE (HID_SVX_START + 110) -#define HID_MNU_FUNC_AVG (HID_SVX_START + 111) -#define HID_MNU_FUNC_COUNT (HID_SVX_START + 112) -#define HID_MNU_FUNC_COUNT2 (HID_SVX_START + 113) -#define HID_MNU_FUNC_MAX (HID_SVX_START + 114) -#define HID_MNU_FUNC_MIN (HID_SVX_START + 115) -#define HID_MNU_FUNC_NONE (HID_SVX_START + 116) -#define HID_MNU_FUNC_SUM (HID_SVX_START + 117) -#define HID_MNU_ZOOM_100 (HID_SVX_START + 118) -#define HID_MNU_ZOOM_150 (HID_SVX_START + 119) -#define HID_MNU_ZOOM_200 (HID_SVX_START + 120) -#define HID_MNU_ZOOM_50 (HID_SVX_START + 121) -#define HID_MNU_ZOOM_75 (HID_SVX_START + 122) -#define HID_MNU_ZOOM_OPTIMAL (HID_SVX_START + 123) -#define HID_MNU_ZOOM_PAGE_WIDTH (HID_SVX_START + 124) -#define HID_MNU_ZOOM_WHOLE_PAGE (HID_SVX_START + 125) -#define HID_OPTIONS_GRID (HID_SVX_START + 126) -#define HID_PASSWORD (HID_SVX_START + 127) -#define HID_POPUP_COLOR (HID_SVX_START + 128) -#define HID_POPUP_COLOR_CTRL (HID_SVX_START + 129) -#define HID_POPUP_EXTRUSION_DEPTH (HID_SVX_START + 130) -#define HID_POPUP_EXTRUSION_DIRECTION (HID_SVX_START + 131) -#define HID_POPUP_EXTRUSION_LIGHTING (HID_SVX_START + 132) -#define HID_POPUP_EXTRUSION_SURFACE (HID_SVX_START + 133) -#define HID_POPUP_FONTWORK_ALIGN (HID_SVX_START + 134) -#define HID_POPUP_FONTWORK_CHARSPACE (HID_SVX_START + 135) -#define HID_POPUP_FRAME (HID_SVX_START + 136) -#define HID_POPUP_LINE (HID_SVX_START + 137) -#define HID_POPUP_LINEEND (HID_SVX_START + 138) -#define HID_POPUP_LINEEND_CTRL (HID_SVX_START + 139) -#define HID_REDLINING_FILTER_BTN_REF (HID_SVX_START + 140) -#define HID_REDLINING_FILTER_CB_ACTION (HID_SVX_START + 141) -#define HID_REDLINING_FILTER_CB_AUTOR (HID_SVX_START + 142) -#define HID_REDLINING_FILTER_CB_COMMENT (HID_SVX_START + 143) -#define HID_REDLINING_FILTER_CB_DATE (HID_SVX_START + 144) -#define HID_REDLINING_FILTER_CB_RANGE (HID_SVX_START + 145) -#define HID_REDLINING_FILTER_DF_DATE (HID_SVX_START + 146) -#define HID_REDLINING_FILTER_DF_DATE2 (HID_SVX_START + 147) -#define HID_REDLINING_FILTER_ED_COMMENT (HID_SVX_START + 148) -#define HID_REDLINING_FILTER_ED_RANGE (HID_SVX_START + 149) -#define HID_REDLINING_FILTER_IB_CLOCK (HID_SVX_START + 150) -#define HID_REDLINING_FILTER_IB_CLOCK2 (HID_SVX_START + 151) -#define HID_REDLINING_FILTER_LB_ACTION (HID_SVX_START + 152) -#define HID_REDLINING_FILTER_LB_AUTOR (HID_SVX_START + 153) -#define HID_REDLINING_FILTER_LB_DATE (HID_SVX_START + 154) -#define HID_REDLINING_FILTER_PAGE (HID_SVX_START + 155) -#define HID_REDLINING_FILTER_TF_DATE (HID_SVX_START + 156) -#define HID_REDLINING_FILTER_TF_DATE2 (HID_SVX_START + 157) -#define HID_REDLINING_TABCONTROL (HID_SVX_START + 158) -#define HID_REDLINING_VIEW_DG_VIEW (HID_SVX_START + 159) -#define HID_REDLINING_VIEW_DG_VIEW_HEADER (HID_SVX_START + 160) -#define HID_REDLINING_VIEW_DG_VIEW_TABLE (HID_SVX_START + 161) -#define HID_REDLINING_VIEW_PAGE (HID_SVX_START + 162) -#define HID_REDLINING_VIEW_PB_ACCEPT (HID_SVX_START + 163) -#define HID_REDLINING_VIEW_PB_ACCEPTALL (HID_SVX_START + 164) -#define HID_REDLINING_VIEW_PB_REJECT (HID_SVX_START + 165) -#define HID_REDLINING_VIEW_PB_REJECTALL (HID_SVX_START + 166) -#define HID_REDLINING_VIEW_PB_UNDO (HID_SVX_START + 167) -#define HID_RUBY_DIALOG (HID_SVX_START + 168) -#define HID_STYLE_LISTBOX (HID_SVX_START + 169) -#define HID_SVXTBX_ALIGNMENT (HID_SVX_START + 170) -#define HID_SVXTBX_DRAW (HID_SVX_START + 171) -#define HID_SVXTBX_UNDO_REDO_CTRL (HID_SVX_START + 172) -#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE (HID_SVX_START + 173) -#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER (HID_SVX_START + 174) -#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED (HID_SVX_START + 175) -#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL (HID_SVX_START + 176) -#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED (HID_SVX_START + 177) -#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL (HID_SVX_START + 178) -#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS (HID_SVX_START + 179) -#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED (HID_SVX_START + 180) -#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL (HID_SVX_START + 181) -#define HID_SVX_MDLG_DOCRECOVERY_BROKEN (HID_SVX_START + 182) -#define HID_SVX_MDLG_DOCRECOVERY_PROGR (HID_SVX_START + 183) -#define HID_SVX_MDLG_ERR_REP_OPTIONS (HID_SVX_START + 184) -#define HID_SVX_MDLG_ERR_REP_PREVIEW (HID_SVX_START + 185) -#define HID_SVX_TABDLG_DOCRECOVERY (HID_SVX_START + 186) -#define HID_SVX_TP_DOCRECOVERY_RECOVER (HID_SVX_START + 187) -#define HID_SVX_TP_DOCRECOVERY_SAVE (HID_SVX_START + 188) -#define HID_SVX_TP_ERR_REP_SEND (HID_SVX_START + 189) -#define HID_SVX_TP_ERR_REP_WELCOME (HID_SVX_START + 190) - -#define HID_VALUESET_EXTRUSION_DIRECTION (HID_SVX_START + 192) -#define HID_VALUESET_EXTRUSION_LIGHTING (HID_SVX_START + 193) -#define HID_WIN_FONTWORK_ALIGN (HID_SVX_START + 194) -#define HID_WIN_FONTWORK_CHARSPACE (HID_SVX_START + 195) -#define HID_XMLSEC_CALL (HID_SVX_START + 196) -#define HID_OFA_HYPERLINK_DLG (HID_SVX_START + 197) -#define HID_OFA_HYPERLINK_NAME (HID_SVX_START + 198) -#define HID_OFA_HYPERLINK_SEARCH (HID_SVX_START + 199) -#define HID_OFA_HYPERLINK_TARGET (HID_SVX_START + 200) -#define HID_OFA_HYPERLINK_URL (HID_SVX_START + 201) -#define HID_OFA_HYPERLINK_URL_TXT (HID_SVX_START + 202) -#define HID_AUTOCORR_DLG (HID_SVX_START + 203) -#define HID_SVXCTL_MAIL_ATTACH (HID_SVX_START + 204) -#define HID_SVXDLG_REGISTRATION (HID_SVX_START + 205) -#define HID_SVXDLG_TREE_BASE (HID_SVX_START + 206) -#define HID_SVXDLG_TREE_CHART (HID_SVX_START + 207) -#define HID_SVXDLG_TREE_FILTER (HID_SVX_START + 208) -#define HID_SVXDLG_TREE_LANGUAGE (HID_SVX_START + 209) -#define HID_SVXWIN_MAIL_ATTACH (HID_SVX_START + 210) -#define HID_SVXWIN_MAIL_HEADER (HID_SVX_START + 211) -#define HID_SVX_DLGFORMNEW (HID_SVX_START + 212) -#define HID_SVX_DLGTABNEW (HID_SVX_START + 213) -#define HID_SVX_HYPERLINK (HID_SVX_START + 214) -#define HID_SVX_MAILATTACH_ASCII_CB (HID_SVX_START + 215) -#define HID_SVX_MAILATTACH_HTML_CB (HID_SVX_START + 216) -#define HID_SVX_MAILATTACH_OFFICE_CB (HID_SVX_START + 217) -#define HID_SVX_MAILATTACH_PRIORITY_LB (HID_SVX_START + 218) -#define HID_SVX_MAILATTACH_RECEIPT_CB (HID_SVX_START + 219) -#define HID_SVX_MAILATTACH_RTF_CB (HID_SVX_START + 220) -#define HID_SVX_MAILHEAD_HEAD_WIN (HID_SVX_START + 221) -#define HID_SVX_MAILHEAD_PRIORITY_LB (HID_SVX_START + 222) -#define HID_SVX_MAILHEAD_PROTOCOL_LB (HID_SVX_START + 223) -#define HID_SVX_MAILHEAD_RCPT_CB (HID_SVX_START + 224) -#define HID_SVX_MAILHEAD_RCPT_ED (HID_SVX_START + 225) -#define HID_SVX_MAILHEAD_RCPT_LB (HID_SVX_START + 226) -#define HID_SVX_MAILHEAD_RECEIPT_CB (HID_SVX_START + 227) -#define HID_SVX_MAILHEAD_ROLE_LB (HID_SVX_START + 228) -#define HID_SVX_MAILHEAD_SUBJECT_ED (HID_SVX_START + 229) -#define HID_SVX_MAILMENU_ADDADDRESS (HID_SVX_START + 230) -#define HID_SVX_MAILMENU_COPYLINK (HID_SVX_START + 231) -#define HID_SVX_MAILMENU_DELETE (HID_SVX_START + 232) -#define HID_SVX_MAILMENU_FILE (HID_SVX_START + 233) -#define HID_SVX_MAILMENU_OPEN (HID_SVX_START + 234) -#define HID_SVX_MAILMENU_RENAME (HID_SVX_START + 235) -#define HID_SVX_MAILMENU_SAVEAS (HID_SVX_START + 236) -#define HID_SVX_MAILMENU_SIG1 (HID_SVX_START + 237) -#define HID_SVX_MAILMENU_SIG2 (HID_SVX_START + 238) -#define HID_SVX_MAILMENU_SIG3 (HID_SVX_START + 239) -#define HID_SVX_MAILMENU_SIG4 (HID_SVX_START + 240) -#define HID_SVX_MAILTOOLBOX (HID_SVX_START + 241) -#define HID_SVX_SENDMENU_ENCRYPT (HID_SVX_START + 242) -#define HID_SVX_SENDMENU_PLAIN (HID_SVX_START + 243) -#define HID_SVX_SENDMENU_SIGN (HID_SVX_START + 244) -#define HID_SVX_SENDMENU_SIGNANDENCRYPT (HID_SVX_START + 245) -#define HID_SVX_TP_APPEARANCE (HID_SVX_START + 246) -#define HID_SVX_TP_DESKTOP (HID_SVX_START + 247) -#define HID_CT_THES_ALTERNATIVES (HID_SVX_START + 248) +#define HID_GALLERY_WINDOW "SVX_HID_GALLERY_WINDOW" +#define HID_GRFFILTER "SVX_HID_GRFFILTER" +#define HID_GRFFILTER_EMBOSS "SVX_HID_GRFFILTER_EMBOSS" +#define HID_GRFFILTER_INVERT "SVX_HID_GRFFILTER_INVERT" +#define HID_GRFFILTER_MOSAIC "SVX_HID_GRFFILTER_MOSAIC" +#define HID_GRFFILTER_POPART "SVX_HID_GRFFILTER_POPART" +#define HID_GRFFILTER_POSTER "SVX_HID_GRFFILTER_POSTER" +#define HID_GRFFILTER_REMOVENOISE "SVX_HID_GRFFILTER_REMOVENOISE" +#define HID_GRFFILTER_SEPIA "SVX_HID_GRFFILTER_SEPIA" +#define HID_GRFFILTER_SHARPEN "SVX_HID_GRFFILTER_SHARPEN" +#define HID_GRFFILTER_SMOOTH "SVX_HID_GRFFILTER_SMOOTH" +#define HID_GRFFILTER_SOBEL "SVX_HID_GRFFILTER_SOBEL" +#define HID_GRFFILTER_SOLARIZE "SVX_HID_GRFFILTER_SOLARIZE" -// please adjust ACT_SVX_HID_END2 below if you add entries here! +#define HID_IMAPDLG_ACTIVE "SVX_HID_IMAPDLG_ACTIVE" +#define HID_IMAPDLG_APPLY "SVX_HID_IMAPDLG_APPLY" +#define HID_IMAPDLG_CIRCLE "SVX_HID_IMAPDLG_CIRCLE" +#define HID_IMAPDLG_FREEPOLY "SVX_HID_IMAPDLG_FREEPOLY" +#define HID_IMAPDLG_GRAPHWND "SVX_HID_IMAPDLG_GRAPHWND" +#define HID_IMAPDLG_MACRO "SVX_HID_IMAPDLG_MACRO" +#define HID_IMAPDLG_OPEN "SVX_HID_IMAPDLG_OPEN" +#define HID_IMAPDLG_POLY "SVX_HID_IMAPDLG_POLY" +#define HID_IMAPDLG_POLYDELETE "SVX_HID_IMAPDLG_POLYDELETE" +#define HID_IMAPDLG_POLYEDIT "SVX_HID_IMAPDLG_POLYEDIT" +#define HID_IMAPDLG_POLYINSERT "SVX_HID_IMAPDLG_POLYINSERT" +#define HID_IMAPDLG_POLYMOVE "SVX_HID_IMAPDLG_POLYMOVE" +#define HID_IMAPDLG_PROPERTY "SVX_HID_IMAPDLG_PROPERTY" +#define HID_IMAPDLG_RECT "SVX_HID_IMAPDLG_RECT" +#define HID_IMAPDLG_REDO "SVX_HID_IMAPDLG_REDO" +#define HID_IMAPDLG_SAVEAS "SVX_HID_IMAPDLG_SAVEAS" +#define HID_IMAPDLG_SELECT "SVX_HID_IMAPDLG_SELECT" +#define HID_IMAPDLG_TOOLBOX "SVX_HID_IMAPDLG_TOOLBOX" +#define HID_IMAPDLG_UNDO "SVX_HID_IMAPDLG_UNDO" +#define HID_MENU_EXTRUSION_DEPTH "SVX_HID_MENU_EXTRUSION_DEPTH" +#define HID_MENU_EXTRUSION_DIRECTION "SVX_HID_MENU_EXTRUSION_DIRECTION" +#define HID_MENU_EXTRUSION_LIGHTING "SVX_HID_MENU_EXTRUSION_LIGHTING" +#define HID_MENU_EXTRUSION_SURFACE "SVX_HID_MENU_EXTRUSION_SURFACE" +#define HID_MNU_FUNC_AVG "SVX_HID_MNU_FUNC_AVG" +#define HID_MNU_FUNC_COUNT "SVX_HID_MNU_FUNC_COUNT" +#define HID_MNU_FUNC_COUNT2 "SVX_HID_MNU_FUNC_COUNT2" +#define HID_MNU_FUNC_MAX "SVX_HID_MNU_FUNC_MAX" +#define HID_MNU_FUNC_MIN "SVX_HID_MNU_FUNC_MIN" +#define HID_MNU_FUNC_NONE "SVX_HID_MNU_FUNC_NONE" +#define HID_MNU_FUNC_SUM "SVX_HID_MNU_FUNC_SUM" +#define HID_MNU_ZOOM_100 "SVX_HID_MNU_ZOOM_100" +#define HID_MNU_ZOOM_150 "SVX_HID_MNU_ZOOM_150" +#define HID_MNU_ZOOM_200 "SVX_HID_MNU_ZOOM_200" +#define HID_MNU_ZOOM_50 "SVX_HID_MNU_ZOOM_50" +#define HID_MNU_ZOOM_75 "SVX_HID_MNU_ZOOM_75" +#define HID_MNU_ZOOM_OPTIMAL "SVX_HID_MNU_ZOOM_OPTIMAL" +#define HID_MNU_ZOOM_PAGE_WIDTH "SVX_HID_MNU_ZOOM_PAGE_WIDTH" +#define HID_MNU_ZOOM_WHOLE_PAGE "SVX_HID_MNU_ZOOM_WHOLE_PAGE" +#define HID_OPTIONS_GRID "SVX_HID_OPTIONS_GRID" +#define HID_PASSWORD "SVX_HID_PASSWORD" +#define HID_POPUP_COLOR "SVX_HID_POPUP_COLOR" +#define HID_POPUP_COLOR_CTRL "SVX_HID_POPUP_COLOR_CTRL" +#define HID_POPUP_EXTRUSION_DEPTH "SVX_HID_POPUP_EXTRUSION_DEPTH" +#define HID_POPUP_EXTRUSION_DIRECTION "SVX_HID_POPUP_EXTRUSION_DIRECTION" +#define HID_POPUP_EXTRUSION_LIGHTING "SVX_HID_POPUP_EXTRUSION_LIGHTING" +#define HID_POPUP_EXTRUSION_SURFACE "SVX_HID_POPUP_EXTRUSION_SURFACE" +#define HID_POPUP_FONTWORK_ALIGN "SVX_HID_POPUP_FONTWORK_ALIGN" +#define HID_POPUP_FONTWORK_CHARSPACE "SVX_HID_POPUP_FONTWORK_CHARSPACE" +#define HID_POPUP_FRAME "SVX_HID_POPUP_FRAME" +#define HID_POPUP_LINE "SVX_HID_POPUP_LINE" +#define HID_POPUP_LINEEND "SVX_HID_POPUP_LINEEND" +#define HID_POPUP_LINEEND_CTRL "SVX_HID_POPUP_LINEEND_CTRL" +#define HID_REDLINING_FILTER_BTN_REF "SVX_HID_REDLINING_FILTER_BTN_REF" +#define HID_REDLINING_FILTER_CB_ACTION "SVX_HID_REDLINING_FILTER_CB_ACTION" +#define HID_REDLINING_FILTER_CB_AUTOR "SVX_HID_REDLINING_FILTER_CB_AUTOR" +#define HID_REDLINING_FILTER_CB_COMMENT "SVX_HID_REDLINING_FILTER_CB_COMMENT" +#define HID_REDLINING_FILTER_CB_DATE "SVX_HID_REDLINING_FILTER_CB_DATE" +#define HID_REDLINING_FILTER_CB_RANGE "SVX_HID_REDLINING_FILTER_CB_RANGE" +#define HID_REDLINING_FILTER_DF_DATE "SVX_HID_REDLINING_FILTER_DF_DATE" +#define HID_REDLINING_FILTER_DF_DATE2 "SVX_HID_REDLINING_FILTER_DF_DATE2" +#define HID_REDLINING_FILTER_ED_COMMENT "SVX_HID_REDLINING_FILTER_ED_COMMENT" +#define HID_REDLINING_FILTER_ED_RANGE "SVX_HID_REDLINING_FILTER_ED_RANGE" +#define HID_REDLINING_FILTER_IB_CLOCK "SVX_HID_REDLINING_FILTER_IB_CLOCK" +#define HID_REDLINING_FILTER_IB_CLOCK2 "SVX_HID_REDLINING_FILTER_IB_CLOCK2" +#define HID_REDLINING_FILTER_LB_ACTION "SVX_HID_REDLINING_FILTER_LB_ACTION" +#define HID_REDLINING_FILTER_LB_AUTOR "SVX_HID_REDLINING_FILTER_LB_AUTOR" +#define HID_REDLINING_FILTER_LB_DATE "SVX_HID_REDLINING_FILTER_LB_DATE" +#define HID_REDLINING_FILTER_PAGE "SVX_HID_REDLINING_FILTER_PAGE" +#define HID_REDLINING_FILTER_TF_DATE "SVX_HID_REDLINING_FILTER_TF_DATE" +#define HID_REDLINING_FILTER_TF_DATE2 "SVX_HID_REDLINING_FILTER_TF_DATE2" +#define HID_REDLINING_TABCONTROL "SVX_HID_REDLINING_TABCONTROL" +#define HID_REDLINING_VIEW_DG_VIEW "SVX_HID_REDLINING_VIEW_DG_VIEW" +#define HID_REDLINING_VIEW_DG_VIEW_HEADER "SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER" +#define HID_REDLINING_VIEW_DG_VIEW_TABLE "SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE" +#define HID_REDLINING_VIEW_PAGE "SVX_HID_REDLINING_VIEW_PAGE" +#define HID_REDLINING_VIEW_PB_ACCEPT "SVX_HID_REDLINING_VIEW_PB_ACCEPT" +#define HID_REDLINING_VIEW_PB_ACCEPTALL "SVX_HID_REDLINING_VIEW_PB_ACCEPTALL" +#define HID_REDLINING_VIEW_PB_REJECT "SVX_HID_REDLINING_VIEW_PB_REJECT" +#define HID_REDLINING_VIEW_PB_REJECTALL "SVX_HID_REDLINING_VIEW_PB_REJECTALL" +#define HID_REDLINING_VIEW_PB_UNDO "SVX_HID_REDLINING_VIEW_PB_UNDO" +#define HID_RUBY_DIALOG "SVX_HID_RUBY_DIALOG" +#define HID_STYLE_LISTBOX "SVX_HID_STYLE_LISTBOX" +#define HID_SVXTBX_ALIGNMENT "SVX_HID_SVXTBX_ALIGNMENT" +#define HID_SVXTBX_DRAW "SVX_HID_SVXTBX_DRAW" +#define HID_SVXTBX_UNDO_REDO_CTRL "SVX_HID_SVXTBX_UNDO_REDO_CTRL" +#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE "SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE" +#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER "SVX_HID_SVX_CHINESE_DICTIONARY_LB_HEADER" +#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED" +#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL" +#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED" +#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL" +#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS "SVX_HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS" +#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED" +#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL" +#define HID_SVX_MDLG_DOCRECOVERY_BROKEN "SVX_HID_SVX_MDLG_DOCRECOVERY_BROKEN" +#define HID_SVX_MDLG_DOCRECOVERY_PROGR "SVX_HID_SVX_MDLG_DOCRECOVERY_PROGR" +#define HID_SVX_MDLG_ERR_REP_OPTIONS "SVX_HID_SVX_MDLG_ERR_REP_OPTIONS" +#define HID_SVX_MDLG_ERR_REP_PREVIEW "SVX_HID_SVX_MDLG_ERR_REP_PREVIEW" +#define HID_SVX_TABDLG_DOCRECOVERY "SVX_HID_SVX_TABDLG_DOCRECOVERY" +#define HID_SVX_TP_DOCRECOVERY_RECOVER "SVX_HID_SVX_TP_DOCRECOVERY_RECOVER" +#define HID_SVX_TP_DOCRECOVERY_SAVE "SVX_HID_SVX_TP_DOCRECOVERY_SAVE" +#define HID_SVX_TP_ERR_REP_SEND "SVX_HID_SVX_TP_ERR_REP_SEND" +#define HID_SVX_TP_ERR_REP_WELCOME "SVX_HID_SVX_TP_ERR_REP_WELCOME" -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_SVX_HID_END (HID_SVX_START+248) -#if ACT_SVX_HID_END > HID_SVX_END -#error Resource overflow in #line, #file -#endif +#define HID_VALUESET_EXTRUSION_DIRECTION "SVX_HID_VALUESET_EXTRUSION_DIRECTION" +#define HID_VALUESET_EXTRUSION_LIGHTING "SVX_HID_VALUESET_EXTRUSION_LIGHTING" +#define HID_WIN_FONTWORK_ALIGN "SVX_HID_WIN_FONTWORK_ALIGN" +#define HID_WIN_FONTWORK_CHARSPACE "SVX_HID_WIN_FONTWORK_CHARSPACE" +#define HID_XMLSEC_CALL "SVX_HID_XMLSEC_CALL" +#define HID_OFA_HYPERLINK_DLG "SVX_HID_OFA_HYPERLINK_DLG" +#define HID_OFA_HYPERLINK_NAME "SVX_HID_OFA_HYPERLINK_NAME" +#define HID_OFA_HYPERLINK_SEARCH "SVX_HID_OFA_HYPERLINK_SEARCH" +#define HID_OFA_HYPERLINK_TARGET "SVX_HID_OFA_HYPERLINK_TARGET" +#define HID_OFA_HYPERLINK_URL "SVX_HID_OFA_HYPERLINK_URL" +#define HID_OFA_HYPERLINK_URL_TXT "SVX_HID_OFA_HYPERLINK_URL_TXT" +#define HID_AUTOCORR_DLG "SVX_HID_AUTOCORR_DLG" +#define HID_SVXCTL_MAIL_ATTACH "SVX_HID_SVXCTL_MAIL_ATTACH" +#define HID_SVXDLG_REGISTRATION "SVX_HID_SVXDLG_REGISTRATION" +#define HID_SVXDLG_TREE_BASE "SVX_HID_SVXDLG_TREE_BASE" +#define HID_SVXDLG_TREE_CHART "SVX_HID_SVXDLG_TREE_CHART" +#define HID_SVXDLG_TREE_FILTER "SVX_HID_SVXDLG_TREE_FILTER" +#define HID_SVXDLG_TREE_LANGUAGE "SVX_HID_SVXDLG_TREE_LANGUAGE" +#define HID_SVXWIN_MAIL_ATTACH "SVX_HID_SVXWIN_MAIL_ATTACH" +#define HID_SVXWIN_MAIL_HEADER "SVX_HID_SVXWIN_MAIL_HEADER" +#define HID_SVX_DLGFORMNEW "SVX_HID_SVX_DLGFORMNEW" +#define HID_SVX_DLGTABNEW "SVX_HID_SVX_DLGTABNEW" +#define HID_SVX_HYPERLINK "SVX_HID_SVX_HYPERLINK" +#define HID_SVX_MAILATTACH_ASCII_CB "SVX_HID_SVX_MAILATTACH_ASCII_CB" +#define HID_SVX_MAILATTACH_HTML_CB "SVX_HID_SVX_MAILATTACH_HTML_CB" +#define HID_SVX_MAILATTACH_OFFICE_CB "SVX_HID_SVX_MAILATTACH_OFFICE_CB" +#define HID_SVX_MAILATTACH_PRIORITY_LB "SVX_HID_SVX_MAILATTACH_PRIORITY_LB" +#define HID_SVX_MAILATTACH_RECEIPT_CB "SVX_HID_SVX_MAILATTACH_RECEIPT_CB" +#define HID_SVX_MAILATTACH_RTF_CB "SVX_HID_SVX_MAILATTACH_RTF_CB" +#define HID_SVX_MAILHEAD_HEAD_WIN "SVX_HID_SVX_MAILHEAD_HEAD_WIN" +#define HID_SVX_MAILHEAD_PRIORITY_LB "SVX_HID_SVX_MAILHEAD_PRIORITY_LB" +#define HID_SVX_MAILHEAD_PROTOCOL_LB "SVX_HID_SVX_MAILHEAD_PROTOCOL_LB" +#define HID_SVX_MAILHEAD_RCPT_CB "SVX_HID_SVX_MAILHEAD_RCPT_CB" +#define HID_SVX_MAILHEAD_RCPT_ED "SVX_HID_SVX_MAILHEAD_RCPT_ED" +#define HID_SVX_MAILHEAD_RCPT_LB "SVX_HID_SVX_MAILHEAD_RCPT_LB" +#define HID_SVX_MAILHEAD_RECEIPT_CB "SVX_HID_SVX_MAILHEAD_RECEIPT_CB" +#define HID_SVX_MAILHEAD_ROLE_LB "SVX_HID_SVX_MAILHEAD_ROLE_LB" +#define HID_SVX_MAILHEAD_SUBJECT_ED "SVX_HID_SVX_MAILHEAD_SUBJECT_ED" +#define HID_SVX_MAILMENU_ADDADDRESS "SVX_HID_SVX_MAILMENU_ADDADDRESS" +#define HID_SVX_MAILMENU_COPYLINK "SVX_HID_SVX_MAILMENU_COPYLINK" +#define HID_SVX_MAILMENU_DELETE "SVX_HID_SVX_MAILMENU_DELETE" +#define HID_SVX_MAILMENU_FILE "SVX_HID_SVX_MAILMENU_FILE" +#define HID_SVX_MAILMENU_OPEN "SVX_HID_SVX_MAILMENU_OPEN" +#define HID_SVX_MAILMENU_RENAME "SVX_HID_SVX_MAILMENU_RENAME" +#define HID_SVX_MAILMENU_SAVEAS "SVX_HID_SVX_MAILMENU_SAVEAS" +#define HID_SVX_MAILMENU_SIG1 "SVX_HID_SVX_MAILMENU_SIG1" +#define HID_SVX_MAILMENU_SIG2 "SVX_HID_SVX_MAILMENU_SIG2" +#define HID_SVX_MAILMENU_SIG3 "SVX_HID_SVX_MAILMENU_SIG3" +#define HID_SVX_MAILMENU_SIG4 "SVX_HID_SVX_MAILMENU_SIG4" +#define HID_SVX_MAILTOOLBOX "SVX_HID_SVX_MAILTOOLBOX" +#define HID_SVX_SENDMENU_ENCRYPT "SVX_HID_SVX_SENDMENU_ENCRYPT" +#define HID_SVX_SENDMENU_PLAIN "SVX_HID_SVX_SENDMENU_PLAIN" +#define HID_SVX_SENDMENU_SIGN "SVX_HID_SVX_SENDMENU_SIGN" +#define HID_SVX_SENDMENU_SIGNANDENCRYPT "SVX_HID_SVX_SENDMENU_SIGNANDENCRYPT" +#define HID_SVX_TP_APPEARANCE "SVX_HID_SVX_TP_APPEARANCE" +#define HID_SVX_TP_DESKTOP "SVX_HID_SVX_TP_DESKTOP" +#define HID_CT_THES_ALTERNATIVES "SVX_HID_CT_THES_ALTERNATIVES" #endif diff --git a/svx/inc/lightdlg.hxx b/svx/inc/lightdlg.hxx index b179163289..b179163289 100644..100755 --- a/svx/inc/lightdlg.hxx +++ b/svx/inc/lightdlg.hxx diff --git a/svx/inc/pch/precompiled_svx.cxx b/svx/inc/pch/precompiled_svx.cxx index 88354384ce..88354384ce 100644..100755 --- a/svx/inc/pch/precompiled_svx.cxx +++ b/svx/inc/pch/precompiled_svx.cxx diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index f9e3f6a5bd..787699cebc 100644..100755 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -808,7 +808,6 @@ #include "svtools/parhtml.hxx" #include "svtools/parrtf.hxx" #include "unotools/pathoptions.hxx" -#include "svl/pickerhelper.hxx" #include "svl/poolitem.hxx" #include "unotools/printwarningoptions.hxx" #include "svl/ptitem.hxx" @@ -923,7 +922,7 @@ #include "vcl/cursor.hxx" #include "vcl/decoview.hxx" #include "vcl/dndhelp.hxx" -#include "vcl/fldunit.hxx" +#include "tools/fldunit.hxx" #include "vcl/fntstyle.hxx" #include "unotools/fontcvt.hxx" #include "vcl/gdimtf.hxx" @@ -942,7 +941,7 @@ #include "vcl/unohelp.hxx" #include "vcl/unohelp2.hxx" #include "vcl/wall.hxx" -#include "vcl/wintypes.hxx" +#include "tools/wintypes.hxx" #include "osl/mutex.hxx" #include "xmloff/DashStyle.hxx" #include "xmloff/GradientStyle.hxx" diff --git a/svx/inc/sjctrl.hxx b/svx/inc/sjctrl.hxx index 42af07adde..e91603880c 100644..100755 --- a/svx/inc/sjctrl.hxx +++ b/svx/inc/sjctrl.hxx @@ -130,10 +130,10 @@ class ImpSjJScriptCheckboxObject : public SjJScriptCheckboxObject, ImpSjJScriptC virtual String getValue() const; virtual String getType() const; - virtual BOOL getChecked() const; - virtual void setChecked( BOOL bCheck ); - virtual BOOL getDefaultChecked() const; - virtual void setDefaultChecked( BOOL bCheck ); + virtual sal_Bool getChecked() const; + virtual void setChecked( sal_Bool bCheck ); + virtual sal_Bool getDefaultChecked() const; + virtual void setDefaultChecked( sal_Bool bCheck ); virtual void setValue( const String & aStrg ); // Methods of the object @@ -159,8 +159,8 @@ class ImpSjJScriptRadioArray: public SjJSbxArrayObject { VCRadioManager* pMgr; public: - INT32 ImpSjJScriptRadioArray::getLength() const; - SjJSbxObject* ImpSjJScriptRadioArray::getElement( INT32 nIndex ) const; + sal_Int32 ImpSjJScriptRadioArray::getLength() const; + SjJSbxObject* ImpSjJScriptRadioArray::getElement( sal_Int32 nIndex ) const; SjJSbxObject* ImpSjJScriptRadioArray::getElement_String( const String & aName ) const; // construktor @@ -181,10 +181,10 @@ class ImpSjJScriptRadioObject : public SjJScriptRadioObject, ImpSjJScriptControl virtual String getType() const; // Properties of SjJScriptCheckboxObject - virtual BOOL getChecked() const; - virtual void setChecked( BOOL bCheck ); - virtual BOOL getDefaultChecked() const; - virtual void setDefaultChecked( BOOL bCheck ); + virtual sal_Bool getChecked() const; + virtual void setChecked( sal_Bool bCheck ); + virtual sal_Bool getDefaultChecked() const; + virtual void setDefaultChecked( sal_Bool bCheck ); virtual void setValue( const String & aStrg ); // Methods of the object @@ -215,9 +215,9 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr virtual String getValue() const; virtual String getType() const; - virtual INT32 getLength(); - virtual INT32 getSelectedIndex() const; - virtual void setSelectedIndex( INT32 nNo ); + virtual sal_Int32 getLength(); + virtual sal_Int32 getSelectedIndex() const; + virtual void setSelectedIndex( sal_Int32 nNo ); // Methods of the object virtual void focus(); @@ -243,42 +243,42 @@ class ImpSjJScriptSelectObject : public SjJScriptSelectObject, ImpSjJScriptContr void onFocus(); // SjJSbxArrayObject methods - virtual INT32 getLength() const; + virtual sal_Int32 getLength() const; // Access through the index - virtual SjJSbxObject * getElement( INT32 nIndex ) const; + virtual SjJSbxObject * getElement( sal_Int32 nIndex ) const; // Constructor ImpSjJScriptSelectObject( VCControl* _pControl, SjJSbxObject * p ); // for setting entries of the object (to be called from Java) - virtual void setOption( INT32 nIndex, const String & aOptionText, + virtual void setOption( sal_Int32 nIndex, const String & aOptionText, const String & aOptionValue, - BOOL bDefaultSelected, BOOL bSelected ); + sal_Bool bDefaultSelected, sal_Bool bSelected ); // interface for the properties of the option objects - virtual BOOL getOptionDefaultSelected( INT32 nIndex ) const; - virtual void setOptionDefaultSelected( BOOL bSelected, INT32 nIndex ); - virtual BOOL getOptionSelected( INT32 nIndex ) const; - virtual void setOptionSelected( BOOL bSelected, INT32 nIndex ); - virtual String getOptionText( INT32 nIndex ) const; - virtual void setOptionText( const String & sText, INT32 nIndex ); - virtual void setOptionValue( const String & sText, INT32 nIndex ); - virtual String getOptionValue( INT32 nIndex ) const; + virtual sal_Bool getOptionDefaultSelected( sal_Int32 nIndex ) const; + virtual void setOptionDefaultSelected( sal_Bool bSelected, sal_Int32 nIndex ); + virtual sal_Bool getOptionSelected( sal_Int32 nIndex ) const; + virtual void setOptionSelected( sal_Bool bSelected, sal_Int32 nIndex ); + virtual String getOptionText( sal_Int32 nIndex ) const; + virtual void setOptionText( const String & sText, sal_Int32 nIndex ); + virtual void setOptionValue( const String & sText, sal_Int32 nIndex ); + virtual String getOptionValue( sal_Int32 nIndex ) const; }; //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptControlBase { - USHORT nListBoxIndex; + sal_uInt16 nListBoxIndex; public: // Methods from Java --> C++ (for properties) //-------------------------------------------- - virtual BOOL getdefaultSelected() const; - virtual void setdefaultSelected( BOOL bSelected ); - virtual INT32 getIndex() const; - virtual BOOL getSelected() const; - virtual void setSelected( BOOL bSelected ); + virtual sal_Bool getdefaultSelected() const; + virtual void setdefaultSelected( sal_Bool bSelected ); + virtual sal_Int32 getIndex() const; + virtual sal_Bool getSelected() const; + virtual void setSelected( sal_Bool bSelected ); virtual String getText() const; virtual void setText( const String & sText ); @@ -298,7 +298,7 @@ class ImpSjJScriptOptionObject : public SjJScriptOptionObject, ImpSjJScriptContr // none ! // Constructor - ImpSjJScriptOptionObject( VCControl* _pControl, SjJSbxObject * p, USHORT _nListBoxIndex ); + ImpSjJScriptOptionObject( VCControl* _pControl, SjJSbxObject * p, sal_uInt16 _nListBoxIndex ); }; //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ @@ -310,9 +310,9 @@ class SjJSbxFormsArray: public SfxJSArray public: // SjJSbxArrayObject methods - virtual INT32 getLength() const; + virtual sal_Int32 getLength() const; // access through the index - virtual SjJSbxObject * getElement( INT32 nIndex ) const; + virtual SjJSbxObject * getElement( sal_Int32 nIndex ) const; // access through the name // cannot overload native java methods (yet) virtual SjJSbxObject * getElement_String( const String & aName ) const; @@ -557,8 +557,8 @@ class ImpSjJScriptFormObject : public SjJScriptFormObject virtual void setTarget( const String & sValue ); // SjJSbxArrayObject methods - INT32 getLength() const; - SjJSbxObject* getElement( INT32 nIndex ) const; + sal_Int32 getLength() const; + SjJSbxObject* getElement( sal_Int32 nIndex ) const; SjJSbxObject* getElement_String( const String & aName ) const; // Methods of the object diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index b46d695f3f..47982f8683 100644..100755 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -48,9 +48,9 @@ friend class ImpItemEdit; Link aSetDirtyHdl; ImpItemListRow* pAktChangeEntry; long nLastWhichOfs; - USHORT nLastWhich; - USHORT nLastWhichOben; - USHORT nLastWhichUnten; + sal_uInt16 nLastWhich; + sal_uInt16 nLastWhichOben; + sal_uInt16 nLastWhichUnten; bool bWhichesButNames; bool bDontHideIneffectiveItems; bool bDontSortItems; @@ -59,15 +59,15 @@ friend class ImpItemEdit; private: #if _SOLAR__PRIVATE void ImpCtor(); - void ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEntryNum); - ImpItemListRow* ImpGetEntry(ULONG nPos) const { return (ImpItemListRow*)aList.GetObject(nPos); } + void ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntPtr nEntryNum); + ImpItemListRow* ImpGetEntry(sal_uIntPtr nPos) const { return (ImpItemListRow*)aList.GetObject(nPos); } void ImpSaveWhich(); void ImpRestoreWhich(); #endif // __PRIVATE protected: virtual long GetRowCount() const; - virtual BOOL SeekRow(long nRow); - virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId) const; + virtual sal_Bool SeekRow(long nRow); + virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const; virtual void DoubleClick(const BrowserMouseEvent&); virtual void KeyInput(const KeyEvent& rEvt); virtual void Select(); @@ -79,9 +79,9 @@ public: virtual ~_SdrItemBrowserControl(); void Clear(); void SetAttributes(const SfxItemSet* pAttr, const SfxItemSet* p2ndSet=NULL); - ULONG GetCurrentPos() const; - USHORT GetCurrentWhich() const; - virtual bool BegChangeEntry(ULONG nPos); + sal_uIntPtr GetCurrentPos() const; + sal_uInt16 GetCurrentWhich() const; + virtual bool BegChangeEntry(sal_uIntPtr nPos); virtual bool EndChangeEntry(); virtual void BrkChangeEntry(); @@ -93,7 +93,7 @@ public: @return the text out of the cell */ - virtual String GetCellText(long _nRow, USHORT _nColId) const; + virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const; const ImpItemListRow* GetAktChangeEntry() const { return pAktChangeEntry; } XubString GetNewEntryValue() const { return pEditControl->GetText(); } diff --git a/svx/inc/svdpomv.hxx b/svx/inc/svdpomv.hxx index 8a35638621..8a35638621 100644..100755 --- a/svx/inc/svdpomv.hxx +++ b/svx/inc/svdpomv.hxx diff --git a/svx/inc/svx/AccessibleControlShape.hxx b/svx/inc/svx/AccessibleControlShape.hxx index 42518561c8..42518561c8 100644..100755 --- a/svx/inc/svx/AccessibleControlShape.hxx +++ b/svx/inc/svx/AccessibleControlShape.hxx diff --git a/svx/inc/svx/AccessibleGraphicShape.hxx b/svx/inc/svx/AccessibleGraphicShape.hxx index efd568138f..efd568138f 100644..100755 --- a/svx/inc/svx/AccessibleGraphicShape.hxx +++ b/svx/inc/svx/AccessibleGraphicShape.hxx diff --git a/svx/inc/svx/AccessibleOLEShape.hxx b/svx/inc/svx/AccessibleOLEShape.hxx index 77aead6fd3..77aead6fd3 100644..100755 --- a/svx/inc/svx/AccessibleOLEShape.hxx +++ b/svx/inc/svx/AccessibleOLEShape.hxx diff --git a/svx/inc/svx/AccessibleShape.hxx b/svx/inc/svx/AccessibleShape.hxx index edd01a314f..edd01a314f 100644..100755 --- a/svx/inc/svx/AccessibleShape.hxx +++ b/svx/inc/svx/AccessibleShape.hxx diff --git a/svx/inc/svx/AccessibleShapeInfo.hxx b/svx/inc/svx/AccessibleShapeInfo.hxx index 15271ef95a..15271ef95a 100644..100755 --- a/svx/inc/svx/AccessibleShapeInfo.hxx +++ b/svx/inc/svx/AccessibleShapeInfo.hxx diff --git a/svx/inc/svx/AccessibleShapeTreeInfo.hxx b/svx/inc/svx/AccessibleShapeTreeInfo.hxx index 1ba7fa48bd..1ba7fa48bd 100644..100755 --- a/svx/inc/svx/AccessibleShapeTreeInfo.hxx +++ b/svx/inc/svx/AccessibleShapeTreeInfo.hxx diff --git a/svx/inc/svx/AccessibleTableShape.hxx b/svx/inc/svx/AccessibleTableShape.hxx index 2da3859c44..2da3859c44 100644..100755 --- a/svx/inc/svx/AccessibleTableShape.hxx +++ b/svx/inc/svx/AccessibleTableShape.hxx diff --git a/svx/inc/svx/AccessibleTextHelper.hxx b/svx/inc/svx/AccessibleTextHelper.hxx index ae52362029..ae52362029 100644..100755 --- a/svx/inc/svx/AccessibleTextHelper.hxx +++ b/svx/inc/svx/AccessibleTextHelper.hxx diff --git a/svx/inc/ActionDescriptionProvider.hxx b/svx/inc/svx/ActionDescriptionProvider.hxx index 95e61a649f..95e61a649f 100644..100755 --- a/svx/inc/ActionDescriptionProvider.hxx +++ b/svx/inc/svx/ActionDescriptionProvider.hxx diff --git a/svx/inc/svx/ChildrenManager.hxx b/svx/inc/svx/ChildrenManager.hxx index 8230d566df..8230d566df 100644..100755 --- a/svx/inc/svx/ChildrenManager.hxx +++ b/svx/inc/svx/ChildrenManager.hxx diff --git a/svx/inc/DescriptionGenerator.hxx b/svx/inc/svx/DescriptionGenerator.hxx index 4b951aaee0..4b951aaee0 100644..100755 --- a/svx/inc/DescriptionGenerator.hxx +++ b/svx/inc/svx/DescriptionGenerator.hxx diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx index 568f533385..568f533385 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShape2d.hxx +++ b/svx/inc/svx/EnhancedCustomShape2d.hxx diff --git a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx index 7383bfa5f5..7383bfa5f5 100644..100755 --- a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx +++ b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx index 4c16eb1bf7..4c16eb1bf7 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx +++ b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx index 4432c7a8a1..4432c7a8a1 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx +++ b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx diff --git a/svx/inc/svx/IAccessibleParent.hxx b/svx/inc/svx/IAccessibleParent.hxx index 2f07103ef5..2f07103ef5 100644..100755 --- a/svx/inc/svx/IAccessibleParent.hxx +++ b/svx/inc/svx/IAccessibleParent.hxx diff --git a/svx/inc/svx/IAccessibleViewForwarder.hxx b/svx/inc/svx/IAccessibleViewForwarder.hxx index ee787a9a8e..ee787a9a8e 100644..100755 --- a/svx/inc/svx/IAccessibleViewForwarder.hxx +++ b/svx/inc/svx/IAccessibleViewForwarder.hxx diff --git a/svx/inc/svx/IAccessibleViewForwarderListener.hxx b/svx/inc/svx/IAccessibleViewForwarderListener.hxx index db771fa8b3..db771fa8b3 100644..100755 --- a/svx/inc/svx/IAccessibleViewForwarderListener.hxx +++ b/svx/inc/svx/IAccessibleViewForwarderListener.hxx diff --git a/svx/inc/ParseContext.hxx b/svx/inc/svx/ParseContext.hxx index fa90223515..fa90223515 100644..100755 --- a/svx/inc/ParseContext.hxx +++ b/svx/inc/svx/ParseContext.hxx diff --git a/svx/inc/svx/ShapeTypeHandler.hxx b/svx/inc/svx/ShapeTypeHandler.hxx index 9b0237c8e5..9b0237c8e5 100644..100755 --- a/svx/inc/svx/ShapeTypeHandler.hxx +++ b/svx/inc/svx/ShapeTypeHandler.hxx diff --git a/svx/inc/svx/SmartTagCtl.hxx b/svx/inc/svx/SmartTagCtl.hxx index e0c12228f6..fa06b4ba35 100644..100755 --- a/svx/inc/svx/SmartTagCtl.hxx +++ b/svx/inc/svx/SmartTagCtl.hxx @@ -73,11 +73,11 @@ private: void FillMenu(); DECL_LINK( MenuSelect, PopupMenu * ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - SvxSmartTagsControl( USHORT nId, Menu&, SfxBindings& ); + SvxSmartTagsControl( sal_uInt16 nId, Menu&, SfxBindings& ); ~SvxSmartTagsControl(); virtual PopupMenu* GetPopup() const; diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx index 898d2407aa..58cb835e02 100644..100755 --- a/svx/inc/svx/SmartTagItem.hxx +++ b/svx/inc/svx/SmartTagItem.hxx @@ -64,7 +64,7 @@ class SVX_DLLPUBLIC SvxSmartTagItem : public SfxPoolItem public: TYPEINFO(); - SvxSmartTagItem( const USHORT nId, + SvxSmartTagItem( const sal_uInt16 nId, const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence, const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& rActionIndicesSequence, const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, @@ -77,10 +77,10 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; // leer - virtual SvStream& Store(SvStream &, USHORT nItemVersion) const; // leer - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; // leer + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion) const; // leer + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& GetActionComponentsSequence() const { return maActionComponentsSequence; } const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& GetActionIndicesSequence() const { return maActionIndicesSequence; } diff --git a/svx/inc/svx/SmartTagMgr.hxx b/svx/inc/svx/SmartTagMgr.hxx index 1559cad536..1559cad536 100644..100755 --- a/svx/inc/svx/SmartTagMgr.hxx +++ b/svx/inc/svx/SmartTagMgr.hxx diff --git a/svx/inc/svx/SpellDialogChildWindow.hxx b/svx/inc/svx/SpellDialogChildWindow.hxx index af440c0e8a..c3240fb7a5 100644..100755 --- a/svx/inc/svx/SpellDialogChildWindow.hxx +++ b/svx/inc/svx/SpellDialogChildWindow.hxx @@ -59,7 +59,7 @@ class SVX_DLLPUBLIC SpellDialogChildWindow public: SpellDialogChildWindow ( Window*pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo); virtual ~SpellDialogChildWindow (); diff --git a/svx/inc/svx/SvxShapeTypes.hxx b/svx/inc/svx/SvxShapeTypes.hxx index 1f7f08faf2..1f7f08faf2 100644..100755 --- a/svx/inc/svx/SvxShapeTypes.hxx +++ b/svx/inc/svx/SvxShapeTypes.hxx diff --git a/svx/inc/UnoNamespaceMap.hxx b/svx/inc/svx/UnoNamespaceMap.hxx index eaa7712863..eaa7712863 100644..100755 --- a/svx/inc/UnoNamespaceMap.hxx +++ b/svx/inc/svx/UnoNamespaceMap.hxx diff --git a/svx/inc/XPropertyTable.hxx b/svx/inc/svx/XPropertyTable.hxx index 45d8db0f25..45d8db0f25 100644..100755 --- a/svx/inc/XPropertyTable.hxx +++ b/svx/inc/svx/XPropertyTable.hxx diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx index cb14fa25f0..a4a1e3b17e 100644..100755 --- a/svx/inc/svx/algitem.hxx +++ b/svx/inc/svx/algitem.hxx @@ -47,24 +47,24 @@ public: SvxOrientationItem( const SvxCellOrientation eOrientation /*= SVX_ORIENTATION_STANDARD*/, - const USHORT nId ); + const sal_uInt16 nId ); SvxOrientationItem( - INT32 nRotation, BOOL bStacked, - const USHORT nId ); + sal_Int32 nRotation, sal_Bool bStacked, + const sal_uInt16 nId ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual USHORT GetValueCount() const; - virtual String GetValueText( USHORT nVal ) const; + virtual sal_uInt16 GetValueCount() const; + virtual String GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; inline SvxOrientationItem& operator=(const SvxOrientationItem& rOrientation) { @@ -72,28 +72,28 @@ public: return *this; } - /** Returns TRUE, if the item represents STACKED state. */ - BOOL IsStacked() const; + /** Returns sal_True, if the item represents STACKED state. */ + sal_Bool IsStacked() const; /** Returns the rotation this item represents (returns nStdAngle for STANDARD and STACKED state). */ - INT32 GetRotation( INT32 nStdAngle = 0 ) const; + sal_Int32 GetRotation( sal_Int32 nStdAngle = 0 ) const; /** Fills this item according to passed item values. */ - void SetFromRotation( INT32 nRotation, BOOL bStacked ); + void SetFromRotation( sal_Int32 nRotation, sal_Bool bStacked ); }; //------------------------------------------------------------------------ class SVX_DLLPUBLIC SvxMarginItem: public SfxPoolItem { - INT16 nLeftMargin; - INT16 nTopMargin; - INT16 nRightMargin; - INT16 nBottomMargin; + sal_Int16 nLeftMargin; + sal_Int16 nTopMargin; + sal_Int16 nRightMargin; + sal_Int16 nBottomMargin; public: TYPEINFO(); - SvxMarginItem( const USHORT nId ); - SvxMarginItem( INT16 nLeft, INT16 nTop /*= 0*/, - INT16 nRight /*= 0*/, INT16 nBottom /*= 0*/, - const USHORT nId ); + SvxMarginItem( const sal_uInt16 nId ); + SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop /*= 0*/, + sal_Int16 nRight /*= 0*/, sal_Int16 nBottom /*= 0*/, + const sal_uInt16 nId ); SvxMarginItem( const SvxMarginItem& ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -103,20 +103,20 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const; - - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - - INT16 GetLeftMargin() const {return nLeftMargin; } - BOOL SetLeftMargin(INT16 nLeft); - INT16 GetTopMargin() const {return nTopMargin; } - BOOL SetTopMargin(INT16 nTop); - INT16 GetRightMargin() const {return nRightMargin; } - BOOL SetRightMargin(INT16 nRight); - INT16 GetBottomMargin() const {return nBottomMargin; } - BOOL SetBottomMargin(INT16 nBottom); + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; + virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const; + + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + + sal_Int16 GetLeftMargin() const {return nLeftMargin; } + sal_Bool SetLeftMargin(sal_Int16 nLeft); + sal_Int16 GetTopMargin() const {return nTopMargin; } + sal_Bool SetTopMargin(sal_Int16 nTop); + sal_Int16 GetRightMargin() const {return nRightMargin; } + sal_Bool SetRightMargin(sal_Int16 nRight); + sal_Int16 GetBottomMargin() const {return nBottomMargin; } + sal_Bool SetBottomMargin(sal_Int16 nBottom); inline SvxMarginItem& operator=(const SvxMarginItem& rMargin) { diff --git a/svx/inc/anchorid.hxx b/svx/inc/svx/anchorid.hxx index 516aebd18b..516aebd18b 100644..100755 --- a/svx/inc/anchorid.hxx +++ b/svx/inc/svx/anchorid.hxx diff --git a/svx/inc/svx/bmpmask.hxx b/svx/inc/svx/bmpmask.hxx index d6b0b0c66b..af00d01078 100644..100755 --- a/svx/inc/svx/bmpmask.hxx +++ b/svx/inc/svx/bmpmask.hxx @@ -51,11 +51,11 @@ private: SvxBmpMask &rBmpMask; protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - SvxBmpMaskSelectItem( USHORT nId, SvxBmpMask& rMask, + SvxBmpMaskSelectItem( sal_uInt16 nId, SvxBmpMask& rMask, SfxBindings& rBindings ); }; @@ -69,7 +69,7 @@ class SVX_DLLPUBLIC SvxBmpMaskChildWindow : public SfxChildWindow { public: SvxBmpMaskChildWindow( Window*, - USHORT, SfxBindings*, + sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW(SvxBmpMaskChildWindow); @@ -97,6 +97,9 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow PushButton aBtnExec; FixedLine aGrpQ; + FixedText aFt1; + FixedText aFt2; + FixedText aFt3; CheckBox aCbx1; MaskSet* pQSet1; MetricField aSp1; @@ -120,21 +123,19 @@ class SVX_DLLPUBLIC SvxBmpMask : public SfxDockingWindow MaskData* pData; CheckBox aCbxTrans; ColorLB aLbColorTrans; - FixedText aFt1; - FixedText aFt2; - FixedText aFt3; + const XColorTable* pColTab; Color aPipetteColor; SvxBmpMaskSelectItem aSelItem; Image maImgPipette; - virtual BOOL Close(); + virtual sal_Bool Close(); #ifdef BMPMASK_PRIVATE - USHORT InitColorArrays( Color* pSrcCols, Color* pDstCols, - ULONG* pTols ); + sal_uInt16 InitColorArrays( Color* pSrcCols, Color* pDstCols, + sal_uIntPtr* pTols ); Bitmap ImpMask( const Bitmap& rBitmap ); BitmapEx ImpMask( const BitmapEx& rBitmapEx ); @@ -163,14 +164,14 @@ public: void SetColor( const Color& rColor ); void PipetteClicked(); - BOOL NeedsColorTable() const; + sal_Bool NeedsColorTable() const; void SetColorTable( const XColorTable* pColorTable ); - void SetExecState( BOOL bEnable ); + void SetExecState( sal_Bool bEnable ); Graphic Mask( const Graphic& rGraphic ); - BOOL IsEyedropping() const; + sal_Bool IsEyedropping() const; void onSelect( MaskSet* pSet ); diff --git a/svx/inc/svx/camera3d.hxx b/svx/inc/svx/camera3d.hxx index 0f1a8aba37..0f1a8aba37 100644..100755 --- a/svx/inc/svx/camera3d.hxx +++ b/svx/inc/svx/camera3d.hxx diff --git a/svx/inc/svx/charmap.hxx b/svx/inc/svx/charmap.hxx index ba66b9df30..ccbc488865 100644..100755 --- a/svx/inc/svx/charmap.hxx +++ b/svx/inc/svx/charmap.hxx @@ -59,7 +59,7 @@ public: void SetFont( const Font& rFont ); - void SelectCharacter( sal_uInt32 cNew, BOOL bFocus = FALSE ); + void SelectCharacter( sal_uInt32 cNew, sal_Bool bFocus = sal_False ); sal_UCS4 GetSelectCharacter() const; Link GetDoubleClickHdl() const { return aDoubleClkHdl; } @@ -77,12 +77,12 @@ public: int FirstInView( void) const; int LastInView( void) const; int PixelToMapIndex( const Point&) const; - void SelectIndex( int index, BOOL bFocus = FALSE ); + void SelectIndex( int index, sal_Bool bFocus = sal_False ); void DeSelect(); - inline sal_Bool IsSelected(USHORT _nPos) const { return _nPos == nSelectedIndex; } - inline USHORT GetSelectIndexId() const { return sal::static_int_cast<USHORT>(nSelectedIndex); } - USHORT GetRowPos(USHORT _nPos) const; - USHORT GetColumnPos(USHORT _nPos) const; + inline sal_Bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; } + inline sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); } + sal_uInt16 GetRowPos(sal_uInt16 _nPos) const; + sal_uInt16 GetColumnPos(sal_uInt16 _nPos) const; void ImplFireAccessibleEvent( short nEventId, const ::com::sun::star::uno::Any& rOldValue, @@ -120,7 +120,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAccessible; long nX; long nY; - BOOL bDrag; + sal_Bool bDrag; sal_Int32 nSelectedIndex; @@ -131,7 +131,7 @@ private: private: void DrawChars_Impl( int n1, int n2); - void InitSettings( BOOL bForeground, BOOL bBackground); + void InitSettings( sal_Bool bForeground, sal_Bool bBackground); // abstraction layers are: Unicode<->MapIndex<->Pixel Point MapIndexToPixel( int) const; DECL_LINK( VscrollHdl, ScrollBar* ); diff --git a/svx/inc/svx/checklbx.hxx b/svx/inc/svx/checklbx.hxx index c69f9bd390..9be32da323 100644..100755 --- a/svx/inc/svx/checklbx.hxx +++ b/svx/inc/svx/checklbx.hxx @@ -53,8 +53,8 @@ private: using SvTreeListBox::InsertEntry; // Avoid ambiguity with new InsertEntry: virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent, - BOOL bChildsOnDemand, - ULONG nPos, void* pUserData, + sal_Bool bChildsOnDemand, + sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind ); public: @@ -65,23 +65,23 @@ public: ~SvxCheckListBox(); void InsertEntry ( const String& rStr, - USHORT nPos = LISTBOX_APPEND, + sal_uInt16 nPos = LISTBOX_APPEND, void* pUserData = NULL, SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox ); - void RemoveEntry ( USHORT nPos ); + void RemoveEntry ( sal_uInt16 nPos ); - void SelectEntryPos ( USHORT nPos, BOOL bSelect = TRUE ); - USHORT GetSelectEntryPos () const; + void SelectEntryPos ( sal_uInt16 nPos, sal_Bool bSelect = sal_True ); + sal_uInt16 GetSelectEntryPos () const; - String GetText ( USHORT nPos ) const; - USHORT GetCheckedEntryCount() const; - void CheckEntryPos ( USHORT nPos, BOOL bCheck = TRUE ); - BOOL IsChecked ( USHORT nPos ) const; + String GetText ( sal_uInt16 nPos ) const; + sal_uInt16 GetCheckedEntryCount() const; + void CheckEntryPos ( sal_uInt16 nPos, sal_Bool bCheck = sal_True ); + sal_Bool IsChecked ( sal_uInt16 nPos ) const; void ToggleCheckButton ( SvLBoxEntry* pEntry ); - void* SetEntryData ( USHORT nPos, void* pNewData ); - void* GetEntryData ( USHORT nPos ) const; + void* SetEntryData ( sal_uInt16 nPos, void* pNewData ); + void* GetEntryData ( sal_uInt16 nPos ) const; virtual void MouseButtonDown ( const MouseEvent& rMEvt ); virtual void KeyInput ( const KeyEvent& rKEvt ); diff --git a/svx/inc/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx index 4ce6daea7b..edbc1fadfd 100644..100755 --- a/svx/inc/chrtitem.hxx +++ b/svx/inc/svx/chrtitem.hxx @@ -115,21 +115,6 @@ enum SvxChartDataDescr #define CHDESCR_COUNT (CHDESCR_TEXTANDVALUE + 1) -enum SvxChartLegendPos -{ - CHLEGEND_NONE, - CHLEGEND_LEFT, - CHLEGEND_TOP, - CHLEGEND_RIGHT, - CHLEGEND_BOTTOM, - CHLEGEND_NONE_TOP, - CHLEGEND_NONE_LEFT, - CHLEGEND_NONE_RIGHT, - CHLEGEND_NONE_BOTTOM -}; - -#define CHLEGEND_COUNT (CHLEGEND_BOTTOM + 1) - enum SvxChartTextOrder { CHTXTORDER_SIDEBYSIDE, @@ -193,13 +178,13 @@ class SVX_DLLPUBLIC SvxChartStyleItem : public SfxEnumItem public: TYPEINFO(); SvxChartStyleItem(SvxChartStyle eStyle /*= CHSTYLE_2D_LINE*/, - USHORT nId ); - SvxChartStyleItem(SvStream& rIn, USHORT nId ); + sal_uInt16 nId ); + SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - USHORT GetValueCount() const { return CHSTYLE_COUNT; } + sal_uInt16 GetValueCount() const { return CHSTYLE_COUNT; } SvxChartStyle GetValue() const { return (SvxChartStyle)SfxEnumItem::GetValue(); } }; @@ -211,16 +196,16 @@ class SVX_DLLPUBLIC SvxChartRegressItem : public SfxEnumItem public: TYPEINFO(); SvxChartRegressItem(SvxChartRegress eRegress /*= CHREGRESS_LINEAR*/, - USHORT nId ); - SvxChartRegressItem(SvStream& rIn, USHORT nId ); + sal_uInt16 nId ); + SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - USHORT GetValueCount() const { return CHREGRESS_COUNT; } + sal_uInt16 GetValueCount() const { return CHREGRESS_COUNT; } SvxChartRegress GetValue() const { return (SvxChartRegress)SfxEnumItem::GetValue(); } - USHORT GetVersion (USHORT nFileFormatVersion) const; + sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; }; //------------------------------------------------------------------ @@ -230,55 +215,36 @@ class SVX_DLLPUBLIC SvxChartDataDescrItem : public SfxEnumItem public: TYPEINFO(); SvxChartDataDescrItem(SvxChartDataDescr eDataDescr /*= CHDESCR_NONE*/, - USHORT nId ); + sal_uInt16 nId ); SvxChartDataDescrItem(SvStream& rIn, - USHORT nId ); + sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - USHORT GetValueCount() const { return CHDESCR_COUNT; } + sal_uInt16 GetValueCount() const { return CHDESCR_COUNT; } SvxChartDataDescr GetValue() const { return (SvxChartDataDescr)SfxEnumItem::GetValue(); } }; //------------------------------------------------------------------ -class SVX_DLLPUBLIC SvxChartLegendPosItem : public SfxEnumItem -{ -public: - TYPEINFO(); - SvxChartLegendPosItem(SvxChartLegendPos eLegendPos /*= CHLEGEND_NONE*/, - USHORT nId ); - SvxChartLegendPosItem(SvStream& rIn, - USHORT nId ); - - virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - - USHORT GetValueCount() const { return CHLEGEND_COUNT; } - SvxChartLegendPos GetValue() const - { return (SvxChartLegendPos)SfxEnumItem::GetValue(); } -}; - -//------------------------------------------------------------------ - class SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem { public: TYPEINFO(); SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= CHTXTORDER_SIDEBYSIDE*/, - USHORT nId ); + sal_uInt16 nId ); SvxChartTextOrderItem(SvStream& rIn, - USHORT nId ); + sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - USHORT GetValueCount() const { return CHTXTORDER_COUNT; } + sal_uInt16 GetValueCount() const { return CHTXTORDER_COUNT; } SvxChartTextOrder GetValue() const { return (SvxChartTextOrder)SfxEnumItem::GetValue(); } }; @@ -290,14 +256,14 @@ class SVX_DLLPUBLIC SvxChartTextOrientItem : public SfxEnumItem public: TYPEINFO(); SvxChartTextOrientItem(SvxChartTextOrient /*eOrient = CHTXTORIENT_STANDARD*/, - USHORT nId ); + sal_uInt16 nId ); SvxChartTextOrientItem(SvStream& rIn, - USHORT nId ); + sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - USHORT GetValueCount() const { return CHTXTORDER_COUNT; } + sal_uInt16 GetValueCount() const { return CHTXTORDER_COUNT; } SvxChartTextOrient GetValue() const { return (SvxChartTextOrient)SfxEnumItem::GetValue(); } }; @@ -309,18 +275,18 @@ class SVX_DLLPUBLIC SvxChartKindErrorItem : public SfxEnumItem public: TYPEINFO(); SvxChartKindErrorItem(SvxChartKindError /*eOrient = CHERROR_NONE*/, - USHORT nId ); + sal_uInt16 nId ); SvxChartKindErrorItem(SvStream& rIn, - USHORT nId ); + sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - USHORT GetValueCount() const { return CHERROR_COUNT; } + sal_uInt16 GetValueCount() const { return CHERROR_COUNT; } SvxChartKindError GetValue() const { return (SvxChartKindError)SfxEnumItem::GetValue(); } - USHORT GetVersion (USHORT nFileFormatVersion) const; + sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; }; //------------------------------------------------------------------ @@ -330,18 +296,18 @@ class SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem public: TYPEINFO(); SvxChartIndicateItem(SvxChartIndicate eOrient /*= CHINDICATE_NONE*/, - USHORT nId ); + sal_uInt16 nId ); SvxChartIndicateItem(SvStream& rIn, - USHORT nId ); + sal_uInt16 nId ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - USHORT GetValueCount() const { return CHINDICATE_COUNT; } + sal_uInt16 GetValueCount() const { return CHINDICATE_COUNT; } SvxChartIndicate GetValue() const { return (SvxChartIndicate)SfxEnumItem::GetValue(); } - USHORT GetVersion (USHORT nFileFormatVersion) const; + sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; }; //------------------------------------------------------------------ @@ -352,12 +318,12 @@ class SVX_DLLPUBLIC SvxDoubleItem : public SfxPoolItem public: TYPEINFO(); - SvxDoubleItem(double fValue /*= 0.0*/, USHORT nId ); - SvxDoubleItem(SvStream& rIn, USHORT nId ); + SvxDoubleItem(double fValue /*= 0.0*/, sal_uInt16 nId ); + SvxDoubleItem(SvStream& rIn, sal_uInt16 nId ); SvxDoubleItem(const SvxDoubleItem& rItem); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, @@ -367,8 +333,8 @@ public: virtual int operator == (const SfxPoolItem&) const; virtual SfxPoolItem* Clone(SfxItemPool *pPool = NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVersion) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVersion) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; virtual double GetMin() const; virtual double GetMax() const; diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx index 48651a9e26..cd64e3cb41 100644..100755 --- a/svx/inc/clipboardctl.hxx +++ b/svx/inc/svx/clipboardctl.hxx @@ -44,20 +44,20 @@ class SVX_DLLPUBLIC SvxClipBoardControl : public SfxToolBoxControl { SfxPoolItem* pClipboardFmtItem; PopupMenu* pPopup; - USHORT nItemId; - BOOL bDisabled; + sal_uInt16 nItemId; + sal_Bool bDisabled; void DelPopup(); public: SFX_DECL_TOOLBOX_CONTROL(); - SvxClipBoardControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxClipBoardControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxClipBoardControl(); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx index 03b9bc6aee..5be51aeed0 100644..100755 --- a/svx/inc/clipfmtitem.hxx +++ b/svx/inc/svx/clipfmtitem.hxx @@ -47,20 +47,20 @@ protected: public: TYPEINFO(); - SvxClipboardFmtItem( USHORT nId = 0 ); + SvxClipboardFmtItem( sal_uInt16 nId = 0 ); SvxClipboardFmtItem( const SvxClipboardFmtItem& ); virtual ~SvxClipboardFmtItem(); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); - void AddClipbrdFormat( ULONG nId, USHORT nPos = USHRT_MAX ); - void AddClipbrdFormat( ULONG nId, const String& rName, - USHORT nPos = USHRT_MAX ); - USHORT Count() const; + void AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos = USHRT_MAX ); + void AddClipbrdFormat( sal_uIntPtr nId, const String& rName, + sal_uInt16 nPos = USHRT_MAX ); + sal_uInt16 Count() const; - ULONG GetClipbrdFormatId( USHORT nPos ) const; - const String& GetClipbrdFormatName( USHORT nPos ) const; + sal_uIntPtr GetClipbrdFormatId( sal_uInt16 nPos ) const; + const String& GetClipbrdFormatName( sal_uInt16 nPos ) const; }; diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx index e37363a95b..54772a54c6 100644..100755 --- a/svx/inc/svx/colrctrl.hxx +++ b/svx/inc/svx/colrctrl.hxx @@ -50,7 +50,7 @@ class SvxColorValueSet : public ValueSet, public DragSourceHelper private: - BOOL bLeft; + sal_Bool bLeft; Point aDragPosPixel; protected: @@ -71,7 +71,7 @@ public: SvxColorValueSet( Window* pParent, WinBits nWinStyle = WB_ITEMBORDER ); SvxColorValueSet( Window* pParent, const ResId& rResId ); - BOOL IsLeftButton() const { return bLeft; } + sal_Bool IsLeftButton() const { return bLeft; } }; /************************************************************************* @@ -83,7 +83,7 @@ public: class SVX_DLLPUBLIC SvxColorChildWindow : public SfxChildWindow { public: - SvxColorChildWindow( Window*, USHORT, SfxBindings*, + SvxColorChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW(SvxColorChildWindow); @@ -102,10 +102,10 @@ class SvxColorDockingWindow : public SfxDockingWindow, public SfxListener private: XColorTable* pColorTable; SvxColorValueSet aColorSet; - USHORT nLeftSlot; - USHORT nRightSlot; - USHORT nCols; - USHORT nLines; + sal_uInt16 nLeftSlot; + sal_uInt16 nRightSlot; + sal_uInt16 nCols; + sal_uInt16 nLines; long nCount; Size aColorSize; Size aItemSize; @@ -121,7 +121,7 @@ private: virtual void GetFocus (void); protected: - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Resize(); virtual void Resizing( Size& rSize ); @@ -134,7 +134,7 @@ public: virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); - void SetSlotIDs( USHORT nLeft, USHORT nRight ) + void SetSlotIDs( sal_uInt16 nLeft, sal_uInt16 nRight ) { nLeftSlot = nLeft; nRightSlot = nRight; } virtual long Notify( NotifyEvent& rNEvt ); diff --git a/svx/inc/connctrl.hxx b/svx/inc/svx/connctrl.hxx index 5bd0160031..ab642162ce 100644..100755 --- a/svx/inc/connctrl.hxx +++ b/svx/inc/svx/connctrl.hxx @@ -63,7 +63,7 @@ public: virtual void MouseButtonDown( const MouseEvent& rMEvt ); void SetAttributes( const SfxItemSet& rInAttrs ); - USHORT GetLineDeltaAnz(); + sal_uInt16 GetLineDeltaAnz(); void Construct(); void SetView( const SdrView* pSdrView ) { pView = pSdrView; } diff --git a/svx/inc/svx/contdlg.hxx b/svx/inc/svx/contdlg.hxx index 742e16b66e..757ea46206 100644..100755 --- a/svx/inc/svx/contdlg.hxx +++ b/svx/inc/svx/contdlg.hxx @@ -46,11 +46,11 @@ class SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow { public: - SvxContourDlgChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); + SvxContourDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW( SvxContourDlgChildWindow ); - static void UpdateContourDlg( const Graphic& rGraphic, BOOL bGraphicLinked, + static void UpdateContourDlg( const Graphic& rGraphic, sal_Bool bGraphicLinked, const PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL ); }; @@ -66,11 +66,11 @@ class SvxContourDlgItem : public SfxControllerItem protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - SvxContourDlgItem( USHORT nId, SvxSuperContourDlg& rDlg, SfxBindings& rBindings ); + SvxContourDlgItem( sal_uInt16 nId, SvxSuperContourDlg& rDlg, SfxBindings& rBindings ); }; class SVX_DLLPUBLIC SvxContourDlg : public SfxFloatingWindow @@ -90,12 +90,12 @@ public: Window* pParent, const ResId& rResId ); ~SvxContourDlg(); - void SetExecState( BOOL bEnable ); + void SetExecState( sal_Bool bEnable ); void SetGraphic( const Graphic& rGraphic ); - void SetGraphicLinked( BOOL bLinked ); + void SetGraphicLinked( sal_Bool bLinked ); const Graphic& GetGraphic() const; - BOOL IsGraphicChanged() const; + sal_Bool IsGraphicChanged() const; void SetPolyPolygon( const PolyPolygon& rPolyPoly ); PolyPolygon GetPolyPolygon(); @@ -103,12 +103,12 @@ public: void SetEditingObject( void* pObj ); const void* GetEditingObject() const; - void Update( const Graphic& rGraphic, BOOL bGraphicLinked, + void Update( const Graphic& rGraphic, sal_Bool bGraphicLinked, const PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL ); static PolyPolygon CreateAutoContour( const Graphic& rGraphic, const Rectangle* pRect = NULL, - const ULONG nFlags = 0L ); + const sal_uIntPtr nFlags = 0L ); static void ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic, const MapUnit eUnit, const Size& rDisplaySize ); }; diff --git a/svx/inc/svx/ctredlin.hxx b/svx/inc/svx/ctredlin.hxx index 56a561b1ac..3801daf060 100644..100755 --- a/svx/inc/svx/ctredlin.hxx +++ b/svx/inc/svx/ctredlin.hxx @@ -61,7 +61,7 @@ class SVX_DLLPUBLIC RedlinData public: RedlinData(); virtual ~RedlinData(); - BOOL bDisabled; + sal_Bool bDisabled; DateTime aDateTime; void* pData; }; @@ -81,12 +81,12 @@ private: Color aPrivColor; public: - SvLBoxColorString( SvLBoxEntry*,USHORT nFlags,const XubString& rStr, + SvLBoxColorString( SvLBoxEntry*,sal_uInt16 nFlags,const XubString& rStr, const Color& rCol); SvLBoxColorString(); ~SvLBoxColorString(); - void Paint( const Point&, SvLBox& rDev, USHORT nFlags,SvLBoxEntry* ); + void Paint( const Point&, SvLBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* ); SvLBoxItem* Create() const; }; @@ -96,12 +96,12 @@ class SVX_DLLPUBLIC SvxRedlinTable : public SvxSimpleTable private: - BOOL bIsCalc; - USHORT nDatePos; - BOOL bAuthor; - BOOL bDate; - BOOL bComment; - USHORT nDaTiMode; + sal_Bool bIsCalc; + sal_uInt16 nDatePos; + sal_Bool bAuthor; + sal_Bool bDate; + sal_Bool bComment; + sal_uInt16 nDaTiMode; DateTime aDaTiFirst; DateTime aDaTiLast; DateTime aDaTiFilterFirst; @@ -126,35 +126,35 @@ public: ~SvxRedlinTable(); // For FilterPage only { - void SetFilterDate(BOOL bFlag=TRUE); - void SetDateTimeMode(USHORT nMode); + void SetFilterDate(sal_Bool bFlag=sal_True); + void SetDateTimeMode(sal_uInt16 nMode); void SetFirstDate(const Date&); void SetLastDate(const Date&); void SetFirstTime(const Time&); void SetLastTime(const Time&); - void SetFilterAuthor(BOOL bFlag=TRUE); + void SetFilterAuthor(sal_Bool bFlag=sal_True); void SetAuthor(const String &); - void SetFilterComment(BOOL bFlag=TRUE); + void SetFilterComment(sal_Bool bFlag=sal_True); void SetCommentParams( const utl::SearchParam* pSearchPara ); void UpdateFilterTest(); // } For FilterPage only - void SetCalcView(BOOL bFlag=TRUE); - BOOL IsValidCalcEntry(const String& ,RedlinData *pUserData); - BOOL IsValidWriterEntry(const String& ,RedlinData *pUserData); + void SetCalcView(sal_Bool bFlag=sal_True); + sal_Bool IsValidCalcEntry(const String& ,RedlinData *pUserData); + sal_Bool IsValidWriterEntry(const String& ,RedlinData *pUserData); // no NULL-pointer checking { - BOOL IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment); - BOOL IsValidEntry(const String* pAuthor,const DateTime *pDateTime); - BOOL IsValidComment(const String* pComment); + sal_Bool IsValidEntry(const String* pAuthor,const DateTime *pDateTime,const String* pComment); + sal_Bool IsValidEntry(const String* pAuthor,const DateTime *pDateTime); + sal_Bool IsValidComment(const String* pComment); // } SvLBoxEntry* InsertEntry(const String& ,RedlinData *pUserData, - SvLBoxEntry* pParent=NULL,ULONG nPos=LIST_APPEND); + SvLBoxEntry* pParent=NULL,sal_uIntPtr nPos=LIST_APPEND); SvLBoxEntry* InsertEntry(const String& ,RedlinData *pUserData,const Color&, - SvLBoxEntry* pParent=NULL,ULONG nPos=LIST_APPEND); + SvLBoxEntry* pParent=NULL,sal_uIntPtr nPos=LIST_APPEND); virtual SvLBoxEntry* CreateEntry() const; @@ -201,7 +201,7 @@ private: String aActionStr; String aRangeStr; String aStrMyName; - BOOL bModified; + sal_Bool bModified; DECL_LINK( SelDateHdl, ListBox* ); DECL_LINK( RowEnableHdl, CheckBox* ); @@ -213,9 +213,9 @@ private: protected: - void ShowDateFields(USHORT nKind); - void EnableDateLine1(BOOL bFlag); - void EnableDateLine2(BOOL bFlag); + void ShowDateFields(sal_uInt16 nKind); + void EnableDateLine1(sal_Bool bFlag); + void EnableDateLine2(sal_Bool bFlag); public: SvxTPFilter( Window * pParent); @@ -234,15 +234,15 @@ public: Time GetLastTime() const; void SetLastTime(const Time &aTime); - void SetDateMode(USHORT nMode); - USHORT GetDateMode(); + void SetDateMode(sal_uInt16 nMode); + sal_uInt16 GetDateMode(); void ClearAuthors(); - void InsertAuthor( const String& rString, USHORT nPos = LISTBOX_APPEND ); - USHORT GetSelectedAuthorPos(); + void InsertAuthor( const String& rString, sal_uInt16 nPos = LISTBOX_APPEND ); + sal_uInt16 GetSelectedAuthorPos(); String GetSelectedAuthor()const; - void SelectedAuthorPos(USHORT nPos); - USHORT SelectAuthor(const String& aString); + void SelectedAuthorPos(sal_uInt16 nPos); + sal_uInt16 SelectAuthor(const String& aString); void SetComment(const String &rComment); String GetComment()const; @@ -250,27 +250,27 @@ public: // Methods for Calc { void SetRange(const String& rString); String GetRange() const; - void HideRange(BOOL bHide=TRUE); - void DisableRange(BOOL bFlag=TRUE); + void HideRange(sal_Bool bHide=sal_True); + void DisableRange(sal_Bool bFlag=sal_True); void SetFocusToRange(); // } Methods for Calc - void HideClocks(BOOL bHide=TRUE); - void DisableRef(BOOL bFlag); + void HideClocks(sal_Bool bHide=sal_True); + void DisableRef(sal_Bool bFlag); - BOOL IsDate(); - BOOL IsAuthor(); - BOOL IsRange(); - BOOL IsAction(); - BOOL IsComment(); + sal_Bool IsDate(); + sal_Bool IsAuthor(); + sal_Bool IsRange(); + sal_Bool IsAction(); + sal_Bool IsComment(); - void ShowAction(BOOL bShow=TRUE); + void ShowAction(sal_Bool bShow=sal_True); - void CheckDate(BOOL bFlag=TRUE); - void CheckAuthor(BOOL bFlag=TRUE); - void CheckRange(BOOL bFlag=TRUE); - void CheckAction(BOOL bFlag=TRUE); - void CheckComment(BOOL bFlag=TRUE); + void CheckDate(sal_Bool bFlag=sal_True); + void CheckAuthor(sal_Bool bFlag=sal_True); + void CheckRange(sal_Bool bFlag=sal_True); + void CheckAction(sal_Bool bFlag=sal_True); + void CheckComment(sal_Bool bFlag=sal_True); ListBox* GetLbAction(); @@ -349,21 +349,21 @@ public: void InsertCalcHeader(); SvxRedlinTable* GetTableControl(); - void EnableAccept(BOOL nFlag=TRUE); - void EnableAcceptAll(BOOL nFlag=TRUE); - void EnableReject(BOOL nFlag=TRUE); - void EnableRejectAll(BOOL nFlag=TRUE); - void EnableUndo(BOOL nFlag=TRUE); + void EnableAccept(sal_Bool nFlag=sal_True); + void EnableAcceptAll(sal_Bool nFlag=sal_True); + void EnableReject(sal_Bool nFlag=sal_True); + void EnableRejectAll(sal_Bool nFlag=sal_True); + void EnableUndo(sal_Bool nFlag=sal_True); - void DisableAccept() {EnableAccept(FALSE);} - void DisableAcceptAll() {EnableAcceptAll(FALSE);} - void DisableReject() {EnableReject(FALSE);} - void DisableRejectAll() {EnableRejectAll(FALSE);} - void DisableUndo() {EnableUndo(FALSE);} + void DisableAccept() {EnableAccept(sal_False);} + void DisableAcceptAll() {EnableAcceptAll(sal_False);} + void DisableReject() {EnableReject(sal_False);} + void DisableRejectAll() {EnableRejectAll(sal_False);} + void DisableUndo() {EnableUndo(sal_False);} - void ShowUndo(BOOL nFlag=TRUE); - void HideUndo() {ShowUndo(FALSE);} - BOOL IsUndoVisible(); + void ShowUndo(sal_Bool nFlag=sal_True); + void HideUndo() {ShowUndo(sal_False);} + sal_Bool IsUndoVisible(); Size GetMinSizePixel(); @@ -412,8 +412,8 @@ public: void ShowFilterPage(); void ShowViewPage(); - BOOL IsFilterPageVisible(); - BOOL IsViewPageVisible(); + sal_Bool IsFilterPageVisible(); + sal_Bool IsViewPageVisible(); SvxTPFilter* GetFilterPage(); SvxTPView* GetViewPage(); diff --git a/svx/inc/svx/cube3d.hxx b/svx/inc/svx/cube3d.hxx index 5049bda27c..c3aca2e648 100644..100755 --- a/svx/inc/svx/cube3d.hxx +++ b/svx/inc/svx/cube3d.hxx @@ -56,7 +56,7 @@ private: // Parameter basegfx::B3DPoint aCubePos; basegfx::B3DVector aCubeSize; - UINT16 nSideFlags; + sal_uInt16 nSideFlags; // BOOLeans unsigned bPosIsCenter : 1; @@ -70,8 +70,8 @@ public: E3dCubeObj(E3dDefaultAttributes& rDefault, basegfx::B3DPoint aPos, const basegfx::B3DVector& r3DSize); E3dCubeObj(); - virtual UINT16 GetObjIdentifier() const; - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual sal_uInt16 GetObjIdentifier() const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual void operator=(const SdrObject&); @@ -82,11 +82,11 @@ public: void SetCubeSize(const basegfx::B3DVector& rNew); const basegfx::B3DVector& GetCubeSize() { return aCubeSize; } - void SetPosIsCenter(BOOL bNew); - BOOL GetPosIsCenter() { return (BOOL)bPosIsCenter; } + void SetPosIsCenter(sal_Bool bNew); + sal_Bool GetPosIsCenter() { return (sal_Bool)bPosIsCenter; } - void SetSideFlags(UINT16 nNew); - UINT16 GetSideFlags() { return nSideFlags; } + void SetSideFlags(sal_uInt16 nNew); + sal_uInt16 GetSideFlags() { return nSideFlags; } // TakeObjName...() is for the display in the UI, for example "3 frames selected". virtual void TakeObjNameSingul(String& rName) const; diff --git a/svx/inc/svx/dataaccessdescriptor.hxx b/svx/inc/svx/dataaccessdescriptor.hxx index ec972e0dd8..ec972e0dd8 100644..100755 --- a/svx/inc/svx/dataaccessdescriptor.hxx +++ b/svx/inc/svx/dataaccessdescriptor.hxx diff --git a/svx/inc/svx/databaselocationinput.hxx b/svx/inc/svx/databaselocationinput.hxx index adbaf9ed5a..adbaf9ed5a 100644..100755 --- a/svx/inc/svx/databaselocationinput.hxx +++ b/svx/inc/svx/databaselocationinput.hxx diff --git a/svx/inc/databaseregistrationui.hxx b/svx/inc/svx/databaseregistrationui.hxx index 352913bf5e..9b758e8f5e 100644..100755 --- a/svx/inc/databaseregistrationui.hxx +++ b/svx/inc/svx/databaseregistrationui.hxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,12 +44,10 @@ namespace svx /** opens a dialog which allows the user to administrate the database registrations */ - USHORT SVX_DLLPUBLIC administrateDatabaseRegistration( Window* _parentWindow ); + sal_uInt16 SVX_DLLPUBLIC administrateDatabaseRegistration( Window* _parentWindow ); //........................................................................ } // namespace svx //........................................................................ #endif // SVX_DATABASE_REGISTRATION_UI_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/dbaexchange.hxx b/svx/inc/svx/dbaexchange.hxx index 7a6ce675f3..7a6ce675f3 100644..100755 --- a/svx/inc/svx/dbaexchange.hxx +++ b/svx/inc/svx/dbaexchange.hxx diff --git a/svx/inc/svx/dbaobjectex.hxx b/svx/inc/svx/dbaobjectex.hxx index 446822a2e4..446822a2e4 100644..100755 --- a/svx/inc/svx/dbaobjectex.hxx +++ b/svx/inc/svx/dbaobjectex.hxx diff --git a/svx/inc/svx/dbcharsethelper.hxx b/svx/inc/svx/dbcharsethelper.hxx index ce6bffd3a9..ce6bffd3a9 100644..100755 --- a/svx/inc/svx/dbcharsethelper.hxx +++ b/svx/inc/svx/dbcharsethelper.hxx diff --git a/svx/inc/dbexch.hrc b/svx/inc/svx/dbexch.hrc index 1909ece6de..1909ece6de 100644..100755 --- a/svx/inc/dbexch.hrc +++ b/svx/inc/svx/dbexch.hrc diff --git a/svx/inc/svx/dbtoolsclient.hxx b/svx/inc/svx/dbtoolsclient.hxx index 9144f64cda..7e2cc64314 100644..100755 --- a/svx/inc/svx/dbtoolsclient.hxx +++ b/svx/inc/svx/dbtoolsclient.hxx @@ -58,7 +58,7 @@ namespace svxform static ::connectivity::simple::createDataAccessToolsFactoryFunction s_pFactoryCreationFunc; - mutable BOOL m_bCreateAlready; + mutable sal_Bool m_bCreateAlready; private: mutable ::rtl::Reference< ::connectivity::simple::IDataAccessToolsFactory > m_xDataAccessFactory; diff --git a/svx/inc/svx/def3d.hxx b/svx/inc/svx/def3d.hxx index 93931feca6..93931feca6 100644..100755 --- a/svx/inc/svx/def3d.hxx +++ b/svx/inc/svx/def3d.hxx diff --git a/svx/inc/svx/deflt3d.hxx b/svx/inc/svx/deflt3d.hxx index 41e8754e68..ac6b8583b7 100644..100755 --- a/svx/inc/svx/deflt3d.hxx +++ b/svx/inc/svx/deflt3d.hxx @@ -45,14 +45,14 @@ class SVX_DLLPUBLIC E3dDefaultAttributes private: // Compound object Color aDefaultAmbientColor; - BOOL bDefaultCreateNormals; - BOOL bDefaultCreateTexture; + sal_Bool bDefaultCreateNormals; + sal_Bool bDefaultCreateTexture; // Cube object basegfx::B3DPoint aDefaultCubePos; basegfx::B3DVector aDefaultCubeSize; - UINT16 nDefaultCubeSideFlags; - BOOL bDefaultCubePosIsCenter; + sal_uInt16 nDefaultCubeSideFlags; + sal_Bool bDefaultCubePosIsCenter; // Sphere object basegfx::B3DPoint aDefaultSphereCenter; @@ -60,18 +60,18 @@ private: // Lathe object long nDefaultLatheEndAngle; - BOOL bDefaultLatheSmoothed; - BOOL bDefaultLatheSmoothFrontBack; - BOOL bDefaultLatheCharacterMode; - BOOL bDefaultLatheCloseFront; - BOOL bDefaultLatheCloseBack; + sal_Bool bDefaultLatheSmoothed; + sal_Bool bDefaultLatheSmoothFrontBack; + sal_Bool bDefaultLatheCharacterMode; + sal_Bool bDefaultLatheCloseFront; + sal_Bool bDefaultLatheCloseBack; // Extrude object - BOOL bDefaultExtrudeSmoothed; - BOOL bDefaultExtrudeSmoothFrontBack; - BOOL bDefaultExtrudeCharacterMode; - BOOL bDefaultExtrudeCloseFront; - BOOL bDefaultExtrudeCloseBack; + sal_Bool bDefaultExtrudeSmoothed; + sal_Bool bDefaultExtrudeSmoothFrontBack; + sal_Bool bDefaultExtrudeCharacterMode; + sal_Bool bDefaultExtrudeCloseFront; + sal_Bool bDefaultExtrudeCloseBack; public: // Construktor @@ -85,20 +85,20 @@ public: const Color& GetDefaultAmbientColor() { return aDefaultAmbientColor; } void SetDefaultAmbientColor(const Color& rNew) { aDefaultAmbientColor = rNew; } - BOOL GetDefaultCreateNormals() const { return bDefaultCreateNormals; } - void SetDefaultCreateNormals(const BOOL bNew) { bDefaultCreateNormals = bNew; } - BOOL GetDefaultCreateTexture() const { return bDefaultCreateTexture; } - void SetDefaultCreateTexture(const BOOL bNew) { bDefaultCreateTexture = bNew; } + sal_Bool GetDefaultCreateNormals() const { return bDefaultCreateNormals; } + void SetDefaultCreateNormals(const sal_Bool bNew) { bDefaultCreateNormals = bNew; } + sal_Bool GetDefaultCreateTexture() const { return bDefaultCreateTexture; } + void SetDefaultCreateTexture(const sal_Bool bNew) { bDefaultCreateTexture = bNew; } // Cube object const basegfx::B3DPoint& GetDefaultCubePos() { return aDefaultCubePos; } void SetDefaultCubePos(const basegfx::B3DPoint& rNew) { aDefaultCubePos = rNew; } const basegfx::B3DVector& GetDefaultCubeSize() { return aDefaultCubeSize; } void SetDefaultCubeSize(const basegfx::B3DVector& rNew) { aDefaultCubeSize = rNew; } - UINT16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; } - void SetDefaultCubeSideFlags(const UINT16 nNew) { nDefaultCubeSideFlags = nNew; } - BOOL GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; } - void SetDefaultCubePosIsCenter(const BOOL bNew) { bDefaultCubePosIsCenter = bNew; } + sal_uInt16 GetDefaultCubeSideFlags() const { return nDefaultCubeSideFlags; } + void SetDefaultCubeSideFlags(const sal_uInt16 nNew) { nDefaultCubeSideFlags = nNew; } + sal_Bool GetDefaultCubePosIsCenter() const { return bDefaultCubePosIsCenter; } + void SetDefaultCubePosIsCenter(const sal_Bool bNew) { bDefaultCubePosIsCenter = bNew; } // Sphere object const basegfx::B3DPoint& GetDefaultSphereCenter() { return aDefaultSphereCenter; } @@ -109,28 +109,28 @@ public: // Lathe object long GetDefaultLatheEndAngle() const { return nDefaultLatheEndAngle; } void SetDefaultLatheEndAngle(const long nNew) { nDefaultLatheEndAngle = nNew; } - BOOL GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; } - void SetDefaultLatheSmoothed(const BOOL bNew) { bDefaultLatheSmoothed = bNew; } - BOOL GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; } - void SetDefaultLatheSmoothFrontBack(const BOOL bNew) { bDefaultLatheSmoothFrontBack = bNew; } - BOOL GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; } - void SetDefaultLatheCharacterMode(const BOOL bNew) { bDefaultLatheCharacterMode = bNew; } - BOOL GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; } - void SetDefaultLatheCloseFront(const BOOL bNew) { bDefaultLatheCloseFront = bNew; } - BOOL GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; } - void SetDefaultLatheCloseBack(const BOOL bNew) { bDefaultLatheCloseBack = bNew; } + sal_Bool GetDefaultLatheSmoothed() const { return bDefaultLatheSmoothed; } + void SetDefaultLatheSmoothed(const sal_Bool bNew) { bDefaultLatheSmoothed = bNew; } + sal_Bool GetDefaultLatheSmoothFrontBack() const { return bDefaultLatheSmoothFrontBack; } + void SetDefaultLatheSmoothFrontBack(const sal_Bool bNew) { bDefaultLatheSmoothFrontBack = bNew; } + sal_Bool GetDefaultLatheCharacterMode() const { return bDefaultLatheCharacterMode; } + void SetDefaultLatheCharacterMode(const sal_Bool bNew) { bDefaultLatheCharacterMode = bNew; } + sal_Bool GetDefaultLatheCloseFront() const { return bDefaultLatheCloseFront; } + void SetDefaultLatheCloseFront(const sal_Bool bNew) { bDefaultLatheCloseFront = bNew; } + sal_Bool GetDefaultLatheCloseBack() const { return bDefaultLatheCloseBack; } + void SetDefaultLatheCloseBack(const sal_Bool bNew) { bDefaultLatheCloseBack = bNew; } // Extrude object - BOOL GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; } - void SetDefaultExtrudeSmoothed(const BOOL bNew) { bDefaultExtrudeSmoothed = bNew; } - BOOL GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; } - void SetDefaultExtrudeSmoothFrontBack(const BOOL bNew) { bDefaultExtrudeSmoothFrontBack = bNew; } - BOOL GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; } - void SetDefaultExtrudeCharacterMode(const BOOL bNew) { bDefaultExtrudeCharacterMode = bNew; } - BOOL GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; } - void SetDefaultExtrudeCloseFront(const BOOL bNew) { bDefaultExtrudeCloseFront = bNew; } - BOOL GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; } - void SetDefaultExtrudeCloseBack(const BOOL bNew) { bDefaultExtrudeCloseBack = bNew; } + sal_Bool GetDefaultExtrudeSmoothed() const { return bDefaultExtrudeSmoothed; } + void SetDefaultExtrudeSmoothed(const sal_Bool bNew) { bDefaultExtrudeSmoothed = bNew; } + sal_Bool GetDefaultExtrudeSmoothFrontBack() const { return bDefaultExtrudeSmoothFrontBack; } + void SetDefaultExtrudeSmoothFrontBack(const sal_Bool bNew) { bDefaultExtrudeSmoothFrontBack = bNew; } + sal_Bool GetDefaultExtrudeCharacterMode() const { return bDefaultExtrudeCharacterMode; } + void SetDefaultExtrudeCharacterMode(const sal_Bool bNew) { bDefaultExtrudeCharacterMode = bNew; } + sal_Bool GetDefaultExtrudeCloseFront() const { return bDefaultExtrudeCloseFront; } + void SetDefaultExtrudeCloseFront(const sal_Bool bNew) { bDefaultExtrudeCloseFront = bNew; } + sal_Bool GetDefaultExtrudeCloseBack() const { return bDefaultExtrudeCloseBack; } + void SetDefaultExtrudeCloseBack(const sal_Bool bNew) { bDefaultExtrudeCloseBack = bNew; } }; #endif // _E3D_DEFLT3D_HXX diff --git a/svx/inc/dialcontrol.hxx b/svx/inc/svx/dialcontrol.hxx index 5ead2c2b68..5ead2c2b68 100644..100755 --- a/svx/inc/dialcontrol.hxx +++ b/svx/inc/svx/dialcontrol.hxx diff --git a/svx/inc/svx/dialmgr.hxx b/svx/inc/svx/dialmgr.hxx index 0cc242191c..0cc242191c 100644..100755 --- a/svx/inc/svx/dialmgr.hxx +++ b/svx/inc/svx/dialmgr.hxx diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 498a30b4bd..4383af520e 100755 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -52,6 +52,14 @@ #define RID_SVXSTR_LINESTYLE (RID_SVX_START + 173) #define RID_SVXSTR_FIELDUNIT_TABLE (RID_SVX_START + 311) #define RID_SVXSTR_COLOR_USER (RID_SVX_START + 250) +//IAccessibility2 Implementation 2009----- +#define RID_SVXSTR_GALLERYPROPS_GALTHEME (RID_SVX_START + 251) +#define RID_SVXSTR_GALLERY_THEMEITEMS (RID_SVX_START + 252) +#define RID_SVXSTR_GALLERY_THEMENAME (RID_SVX_START + 253) +#define RID_SVXSTR_GALLERY_FILESFOUND (RID_SVX_START + 254) +#define RID_SVXSTR_GALLERY_PREVIEW (RID_SVX_START + 255) +//-----IAccessibility2 Implementation 2009 + // factory IDs of tabpages implemented in CUI #define RID_SVXPAGE_CHAR_TWOLINES (RID_SVX_START + 242) @@ -306,10 +314,6 @@ #define RID_SVXBMP_3D_FOCAL_LENGTH_09 (RID_SVX_START + 180) #define RID_SVXBMP_3D_FOCAL_LENGTH_10 (RID_SVX_START + 181) -// for ToolboxControls alignment and draw objects -#define RID_SVXTBX_DRAW (RID_SVX_START + 189) -#define RID_SVXTBX_ALIGNMENT (RID_SVX_START + 190) - // Ids fuer auto correction #define RID_SVX_AUTOCORR (RID_SVX_START + 192) @@ -942,6 +946,9 @@ #define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1191) +//IAccessibility2 Implementation 2009----- +#define RID_SVXSTR_TEXTCOLOR (RID_SVX_START + 1178) +//-----IAccessibility2 Implementation 2009 // ---------------------------------------------------------------------------- // if we have _a_lot_ time, we should group the resource ids by type, instead // of grouping them by semantics. The reason is that resource ids have to be @@ -1017,8 +1024,10 @@ #define SID_SC_TP_MISC (RID_OFA_START + 239) #define OFA_TP_TABPROPERTIES_TEXT (RID_OFA_START + 245) #define OFA_TP_HELPERPROG (RID_OFA_START + 249) -#define SID_SC_TP_FORMULA (RID_OFA_START + 257) -#define SID_SC_TP_COMPATIBILITY (RID_OFA_START + 258) +#define STR_COLORTABLE (RID_OFA_START + 257) +#define STR_SWITCH (RID_OFA_START + 258) +#define SID_SC_TP_FORMULA (RID_OFA_START + 259) +#define SID_SC_TP_COMPATIBILITY (RID_OFA_START + 260) // ---------------------------------------------------------------------------- // ooo-build specific resources diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx index d56a3991f8..d56a3991f8 100644..100755 --- a/svx/inc/svx/dlgctl3d.hxx +++ b/svx/inc/svx/dlgctl3d.hxx diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx index 9c4fffd326..4a66cd9bcf 100644..100755 --- a/svx/inc/svx/dlgctrl.hxx +++ b/svx/inc/svx/dlgctrl.hxx @@ -83,7 +83,7 @@ public: |* an object |* \************************************************************************/ -typedef UINT16 CTL_STATE; +typedef sal_uInt16 CTL_STATE; #define CS_NOHORZ 1 // no horizontal input information is used #define CS_NOVERT 2 // no vertikal input information is used @@ -92,15 +92,15 @@ class SvxRectCtlAccessibleContext; class SVX_DLLPUBLIC SvxRectCtl : public Control { private: - SVX_DLLPRIVATE void InitSettings( BOOL bForeground, BOOL bBackground ); + SVX_DLLPRIVATE void InitSettings( sal_Bool bForeground, sal_Bool bBackground ); SVX_DLLPRIVATE void InitRectBitmap( void ); SVX_DLLPRIVATE Bitmap& GetRectBitmap( void ); SVX_DLLPRIVATE void Resize_Impl(); protected: SvxRectCtlAccessibleContext* pAccContext; - USHORT nBorderWidth; - USHORT nRadius; + sal_uInt16 nBorderWidth; + sal_uInt16 nRadius; Size aSize; Point aPtLT, aPtMT, aPtRT; Point aPtLM, aPtMM, aPtRM; @@ -124,7 +124,7 @@ protected: Point GetApproxLogPtFromPixPt( const Point& rRoughPixelPoint ) const; public: SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt = RP_MM, - USHORT nBorder = 200, USHORT nCircle = 80, CTL_STYLE eStyle = CS_RECT ); + sal_uInt16 nBorder = 200, sal_uInt16 nCircle = 80, CTL_STYLE eStyle = CS_RECT ); virtual ~SvxRectCtl(); virtual void Paint( const Rectangle& rRect ); @@ -140,7 +140,7 @@ public: void SetState( CTL_STATE nState ); - UINT8 GetNumOfChilds( void ) const; // returns number of usable radio buttons + sal_uInt8 GetNumOfChilds( void ) const; // returns number of usable radio buttons Rectangle CalculateFocusRectangle( void ) const; Rectangle CalculateFocusRectangle( RECT_POINT eRectPoint ) const; @@ -167,7 +167,7 @@ private: protected: Font aFont; Size aFontSize; - BOOL bPositive; + sal_Bool bPositive; public: SvxAngleCtl( Window* pParent, const ResId& rResId ); @@ -188,9 +188,9 @@ class SVX_DLLPUBLIC SvxBitmapCtl { protected: Size aSize; - USHORT nLines; + sal_uInt16 nLines; Color aPixelColor, aBackgroundColor; - const USHORT* pBmpArray; + const sal_uInt16* pBmpArray; public: SvxBitmapCtl( Window* pParent, const Size& rSize ); @@ -198,8 +198,8 @@ public: XOBitmap GetXBitmap(); - void SetBmpArray( const USHORT* pPixel ) { pBmpArray = pPixel; } - void SetLines( USHORT nLns ) { nLines = nLns; } + void SetBmpArray( const sal_uInt16* pPixel ) { pBmpArray = pPixel; } + void SetLines( sal_uInt16 nLns ) { nLines = nLns; } void SetPixelColor( Color aColor ) { aPixelColor = aColor; } void SetBackgroundColor( Color aColor ) { aBackgroundColor = aColor; } }; @@ -215,19 +215,19 @@ private: using OutputDevice::SetLineColor; protected: - USHORT nLines, nSquares; + sal_uInt16 nLines, nSquares; Color aPixelColor; Color aBackgroundColor; Color aLineColor; Size aRectSize; - USHORT* pPixel; - BOOL bPaintable; + sal_uInt16* pPixel; + sal_Bool bPaintable; - void ChangePixel( USHORT nPixel ); + void ChangePixel( sal_uInt16 nPixel ); public: SvxPixelCtl( Window* pParent, const ResId& rResId, - USHORT nNumber = 8 ); + sal_uInt16 nNumber = 8 ); ~SvxPixelCtl(); virtual void Paint( const Rectangle& rRect ); @@ -239,14 +239,14 @@ public: void SetBackgroundColor( const Color& rCol ) { aBackgroundColor = rCol; } void SetLineColor( const Color& rCol ) { aLineColor = rCol; } - USHORT GetLineCount() const { return nLines; } + sal_uInt16 GetLineCount() const { return nLines; } Color GetPixelColor() const { return aPixelColor; } Color GetBackgroundColor() const { return aBackgroundColor; } - USHORT GetBitmapPixel( const USHORT nPixelNumber ); - USHORT* GetBitmapPixelPtr() { return pPixel; } + sal_uInt16 GetBitmapPixel( const sal_uInt16 nPixelNumber ); + sal_uInt16* GetBitmapPixelPtr() { return pPixel; } - void SetPaintable( BOOL bTmp ) { bPaintable = bTmp; } + void SetPaintable( sal_Bool bTmp ) { bPaintable = bTmp; } void Reset(); }; @@ -265,7 +265,7 @@ public: virtual void Fill( const XColorTable* pTab ); void Append( XColorEntry* pEntry, Bitmap* pBmp = NULL ); - void Modify( XColorEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL ); + void Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL ); }; /************************************************************************* @@ -277,20 +277,20 @@ class SVX_DLLPUBLIC HatchingLB : public ListBox { public: - HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE ); - HatchingLB( Window* pParent, WinBits aWB, BOOL bUserDraw = TRUE ); + HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True ); + HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw = sal_True ); virtual void Fill( const XHatchList* pList ); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void Append( XHatchEntry* pEntry, Bitmap* pBmp = NULL ); - void Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL ); + void Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL ); void SelectEntryByList( const XHatchList* pList, const String& rStr, - const XHatch& rXHatch, USHORT nDist = 0 ); + const XHatch& rXHatch, sal_uInt16 nDist = 0 ); private: XHatchList* mpList; - BOOL mbUserDraw; + sal_Bool mbUserDraw; }; /************************************************************************* @@ -301,20 +301,20 @@ private: class SVX_DLLPUBLIC GradientLB : public ListBox { public: - GradientLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE ); - GradientLB( Window* pParent, WinBits aWB, BOOL bUserDraw = TRUE ); + GradientLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True ); + GradientLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw = sal_True ); virtual void Fill( const XGradientList* pList ); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void Append( XGradientEntry* pEntry, Bitmap* pBmp = NULL ); - void Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL ); + void Modify( XGradientEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL ); void SelectEntryByList( const XGradientList* pList, const String& rStr, - const XGradient& rXGradient, USHORT nDist = 0 ); + const XGradient& rXGradient, sal_uInt16 nDist = 0 ); private: XGradientList* mpList; - BOOL mbUserDraw; + sal_Bool mbUserDraw; }; /************************************************************************* @@ -325,13 +325,13 @@ private: class SVX_DLLPUBLIC BitmapLB : public ListBox { public: - BitmapLB( Window* pParent, ResId Id, BOOL bUserDraw = TRUE ); + BitmapLB( Window* pParent, ResId Id, sal_Bool bUserDraw = sal_True ); virtual void Fill( const XBitmapList* pList ); virtual void UserDraw( const UserDrawEvent& rUDEvt ); void Append( XBitmapEntry* pEntry, Bitmap* pBmp = NULL ); - void Modify( XBitmapEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL ); + void Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL ); void SelectEntryByList( const XBitmapList* pList, const String& rStr, const Bitmap& rBmp); @@ -340,7 +340,7 @@ private: Bitmap aBitmap; XBitmapList* mpList; - BOOL mbUserDraw; + sal_Bool mbUserDraw; SVX_DLLPRIVATE void SetVirtualDevice(); }; @@ -401,9 +401,9 @@ public: virtual void Fill( const XDashList* pList ); void Append( XDashEntry* pEntry, Bitmap* pBmp = NULL ); - void Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL ); + void Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL ); void SelectEntryByList( const XDashList* pList, const String& rStr, - const XDash& rDash, USHORT nDist = 0 ); + const XDash& rDash, sal_uInt16 nDist = 0 ); void FillStyles(); }; @@ -419,12 +419,12 @@ public: LineEndLB( Window* pParent, ResId Id ) : ListBox( pParent, Id ) {} LineEndLB( Window* pParent, WinBits aWB ) : ListBox( pParent, aWB ) {} - virtual void Fill( const XLineEndList* pList, BOOL bStart = TRUE ); + virtual void Fill( const XLineEndList* pList, sal_Bool bStart = sal_True ); void Append( XLineEndEntry* pEntry, Bitmap* pBmp = NULL, - BOOL bStart = TRUE ); - void Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL, - BOOL bStart = TRUE ); + sal_Bool bStart = sal_True ); + void Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp = NULL, + sal_Bool bStart = sal_True ); }; ////////////////////////////////////////////////////////////////////////////// @@ -483,7 +483,7 @@ public: void SetLineAttributes(const SfxItemSet& rItemSet); - void ShowSymbol( BOOL b ) { mbWithSymbol = b; }; + void ShowSymbol( sal_Bool b ) { mbWithSymbol = b; }; void SetSymbol( Graphic* p, const Size& s ); void ResizeSymbol( const Size& s ); diff --git a/svx/inc/dlgutil.hxx b/svx/inc/svx/dlgutil.hxx index 039fa22476..d3f44537ef 100644..100755 --- a/svx/inc/dlgutil.hxx +++ b/svx/inc/svx/dlgutil.hxx @@ -40,7 +40,7 @@ class SfxItemSet; SVX_DLLPUBLIC FieldUnit GetModuleFieldUnit( const SfxItemSet& ); -SVX_DLLPUBLIC BOOL GetApplyCharUnit( const SfxItemSet& ); +SVX_DLLPUBLIC bool GetApplyCharUnit( const SfxItemSet& ); #define OUTPUT_DRAWMODE_COLOR (DRAWMODE_DEFAULT) #define OUTPUT_DRAWMODE_CONTRAST (DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT) diff --git a/svx/inc/drawitem.hxx b/svx/inc/svx/drawitem.hxx index cac8a37b87..e63017285e 100644..100755 --- a/svx/inc/drawitem.hxx +++ b/svx/inc/svx/drawitem.hxx @@ -49,7 +49,7 @@ public: TYPEINFO(); SvxColorTableItem(); SvxColorTableItem( XColorTable* pTable, - USHORT nWhich ); + sal_uInt16 nWhich ); SvxColorTableItem( const SvxColorTableItem& ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -59,8 +59,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XColorTable* GetColorTable() const { return pColorTable; } void SetColorTable( XColorTable* pTable ) { @@ -83,7 +83,7 @@ public: TYPEINFO(); SvxGradientListItem(); SvxGradientListItem( XGradientList* pList, - USHORT nWhich ); + sal_uInt16 nWhich ); SvxGradientListItem( const SvxGradientListItem& ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -93,8 +93,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XGradientList* GetGradientList() const { return pGradientList; } void SetGradientList( XGradientList* pList ) { @@ -118,7 +118,7 @@ public: TYPEINFO(); SvxHatchListItem(); SvxHatchListItem( XHatchList* pList, - USHORT nWhich ); + sal_uInt16 nWhich ); SvxHatchListItem( const SvxHatchListItem& ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -128,8 +128,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XHatchList* GetHatchList() const { return pHatchList; } void SetHatchList( XHatchList* pList ) { @@ -153,7 +153,7 @@ public: TYPEINFO(); SvxBitmapListItem(); SvxBitmapListItem( XBitmapList* pBL, - USHORT nWhich ); + sal_uInt16 nWhich ); SvxBitmapListItem( const SvxBitmapListItem& ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -163,8 +163,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XBitmapList* GetBitmapList() const { return pBitmapList; } void SetBitmapList( XBitmapList* pList ) { @@ -188,7 +188,7 @@ public: TYPEINFO(); SvxDashListItem(); SvxDashListItem( XDashList* pList, - USHORT nWhich ); + sal_uInt16 nWhich ); SvxDashListItem( const SvxDashListItem& ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -198,8 +198,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XDashList* GetDashList() const { return pDashList; } void SetDashList( XDashList* pList ); @@ -222,7 +222,7 @@ public: TYPEINFO(); SvxLineEndListItem(); SvxLineEndListItem( XLineEndList* pList, - USHORT nWhich ); + sal_uInt16 nWhich ); SvxLineEndListItem( const SvxLineEndListItem& ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -232,8 +232,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); XLineEndList* GetLineEndList() const { return pLineEndList; } void SetLineEndList( XLineEndList* pList ) { diff --git a/svx/inc/svx/dstribut_enum.hxx b/svx/inc/svx/dstribut_enum.hxx index 6238bf991f..6238bf991f 100644..100755 --- a/svx/inc/svx/dstribut_enum.hxx +++ b/svx/inc/svx/dstribut_enum.hxx diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx index 266cdbaeda..42926ddab9 100644..100755 --- a/svx/inc/svx/e3ditem.hxx +++ b/svx/inc/svx/e3ditem.hxx @@ -45,18 +45,18 @@ class SVX_DLLPUBLIC SvxB3DVectorItem : public SfxPoolItem public: TYPEINFO(); SvxB3DVectorItem(); - SvxB3DVectorItem( USHORT nWhich, const basegfx::B3DVector& rVal ); - SvxB3DVectorItem( USHORT nWhich, SvStream & ); + SvxB3DVectorItem( sal_uInt16 nWhich, const basegfx::B3DVector& rVal ); + SvxB3DVectorItem( sal_uInt16 nWhich, SvStream & ); SvxB3DVectorItem( const SvxB3DVectorItem& ); ~SvxB3DVectorItem(); virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT nVersion) const; - virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVersion) const; + virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); const basegfx::B3DVector& GetValue() const { return aVal; } void SetValue( const basegfx::B3DVector& rNewVal ) { @@ -64,7 +64,7 @@ public: aVal = rNewVal; } - virtual USHORT GetVersion (USHORT nFileFormatVersion) const; + virtual sal_uInt16 GetVersion (sal_uInt16 nFileFormatVersion) const; }; #endif diff --git a/svx/inc/svx/e3dsceneupdater.hxx b/svx/inc/svx/e3dsceneupdater.hxx index 473ca1f230..473ca1f230 100644..100755 --- a/svx/inc/svx/e3dsceneupdater.hxx +++ b/svx/inc/svx/e3dsceneupdater.hxx diff --git a/svx/inc/svx/e3dundo.hxx b/svx/inc/svx/e3dundo.hxx index 131c4aac6d..76f32e52da 100644..100755 --- a/svx/inc/svx/e3dundo.hxx +++ b/svx/inc/svx/e3dundo.hxx @@ -58,7 +58,7 @@ class E3dUndoAction : public SdrUndoAction virtual ~E3dUndoAction (); - virtual BOOL CanRepeat(SfxRepeatTarget&) const; + virtual sal_Bool CanRepeat(SfxRepeatTarget&) const; }; /************************************************************************\ @@ -101,7 +101,7 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction SdrObject* pObject; E3dView* pView; - BOOL bUseSubObjects; + sal_Bool bUseSubObjects; const SfxItemSet aNewSet; const SfxItemSet aOldSet; @@ -112,11 +112,11 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction E3dObject* pInObject, const SfxItemSet& rNewSet, const SfxItemSet& rOldSet, - BOOL bUseSubObj); + sal_Bool bUseSubObj); virtual ~E3dAttributesUndoAction(); - virtual BOOL CanRepeat(SfxRepeatTarget& rView) const; + virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const; virtual void Undo(); virtual void Redo(); virtual void Repeat(); diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc index 2008375dde..828ed6c124 100644..100755 --- a/svx/inc/svx/exthelpid.hrc +++ b/svx/inc/svx/exthelpid.hrc @@ -28,8 +28,6 @@ #define _SVX_EXTHELPID_HRC // include --------------------------------------------------------------- -#include <svl/solar.hrc> - // these HIDs are used in SVX and also in other modules, mainly CUI // the reason is that different controls have the same help texts assigned // but are implemented in different libraries @@ -37,19 +35,8 @@ // are moved to this exported (delivered) hrc file // Help-Ids -------------------------------------------------------------- -#define HID_GALLERY_ACTUALIZE (HID_SVX_EXT0_START + 0) -#define HID_GALLERY_TITLE (HID_SVX_EXT0_START + 1) - -// please adjust ACT_SVX_EXT_HID_END2 below if you add entries here! - -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_SVX_EXT_HID_END (HID_SVX_EXT0_START + 1) -#if ACT_SVX_EXT_HID_END > HID_SVX_EXT0_END -#error Resource-Ueberlauf in #line, #file -#endif +#define HID_GALLERY_ACTUALIZE "SVX_HID_GALLERY_ACTUALIZE" +#define HID_GALLERY_TITLE "SVX_HID_GALLERY_TITLE" #endif diff --git a/svx/inc/svx/extrud3d.hxx b/svx/inc/svx/extrud3d.hxx index 8454acf04d..0df8d1eac5 100644..100755 --- a/svx/inc/svx/extrud3d.hxx +++ b/svx/inc/svx/extrud3d.hxx @@ -90,7 +90,7 @@ public: sal_Bool GetCloseBack() const { return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); } - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void operator=(const SdrObject&); @@ -102,7 +102,7 @@ public: void SetExtrudePolygon(const basegfx::B2DPolyPolygon &rNew); const basegfx::B2DPolyPolygon &GetExtrudePolygon() { return maExtrudePolygon; } - virtual BOOL IsBreakObjPossible(); + virtual sal_Bool IsBreakObjPossible(); virtual SdrAttrObj* GetBreakObj(); }; diff --git a/svx/inc/svx/extrusionbar.hxx b/svx/inc/svx/extrusionbar.hxx index f33748836b..f33748836b 100644..100755 --- a/svx/inc/svx/extrusionbar.hxx +++ b/svx/inc/svx/extrusionbar.hxx diff --git a/svx/inc/svx/extrusioncolorcontrol.hxx b/svx/inc/svx/extrusioncolorcontrol.hxx index 4b79b8819c..f7f26d96e7 100644..100755 --- a/svx/inc/svx/extrusioncolorcontrol.hxx +++ b/svx/inc/svx/extrusioncolorcontrol.hxx @@ -43,10 +43,10 @@ private: public: SFX_DECL_TOOLBOX_CONTROL(); - ExtrusionColorControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + ExtrusionColorControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~ExtrusionColorControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); diff --git a/svx/inc/svx/f3dchild.hxx b/svx/inc/svx/f3dchild.hxx index bcfc8dcc05..0063b4a940 100644..100755 --- a/svx/inc/svx/f3dchild.hxx +++ b/svx/inc/svx/f3dchild.hxx @@ -43,7 +43,7 @@ class SVX_DLLPUBLIC Svx3DChildWindow : public SfxChildWindow { public: - Svx3DChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); + Svx3DChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW(Svx3DChildWindow); }; diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx index 73b5c69a54..c52eac07e3 100644..100755 --- a/svx/inc/svx/fillctrl.hxx +++ b/svx/inc/svx/fillctrl.hxx @@ -62,17 +62,17 @@ private: SvxFillTypeBox* pFillTypeLB; SvxFillAttrBox* pFillAttrLB; - BOOL bUpdate; - BOOL bIgnoreStatusUpdate; - USHORT eLastXFS; + sal_Bool bUpdate; + sal_Bool bIgnoreStatusUpdate; + sal_uInt16 eLastXFS; public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFillToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFillToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); void Update( const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); diff --git a/svx/inc/flagsdef.hxx b/svx/inc/svx/flagsdef.hxx index 46f0375801..61831831f4 100644..100755 --- a/svx/inc/flagsdef.hxx +++ b/svx/inc/svx/flagsdef.hxx @@ -46,13 +46,13 @@ #define SVX_HIDESHADOWCTL 0x01 // copy from chardlg.hxx -#define DISABLE_CASEMAP ((USHORT)0x0001) -#define DISABLE_WORDLINE ((USHORT)0x0002) -#define DISABLE_BLINK ((USHORT)0x0004) -#define DISABLE_UNDERLINE_COLOR ((USHORT)0x0008) +#define DISABLE_CASEMAP ((sal_uInt16)0x0001) +#define DISABLE_WORDLINE ((sal_uInt16)0x0002) +#define DISABLE_BLINK ((sal_uInt16)0x0004) +#define DISABLE_UNDERLINE_COLOR ((sal_uInt16)0x0008) -#define DISABLE_LANGUAGE ((USHORT)0x0010) -#define DISABLE_HIDE_LANGUAGE ((USHORT)0x0020) +#define DISABLE_LANGUAGE ((sal_uInt16)0x0010) +#define DISABLE_HIDE_LANGUAGE ((sal_uInt16)0x0020) // flags for SvxCharBasePage's child class #define SVX_PREVIEW_CHARACTER 0x01 diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx index 7f6eb2c26d..b0763924af 100644..100755 --- a/svx/inc/svx/float3d.hxx +++ b/svx/inc/svx/float3d.hxx @@ -33,7 +33,7 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> #include <sfx2/dockwin.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <svtools/valueset.hxx> #include <svtools/stdctrl.hxx> #include "svx/svxdllapi.h" @@ -80,6 +80,7 @@ private: ImageButton aBtnAssign; // geometry + FixedLine aFLGeometrie; FixedText aFtPercentDiagonal; MetricField aMtrPercentDiagonal; FixedText aFtBackscale; @@ -88,36 +89,35 @@ private: MetricField aMtrEndAngle; FixedText aFtDepth; MetricField aMtrDepth; - FixedLine aFLGeometrie; + FixedLine aFLSegments; FixedText aFtHorizontal; NumericField aNumHorizontal; FixedText aFtVertical; NumericField aNumVertical; - FixedLine aFLSegments; + FixedLine aFLNormals; ImageButton aBtnNormalsObj; ImageButton aBtnNormalsFlat; ImageButton aBtnNormalsSphere; ImageButton aBtnNormalsInvert; ImageButton aBtnTwoSidedLighting; - FixedLine aFLNormals; ImageButton aBtnDoubleSided; - + FixedLine aFLRepresentation; // presentation FixedText aFtShademode; ListBox aLbShademode; + FixedLine aFLShadow; ImageButton aBtnShadow3d; FixedText aFtSlant; MetricField aMtrSlant; - FixedLine aFLShadow; FixedText aFtDistance; MetricField aMtrDistance; FixedText aFtFocalLeng; MetricField aMtrFocalLength; FixedLine aFLCamera; - FixedLine aFLRepresentation; + FixedLine aFLLight; // lighting ImageButton aBtnLight1; @@ -128,6 +128,7 @@ private: ImageButton aBtnLight6; ImageButton aBtnLight7; ImageButton aBtnLight8; + FixedText aFTLightsource; ColorLB aLbLight1; ColorLB aLbLight2; ColorLB aLbLight3; @@ -138,7 +139,6 @@ private: ColorLB aLbLight8; ImageButton aBtnLightColor; - FixedText aFTLightsource; // #99694# Keyboard shortcuts activate the next control, so the // order needed to be changed here @@ -146,7 +146,7 @@ private: ColorLB aLbAmbientlight; // ListBox ImageButton aBtnAmbientColor; // color button - FixedLine aFLLight; + FixedLine aFLTexture; // Textures FixedText aFtTexKind; @@ -166,10 +166,10 @@ private: ImageButton aBtnTexCircleY; FixedText aFtTexFilter; ImageButton aBtnTexFilter; - FixedLine aFLTexture; // material // material editor + FixedLine aFLMaterial; FixedText aFtMatFavorites; ListBox aLbMatFavorites; FixedText aFtMatColor; @@ -178,25 +178,25 @@ private: FixedText aFtMatEmission; ColorLB aLbMatEmission; ImageButton aBtnEmissionColor; + FixedLine aFLMatSpecular; FixedText aFtMatSpecular; ColorLB aLbMatSpecular; ImageButton aBtnSpecularColor; FixedText aFtMatSpecularIntensity; MetricField aMtrMatSpecularIntensity; - FixedLine aFLMatSpecular; - FixedLine aFLMaterial; + + Svx3DPreviewControl aCtlPreview; + SvxLightCtl3D aCtlLightPreview; // bottom part ImageButton aBtnConvertTo3D; ImageButton aBtnLatheObject; ImageButton aBtnPerspective; - Svx3DPreviewControl aCtlPreview; - SvxLightCtl3D aCtlLightPreview; // the rest ... Image aImgLightOn; Image aImgLightOff; - BOOL bUpdate; + sal_Bool bUpdate; ViewType3D eViewType; Size aSize; @@ -221,7 +221,7 @@ private: // ItemSet used to remember set 2d attributes SfxItemSet* mpRemember2DAttributes; - BOOL bOnly3DChanged; + sal_Bool bOnly3DChanged; //------------------------------------ @@ -242,8 +242,8 @@ private: SVX_DLLPRIVATE void Construct(); SVX_DLLPRIVATE void Reset(); - SVX_DLLPRIVATE BOOL LBSelectColor( ColorLB* pLb, const Color& rColor ); - SVX_DLLPRIVATE USHORT GetLightSource( const PushButton* pBtn = NULL ); + SVX_DLLPRIVATE sal_Bool LBSelectColor( ColorLB* pLb, const Color& rColor ); + SVX_DLLPRIVATE sal_uInt16 GetLightSource( const PushButton* pBtn = NULL ); SVX_DLLPRIVATE ColorLB* GetLbByButton( const PushButton* pBtn = NULL ); SVX_DLLPRIVATE bool GetUILightState( ImageButton& aBtn ) const; @@ -258,7 +258,7 @@ public: ~Svx3DWin(); void InitColorLB( const SdrModel* pDoc ); - BOOL IsUpdateMode() const { return bUpdate; } + sal_Bool IsUpdateMode() const { return bUpdate; } void Update( SfxItemSet& rSet ); void GetAttr( SfxItemSet& rSet ); @@ -278,11 +278,11 @@ class Svx3DCtrlItem : public SfxControllerItem Svx3DWin* p3DWin; protected: - virtual void StateChanged( USHORT nSId, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState ); public: - Svx3DCtrlItem( USHORT, Svx3DWin*, SfxBindings* ); + Svx3DCtrlItem( sal_uInt16, Svx3DWin*, SfxBindings* ); }; /************************************************************************* @@ -294,14 +294,14 @@ class Svx3DCtrlItem : public SfxControllerItem class SvxConvertTo3DItem : public SfxControllerItem { - BOOL bState; + sal_Bool bState; protected: - virtual void StateChanged(UINT16 nSId, SfxItemState eState, const SfxPoolItem* pState); + virtual void StateChanged(sal_uInt16 nSId, SfxItemState eState, const SfxPoolItem* pState); public: - SvxConvertTo3DItem(UINT16 nId, SfxBindings* pBindings); - BOOL GetState() const { return bState; } + SvxConvertTo3DItem(sal_uInt16 nId, SfxBindings* pBindings); + sal_Bool GetState() const { return bState; } }; #endif // _SVX_FLOAT3D_HXX diff --git a/svx/inc/svx/fmdmod.hxx b/svx/inc/svx/fmdmod.hxx index a38f561d6d..a38f561d6d 100644..100755 --- a/svx/inc/svx/fmdmod.hxx +++ b/svx/inc/svx/fmdmod.hxx diff --git a/svx/inc/svx/fmdpage.hxx b/svx/inc/svx/fmdpage.hxx index 990c90c4be..990c90c4be 100644..100755 --- a/svx/inc/svx/fmdpage.hxx +++ b/svx/inc/svx/fmdpage.hxx diff --git a/svx/inc/svx/fmglob.hxx b/svx/inc/svx/fmglob.hxx index c2289cbe51..c2289cbe51 100644..100755 --- a/svx/inc/svx/fmglob.hxx +++ b/svx/inc/svx/fmglob.hxx diff --git a/svx/inc/svx/fmgridcl.hxx b/svx/inc/svx/fmgridcl.hxx index 054cccfe4e..054cccfe4e 100644..100755 --- a/svx/inc/svx/fmgridcl.hxx +++ b/svx/inc/svx/fmgridcl.hxx diff --git a/svx/inc/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx index 9c0cbedfb2..c6a9d2d967 100644..100755 --- a/svx/inc/fmgridif.hxx +++ b/svx/inc/svx/fmgridif.hxx @@ -50,7 +50,7 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <toolkit/controls/unocontrol.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/uno3.hxx> diff --git a/svx/inc/svx/fmmodel.hxx b/svx/inc/svx/fmmodel.hxx index d4dfef4951..aaa5294230 100644..100755 --- a/svx/inc/svx/fmmodel.hxx +++ b/svx/inc/svx/fmmodel.hxx @@ -70,7 +70,7 @@ public: virtual SdrPage* AllocPage(bool bMasterPage); virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); virtual SdrPage* RemovePage(sal_uInt16 nPgNum); - virtual void MovePage(USHORT nPgNum, USHORT nNewPos); + virtual void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos); virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum); diff --git a/svx/inc/fmobjfac.hxx b/svx/inc/svx/fmobjfac.hxx index b2767b6258..7e59fa175b 100644..100755 --- a/svx/inc/fmobjfac.hxx +++ b/svx/inc/svx/fmobjfac.hxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,4 +49,3 @@ public: #endif // _FM_FMOBJFAC_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/fmpage.hxx b/svx/inc/svx/fmpage.hxx index 2aee35639d..78c4284a3c 100644..100755 --- a/svx/inc/svx/fmpage.hxx +++ b/svx/inc/svx/fmpage.hxx @@ -62,10 +62,10 @@ public: virtual SdrPage* Clone() const; using SdrPage::Clone; - virtual void InsertObject(SdrObject* pObj, ULONG nPos = CONTAINER_APPEND, + virtual void InsertObject(SdrObject* pObj, sal_uLong nPos = CONTAINER_APPEND, const SdrInsertReason* pReason=NULL); - virtual SdrObject* RemoveObject(ULONG nObjNum); + virtual SdrObject* RemoveObject(sal_uLong nObjNum); // access to all forms const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>& GetForms( bool _bForceCreate = true ) const; diff --git a/svx/source/inc/fmresids.hrc b/svx/inc/svx/fmresids.hrc index 07e994bb62..07e994bb62 100644..100755 --- a/svx/source/inc/fmresids.hrc +++ b/svx/inc/svx/fmresids.hrc diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx index b943e452af..b943e452af 100644..100755 --- a/svx/inc/svx/fmsearch.hxx +++ b/svx/inc/svx/fmsearch.hxx diff --git a/svx/inc/svx/fmshell.hxx b/svx/inc/svx/fmshell.hxx index 9f7380e031..9f7380e031 100644..100755 --- a/svx/inc/svx/fmshell.hxx +++ b/svx/inc/svx/fmshell.hxx diff --git a/svx/source/inc/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx index 6ba0bd062f..6ba0bd062f 100644..100755 --- a/svx/source/inc/fmsrccfg.hxx +++ b/svx/inc/svx/fmsrccfg.hxx diff --git a/svx/source/inc/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx index 85d6ee43ee..3748a69e18 100644..100755 --- a/svx/source/inc/fmsrcimp.hxx +++ b/svx/inc/svx/fmsrcimp.hxx @@ -47,15 +47,7 @@ #include <unotools/collatorwrapper.hxx> #include <osl/thread.hxx> -#ifndef _SVSTDARR_ULONGS -#define _SVSTDARR_ULONGS -#include <svl/svstdarr.hxx> -#endif - -// =================================================================================================== -// Hilfsstrukturen - -SV_DECL_OBJARR(SvInt32Array, sal_Int32, 16, 16) +#include <deque> // =================================================================================================== // = class FmSearchThread - wie der Name schon sagt @@ -190,8 +182,8 @@ class SVX_DLLPUBLIC FmSearchEngine enum SEARCHFOR_TYPE { SEARCHFOR_STRING, SEARCHFOR_NULL, SEARCHFOR_NOTNULL }; // zugrundeliegende Daten - CursorWrapper m_xSearchCursor; - SvInt32Array m_arrFieldMapping; + CursorWrapper m_xSearchCursor; + std::deque<sal_Int32> m_arrFieldMapping; // da der Iterator durchaus mehr Spalten haben kann, als ich eigentlich verwalte (in meiner Feld-Listbox), // muss ich mir hier ein Mapping dieser ::com::sun::star::form-Schluessel auf die Indizies der entsprechenden Spalten im Iterator halten diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx index 4cffe7f4a5..3d4ef3b930 100644..100755 --- a/svx/inc/svx/fmtools.hxx +++ b/svx/inc/svx/fmtools.hxx @@ -72,7 +72,7 @@ #include <com/sun/star/util/XNumberFormatter.hpp> #include <com/sun/star/util/XNumberFormats.hpp> -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <cppuhelper/weakref.hxx> #include <comphelper/uno3.hxx> #include <comphelper/stl_types.hxx> diff --git a/svx/inc/svx/fmview.hxx b/svx/inc/svx/fmview.hxx index dda53d3ab5..48bcefecc9 100644..100755 --- a/svx/inc/svx/fmview.hxx +++ b/svx/inc/svx/fmview.hxx @@ -98,8 +98,8 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, - UINT32 _nInventor, - UINT16 _nLabelObjectID, + sal_uInt32 _nInventor, + sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, @@ -115,7 +115,7 @@ public: using E3dView::Paste; virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); - virtual BOOL MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ); + virtual sal_Bool MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ); /** grab the focus to the first form control on the view @param _bForceSync @@ -129,7 +129,7 @@ public: GetFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const; // SdrView - BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin); + sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); /// shortcut to "GetSdrPageView() ? PTR_CAST( FmFormPage, GetSdrPageView() ) : NULL" FmFormPage* GetCurPage(); diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx index e94329ef52..33583c4d8a 100644..100755 --- a/svx/inc/svx/fntctl.hxx +++ b/svx/inc/svx/fntctl.hxx @@ -49,12 +49,12 @@ private: SVX_DLLPRIVATE void FillMenu(); DECL_LINK( MenuSelect, FontNameMenu * ); - SVX_DLLPRIVATE virtual void StateChanged( USHORT nSID, SfxItemState eState, + SVX_DLLPRIVATE virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); public: - SvxFontMenuControl( USHORT nId, Menu&, SfxBindings& ); + SvxFontMenuControl( sal_uInt16 nId, Menu&, SfxBindings& ); ~SvxFontMenuControl(); virtual PopupMenu* GetPopup() const; diff --git a/svx/inc/svx/fntctrl.hxx b/svx/inc/svx/fntctrl.hxx index 3690d291e8..c9a4c34c75 100644..100755 --- a/svx/inc/svx/fntctrl.hxx +++ b/svx/inc/svx/fntctrl.hxx @@ -48,7 +48,7 @@ class SVX_DLLPUBLIC SvxFontPrevWindow : public Window private: FontPrevWin_Impl* pImpl; - SVX_DLLPRIVATE void InitSettings( BOOL bForeground, BOOL bBackground ); + SVX_DLLPRIVATE void InitSettings( sal_Bool bForeground, sal_Bool bBackground ); public: SvxFontPrevWindow( Window* pParent, const ResId& rId ); @@ -69,15 +69,15 @@ public: void SetColor( const Color& rColor ); void ResetColor(); void SetBackColor( const Color& rColor ); - void UseResourceText( BOOL bUse = TRUE ); + void UseResourceText( sal_Bool bUse = sal_True ); void Paint( const Rectangle& ); - BOOL IsTwoLines() const; - void SetTwoLines(BOOL bSet); + sal_Bool IsTwoLines() const; + void SetTwoLines(sal_Bool bSet); void SetBrackets(sal_Unicode cStart, sal_Unicode cEnd); - void SetFontWidthScale( UINT16 nScaleInPercent ); + void SetFontWidthScale( sal_uInt16 nScaleInPercent ); void AutoCorrectFontColor( void ); diff --git a/svx/inc/svx/fntszctl.hxx b/svx/inc/svx/fntszctl.hxx index 1413e39751..296b9bb566 100644..100755 --- a/svx/inc/svx/fntszctl.hxx +++ b/svx/inc/svx/fntszctl.hxx @@ -50,11 +50,11 @@ private: DECL_LINK( MenuSelect, FontSizeMenu * ); protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - SvxFontSizeMenuControl( USHORT nId, Menu&, SfxBindings& ); + SvxFontSizeMenuControl( sal_uInt16 nId, Menu&, SfxBindings& ); ~SvxFontSizeMenuControl(); virtual PopupMenu* GetPopup() const; diff --git a/svx/inc/fontlb.hxx b/svx/inc/svx/fontlb.hxx index 6cbcee90dd..7cf56e506d 100644..100755 --- a/svx/inc/fontlb.hxx +++ b/svx/inc/svx/fontlb.hxx @@ -95,7 +95,7 @@ public: void SetNoSelection(); /** Returns the position of the entry currently selected or LIST_APPEND. */ - ULONG GetSelectEntryPos() const; + sal_uLong GetSelectEntryPos() const; /** Returns the text of the selected entry or an empty string. */ XubString GetSelectEntry() const; diff --git a/svx/inc/svx/fontwork.hxx b/svx/inc/svx/fontwork.hxx index 0eb718bf4c..561caaf3af 100644..100755 --- a/svx/inc/svx/fontwork.hxx +++ b/svx/inc/svx/fontwork.hxx @@ -70,11 +70,11 @@ class SvxFontWorkControllerItem : public SfxControllerItem SvxFontWorkDialog &rFontWorkDlg; protected: - virtual void StateChanged(USHORT nSID, SfxItemState eState, + virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState); public: - SvxFontWorkControllerItem(USHORT nId, SvxFontWorkDialog&, SfxBindings&); + SvxFontWorkControllerItem(sal_uInt16 nId, SvxFontWorkDialog&, SfxBindings&); }; /************************************************************************* @@ -86,7 +86,7 @@ public: class SVX_DLLPUBLIC SvxFontWorkChildWindow : public SfxChildWindow { public: - SvxFontWorkChildWindow(Window*, USHORT, SfxBindings*, SfxChildWinInfo*); + SvxFontWorkChildWindow(Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo*); SFX_DECL_CHILDWINDOW(SvxFontWorkChildWindow); }; @@ -123,11 +123,11 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow SfxBindings& rBindings; Timer aInputTimer; - BOOL bUserZoomedIn; + sal_Bool bUserZoomedIn; - USHORT nLastStyleTbxId; - USHORT nLastAdjustTbxId; - USHORT nLastShadowTbxId; + sal_uInt16 nLastStyleTbxId; + sal_uInt16 nLastAdjustTbxId; + sal_uInt16 nLastShadowTbxId; long nSaveShadowX; long nSaveShadowY; long nSaveShadowAngle; @@ -160,7 +160,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow void SetShowForm_Impl(const XFormTextHideFormItem*); void SetOutline_Impl(const XFormTextOutlineItem*); void SetShadow_Impl(const XFormTextShadowItem*, - BOOL bRestoreValues = FALSE); + sal_Bool bRestoreValues = sal_False); void SetShadowColor_Impl(const XFormTextShadowColorItem*); void SetShadowXVal_Impl(const XFormTextShadowXValItem*); void SetShadowYVal_Impl(const XFormTextShadowYValItem*); @@ -182,7 +182,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow ~SvxFontWorkDialog(); void SetColorTable(const XColorTable* pTable); - void SetActive(BOOL bActivate = TRUE); + void SetActive(sal_Bool bActivate = sal_True); void CreateStdFormObj(SdrView& rView, SdrPageView& rPV, const SfxItemSet& rAttr, SdrObject& rOldObj, diff --git a/svx/inc/svx/fontworkbar.hxx b/svx/inc/svx/fontworkbar.hxx index 24ed76812e..24ed76812e 100644..100755 --- a/svx/inc/svx/fontworkbar.hxx +++ b/svx/inc/svx/fontworkbar.hxx diff --git a/svx/inc/fontworkgallery.hxx b/svx/inc/svx/fontworkgallery.hxx index 51c9901ab0..315d882fd8 100644..100755 --- a/svx/inc/fontworkgallery.hxx +++ b/svx/inc/svx/fontworkgallery.hxx @@ -64,10 +64,10 @@ class SVX_DLLPUBLIC FontWorkShapeTypeControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - FontWorkShapeTypeControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~FontWorkShapeTypeControl(); - virtual void Select( BOOL bMod1 = FALSE ); + virtual void Select( sal_Bool bMod1 = sal_False ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); }; @@ -92,8 +92,8 @@ public: class SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog { - ValueSet maCtlFavorites; FixedLine maFLFavorites; + ValueSet maCtlFavorites; OKButton maOKButton; CancelButton maCancelButton; HelpButton maHelpButton; diff --git a/svx/inc/formatpaintbrushctrl.hxx b/svx/inc/svx/formatpaintbrushctrl.hxx index 6f73ecd1a4..d7b3716546 100644..100755 --- a/svx/inc/formatpaintbrushctrl.hxx +++ b/svx/inc/svx/formatpaintbrushctrl.hxx @@ -50,14 +50,14 @@ class SVX_DLLPUBLIC FormatPaintBrushToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - FormatPaintBrushToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~FormatPaintBrushToolBoxControl(); virtual void DoubleClick(); virtual void Click(); - virtual void Select( BOOL bMod1 = FALSE ); + virtual void Select( sal_Bool bMod1 = sal_False ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); private: DECL_LINK( WaitDoubleClickHdl, void* ); diff --git a/svx/inc/svx/framebordertype.hxx b/svx/inc/svx/framebordertype.hxx index e35cdd19a4..e35cdd19a4 100644..100755 --- a/svx/inc/svx/framebordertype.hxx +++ b/svx/inc/svx/framebordertype.hxx diff --git a/svx/inc/svx/framelink.hxx b/svx/inc/svx/framelink.hxx index 5e30028ce4..5e30028ce4 100644..100755 --- a/svx/inc/svx/framelink.hxx +++ b/svx/inc/svx/framelink.hxx diff --git a/svx/inc/svx/framelinkarray.hxx b/svx/inc/svx/framelinkarray.hxx index 2b0e7b0c82..2b0e7b0c82 100644..100755 --- a/svx/inc/svx/framelinkarray.hxx +++ b/svx/inc/svx/framelinkarray.hxx diff --git a/svx/inc/svx/frmdirlbox.hxx b/svx/inc/svx/frmdirlbox.hxx index b9239ccfb5..b9239ccfb5 100644..100755 --- a/svx/inc/svx/frmdirlbox.hxx +++ b/svx/inc/svx/frmdirlbox.hxx diff --git a/svx/inc/svx/frmsel.hxx b/svx/inc/svx/frmsel.hxx index 20a3fad699..07c6ccae97 100644..100755 --- a/svx/inc/svx/frmsel.hxx +++ b/svx/inc/svx/frmsel.hxx @@ -130,7 +130,7 @@ public: /** Returns true, if all visible frame borders have equal widths. @descr Ignores hidden and "don't care" frame borders. On success, returns the widths in the passed parameters. */ - bool GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnSec, + bool GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSec, SvxBorderStyle& rnStyle ) const; /** Returns true, if all visible frame borders have equal color. @descr Ignores hidden and "don't care" frame borders. On success, @@ -162,7 +162,7 @@ public: void SelectAllVisibleBorders( bool bSelect = true ); /** Sets the passed line widths to all selected frame borders (in twips). */ - void SetStyleToSelection( USHORT nPrim, USHORT nDist, USHORT nSec, + void SetStyleToSelection( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSec, SvxBorderStyle nStyle ); /** Sets the passed color to all selected frame borders. */ void SetColorToSelection( const Color& rColor ); diff --git a/svx/inc/galbrws.hxx b/svx/inc/svx/galbrws.hxx index a639fd7ac6..769fa119ba 100644..100755 --- a/svx/inc/galbrws.hxx +++ b/svx/inc/svx/galbrws.hxx @@ -48,7 +48,7 @@ class SVX_DLLPUBLIC GalleryChildWindow : public SfxChildWindow { public: - GalleryChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); + GalleryChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); ~GalleryChildWindow(); SFX_DECL_CHILDWINDOW( GalleryChildWindow ); @@ -89,7 +89,7 @@ private: void InitSettings(); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Resize(); virtual void GetFocus(); @@ -108,10 +108,10 @@ public: INetURLObject GetURL() const; String GetFilterName() const; Graphic GetGraphic() const; - BOOL GetVCDrawModel( FmFormModel& rModel ) const; - BOOL IsLinkage() const; + sal_Bool GetVCDrawModel( FmFormModel& rModel ) const; + sal_Bool IsLinkage() const; - BOOL KeyInput( const KeyEvent& rKEvt, Window* pWindow ); + sal_Bool KeyInput( const KeyEvent& rKEvt, Window* pWindow ); }; #endif // _SVX_GALBRWS_HXX_ diff --git a/svx/inc/galctrl.hxx b/svx/inc/svx/galctrl.hxx index 9352bfbc53..de1049e379 100644..100755 --- a/svx/inc/galctrl.hxx +++ b/svx/inc/svx/galctrl.hxx @@ -66,7 +66,7 @@ private: Rectangle aPreviewRect; GalleryTheme* mpTheme; - SVX_DLLPRIVATE BOOL ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const; + SVX_DLLPRIVATE sal_Bool ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const; SVX_DLLPRIVATE void InitSettings(); // Window @@ -146,14 +146,14 @@ private: Link maSelectHdl; GalleryTheme* mpTheme; - ULONG mnCurRow; - BOOL mbInit; + sal_uIntPtr mnCurRow; + sal_Bool mbInit; void InitSettings(); // BrowseBox - virtual BOOL SeekRow( long nRow ); - virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const; + virtual sal_Bool SeekRow( long nRow ); + virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const; virtual void DoubleClick( const BrowserMouseEvent& rEvt ); virtual void Select(); virtual sal_Int8 AcceptDrop( const BrowserAcceptDropEvent& rEvt ); @@ -182,7 +182,7 @@ public: @return the text out of the cell */ - virtual String GetCellText(long _nRow, USHORT _nColId) const; + virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const; // from IAccessibleTableProvider virtual Rectangle GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nColumnPos,sal_Int32 nIndex); diff --git a/svx/inc/gallery.hxx b/svx/inc/svx/gallery.hxx index 726db2396b..181780b6c0 100644..100755 --- a/svx/inc/gallery.hxx +++ b/svx/inc/svx/gallery.hxx @@ -225,57 +225,57 @@ public: INetURLObject GetURL() const; String GetFilterName() const; Graphic GetGraphic() const; - BOOL GetVCDrawModel( FmFormModel& rModel ) const; - BOOL IsLinkage() const; + sal_Bool GetVCDrawModel( FmFormModel& rModel ) const; + sal_Bool IsLinkage() const; static bool FillThemeList( std::vector<String>& rThemeList ); // FillObjList is filling rObjList with Strings of the internal Gallery Object URL - static BOOL FillObjList( const String& rThemeName, List& rObjList ); - static BOOL FillObjList( ULONG nThemeId, List& rObjList ); + static sal_Bool FillObjList( const String& rThemeName, List& rObjList ); + static sal_Bool FillObjList( sal_uIntPtr nThemeId, List& rObjList ); // FillObjTitleList is filling the rList with the title for each gallery object static sal_Bool FillObjListTitle( const sal_uInt32 nThemeId, std::vector< rtl::OUString >& rList ); - static BOOL InsertURL( const String& rThemeName, const String& rURL ); - static BOOL InsertURL( ULONG nThemeId, const String& rURL ); + static sal_Bool InsertURL( const String& rThemeName, const String& rURL ); + static sal_Bool InsertURL( sal_uIntPtr nThemeId, const String& rURL ); - static BOOL InsertURL( const String& rThemeName, const String& rURL, - const ULONG nSgaFormat /* = SGA_FORMAT_ALL */ ); - static BOOL InsertURL( ULONG nThemeId, const String& rURL, - const ULONG nSgaFormat /* = SGA_FORMAT_ALL */ ); + static sal_Bool InsertURL( const String& rThemeName, const String& rURL, + const sal_uIntPtr nSgaFormat /* = SGA_FORMAT_ALL */ ); + static sal_Bool InsertURL( sal_uIntPtr nThemeId, const String& rURL, + const sal_uIntPtr nSgaFormat /* = SGA_FORMAT_ALL */ ); - static ULONG GetObjCount( const String& rThemeName ); - static ULONG GetObjCount( ULONG nThemeId ); + static sal_uIntPtr GetObjCount( const String& rThemeName ); + static sal_uIntPtr GetObjCount( sal_uIntPtr nThemeId ); - static BOOL GetGraphicObj( const String& rThemeName, ULONG nPos, + static sal_Bool GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos, Graphic* pGraphic = NULL, Bitmap* pThumb = NULL, - BOOL bProgess = FALSE ); - static BOOL GetGraphicObj( ULONG nThemeId, ULONG nPos, + sal_Bool bProgess = sal_False ); + static sal_Bool GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos, Graphic* pGraphic = NULL, Bitmap* pThumb = NULL, - BOOL bProgess = FALSE ); + sal_Bool bProgess = sal_False ); - static BOOL InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic ); - static BOOL InsertGraphicObj( ULONG nThemeId, const Graphic& rGraphic ); + static sal_Bool InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic ); + static sal_Bool InsertGraphicObj( sal_uIntPtr nThemeId, const Graphic& rGraphic ); - static ULONG GetSdrObjCount( const String& rThemeName ); - static ULONG GetSdrObjCount( ULONG nThemeId ); + static sal_uIntPtr GetSdrObjCount( const String& rThemeName ); + static sal_uIntPtr GetSdrObjCount( sal_uIntPtr nThemeId ); - static BOOL GetSdrObj( const String& rThemeName, ULONG nSdrModelPos, + static sal_Bool GetSdrObj( const String& rThemeName, sal_uIntPtr nSdrModelPos, SdrModel* pModel = NULL, Bitmap* pThumb = NULL ); - static BOOL GetSdrObj( ULONG nThemeId, ULONG nSdrModelPos, + static sal_Bool GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos, SdrModel* pModel = NULL, Bitmap* pThumb = NULL ); - static BOOL InsertSdrObj( const String& rThemeName, FmFormModel& rModel ); - static BOOL InsertSdrObj( ULONG nThemeId, FmFormModel& rModel ); + static sal_Bool InsertSdrObj( const String& rThemeName, FmFormModel& rModel ); + static sal_Bool InsertSdrObj( sal_uIntPtr nThemeId, FmFormModel& rModel ); - static BOOL BeginLocking( const String& rThemeName ); - static BOOL BeginLocking( ULONG nThemeId ); + static sal_Bool BeginLocking( const String& rThemeName ); + static sal_Bool BeginLocking( sal_uIntPtr nThemeId ); - static BOOL EndLocking( const String& rThemeName ); - static BOOL EndLocking( ULONG nThemeId ); + static sal_Bool EndLocking( const String& rThemeName ); + static sal_Bool EndLocking( sal_uIntPtr nThemeId ); - static BOOL DrawCentered( OutputDevice* pOut, const FmFormModel& rModel ); + static sal_Bool DrawCentered( OutputDevice* pOut, const FmFormModel& rModel ); }; #endif // _GALLERY_HXX_ diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx index b0f3ee538f..ca708cf39c 100644..100755 --- a/svx/inc/svx/gallery1.hxx +++ b/svx/inc/svx/gallery1.hxx @@ -51,12 +51,12 @@ private: INetURLObject aThmURL; INetURLObject aSdgURL; INetURLObject aSdvURL; - UINT32 nFileNumber; - UINT32 nId; - BOOL bReadOnly; - BOOL bImported; - BOOL bModified; - BOOL bThemeNameFromResource; + sal_uInt32 nFileNumber; + sal_uInt32 nId; + sal_Bool bReadOnly; + sal_Bool bImported; + sal_Bool bModified; + sal_Bool bThemeNameFromResource; GalleryThemeEntry(); INetURLObject ImplGetURLIgnoreCase( const INetURLObject& rURL ) const; @@ -64,31 +64,31 @@ private: public: GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName, - UINT32 nFileNumber, BOOL bReadOnly, BOOL bImported, - BOOL bNewFile, UINT32 nId, BOOL bThemeNameFromResource ); + sal_uInt32 nFileNumber, sal_Bool bReadOnly, sal_Bool bImported, + sal_Bool bNewFile, sal_uInt32 nId, sal_Bool bThemeNameFromResource ); ~GalleryThemeEntry() {}; const String& GetThemeName() const { return aName; } - UINT32 GetFileNumber() const { return nFileNumber; } + sal_uInt32 GetFileNumber() const { return nFileNumber; } const INetURLObject& GetThmURL() const { return aThmURL; } const INetURLObject& GetSdgURL() const { return aSdgURL; } const INetURLObject& GetSdvURL() const { return aSdvURL; } - BOOL IsImported() const { return bImported; } - BOOL IsReadOnly() const { return bReadOnly; } - BOOL IsDefault() const; + sal_Bool IsImported() const { return bImported; } + sal_Bool IsReadOnly() const { return bReadOnly; } + sal_Bool IsDefault() const; - BOOL IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; } + sal_Bool IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; } - BOOL IsModified() const { return bModified; } - void SetModified( BOOL bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); } + sal_Bool IsModified() const { return bModified; } + void SetModified( sal_Bool bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); } void SetName( const String& rNewName ); - BOOL IsNameFromResource() const { return bThemeNameFromResource; } + sal_Bool IsNameFromResource() const { return bThemeNameFromResource; } - UINT32 GetId() const { return nId; } - void SetId( UINT32 nNewId, BOOL bResetThemeName ); + sal_uInt32 GetId() const { return nId; } + void SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ); }; typedef ::std::vector< GalleryThemeEntry* > GalleryThemeList; @@ -136,16 +136,16 @@ private: INetURLObject aRelURL; INetURLObject aUserURL; rtl_TextEncoding nReadTextEncoding; - ULONG nLastFileNumber; - BOOL bMultiPath; - + sal_uIntPtr nLastFileNumber; + sal_Bool bMultiPath; + void ImplLoad( const String& rMultiPath ); void ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly ); void ImplLoadImports(); void ImplWriteImportList(); - + SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const String& rThemeName ); - GalleryThemeEntry* ImplGetThemeEntry( ULONG nThemeId ); + GalleryThemeEntry* ImplGetThemeEntry( sal_uIntPtr nThemeId ); GalleryImportThemeEntry* ImplGetImportThemeEntry( const String& rImportName ); GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry ); @@ -163,13 +163,13 @@ public: { return nPos < aThemeList.size() ? aThemeList[ nPos ] : NULL; } const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); } - SVX_DLLPUBLIC BOOL HasTheme( const String& rThemeName ); - String GetThemeName( ULONG nThemeId ) const; + SVX_DLLPUBLIC sal_Bool HasTheme( const String& rThemeName ); + String GetThemeName( sal_uIntPtr nThemeId ) const; - SVX_DLLPUBLIC BOOL CreateTheme( const String& rThemeName, UINT32 nNumFrom = 0 ); - BOOL CreateImportTheme( const INetURLObject& rURL, const String& rFileName ); - BOOL RenameTheme( const String& rOldName, const String& rNewName ); - SVX_DLLPUBLIC BOOL RemoveTheme( const String& rThemeName ); + SVX_DLLPUBLIC sal_Bool CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom = 0 ); + sal_Bool CreateImportTheme( const INetURLObject& rURL, const String& rFileName ); + sal_Bool RenameTheme( const String& rOldName, const String& rNewName ); + SVX_DLLPUBLIC sal_Bool RemoveTheme( const String& rThemeName ); SVX_DLLPUBLIC GalleryTheme* AcquireTheme( const String& rThemeName, SfxListener& rListener ); SVX_DLLPUBLIC void ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener ); @@ -177,11 +177,11 @@ public: public: INetURLObject GetImportURL( const String& rThemeName ); - + const INetURLObject& GetUserURL() const { return aUserURL; } const INetURLObject& GetRelativeURL() const { return aRelURL; } - - BOOL IsMultiPath() const { return bMultiPath; } + + sal_Bool IsMultiPath() const { return bMultiPath; } }; #endif // _SVX_GALLERY1_HXX_ diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx index d1e7192396..a2781317d9 100644..100755 --- a/svx/inc/svx/galmisc.hxx +++ b/svx/inc/svx/galmisc.hxx @@ -74,7 +74,7 @@ enum SgaObjKind // - Defines - // ----------- -#define IV_IMAPINFO (UINT32('S')*0x00000001+UINT32('D')*0x00000100+UINT32('U')*0x00010000+UINT32('D')*0x01000000) +#define IV_IMAPINFO (sal_uInt32('S')*0x00000001+sal_uInt32('D')*0x00000100+sal_uInt32('U')*0x00010000+sal_uInt32('D')*0x01000000) #define ID_IMAPINFO 2 #define USERDATA_HDL() (LINK(this,SgaUserDataFactory,MakeUserData)) @@ -105,16 +105,16 @@ class ImageMap; class Gallery; SVX_DLLPUBLIC ResMgr* GetGalleryResMgr(); -USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, String& rFilterName, BOOL bShowProgress = FALSE ); -BOOL GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel ); -BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap ); -SVX_DLLPUBLIC String GetReducedString( const INetURLObject& rURL, ULONG nMaxLen ); +sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, String& rFilterName, sal_Bool bShowProgress = sal_False ); +sal_Bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel ); +sal_Bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap ); +SVX_DLLPUBLIC String GetReducedString( const INetURLObject& rURL, sal_uIntPtr nMaxLen ); String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL ); -BOOL FileExists( const INetURLObject& rURL ); -BOOL CreateDir( const INetURLObject& rURL ); -BOOL CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ); -BOOL KillFile( const INetURLObject& rURL ); +sal_Bool FileExists( const INetURLObject& rURL ); +sal_Bool CreateDir( const INetURLObject& rURL ); +sal_Bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ); +sal_Bool KillFile( const INetURLObject& rURL ); BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId ); @@ -174,7 +174,7 @@ class SVX_DLLPUBLIC GalleryProgress GalleryProgress( GraphicFilter* pFilter = NULL ); ~GalleryProgress(); - void Update( ULONG nVal, ULONG nMaxVal ); + void Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal ); }; // ----------------------- @@ -202,7 +202,7 @@ private: protected: - GalleryTransferable( GalleryTheme* pTheme, ULONG nObjectPos, bool bLazy ); + GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy ); ~GalleryTransferable(); void InitData( bool bLazy ); @@ -239,25 +239,25 @@ class GalleryHint : public SfxHint { private: - ULONG mnType; + sal_uIntPtr mnType; String maThemeName; String maStringData; - ULONG mnData1; - ULONG mnData2; + sal_uIntPtr mnData1; + sal_uIntPtr mnData2; public: - GalleryHint( ULONG nType, const String& rThemeName, ULONG nData1 = 0UL, ULONG nData2 = 0UL ) : + GalleryHint( sal_uIntPtr nType, const String& rThemeName, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) : mnType( nType ), maThemeName( rThemeName ), mnData1( nData1 ), mnData2( nData2 ) {} - GalleryHint( ULONG nType, const String& rThemeName, const String& rStringData, ULONG nData1 = 0UL, ULONG nData2 = 0UL ) : + GalleryHint( sal_uIntPtr nType, const String& rThemeName, const String& rStringData, sal_uIntPtr nData1 = 0UL, sal_uIntPtr nData2 = 0UL ) : mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ), mnData2( nData2 ) {} - ULONG GetType() const { return mnType; } + sal_uIntPtr GetType() const { return mnType; } const String& GetThemeName() const { return maThemeName; } const String& GetStringData() const { return maStringData; } - ULONG GetData1() const { return mnData1; } - ULONG GetData2() const { return mnData2; } + sal_uIntPtr GetData1() const { return mnData1; } + sal_uIntPtr GetData2() const { return mnData2; } }; #endif diff --git a/svx/inc/galtheme.hxx b/svx/inc/svx/galtheme.hxx index 9a4f44a06b..005073be09 100644..100755 --- a/svx/inc/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx @@ -56,7 +56,7 @@ struct GalleryObject INetURLObject aURL; sal_uInt32 nOffset; SgaObjKind eObjKind; - BOOL bDummy; + sal_Bool bDummy; }; typedef ::std::vector< GalleryObject* > GalleryObjectList; @@ -73,7 +73,7 @@ class ListBox; struct GalDragParams { Region aDragRegion; - ULONG nDragObjPos; + sal_uIntPtr nDragObjPos; String aThemeName; String aFileName; SgaObjKind eObjKind; @@ -106,15 +106,15 @@ private: SotStorageRef aSvDrawStorageRef; Gallery* pParent; GalleryThemeEntry* pThm; - ULONG mnThemeLockCount; - ULONG mnBroadcasterLockCount; - ULONG nDragPos; - BOOL bDragging; - BOOL bAbortActualize; + sal_uIntPtr mnThemeLockCount; + sal_uIntPtr mnBroadcasterLockCount; + sal_uIntPtr nDragPos; + sal_Bool bDragging; + sal_Bool bAbortActualize; void ImplCreateSvDrawStorage(); SVX_DLLPUBLIC SgaObject* ImplReadSgaObject( GalleryObject* pEntry ); - BOOL ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry ); + sal_Bool ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry ); void ImplRead(); void ImplWrite(); const GalleryObject* ImplGetGalleryObject( size_t nPos ) const @@ -129,9 +129,9 @@ private: return size_t(-1); } INetURLObject ImplGetURL( const GalleryObject* pObject ) const; - INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat = CVT_UNKNOWN ); - void ImplSetModified( BOOL bModified ); - void ImplBroadcast( ULONG nUpdatePos ); + INetURLObject ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat = CVT_UNKNOWN ); + void ImplSetModified( sal_Bool bModified ); + void ImplBroadcast( sal_uIntPtr nUpdatePos ); GalleryTheme(); GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry ); @@ -139,16 +139,16 @@ private: public: - static GalleryThemeEntry* CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly ); + static GalleryThemeEntry* CreateThemeEntry( const INetURLObject& rURL, sal_Bool bReadOnly ); size_t GetObjectCount() const { return aObjectList.size(); } SVX_DLLPUBLIC SgaObject* AcquireObject( size_t nPos ); - SVX_DLLPUBLIC void ReleaseObject( SgaObject* pObj ); + SVX_DLLPUBLIC void ReleaseObject( SgaObject* pObj ); - SVX_DLLPUBLIC BOOL InsertObject( const SgaObject& rObj, ULONG nPos = LIST_APPEND ); - SVX_DLLPUBLIC BOOL RemoveObject( size_t nPos ); - BOOL ChangeObjectPos( size_t nOldPos, size_t nNewPos ); + SVX_DLLPUBLIC bool InsertObject( const SgaObject& rObj, sal_uIntPtr nPos = LIST_APPEND ); + SVX_DLLPUBLIC bool RemoveObject( size_t nPos ); + bool ChangeObjectPos( size_t nOldPos, size_t nNewPos ); SVX_DLLPUBLIC const String& GetName() const; const String& GetRealName() const; @@ -162,69 +162,69 @@ public: SVX_DLLPUBLIC const INetURLObject& GetSdgURL() const; const INetURLObject& GetSdvURL() const; - SVX_DLLPUBLIC UINT32 GetId() const; - void SetId( UINT32 nNewId, BOOL bResetThemeName ); + SVX_DLLPUBLIC sal_uInt32 GetId() const; + void SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ); - void SetDragging( BOOL bSet ) { bDragging = bSet; } - BOOL IsDragging() const { return bDragging; } + void SetDragging( sal_Bool bSet ) { bDragging = bSet; } + sal_Bool IsDragging() const { return bDragging; } void LockTheme() { ++mnThemeLockCount; } - BOOL UnlockTheme(); + sal_Bool UnlockTheme(); void LockBroadcaster() { mnBroadcasterLockCount++; } - SVX_DLLPUBLIC void UnlockBroadcaster( ULONG nUpdatePos = 0 ); - BOOL IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; } + SVX_DLLPUBLIC void UnlockBroadcaster( sal_uIntPtr nUpdatePos = 0 ); + sal_Bool IsBroadcasterLocked() const { return mnBroadcasterLockCount > 0; } + + void SetDragPos( sal_uIntPtr nPos ) { nDragPos = nPos; } + sal_uIntPtr GetDragPos() const { return nDragPos; } - void SetDragPos( ULONG nPos ) { nDragPos = nPos; } - ULONG GetDragPos() const { return nDragPos; } + sal_Bool IsThemeNameFromResource() const; - BOOL IsThemeNameFromResource() const; - - SVX_DLLPUBLIC BOOL IsImported() const; - SVX_DLLPUBLIC BOOL IsReadOnly() const; - SVX_DLLPUBLIC BOOL IsDefault() const; - BOOL IsModified() const; + SVX_DLLPUBLIC sal_Bool IsImported() const; + SVX_DLLPUBLIC sal_Bool IsReadOnly() const; + SVX_DLLPUBLIC sal_Bool IsDefault() const; + sal_Bool IsModified() const; SVX_DLLPUBLIC void Actualize( const Link& rActualizeLink, GalleryProgress* pProgress = NULL ); - void AbortActualize() { bAbortActualize = TRUE; } + void AbortActualize() { bAbortActualize = sal_True; } Gallery* GetParent() const { return pParent; } SotStorageRef GetSvDrawStorage() const { return aSvDrawStorageRef; } public: - SgaObjKind GetObjectKind( ULONG nPos ) const + SgaObjKind GetObjectKind( sal_uIntPtr nPos ) const { DBG_ASSERT( nPos < GetObjectCount(), "Position out of range" ); return ImplGetGalleryObject( nPos )->eObjKind; } - const INetURLObject& GetObjectURL( ULONG nPos ) const + const INetURLObject& GetObjectURL( sal_uIntPtr nPos ) const { DBG_ASSERT( nPos < GetObjectCount(), "Position out of range" ); return ImplGetGalleryObject( nPos )->aURL; } - BOOL GetThumb( ULONG nPos, Bitmap& rBmp, BOOL bProgress = FALSE ); + sal_Bool GetThumb( sal_uIntPtr nPos, Bitmap& rBmp, sal_Bool bProgress = sal_False ); - SVX_DLLPUBLIC BOOL GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress = FALSE ); - SVX_DLLPUBLIC BOOL InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos = LIST_APPEND ); + SVX_DLLPUBLIC sal_Bool GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool bProgress = sal_False ); + SVX_DLLPUBLIC sal_Bool InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos = LIST_APPEND ); - SVX_DLLPUBLIC BOOL GetModel( ULONG nPos, SdrModel& rModel, BOOL bProgress = FALSE ); - SVX_DLLPUBLIC BOOL InsertModel( const FmFormModel& rModel, ULONG nInsertPos = LIST_APPEND ); + SVX_DLLPUBLIC sal_Bool GetModel( sal_uIntPtr nPos, SdrModel& rModel, sal_Bool bProgress = sal_False ); + SVX_DLLPUBLIC sal_Bool InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos = LIST_APPEND ); - BOOL GetModelStream( ULONG nPos, SotStorageStreamRef& rModelStreamRef, BOOL bProgress = FALSE ); - BOOL InsertModelStream( const SotStorageStreamRef& rModelStream, ULONG nInsertPos = LIST_APPEND ); + sal_Bool GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rModelStreamRef, sal_Bool bProgress = sal_False ); + sal_Bool InsertModelStream( const SotStorageStreamRef& rModelStream, sal_uIntPtr nInsertPos = LIST_APPEND ); - BOOL GetURL( ULONG nPos, INetURLObject& rURL, BOOL bProgress = FALSE ); - SVX_DLLPUBLIC BOOL InsertURL( const INetURLObject& rURL, ULONG nInsertPos = LIST_APPEND ); - BOOL InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG nInsertPos = LIST_APPEND ); + sal_Bool GetURL( sal_uIntPtr nPos, INetURLObject& rURL, sal_Bool bProgress = sal_False ); + SVX_DLLPUBLIC sal_Bool InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos = LIST_APPEND ); + sal_Bool InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos = LIST_APPEND ); - BOOL InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, ULONG nInsertPos ); + sal_Bool InsertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos ); - void CopyToClipboard( Window* pWindow, ULONG nPos ); - void StartDrag( Window* pWindow, ULONG nPos ); + void CopyToClipboard( Window* pWindow, sal_uIntPtr nPos ); + void StartDrag( Window* pWindow, sal_uIntPtr nPos ); public: diff --git a/svx/inc/globl3d.hxx b/svx/inc/svx/globl3d.hxx index 4ec9f1ba2d..2dce3db186 100644..100755 --- a/svx/inc/globl3d.hxx +++ b/svx/inc/svx/globl3d.hxx @@ -35,20 +35,20 @@ const double PrecisionLimit = 1.0e-14; -const UINT32 E3dInventor = UINT32('E')*0x00000001+ - UINT32('3')*0x00000100+ - UINT32('D')*0x00010000+ - UINT32('1')*0x01000000; - -const UINT16 E3D_SCENE_ID = 1; -const UINT16 E3D_POLYSCENE_ID = 2; -const UINT16 E3D_OBJECT_ID = 3; // should not be used, it's only a helper class for E3DScene and E3DCompoundObject -const UINT16 E3D_CUBEOBJ_ID = 4; -const UINT16 E3D_SPHEREOBJ_ID = 5; -const UINT16 E3D_EXTRUDEOBJ_ID = 6; -const UINT16 E3D_LATHEOBJ_ID = 7; -const UINT16 E3D_COMPOUNDOBJ_ID = 8; -const UINT16 E3D_POLYGONOBJ_ID = 9; +const sal_uInt32 E3dInventor = sal_uInt32('E')*0x00000001+ + sal_uInt32('3')*0x00000100+ + sal_uInt32('D')*0x00010000+ + sal_uInt32('1')*0x01000000; + +const sal_uInt16 E3D_SCENE_ID = 1; +const sal_uInt16 E3D_POLYSCENE_ID = 2; +const sal_uInt16 E3D_OBJECT_ID = 3; // should not be used, it's only a helper class for E3DScene and E3DCompoundObject +const sal_uInt16 E3D_CUBEOBJ_ID = 4; +const sal_uInt16 E3D_SPHEREOBJ_ID = 5; +const sal_uInt16 E3D_EXTRUDEOBJ_ID = 6; +const sal_uInt16 E3D_LATHEOBJ_ID = 7; +const sal_uInt16 E3D_COMPOUNDOBJ_ID = 8; +const sal_uInt16 E3D_POLYGONOBJ_ID = 9; #endif // _E3D_GLOBL3D_HXX diff --git a/svx/inc/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx index f621e9ddd5..18023dd6a9 100644..100755 --- a/svx/inc/grafctrl.hxx +++ b/svx/inc/svx/grafctrl.hxx @@ -42,7 +42,7 @@ class SVX_DLLPUBLIC TbxImageItem : public SfxUInt16Item { public: TYPEINFO(); - TbxImageItem( USHORT nWhich = 0, UINT16 nImage = 0 ); + TbxImageItem( sal_uInt16 nWhich = 0, sal_uInt16 nImage = 0 ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; virtual int operator==( const SfxPoolItem& ) const; @@ -58,10 +58,10 @@ public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafFilterToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxGrafFilterToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); }; @@ -75,10 +75,10 @@ class SvxGrafToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxGrafToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); }; @@ -90,7 +90,7 @@ class SVX_DLLPUBLIC SvxGrafRedToolBoxControl : public SvxGrafToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafRedToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafRedToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; // ------------------------------ @@ -101,7 +101,7 @@ class SVX_DLLPUBLIC SvxGrafGreenToolBoxControl : public SvxGrafToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafGreenToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafGreenToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; // ----------------------------- @@ -112,7 +112,7 @@ class SVX_DLLPUBLIC SvxGrafBlueToolBoxControl : public SvxGrafToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafBlueToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafBlueToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; // ---------------------------------- @@ -123,7 +123,7 @@ class SVX_DLLPUBLIC SvxGrafLuminanceToolBoxControl : public SvxGrafToolBoxContro { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafLuminanceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafLuminanceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; // --------------------------------- @@ -134,7 +134,7 @@ class SVX_DLLPUBLIC SvxGrafContrastToolBoxControl : public SvxGrafToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafContrastToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafContrastToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; // ------------------------------ @@ -145,7 +145,7 @@ class SVX_DLLPUBLIC SvxGrafGammaToolBoxControl : public SvxGrafToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafGammaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafGammaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; // ------------------------------------- @@ -156,7 +156,7 @@ class SVX_DLLPUBLIC SvxGrafTransparenceToolBoxControl : public SvxGrafToolBoxCon { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafTransparenceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafTransparenceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; // ----------------------------- @@ -167,10 +167,10 @@ class SVX_DLLPUBLIC SvxGrafModeToolBoxControl : public SfxToolBoxControl, public { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxGrafModeToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxGrafModeToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); }; diff --git a/svx/inc/svx/graphctl.hxx b/svx/inc/svx/graphctl.hxx index 6a19b85bfc..3c9dea8586 100644..100755 --- a/svx/inc/svx/graphctl.hxx +++ b/svx/inc/svx/graphctl.hxx @@ -60,10 +60,10 @@ class SVX_DLLPUBLIC GraphCtrl : public Control GraphCtrlUserCall* pUserCall; WinBits nWinStyle; SdrObjKind eObjKind; - USHORT nPolyEdit; - BOOL bEditMode; - BOOL bSdrMode; - BOOL bAnim; + sal_uInt16 nPolyEdit; + sal_Bool bEditMode; + sal_Bool bSdrMode; + sal_Bool bAnim; DECL_LINK( UpdateHdl, Timer* ); @@ -98,17 +98,17 @@ public: void SetWinStyle( WinBits nWinBits ); WinBits GetWinStyle() const { return nWinStyle; } - void SetGraphic( const Graphic& rGraphic, BOOL bNewModel = TRUE ); + void SetGraphic( const Graphic& rGraphic, sal_Bool bNewModel = sal_True ); const Graphic& GetGraphic() const { return aGraphic; } const Size& GetGraphicSize() const { return aGraphSize; } const Point& GetMousePos() const { return aMousePos; } - void SetEditMode( const BOOL bEditMode ); - BOOL IsEditMode() const { return bEditMode; } + void SetEditMode( const sal_Bool bEditMode ); + sal_Bool IsEditMode() const { return bEditMode; } - void SetPolyEditMode( const USHORT nPolyEdit ); - USHORT GetPolyEditMode() const { return nPolyEdit; } + void SetPolyEditMode( const sal_uInt16 nPolyEdit ); + sal_uInt16 GetPolyEditMode() const { return nPolyEdit; } void SetObjKind( const SdrObjKind eObjKind ); SdrObjKind GetObjKind() const { return eObjKind; } @@ -116,7 +116,7 @@ public: SdrModel* GetSdrModel() const { return pModel; } SdrView* GetSdrView() const { return pView; } SdrObject* GetSelectedSdrObject() const; - BOOL IsChanged() const { return bSdrMode ? pModel->IsChanged() : FALSE; } + sal_Bool IsChanged() const { return bSdrMode ? pModel->IsChanged() : sal_False; } void SetMousePosLink( const Link& rLink ) { aMousePosLink = rLink; } const Link& GetMousePosLink() const { return aMousePosLink; } diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx index 8d42a26cda..e70c890d10 100644..100755 --- a/svx/inc/svx/grfcrop.hxx +++ b/svx/inc/svx/grfcrop.hxx @@ -39,25 +39,25 @@ class SVX_DLLPUBLIC SvxGrfCrop : public SfxPoolItem { sal_Int32 nLeft, nRight, nTop, nBottom; public: - SvxGrfCrop( USHORT ); + SvxGrfCrop( sal_uInt16 ); SvxGrfCrop( sal_Int32 nLeft, sal_Int32 nRight, sal_Int32 nTop, sal_Int32 nBottom, - USHORT ); + sal_uInt16 ); virtual ~SvxGrfCrop(); // "pure virtual methods" from SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT nVer) const; - virtual SvStream& Store(SvStream &, USHORT nIVer) const; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream &, sal_uInt16 nIVer) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper* pIntl = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ); void SetLeft( sal_Int32 nVal ) { nLeft = nVal; } void SetRight( sal_Int32 nVal ) { nRight = nVal; } diff --git a/svx/inc/svx/grfflt.hxx b/svx/inc/svx/grfflt.hxx index 599261c3ad..5a38f6abbf 100644..100755 --- a/svx/inc/svx/grfflt.hxx +++ b/svx/inc/svx/grfflt.hxx @@ -61,7 +61,7 @@ class SVX_DLLPUBLIC SvxGraphicFilter { public: - static ULONG ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ); + static sal_uLong ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ); static void DisableGraphicFilterSlots( SfxItemSet& rSet ); }; diff --git a/svx/inc/svx/gridctrl.hxx b/svx/inc/svx/gridctrl.hxx index d13fa25844..8187508501 100644..100755 --- a/svx/inc/svx/gridctrl.hxx +++ b/svx/inc/svx/gridctrl.hxx @@ -285,7 +285,7 @@ private: sal_uInt16 m_nOptionMask; // the mask of options to be enabled in setDataSource // (with respect to the data source capabilities) // defaults to (insert | update | delete) - USHORT m_nLastColId; + sal_uInt16 m_nLastColId; long m_nLastRowId; sal_Bool m_bDesignMode : 1; // default = sal_False @@ -390,7 +390,7 @@ public: @return the text out of the cell */ - virtual String GetCellText(long _nRow, USHORT _nColId) const; + virtual String GetCellText(long _nRow, sal_uInt16 _nColId) const; void RemoveRows(sal_Bool bNewCursor); @@ -594,7 +594,7 @@ protected: const DbGridRowRef& GetSeekRow() const { return m_xSeekRow; } const DbGridRowRef& GetPaintRow() const { return m_xPaintRow; } CursorWrapper* GetSeekCursor() const { return m_pSeekCursor; } - + void ConnectToFields(); void DisconnectFromFields(); diff --git a/svx/inc/svx/hdft.hxx b/svx/inc/svx/hdft.hxx index fb1087370d..45a4a4a4e5 100644..100755 --- a/svx/inc/svx/hdft.hxx +++ b/svx/inc/svx/hdft.hxx @@ -49,22 +49,23 @@ class SVX_DLLPUBLIC SvxHFPage: public SfxTabPage public: - virtual BOOL FillItemSet( SfxItemSet& rOutSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rOutSet ); virtual void Reset( const SfxItemSet& rSet ); virtual ~SvxHFPage(); - void DisableDeleteQueryBox() { bDisableQueryBox = TRUE; } - void EnableBackgroundSelector( BOOL bNew ) { bEnableBackgroundSelector = bNew; } + void DisableDeleteQueryBox() { bDisableQueryBox = sal_True; } + void EnableBackgroundSelector( sal_Bool bNew ) { bEnableBackgroundSelector = bNew; } void EnableDynamicSpacing(); protected: virtual void ActivatePage( const SfxItemSet& rSet ); virtual int DeactivatePage( SfxItemSet* pSet = 0 ); - SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rSet, - USHORT nSetId ); + SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rSet, + sal_uInt16 nSetId ); + FixedLine aFrm; CheckBox aTurnOnBox; CheckBox aCntSharedBox; FixedText aLMLbl; @@ -77,14 +78,13 @@ protected: FixedText aHeightFT; MetricField aHeightEdit; CheckBox aHeightDynBtn; - FixedLine aFrm; SvxPageWindow aBspWin; PushButton aBackgroundBtn; - USHORT nId; + sal_uInt16 nId; SfxItemSet* pBBSet; - BOOL bDisableQueryBox; - BOOL bEnableBackgroundSelector; + sal_Bool bDisableQueryBox; + sal_Bool bEnableBackgroundSelector; bool bInReset; void InitHandler(); @@ -109,7 +109,7 @@ class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage { public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); private: SvxHeaderPage( Window* pParent, const SfxItemSet& rSet ); @@ -121,7 +121,7 @@ class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage { public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static USHORT* GetRanges(); + static sal_uInt16* GetRanges(); private: SVX_DLLPRIVATE SvxFooterPage( Window* pParent, const SfxItemSet& rSet ); diff --git a/svx/inc/svx/helperhittest3d.hxx b/svx/inc/svx/helperhittest3d.hxx index 630f6cd4f8..630f6cd4f8 100644..100755 --- a/svx/inc/svx/helperhittest3d.hxx +++ b/svx/inc/svx/helperhittest3d.hxx diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/svx/hlnkitem.hxx index 13b6b1d8d7..5e3933a22c 100644..100755 --- a/svx/inc/hlnkitem.hxx +++ b/svx/inc/svx/hlnkitem.hxx @@ -56,18 +56,18 @@ class SVX_DLLPUBLIC SvxHyperlinkItem : public SfxPoolItem String sIntName; SvxMacroTableDtor* pMacroTable; - USHORT nMacroEvents; + sal_uInt16 nMacroEvents; public: TYPEINFO(); - SvxHyperlinkItem( USHORT _nWhich = SID_HYPERLINK_GETLINK ): + SvxHyperlinkItem( sal_uInt16 _nWhich = SID_HYPERLINK_GETLINK ): SfxPoolItem(_nWhich), pMacroTable(NULL) { eType = HLINK_DEFAULT; nMacroEvents=0; }; SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ); - SvxHyperlinkItem( USHORT nWhich, String& rName, String& rURL, + SvxHyperlinkItem( sal_uInt16 nWhich, String& rName, String& rURL, String& rTarget, String& rIntName, SvxLinkInsertMode eTyp = HLINK_FIELD, - USHORT nEvents = 0, + sal_uInt16 nEvents = 0, SvxMacroTableDtor *pMacroTbl =NULL ); virtual ~SvxHyperlinkItem () { delete pMacroTable; } @@ -75,8 +75,8 @@ public: virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); const String& GetName() const { return sName; } void SetName(const String& rName) { sName = rName; } @@ -93,16 +93,16 @@ public: SvxLinkInsertMode GetInsertMode() const { return eType; } void SetInsertMode( SvxLinkInsertMode eNew ) { eType = eNew; } - void SetMacro( USHORT nEvent, const SvxMacro& rMacro ); + void SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro ); void SetMacroTable( const SvxMacroTableDtor& rTbl ); const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTable; } - void SetMacroEvents (const USHORT nEvents) { nMacroEvents = nEvents; } - USHORT GetMacroEvents() const { return nMacroEvents; } + void SetMacroEvents (const sal_uInt16 nEvents) { nMacroEvents = nEvents; } + sal_uInt16 GetMacroEvents() const { return nMacroEvents; } - virtual SvStream& Store( SvStream &, USHORT nItemVersion ) const; - virtual SfxPoolItem* Create( SvStream &, USHORT nVer ) const; + virtual SvStream& Store( SvStream &, sal_uInt16 nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream &, sal_uInt16 nVer ) const; }; diff --git a/svx/inc/htmlmode.hxx b/svx/inc/svx/htmlmode.hxx index d7c4d9588f..d7c4d9588f 100644..100755 --- a/svx/inc/htmlmode.hxx +++ b/svx/inc/svx/htmlmode.hxx diff --git a/svx/inc/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx index fc286e2389..344177966c 100644..100755 --- a/svx/inc/hyperdlg.hxx +++ b/svx/inc/svx/hyperdlg.hxx @@ -48,7 +48,7 @@ private: AbstractSvxHpLinkDlg* mpDlg; public: - SvxHlinkDlgWrapper( Window*pParent, USHORT nId, + SvxHlinkDlgWrapper( Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); SFX_DECL_CHILDWINDOW(SvxHlinkDlgWrapper); diff --git a/svx/inc/srchitem.hxx b/svx/inc/svx/hyprlink.hxx index 5555922a55..dd7836f2ed 100644..100755 --- a/svx/inc/srchitem.hxx +++ b/svx/inc/svx/hyprlink.hxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,12 +24,20 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _SVX_SRCHITEM_HXX -#define _SVX_SRCHITEM_HXX +#ifndef _SVX_DLG_HYPERLINK_HXX +#define _SVX_DLG_HYPERLINK_HXX -#include <svl/srchitem.hxx> +#include <sfx2/childwin.hxx> +#include "svx/svxdllapi.h" -#endif +// class SvxHyperlinkDialogWrapper --------------------------------------- +class SVX_DLLPUBLIC SvxHyperlinkDlgWrapper : public SfxChildWindow +{ +public: + SvxHyperlinkDlgWrapper( Window*pParent, sal_uInt16 nId, + SfxBindings* pBindings, SfxChildWinInfo* pInfo ); + SFX_DECL_CHILDWINDOW(SvxHyperlinkDlgWrapper); +}; +#endif // _SVX_DLG_HYPERLINK_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/ifaceids.hxx b/svx/inc/svx/ifaceids.hxx index 58001a9b9b..58001a9b9b 100644..100755 --- a/svx/inc/svx/ifaceids.hxx +++ b/svx/inc/svx/ifaceids.hxx diff --git a/svx/inc/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx index 05e30ee342..603ab0c588 100644..100755 --- a/svx/inc/imapdlg.hxx +++ b/svx/inc/svx/imapdlg.hxx @@ -66,7 +66,7 @@ class SVX_DLLPUBLIC SvxIMapDlgChildWindow : public SfxChildWindow { public: - SvxIMapDlgChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); + SvxIMapDlgChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW( SvxIMapDlgChildWindow ); @@ -93,13 +93,13 @@ class SvxIMapDlgItem : public SfxControllerItem protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - SvxIMapDlgItem( USHORT nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ); + SvxIMapDlgItem( sal_uInt16 nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ); }; @@ -135,7 +135,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow SvxIMapDlgItem aIMapItem; virtual void Resize(); - virtual BOOL Close(); + virtual sal_Bool Close(); #ifdef _IMAPDLG_PRIVATE @@ -151,7 +151,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow DECL_LINK( MiscHdl, void* ); void DoOpen(); - BOOL DoSave(); + sal_Bool DoSave(); #endif @@ -162,7 +162,7 @@ public: Window* pParent, const ResId& rResId ); ~SvxIMapDlg(); - void SetExecState( BOOL bEnable ); + void SetExecState( sal_Bool bEnable ); void SetGraphic( const Graphic& rGraphic ); diff --git a/svx/inc/insctrl.hxx b/svx/inc/svx/insctrl.hxx index 139b0197e2..8c4748f0fc 100644..100755 --- a/svx/inc/insctrl.hxx +++ b/svx/inc/svx/insctrl.hxx @@ -38,20 +38,20 @@ class SVX_DLLPUBLIC SvxInsertStatusBarControl : public SfxStatusBarControl { public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Click(); virtual void Paint( const UserDrawEvent& rEvt ); SFX_DECL_STATUSBAR_CONTROL(); - SvxInsertStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SvxInsertStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SvxInsertStatusBarControl(); - static ULONG GetDefItemWidth(const StatusBar& rStb); + static sal_uIntPtr GetDefItemWidth(const StatusBar& rStb); private: - BOOL bInsert; + sal_Bool bInsert; #ifdef _SVX_INSCTRL_CXX SVX_DLLPRIVATE void DrawItemText_Impl(); diff --git a/svx/inc/svx/ipolypolygoneditorcontroller.hxx b/svx/inc/svx/ipolypolygoneditorcontroller.hxx index a35f29c44d..1a7f0dbd76 100644..100755 --- a/svx/inc/svx/ipolypolygoneditorcontroller.hxx +++ b/svx/inc/svx/ipolypolygoneditorcontroller.hxx @@ -55,20 +55,20 @@ class IPolyPolygonEditorController { public: virtual void DeleteMarkedPoints() = 0; - virtual BOOL IsDeleteMarkedPointsPossible() const = 0; + virtual sal_Bool IsDeleteMarkedPointsPossible() const = 0; virtual void RipUpAtMarkedPoints() = 0; virtual bool IsRipUpAtMarkedPointsPossible() const = 0; - virtual BOOL IsSetMarkedSegmentsKindPossible() const = 0; + virtual sal_Bool IsSetMarkedSegmentsKindPossible() const = 0; virtual SdrPathSegmentKind GetMarkedSegmentsKind() const = 0; virtual void SetMarkedSegmentsKind(SdrPathSegmentKind eKind) = 0; - virtual BOOL IsSetMarkedPointsSmoothPossible() const = 0; + virtual sal_Bool IsSetMarkedPointsSmoothPossible() const = 0; virtual SdrPathSmoothKind GetMarkedPointsSmooth() const = 0; virtual void SetMarkedPointsSmooth(SdrPathSmoothKind eKind) = 0; - virtual void CloseMarkedObjects(BOOL bToggle, BOOL bOpen ) = 0; + virtual void CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen ) = 0; virtual bool IsOpenCloseMarkedObjectsPossible() const = 0; virtual SdrObjClosedKind GetMarkedObjectsClosedState() const = 0; }; diff --git a/svx/inc/svx/itemwin.hxx b/svx/inc/svx/itemwin.hxx index e731deb650..1d892f3741 100644..100755 --- a/svx/inc/svx/itemwin.hxx +++ b/svx/inc/svx/itemwin.hxx @@ -43,10 +43,10 @@ class SfxObjectShell; class SvxLineBox : public LineLB { - USHORT nCurPos; + sal_uInt16 nCurPos; Timer aDelayTimer; Size aLogicalSize; - BOOL bRelease; + sal_Bool bRelease; SfxObjectShell* mpSh; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; @@ -77,11 +77,11 @@ class SvxColorBox : public ColorLB { using Window::Update; - USHORT nCurPos; - USHORT nId; + sal_uInt16 nCurPos; + sal_uInt16 nId; Timer aDelayTimer; Size aLogicalSize; - BOOL bRelease; + sal_Bool bRelease; ::rtl::OUString maCommand; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; @@ -152,17 +152,17 @@ public: SvxFillTypeBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); ~SvxFillTypeBox(); - void Selected() { bSelect = TRUE; } - BOOL IsRelease() { return bRelease;} + void Selected() { bSelect = sal_True; } + sal_Bool IsRelease() { return bRelease;} protected: virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); private: - USHORT nCurPos; - BOOL bSelect; - BOOL bRelease; + sal_uInt16 nCurPos; + sal_Bool bSelect; + sal_Bool bRelease; #ifdef _SVX_ITEMWIN_CXX void ReleaseFocus_Impl(); @@ -177,7 +177,7 @@ public: SvxFillAttrBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); ~SvxFillAttrBox(); - BOOL IsRelease() { return bRelease;} + sal_Bool IsRelease() { return bRelease;} protected: virtual long PreNotify( NotifyEvent& rNEvt ); @@ -185,8 +185,8 @@ protected: virtual void Select(); private: - USHORT nCurPos; - BOOL bRelease; + sal_uInt16 nCurPos; + sal_Bool bRelease; #ifdef _SVX_ITEMWIN_CXX void ReleaseFocus_Impl(); diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx index a57524e170..05855cdaa6 100644..100755 --- a/svx/inc/svx/langbox.hxx +++ b/svx/inc/svx/langbox.hxx @@ -59,7 +59,7 @@ class SvtLanguageTable; // load language strings from resource -SVX_DLLPUBLIC String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg ); +SVX_DLLPUBLIC String GetDicInfoStr( const String& rName, const sal_uInt16 nLang, sal_Bool bNeg ); class SVX_DLLPUBLIC SvxLanguageBox : public ListBox { @@ -69,34 +69,34 @@ private: Image m_aNotCheckedImage; Image m_aCheckedImage; String m_aAllString; - com::sun::star::uno::Sequence< INT16 > *m_pSpellUsedLang; + com::sun::star::uno::Sequence< sal_Int16 > *m_pSpellUsedLang; SvtLanguageTable* m_pLangTable; - INT16 m_nLangList; - BOOL m_bHasLangNone; - BOOL m_bLangNoneIsLangAll; - BOOL m_bWithCheckmark; + sal_Int16 m_nLangList; + sal_Bool m_bHasLangNone; + sal_Bool m_bLangNoneIsLangAll; + sal_Bool m_bWithCheckmark; SVX_DLLPRIVATE void Init(); - SVX_DLLPRIVATE USHORT ImplInsertImgEntry( const String& rEntry, USHORT nPos, bool bChecked ); - SVX_DLLPRIVATE USHORT ImplInsertLanguage(LanguageType, USHORT, sal_Int16 ); + SVX_DLLPRIVATE sal_uInt16 ImplInsertImgEntry( const String& rEntry, sal_uInt16 nPos, bool bChecked ); + SVX_DLLPRIVATE sal_uInt16 ImplInsertLanguage(LanguageType, sal_uInt16, sal_Int16 ); public: - SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck = FALSE); - SvxLanguageBox( Window* pParent, const ResId& rResId, BOOL bCheck = FALSE); + SvxLanguageBox( Window* pParent, WinBits nWinStyle, sal_Bool bCheck = sal_False); + SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool bCheck = sal_False); ~SvxLanguageBox(); - void SetLanguageList( INT16 nLangList, - BOOL bHasLangNone, BOOL bLangNoneIsLangAll = FALSE, - BOOL bCheckSpellAvail = FALSE ); + void SetLanguageList( sal_Int16 nLangList, + sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll = sal_False, + sal_Bool bCheckSpellAvail = sal_False ); - USHORT InsertLanguage( const LanguageType eLangType, USHORT nPos = LISTBOX_APPEND ); - USHORT InsertDefaultLanguage( sal_Int16 nType, USHORT nPos = LISTBOX_APPEND ); - USHORT InsertLanguage( const LanguageType eLangType, - BOOL bCheckEntry, USHORT nPos = LISTBOX_APPEND ); + sal_uInt16 InsertLanguage( const LanguageType eLangType, sal_uInt16 nPos = LISTBOX_APPEND ); + sal_uInt16 InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos = LISTBOX_APPEND ); + sal_uInt16 InsertLanguage( const LanguageType eLangType, + sal_Bool bCheckEntry, sal_uInt16 nPos = LISTBOX_APPEND ); void RemoveLanguage( const LanguageType eLangType ); - void SelectLanguage( const LanguageType eLangType, BOOL bSelect = TRUE ); + void SelectLanguage( const LanguageType eLangType, sal_Bool bSelect = sal_True ); LanguageType GetSelectLanguage() const; - BOOL IsLanguageSelected( const LanguageType eLangType ) const; + sal_Bool IsLanguageSelected( const LanguageType eLangType ) const; }; #if ENABLE_LAYOUT @@ -106,7 +106,7 @@ class SvxLanguageBoxImpl; class SVX_DLLPUBLIC SvxLanguageBox : public ListBox { public: - SvxLanguageBox( Context*, const char*, BOOL bCheck = FALSE ); + SvxLanguageBox( Context*, const char*, sal_Bool bCheck = sal_False ); ~SvxLanguageBox (); void SetLanguageList (sal_Int16 list, bool hasLangNone, bool langNoneIsLangAll=false, bool checkSpellAvailable=false); diff --git a/svx/inc/svx/lathe3d.hxx b/svx/inc/svx/lathe3d.hxx index 2657881dd9..5e5e86ab30 100644..100755 --- a/svx/inc/svx/lathe3d.hxx +++ b/svx/inc/svx/lathe3d.hxx @@ -99,12 +99,12 @@ private: sal_Bool GetCloseBack() const { return ((const Svx3DCloseBackItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_CLOSE_BACK)).GetValue(); } - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; void ReSegment(sal_uInt32 nHSegs, sal_uInt32 nVSegs); virtual void operator=(const SdrObject&); - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; // TakeObjName...() is for the display in the UI, for example "3 frames selected". virtual void TakeObjNameSingul(String& rName) const; @@ -115,7 +115,7 @@ private: const basegfx::B2DPolyPolygon& GetPolyPoly2D() { return maPolyPoly2D; } // break up - virtual BOOL IsBreakObjPossible(); + virtual sal_Bool IsBreakObjPossible(); virtual SdrAttrObj* GetBreakObj(); }; diff --git a/svx/inc/layctrl.hxx b/svx/inc/svx/layctrl.hxx index 37beb62cb3..cadf1418aa 100644..100755 --- a/svx/inc/layctrl.hxx +++ b/svx/inc/svx/layctrl.hxx @@ -45,13 +45,13 @@ public: virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); virtual SfxPopupWindow* CreatePopupWindowCascading(); - virtual void StateChanged( USHORT nSID, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); SFX_DECL_TOOLBOX_CONTROL(); - SvxTableToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxTableToolBoxControl(); }; @@ -67,10 +67,10 @@ public: SFX_DECL_TOOLBOX_CONTROL(); - SvxColumnsToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxColumnsToolBoxControl(); - virtual void StateChanged( USHORT nSID, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; diff --git a/svx/inc/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx index 8483146ab4..e5f01b6da3 100644..100755 --- a/svx/inc/lboxctrl.hxx +++ b/svx/inc/svx/lboxctrl.hxx @@ -45,7 +45,7 @@ protected: String aActionStr; SvxPopupWindowListBox * pPopupWin; - void Impl_SetInfo( USHORT nCount ); + void Impl_SetInfo( sal_uInt16 nCount ); DECL_LINK( PopupModeEndHdl, void * ); DECL_LINK( SelectHdl, void * ); @@ -53,12 +53,12 @@ protected: public: SFX_DECL_TOOLBOX_CONTROL(); - SvxListBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxListBoxControl(); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -73,10 +73,10 @@ class SVX_DLLPUBLIC SvxUndoRedoControl : public SvxListBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxUndoRedoControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxUndoRedoControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual ~SvxUndoRedoControl(); - virtual void StateChanged( USHORT nSID, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); diff --git a/svx/inc/linectrl.hxx b/svx/inc/svx/linectrl.hxx index 3045a55141..63433bbf51 100644..100755 --- a/svx/inc/linectrl.hxx +++ b/svx/inc/svx/linectrl.hxx @@ -51,15 +51,15 @@ private: XLineStyleItem* pStyleItem; XLineDashItem* pDashItem; - BOOL bUpdate; + sal_Bool bUpdate; public: SFX_DECL_TOOLBOX_CONTROL(); - SvxLineStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxLineStyleToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); void Update( const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); @@ -74,10 +74,10 @@ class SVX_DLLPUBLIC SvxLineWidthToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxLineWidthToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxLineWidthToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxLineWidthToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); }; @@ -91,10 +91,10 @@ class SVX_DLLPUBLIC SvxLineColorToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxLineColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxLineColorToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); void Update( const SfxPoolItem* pState ); virtual Window* CreateItemWindow( Window *pParent ); @@ -110,11 +110,11 @@ class SvxLineEndWindow : public SfxPopupWindow private: XLineEndList* pLineEndList; ValueSet aLineEndSet; - USHORT nCols; - USHORT nLines; - ULONG nLineEndWidth; + sal_uInt16 nCols; + sal_uInt16 nLines; + sal_uIntPtr nLineEndWidth; Size aBmpSize; - BOOL bPopupMode; + sal_Bool bPopupMode; bool mbInResize; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame; @@ -127,7 +127,7 @@ private: protected: virtual void Resizing( Size& rSize ); virtual void Resize(); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void PopupModeEnd(); /** This function is called when the window gets the focus. It grabs @@ -137,10 +137,10 @@ protected: virtual void GetFocus (void); public: - SvxLineEndWindow( USHORT nId, + SvxLineEndWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const String& rWndTitle ); - SvxLineEndWindow( USHORT nId, + SvxLineEndWindow( sal_uInt16 nId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow, const String& rWndTitle ); @@ -148,7 +148,7 @@ public: void StartSelection(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindow* Clone() const; }; @@ -161,10 +161,10 @@ class SVX_DLLPUBLIC SvxLineEndToolBoxControl : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxLineEndToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxLineEndToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); diff --git a/svx/inc/measctrl.hxx b/svx/inc/svx/measctrl.hxx index 79efb8e1d6..79efb8e1d6 100644..100755 --- a/svx/inc/measctrl.hxx +++ b/svx/inc/svx/measctrl.hxx diff --git a/svx/inc/modctrl.hxx b/svx/inc/svx/modctrl.hxx index fd4133083c..b97d1066ba 100644..100755 --- a/svx/inc/modctrl.hxx +++ b/svx/inc/svx/modctrl.hxx @@ -40,16 +40,16 @@ class SVX_DLLPUBLIC SvxModifyControl : public SfxStatusBarControl { public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rUsrEvt ); virtual void DoubleClick(); SFX_DECL_STATUSBAR_CONTROL(); - SvxModifyControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SvxModifyControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); - static ULONG GetDefItemWidth(const StatusBar& rStb); + static sal_uIntPtr GetDefItemWidth(const StatusBar& rStb); private: struct ImplData; diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx index dfc33044ad..81d5b3b2e2 100644..100755 --- a/svx/inc/svx/msdffdef.hxx +++ b/svx/inc/svx/msdffdef.hxx @@ -272,15 +272,15 @@ enum DFF_TextHeader { // Transform #define DFF_Prop_Rotation 4 // Fixed Point 16.16 degrees // Protection -#define DFF_Prop_LockRotation 119 // BOOL No rotation -#define DFF_Prop_LockAspectRatio 120 // BOOL Don't allow changes in aspect ratio -#define DFF_Prop_LockPosition 121 // BOOL Don't allow the shape to be moved -#define DFF_Prop_LockAgainstSelect 122 // BOOL Shape may not be selected -#define DFF_Prop_LockCropping 123 // BOOL No cropping this shape -#define DFF_Prop_LockVertices 124 // BOOL Edit Points not allowed -#define DFF_Prop_LockText 125 // BOOL Do not edit text -#define DFF_Prop_LockAdjustHandles 126 // BOOL Do not adjust -#define DFF_Prop_LockAgainstGrouping 127 // BOOL Do not group this shape +#define DFF_Prop_LockRotation 119 // sal_Bool No rotation +#define DFF_Prop_LockAspectRatio 120 // sal_Bool Don't allow changes in aspect ratio +#define DFF_Prop_LockPosition 121 // sal_Bool Don't allow the shape to be moved +#define DFF_Prop_LockAgainstSelect 122 // sal_Bool Shape may not be selected +#define DFF_Prop_LockCropping 123 // sal_Bool No cropping this shape +#define DFF_Prop_LockVertices 124 // sal_Bool Edit Points not allowed +#define DFF_Prop_LockText 125 // sal_Bool Do not edit text +#define DFF_Prop_LockAdjustHandles 126 // sal_Bool Do not adjust +#define DFF_Prop_LockAgainstGrouping 127 // sal_Bool Do not group this shape // Text #define DFF_Prop_lTxid 128 // LONG id for the text, value determined by the host #define DFF_Prop_dxTextLeft 129 // LONG margins relative to shape's inscribed text rectangle (in EMUs) @@ -294,11 +294,11 @@ enum DFF_TextHeader { #define DFF_Prop_cdirFont 137 // MSO_CDIR Font rotation #define DFF_Prop_hspNext 138 // MSO_HSP ID of the next shape (used by Word for linked textboxes) #define DFF_Prop_txdir 139 // MSO_TXDIR Bi-Di Text direction -#define DFF_Prop_SelectText 187 // BOOL TRUE if single click selects text, FALSE if two clicks -#define DFF_Prop_AutoTextMargin 188 // BOOL use host's margin calculations -#define DFF_Prop_RotateText 189 // BOOL Rotate text with shape -#define DFF_Prop_FitShapeToText 190 // BOOL Size shape to fit text size -#define DFF_Prop_FitTextToShape 191 // BOOL Size text to fit shape size +#define DFF_Prop_SelectText 187 // sal_Bool sal_True if single click selects text, sal_False if two clicks +#define DFF_Prop_AutoTextMargin 188 // sal_Bool use host's margin calculations +#define DFF_Prop_RotateText 189 // sal_Bool Rotate text with shape +#define DFF_Prop_FitShapeToText 190 // sal_Bool Size shape to fit text size +#define DFF_Prop_FitTextToShape 191 // sal_Bool Size text to fit shape size // GeoText #define DFF_Prop_gtextUNICODE 192 // WCHAR* UNICODE text string #define DFF_Prop_gtextRTF 193 // char* RTF text string @@ -306,22 +306,22 @@ enum DFF_TextHeader { #define DFF_Prop_gtextSize 195 // LONG default point size #define DFF_Prop_gtextSpacing 196 // LONG fixed point 16.16 #define DFF_Prop_gtextFont 197 // WCHAR* font family name -#define DFF_Prop_gtextFReverseRows 240 // BOOL 8000 Reverse row order -#define DFF_Prop_fGtext 241 // BOOL 4000 Has text effect -#define DFF_Prop_gtextFVertical 242 // BOOL 2000 Rotate characters -#define DFF_Prop_gtextFKern 243 // BOOL 1000 Kern characters -#define DFF_Prop_gtextFTight 244 // BOOL 800 Tightening or tracking -#define DFF_Prop_gtextFStretch 245 // BOOL 400 Stretch to fit shape -#define DFF_Prop_gtextFShrinkFit 246 // BOOL 200 Char bounding box -#define DFF_Prop_gtextFBestFit 247 // BOOL 100 Scale text-on-path -#define DFF_Prop_gtextFNormalize 248 // BOOL 80 Stretch char height -#define DFF_Prop_gtextFDxMeasure 249 // BOOL 40 Do not measure along path -#define DFF_Prop_gtextFBold 250 // BOOL 20 Bold font -#define DFF_Prop_gtextFItalic 251 // BOOL 10 Italic font -#define DFF_Prop_gtextFUnderline 252 // BOOL 8 Underline font -#define DFF_Prop_gtextFShadow 253 // BOOL 4 Shadow font -#define DFF_Prop_gtextFSmallcaps 254 // BOOL 2 Small caps font -#define DFF_Prop_gtextFStrikethrough 255 // BOOL 1 Strike through font +#define DFF_Prop_gtextFReverseRows 240 // sal_Bool 8000 Reverse row order +#define DFF_Prop_fGtext 241 // sal_Bool 4000 Has text effect +#define DFF_Prop_gtextFVertical 242 // sal_Bool 2000 Rotate characters +#define DFF_Prop_gtextFKern 243 // sal_Bool 1000 Kern characters +#define DFF_Prop_gtextFTight 244 // sal_Bool 800 Tightening or tracking +#define DFF_Prop_gtextFStretch 245 // sal_Bool 400 Stretch to fit shape +#define DFF_Prop_gtextFShrinkFit 246 // sal_Bool 200 Char bounding box +#define DFF_Prop_gtextFBestFit 247 // sal_Bool 100 Scale text-on-path +#define DFF_Prop_gtextFNormalize 248 // sal_Bool 80 Stretch char height +#define DFF_Prop_gtextFDxMeasure 249 // sal_Bool 40 Do not measure along path +#define DFF_Prop_gtextFBold 250 // sal_Bool 20 Bold font +#define DFF_Prop_gtextFItalic 251 // sal_Bool 10 Italic font +#define DFF_Prop_gtextFUnderline 252 // sal_Bool 8 Underline font +#define DFF_Prop_gtextFShadow 253 // sal_Bool 4 Shadow font +#define DFF_Prop_gtextFSmallcaps 254 // sal_Bool 2 Small caps font +#define DFF_Prop_gtextFStrikethrough 255 // sal_Bool 1 Strike through font // Blip #define DFF_Prop_cropFromTop 256 // LONG 16.16 fraction times total image width or height, as appropriate. #define DFF_Prop_cropFromBottom 257 // LONG @@ -341,10 +341,10 @@ enum DFF_TextHeader { #define DFF_Prop_pibPrint 271 // IMsoBlip* Blip to display when printing #define DFF_Prop_pibPrintName 272 // WCHAR* Blip file name #define DFF_Prop_pibPrintFlags 273 // MSO_BLIPFLAGS Blip flags -#define DFF_Prop_fNoHitTestPicture 316 // BOOL Do not hit test the picture -#define DFF_Prop_pictureGray 317 // BOOL grayscale display -#define DFF_Prop_pictureBiLevel 318 // BOOL bi-level display -#define DFF_Prop_pictureActive 319 // BOOL Server is active (OLE objects only) +#define DFF_Prop_fNoHitTestPicture 316 // sal_Bool Do not hit test the picture +#define DFF_Prop_pictureGray 317 // sal_Bool grayscale display +#define DFF_Prop_pictureBiLevel 318 // sal_Bool bi-level display +#define DFF_Prop_pictureActive 319 // sal_Bool Server is active (OLE objects only) // Geometry #define DFF_Prop_geoLeft 320 // LONG Defines the G (geometry) coordinate space. #define DFF_Prop_geoTop 321 // LONG @@ -370,12 +370,12 @@ enum DFF_TextHeader { #define DFF_Prop_pFormulas 342 // LONG #define DFF_Prop_textRectangles 343 // LONG #define DFF_Prop_connectorType 344 // LONG ->0=none, 1=segments, 2=custom, 3=rect -#define DFF_Prop_fShadowOK 378 // BOOL Shadow may be set -#define DFF_Prop_f3DOK 379 // BOOL 3D may be set -#define DFF_Prop_fLineOK 380 // BOOL Line style may be set -#define DFF_Prop_fGtextOK 381 // BOOL Text effect (FontWork) supported +#define DFF_Prop_fShadowOK 378 // sal_Bool Shadow may be set +#define DFF_Prop_f3DOK 379 // sal_Bool 3D may be set +#define DFF_Prop_fLineOK 380 // sal_Bool Line style may be set +#define DFF_Prop_fGtextOK 381 // sal_Bool Text effect (FontWork) supported #define DFF_Prop_fFillShadeShapeOK 382 // BOOL -#define DFF_Prop_fFillOK 383 // BOOL OK to fill the shape through the UI or VBA? +#define DFF_Prop_fFillOK 383 // sal_Bool OK to fill the shape through the UI or VBA? // FillStyle #define DFF_Prop_fillType 384 // MSO_FILLTYPE Type of fill #define DFF_Prop_fillColor 385 // MSO_CLR Foreground color @@ -406,11 +406,11 @@ enum DFF_TextHeader { #define DFF_Prop_fillShapeOriginX 410 // LONG #define DFF_Prop_fillShapeOriginY 411 // LONG #define DFF_Prop_fillShadeType 412 // MSO_SHADETYPE Type of shading, if a shaded (gradient) fill. -#define DFF_Prop_fFilled 443 // BOOL Is shape filled? -#define DFF_Prop_fHitTestFill 444 // BOOL Should we hit test fill? -#define DFF_Prop_fillShape 445 // BOOL Register pattern on shape -#define DFF_Prop_fillUseRect 446 // BOOL Use the large rect? -#define DFF_Prop_fNoFillHitTest 447 // BOOL Hit test a shape as though filled +#define DFF_Prop_fFilled 443 // sal_Bool Is shape filled? +#define DFF_Prop_fHitTestFill 444 // sal_Bool Should we hit test fill? +#define DFF_Prop_fillShape 445 // sal_Bool Register pattern on shape +#define DFF_Prop_fillUseRect 446 // sal_Bool Use the large rect? +#define DFF_Prop_fNoFillHitTest 447 // sal_Bool Hit test a shape as though filled // LineStyle #define DFF_Prop_lineColor 448 // MSO_CLR Color of line #define DFF_Prop_lineOpacity 449 // LONG Not implemented @@ -436,11 +436,11 @@ enum DFF_TextHeader { #define DFF_Prop_lineEndArrowLength 469 // MSO_LINEENDLENGTH Arrow at end #define DFF_Prop_lineJoinStyle 470 // MSO_LINEJOIN How to join lines #define DFF_Prop_lineEndCapStyle 471 // MSO_LINECAP How to end lines -#define DFF_Prop_fArrowheadsOK 507 // BOOL Allow arrowheads if prop. is set -#define DFF_Prop_fLine 508 // BOOL Any line? -#define DFF_Prop_fHitTestLine 509 // BOOL Should we hit test lines? -#define DFF_Prop_lineFillShape 510 // BOOL Register pattern on shape -#define DFF_Prop_fNoLineDrawDash 511 // BOOL Draw a dashed line if no line +#define DFF_Prop_fArrowheadsOK 507 // sal_Bool Allow arrowheads if prop. is set +#define DFF_Prop_fLine 508 // sal_Bool Any line? +#define DFF_Prop_fHitTestLine 509 // sal_Bool Should we hit test lines? +#define DFF_Prop_lineFillShape 510 // sal_Bool Register pattern on shape +#define DFF_Prop_fNoLineDrawDash 511 // sal_Bool Draw a dashed line if no line // ShadowStyle #define DFF_Prop_shadowType 512 // MSO_SHADOWTYPE Type of effect #define DFF_Prop_shadowColor 513 // MSO_CLR Foreground color @@ -460,8 +460,8 @@ enum DFF_TextHeader { #define DFF_Prop_shadowWeight 527 // LONG scaling factor #define DFF_Prop_shadowOriginX 528 // LONG #define DFF_Prop_shadowOriginY 529 // LONG -#define DFF_Prop_fShadow 574 // BOOL Any shadow? -#define DFF_Prop_fshadowObscured 575 // BOOL Excel5-style shadow +#define DFF_Prop_fShadow 574 // sal_Bool Any shadow? +#define DFF_Prop_fshadowObscured 575 // sal_Bool Excel5-style shadow // PerspectiveStyle #define DFF_Prop_perspectiveType 576 // MSO_XFORMTYPE Where transform applies #define DFF_Prop_perspectiveOffsetX 577 // LONG The LONG values define a transformation matrix, effectively, each value is scaled by the perspectiveWeight parameter. @@ -475,7 +475,7 @@ enum DFF_TextHeader { #define DFF_Prop_perspectiveWeight 585 // LONG Scaling factor #define DFF_Prop_perspectiveOriginX 586 // LONG #define DFF_Prop_perspectiveOriginY 587 // LONG -#define DFF_Prop_fPerspective 639 // BOOL On/off +#define DFF_Prop_fPerspective 639 // sal_Bool On/off // 3D Object #define DFF_Prop_c3DSpecularAmt 640 // LONG Fixed-point 16.16 #define DFF_Prop_c3DDiffuseAmt 641 // LONG Fixed-point 16.16 @@ -486,8 +486,8 @@ enum DFF_TextHeader { #define DFF_Prop_c3DExtrudePlane 646 // LONG Extrusion direction #define DFF_Prop_c3DExtrusionColor 647 // MSO_CLR Basic color of extruded part of shape; the lighting model used will determine the exact shades used when rendering. #define DFF_Prop_c3DCrMod 648 // MSO_CLR Modification for BW views -#define DFF_Prop_f3D 700 // BOOL Does this shape have a 3D effect? -#define DFF_Prop_fc3DMetallic 701 // BOOL Use metallic specularity? +#define DFF_Prop_f3D 700 // sal_Bool Does this shape have a 3D effect? +#define DFF_Prop_fc3DMetallic 701 // sal_Bool Use metallic specularity? #define DFF_Prop_fc3DUseExtrusionColor 702 // BOOL #define DFF_Prop_fc3DLightFace 703 // BOOL // 3D Style @@ -520,20 +520,20 @@ enum DFF_TextHeader { #define DFF_Prop_c3DFillIntensity 730 // LONG Fixed point intensity #define DFF_Prop_fc3DConstrainRotation 763 // BOOL #define DFF_Prop_fc3DRotationCenterAuto 764 // BOOL -#define DFF_Prop_fc3DParallel 765 // BOOL Parallel projection? -#define DFF_Prop_fc3DKeyHarsh 766 // BOOL Is key lighting harsh? -#define DFF_Prop_fc3DFillHarsh 767 // BOOL Is fill lighting harsh? +#define DFF_Prop_fc3DParallel 765 // sal_Bool Parallel projection? +#define DFF_Prop_fc3DKeyHarsh 766 // sal_Bool Is key lighting harsh? +#define DFF_Prop_fc3DFillHarsh 767 // sal_Bool Is fill lighting harsh? // Shape #define DFF_Prop_hspMaster 769 // MSO_HSP master shape #define DFF_Prop_cxstyle 771 // MSO_CXSTYLE Type of connector #define DFF_Prop_bWMode 772 // MSO_BWMODE Settings for modifications to be made when in different forms of black-and-white mode. #define DFF_Prop_bWModePureBW 773 // MSO_BWMODE #define DFF_Prop_bWModeBW 774 // MSO_BWMODE -#define DFF_Prop_fOleIcon 826 // BOOL For OLE objects, whether the object is in icon form -#define DFF_Prop_fPreferRelativeResize 827 // BOOL For UI only. Prefer relative resizing. -#define DFF_Prop_fLockShapeType 828 // BOOL Lock the shape type (don't allow Change Shape) +#define DFF_Prop_fOleIcon 826 // sal_Bool For OLE objects, whether the object is in icon form +#define DFF_Prop_fPreferRelativeResize 827 // sal_Bool For UI only. Prefer relative resizing. +#define DFF_Prop_fLockShapeType 828 // sal_Bool Lock the shape type (don't allow Change Shape) #define DFF_Prop_fDeleteAttachedObject 830 // BOOL -#define DFF_Prop_fBackground 831 // BOOL If TRUE, this is the background shape. +#define DFF_Prop_fBackground 831 // sal_Bool If sal_True, this is the background shape. // Callout #define DFF_Prop_spcot 832 // MSO_SPCOT Callout type @@ -542,13 +542,13 @@ enum DFF_TextHeader { #define DFF_Prop_spcod 835 // MSO_SPCOD Callout drop type #define DFF_Prop_dxyCalloutDropSpecified 836 // LONG if mso_spcodSpecified, the actual drop distance #define DFF_Prop_dxyCalloutLengthSpecified 837 // LONG if fCalloutLengthSpecified, the actual distance -#define DFF_Prop_fCallout 889 // BOOL Is the shape a callout? -#define DFF_Prop_fCalloutAccentBar 890 // BOOL does callout have accent bar -#define DFF_Prop_fCalloutTextBorder 891 // BOOL does callout have a text border +#define DFF_Prop_fCallout 889 // sal_Bool Is the shape a callout? +#define DFF_Prop_fCalloutAccentBar 890 // sal_Bool does callout have accent bar +#define DFF_Prop_fCalloutTextBorder 891 // sal_Bool does callout have a text border #define DFF_Prop_fCalloutMinusX 892 // BOOL #define DFF_Prop_fCalloutMinusY 893 // BOOL -#define DFF_Prop_fCalloutDropAuto 894 // BOOL If true, then we occasionally invert the drop distance -#define DFF_Prop_fCalloutLengthSpecified 895 // BOOL if true, we look at dxyCalloutLengthSpecified +#define DFF_Prop_fCalloutDropAuto 894 // sal_Bool If true, then we occasionally invert the drop distance +#define DFF_Prop_fCalloutLengthSpecified 895 // sal_Bool if true, we look at dxyCalloutLengthSpecified // GroupShape #define DFF_Prop_wzName 896 // WCHAR* Shape Name (present only if explicitly set) @@ -562,13 +562,13 @@ enum DFF_TextHeader { #define DFF_Prop_lidRegroup 904 // LONG Regroup ID #define DFF_Prop_tableProperties 927 // LONG #define DFF_Prop_tableRowProperties 928 // LONG* -#define DFF_Prop_fEditedWrap 953 // BOOL Has the wrap polygon been edited? -#define DFF_Prop_fBehindDocument 954 // BOOL Word-only (shape is behind text) -#define DFF_Prop_fOnDblClickNotify 955 // BOOL Notify client on a double click -#define DFF_Prop_fIsButton 956 // BOOL A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros. -#define DFF_Prop_fOneD 957 // BOOL 1D adjustment -#define DFF_Prop_fHidden 958 // BOOL Do not display -#define DFF_Prop_fPrint 959 // BOOL Print this shape +#define DFF_Prop_fEditedWrap 953 // sal_Bool Has the wrap polygon been edited? +#define DFF_Prop_fBehindDocument 954 // sal_Bool Word-only (shape is behind text) +#define DFF_Prop_fOnDblClickNotify 955 // sal_Bool Notify client on a double click +#define DFF_Prop_fIsButton 956 // sal_Bool A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros. +#define DFF_Prop_fOneD 957 // sal_Bool 1D adjustment +#define DFF_Prop_fHidden 958 // sal_Bool Do not display +#define DFF_Prop_fPrint 959 // sal_Bool Print this shape // entsprechende BitFlags #define DFF_PBit_EditedWrap 0x00000040 #define DFF_PBit_BehindDocument 0x00000020 @@ -1077,17 +1077,17 @@ enum MSO_LineCap { // BStore-Container // FBSE - File Blip Store Entry typedef struct _MSOF_BSE { - BYTE btWin32; // Required type on Win32 - BYTE btMacOS; // Required type on Mac - BYTE rgbUid[16]; // Identifier of blip - USHORT tag; // currently unused - ULONG size; // Blip size in stream - ULONG cRef; // Reference count on the blip - ULONG /*MSOFO*/ foDelay; // File offset in the delay stream - BYTE usage; // How this blip is used (MSOBLIPUSAGE) - BYTE cbName; // length of the blip name - BYTE unused2; // for the future - BYTE unused3; // for the future + sal_uInt8 btWin32; // Required type on Win32 + sal_uInt8 btMacOS; // Required type on Mac + sal_uInt8 rgbUid[16]; // Identifier of blip + sal_uInt16 tag; // currently unused + sal_uIntPtr size; // Blip size in stream + sal_uIntPtr cRef; // Reference count on the blip + sal_uIntPtr /*MSOFO*/ foDelay; // File offset in the delay stream + sal_uInt8 usage; // How this blip is used (MSOBLIPUSAGE) + sal_uInt8 cbName; // length of the blip name + sal_uInt8 unused2; // for the future + sal_uInt8 unused3; // for the future } MSO_FBSE; typedef enum { diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx index bf69daaa18..a7c6f958d2 100644..100755 --- a/svx/inc/svx/numfmtsh.hxx +++ b/svx/inc/svx/numfmtsh.hxx @@ -125,14 +125,14 @@ public: const String* pNumStr = NULL ); - void GetInitSettings( USHORT& nCatLbPos, + void GetInitSettings( sal_uInt16& nCatLbPos, LanguageType& rLangType, - USHORT& nFmtLbSelPos, + sal_uInt16& nFmtLbSelPos, SvStrings& rFmtEntries, String& rPrevString, Color*& rpPrevColor ); - void CategoryChanged( USHORT nCatLbPos, + void CategoryChanged( sal_uInt16 nCatLbPos, short& rFmtSelPos, SvStrings& rFmtEntries ); @@ -140,34 +140,34 @@ public: short& rFmtSelPos, SvStrings& rFmtEntries ); - void FormatChanged( USHORT nFmtLbPos, + void FormatChanged( sal_uInt16 nFmtLbPos, String& rPreviewStr, Color*& rpFontColor ); - BOOL AddFormat( String& rFormat, + sal_Bool AddFormat( String& rFormat, xub_StrLen& rErrPos, - USHORT& rCatLbSelPos, + sal_uInt16& rCatLbSelPos, short& rFmtSelPos, SvStrings& rFmtEntries ); - BOOL RemoveFormat( const String& rFormat, - USHORT& rCatLbSelPos, + sal_Bool RemoveFormat( const String& rFormat, + sal_uInt16& rCatLbSelPos, short& rFmtSelPos, SvStrings& rFmtEntries ); void MakeFormat( String& rFormat, - BOOL bThousand, - BOOL bNegRed, - USHORT nPrecision, - USHORT nLeadingZeroes, - USHORT nCurrencyEntryPos); + sal_Bool bThousand, + sal_Bool bNegRed, + sal_uInt16 nPrecision, + sal_uInt16 nLeadingZeroes, + sal_uInt16 nCurrencyEntryPos); void GetOptions( const String& rFormat, - BOOL& rThousand, - BOOL& rNegRed, - USHORT& rPrecision, - USHORT& rLeadingZeroes, - USHORT& rCatLbPos ); + sal_Bool& rThousand, + sal_Bool& rNegRed, + sal_uInt16& rPrecision, + sal_uInt16& rLeadingZeroes, + sal_uInt16& rCatLbPos ); void MakePreviewString( const String& rFormatStr, String& rPreviewStr, @@ -178,11 +178,11 @@ public: Color*& rpFontColor, double nValue); - BOOL IsUserDefined( const String& rFmtString ); - BOOL IsTmpCurrencyFormat( const String& rFmtString ); - BOOL FindEntry( const String& rFmtString, sal_uInt32* pAt = NULL ); + sal_Bool IsUserDefined( const String& rFmtString ); + sal_Bool IsTmpCurrencyFormat( const String& rFmtString ); + sal_Bool FindEntry( const String& rFmtString, sal_uInt32* pAt = NULL ); - void ValidateNewEntries( BOOL bValidate = TRUE ) { bUndoAddList = !bValidate; } + void ValidateNewEntries( sal_Bool bValidate = sal_True ) { bUndoAddList = !bValidate; } sal_uInt32 GetUpdateDataCount() const; void GetUpdateData( sal_uInt32* pDelArray, const sal_uInt32 nSize ); @@ -197,25 +197,25 @@ public: String GetComment4Entry(short nEntry); short GetCategory4Entry(short nEntry); - BOOL GetUserDefined4Entry(short nEntry); + sal_Bool GetUserDefined4Entry(short nEntry); String GetFormat4Entry(short nEntry); void SetComment4Entry(short nEntry,String aCommentString); - BOOL IsBankingSymbol(USHORT nPos); - void SetCurrencySymbol(USHORT nPos); + sal_Bool IsBankingSymbol(sal_uInt16 nPos); + void SetCurrencySymbol(sal_uInt16 nPos); sal_uInt32 GetCurrencySymbol(); - USHORT FindCurrencyFormat( const String& rFmtString ); - USHORT FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,BOOL bTmpBanking); + sal_uInt16 FindCurrencyFormat( const String& rFmtString ); + sal_uInt16 FindCurrencyFormat(const NfCurrencyEntry* pTmpCurrencyEntry,sal_Bool bTmpBanking); NfCurrencyEntry* GetCurCurrencyEntry(); void SetCurCurrencyEntry(NfCurrencyEntry*); short GetListPos4Entry(sal_uInt32 nIdx); short GetListPos4Entry( const String& rFmtString ); - void GetCurrencySymbols( SvStringsDtor& rList, USHORT* pPos ); - void GetCurrencySymbols( SvStringsDtor& rList, BOOL bFlag ); + void GetCurrencySymbols( SvStringsDtor& rList, sal_uInt16* pPos ); + void GetCurrencySymbols( SvStringsDtor& rList, sal_Bool bFlag ); - USHORT FindCurrencyTableEntry( const String& rFmtString, BOOL &bTestBanking ); - BOOL IsInTable(USHORT nPos,BOOL bTmpBanking,const String &rFmtString); + sal_uInt16 FindCurrencyTableEntry( const String& rFmtString, sal_Bool &bTestBanking ); + sal_Bool IsInTable(sal_uInt16 nPos,sal_Bool bTmpBanking,const String &rFmtString); void GetCurrencyFormats(SvStrings& rList); @@ -227,7 +227,7 @@ private: SvxNumberValueType eValType; String aValStr; double nValNum; - BOOL bUndoAddList; + sal_Bool bUndoAddList; SvULongs aAddList; SvULongs aDelList; SvULongs aCurEntryList; @@ -237,13 +237,13 @@ private: LanguageType eCurLanguage; SvUShorts aCurCurrencyList; NfCurrencyEntry* pCurCurrencyEntry; - BOOL bBankingSymbol; - USHORT nCurCurrencyEntryPos; + sal_Bool bBankingSymbol; + sal_uInt16 nCurCurrencyEntryPos; SvStrings aCurrencyFormatList; #ifdef _SVX_NUMFMTSH_CXX SVX_DLLPRIVATE short FillEntryList_Impl( SvStrings& rList ); - SVX_DLLPRIVATE void FillEListWithStd_Impl( SvStrings& rList,USHORT aPrivCat, short &Pos); + SVX_DLLPRIVATE void FillEListWithStd_Impl( SvStrings& rList,sal_uInt16 aPrivCat, short &Pos); SVX_DLLPRIVATE short FillEListWithFormats_Impl( SvStrings& rList,short nSelPos, NfIndexTableOffset eOffsetStart, NfIndexTableOffset eOffsetEnd); @@ -255,12 +255,12 @@ private: SVX_DLLPRIVATE short FillEListWithUserCurrencys( SvStrings& rList,short nSelPos); SVX_DLLPRIVATE short FillEListWithUsD_Impl( SvStrings& rList, sal_uInt16 nPrivCat, short Pos ); - SVX_DLLPRIVATE BOOL IsRemoved_Impl( sal_uInt32 nKey ); - SVX_DLLPRIVATE BOOL IsAdded_Impl( sal_uInt32 nKey ); + SVX_DLLPRIVATE sal_Bool IsRemoved_Impl( sal_uInt32 nKey ); + SVX_DLLPRIVATE sal_Bool IsAdded_Impl( sal_uInt32 nKey ); SVX_DLLPRIVATE void GetPreviewString_Impl( String& rString, Color*& rpColor ); - SVX_DLLPRIVATE void PosToCategory_Impl( USHORT nPos, short& rCategory ); - SVX_DLLPRIVATE void CategoryToPos_Impl( short nCategory, USHORT& rPos ); + SVX_DLLPRIVATE void PosToCategory_Impl( sal_uInt16 nPos, short& rCategory ); + SVX_DLLPRIVATE void CategoryToPos_Impl( short nCategory, sal_uInt16& rPos ); #endif }; diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx index 0ecde44dc5..4cc6b26713 100644..100755 --- a/svx/inc/svx/numinf.hxx +++ b/svx/inc/svx/numinf.hxx @@ -47,23 +47,23 @@ class SVX_DLLPUBLIC SvxNumberInfoItem : public SfxPoolItem public: TYPEINFO(); - SvxNumberInfoItem( const USHORT nId ); + SvxNumberInfoItem( const sal_uInt16 nId ); SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, - const USHORT nId ); + const sal_uInt16 nId ); SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const String& rVal, - const USHORT nId ); + const sal_uInt16 nId ); SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, - const USHORT nId ); + const sal_uInt16 nId ); // if both double and String are supplied, String is used for text formats SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, - const String& rValueStr, const USHORT nId ); + const String& rValueStr, const sal_uInt16 nId ); SvxNumberInfoItem( const SvxNumberInfoItem& ); ~SvxNumberInfoItem(); virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVer ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const; + virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/numvset.hxx b/svx/inc/svx/numvset.hxx index 69600123d4..498ea28af9 100644..100755 --- a/svx/inc/numvset.hxx +++ b/svx/inc/svx/numvset.hxx @@ -56,14 +56,14 @@ class SvxNumRule; struct SvxBmpItemInfo { SvxBrushItem* pBrushItem; - USHORT nItemId; + sal_uInt16 nItemId; }; class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet { Color aLineColor; - USHORT nPageType; - BOOL bHTMLMode; + sal_uInt16 nPageType; + sal_Bool bHTMLMode; Rectangle aOrgRect; VirtualDevice* pVDev; @@ -78,12 +78,12 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess> > aOutlineSettings; public: - SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nType ); + SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType ); ~SvxNumValueSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); - void SetHTMLMode(BOOL bSet) {bHTMLMode = bSet;} + void SetHTMLMode(sal_Bool bSet) {bHTMLMode = bSet;} void SetNumberingSettings( const com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< @@ -103,13 +103,13 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet { String sBullets; Timer aFormatTimer; - BOOL bGrfNotFound; + sal_Bool bGrfNotFound; protected: DECL_LINK(FormatHdl_Impl, Timer*); - void SetGrfNotFound(BOOL bSet) {bGrfNotFound = bSet;} - BOOL IsGrfNotFound()const {return bGrfNotFound;} + void SetGrfNotFound(sal_Bool bSet) {bGrfNotFound = bSet;} + sal_Bool IsGrfNotFound()const {return bGrfNotFound;} Timer& GetFormatTimer() {return aFormatTimer;} @@ -127,8 +127,8 @@ class SvxNumberingPreview : public Window Font aStdFont; long nPageWidth; const String* pOutlineNames; - BOOL bPosition; - UINT16 nActLevel; + sal_Bool bPosition; + sal_uInt16 nActLevel; protected: virtual void Paint( const Rectangle& rRect ); @@ -136,7 +136,7 @@ class SvxNumberingPreview : public Window public: SvxNumberingPreview(Window* pParent, const ResId& rResId ) : Window(pParent, rResId), - pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(FALSE), nActLevel(USHRT_MAX) + pActNum(0),nPageWidth(0), pOutlineNames(0), bPosition(sal_False), nActLevel(USHRT_MAX) { SetBorderStyle( WINDOW_BORDER_MONO ); } void SetNumRule(const SvxNumRule* pNum) @@ -146,8 +146,8 @@ class SvxNumberingPreview : public Window void SetOutlineNames(const String* pNames) {pOutlineNames = pNames;} void SetPositionMode() - { bPosition = TRUE;} - void SetLevel(USHORT nSet) {nActLevel = nSet;} + { bPosition = sal_True;} + void SetLevel(sal_uInt16 nSet) {nActLevel = nSet;} }; diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx index 3dd361b215..953a9cd8c8 100644..100755 --- a/svx/inc/svx/obj3d.hxx +++ b/svx/inc/svx/obj3d.hxx @@ -93,10 +93,10 @@ public: SVX_DLLPUBLIC E3dObjList(const E3dObjList& rSrcList); SVX_DLLPUBLIC virtual ~E3dObjList(); - virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL); - virtual void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL); - virtual SdrObject* NbcRemoveObject(ULONG nObjNum); - virtual SdrObject* RemoveObject(ULONG nObjNum); + virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL); + virtual void InsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND, const SdrInsertReason* pReason=NULL); + virtual SdrObject* NbcRemoveObject(sal_uIntPtr nObjNum); + virtual SdrObject* RemoveObject(sal_uIntPtr nObjNum); }; /************************************************************************* @@ -142,7 +142,7 @@ protected: // and no instances should be created from anyone, so i move the constructors // to protected area E3dObject(); - E3dObject(BOOL bIsFromChart); + E3dObject(sal_Bool bIsFromChart); public: TYPEINFO(); @@ -151,8 +151,8 @@ public: virtual ~E3dObject(); - virtual UINT32 GetObjInventor() const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt32 GetObjInventor() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; @@ -195,7 +195,7 @@ public: // TakeObjName...() is for the display in the UI, for example "3 frames selected". virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; - USHORT GetLogicalGroup() { return 0; } + sal_uInt16 GetLogicalGroup() { return 0; } virtual void operator=(const SdrObject&); virtual SdrObjGeoData *NewGeoData() const; @@ -207,7 +207,7 @@ public: void SetSelected(bool bNew); // break up - virtual BOOL IsBreakObjPossible(); + virtual sal_Bool IsBreakObjPossible(); virtual SdrAttrObj* GetBreakObj(); }; @@ -257,28 +257,28 @@ public : virtual sal_uInt32 GetHdlCount() const; virtual void AddToHdlList(SdrHdlList& rHdlList) const; - // DoubleSided: TRUE/FALSE - BOOL GetDoubleSided() const + // DoubleSided: sal_True/FALSE + sal_Bool GetDoubleSided() const { return ((const Svx3DDoubleSidedItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue(); } - // NormalsKind: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE + // NormalsKind: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE sal_uInt16 GetNormalsKind() const { return ((const Svx3DNormalsKindItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue(); } - // NormalsInvert: TRUE/FALSE - BOOL GetNormalsInvert() const + // NormalsInvert: sal_True/FALSE + sal_Bool GetNormalsInvert() const { return ((const Svx3DNormalsInvertItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue(); } - // TextureProjX: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE + // TextureProjX: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE sal_uInt16 GetTextureProjectionX() const { return ((const Svx3DTextureProjectionXItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue(); } - // TextureProjY: 0 == FALSE/FALSE, 1 == TRUE/FALSE, else == TRUE/TRUE + // TextureProjY: 0 == sal_False/sal_False, 1 == sal_True/sal_False, else == sal_True/TRUE sal_uInt16 GetTextureProjectionY() const { return ((const Svx3DTextureProjectionYItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue(); } - // Shadow3D: TRUE/FALSE - BOOL GetShadow3D() const + // Shadow3D: sal_True/FALSE + sal_Bool GetShadow3D() const { return ((const Svx3DShadow3DItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue(); } // MaterialColor: Color @@ -297,24 +297,24 @@ public : sal_uInt16 GetMaterialSpecularIntensity() const { return ((const Svx3DMaterialSpecularIntensityItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue(); } - // TextureFilter: TRUE/FALSE - BOOL GetTextureFilter() const + // TextureFilter: sal_True/FALSE + sal_Bool GetTextureFilter() const { return ((const Svx3DTextureFilterItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue(); } // #i28528# // Added extra Item (Bool) for chart2 to be able to show reduced line geometry - BOOL GetReducedLineGeometry() const + sal_Bool GetReducedLineGeometry() const { return ((const Svx3DReducedLineGeometryItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY)).GetValue(); } - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void RecalcSnapRect(); // set/get parameters for geometry creation - BOOL GetCreateNormals() const { return bCreateNormals; } - void SetCreateNormals(BOOL bNew); + sal_Bool GetCreateNormals() const { return bCreateNormals; } + void SetCreateNormals(sal_Bool bNew); - BOOL GetCreateTexture() const { return bCreateTexture; } - void SetCreateTexture(BOOL bNew); + sal_Bool GetCreateTexture() const { return bCreateTexture; } + void SetCreateTexture(sal_Bool bNew); // copy operator virtual void operator=(const SdrObject&); diff --git a/svx/inc/objfac3d.hxx b/svx/inc/svx/objfac3d.hxx index 9cb7ecb526..9cb7ecb526 100644..100755 --- a/svx/inc/objfac3d.hxx +++ b/svx/inc/svx/objfac3d.hxx diff --git a/svx/inc/ofaitem.hxx b/svx/inc/svx/ofaitem.hxx index 766c8ee776..b56512c1fa 100644..100755 --- a/svx/inc/ofaitem.hxx +++ b/svx/inc/svx/ofaitem.hxx @@ -41,7 +41,7 @@ private: void* pPtr; public: - OfaPtrItem( USHORT nWhich, void *pPtr ); + OfaPtrItem( sal_uInt16 nWhich, void *pPtr ); OfaPtrItem( const OfaPtrItem& ); virtual int operator==( const SfxPoolItem& ) const; diff --git a/svx/inc/optgenrl.hxx b/svx/inc/svx/optgenrl.hxx index 85efb6104a..a51add08b1 100644..100755 --- a/svx/inc/optgenrl.hxx +++ b/svx/inc/svx/optgenrl.hxx @@ -29,22 +29,22 @@ #define _SVX_OPTGENRL_HXX // Defines for setting the focus of a Edit via a slot from external. -#define UNKNOWN_EDIT ((USHORT)0) -#define COMPANY_EDIT ((USHORT)1) -#define FIRSTNAME_EDIT ((USHORT)2) -#define LASTNAME_EDIT ((USHORT)3) -#define STREET_EDIT ((USHORT)4) -#define COUNTRY_EDIT ((USHORT)5) -#define PLZ_EDIT ((USHORT)6) -#define CITY_EDIT ((USHORT)7) -#define STATE_EDIT ((USHORT)8) -#define TITLE_EDIT ((USHORT)9) -#define POSITION_EDIT ((USHORT)10) -#define SHORTNAME_EDIT ((USHORT)11) -#define TELPRIV_EDIT ((USHORT)12) -#define TELCOMPANY_EDIT ((USHORT)13) -#define FAX_EDIT ((USHORT)14) -#define EMAIL_EDIT ((USHORT)15) +#define UNKNOWN_EDIT ((sal_uInt16)0) +#define COMPANY_EDIT ((sal_uInt16)1) +#define FIRSTNAME_EDIT ((sal_uInt16)2) +#define LASTNAME_EDIT ((sal_uInt16)3) +#define STREET_EDIT ((sal_uInt16)4) +#define COUNTRY_EDIT ((sal_uInt16)5) +#define PLZ_EDIT ((sal_uInt16)6) +#define CITY_EDIT ((sal_uInt16)7) +#define STATE_EDIT ((sal_uInt16)8) +#define TITLE_EDIT ((sal_uInt16)9) +#define POSITION_EDIT ((sal_uInt16)10) +#define SHORTNAME_EDIT ((sal_uInt16)11) +#define TELPRIV_EDIT ((sal_uInt16)12) +#define TELCOMPANY_EDIT ((sal_uInt16)13) +#define FAX_EDIT ((sal_uInt16)14) +#define EMAIL_EDIT ((sal_uInt16)15) #endif // #ifndef _SVX_OPTGENRL_HXX diff --git a/svx/inc/optgrid.hxx b/svx/inc/svx/optgrid.hxx index f10267b02f..293a592127 100644..100755 --- a/svx/inc/optgrid.hxx +++ b/svx/inc/svx/optgrid.hxx @@ -44,42 +44,42 @@ class SvxGridTabPage; class SVX_DLLPUBLIC SvxOptionsGrid { protected: - UINT32 nFldDrawX; - UINT32 nFldDivisionX; - UINT32 nFldDrawY; - UINT32 nFldDivisionY; - UINT32 nFldSnapX; - UINT32 nFldSnapY; - BOOL bUseGridsnap:1; - BOOL bSynchronize:1; - BOOL bGridVisible:1; - BOOL bEqualGrid: 1; + sal_uInt32 nFldDrawX; + sal_uInt32 nFldDivisionX; + sal_uInt32 nFldDrawY; + sal_uInt32 nFldDivisionY; + sal_uInt32 nFldSnapX; + sal_uInt32 nFldSnapY; + sal_Bool bUseGridsnap:1; + sal_Bool bSynchronize:1; + sal_Bool bGridVisible:1; + sal_Bool bEqualGrid: 1; public: SvxOptionsGrid(); ~SvxOptionsGrid(); - void SetFldDrawX( UINT32 nSet){nFldDrawX = nSet;} - void SetFldDivisionX(UINT32 nSet){nFldDivisionX = nSet;} - void SetFldDrawY ( UINT32 nSet){nFldDrawY = nSet;} - void SetFldDivisionY(UINT32 nSet){nFldDivisionY = nSet;} - void SetFldSnapX( UINT32 nSet){nFldSnapX = nSet;} - void SetFldSnapY ( UINT32 nSet){nFldSnapY = nSet;} - void SetUseGridSnap( BOOL bSet ) {bUseGridsnap = bSet;} - void SetSynchronize( BOOL bSet ) {bSynchronize = bSet;} - void SetGridVisible( BOOL bSet ) {bGridVisible = bSet;} - void SetEqualGrid( BOOL bSet ) {bEqualGrid = bSet;} - - UINT32 GetFldDrawX( ) const { return nFldDrawX; } - UINT32 GetFldDivisionX() const { return nFldDivisionX;} - UINT32 GetFldDrawY ( ) const { return nFldDrawY; } - UINT32 GetFldDivisionY() const { return nFldDivisionY;} - UINT32 GetFldSnapX( ) const { return nFldSnapX; } - UINT32 GetFldSnapY ( ) const { return nFldSnapY; } - BOOL GetUseGridSnap( ) const { return bUseGridsnap; } - BOOL GetSynchronize( ) const { return bSynchronize; } - BOOL GetGridVisible( ) const { return bGridVisible; } - BOOL GetEqualGrid() const { return bEqualGrid; } + void SetFldDrawX( sal_uInt32 nSet){nFldDrawX = nSet;} + void SetFldDivisionX(sal_uInt32 nSet){nFldDivisionX = nSet;} + void SetFldDrawY ( sal_uInt32 nSet){nFldDrawY = nSet;} + void SetFldDivisionY(sal_uInt32 nSet){nFldDivisionY = nSet;} + void SetFldSnapX( sal_uInt32 nSet){nFldSnapX = nSet;} + void SetFldSnapY ( sal_uInt32 nSet){nFldSnapY = nSet;} + void SetUseGridSnap( sal_Bool bSet ) {bUseGridsnap = bSet;} + void SetSynchronize( sal_Bool bSet ) {bSynchronize = bSet;} + void SetGridVisible( sal_Bool bSet ) {bGridVisible = bSet;} + void SetEqualGrid( sal_Bool bSet ) {bEqualGrid = bSet;} + + sal_uInt32 GetFldDrawX( ) const { return nFldDrawX; } + sal_uInt32 GetFldDivisionX() const { return nFldDivisionX;} + sal_uInt32 GetFldDrawY ( ) const { return nFldDrawY; } + sal_uInt32 GetFldDivisionY() const { return nFldDivisionY;} + sal_uInt32 GetFldSnapX( ) const { return nFldSnapX; } + sal_uInt32 GetFldSnapY ( ) const { return nFldSnapY; } + sal_Bool GetUseGridSnap( ) const { return bUseGridsnap; } + sal_Bool GetSynchronize( ) const { return bSynchronize; } + sal_Bool GetGridVisible( ) const { return bGridVisible; } + sal_Bool GetEqualGrid() const { return bEqualGrid; } }; // class SvxGridItem ----------------------------------------------------- @@ -90,7 +90,7 @@ class SVX_DLLPUBLIC SvxGridItem : public SvxOptionsGrid, public SfxPoolItem friend class SvxGridTabPage; public: - SvxGridItem( USHORT _nWhich) : SfxPoolItem(_nWhich){}; + SvxGridItem( sal_uInt16 _nWhich) : SfxPoolItem(_nWhich){}; SvxGridItem( const SvxGridItem& pTestItem ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -115,7 +115,7 @@ public: static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet ); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void ActivatePage( const SfxItemSet& rSet ); @@ -164,7 +164,7 @@ protected: MetricField aMtrFldBezAngle; private: - BOOL bAttrModified; + sal_Bool bAttrModified; #ifdef _SVX_OPTGRID_CXX DECL_LINK( ClickRotateHdl_Impl, void * ); diff --git a/svx/inc/orienthelper.hxx b/svx/inc/svx/orienthelper.hxx index 0b315add63..0b315add63 100644..100755 --- a/svx/inc/orienthelper.hxx +++ b/svx/inc/svx/orienthelper.hxx diff --git a/svx/inc/svx/pagectrl.hxx b/svx/inc/svx/pagectrl.hxx index 0f35022d5c..a8bab4dbb5 100644..100755 --- a/svx/inc/svx/pagectrl.hxx +++ b/svx/inc/svx/pagectrl.hxx @@ -70,13 +70,13 @@ private: Color aFtColor; SvxBoxItem* pFtBorder; - BOOL bFooter :1; - BOOL bHeader :1; - BOOL bTable :1; - BOOL bHorz :1; - BOOL bVert :1; + sal_Bool bFooter :1; + sal_Bool bHeader :1; + sal_Bool bTable :1; + sal_Bool bHorz :1; + sal_Bool bVert :1; - USHORT eUsage; + sal_uInt16 eUsage; String aLeftText; String aRightText; @@ -85,8 +85,8 @@ protected: virtual void Paint( const Rectangle& rRect ); virtual void DrawPage( const Point& rPoint, - const BOOL bSecond, - const BOOL bEnabled ); + const sal_Bool bSecond, + const sal_Bool bEnabled ); public: SvxPageWindow( Window* pParent, const ResId& rId ); @@ -144,20 +144,20 @@ public: const Color& GetFtColor() const { return aFtColor; } const SvxBoxItem& GetFtBorder() const { return *pFtBorder; } - void SetUsage( USHORT eU ) { eUsage = eU; } - USHORT GetUsage() const { return eUsage;} + void SetUsage( sal_uInt16 eU ) { eUsage = eU; } + sal_uInt16 GetUsage() const { return eUsage;} - void SetHeader( BOOL bNew ) { bHeader = bNew; } - BOOL GetHeader() const { return bHeader;} - void SetFooter( BOOL bNew ) { bFooter = bNew; } - BOOL GetFooter() const { return bFooter;} + void SetHeader( sal_Bool bNew ) { bHeader = bNew; } + sal_Bool GetHeader() const { return bHeader;} + void SetFooter( sal_Bool bNew ) { bFooter = bNew; } + sal_Bool GetFooter() const { return bFooter;} - void SetTable( BOOL bNew ) { bTable = bNew; } - BOOL GetTable() const { return bTable;} - void SetHorz( BOOL bNew ) { bHorz = bNew; } - BOOL GetHorz() const { return bHorz;} - void SetVert( BOOL bNew ) { bVert = bNew; } - BOOL GetVert() const { return bVert;} + void SetTable( sal_Bool bNew ) { bTable = bNew; } + sal_Bool GetTable() const { return bTable;} + void SetHorz( sal_Bool bNew ) { bHorz = bNew; } + sal_Bool GetHorz() const { return bHorz;} + void SetVert( sal_Bool bNew ) { bVert = bNew; } + sal_Bool GetVert() const { return bVert;} void EnableFrameDirection(sal_Bool bEnable); //uses enum SvxFrameDirection diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx index 68d774674a..20bfd03ac5 100644..100755 --- a/svx/inc/svx/pageitem.hxx +++ b/svx/inc/svx/pageitem.hxx @@ -75,13 +75,13 @@ class SVX_DLLPUBLIC SvxPageItem: public SfxPoolItem private: String aDescName; // name of the template SvxNumType eNumType; // enumeration - BOOL bLandscape; // portrait / landscape - USHORT eUse; // layout + sal_Bool bLandscape; // Portrait / Landscape + sal_uInt16 eUse; // Layout public: TYPEINFO(); - SvxPageItem( const USHORT nId ); + SvxPageItem( const sal_uInt16 nId ); SvxPageItem( const SvxPageItem& rItem ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -92,17 +92,17 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual SfxPoolItem* Create( SvStream&, USHORT ) const; - virtual SvStream& Store( SvStream& , USHORT nItemVersion ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 ) const; + virtual SvStream& Store( SvStream& , sal_uInt16 nItemVersion ) const; // orientation - USHORT GetPageUsage() const { return eUse; } - void SetPageUsage(USHORT eU) { eUse= eU; } + sal_uInt16 GetPageUsage() const { return eUse; } + void SetPageUsage(sal_uInt16 eU) { eUse= eU; } - BOOL IsLandscape() const { return bLandscape; } - void SetLandscape(BOOL bL) { bLandscape = bL; } + sal_Bool IsLandscape() const { return bLandscape; } + void SetLandscape(sal_Bool bL) { bLandscape = bL; } // enumeration SvxNumType GetNumType() const { return eNumType; } @@ -122,9 +122,9 @@ public: class SVX_DLLPUBLIC SvxSetItem: public SfxSetItem { public: - SvxSetItem( const USHORT nId, const SfxItemSet& rSet ); + SvxSetItem( const sal_uInt16 nId, const SfxItemSet& rSet ); SvxSetItem( const SvxSetItem& rItem ); - SvxSetItem( const USHORT nId, SfxItemSet* pSet ); + SvxSetItem( const sal_uInt16 nId, SfxItemSet* pSet ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -133,8 +133,8 @@ public: SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual SfxPoolItem* Create( SvStream&, USHORT nVersion ) const; - virtual SvStream& Store( SvStream&, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream&, sal_uInt16 nVersion ) const; + virtual SvStream& Store( SvStream&, sal_uInt16 nItemVersion ) const; }; diff --git a/svx/inc/svx/paraprev.hxx b/svx/inc/svx/paraprev.hxx index 70f5aa720d..e2d615b7a3 100644..100755 --- a/svx/inc/svx/paraprev.hxx +++ b/svx/inc/svx/paraprev.hxx @@ -60,15 +60,15 @@ private: long nRightMargin; short nFirstLineOfst; // distances - USHORT nUpper; - USHORT nLower; + sal_uInt16 nUpper; + sal_uInt16 nLower; // adjustment SvxAdjust eAdjust; // last line in justification SvxAdjust eLastLine; // line distance SvxPrevLineSpace eLine; - USHORT nLineVal; + sal_uInt16 nLineVal; String aText; Rectangle Lines[9]; @@ -76,7 +76,7 @@ private: protected: virtual void Paint( const Rectangle& rRect ); - void DrawParagraph( BOOL bAll ); + void DrawParagraph( sal_Bool bAll ); public: SvxParaPrevWindow( Window* pParent, const ResId& rId ); @@ -84,11 +84,11 @@ public: void SetFirstLineOfst( short nNew ) { nFirstLineOfst = nNew; } void SetLeftMargin( long nNew ) { nLeftMargin = nNew; } void SetRightMargin( long nNew ) { nRightMargin = nNew; } - void SetUpper( USHORT nNew ) { nUpper = nNew; } - void SetLower( USHORT nNew ) { nLower = nNew; } + void SetUpper( sal_uInt16 nNew ) { nUpper = nNew; } + void SetLower( sal_uInt16 nNew ) { nLower = nNew; } void SetAdjust( SvxAdjust eNew ) { eAdjust = eNew; } void SetLastLine( SvxAdjust eNew ) { eLastLine = eNew; } - void SetLineSpace( SvxPrevLineSpace eNew, USHORT nNew = 0 ) + void SetLineSpace( SvxPrevLineSpace eNew, sal_uInt16 nNew = 0 ) { eLine = eNew; nLineVal = nNew; } void SetText( const String& rStr ) { aText = rStr; } void SetSize( Size aNew ) { aSize = aNew; } @@ -96,18 +96,18 @@ public: short GetFirstLineOfst() const { return nFirstLineOfst; } long GetLeftMargin() const { return nLeftMargin; } long GetRightMargin() const { return nRightMargin; } - USHORT GetUpper() const { return nUpper; } - USHORT GetLower() const { return nLower; } + sal_uInt16 GetUpper() const { return nUpper; } + sal_uInt16 GetLower() const { return nLower; } SvxAdjust GetAdjust() const { return eAdjust; } SvxPrevLineSpace GetLineEnum() const { return eLine; } - USHORT GetLineValue() const { return nLineVal; } + sal_uInt16 GetLineValue() const { return nLineVal; } String GetText() const { return aText; } Size GetSize() const { return aSize; } void OutputSizeChanged(); - void Draw( BOOL bAll ) { DrawParagraph( bAll ); } + void Draw( sal_Bool bAll ) { DrawParagraph( bAll ); } }; #endif diff --git a/svx/inc/passwd.hxx b/svx/inc/svx/passwd.hxx index 5913851720..9082a09ca8 100644..100755 --- a/svx/inc/passwd.hxx +++ b/svx/inc/svx/passwd.hxx @@ -61,13 +61,13 @@ private: Link aCheckPasswordHdl; - BOOL bEmpty; + sal_Bool bEmpty; DECL_LINK( ButtonHdl, OKButton * ); DECL_LINK( EditModifyHdl, Edit * ); public: - SvxPasswordDialog( Window* pParent, BOOL bAllowEmptyPasswords = FALSE, BOOL bDisableOldPassword = FALSE ); + SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPasswords = sal_False, sal_Bool bDisableOldPassword = sal_False ); ~SvxPasswordDialog(); String GetOldPassword() const { return aOldPasswdED.GetText(); } diff --git a/svx/inc/pfiledlg.hxx b/svx/inc/svx/pfiledlg.hxx index 86f47c4136..9b6a5b0df0 100644..100755 --- a/svx/inc/pfiledlg.hxx +++ b/svx/inc/svx/pfiledlg.hxx @@ -47,16 +47,14 @@ private: public: // with nKind = SID_INSERT_SOUND or // nKind = SID_INSERT_VIDEO - SvxPluginFileDlg (Window *pParent, USHORT nKind ); + SvxPluginFileDlg (Window *pParent, sal_uInt16 nKind ); ~SvxPluginFileDlg (); ErrCode Execute(); String GetPath() const; - static bool IsAvailable (USHORT nKind); + static bool IsAvailable (sal_uInt16 nKind); - // setting HelpId and/or context of FileDialogHelper - void SetDialogHelpId( const sal_Int32 nHelpId ); void SetContext( sfx2::FileDialogHelper::Context eNewContext ); }; diff --git a/svx/inc/svx/polygn3d.hxx b/svx/inc/svx/polygn3d.hxx index e36b1dd84e..907cb69ecb 100644..100755 --- a/svx/inc/svx/polygn3d.hxx +++ b/svx/inc/svx/polygn3d.hxx @@ -39,7 +39,7 @@ private: basegfx::B3DPolyPolygon aPolyPoly3D; basegfx::B3DPolyPolygon aPolyNormals3D; basegfx::B2DPolyPolygon aPolyTexture2D; - BOOL bLineOnly; + sal_Bool bLineOnly; SVX_DLLPRIVATE void CreateDefaultNormals(); SVX_DLLPRIVATE void CreateDefaultTexture(); @@ -57,18 +57,18 @@ public: E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, - BOOL bLinOnly=FALSE); + sal_Bool bLinOnly=sal_False); E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, const basegfx::B3DPolyPolygon& rPolyNormals3D, - BOOL bLinOnly=FALSE); + sal_Bool bLinOnly=sal_False); E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, const basegfx::B3DPolyPolygon& rPolyNormals3D, const basegfx::B2DPolyPolygon& rPolyTexture2D, - BOOL bLinOnly=FALSE); + sal_Bool bLinOnly=sal_False); E3dPolygonObj(); virtual ~E3dPolygonObj(); @@ -77,14 +77,14 @@ public: const basegfx::B3DPolyPolygon& GetPolyNormals3D() const { return aPolyNormals3D; } const basegfx::B2DPolyPolygon& GetPolyTexture2D() const { return aPolyTexture2D; } - virtual UINT16 GetObjIdentifier() const; - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual sal_uInt16 GetObjIdentifier() const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual void operator=(const SdrObject&); // LineOnly? - BOOL GetLineOnly() { return bLineOnly; } - void SetLineOnly(BOOL bNew); + sal_Bool GetLineOnly() { return bLineOnly; } + void SetLineOnly(sal_Bool bNew); }; #endif // _E3D_POLYGON3D_HXX diff --git a/svx/inc/svx/polypolygoneditor.hxx b/svx/inc/svx/polypolygoneditor.hxx index 1fc8ba162e..1fc8ba162e 100644..100755 --- a/svx/inc/svx/polypolygoneditor.hxx +++ b/svx/inc/svx/polypolygoneditor.hxx diff --git a/svx/inc/svx/polysc3d.hxx b/svx/inc/svx/polysc3d.hxx index 0471fe9e46..f31929a387 100644..100755 --- a/svx/inc/svx/polysc3d.hxx +++ b/svx/inc/svx/polysc3d.hxx @@ -45,7 +45,7 @@ public: E3dPolyScene(); E3dPolyScene(E3dDefaultAttributes& rDefault); - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; }; #endif // _E3D_POLYSC3D_HXX diff --git a/svx/inc/postattr.hxx b/svx/inc/svx/postattr.hxx index 15d9456229..c892ec724c 100644..100755 --- a/svx/inc/postattr.hxx +++ b/svx/inc/svx/postattr.hxx @@ -46,9 +46,9 @@ class SVX_DLLPUBLIC SvxPostItAuthorItem: public SfxStringItem public: TYPEINFO(); - SvxPostItAuthorItem( USHORT nWhich ); + SvxPostItAuthorItem( sal_uInt16 nWhich ); - SvxPostItAuthorItem( const String& rAuthor, USHORT nWhich ); + SvxPostItAuthorItem( const String& rAuthor, sal_uInt16 nWhich ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -77,9 +77,9 @@ class SVX_DLLPUBLIC SvxPostItDateItem: public SfxStringItem public: TYPEINFO(); - SvxPostItDateItem( USHORT nWhich ); + SvxPostItDateItem( sal_uInt16 nWhich ); - SvxPostItDateItem( const String& rDate, USHORT nWhich ); + SvxPostItDateItem( const String& rDate, sal_uInt16 nWhich ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -107,9 +107,9 @@ class SVX_DLLPUBLIC SvxPostItTextItem: public SfxStringItem public: TYPEINFO(); - SvxPostItTextItem( USHORT nWhich ); + SvxPostItTextItem( sal_uInt16 nWhich ); - SvxPostItTextItem( const String& rText, USHORT nWhich ); + SvxPostItTextItem( const String& rText, sal_uInt16 nWhich ); // "pure virtual methods" vom SfxPoolItem virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/prtqry.hxx b/svx/inc/svx/prtqry.hxx index 29d61a419c..29d61a419c 100644..100755 --- a/svx/inc/prtqry.hxx +++ b/svx/inc/svx/prtqry.hxx diff --git a/svx/inc/pszctrl.hxx b/svx/inc/svx/pszctrl.hxx index 08f49670f2..7087265d40 100644..100755 --- a/svx/inc/pszctrl.hxx +++ b/svx/inc/svx/pszctrl.hxx @@ -48,14 +48,14 @@ private: public: SFX_DECL_STATUSBAR_CONTROL(); - SvxPosSizeStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SvxPosSizeStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); ~SvxPosSizeStatusBarControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); virtual void Command( const CommandEvent& rCEvt ); - static ULONG GetDefItemWidth( const StatusBar& rStb ); + static sal_uIntPtr GetDefItemWidth( const StatusBar& rStb ); }; diff --git a/svx/inc/svx/rectenum.hxx b/svx/inc/svx/rectenum.hxx index d8edbc5511..d8edbc5511 100644..100755 --- a/svx/inc/svx/rectenum.hxx +++ b/svx/inc/svx/rectenum.hxx diff --git a/svx/inc/relfld.hxx b/svx/inc/svx/relfld.hxx index 1a5e9dd913..d083f7b7dc 100644..100755 --- a/svx/inc/relfld.hxx +++ b/svx/inc/svx/relfld.hxx @@ -39,12 +39,12 @@ class SVX_DLLPUBLIC SvxRelativeField : public MetricField { private: - USHORT nRelMin; - USHORT nRelMax; - USHORT nRelStep; - BOOL bRelativeMode; - BOOL bRelative; - BOOL bNegativeEnabled; + sal_uInt16 nRelMin; + sal_uInt16 nRelMax; + sal_uInt16 nRelStep; + sal_Bool bRelativeMode; + sal_Bool bRelative; + sal_Bool bNegativeEnabled; protected: void Modify(); @@ -53,12 +53,12 @@ public: SvxRelativeField( Window* pParent, WinBits nWinStyle = 0 ); SvxRelativeField( Window* pParent, const ResId& rResId ); - void EnableRelativeMode( USHORT nMin = 50, USHORT nMax = 150, - USHORT nStep = 5 ); - BOOL IsRelativeMode() const { return bRelativeMode; } - void SetRelative( BOOL bRelative = FALSE ); - BOOL IsRelative() const { return bRelative; } - void EnableNegativeMode() {bNegativeEnabled = TRUE;} + void EnableRelativeMode( sal_uInt16 nMin = 50, sal_uInt16 nMax = 150, + sal_uInt16 nStep = 5 ); + sal_Bool IsRelativeMode() const { return bRelativeMode; } + void SetRelative( sal_Bool bRelative = sal_False ); + sal_Bool IsRelative() const { return bRelative; } + void EnableNegativeMode() {bNegativeEnabled = sal_True;} }; diff --git a/svx/inc/rotmodit.hxx b/svx/inc/svx/rotmodit.hxx index 157ab6e715..9dcdff4f10 100644..100755 --- a/svx/inc/rotmodit.hxx +++ b/svx/inc/svx/rotmodit.hxx @@ -48,21 +48,21 @@ class SVX_DLLPUBLIC SvxRotateModeItem: public SfxEnumItem public: TYPEINFO(); - SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, USHORT nWhich=0); + SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, sal_uInt16 nWhich=0); SvxRotateModeItem( const SvxRotateModeItem& rItem ); ~SvxRotateModeItem(); - virtual USHORT GetValueCount() const; - virtual String GetValueText( USHORT nVal ) const; + virtual sal_uInt16 GetValueCount() const; + virtual String GetValueText( sal_uInt16 nVal ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create(SvStream &, USHORT) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; diff --git a/svx/inc/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx index 2a1453b5ea..5eca1615f6 100644..100755 --- a/svx/inc/rubydialog.hxx +++ b/svx/inc/svx/rubydialog.hxx @@ -62,7 +62,7 @@ class SVX_DLLPUBLIC SvxRubyChildWindow : public SfxChildWindow { public: - SvxRubyChildWindow( Window*, USHORT, SfxBindings*, SfxChildWinInfo* ); + SvxRubyChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); SFX_DECL_CHILDWINDOW( SvxRubyChildWindow ); @@ -125,7 +125,7 @@ class SvxRubyDialog : public SfxModelessDialog long nLastPos; long nCurrentEdit; - BOOL bModified; + sal_Bool bModified; com::sun::star::uno::Reference<com::sun::star::view::XSelectionChangeListener> xImpl; SfxBindings* pBindings; @@ -149,13 +149,13 @@ class SvxRubyDialog : public SfxModelessDialog void AssertOneEntry(); void Update(); - virtual BOOL Close(); + virtual sal_Bool Close(); long GetLastPos() const {return nLastPos;} void SetLastPos(long nSet) {nLastPos = nSet;} - BOOL IsModified() const {return bModified;} - void SetModified(BOOL bSet) {bModified = bSet;} + sal_Bool IsModified() const {return bModified;} + void SetModified(sal_Bool bSet) {bModified = bSet;} void EnableControls(sal_Bool bEnable) { diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx index 67dc379f09..4c9f647497 100644..100755 --- a/svx/inc/svx/ruler.hxx +++ b/svx/inc/svx/ruler.hxx @@ -64,13 +64,13 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener SvxObjectItem *pObjectItem; // object Window *pEditWin; SvxRuler_Impl *pRuler_Imp; - BOOL bAppSetNullOffset :1; - BOOL bHorz :1; + sal_Bool bAppSetNullOffset :1; + sal_Bool bHorz :1; long lLogicNullOffset; // in logic coordinates long lAppNullOffset; // in logic coordinates long lMinFrame; // minimal frame width in pixels long lInitialDragPos; - USHORT nFlags; + sal_uInt16 nFlags; enum { NONE = 0x0000, DRAG_OBJECT = 0x0001, @@ -83,27 +83,27 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener DRAG_OBJECT_LEFT_INDENT_ONLY = DRAG_OBJECT_SIZE_PROPORTIONAL } nDragType; - USHORT nDefTabType; - USHORT nTabCount; - USHORT nTabBufSize; + sal_uInt16 nDefTabType; + sal_uInt16 nTabCount; + sal_uInt16 nTabBufSize; long lDefTabDist; long lTabPos; RulerTab *pTabs; // tab positions in pixel RulerIndent *pIndents; // paragraph margins in pixel RulerBorder *pBorders; - USHORT nBorderCount; + sal_uInt16 nBorderCount; RulerBorder *pObjectBorders; SfxBindings *pBindings; long nDragOffset; long nMaxLeft; long nMaxRight; - BOOL bValid; - BOOL bListening; - BOOL bActive; + sal_Bool bValid; + sal_Bool bListening; + sal_Bool bActive; void StartListening_Impl(); - long GetCorrectedDragPos( BOOL bLeft = TRUE, BOOL bRight = TRUE ); - void DrawLine_Impl(long &lTabPos, int, BOOL Hori=TRUE); - USHORT GetObjectBordersOff(USHORT nIdx) const; + long GetCorrectedDragPos( sal_Bool bLeft = sal_True, sal_Bool bRight = sal_True ); + void DrawLine_Impl(long &lTabPos, int, sal_Bool Hori=sal_True); + sal_uInt16 GetObjectBordersOff(sal_uInt16 nIdx) const; // page borders or surrounding frame void UpdateFrame(const SvxLongLRSpaceItem *); @@ -118,7 +118,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener // page position and width void Update(const SvxPagePosSizeItem *); // columns - void Update(const SvxColumnItem *, USHORT nSID); + void Update(const SvxColumnItem *, sal_uInt16 nSID); // object selection void Update(const SvxObjectItem *); // protect @@ -190,8 +190,8 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener DECL_LINK( MenuSelect, Menu * ); void PrepareProportional_Impl(RulerType); - USHORT GetNextVisible(USHORT nColumn); - USHORT GetPrevVisible(USHORT nColumn); + sal_uInt16 GetNextVisible(sal_uInt16 nColumn); + sal_uInt16 GetPrevVisible(sal_uInt16 nColumn); void Update(); @@ -214,16 +214,16 @@ protected: // calculation of boundary values for object borders // values refer to the page - virtual BOOL CalcLimits(long &nMax1, long &nMax2, BOOL bFirst) const; - BOOL IsActLastColumn( - BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX) const ; - BOOL IsActFirstColumn( - BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX) const; - USHORT GetActLeftColumn( - BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX ) const; - USHORT GetActRightColumn ( - BOOL bForceDontConsiderHidden = FALSE, USHORT nAct=USHRT_MAX ) const; - long CalcPropMaxRight(USHORT nCol=USHRT_MAX) const; + virtual sal_Bool CalcLimits(long &nMax1, long &nMax2, sal_Bool bFirst) const; + sal_Bool IsActLastColumn( + sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX) const ; + sal_Bool IsActFirstColumn( + sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX) const; + sal_uInt16 GetActLeftColumn( + sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX ) const; + sal_uInt16 GetActRightColumn ( + sal_Bool bForceDontConsiderHidden = sal_False, sal_uInt16 nAct=USHRT_MAX ) const; + long CalcPropMaxRight(sal_uInt16 nCol=USHRT_MAX) const; public: #define SVXRULER_SUPPORT_TABS 0x0001 @@ -237,7 +237,7 @@ public: SvxRuler(Window* pParent, Window *pEditWin, - USHORT nRulerFlags, + sal_uInt16 nRulerFlags, SfxBindings &rBindings, WinBits nWinStyle = WB_STDRULER); ~SvxRuler(); @@ -245,7 +245,7 @@ public: void SetMinFrameSize(long lSize); long GetMinFrameSize() const ; - USHORT GetRulerFlags() const { return nFlags; } + sal_uInt16 GetRulerFlags() const { return nFlags; } void SetDefTabDist(long); long GetDefTabDist() const; @@ -254,13 +254,13 @@ public: void SetNullOffsetLogic(long lOff = 0); long GetNullOffsetLogic() const { return lAppNullOffset; } - void SetActive(BOOL bOn = TRUE); - BOOL IsActive() const { return bActive; } + void SetActive(sal_Bool bOn = sal_True); + sal_Bool IsActive() const { return bActive; } void ForceUpdate() { Update(); } //#i24363# tab stops relative to indent - void SetTabsRelativeToIndent( BOOL bRel = TRUE ); + void SetTabsRelativeToIndent( sal_Bool bRel = sal_True ); }; #endif diff --git a/svx/inc/rulritem.hxx b/svx/inc/svx/rulritem.hxx index e7a9a43d8d..89d5702610 100644..100755 --- a/svx/inc/rulritem.hxx +++ b/svx/inc/svx/rulritem.hxx @@ -45,8 +45,8 @@ class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem protected: virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -61,7 +61,7 @@ private: public: TYPEINFO(); - SvxLongLRSpaceItem(long lLeft, long lRight, USHORT nId); + SvxLongLRSpaceItem(long lLeft, long lRight, sal_uInt16 nId); SvxLongLRSpaceItem(const SvxLongLRSpaceItem &); SvxLongLRSpaceItem(); @@ -81,8 +81,8 @@ class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem protected: virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -97,7 +97,7 @@ private: public: TYPEINFO(); - SvxLongULSpaceItem(long lUpper, long lLower, USHORT nId); + SvxLongULSpaceItem(long lUpper, long lLower, sal_uInt16 nId); SvxLongULSpaceItem(const SvxLongULSpaceItem &); SvxLongULSpaceItem(); @@ -116,8 +116,8 @@ class SVX_DLLPUBLIC SvxPagePosSizeItem : public SfxPoolItem long lHeight; protected: virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual String GetValueText() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, @@ -146,13 +146,13 @@ struct SvxColumnDescription { long nStart; /* Start of the column */ long nEnd; /* End of the column */ - BOOL bVisible; /* Visibility */ + sal_Bool bVisible; /* Visibility */ long nEndMin; //min. possible position of end long nEndMax; //max. possible position of end SvxColumnDescription(): - nStart(0), nEnd(0), bVisible(TRUE), nEndMin(0), nEndMax(0) {} + nStart(0), nEnd(0), bVisible(sal_True), nEndMin(0), nEndMax(0) {} SvxColumnDescription(const SvxColumnDescription &rCopy) : nStart(rCopy.nStart), nEnd(rCopy.nEnd), @@ -160,13 +160,13 @@ struct SvxColumnDescription nEndMin(rCopy.nEndMin), nEndMax(rCopy.nEndMax) {} - SvxColumnDescription(long start, long end, BOOL bVis = TRUE): + SvxColumnDescription(long start, long end, sal_Bool bVis = sal_True): nStart(start), nEnd(end), bVisible(bVis), nEndMin(0), nEndMax(0) {} SvxColumnDescription(long start, long end, - long endMin, long endMax, BOOL bVis = TRUE): + long endMin, long endMax, sal_Bool bVis = sal_True): nStart(start), nEnd(end), bVisible(bVis), nEndMin(endMin), nEndMax(endMax) @@ -195,9 +195,9 @@ class SVX_DLLPUBLIC SvxColumnItem : public SfxPoolItem long nLeft, // Left edge for the table nRight; // Right edge for the table; for columns always // equal to the surrounding frame - USHORT nActColumn; // the current column - BOOL bTable; // table? - BOOL bOrtho; // evenly spread columns + sal_uInt16 nActColumn; // the current column + sal_uInt8 bTable; // table? + sal_uInt8 bOrtho; // evenly spread columns void DeleteAndDestroyColumns(); @@ -211,47 +211,47 @@ protected: String &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); public: TYPEINFO(); // right edge of the surrounding frame // nLeft, nRight each the distance to the surrounding frame - SvxColumnItem(USHORT nAct = 0); // columns - SvxColumnItem(USHORT nActCol, - USHORT nLeft, USHORT nRight = 0); // table with borders + SvxColumnItem(sal_uInt16 nAct = 0); // columns + SvxColumnItem(sal_uInt16 nActCol, + sal_uInt16 nLeft, sal_uInt16 nRight = 0); // Table with borders SvxColumnItem(const SvxColumnItem &); ~SvxColumnItem(); const SvxColumnItem &operator=(const SvxColumnItem &); - USHORT Count() const { return aColumns.Count(); } - SvxColumnDescription &operator[](USHORT i) + sal_uInt16 Count() const { return aColumns.Count(); } + SvxColumnDescription &operator[](sal_uInt16 i) { return *(SvxColumnDescription*)aColumns[i]; } - const SvxColumnDescription &operator[](USHORT i) const + const SvxColumnDescription &operator[](sal_uInt16 i) const { return *(SvxColumnDescription*)aColumns[i]; } - void Insert(const SvxColumnDescription &rDesc, USHORT nPos) { + void Insert(const SvxColumnDescription &rDesc, sal_uInt16 nPos) { SvxColumnDescription* pDesc = new SvxColumnDescription(rDesc); aColumns.Insert(pDesc, nPos); } void Append(const SvxColumnDescription &rDesc) { Insert(rDesc, Count()); } void SetLeft(long left) { nLeft = left; } void SetRight(long right) { nRight = right; } - void SetActColumn(USHORT nCol) { nActColumn = nCol; } + void SetActColumn(sal_uInt16 nCol) { nActColumn = nCol; } - USHORT GetActColumn() const { return nActColumn; } - BOOL IsFirstAct() const { return nActColumn == 0; } - BOOL IsLastAct() const { return nActColumn == Count()-1; } + sal_uInt16 GetActColumn() const { return nActColumn; } + sal_Bool IsFirstAct() const { return nActColumn == 0; } + sal_Bool IsLastAct() const { return nActColumn == Count()-1; } long GetLeft() { return nLeft; } long GetRight() { return nRight; } - BOOL IsTable() const { return bTable; } + sal_Bool IsTable() const { return bTable; } - BOOL CalcOrtho() const; - void SetOrtho(BOOL bVal) { bOrtho = bVal; } - BOOL IsOrtho () const { return FALSE ; } + sal_Bool CalcOrtho() const; + void SetOrtho(sal_Bool bVal) { bOrtho = bVal; } + sal_Bool IsOrtho () const { return sal_False ; } - BOOL IsConsistent() const { return nActColumn < aColumns.Count(); } + sal_Bool IsConsistent() const { return nActColumn < aColumns.Count(); } long GetVisibleRight() const;// right visible edge of the current column }; @@ -264,7 +264,7 @@ private: long nEndX; /* End in x direction */ long nStartY; /* Start in y direction */ long nEndY; /* Ende in y direction */ - BOOL bLimits; /* boundary limit control by the application */ + sal_Bool bLimits; /* boundary limit control by the application */ protected: virtual int operator==( const SfxPoolItem& ) const; @@ -275,18 +275,18 @@ protected: String &rText, const IntlWrapper * = 0 ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); private: SVX_DLLPRIVATE const SvxObjectItem &operator=(const SvxObjectItem &); // n.i. public: TYPEINFO(); SvxObjectItem(long nStartX, long nEndX, long nStartY, long nEndY, - BOOL bLimits = FALSE); + sal_Bool bLimits = sal_False); SvxObjectItem(const SvxObjectItem &); - BOOL HasLimits() const { return bLimits; } + sal_Bool HasLimits() const { return bLimits; } long GetStartX() const { return nStartX; } long GetEndX() const { return nEndX; } diff --git a/svx/inc/svx/scene3d.hxx b/svx/inc/svx/scene3d.hxx index 579d9a8d32..e56f8bb0b4 100644..100755 --- a/svx/inc/svx/scene3d.hxx +++ b/svx/inc/svx/scene3d.hxx @@ -125,7 +125,7 @@ public: { return ((const Svx3DFocalLengthItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); } // Two sided lighting: - BOOL GetTwoSidedLighting() const + sal_Bool GetTwoSidedLighting() const { return ((const Svx3DTwoSidedLightingItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue(); } // Lightcolor: @@ -151,21 +151,21 @@ public: { return ((const Svx3DAmbientcolorItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_AMBIENTCOLOR)).GetValue(); } // Light on/off: - BOOL GetLightOnOff1() const + sal_Bool GetLightOnOff1() const { return ((const Svx3DLightOnOff1Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_1)).GetValue(); } - BOOL GetLightOnOff2() const + sal_Bool GetLightOnOff2() const { return ((const Svx3DLightOnOff2Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_2)).GetValue(); } - BOOL GetLightOnOff3() const + sal_Bool GetLightOnOff3() const { return ((const Svx3DLightOnOff3Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_3)).GetValue(); } - BOOL GetLightOnOff4() const + sal_Bool GetLightOnOff4() const { return ((const Svx3DLightOnOff4Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_4)).GetValue(); } - BOOL GetLightOnOff5() const + sal_Bool GetLightOnOff5() const { return ((const Svx3DLightOnOff5Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_5)).GetValue(); } - BOOL GetLightOnOff6() const + sal_Bool GetLightOnOff6() const { return ((const Svx3DLightOnOff6Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_6)).GetValue(); } - BOOL GetLightOnOff7() const + sal_Bool GetLightOnOff7() const { return ((const Svx3DLightOnOff7Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_7)).GetValue(); } - BOOL GetLightOnOff8() const + sal_Bool GetLightOnOff8() const { return ((const Svx3DLightOnOff8Item&)GetObjectItemSet().Get(SDRATTR_3DSCENE_LIGHTON_8)).GetValue(); } // Light direction: @@ -195,9 +195,9 @@ public: { return ((const Svx3DShadeModeItem&)GetObjectItemSet().Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue(); } // set flag to draw only selected - void SetDrawOnlySelected(BOOL bNew) { bDrawOnlySelected = bNew; } + void SetDrawOnlySelected(sal_Bool bNew) { bDrawOnlySelected = bNew; } bool GetDrawOnlySelected() const { return bDrawOnlySelected; } - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void NbcSetSnapRect(const Rectangle& rRect); virtual void NbcMove(const Size& rSize); @@ -230,7 +230,7 @@ public: B3dCamera& GetCameraSet() { return aCameraSet; } // break up - virtual BOOL IsBreakObjPossible(); + virtual sal_Bool IsBreakObjPossible(); basegfx::B3DVector GetShadowPlaneDirection() const; void SetShadowPlaneDirection(const basegfx::B3DVector& rVec); diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx index 2ca6713df8..d3132ffd4e 100644..100755 --- a/svx/inc/svx/sdangitm.hxx +++ b/svx/inc/svx/sdangitm.hxx @@ -39,10 +39,10 @@ class SVX_DLLPUBLIC SdrAngleItem: public SfxInt32Item { public: TYPEINFO(); SdrAngleItem(): SfxInt32Item() {} - SdrAngleItem(USHORT nId, INT32 nAngle=0): SfxInt32Item(nId,nAngle) {} - SdrAngleItem(USHORT nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} + SdrAngleItem(sal_uInt16 nId, sal_Int32 nAngle=0): SfxInt32Item(nId,nAngle) {} + SdrAngleItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx index 8e98620e33..2c128f2fe9 100644..100755 --- a/svx/inc/svx/sdasaitm.hxx +++ b/svx/inc/svx/sdasaitm.hxx @@ -66,8 +66,8 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); sal_uInt32 GetCount() const { return aAdjustmentValueList.size(); }; SVX_DLLPUBLIC const SdrCustomShapeAdjustmentValue& GetValue( sal_uInt32 nIndex ) const; diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx index 314e6fbc8b..e66228d5c6 100644..100755 --- a/svx/inc/svx/sdasitm.hxx +++ b/svx/inc/svx/sdasitm.hxx @@ -100,8 +100,8 @@ private: virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& GetGeometry() const; @@ -127,7 +127,7 @@ class SdrCustomShapeReplacementURLItem : public SfxStringItem //--------------------------- class SdrTextWordWrapItem : public SdrOnOffItem { public: - SdrTextWordWrapItem( BOOL bAuto = FALSE ): SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto ) {} + SdrTextWordWrapItem( sal_Bool bAuto = sal_False ): SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto ) {} SdrTextWordWrapItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, rIn ) {} }; @@ -136,7 +136,7 @@ public: //------------------------------- class SdrTextAutoGrowSizeItem : public SdrOnOffItem { public: - SdrTextAutoGrowSizeItem( BOOL bAuto = FALSE ): SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) {} + SdrTextAutoGrowSizeItem( sal_Bool bAuto = sal_False ): SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) {} SdrTextAutoGrowSizeItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, rIn ) {} }; diff --git a/svx/inc/svx/sderitm.hxx b/svx/inc/svx/sderitm.hxx index 6f3d8b7bb3..6f3d8b7bb3 100644..100755 --- a/svx/inc/svx/sderitm.hxx +++ b/svx/inc/svx/sderitm.hxx diff --git a/svx/inc/svx/sdgcoitm.hxx b/svx/inc/svx/sdgcoitm.hxx index 7cf1431b77..927769891d 100644..100755 --- a/svx/inc/svx/sdgcoitm.hxx +++ b/svx/inc/svx/sdgcoitm.hxx @@ -47,7 +47,7 @@ public: SdrGrafRedItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFRED, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; //------------------- @@ -64,7 +64,7 @@ public: SdrGrafGreenItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFGREEN, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; //------------------- @@ -81,7 +81,7 @@ public: SdrGrafBlueItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFBLUE, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; #endif // _SDGCOITM_HXX diff --git a/svx/inc/svx/sdgcpitm.hxx b/svx/inc/svx/sdgcpitm.hxx index 24fc7cf6ce..13548357e6 100644..100755 --- a/svx/inc/svx/sdgcpitm.hxx +++ b/svx/inc/svx/sdgcpitm.hxx @@ -44,12 +44,12 @@ public: SdrGrafCropItem( sal_Int32 nLeftCrop = 0, sal_Int32 nTopCrop = 0, sal_Int32 nRightCrop = 0, sal_Int32 nBottomCrop = 0, - USHORT nWhichId = SDRATTR_GRAFCROP ) : + sal_uInt16 nWhichId = SDRATTR_GRAFCROP ) : SvxGrfCrop( nLeftCrop, nRightCrop, nTopCrop, nBottomCrop, nWhichId ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - virtual USHORT GetVersion( USHORT nFileVersion ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const; }; #endif // _SDGCPITM_HXX diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx index e25e5beecf..3d063e6e67 100644..100755 --- a/svx/inc/svx/sdggaitm.hxx +++ b/svx/inc/svx/sdggaitm.hxx @@ -43,14 +43,14 @@ public: TYPEINFO(); - SdrGrafGamma100Item( ULONG nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {} + SdrGrafGamma100Item( sal_uIntPtr nGamma100 = 100 ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, nGamma100 ) {} SdrGrafGamma100Item( SvStream& rIn ) : SfxUInt32Item( SDRATTR_GRAFGAMMA, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif // _SDGGAITM_HXX diff --git a/svx/inc/svx/sdginitm.hxx b/svx/inc/svx/sdginitm.hxx index c20f7298e6..e3ef16f75a 100644..100755 --- a/svx/inc/svx/sdginitm.hxx +++ b/svx/inc/svx/sdginitm.hxx @@ -43,11 +43,11 @@ public: TYPEINFO(); - SdrGrafInvertItem( BOOL bInvert = FALSE ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {} + SdrGrafInvertItem( sal_Bool bInvert = sal_False ) : SdrOnOffItem( SDRATTR_GRAFINVERT, bInvert ) {} SdrGrafInvertItem( SvStream& rIn ) : SdrOnOffItem( SDRATTR_GRAFINVERT, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; #endif // _SDGINITM_HXX diff --git a/svx/inc/svx/sdgluitm.hxx b/svx/inc/svx/sdgluitm.hxx index 27103ded00..3047591fbf 100644..100755 --- a/svx/inc/svx/sdgluitm.hxx +++ b/svx/inc/svx/sdgluitm.hxx @@ -47,7 +47,7 @@ public: SdrGrafLuminanceItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFLUMINANCE, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; //---------------------- @@ -64,7 +64,7 @@ public: SdrGrafContrastItem( SvStream& rIn ) : SdrSignedPercentItem( SDRATTR_GRAFCONTRAST, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; #endif // _SDGLUITM_HXX diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx index d5b1163a51..54f94ed029 100644..100755 --- a/svx/inc/svx/sdgmoitm.hxx +++ b/svx/inc/svx/sdgmoitm.hxx @@ -44,15 +44,15 @@ public: TYPEINFO(); - SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (USHORT)eMode ) {} + SdrGrafModeItem( GraphicDrawMode eMode = GRAPHICDRAWMODE_STANDARD ) : SfxEnumItem( SDRATTR_GRAFMODE, (sal_uInt16)eMode ) {} SdrGrafModeItem( SvStream& rIn ) : SfxEnumItem( SDRATTR_GRAFMODE, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - virtual USHORT GetValueCount() const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual sal_uInt16 GetValueCount() const; GraphicDrawMode GetValue() const { return (GraphicDrawMode) SfxEnumItem::GetValue(); } - virtual String GetValueTextByPos( USHORT nPos ) const; + virtual String GetValueTextByPos( sal_uInt16 nPos ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/svx/inc/svx/sdgtritm.hxx b/svx/inc/svx/sdgtritm.hxx index 7b981fc670..67995df089 100644..100755 --- a/svx/inc/svx/sdgtritm.hxx +++ b/svx/inc/svx/sdgtritm.hxx @@ -42,11 +42,11 @@ class SVX_DLLPUBLIC SdrGrafTransparenceItem : public SdrPercentItem public: TYPEINFO(); - SdrGrafTransparenceItem( USHORT nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {} + SdrGrafTransparenceItem( sal_uInt16 nTransparencePercent = 0 ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, nTransparencePercent ) {} SdrGrafTransparenceItem( SvStream& rIn ) : SdrPercentItem( SDRATTR_GRAFTRANSPARENCE, rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; }; #endif // _SDGTRITM_HXX diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx index 3ef6fa520d..ca5d83dba3 100644..100755 --- a/svx/inc/svx/sdmetitm.hxx +++ b/svx/inc/svx/sdmetitm.hxx @@ -41,10 +41,10 @@ class SVX_DLLPUBLIC SdrMetricItem: public SfxInt32Item { public: TYPEINFO(); SdrMetricItem(): SfxInt32Item() {} - SdrMetricItem(USHORT nId, INT32 nVal=0): SfxInt32Item(nId,nVal) {} - SdrMetricItem(USHORT nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} + SdrMetricItem(sal_uInt16 nId, sal_Int32 nVal=0): SfxInt32Item(nId,nVal) {} + SdrMetricItem(sal_uInt16 nId, SvStream& rIn): SfxInt32Item(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual bool HasMetrics() const; virtual bool ScaleMetrics(long nMul, long nDiv); diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx index 193edd3015..3abb402fce 100644..100755 --- a/svx/inc/svx/sdooitm.hxx +++ b/svx/inc/svx/sdooitm.hxx @@ -41,12 +41,12 @@ class SVX_DLLPUBLIC SdrOnOffItem: public SfxBoolItem { public: TYPEINFO(); SdrOnOffItem(): SfxBoolItem() {} - SdrOnOffItem(USHORT nId, BOOL bOn=FALSE): SfxBoolItem(nId,bOn) {} - SdrOnOffItem(USHORT nId, SvStream& rIn): SfxBoolItem(nId,rIn) {} + SdrOnOffItem(sal_uInt16 nId, sal_Bool bOn=sal_False): SfxBoolItem(nId,bOn) {} + SdrOnOffItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual String GetValueTextByVal(BOOL bVal) const; + virtual String GetValueTextByVal(sal_Bool bVal) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx index 79b3b64546..baec57268a 100644..100755 --- a/svx/inc/svx/sdprcitm.hxx +++ b/svx/inc/svx/sdprcitm.hxx @@ -42,10 +42,10 @@ class SVX_DLLPUBLIC SdrPercentItem : public SfxUInt16Item public: TYPEINFO(); SdrPercentItem(): SfxUInt16Item() {} - SdrPercentItem(USHORT nId, UINT16 nVal=0): SfxUInt16Item(nId,nVal) {} - SdrPercentItem(USHORT nId, SvStream& rIn): SfxUInt16Item(nId,rIn) {} + SdrPercentItem(sal_uInt16 nId, sal_uInt16 nVal=0): SfxUInt16Item(nId,nVal) {} + SdrPercentItem(sal_uInt16 nId, SvStream& rIn): SfxUInt16Item(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; @@ -60,10 +60,10 @@ class SVX_DLLPUBLIC SdrSignedPercentItem : public SfxInt16Item public: TYPEINFO(); SdrSignedPercentItem(): SfxInt16Item() {} - SdrSignedPercentItem( USHORT nId, INT16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {} - SdrSignedPercentItem( USHORT nId, SvStream& rIn ) : SfxInt16Item( nId,rIn ) {} + SdrSignedPercentItem( sal_uInt16 nId, sal_Int16 nVal = 0 ) : SfxInt16Item( nId,nVal ) {} + SdrSignedPercentItem( sal_uInt16 nId, SvStream& rIn ) : SfxInt16Item( nId,rIn ) {} virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0 ) const; }; diff --git a/svx/inc/svx/sdr/animation/animationstate.hxx b/svx/inc/svx/sdr/animation/animationstate.hxx index 92ceb14ecd..92ceb14ecd 100644..100755 --- a/svx/inc/svx/sdr/animation/animationstate.hxx +++ b/svx/inc/svx/sdr/animation/animationstate.hxx diff --git a/svx/inc/svx/sdr/animation/objectanimator.hxx b/svx/inc/svx/sdr/animation/objectanimator.hxx index 0b4e1de23c..0b4e1de23c 100644..100755 --- a/svx/inc/svx/sdr/animation/objectanimator.hxx +++ b/svx/inc/svx/sdr/animation/objectanimator.hxx diff --git a/svx/inc/svx/sdr/animation/scheduler.hxx b/svx/inc/svx/sdr/animation/scheduler.hxx index 82efaf6f3d..82efaf6f3d 100644..100755 --- a/svx/inc/svx/sdr/animation/scheduler.hxx +++ b/svx/inc/svx/sdr/animation/scheduler.hxx diff --git a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx index ea9955a13c..ea9955a13c 100644..100755 --- a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx diff --git a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx index 4f91c9123e..4f91c9123e 100644..100755 --- a/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrformtextattribute.hxx diff --git a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx index 15fd5e93df..15fd5e93df 100644..100755 --- a/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrformtextoutlineattribute.hxx diff --git a/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx index ea2fb4f096..ea2fb4f096 100644..100755 --- a/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx diff --git a/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx index fb8d8d51be..fb8d8d51be 100644..100755 --- a/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrlineshadowtextattribute.hxx diff --git a/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx index 9fed857c00..9fed857c00 100644..100755 --- a/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrshadowtextattribute.hxx diff --git a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx index 00e53dad46..00e53dad46 100644..100755 --- a/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx +++ b/svx/inc/svx/sdr/attribute/sdrtextattribute.hxx diff --git a/svx/inc/svx/sdr/contact/displayinfo.hxx b/svx/inc/svx/sdr/contact/displayinfo.hxx index 6d4535d9d5..6d4535d9d5 100644..100755 --- a/svx/inc/svx/sdr/contact/displayinfo.hxx +++ b/svx/inc/svx/sdr/contact/displayinfo.hxx diff --git a/svx/inc/svx/sdr/contact/objectcontact.hxx b/svx/inc/svx/sdr/contact/objectcontact.hxx index 28fc931423..28fc931423 100644..100755 --- a/svx/inc/svx/sdr/contact/objectcontact.hxx +++ b/svx/inc/svx/sdr/contact/objectcontact.hxx diff --git a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx index 48de837682..14a607cf4d 100644..100755 --- a/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/svx/inc/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -96,6 +96,15 @@ namespace sdr // Process the whole displaying virtual void ProcessDisplay(DisplayInfo& rDisplayInfo); + // VirtualDevice? Default is false + virtual bool isOutputToVirtualDevice() const; + + // recording MetaFile? Default is false + virtual bool isOutputToRecordingMetaFile() const; + + // pdf export? Default is false + virtual bool isOutputToPDFFile() const; + // access to OutputDevice. May return 0L like the default implementations do. Needs to be overloaded as needed. virtual OutputDevice* TryToGetOutputDevice() const; }; diff --git a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx index c8badbcf26..c8badbcf26 100644..100755 --- a/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx +++ b/svx/inc/svx/sdr/contact/objectcontactofpageview.hxx diff --git a/svx/inc/svx/sdr/contact/objectcontacttools.hxx b/svx/inc/svx/sdr/contact/objectcontacttools.hxx index 3b46a26085..3b46a26085 100644..100755 --- a/svx/inc/svx/sdr/contact/objectcontacttools.hxx +++ b/svx/inc/svx/sdr/contact/objectcontacttools.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontact.hxx b/svx/inc/svx/sdr/contact/viewcontact.hxx index d61b7defff..d61b7defff 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontact.hxx +++ b/svx/inc/svx/sdr/contact/viewcontact.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx index 08cf6a1436..08cf6a1436 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3d.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx index 8e6abc00f4..8e6abc00f4 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dcube.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx index bb847b5a31..bb847b5a31 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dextrude.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx index 40b55a3245..40b55a3245 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dlathe.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx index 5edcda4924..5edcda4924 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dpolygon.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx index 25b6947553..25b6947553 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dscene.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx index cfed0a6fbd..cfed0a6fbd 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofe3dsphere.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx b/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx index 308cb76c44..308cb76c44 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofgraphic.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx b/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx index 03dc36135d..03dc36135d 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofgroup.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx index fdd039d25f..fdd039d25f 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx index 322ed7c3c6..322ed7c3c6 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofpageobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx index a2e4067017..a2e4067017 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx index 96cb4ccbf1..96cb4ccbf1 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrcircobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx index babcb8ce48..babcb8ce48 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdredgeobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx index 0d4339b6bd..0d4339b6bd 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx index 3b7816cc7d..3b7816cc7d 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrmediaobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx index c3600d1b14..c3600d1b14 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx index 614e5f04fd..614e5f04fd 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx index c67fae1e91..c67fae1e91 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrole2obj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx index ad4c9ca95d..ad4c9ca95d 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrpage.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx index 5265910ab6..5265910ab6 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrpathobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx index f8de886596..f8de886596 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofsdrrectobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx b/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx index 470a2339cc..470a2339cc 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactoftextobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx index a85051fecb..a85051fecb 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofunocontrol.hxx diff --git a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx b/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx index 13e18311d9..13e18311d9 100644..100755 --- a/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx +++ b/svx/inc/svx/sdr/contact/viewcontactofvirtobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx index 3b586068a1..3b586068a1 100644..100755 --- a/svx/inc/svx/sdr/contact/viewobjectcontact.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontact.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx index b559ff59ab..b559ff59ab 100644..100755 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofe3d.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx index be1b344481..be1b344481 100644..100755 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofe3dscene.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx index 2b9ba7bcce..2b9ba7bcce 100644..100755 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgraphic.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx index b654aea38f..b654aea38f 100644..100755 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofgroup.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx index 29464cbff9..29464cbff9 100644..100755 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx index 2dc87105a7..2dc87105a7 100644..100755 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofpageobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx index 1db6c82185..1db6c82185 100644..100755 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx index 2e31417ba3..2e31417ba3 100644..100755 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrobj.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx index 5baef0b96a..5baef0b96a 100644..100755 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx index 9e6aa4d086..9e6aa4d086 100644..100755 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofsdrpage.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx index 4dbb923cfc..4dbb923cfc 100644..100755 --- a/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactofunocontrol.hxx diff --git a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx b/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx index dfdc079150..dfdc079150 100644..100755 --- a/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx +++ b/svx/inc/svx/sdr/contact/viewobjectcontactredirector.hxx diff --git a/svx/inc/svx/sdr/event/eventhandler.hxx b/svx/inc/svx/sdr/event/eventhandler.hxx index a64c5639a4..a64c5639a4 100644..100755 --- a/svx/inc/svx/sdr/event/eventhandler.hxx +++ b/svx/inc/svx/sdr/event/eventhandler.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx index cb1a553496..cb1a553496 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/svx/inc/svx/sdr/overlay/overlayanimatedbitmapex.hxx diff --git a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx index cdd5e73626..cdd5e73626 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx +++ b/svx/inc/svx/sdr/overlay/overlaybitmapex.hxx diff --git a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx b/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx index 70f004bf3e..70f004bf3e 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx +++ b/svx/inc/svx/sdr/overlay/overlaycrosshair.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx index 2c441efa41..2c441efa41 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx +++ b/svx/inc/svx/sdr/overlay/overlayhatchrect.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx b/svx/inc/svx/sdr/overlay/overlayhelpline.hxx index 7b91f547c1..7b91f547c1 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlayhelpline.hxx +++ b/svx/inc/svx/sdr/overlay/overlayhelpline.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayline.hxx b/svx/inc/svx/sdr/overlay/overlayline.hxx index 3810f48b4a..3810f48b4a 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlayline.hxx +++ b/svx/inc/svx/sdr/overlay/overlayline.hxx diff --git a/svx/inc/svx/sdr/overlay/overlaymanager.hxx b/svx/inc/svx/sdr/overlay/overlaymanager.hxx index ba8bfdd142..ba8bfdd142 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlaymanager.hxx +++ b/svx/inc/svx/sdr/overlay/overlaymanager.hxx diff --git a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx index 6bc231f9eb..6bc231f9eb 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayobject.hxx b/svx/inc/svx/sdr/overlay/overlayobject.hxx index 7d8aee9331..7d8aee9331 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlayobject.hxx +++ b/svx/inc/svx/sdr/overlay/overlayobject.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx b/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx index 68d3338f28..68d3338f28 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx +++ b/svx/inc/svx/sdr/overlay/overlayobjectcell.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx index 6de641a5ab..6de641a5ab 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx +++ b/svx/inc/svx/sdr/overlay/overlayobjectlist.hxx diff --git a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx index 90e8e90c92..90e8e90c92 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx +++ b/svx/inc/svx/sdr/overlay/overlaypolypolygon.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index af8de0f536..af8de0f536 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/svx/inc/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx index 04cd459441..04cd459441 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx +++ b/svx/inc/svx/sdr/overlay/overlayrollingrectangle.hxx diff --git a/svx/inc/svx/sdr/overlay/overlayselection.hxx b/svx/inc/svx/sdr/overlay/overlayselection.hxx index 019e33ff78..019e33ff78 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlayselection.hxx +++ b/svx/inc/svx/sdr/overlay/overlayselection.hxx diff --git a/svx/inc/svx/sdr/overlay/overlaytools.hxx b/svx/inc/svx/sdr/overlay/overlaytools.hxx index 924e4fdb01..924e4fdb01 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlaytools.hxx +++ b/svx/inc/svx/sdr/overlay/overlaytools.hxx diff --git a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx index eea5d4e095..eea5d4e095 100644..100755 --- a/svx/inc/svx/sdr/overlay/overlaytriangle.hxx +++ b/svx/inc/svx/sdr/overlay/overlaytriangle.hxx diff --git a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx index 7aa8ea03fa..7aa8ea03fa 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/primitiveFactory2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx b/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx index c1e9b87bc6..c1e9b87bc6 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrattributecreator.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx index 9ec9276099..9ec9276099 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx index 85808f592d..85808f592d 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx index dfa235b7ea..dfa235b7ea 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx index 30cd545b1a..30cd545b1a 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrdecompositiontools.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx index fcbc65c8b0..fcbc65c8b0 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx index 5aa15b3bd4..5aa15b3bd4 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx index 2d314f13b6..2d314f13b6 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx index b85cca7b35..b85cca7b35 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrole2primitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx index 66015d4a97..66015d4a97 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx index cee3071dcf..cee3071dcf 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrpathprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx index 67a314fd8b..67a314fd8b 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx index a201132212..a201132212 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx index d5d9b45980..d5d9b45980 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx diff --git a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx b/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx index d0dbd968f8..d0dbd968f8 100644..100755 --- a/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx +++ b/svx/inc/svx/sdr/primitive2d/svx_primitivetypes2d.hxx diff --git a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx index 8859a77925..8859a77925 100644..100755 --- a/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx +++ b/svx/inc/svx/sdr/primitive3d/sdrattributecreator3d.hxx diff --git a/svx/inc/svx/sdr/properties/attributeproperties.hxx b/svx/inc/svx/sdr/properties/attributeproperties.hxx index bb7343ab21..bb7343ab21 100644..100755 --- a/svx/inc/svx/sdr/properties/attributeproperties.hxx +++ b/svx/inc/svx/sdr/properties/attributeproperties.hxx diff --git a/svx/inc/svx/sdr/properties/captionproperties.hxx b/svx/inc/svx/sdr/properties/captionproperties.hxx index e3aaee1b8a..e3aaee1b8a 100644..100755 --- a/svx/inc/svx/sdr/properties/captionproperties.hxx +++ b/svx/inc/svx/sdr/properties/captionproperties.hxx diff --git a/svx/inc/svx/sdr/properties/circleproperties.hxx b/svx/inc/svx/sdr/properties/circleproperties.hxx index abca379f97..abca379f97 100644..100755 --- a/svx/inc/svx/sdr/properties/circleproperties.hxx +++ b/svx/inc/svx/sdr/properties/circleproperties.hxx diff --git a/svx/inc/svx/sdr/properties/connectorproperties.hxx b/svx/inc/svx/sdr/properties/connectorproperties.hxx index d68a96bfba..d68a96bfba 100644..100755 --- a/svx/inc/svx/sdr/properties/connectorproperties.hxx +++ b/svx/inc/svx/sdr/properties/connectorproperties.hxx diff --git a/svx/inc/svx/sdr/properties/customshapeproperties.hxx b/svx/inc/svx/sdr/properties/customshapeproperties.hxx index 397635d375..397635d375 100644..100755 --- a/svx/inc/svx/sdr/properties/customshapeproperties.hxx +++ b/svx/inc/svx/sdr/properties/customshapeproperties.hxx diff --git a/svx/inc/svx/sdr/properties/defaultproperties.hxx b/svx/inc/svx/sdr/properties/defaultproperties.hxx index e150fd6d47..e150fd6d47 100644..100755 --- a/svx/inc/svx/sdr/properties/defaultproperties.hxx +++ b/svx/inc/svx/sdr/properties/defaultproperties.hxx diff --git a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx b/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx index 07667f0afd..07667f0afd 100644..100755 --- a/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dcompoundproperties.hxx diff --git a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx b/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx index 9e1bff92eb..9e1bff92eb 100644..100755 --- a/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dextrudeproperties.hxx diff --git a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx b/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx index fe859472d1..fe859472d1 100644..100755 --- a/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dlatheproperties.hxx diff --git a/svx/inc/svx/sdr/properties/e3dproperties.hxx b/svx/inc/svx/sdr/properties/e3dproperties.hxx index 22dc6f83dc..22dc6f83dc 100644..100755 --- a/svx/inc/svx/sdr/properties/e3dproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dproperties.hxx diff --git a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx b/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx index cd45eb59b5..cd45eb59b5 100644..100755 --- a/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dsceneproperties.hxx diff --git a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx b/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx index 2b8baf09cf..2b8baf09cf 100644..100755 --- a/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx +++ b/svx/inc/svx/sdr/properties/e3dsphereproperties.hxx diff --git a/svx/inc/svx/sdr/properties/emptyproperties.hxx b/svx/inc/svx/sdr/properties/emptyproperties.hxx index 598f087c85..598f087c85 100644..100755 --- a/svx/inc/svx/sdr/properties/emptyproperties.hxx +++ b/svx/inc/svx/sdr/properties/emptyproperties.hxx diff --git a/svx/inc/svx/sdr/properties/graphicproperties.hxx b/svx/inc/svx/sdr/properties/graphicproperties.hxx index 8fe3fa2b48..8fe3fa2b48 100644..100755 --- a/svx/inc/svx/sdr/properties/graphicproperties.hxx +++ b/svx/inc/svx/sdr/properties/graphicproperties.hxx diff --git a/svx/inc/svx/sdr/properties/groupproperties.hxx b/svx/inc/svx/sdr/properties/groupproperties.hxx index 8c74997b2f..8c74997b2f 100644..100755 --- a/svx/inc/svx/sdr/properties/groupproperties.hxx +++ b/svx/inc/svx/sdr/properties/groupproperties.hxx diff --git a/svx/inc/svx/sdr/properties/itemsettools.hxx b/svx/inc/svx/sdr/properties/itemsettools.hxx index 65a3fe53c5..65a3fe53c5 100644..100755 --- a/svx/inc/svx/sdr/properties/itemsettools.hxx +++ b/svx/inc/svx/sdr/properties/itemsettools.hxx diff --git a/svx/inc/svx/sdr/properties/measureproperties.hxx b/svx/inc/svx/sdr/properties/measureproperties.hxx index 93f1d040a8..93f1d040a8 100644..100755 --- a/svx/inc/svx/sdr/properties/measureproperties.hxx +++ b/svx/inc/svx/sdr/properties/measureproperties.hxx diff --git a/svx/inc/svx/sdr/properties/oleproperties.hxx b/svx/inc/svx/sdr/properties/oleproperties.hxx index 145a0dc7c1..145a0dc7c1 100644..100755 --- a/svx/inc/svx/sdr/properties/oleproperties.hxx +++ b/svx/inc/svx/sdr/properties/oleproperties.hxx diff --git a/svx/inc/svx/sdr/properties/pageproperties.hxx b/svx/inc/svx/sdr/properties/pageproperties.hxx index 6463cc3988..6463cc3988 100644..100755 --- a/svx/inc/svx/sdr/properties/pageproperties.hxx +++ b/svx/inc/svx/sdr/properties/pageproperties.hxx diff --git a/svx/inc/svx/sdr/properties/properties.hxx b/svx/inc/svx/sdr/properties/properties.hxx index 63b7209e91..63b7209e91 100644..100755 --- a/svx/inc/svx/sdr/properties/properties.hxx +++ b/svx/inc/svx/sdr/properties/properties.hxx diff --git a/svx/inc/svx/sdr/properties/rectangleproperties.hxx b/svx/inc/svx/sdr/properties/rectangleproperties.hxx index abb0deada2..abb0deada2 100644..100755 --- a/svx/inc/svx/sdr/properties/rectangleproperties.hxx +++ b/svx/inc/svx/sdr/properties/rectangleproperties.hxx diff --git a/svx/inc/svx/sdr/properties/textproperties.hxx b/svx/inc/svx/sdr/properties/textproperties.hxx index e8b25922dd..e8b25922dd 100644..100755 --- a/svx/inc/svx/sdr/properties/textproperties.hxx +++ b/svx/inc/svx/sdr/properties/textproperties.hxx diff --git a/svx/inc/svx/sdr/table/tabledesign.hxx b/svx/inc/svx/sdr/table/tabledesign.hxx index 6751143307..6751143307 100644..100755 --- a/svx/inc/svx/sdr/table/tabledesign.hxx +++ b/svx/inc/svx/sdr/table/tabledesign.hxx diff --git a/svx/inc/svx/sdrcomment.hxx b/svx/inc/svx/sdrcomment.hxx index 85c30e7e27..85c30e7e27 100644..100755 --- a/svx/inc/svx/sdrcomment.hxx +++ b/svx/inc/svx/sdrcomment.hxx diff --git a/svx/inc/svx/sdrhittesthelper.hxx b/svx/inc/svx/sdrhittesthelper.hxx index 16c5bcaf69..16c5bcaf69 100644..100755 --- a/svx/inc/svx/sdrhittesthelper.hxx +++ b/svx/inc/svx/sdrhittesthelper.hxx diff --git a/svx/inc/svx/sdrmasterpagedescriptor.hxx b/svx/inc/svx/sdrmasterpagedescriptor.hxx index ea2974a867..ea2974a867 100644..100755 --- a/svx/inc/svx/sdrmasterpagedescriptor.hxx +++ b/svx/inc/svx/sdrmasterpagedescriptor.hxx diff --git a/svx/inc/svx/sdrobjectfilter.hxx b/svx/inc/svx/sdrobjectfilter.hxx index f2dd3ffe28..f2dd3ffe28 100644..100755 --- a/svx/inc/svx/sdrobjectfilter.hxx +++ b/svx/inc/svx/sdrobjectfilter.hxx diff --git a/svx/inc/svx/sdrobjectuser.hxx b/svx/inc/svx/sdrobjectuser.hxx index bc2a26f56c..bc2a26f56c 100644..100755 --- a/svx/inc/svx/sdrobjectuser.hxx +++ b/svx/inc/svx/sdrobjectuser.hxx diff --git a/svx/inc/svx/sdrpageuser.hxx b/svx/inc/svx/sdrpageuser.hxx index da0d42669a..da0d42669a 100644..100755 --- a/svx/inc/svx/sdrpageuser.hxx +++ b/svx/inc/svx/sdrpageuser.hxx diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx index 2d9a197efb..7d28e5c936 100644..100755 --- a/svx/inc/svx/sdrpagewindow.hxx +++ b/svx/inc/svx/sdrpagewindow.hxx @@ -117,6 +117,7 @@ public: void PrepareRedraw(const Region& rReg); void RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedirector) const; void RedrawLayer(const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector) const; + void PostPaint(); // Invalidate call, used from ObjectContact(OfPageView) in InvalidatePartOfView(...) void InvalidatePageWindow(const basegfx::B2DRange& rRange); diff --git a/svx/inc/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx index 8be3874bbf..8be3874bbf 100644..100755 --- a/svx/inc/sdrpaintwindow.hxx +++ b/svx/inc/svx/sdrpaintwindow.hxx diff --git a/svx/inc/svx/sdshcitm.hxx b/svx/inc/svx/sdshcitm.hxx index 2ba0f39a44..2ba0f39a44 100644..100755 --- a/svx/inc/svx/sdshcitm.hxx +++ b/svx/inc/svx/sdshcitm.hxx diff --git a/svx/inc/svx/sdshitm.hxx b/svx/inc/svx/sdshitm.hxx index 64ad547cb3..fa76e53578 100644..100755 --- a/svx/inc/svx/sdshitm.hxx +++ b/svx/inc/svx/sdshitm.hxx @@ -36,7 +36,7 @@ //------------------------------ class SdrShadowItem: public SdrOnOffItem { public: - SdrShadowItem(BOOL bShadow=FALSE): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {} + SdrShadowItem(sal_Bool bShadow=sal_False): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {} SdrShadowItem(SvStream& rIn): SdrOnOffItem(SDRATTR_SHADOW, rIn) {} }; diff --git a/svx/inc/svx/sdshtitm.hxx b/svx/inc/svx/sdshtitm.hxx index 200a352a67..cb54c7e07a 100644..100755 --- a/svx/inc/svx/sdshtitm.hxx +++ b/svx/inc/svx/sdshtitm.hxx @@ -36,7 +36,7 @@ //--------------------- class SdrShadowTransparenceItem: public SdrPercentItem { public: - SdrShadowTransparenceItem(USHORT nTransp=0): SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,nTransp) {} + SdrShadowTransparenceItem(sal_uInt16 nTransp=0): SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,nTransp) {} SdrShadowTransparenceItem(SvStream& rIn) : SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,rIn) {} }; diff --git a/svx/inc/svx/sdsxyitm.hxx b/svx/inc/svx/sdsxyitm.hxx index 5a1a70c2a2..5a1a70c2a2 100644..100755 --- a/svx/inc/svx/sdsxyitm.hxx +++ b/svx/inc/svx/sdsxyitm.hxx diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx index 773cf0207e..7e46724207 100644..100755 --- a/svx/inc/svx/sdtaaitm.hxx +++ b/svx/inc/svx/sdtaaitm.hxx @@ -35,10 +35,10 @@ class SVX_DLLPUBLIC SdrTextAniAmountItem: public SfxInt16Item { public: TYPEINFO(); - SdrTextAniAmountItem(INT16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {} + SdrTextAniAmountItem(sal_Int16 nVal=0): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,nVal) {} SdrTextAniAmountItem(SvStream& rIn): SfxInt16Item(SDRATTR_TEXT_ANIAMOUNT,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual bool HasMetrics() const; virtual bool ScaleMetrics(long nMul, long nDiv); diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx index bde531d20f..19da878a48 100644..100755 --- a/svx/inc/svx/sdtacitm.hxx +++ b/svx/inc/svx/sdtacitm.hxx @@ -34,7 +34,7 @@ // Number of loops. 0=infinite. class SdrTextAniCountItem: public SfxUInt16Item { public: - SdrTextAniCountItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {} + SdrTextAniCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {} SdrTextAniCountItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,rIn) {} }; diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx index b44e5ecc6e..21fdc6f06b 100644..100755 --- a/svx/inc/svx/sdtaditm.hxx +++ b/svx/inc/svx/sdtaditm.hxx @@ -44,17 +44,17 @@ enum SdrTextAniDirection {SDRTEXTANI_LEFT, class SVX_DLLPUBLIC SdrTextAniDirectionItem: public SfxEnumItem { public: TYPEINFO(); - SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(USHORT)eDir) {} + SdrTextAniDirectionItem(SdrTextAniDirection eDir=SDRTEXTANI_LEFT): SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,(sal_uInt16)eDir) {} SdrTextAniDirectionItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIDIRECTION,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; SdrTextAniDirection GetValue() const { return (SdrTextAniDirection)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdtagitm.hxx b/svx/inc/svx/sdtagitm.hxx index 2b873350fd..28ebc78f56 100644..100755 --- a/svx/inc/svx/sdtagitm.hxx +++ b/svx/inc/svx/sdtagitm.hxx @@ -36,7 +36,7 @@ //------------------------------------ class SdrTextAutoGrowHeightItem: public SdrOnOffItem { public: - SdrTextAutoGrowHeightItem(BOOL bAuto=TRUE): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,bAuto) {} + SdrTextAutoGrowHeightItem(sal_Bool bAuto=sal_True): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,bAuto) {} SdrTextAutoGrowHeightItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_AUTOGROWHEIGHT,rIn) {} }; @@ -45,7 +45,7 @@ public: //------------------------------------ class SdrTextAutoGrowWidthItem: public SdrOnOffItem { public: - SdrTextAutoGrowWidthItem(BOOL bAuto=FALSE): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,bAuto) {} + SdrTextAutoGrowWidthItem(sal_Bool bAuto=sal_False): SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,bAuto) {} SdrTextAutoGrowWidthItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_AUTOGROWWIDTH,rIn) {} }; diff --git a/svx/inc/svx/sdtaiitm.hxx b/svx/inc/svx/sdtaiitm.hxx index d1c7c0ff95..b3f941fc0b 100644..100755 --- a/svx/inc/svx/sdtaiitm.hxx +++ b/svx/inc/svx/sdtaiitm.hxx @@ -33,13 +33,13 @@ class SdrTextAniStartInsideItem: public SdrYesNoItem { public: - SdrTextAniStartInsideItem(BOOL bOn=FALSE): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {} + SdrTextAniStartInsideItem(sal_Bool bOn=sal_False): SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,bOn) {} SdrTextAniStartInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTARTINSIDE,rIn) {} }; class SdrTextAniStopInsideItem: public SdrYesNoItem { public: - SdrTextAniStopInsideItem(BOOL bOn=FALSE): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {} + SdrTextAniStopInsideItem(sal_Bool bOn=sal_False): SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,bOn) {} SdrTextAniStopInsideItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_TEXT_ANISTOPINSIDE,rIn) {} }; diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx index 45d063fbe3..40394f3022 100644..100755 --- a/svx/inc/svx/sdtaitm.hxx +++ b/svx/inc/svx/sdtaitm.hxx @@ -45,17 +45,17 @@ enum SdrTextVertAdjust {SDRTEXTVERTADJUST_TOP, // aligned to top (normally class SVX_DLLPUBLIC SdrTextVertAdjustItem: public SfxEnumItem { public: TYPEINFO(); - SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(USHORT)eAdj) {} + SdrTextVertAdjustItem(SdrTextVertAdjust eAdj=SDRTEXTVERTADJUST_TOP): SfxEnumItem(SDRATTR_TEXT_VERTADJUST,(sal_uInt16)eAdj) {} SdrTextVertAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_VERTADJUST,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 5; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 5; } SdrTextVertAdjust GetValue() const { return (SdrTextVertAdjust)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; @@ -72,17 +72,17 @@ enum SdrTextHorzAdjust {SDRTEXTHORZADJUST_LEFT, // left adjusted class SVX_DLLPUBLIC SdrTextHorzAdjustItem: public SfxEnumItem { public: TYPEINFO(); - SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(USHORT)eAdj) {} + SdrTextHorzAdjustItem(SdrTextHorzAdjust eAdj=SDRTEXTHORZADJUST_BLOCK): SfxEnumItem(SDRATTR_TEXT_HORZADJUST,(sal_uInt16)eAdj) {} SdrTextHorzAdjustItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_HORZADJUST,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; SdrTextHorzAdjust GetValue() const { return (SdrTextHorzAdjust)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx index ff00264f9d..0b51c7d90d 100644..100755 --- a/svx/inc/svx/sdtakitm.hxx +++ b/svx/inc/svx/sdtakitm.hxx @@ -46,8 +46,8 @@ enum SdrTextAniKind {SDRTEXTANI_NONE, // Einfach nur Blinken. Direction und Amount ohne Wirkung. // Frequenz siehe Delay, 0=0.5Hz (Delay=250). // Count=Anzahl der blinker. 0=Endlos. -// StartInside: FALSE=beginnend mit Pause, TRUE=Beginnend mit Puls -// StopInside: FALSE=Nach Count blinkern nicht sichtbar, TRUE=sichtbar +// StartInside: sal_False=beginnend mit Pause, sal_True=Beginnend mit Puls +// StopInside: sal_False=Nach Count blinkern nicht sichtbar, sal_True=sichtbar // (nur wenn Count!=0) // - SDRTEXTANI_SCROLL: // Schrift laeuft rein, laeuft vollstaendig durch. Wenn ganz verschwunden @@ -55,12 +55,12 @@ enum SdrTextAniKind {SDRTEXTANI_NONE, // Delay in ms, Sonderfall Delay=0 wird auf 50ms defaulted (20Hz) // Count=Durchlaufanzahl (0=Endlos) // Direction: ist eben die Richtung in die gescrollt wird. -// StartInside: FALSE=Schrift wird auch beim ersten Durchlauf reingescrollt -// TRUE=Der linke Teil der Schrift steht beim ersten Durchlauf +// StartInside: sal_False=Schrift wird auch beim ersten Durchlauf reingescrollt +// sal_True=Der linke Teil der Schrift steht beim ersten Durchlauf // bereits da (im sichtbaren "Scrollbereich") -// StopInside: FALSE=Schrift wird auch beim letzten Durchlauf vollstaendig +// StopInside: sal_False=Schrift wird auch beim letzten Durchlauf vollstaendig // rausgescrollt -// TRUE=Schrift wird beim letzten Durchlauf nicht rausgescrollt +// sal_True=Schrift wird beim letzten Durchlauf nicht rausgescrollt // (nur wenn Count!=0) // Amount: Schrittweite in logischen Einheiten. Negative Werte bedeuten // Pixel statt log. Einheiten. Wenn Amount=0, dann wird auf @@ -75,31 +75,31 @@ enum SdrTextAniKind {SDRTEXTANI_NONE, // Alle andern Parameter wie SDRTEXTANI_SCROLL // - SDRTEXTANI_SLIDE: // Schrift wird nur reingeschoben bis zur Originalposition. -// -> also wie SCROLL mit StartInside=FALSE, StopInside=TRUE +// -> also wie SCROLL mit StartInside=sal_False, StopInside=TRUE // und Count=1. Count=0 wird als Count=1 interpretiert. // Fuer jeden Count>1 wird der Text jedoch ruekwaerts wieder vollstaendig // rausgeschoben (aehnlich wie ALTERNATE) und dann wieder reingeschoben. // StopInside wird nicht ausgewertet, weil immer Inside gestoppt wird. // StartInside wird nicht ausgewertet, weil immer Outside gestartet wird. // Alle andern Parameter wie SDRTEXTANI_SCROLL -// StartInside,StopInside: Bei TRUE ist die anfaengliche/entgueltige +// StartInside,StopInside: Bei sal_True ist die anfaengliche/entgueltige // Textposition abhaengig von der Textverankerung am Zeichenobjekt. Sie // entspricht der Textposition bei normalem Paint (ohne Laufschrift). class SVX_DLLPUBLIC SdrTextAniKindItem: public SfxEnumItem { public: TYPEINFO(); - SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(USHORT)eKind) {} + SdrTextAniKindItem(SdrTextAniKind eKind=SDRTEXTANI_NONE): SfxEnumItem(SDRATTR_TEXT_ANIKIND,(sal_uInt16)eKind) {} SdrTextAniKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_ANIKIND,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 5; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 5; } SdrTextAniKind GetValue() const { return (SdrTextAniKind)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx index bbeaa28bb0..85093691d3 100644..100755 --- a/svx/inc/svx/sdtayitm.hxx +++ b/svx/inc/svx/sdtayitm.hxx @@ -35,10 +35,10 @@ class SVX_DLLPUBLIC SdrTextAniDelayItem: public SfxUInt16Item { public: TYPEINFO(); - SdrTextAniDelayItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {} + SdrTextAniDelayItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,nVal) {} SdrTextAniDelayItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANIDELAY,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sdtcfitm.hxx b/svx/inc/svx/sdtcfitm.hxx index 7ccddfcd9d..4cf6d36b86 100644..100755 --- a/svx/inc/svx/sdtcfitm.hxx +++ b/svx/inc/svx/sdtcfitm.hxx @@ -36,7 +36,7 @@ //------------------------------------ class SdrTextContourFrameItem: public SdrOnOffItem { public: - SdrTextContourFrameItem(BOOL bOn=FALSE): SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {} + SdrTextContourFrameItem(sal_Bool bOn=sal_False): SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {} SdrTextContourFrameItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,rIn) {} }; diff --git a/svx/inc/svx/sdtditm.hxx b/svx/inc/svx/sdtditm.hxx index 3c4b9b74d8..3c4b9b74d8 100644..100755 --- a/svx/inc/svx/sdtditm.hxx +++ b/svx/inc/svx/sdtditm.hxx diff --git a/svx/inc/svx/sdtfchim.hxx b/svx/inc/svx/sdtfchim.hxx index db42edd7e8..763c08d1d6 100644..100755 --- a/svx/inc/svx/sdtfchim.hxx +++ b/svx/inc/svx/sdtfchim.hxx @@ -35,7 +35,7 @@ class SVX_DLLPUBLIC SdrTextFixedCellHeightItem : public SfxBoolItem public: TYPEINFO(); - SdrTextFixedCellHeightItem( BOOL bUseFixedCellHeight = FALSE ); + SdrTextFixedCellHeightItem( sal_Bool bUseFixedCellHeight = sal_False ); SVX_DLLPRIVATE SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion ); SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, @@ -47,8 +47,8 @@ public: SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx index 45fec5134b..d1b353b8b2 100644..100755 --- a/svx/inc/svx/sdtfsitm.hxx +++ b/svx/inc/svx/sdtfsitm.hxx @@ -54,21 +54,21 @@ enum SdrFitToSizeType { class SVX_DLLPUBLIC SdrTextFitToSizeTypeItem: public SfxEnumItem { public: TYPEINFO(); - SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(USHORT)eFit) {} + SdrTextFitToSizeTypeItem(SdrFitToSizeType eFit=SDRTEXTFIT_NONE): SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,(sal_uInt16)eFit) {} SdrTextFitToSizeTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_TEXT_FITTOSIZE,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 4; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 4; } SdrFitToSizeType GetValue() const { return (SdrFitToSizeType)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; virtual int HasBoolValue() const; - virtual BOOL GetBoolValue() const; - virtual void SetBoolValue(BOOL bVal); + virtual sal_Bool GetBoolValue() const; + virtual void SetBoolValue(sal_Bool bVal); }; #endif diff --git a/svx/inc/svx/sdtmfitm.hxx b/svx/inc/svx/sdtmfitm.hxx index 00d8c4f14f..00d8c4f14f 100644..100755 --- a/svx/inc/svx/sdtmfitm.hxx +++ b/svx/inc/svx/sdtmfitm.hxx diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx index 2d84a5f4fb..5e1942d3c5 100644..100755 --- a/svx/inc/svx/sdynitm.hxx +++ b/svx/inc/svx/sdynitm.hxx @@ -41,11 +41,11 @@ class SVX_DLLPUBLIC SdrYesNoItem: public SfxBoolItem { public: TYPEINFO(); SdrYesNoItem(): SfxBoolItem() {} - SdrYesNoItem(USHORT nId, BOOL bOn=FALSE): SfxBoolItem(nId,bOn) {} - SdrYesNoItem(USHORT nId, SvStream& rIn): SfxBoolItem(nId,rIn) {} + SdrYesNoItem(sal_uInt16 nId, sal_Bool bOn=sal_False): SfxBoolItem(nId,bOn) {} + SdrYesNoItem(sal_uInt16 nId, SvStream& rIn): SfxBoolItem(nId,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual String GetValueTextByVal(BOOL bVal) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual String GetValueTextByVal(sal_Bool bVal) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/selctrl.hxx b/svx/inc/svx/selctrl.hxx index ab22210bde..c618931660 100644..100755 --- a/svx/inc/selctrl.hxx +++ b/svx/inc/svx/selctrl.hxx @@ -38,19 +38,19 @@ class SVX_DLLPUBLIC SvxSelectionModeControl : public SfxStatusBarControl { public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Click(); virtual void Paint( const UserDrawEvent& rEvt ); SFX_DECL_STATUSBAR_CONTROL(); - SvxSelectionModeControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SvxSelectionModeControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); - static ULONG GetDefItemWidth(const StatusBar& rStb); + static sal_uIntPtr GetDefItemWidth(const StatusBar& rStb); private: - USHORT nState; + sal_uInt16 nState; #ifdef _SVX_SELCTRL_CXX SVX_DLLPRIVATE void DrawItemText_Impl(); diff --git a/svx/inc/svx/selectioncontroller.hxx b/svx/inc/svx/selectioncontroller.hxx index 3a114ea7c6..3a114ea7c6 100644..100755 --- a/svx/inc/svx/selectioncontroller.hxx +++ b/svx/inc/svx/selectioncontroller.hxx diff --git a/svx/inc/svx/shapeproperty.hxx b/svx/inc/svx/shapeproperty.hxx index be8c710520..be8c710520 100644..100755 --- a/svx/inc/svx/shapeproperty.hxx +++ b/svx/inc/svx/shapeproperty.hxx diff --git a/svx/inc/svx/shapepropertynotifier.hxx b/svx/inc/svx/shapepropertynotifier.hxx index 504bcae8d5..504bcae8d5 100644..100755 --- a/svx/inc/svx/shapepropertynotifier.hxx +++ b/svx/inc/svx/shapepropertynotifier.hxx diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index 8c4ebfbd09..0dfbc5b275 100644..100755 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -67,11 +67,11 @@ private: SvxSimpTblContainer aPrivContainer; HeaderBar aHeaderBar; long nOldPos; - USHORT nHeaderItemId; - BOOL bResizeFlag; - BOOL bPaintFlag; - BOOL bSortDirection; - USHORT nSortCol; + sal_uInt16 nHeaderItemId; + sal_Bool bResizeFlag; + sal_Bool bPaintFlag; + sal_Bool bSortDirection; + sal_uInt16 nSortCol; Window* pMyParentWin; DECL_LINK( StartDragHdl, HeaderBar* ); @@ -107,7 +107,7 @@ public: ~SvxSimpleTable(); void InsertHeaderEntry(const XubString& rText, - USHORT nCol=HEADERBAR_APPEND, + sal_uInt16 nCol=HEADERBAR_APPEND, HeaderBarItemBits nBits = HIB_STDSTYLE); void SetTabs( long* pTabs, MapUnit = MAP_APPFONT ); @@ -132,11 +132,11 @@ public: void ShowTable(); void HideTable(); - BOOL IsVisible() const; + sal_Bool IsVisible() const; void EnableTable(); void DisableTable(); - BOOL IsEnabled() const; + sal_Bool IsEnabled() const; void TableToTop(); void SetPosPixel( const Point& rNewPos ); @@ -149,11 +149,11 @@ public: Size GetSizePixel() const; Size GetOutputSizePixel() const; - USHORT GetSelectedCol(); - void SortByCol(USHORT,BOOL bDir=TRUE); - BOOL GetSortDirection(){ return bSortDirection;} - USHORT GetSortedCol(){ return nSortCol;} - SvLBoxItem* GetEntryAtPos( SvLBoxEntry* pEntry, USHORT nPos ) const; + sal_uInt16 GetSelectedCol(); + void SortByCol(sal_uInt16,sal_Bool bDir=sal_True); + sal_Bool GetSortDirection(){ return bSortDirection;} + sal_uInt16 GetSortedCol(){ return nSortCol;} + SvLBoxItem* GetEntryAtPos( SvLBoxEntry* pEntry, sal_uInt16 nPos ) const; CommandEvent GetCommandEvent()const; inline sal_Bool IsFocusOnCellEnabled() const { return IsCellFocusEnabled(); } @@ -167,7 +167,7 @@ public: void SetHeaderBarDblClickHdl( const Link& rLink ) { aHeaderBarDblClickLink = rLink; } const Link& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; } - void SetHeaderBarHelpId(ULONG nHelpId) {aHeaderBar.SetHelpId(nHelpId);} + void SetHeaderBarHelpId(const rtl::OString& rHelpId) {aHeaderBar.SetHelpId(rHelpId);} }; diff --git a/svx/inc/svx/sphere3d.hxx b/svx/inc/svx/sphere3d.hxx index 99c6730289..6c71b797ee 100644..100755 --- a/svx/inc/svx/sphere3d.hxx +++ b/svx/inc/svx/sphere3d.hxx @@ -68,8 +68,8 @@ public: sal_uInt32 GetVerticalSegments() const { return ((const Svx3DVerticalSegmentsItem&)GetObjectItemSet().Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); } - virtual UINT16 GetObjIdentifier() const; - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual sal_uInt16 GetObjIdentifier() const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual void operator=(const SdrObject&); diff --git a/svx/inc/svx/splitcelldlg.hxx b/svx/inc/svx/splitcelldlg.hxx index 58ed1b9c08..0bbf42a8de 100644..100755 --- a/svx/inc/svx/splitcelldlg.hxx +++ b/svx/inc/svx/splitcelldlg.hxx @@ -30,7 +30,7 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <vcl/button.hxx> #include <svx/stddlg.hxx> diff --git a/svx/inc/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx index 85adcf8a09..a4d1c008ee 100644..100755 --- a/svx/inc/srchdlg.hxx +++ b/svx/inc/svx/srchdlg.hxx @@ -65,7 +65,7 @@ struct SearchDlg_Impl; struct SearchAttrItem { - USHORT nSlot; + sal_uInt16 nSlot; SfxPoolItem* pItem; }; @@ -83,17 +83,17 @@ public: void Put( const SfxItemSet& rSet ); SfxItemSet& Get( SfxItemSet& rSet ); void Clear(); - USHORT Count() const { return SrchAttrItemList::Count(); } - SearchAttrItem& operator[](USHORT nPos) const + sal_uInt16 Count() const { return SrchAttrItemList::Count(); } + SearchAttrItem& operator[](sal_uInt16 nPos) const { return SrchAttrItemList::operator[]( nPos ); } - SearchAttrItem& GetObject( USHORT nPos ) const + SearchAttrItem& GetObject( sal_uInt16 nPos ) const { return SrchAttrItemList::GetObject( nPos ); } // the pointer to the item is not being copierd, so don't delete void Insert( const SearchAttrItem& rItem ) { SrchAttrItemList::Insert( rItem, SrchAttrItemList::Count() ); } // deletes the pointer to the items - void Remove( USHORT nPos, USHORT nLen = 1 ); + void Remove( sal_uInt16 nPos, sal_uInt16 nLen = 1 ); }; #ifndef SV_NODIALOG @@ -108,7 +108,7 @@ class SVX_DLLPUBLIC SvxSearchDialogWrapper : public SfxChildWindow { SvxSearchDialog *dialog; public: - SvxSearchDialogWrapper( Window*pParent, USHORT nId, + SvxSearchDialogWrapper( Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); ~SvxSearchDialogWrapper (); @@ -119,7 +119,7 @@ public: // class SvxSearchDialog ------------------------------------------------- /* - {k:\svx\prototyp\dialog\srchdlg.hxx} + {k:\svx\prototyp\dialog\svx/srchdlg.hxx} [Description] In this modeless dialog the attributes for a search are configured @@ -141,7 +141,7 @@ public: SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ); ~SvxSearchDialog(); - virtual BOOL Close(); + virtual sal_Bool Close(); // Window virtual void Activate(); @@ -154,12 +154,12 @@ public: const SearchAttrItemList* GetReplaceItemList() const { return pReplaceList; } - inline BOOL HasSearchAttributes() const; - inline BOOL HasReplaceAttributes() const; + inline sal_Bool HasSearchAttributes() const; + inline sal_Bool HasReplaceAttributes() const; PushButton& GetReplaceBtn() { return aReplaceBtn; } - INT32 GetTransliterationFlags() const; + sal_Int32 GetTransliterationFlags() const; void SetSaveToModule(bool b); @@ -217,14 +217,14 @@ private: CheckBox aAllSheetsCB; SfxBindings& rBindings; - BOOL bWriter; - BOOL bSearch; - BOOL bFormat; - USHORT nOptions; + sal_Bool bWriter; + sal_Bool bSearch; + sal_Bool bFormat; + sal_uInt16 nOptions; bool bSet; bool bReadOnly; bool bConstruct; - ULONG nModifyFlag; + sal_uIntPtr nModifyFlag; String aStylesStr; String aLayoutStr; LocalizedString aCalcStr; @@ -243,7 +243,7 @@ private: SvxSearchController* pSearchSetController; SvxSearchController* pReplaceSetController; - mutable INT32 nTransliterationFlags; + mutable sal_Int32 nTransliterationFlags; #ifdef _SVX_SRCHDLG_CXX DECL_LINK( ModifyHdl_Impl, ComboBox* pEdit ); @@ -263,31 +263,31 @@ private: void Init_Impl( int bHasItemSet ); void InitAttrList_Impl( const SfxItemSet* pSSet, const SfxItemSet* pRSet ); - void Remember_Impl( const String &rStr,BOOL bSearch ); + void Remember_Impl( const String &rStr,sal_Bool bSearch ); void PaintAttrText_Impl(); - String& BuildAttrText_Impl( String& rStr, BOOL bSrchFlag ) const; + String& BuildAttrText_Impl( String& rStr, sal_Bool bSrchFlag ) const; void TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ); - void EnableControls_Impl( const USHORT nFlags ); + void EnableControls_Impl( const sal_uInt16 nFlags ); void EnableControl_Impl( Control* pCtrl ); void SetItem_Impl( const SvxSearchItem* pItem ); void SetModifyFlag_Impl( const Control* pCtrl ); void SaveToModule_Impl(); - void ApplyTransliterationFlags_Impl( INT32 nSettings ); + void ApplyTransliterationFlags_Impl( sal_Int32 nSettings ); #endif }; #include <sfx2/layout-post.hxx> -inline BOOL SvxSearchDialog::HasSearchAttributes() const +inline sal_Bool SvxSearchDialog::HasSearchAttributes() const { int bLen = aSearchAttrText.GetText().Len(); return ( aSearchAttrText.IsEnabled() && bLen ); } -inline BOOL SvxSearchDialog::HasReplaceAttributes() const +inline sal_Bool SvxSearchDialog::HasReplaceAttributes() const { int bLen = aReplaceAttrText.GetText().Len(); return ( aReplaceAttrText.IsEnabled() && bLen ); diff --git a/svx/inc/svx/stddlg.hxx b/svx/inc/svx/stddlg.hxx index 5b6faca80c..5b6faca80c 100644..100755 --- a/svx/inc/svx/stddlg.hxx +++ b/svx/inc/svx/stddlg.hxx diff --git a/svx/inc/svx/strarray.hxx b/svx/inc/svx/strarray.hxx index 6b5eb42c6d..6b5eb42c6d 100644..100755 --- a/svx/inc/svx/strarray.hxx +++ b/svx/inc/svx/strarray.hxx diff --git a/svx/inc/svx/subtoolboxcontrol.hxx b/svx/inc/svx/subtoolboxcontrol.hxx index eb041e478a..b089519ad0 100644..100755 --- a/svx/inc/svx/subtoolboxcontrol.hxx +++ b/svx/inc/svx/subtoolboxcontrol.hxx @@ -41,7 +41,7 @@ class SVX_DLLPUBLIC SvxSubToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxSubToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxSubToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxSubToolBoxControl(); virtual SfxPopupWindowType GetPopupWindowType() const; diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx index a10d84a463..a10d84a463 100644..100755 --- a/svx/inc/svx/svdattr.hxx +++ b/svx/inc/svx/svdattr.hxx diff --git a/svx/inc/svx/svdattrx.hxx b/svx/inc/svx/svdattrx.hxx index 188824c381..188824c381 100644..100755 --- a/svx/inc/svx/svdattrx.hxx +++ b/svx/inc/svx/svdattrx.hxx diff --git a/svx/inc/svx/svdcrtv.hxx b/svx/inc/svx/svdcrtv.hxx index fac8f2ab78..f60cb602e1 100644..100755 --- a/svx/inc/svx/svdcrtv.hxx +++ b/svx/inc/svx/svdcrtv.hxx @@ -72,10 +72,10 @@ protected: Pointer aAktCreatePointer; - INT32 nAutoCloseDistPix; - INT32 nFreeHandMinDistPix; - UINT32 nAktInvent; // Aktuell eingestelltes - UINT16 nAktIdent; // Obj fuer Neuerzeugung + sal_Int32 nAutoCloseDistPix; + sal_Int32 nFreeHandMinDistPix; + sal_uInt32 nAktInvent; // Aktuell eingestelltes + sal_uInt16 nAktIdent; // Obj fuer Neuerzeugung unsigned bAutoTextEdit : 1; // Textedit nach dem erzeugen eines Textrahmens starten unsigned b1stPointAsCenter : 1; @@ -93,9 +93,9 @@ protected: sal_Bool ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, sal_Int16 nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject); - void ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/); - void HideCreateObj(/*OutputDevice* pOut, BOOL bFull*/); - BOOL CheckEdgeMode(); + void ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/); + void HideCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/); + sal_Bool CheckEdgeMode(); protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView @@ -103,14 +103,14 @@ protected: virtual ~SdrCreateView(); public: - virtual BOOL IsAction() const; + virtual sal_Bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); virtual void BrkAction(); virtual void TakeActionRect(Rectangle& rRect) const; - virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); void SetActiveLayer(const String& rName) { aAktLayer=rName; } const String& GetActiveLayer() const { return aAktLayer; } @@ -120,70 +120,70 @@ public: // Ist der MeasureLayer nicht gesetzt (Leerstring), so // wird der ActiveLayer auch fuer Bemassung verwendet. void SetEditMode(SdrViewEditMode eMode) { SdrDragView::SetEditMode(eMode); CheckEdgeMode(); } - void SetEditMode(BOOL bOn=TRUE) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); } - void SetCreateMode(BOOL bOn=TRUE) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); } - void SetGluePointEditMode(BOOL bOn=TRUE) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); } + void SetEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); } + void SetCreateMode(sal_Bool bOn=sal_True) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); } + void SetGluePointEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetGluePointEditMode(bOn); CheckEdgeMode(); } // Feststellen, ob Textwerkzeug aktiviert - BOOL IsTextTool() const; + sal_Bool IsTextTool() const; // Feststellen, ob Objektverbinderwerkzeug aktiviert - BOOL IsEdgeTool() const; + sal_Bool IsEdgeTool() const; // Feststellen, ob Bemassungswerkzeug aktiviert - BOOL IsMeasureTool() const; + sal_Bool IsMeasureTool() const; - void SetCurrentObj(UINT16 nIdent, UINT32 nInvent=SdrInventor); - void TakeCurrentObj(UINT16& nIdent, UINT32& nInvent) const { nInvent=nAktInvent; nIdent=nAktIdent; } - UINT32 GetCurrentObjInventor() const { return nAktInvent; } - UINT16 GetCurrentObjIdentifier() const { return nAktIdent; } + void SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent=SdrInventor); + void TakeCurrentObj(sal_uInt16& nIdent, sal_uInt32& nInvent) const { nInvent=nAktInvent; nIdent=nAktIdent; } + sal_uInt32 GetCurrentObjInventor() const { return nAktInvent; } + sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; } // Starten des normalen Create - BOOL BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); + sal_Bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); sal_Bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject); void MovCreateObj(const Point& rPnt); - BOOL EndCreateObj(SdrCreateCmd eCmd); + sal_Bool EndCreateObj(SdrCreateCmd eCmd); void BckCreateObj(); // z.B. wieder 1 Polygonpunkt zurueck. void BrkCreateObj(); - BOOL IsCreateObj() const { return pAktCreate!=NULL; } + sal_Bool IsCreateObj() const { return pAktCreate!=NULL; } SdrObject* GetCreateObj() const { return pAktCreate; } // BegCreateCaptionObj() erzeugt ein SdrCaptionObj (Legendenobjekt). // rObjSiz ist die anfaengliche Groesse des Legenden-Textrahmens. // gedraggd wird lediglich die Laenge des Zipfel. - BOOL BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); + sal_Bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); - // Wenn TextEditAfterCreate auf TRUE steht (das ist der Default), + // Wenn TextEditAfterCreate auf sal_True steht (das ist der Default), // dann wird nach dem erzeugen eines Textrahmenobjekts (OBJ_TEXT, // OBJ_TEXTEXT, OBJ_OUTLINERTEXT, OBJ_TITLETEXT, OBJ_CAPTION) // automatisch ein TextEdit (SdrObjEditView::SdrBeginTextEdit) gestartet. - BOOL IsTextEditAfterCreate() const { return bAutoTextEdit; } - void SetTextEditAfterCreate(BOOL bOn) { bAutoTextEdit = bOn; } + sal_Bool IsTextEditAfterCreate() const { return bAutoTextEdit; } + void SetTextEditAfterCreate(sal_Bool bOn) { bAutoTextEdit = bOn; } // Erzeugen eines Kreises/Rechtecks/Textrahmens wobei der 1. Punkt // nicht die linke obere Ecke, sondern das Zentrum des Objekts vorgibt. // Persistentes Flag. Default=FALSE. - BOOL IsCreate1stPointAsCenter() const { return b1stPointAsCenter; } - void SetCreate1stPointAsCenter(BOOL bOn) { b1stPointAsCenter = bOn; } + sal_Bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; } + void SetCreate1stPointAsCenter(sal_Bool bOn) { b1stPointAsCenter = bOn; } // Fuer Polylines (OBJ_PLIN) und Freihandlinien (OBJ_FREELINE). Ist dieses - // Flag TRUE, werden diese beiden Objekttypen implizit geschlossen und in + // Flag sal_True, werden diese beiden Objekttypen implizit geschlossen und in // Polygon (OBJ_POLY) bzw. Freihandflaeche (OBJ_FREEFILL) gewandelt falls // zum Ende des Create die Distanz zwischen Startpunkt und Endpunkt des // Objekts <=n Pixel ist, wobei SetAutoCloseDistPix vorgegeben wird. // Default=TRUE. - BOOL IsAutoClosePolys() const { return bAutoClosePolys; } - void SetAutoClosePolys(BOOL bOn) { bAutoClosePolys=bOn; } + sal_Bool IsAutoClosePolys() const { return bAutoClosePolys; } + void SetAutoClosePolys(sal_Bool bOn) { bAutoClosePolys=bOn; } // Default=5 Pixel. - USHORT GetAutoCloseDistPix() const { return USHORT(nAutoCloseDistPix); } - void SetAutoCloseDistPix(USHORT nVal) { nAutoCloseDistPix=nVal; } + sal_uInt16 GetAutoCloseDistPix() const { return sal_uInt16(nAutoCloseDistPix); } + void SetAutoCloseDistPix(sal_uInt16 nVal) { nAutoCloseDistPix=nVal; } // Vorgabe des minimalen Pixelabstands zwischen 2 Bezierpunkten bei der // Erzeugung einer Freihandlinie. // Default=10 Pixel. - USHORT GetFreeHandMinDistPix() const { return USHORT(nFreeHandMinDistPix); } - void SetFreeHandMinDistPix(USHORT nVal) { nFreeHandMinDistPix=nVal; } + sal_uInt16 GetFreeHandMinDistPix() const { return sal_uInt16(nFreeHandMinDistPix); } + void SetFreeHandMinDistPix(sal_uInt16 nVal) { nFreeHandMinDistPix=nVal; } // Wer das (zur restlichen Create-Funktionalitaet von SvDraw) inkompatible // Create-Interface am PathObj beibehalten moechte muss das nachfolgende @@ -191,19 +191,19 @@ public: // OBJ_POLY, OBJ_PLIN, OBJ_PATHLINE, OBJ_PATHFILL // Dieses Flag hat nur voruebergehenden Character. Die betroffenen // Applikationen sollten alsbald umgestellt werden. - // Default=FALSE; - BOOL IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; } - void SetUseIncompatiblePathCreateInterface(BOOL bOn) { bUseIncompatiblePathCreateInterface = bOn; } + // Default=sal_False; + sal_Bool IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; } + void SetUseIncompatiblePathCreateInterface(sal_Bool bOn) { bUseIncompatiblePathCreateInterface = bOn; } void SetConnectMarker(const SdrObjConnection& rCon, const SdrPageView& rPV); void HideConnectMarker(); // Attribute des ggf. gerade in der Erzeugung befindlichen Objekts /* new interface src537 */ - BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const; + sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; - BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll); - SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const; - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr); + sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll); + SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const; + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); }; #endif //_SVDCRTV_HXX diff --git a/svx/inc/svx/svddef.hxx b/svx/inc/svx/svddef.hxx index 08902c1980..da812645be 100644..100755 --- a/svx/inc/svx/svddef.hxx +++ b/svx/inc/svx/svddef.hxx @@ -96,7 +96,7 @@ #define SDRATTR_MISC_FIRST (SDRATTR_CAPTION_LAST + 1) /* 1097 */ /* 1097 */ /* 1080 */ /* Pool V1: 1053 */ #define SDRATTR_ECKENRADIUS (SDRATTR_MISC_FIRST + 0) /* 1097 */ /* 1097 */ /* 1080 long, def=0 */ #define SDRATTR_TEXT_MINFRAMEHEIGHT (SDRATTR_MISC_FIRST + 1) /* 1098 */ /* 1098 */ /* 1081 long, def=0 */ -#define SDRATTR_TEXT_AUTOGROWHEIGHT (SDRATTR_MISC_FIRST + 2) /* 1099 */ /* 1099 */ /* 1082 BOOL, def=TRUE */ +#define SDRATTR_TEXT_AUTOGROWHEIGHT (SDRATTR_MISC_FIRST + 2) /* 1099 */ /* 1099 */ /* 1082 sal_Bool, def=sal_True */ #define SDRATTR_TEXT_FITTOSIZE (SDRATTR_MISC_FIRST + 3) /* 1100 */ /* 1100 */ /* 1083 enum, def=SDRTEXTFIT_NONE */ #define SDRATTR_TEXT_LEFTDIST (SDRATTR_MISC_FIRST + 4) /* 1101 */ /* 1101 */ /* 1084 long, def=0 */ /* Pool V2 */ #define SDRATTR_TEXT_RIGHTDIST (SDRATTR_MISC_FIRST + 5) /* 1102 */ /* 1102 */ /* 1085 long, def=0 */ /* Pool V2 */ @@ -106,15 +106,15 @@ #define SDRATTR_TEXT_MAXFRAMEHEIGHT (SDRATTR_MISC_FIRST + 9) /* 1106 */ /* 1106 */ /* 1089 long, def=0 - Pool V2 */ #define SDRATTR_TEXT_MINFRAMEWIDTH (SDRATTR_MISC_FIRST +10) /* 1107 */ /* 1107 */ /* 1090 long, def=0 - Pool V2 */ #define SDRATTR_TEXT_MAXFRAMEWIDTH (SDRATTR_MISC_FIRST +11) /* 1108 */ /* 1108 */ /* 1091 long, def=0 - Pool V2 */ -#define SDRATTR_TEXT_AUTOGROWWIDTH (SDRATTR_MISC_FIRST +12) /* 1109 */ /* 1109 */ /* 1092 BOOL, def=FALSE - Pool V2 */ +#define SDRATTR_TEXT_AUTOGROWWIDTH (SDRATTR_MISC_FIRST +12) /* 1109 */ /* 1109 */ /* 1092 sal_Bool, def=sal_False - Pool V2 */ #define SDRATTR_TEXT_HORZADJUST (SDRATTR_MISC_FIRST +13) /* 1110 */ /* 1110 */ /* 1093 enum, def=SDRTEXTHORZADJUST_LEFT */ /* Pool V2+ (04-12-1995) */ #define SDRATTR_TEXT_ANIKIND (SDRATTR_MISC_FIRST +14) /* 1111 */ /* 1111 */ /* 1094 enum, def=SDRTEXTANI_NONE - Pool V2/V4 */ #define SDRATTR_TEXT_ANIDIRECTION (SDRATTR_MISC_FIRST +15) /* 1112 */ /* 1112 */ /* 1095 enum, def=SDRTEXTANI_LEFT - Pool V2/V4 */ -#define SDRATTR_TEXT_ANISTARTINSIDE (SDRATTR_MISC_FIRST +16) /* 1113 */ /* 1113 */ /* 1096 BOOL, def=FALSE - Pool V2/V4 */ -#define SDRATTR_TEXT_ANISTOPINSIDE (SDRATTR_MISC_FIRST +17) /* 1114 */ /* 1114 */ /* 1097 BOOL, def=FALSE - Pool V2/V4 */ -#define SDRATTR_TEXT_ANICOUNT (SDRATTR_MISC_FIRST +18) /* 1115 */ /* 1115 */ /* 1098 USHORT, def=0 - Pool V2/V4 */ -#define SDRATTR_TEXT_ANIDELAY (SDRATTR_MISC_FIRST +19) /* 1116 */ /* 1116 */ /* 1099 USHORT, def=0 - Pool V2/V4 */ -#define SDRATTR_TEXT_ANIAMOUNT (SDRATTR_MISC_FIRST +20) /* 1117 */ /* 1117 */ /* 1100 USHORT, def=0 - Pool V2/V4 */ +#define SDRATTR_TEXT_ANISTARTINSIDE (SDRATTR_MISC_FIRST +16) /* 1113 */ /* 1113 */ /* 1096 sal_Bool, def=sal_False - Pool V2/V4 */ +#define SDRATTR_TEXT_ANISTOPINSIDE (SDRATTR_MISC_FIRST +17) /* 1114 */ /* 1114 */ /* 1097 sal_Bool, def=sal_False - Pool V2/V4 */ +#define SDRATTR_TEXT_ANICOUNT (SDRATTR_MISC_FIRST +18) /* 1115 */ /* 1115 */ /* 1098 sal_uInt16, def=0 - Pool V2/V4 */ +#define SDRATTR_TEXT_ANIDELAY (SDRATTR_MISC_FIRST +19) /* 1116 */ /* 1116 */ /* 1099 sal_uInt16, def=0 - Pool V2/V4 */ +#define SDRATTR_TEXT_ANIAMOUNT (SDRATTR_MISC_FIRST +20) /* 1117 */ /* 1117 */ /* 1100 sal_uInt16, def=0 - Pool V2/V4 */ #define SDRATTR_TEXT_CONTOURFRAME (SDRATTR_MISC_FIRST +21) /* 1118 */ /* 1118 */ /* 1101 */ /* Pool V2 */ #define SDRATTR_CUSTOMSHAPE_ADJUSTMENT (SDRATTR_MISC_FIRST +22) /* 1119 */ /* 1119 */ /* 1102 */ /* Pool V2 */ #define SDRATTR_XMLATTRIBUTES (SDRATTR_MISC_FIRST +23) /* 1120 */ /* 1120 */ /* 1103 */ /* Pool V2 */ @@ -169,10 +169,10 @@ // Nur fuer Interfaceing, not implemented yet. /* V4+ */ #define SDRATTR_NOTPERSIST_FIRST (SDRATTR_CIRC_LAST + 1) /* 1180 */ /* 1172 */ /* 1127 */ /* 1110 */ /* Pool V1: 1058 */ -#define SDRATTR_OBJMOVEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 0) /* 1180 BOOL, def=FALSE */ -#define SDRATTR_OBJSIZEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 1) /* 1181 BOOL, def=FALSE */ -#define SDRATTR_OBJPRINTABLE (SDRATTR_NOTPERSIST_FIRST+ 2) /* 1182 BOOL, def=TRUE */ -#define SDRATTR_LAYERID (SDRATTR_NOTPERSIST_FIRST+ 3) /* 1183 USHORT, def=0 */ +#define SDRATTR_OBJMOVEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 0) /* 1180 sal_Bool, def=sal_False */ +#define SDRATTR_OBJSIZEPROTECT (SDRATTR_NOTPERSIST_FIRST+ 1) /* 1181 sal_Bool, def=sal_False */ +#define SDRATTR_OBJPRINTABLE (SDRATTR_NOTPERSIST_FIRST+ 2) /* 1182 sal_Bool, def=sal_True */ +#define SDRATTR_LAYERID (SDRATTR_NOTPERSIST_FIRST+ 3) /* 1183 sal_uInt16, def=0 */ #define SDRATTR_LAYERNAME (SDRATTR_NOTPERSIST_FIRST+ 4) /* 1184 String, def="" */ #define SDRATTR_OBJECTNAME (SDRATTR_NOTPERSIST_FIRST+ 5) /* 1185 String, def="" */ #define SDRATTR_ALLPOSITIONX (SDRATTR_NOTPERSIST_FIRST+ 6) /* 1186 long, def=0 */ diff --git a/svx/inc/svx/svddrag.hxx b/svx/inc/svx/svddrag.hxx index c2d4248a6e..5fad1dd2a9 100644..100755 --- a/svx/inc/svx/svddrag.hxx +++ b/svx/inc/svx/svddrag.hxx @@ -85,7 +85,7 @@ protected: void* aReservePtr4; bool bShown; // Xor sichrbar? - USHORT nMinMov; // Soviel muss erstmal minimal bewegt werden + sal_uInt16 nMinMov; // Soviel muss erstmal minimal bewegt werden bool bMinMoved; // MinMove durchbrochen? bool bHorFixed; // nur Vertikal draggen @@ -99,19 +99,19 @@ protected: protected: void Clear(bool bLeaveOne); - Point& Pnt(ULONG nNum) { return *((Point*)aPnts.GetObject(nNum)); } + Point& Pnt(sal_uIntPtr nNum) { return *((Point*)aPnts.GetObject(nNum)); } //public: SdrDragStatUserData* pUser; // Userdata public: SdrDragStat(): aPnts(1024,16,16) { pUser=NULL; Reset(); } - ~SdrDragStat() { Clear(FALSE); } + ~SdrDragStat() { Clear(sal_False); } void Reset(); SdrView* GetView() const { return pView; } void SetView(SdrView* pV) { pView=pV; } SdrPageView* GetPageView() const { return pPageView; } void SetPageView(SdrPageView* pPV) { pPageView=pPV; } - const Point& GetPoint(ULONG nNum) const { return *((Point*)aPnts.GetObject(nNum)); } - ULONG GetPointAnz() const { return aPnts.Count(); } + const Point& GetPoint(sal_uIntPtr nNum) const { return *((Point*)aPnts.GetObject(nNum)); } + sal_uIntPtr GetPointAnz() const { return aPnts.Count(); } const Point& GetStart() const { return GetPoint(0); } Point& Start() { return Pnt(0); } const Point& GetPrev() const { return GetPoint(GetPointAnz()-(GetPointAnz()>=2 ? 2:1)); } @@ -134,10 +134,10 @@ public: void SetShown(bool bOn) { bShown=bOn; } bool IsMinMoved() const { return bMinMoved; } - void SetMinMoved() { bMinMoved=TRUE; } - void ResetMinMoved() { bMinMoved=FALSE; } - void SetMinMove(USHORT nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; } - USHORT GetMinMove() const { return nMinMov; } + void SetMinMoved() { bMinMoved=sal_True; } + void ResetMinMoved() { bMinMoved=sal_False; } + void SetMinMove(sal_uInt16 nDist) { nMinMov=nDist; if (nMinMov<1) nMinMov=1; } + sal_uInt16 GetMinMove() const { return nMinMov; } bool IsHorFixed() const { return bHorFixed; } void SetHorFixed(bool bOn) { bHorFixed=bOn; } @@ -171,7 +171,7 @@ public: Point KorregPos(const Point& rNow, const Point& rPrev) const; void Reset(const Point& rPnt); void NextMove(const Point& rPnt); - void NextPoint(bool bSaveReal=FALSE); + void NextPoint(bool bSaveReal=sal_False); void PrevPoint(); bool CheckMinMoved(const Point& rPnt); long GetDX() const { return GetNow().X()-GetPrev().X(); } diff --git a/svx/inc/svx/svddrgmt.hxx b/svx/inc/svx/svddrgmt.hxx index 2e5f7ffaf6..2e5f7ffaf6 100644..100755 --- a/svx/inc/svx/svddrgmt.hxx +++ b/svx/inc/svx/svddrgmt.hxx diff --git a/svx/inc/svx/svddrgv.hxx b/svx/inc/svx/svddrgv.hxx index 9b0accba03..91722c302f 100644..100755 --- a/svx/inc/svx/svddrgv.hxx +++ b/svx/inc/svx/svddrgv.hxx @@ -68,10 +68,10 @@ protected: SdrMarkList aFollowingEdges; // Wenn Knoten gedraggd werden, sollen alle Kanten als Xor folgen SdrHdlKind eDragHdl; - ULONG nDragXorPolyLimit; - ULONG nDragXorPointLimit; - USHORT nRubberEdgeDraggingLimit; - USHORT nDetailedEdgeDraggingLimit; + sal_uIntPtr nDragXorPolyLimit; + sal_uIntPtr nDragXorPointLimit; + sal_uInt16 nRubberEdgeDraggingLimit; + sal_uInt16 nDetailedEdgeDraggingLimit; unsigned bFramDrag : 1; // z.Zt. FrameDrag unsigned bDragSpecial : 1; // z.Zt. Special Obj-Dragging @@ -111,7 +111,7 @@ protected: virtual ~SdrDragView(); public: - virtual BOOL IsAction() const; + virtual sal_Bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); @@ -125,72 +125,72 @@ public: // In der Regel ist das die linke obere Ecke des zu erwartenden neuen // SnapRects. Ausnahme: CaptionObj. Dort ist es die Position des // "Schwanzendes". - // Bei Returncode FALSE konnte ich die Position nicht bestimmen + // Bei Returncode sal_False konnte ich die Position nicht bestimmen // (z.B. Punktverschiebung, Mehrfachselektion, Schieben der // Spiegelschse, ...) - BOOL TakeDragObjAnchorPos(Point& rPos, BOOL bTopRight = FALSE ) const; + sal_Bool TakeDragObjAnchorPos(Point& rPos, sal_Bool bTopRight = sal_False ) const; // Wird pForcedMeth uebergeben, so wird pHdl, ... nicht ausgewerten, sondern diese // Drag-Methode verwendet. Die Instanz geht dabei ins Eigentum der View ueber und // wird zum Ende des Draggings destruiert. - virtual BOOL BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL); + virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut=NULL, SdrHdl* pHdl=NULL, short nMinMov=-3, SdrDragMethod* pForcedMeth=NULL); void MovDragObj(const Point& rPnt); - BOOL EndDragObj(BOOL bCopy=FALSE); + sal_Bool EndDragObj(sal_Bool bCopy=sal_False); void BrkDragObj(); - BOOL IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; } + sal_Bool IsDragObj() const { return mpCurrentSdrDragMethod && !bInsPolyPoint && !bInsGluePoint; } SdrHdl* GetDragHdl() const { return pDragHdl; } SdrDragMethod* GetDragMethod() const { return mpCurrentSdrDragMethod; } - BOOL IsDraggingPoints() const { return eDragHdl==HDL_POLY; } - BOOL IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; } + sal_Bool IsDraggingPoints() const { return eDragHdl==HDL_POLY; } + sal_Bool IsDraggingGluePoints() const { return eDragHdl==HDL_GLUE; } // Wer das beim BegDrag oder mittendrin schon festlegen will. - // (Wird bei jedem BegDrag auf FALSE zurueckgesetzt, also nach + // (Wird bei jedem BegDrag auf sal_False zurueckgesetzt, also nach // BegDrag setzen.) - void SetDragWithCopy(BOOL bOn) { bDragWithCopy = bOn; } - BOOL IsDragWithCopy() const { return bDragWithCopy; } + void SetDragWithCopy(sal_Bool bOn) { bDragWithCopy = bOn; } + sal_Bool IsDragWithCopy() const { return bDragWithCopy; } - void SetInsertGluePoint(BOOL bOn) { bInsGluePoint = bOn; } - BOOL IsInsertGluePoint() const { return bInsGluePoint; } + void SetInsertGluePoint(sal_Bool bOn) { bInsGluePoint = bOn; } + sal_Bool IsInsertGluePoint() const { return bInsGluePoint; } // Interaktives einfuegen eines neuen Punktes. nIdx=0 => vor dem ersten Punkt. - BOOL IsInsObjPointPossible() const; - BOOL IsInsPointPossible() const { return IsInsObjPointPossible(); } + sal_Bool IsInsObjPointPossible() const; + sal_Bool IsInsPointPossible() const { return IsInsObjPointPossible(); } sal_Bool BegInsObjPoint(const Point& rPnt, sal_Bool bNewObj) { return ImpBegInsObjPoint(sal_False, 0L, rPnt, bNewObj, 0L); } void MovInsObjPoint(const Point& rPnt) { MovDragObj(rPnt); } - BOOL EndInsObjPoint(SdrCreateCmd eCmd); + sal_Bool EndInsObjPoint(SdrCreateCmd eCmd); void BrkInsObjPoint() { BrkDragObj(); } - BOOL IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; } + sal_Bool IsInsObjPoint() const { return mpCurrentSdrDragMethod && bInsPolyPoint; } // Fuer die App zum Verwalten des Status. GetPreferedPointer() wird // spaeter vielleicht einen passenden Pointer dafuer liefern - void SetInsObjPointMode(BOOL bOn) { bInsObjPointMode = bOn; } - BOOL IsInsObjPointMode() const { return bInsObjPointMode; } + void SetInsObjPointMode(sal_Bool bOn) { bInsObjPointMode = bOn; } + sal_Bool IsInsObjPointMode() const { return bInsObjPointMode; } - BOOL IsInsGluePointPossible() const; - BOOL BegInsGluePoint(const Point& rPnt); + sal_Bool IsInsGluePointPossible() const; + sal_Bool BegInsGluePoint(const Point& rPnt); void MovInsGluePoint(const Point& rPnt) { MovDragObj(rPnt); } - BOOL EndInsGluePoint() { return EndDragObj(); } + sal_Bool EndInsGluePoint() { return EndDragObj(); } void BrkInsGluePoint() { BrkDragObj(); } - BOOL IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; } + sal_Bool IsInsGluePoint() const { return mpCurrentSdrDragMethod && bInsGluePoint; } // Fuer die App zum Verwalten des Status. GetPreferedPointer() wird // spaeter vielleicht einen passenden Pointer dafuer liefern - void SetInsGluePointMode(BOOL bOn) { bInsGluePointMode = bOn; } - BOOL IsInsGluePointMode() const { return bInsGluePointMode; } + void SetInsGluePointMode(sal_Bool bOn) { bInsGluePointMode = bOn; } + sal_Bool IsInsGluePointMode() const { return bInsGluePointMode; } // Begrenzungslinien ueber's gesamte Win waehrend des Draggens // Persistent. Default=FALSE. - void SetDragStripes(BOOL bOn); - BOOL IsDragStripes() const { return bDragStripes; } + void SetDragStripes(sal_Bool bOn); + sal_Bool IsDragStripes() const { return bDragStripes; } // Handles waehrend des Draggens verstecken - //HMHvoid SetDragHdlHide(BOOL bOn); + //HMHvoid SetDragHdlHide(sal_Bool bOn); //HMHBOOL IsDragHdlHide() const { return bNoDragHdl; } // Beim Draggen von Polygonpunkten und Klebepunkten // die Maus verstecken. Default=FALSE - void SetMouseHideWhileDraggingPoints(BOOL bOn) { bMouseHideWhileDraggingPoints = bOn; } - BOOL IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; } + void SetMouseHideWhileDraggingPoints(sal_Bool bOn) { bMouseHideWhileDraggingPoints = bOn; } + sal_Bool IsMouseHideWhileDraggingPoints() const { return bMouseHideWhileDraggingPoints; } // Beim Draggen werden i.d.R. die Konturen der markierten Objekte // als Xor-Polygone dargestellt. Wird dieses Flag hier gesetzt, @@ -199,22 +199,22 @@ public: // hat diese Einstellung keine Auswirkung. // Auch waerend des Draggens umschaltbar. // Default=Off - void SetNoDragXorPolys(BOOL bOn); - BOOL IsNoDragXorPolys() const { return bNoDragXorPolys; } + void SetNoDragXorPolys(sal_Bool bOn); + sal_Bool IsNoDragXorPolys() const { return bNoDragXorPolys; } // Uebersteigt die Anzahl der markierten Objekte den hier eingestellten // Wert, wird implizit (temporaer) auf NoDragPolys geschaltet. // PolyPolygone etc werden entsprechend als mehrere Objekte gewertet. // Default=100 - void SetDragXorPolyLimit(ULONG nObjAnz) { nDragXorPolyLimit=nObjAnz; } - ULONG GetDragXorPolyLimit() const { return nDragXorPolyLimit; } + void SetDragXorPolyLimit(sal_uIntPtr nObjAnz) { nDragXorPolyLimit=nObjAnz; } + sal_uIntPtr GetDragXorPolyLimit() const { return nDragXorPolyLimit; } // Wie DragXorPolyLimit, jedoch bezogen auf die Gesamtpunktanzahl // aller Polygone. Default=500. // Auf NoDragPolys wird (temporaer) geschaltet, wenn eins der Limits // ueberstiegen wird. - void SetDragXorPointLimit(ULONG nPntAnz) { nDragXorPointLimit=nPntAnz; } - ULONG GetDragXorPointLimit() const { return nDragXorPointLimit; } + void SetDragXorPointLimit(sal_uIntPtr nPntAnz) { nDragXorPointLimit=nPntAnz; } + sal_uIntPtr GetDragXorPointLimit() const { return nDragXorPointLimit; } void SetSolidDragging(bool bOn); bool IsSolidDragging() const; @@ -222,14 +222,14 @@ public: // Dragging/Creating von Verbindern: // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Verbinder an Objektscheitelpunkte ankleben - // Default=TRUE=Ja - void SetAutoVertexConnectors(BOOL bOn) { bAutoVertexCon = bOn; } - BOOL IsAutoVertexConnectors() const { return bAutoVertexCon; } + // Default=sal_True=Ja + void SetAutoVertexConnectors(sal_Bool bOn) { bAutoVertexCon = bOn; } + sal_Bool IsAutoVertexConnectors() const { return bAutoVertexCon; } // Verbinder an Objektecken ankleben - // Default=FALSE=Nein - void SetAutoCornerConnectors(BOOL bOn) { bAutoCornerCon = bOn; } - BOOL IsAutoCornerConnectors() const { return bAutoCornerCon; } + // Default=sal_False=Nein + void SetAutoCornerConnectors(sal_Bool bOn) { bAutoCornerCon = bOn; } + sal_Bool IsAutoCornerConnectors() const { return bAutoCornerCon; } // Dragging von verbundenen Objekten (Nodes): // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -238,22 +238,22 @@ public: // Gummibaender sondern komplette Neuberechnunen sind beim Draggen sichtbar. // Diese detalierte Darstellung ist eh nur beim MoveDrag moeglich. // Defaultwert ist 10 - void SetDetailedEdgeDragging(BOOL bOn); // Default an - BOOL IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; } + void SetDetailedEdgeDragging(sal_Bool bOn); // Default an + sal_Bool IsDetailedEdgeDragging() const { return bDetailedEdgeDragging; } - void SetDetailedEdgeDraggingLimit(USHORT nEdgeObjAnz); - USHORT GetDetailedEdgeDraggingLimit() const { return nDetailedEdgeDraggingLimit; } + void SetDetailedEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz); + sal_uInt16 GetDetailedEdgeDraggingLimit() const { return nDetailedEdgeDraggingLimit; } // EdgeDraggingLimit: Sind mehr als nEdgeObjAnz Kanten betroffen, werden // diese beim interaktiven Draggen nicht mit angezeigt. // Gemeint sind hier die "Gummibaender", die weniger Rechenzeit benoetigen // als die kompletten Neuberechnungen beim DetailedEdgeDragging. // Defaultwert ist 100 - void SetRubberEdgeDragging(BOOL bOn); // Default an - BOOL IsRubberEdgeDragging() const { return bRubberEdgeDragging; } + void SetRubberEdgeDragging(sal_Bool bOn); // Default an + sal_Bool IsRubberEdgeDragging() const { return bRubberEdgeDragging; } - void SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz); - USHORT GetRubberEdgeDraggingLimit() const { return nRubberEdgeDraggingLimit; } + void SetRubberEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz); + sal_uInt16 GetRubberEdgeDraggingLimit() const { return nRubberEdgeDraggingLimit; } // Verbinderhandling also zu deutsch wie folgt (bei Defaulteinstellungen): // - Sind bis max 10 Verbinder betroffen werden diese bei jedem @@ -265,29 +265,29 @@ public: // Ist ein spezieller Dragmode eingeschaltet, wie Rotate, Mirror oder Crook, // dann leitet ein Hit auf das markierte Objekt genau dieses Dragging ein. - // Setzt man MarkedHitMovesAlways auf TRUE, so leitet ein Hit auf das + // Setzt man MarkedHitMovesAlways auf sal_True, so leitet ein Hit auf das // markierte Objekt immer ein Moven ein, unabhaengig vom gesetzten DragMode. // Dieses Flag ist persistent und sollte von der App fuer den Anwender // konfigurierbar sein! - void SetMarkedHitMovesAlways(BOOL bOn) { bMarkedHitMovesAlways = bOn; } - BOOL IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; } + void SetMarkedHitMovesAlways(sal_Bool bOn) { bMarkedHitMovesAlways = bOn; } + sal_Bool IsMarkedHitMovesAlways() const { return bMarkedHitMovesAlways; } // Beim Draggen der Spiegelachse das Spiegelbild der markierten Objekte // als Xor darstellen? Persistent. Noch nicht implementiert. Default TRUE. - void SetMirrRefDragObj(BOOL bOn) { bMirrRefDragObj = bOn; } - BOOL IsMirrRefDragObj() const { return bMirrRefDragObj; } + void SetMirrRefDragObj(sal_Bool bOn) { bMirrRefDragObj = bOn; } + sal_Bool IsMirrRefDragObj() const { return bMirrRefDragObj; } - BOOL IsOrthoDesired() const; + sal_Bool IsOrthoDesired() const; // Beim Resize die Mitte als Referenz // Default=FALSE. - BOOL IsResizeAtCenter() const { return bResizeAtCenter; } - void SetResizeAtCenter(BOOL bOn) { bResizeAtCenter = bOn; } + sal_Bool IsResizeAtCenter() const { return bResizeAtCenter; } + void SetResizeAtCenter(sal_Bool bOn) { bResizeAtCenter = bOn; } // Symmetrisches Crook // Default=FALSE. - BOOL IsCrookAtCenter() const { return bCrookAtCenter; } - void SetCrookAtCenter(BOOL bOn) { bCrookAtCenter = bOn; } + sal_Bool IsCrookAtCenter() const { return bCrookAtCenter; } + void SetCrookAtCenter(sal_Bool bOn) { bCrookAtCenter = bOn; } // Begrenzung des Arbeitsbereichs. Die Begrenzung bezieht sich auf die // View, nicht auf die einzelnen PageViews. Von der View wird diese @@ -306,7 +306,7 @@ public: // Das DragLimit ist bezogen auf die Page des Objekts. // (Oder auf die View??? Muss ich mal^^^^recherchieren. Joe.) - // FALSE=Kein Limit. + // sal_False=Kein Limit. // Das Rueckgabe-Rect muss absolute Koordinaten enthalten. Der Maximale // Dragbereich wird von der View dann so gewaehlt, dass das SnapRect des // Objekts bis Maximal auf die Kante des LimitRects gemoved bzw. gesized @@ -315,7 +315,7 @@ public: // Rundungsfehler auftreten koennen, wodurch das LimitRect minnimal // ueberschritten werden koennte... // Implementiert fuer Move und Resize. - virtual BOOL TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const; + virtual sal_Bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const; }; #endif //_SVDDRGV_HXX diff --git a/svx/inc/svx/svdedtv.hxx b/svx/inc/svx/svdedtv.hxx index 6314eced08..9488d6dfab 100644..100755 --- a/svx/inc/svx/svdedtv.hxx +++ b/svx/inc/svx/svdedtv.hxx @@ -150,12 +150,12 @@ protected: void ImpBroadcastEdgesOfMarkedNodes(); // Konvertierung der markierten Objekte in Poly bzw. Bezier. - void ImpConvertTo(BOOL bPath, BOOL bLineToArea); + void ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea); // Konvertiert ein Obj, wirft bei Erfolg das alte as seiner Liste und // fuegt das neue an dessen Position ein. Inkl Undo. Es wird weder ein // MarkEntry noch ein ModelChgBroadcast generiert. - SdrObject* ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLineToArea); + SdrObject* ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea); // Setzen der beiden Flags bToTopPossible und bToBtmPossible. // bToTopPossibleDirty und bToBtmPossibleDirty werden dabei gleichzeitig @@ -178,11 +178,11 @@ protected: // fuer DismantleMarkedObjects sal_Bool ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPpolygon, sal_Bool bMakeLines) const; sal_Bool ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines) const; - void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, ULONG& rPos, SdrPageView* pPV, BOOL bMakeLines); + void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines); void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode, - BOOL bVertical, BOOL bNoContortion, BOOL bRotate, const Rectangle& rMarkRect); - void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion); - BOOL ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const; + sal_Bool bVertical, sal_Bool bNoContortion, sal_Bool bRotate, const Rectangle& rMarkRect); + void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion); + sal_Bool ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const; void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID); // Entfernt alle Obj der MarkList aus ihren ObjLists inkl Undo. @@ -209,7 +209,6 @@ public: // verwendet. NotifyNewUndoAction() wird in diesem Fall erst beim letzten // EndUndo() gerufen. NotifyNewUndoAction() wird nicht gerufen bei einer // leeren Klammerung. -#ifndef WIN void BegUndo() { pMod->BegUndo(); } // Undo-Klammerung auf void BegUndo(const String& rComment) { pMod->BegUndo(rComment); } // Undo-Klammerung auf void BegUndo(const String& rComment, const String& rObjDescr, SdrRepeatFunc eFunc=SDRREPFUNC_OBJ_NONE) { pMod->BegUndo(rComment,rObjDescr,eFunc); } // Undo-Klammerung auf @@ -219,28 +218,17 @@ public: // nur nach dem 1. BegUndo oder vor dem letzten EndUndo: void SetUndoComment(const String& rComment) { pMod->SetUndoComment(rComment); } void SetUndoComment(const String& rComment, const String& rObjDescr) { pMod->SetUndoComment(rComment,rObjDescr); } -#else // ifndef WIN - void BegUndo(); - void BegUndo(const String& rComment); - void BegUndo(const String& rComment, const String& rObjDescr, SdrRepeatFunc eFunc=SDRREPFUNC_OBJ_NONE); - void BegUndo(SdrUndoGroup* pUndoGrp); - void EndUndo(); // Undo-Klammerung zu (inkl BroadcastEdges) - void AddUndo(SdrUndoAction* pUndo); - // nur nach dem 1. BegUndo oder vor dem letzten EndUndo: - void SetUndoComment(const String& rComment); - void SetUndoComment(const String& rComment, const String& rObjDescr); -#endif bool IsUndoEnabled() const; std::vector< SdrUndoAction* > CreateConnectorUndo( SdrObject& rO ); void AddUndoActions( std::vector< SdrUndoAction* >& ); // Layerverwaltung. Mit Undo. - SdrLayer* InsertNewLayer(const String& rName, USHORT nPos=0xFFFF); + SdrLayer* InsertNewLayer(const String& rName, sal_uInt16 nPos=0xFFFF); // Loeschen eines Layer inkl. aller darauf befindlichen Objekte void DeleteLayer(const String& rName); // Verschieben eines Layer (Layerreihenfolge aendern) - void MoveLayer(const String& rName, USHORT nNewPos); + void MoveLayer(const String& rName, sal_uInt16 nNewPos); // Markierte Objekte die ausserhalb ihrer Page liegen // werden ggf. einer anderen Page zugewiesen @@ -248,23 +236,23 @@ public: void ForceMarkedObjToAnotherPage(); void ForceMarkedToAnotherPage() { ForceMarkedObjToAnotherPage(); } - BOOL IsReadOnly() const { ForcePossibilities(); return bReadOnly; } + sal_Bool IsReadOnly() const { ForcePossibilities(); return bReadOnly; } // Loeschen aller markierten Objekte void DeleteMarkedObj(); - BOOL IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; } + sal_Bool IsDeleteMarkedObjPossible() const { ForcePossibilities(); return bDeletePossible; } // Logisch- umschliessendes Rect aller markierten Objekte setzen. // Das das wirklich geschieht ist nicht garantiert, denn eine // waagerechte Linie hat z.B. immer eine Hoehe von 0. - void SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy=FALSE); + void SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy=sal_False); void MoveMarkedObj(const Size& rSiz, bool bCopy=false); void ResizeMarkedObj(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); long GetMarkedObjRotate() const; void RotateMarkedObj(const Point& rRef, long nWink, bool bCopy=false); void MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool bCopy=false); - void MirrorMarkedObjHorizontal(BOOL bCopy=FALSE); - void MirrorMarkedObjVertical(BOOL bCopy=FALSE); + void MirrorMarkedObjHorizontal(sal_Bool bCopy=sal_False); + void MirrorMarkedObjVertical(sal_Bool bCopy=sal_False); long GetMarkedObjShear() const; void ShearMarkedObj(const Point& rRef, long nWink, bool bVShear=false, bool bCopy=false); void CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookMode eMode, bool bVertical=false, bool bNoContortion=false, bool bCopy=false); @@ -272,28 +260,28 @@ public: // Markierte Objekte kopieren und anstelle der alten markieren void CopyMarkedObj(); - void SetAllMarkedRect(const Rectangle& rRect, BOOL bCopy=FALSE) { SetMarkedObjRect(rRect,bCopy); } - void MoveAllMarked(const Size& rSiz, BOOL bCopy=FALSE) { MoveMarkedObj (rSiz,bCopy); } - void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, BOOL bCopy=FALSE) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); } + void SetAllMarkedRect(const Rectangle& rRect, sal_Bool bCopy=sal_False) { SetMarkedObjRect(rRect,bCopy); } + void MoveAllMarked(const Size& rSiz, sal_Bool bCopy=sal_False) { MoveMarkedObj (rSiz,bCopy); } + void ResizeAllMarked(const Point& rRef, const Fraction& xFact, const Fraction& yFact, sal_Bool bCopy=sal_False) { ResizeMarkedObj (rRef,xFact,yFact,bCopy); } long GetAllMarkedRotate() const { return GetMarkedObjRotate(); } - void RotateAllMarked(const Point& rRef, long nWink, BOOL bCopy=FALSE) { RotateMarkedObj(rRef,nWink,bCopy); } - void MirrorAllMarked(const Point& rRef1, const Point& rRef2, BOOL bCopy=FALSE) { MirrorMarkedObj(rRef1,rRef2,bCopy); } - void MirrorAllMarkedHorizontal(BOOL bCopy=FALSE) { MirrorMarkedObjHorizontal(bCopy); } - void MirrorAllMarkedVertical(BOOL bCopy=FALSE) { MirrorMarkedObjVertical(bCopy); } + void RotateAllMarked(const Point& rRef, long nWink, sal_Bool bCopy=sal_False) { RotateMarkedObj(rRef,nWink,bCopy); } + void MirrorAllMarked(const Point& rRef1, const Point& rRef2, sal_Bool bCopy=sal_False) { MirrorMarkedObj(rRef1,rRef2,bCopy); } + void MirrorAllMarkedHorizontal(sal_Bool bCopy=sal_False) { MirrorMarkedObjHorizontal(bCopy); } + void MirrorAllMarkedVertical(sal_Bool bCopy=sal_False) { MirrorMarkedObjVertical(bCopy); } long GetAllMarkedShear() const { return GetMarkedObjShear(); } - void ShearAllMarked(const Point& rRef, long nWink, BOOL bVShear=FALSE, BOOL bCopy=FALSE) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); } - void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, BOOL bVertical=FALSE, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); } + void ShearAllMarked(const Point& rRef, long nWink, sal_Bool bVShear=sal_False, sal_Bool bCopy=sal_False) { ShearMarkedObj(rRef,nWink,bVShear,bCopy); } + void CrookAllMarked(const Point& rRef, const Point& rRad, SdrCrookMode eMode, sal_Bool bVertical=sal_False, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False) { CrookMarkedObj(rRef,rRad,eMode,bVertical,bNoContortion,bCopy); } void CopyMarked() { CopyMarkedObj(); } - BOOL IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; } - BOOL IsResizeAllowed(BOOL bProp=FALSE) const; - BOOL IsRotateAllowed(BOOL b90Deg=FALSE) const; - BOOL IsMirrorAllowed(BOOL b45Deg=FALSE, BOOL b90Deg=FALSE) const; - BOOL IsTransparenceAllowed() const; - BOOL IsGradientAllowed() const; - BOOL IsShearAllowed() const; - BOOL IsEdgeRadiusAllowed() const; - BOOL IsCrookAllowed(BOOL bNoContortion=FALSE) const; - BOOL IsDistortAllowed(BOOL bNoContortion=FALSE) const; + sal_Bool IsMoveAllowed() const { ForcePossibilities(); return bMoveAllowed && !bMoveProtect; } + sal_Bool IsResizeAllowed(sal_Bool bProp=sal_False) const; + sal_Bool IsRotateAllowed(sal_Bool b90Deg=sal_False) const; + sal_Bool IsMirrorAllowed(sal_Bool b45Deg=sal_False, sal_Bool b90Deg=sal_False) const; + sal_Bool IsTransparenceAllowed() const; + sal_Bool IsGradientAllowed() const; + sal_Bool IsShearAllowed() const; + sal_Bool IsEdgeRadiusAllowed() const; + sal_Bool IsCrookAllowed(sal_Bool bNoContortion=sal_False) const; + sal_Bool IsDistortAllowed(sal_Bool bNoContortion=sal_False) const; // Vereinigen mehrerer Objekte zu einem PolyPolygon: // - Rechtecke/Kreise/Text... werden implizit gewandelt. @@ -319,9 +307,9 @@ public: // Memberobjekten um PathObjs handelt. // bMakeLines=TRUE: alle Polygone werden in einzelne Linien bzw. // Beziersegmente zerlegt - void DismantleMarkedObjects(BOOL bMakeLines=FALSE); - BOOL IsCombinePossible(BOOL bNoPolyPoly=FALSE) const; - BOOL IsDismantlePossible(BOOL bMakeLines=FALSE) const; + void DismantleMarkedObjects(sal_Bool bMakeLines=sal_False); + sal_Bool IsCombinePossible(sal_Bool bNoPolyPoly=sal_False) const; + sal_Bool IsDismantlePossible(sal_Bool bMakeLines=sal_False) const; // Ein neues bereits fertig konstruiertes Obj einfuegen. Das Obj gehoert // anschliessend dem Model. Nach dem Einfuegen wird das neue Objekt @@ -330,7 +318,7 @@ public: // wenn der Ziel-Layer gesperrt oder nicht sichtbar ist. In diesem Fall // returniert die Methode mit FALSE. // Die Methode generiert u.a. auch eine Undo-Action. - BOOL InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions=0); + sal_Bool InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions=0); // Ein Zeichenobjekt durch ein neues ersetzen. *pNewObj gehoert // anschliessend mir, *pOldObj wandert ins Undo. @@ -340,13 +328,13 @@ public: // ReplaceObject(...); // ... // EndUndo(); - void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, BOOL bMark=TRUE); + void ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark=sal_True); - void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll); - void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const; - void MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const; - SfxItemSet GetAttrFromMarked(BOOL bOnlyHardAttr) const; - void SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll); + void SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll); + void MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const; + void MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const; + SfxItemSet GetAttrFromMarked(sal_Bool bOnlyHardAttr) const; + void SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll); // Geometrische Attribute (Position, Groesse, Drehwinkel) // Bei der Position wird ein evtl. gesetzter PageOrigin beruecksichtigt. @@ -361,14 +349,14 @@ public: SfxStyleSheet* GetStyleSheetFromMarked() const; // z.Zt. noch ohne Undo :( - void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr); + void SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); /* new interface src537 */ - BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const; + sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const; - BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll); - SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const; - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr); + sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll); + SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const; + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); // Alle markierten Objekte zu einer Gruppe zusammenfassen. // Anschliessend wird die neue Gruppe markiert. Bei einer @@ -386,25 +374,25 @@ public: // zusaetzlich markiert. void UnGroupMarked(); - BOOL IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; } - BOOL IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; } - BOOL IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; } + sal_Bool IsGroupPossible() const { ForcePossibilities(); return bGroupPossible; } + sal_Bool IsUnGroupPossible() const { ForcePossibilities(); return bUnGroupPossible; } + sal_Bool IsGroupEnterPossible() const { ForcePossibilities(); return bGrpEnterPossible; } - // Markierte Objekte in Polygone/Bezierkurven verwandeln. Die BOOL- - // Funktionen returnen TRUE, wenn wenigstens eins der markierten + // Markierte Objekte in Polygone/Bezierkurven verwandeln. Die sal_Bool- + // Funktionen returnen sal_True, wenn wenigstens eins der markierten // Objekte gewandelt werden kann. Memberobjekte von Gruppenobjekten // werden ebenfalls gewandelt. Naehere Beschreibung siehe SdrObj.HXX. - BOOL IsConvertToPathObjPossible(BOOL bLineToArea) const { ForcePossibilities(); return BOOL(bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath); } - BOOL IsConvertToPolyObjPossible(BOOL bLineToArea) const { ForcePossibilities(); return BOOL(bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly); } - BOOL IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; } - void ConvertMarkedToPathObj(BOOL bLineToArea); - void ConvertMarkedToPolyObj(BOOL bLineToArea); + sal_Bool IsConvertToPathObjPossible(sal_Bool bLineToArea) const { ForcePossibilities(); return sal_Bool(bLineToArea ? bCanConvToPathLineToArea : bCanConvToPath); } + sal_Bool IsConvertToPolyObjPossible(sal_Bool bLineToArea) const { ForcePossibilities(); return sal_Bool(bLineToArea ? bCanConvToPolyLineToArea : bCanConvToPoly); } + sal_Bool IsConvertToContourPossible() const { ForcePossibilities(); return bCanConvToContour; } + void ConvertMarkedToPathObj(sal_Bool bLineToArea); + void ConvertMarkedToPolyObj(sal_Bool bLineToArea); // Alle markierten Objekte untereinander ausrichten. Normalerweise werden - // das SnapRect der Obj verwendet. Ist bBoundRects=TRUE, werden stattdessen + // das SnapRect der Obj verwendet. Ist bBoundRects=sal_True, werden stattdessen // die BoundRects ausgerichtet. - void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL bBoundRects=FALSE); - BOOL IsAlignPossible() const; + void AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_Bool bBoundRects=sal_False); + sal_Bool IsAlignPossible() const; // Markierte Objekte etwas nach "oben" holen void MovMarkedToTop(); @@ -432,12 +420,12 @@ public: // Feststellen, ob nach vorn/hinten stellen moeglich ist // GetMaxToTop/BtmObj() wird von diesen Methoden nur begrenzt // beruecksichtigt, d.h. es kann vorkommen dass IsToTopPossible() - // TRUE liefert, MovMarkedToTop() jedoch nichts aendert (z.B. bei + // sal_True liefert, MovMarkedToTop() jedoch nichts aendert (z.B. bei // Mehrfachselektion), weil eine von der abgeleiteten View ueber // GetMaxToTopObj() auferlegte Restriktion dies verhindert. - BOOL IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; } - BOOL IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; } - BOOL IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; } + sal_Bool IsToTopPossible() const { ForcePossibilities(); return bToTopPossible; } + sal_Bool IsToBtmPossible() const { ForcePossibilities(); return bToBtmPossible; } + sal_Bool IsReverseOrderPossible() const { ForcePossibilities(); return bReverseOrderPossible; } // Ueber diese Methoden stellt die View fest, wie weit ein Objekt // nach vorn bzw. nach hinten gestellt werden darf (Z-Order). Das @@ -449,21 +437,21 @@ public: // Folgende Methode wird gerufen, wenn z.B. durch ToTop, ToBtm, ... die // Reihenfolgen der Objekte geaendert wurde. Der Aufruf erfolgt dann nach // jedem SdrObjList::SetObjectOrdNum(nOldPos,nNewPos); - virtual void ObjOrderChanged(SdrObject* pObj, ULONG nOldPos, ULONG nNewPos); + virtual void ObjOrderChanged(SdrObject* pObj, sal_uIntPtr nOldPos, sal_uIntPtr nNewPos); // Falls ein oder mehrere Objekte des Types SdrGrafObj oder SdrOle2Obj // markiert sind und diese in der Lage sind ein StarView-Metafile zu // liefern, konvertiert diese Methode das Metafile in Drawingobjekte. // Die SdrGrafObjs/SdrOle2Objs werden dann durch die neue Objekte ersetzt. void DoImportMarkedMtf(SvdProgressInfo *pProgrInfo=NULL); - BOOL IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; } + sal_Bool IsImportMtfPossible() const { ForcePossibilities(); return bImportMtfPossible; } // Wird der Modus VirtualObjectBundling eingeschaltet, werden beim // ToTop/ToBtm virtuelle Objekte die dasselbe Objekt referenzieren // in ihrer Z-Order buendig zusammengehalten (Writer). - // Defaulteinstellung ist FALSE=ausgeschaltet. - void SetVirtualObjectBundling(BOOL bOn) { bBundleVirtObj=bOn; } - BOOL IsVirtualObjectBundling() const { return bBundleVirtObj; } + // Defaulteinstellung ist sal_False=ausgeschaltet. + void SetVirtualObjectBundling(sal_Bool bOn) { bBundleVirtObj=bOn; } + sal_Bool IsVirtualObjectBundling() const { return bBundleVirtObj; } // von der SdrMarkView ueberladen fuer den internen gebrauch virtual void MarkListHasChanged(); diff --git a/svx/inc/svx/svdedxv.hxx b/svx/inc/svx/svdedxv.hxx index 6f66e12829..701ad84f03 100644..100755 --- a/svx/inc/svx/svdedxv.hxx +++ b/svx/inc/svx/svdedxv.hxx @@ -106,7 +106,7 @@ protected: Link aOldCalcFieldValueLink; // Zum rufen des alten Handlers Point aMacroDownPos; - USHORT nMacroTol; + sal_uInt16 nMacroTol; unsigned bTextEditDontDelete : 1; // Outliner und View bei SdrEndTextEdit nicht deleten (f. Rechtschreibpruefung) unsigned bTextEditOnlyOneView : 1; // Nur eine OutlinerView (f. Rechtschreibpruefung) @@ -126,13 +126,13 @@ protected: // Eine neue OutlinerView auf dem Heap anlegen und alle erforderlichen Parameter setzen. // pTextEditObj, pTextEditPV und pTextEditOutliner muessen initiallisiert sein. - OutlinerView* ImpMakeOutlinerView(Window* pWin, BOOL bNoPaint, OutlinerView* pGivenView) const; + OutlinerView* ImpMakeOutlinerView(Window* pWin, sal_Bool bNoPaint, OutlinerView* pGivenView) const; void ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectangle& rRect) const; void ImpInvalidateOutlinerView(OutlinerView& rOutlView) const; - // Feststellen, ob der gesamte Text markiert ist. Liefert auch TRUE wenn + // Feststellen, ob der gesamte Text markiert ist. Liefert auch sal_True wenn // kein Text vorhanden ist. - BOOL ImpIsTextEditAllSelected() const; + sal_Bool ImpIsTextEditAllSelected() const; void ImpMakeTextCursorAreaVisible(); // Handler fuer AutoGrowing Text bei aktivem Outliner @@ -152,7 +152,7 @@ protected: public: // Actionhandling fuer Macromodus - virtual BOOL IsAction() const; + virtual sal_Bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BrkAction(); @@ -167,8 +167,8 @@ public: //************************************************************************ // QuickTextEditMode bedeutet, dass Objekte mit Text sofort beim Anklicken // editiert werden sollen. Default=TRUE. Persistent. - void SetQuickTextEditMode(BOOL bOn) { bQuickTextEditMode=bOn; } - BOOL IsQuickTextEditMode() const { return bQuickTextEditMode; } + void SetQuickTextEditMode(sal_Bool bOn) { bQuickTextEditMode=bOn; } + sal_Bool IsQuickTextEditMode() const { return bQuickTextEditMode; } // Starten des TextEditMode. Ist pWin==NULL, wird das erste an der View // angemeldete Win verwendet. @@ -179,7 +179,7 @@ public: // Ueber den Parameter pEditOutliner kann die Applikation einen eigenen // Outliner vorgeben, der zum Editieren verwendet wird. Dieser gehoert // nach Aufruf von SdrBeginTextEdit der SdrObjEditView und wird von dieser - // spaeter via delete zerstoert (falls bDontDeleteOutliner=FALSE). Die + // spaeter via delete zerstoert (falls bDontDeleteOutliner=sal_False). Die // SdrObjEditView setzt dann das Modusflag (EditEngine/Outliner) an // dieser Instanz und ausserdem auch den StatusEventHdl. // Ebenso kann eine spezifische OutlinerView vorgegeben werden. @@ -195,23 +195,23 @@ public: virtual SdrEndTextEditKind SdrEndTextEdit(sal_Bool bDontDeleteReally = sal_False); virtual bool IsTextEdit() const; - // TRUE=Es wird ein Textrahmen (OBJ_TEXT,OBJ_OUTLINETEXT,...) editiert + // sal_True=Es wird ein Textrahmen (OBJ_TEXT,OBJ_OUTLINETEXT,...) editiert // ansonsten handelt es sich um ein beschriftetes Zeichenobjekt, an dem // der Text ja bekanntlich hor. und vert. zentriert wird. - BOOL IsTextEditFrame() const; + sal_Bool IsTextEditFrame() const; - // Diese Methode liefert TRUE, wenn der Punkt rHit innerhalb der + // Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb der // des Objektbereichs oder der OutlinerView liegt. - BOOL IsTextEditHit(const Point& rHit, short nTol) const; + sal_Bool IsTextEditHit(const Point& rHit, short nTol) const; - // Diese Methode liefert TRUE, wenn der Punkt rHit innerhalb des + // Diese Methode liefert sal_True, wenn der Punkt rHit innerhalb des // Handle-dicken Rahmens liegt, der die OutlinerView bei TextFrames // umschliesst. - BOOL IsTextEditFrameHit(const Point& rHit) const; + sal_Bool IsTextEditFrameHit(const Point& rHit) const; // Bei aktiver Selektion, also zwischen MouseButtonDown und // MouseButtonUp liefert diese Methode immer TRUE. - BOOL IsTextEditInSelectionMode() const; + sal_Bool IsTextEditInSelectionMode() const; // Folgende Methode addiert einen passenden Offset zum MouseEvent // um diesen an den Outliner weiterzureichen. @@ -235,24 +235,24 @@ public: const OutlinerView* GetTextEditOutlinerView() const { return pTextEditOutlinerView; } OutlinerView* GetTextEditOutlinerView() { return pTextEditOutlinerView; } - virtual BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); - virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin); - virtual BOOL Command(const CommandEvent& rCEvt, Window* pWin); - BOOL Cut(ULONG nFormat=SDR_ANYFORMAT); - BOOL Yank(ULONG nFormat=SDR_ANYFORMAT); - BOOL Paste(Window* pWin=NULL, ULONG nFormat=SDR_ANYFORMAT); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin); + sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT); + sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT); + sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT); // #97766# make virtual to change implementation e.g. for SdOutlineView virtual sal_uInt16 GetScriptType() const; /* new interface src537 */ - BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const; + sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; - BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll); - SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const; - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr); + sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll); + SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const; + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); // Intern: Beim Splitteraufziehen neue OutlinerView... virtual void AddWindowToPaintView(OutputDevice* pNewWin); @@ -263,16 +263,16 @@ public: //************************************************************************ // Persistent. Default TRUE. SvDraw wertet das Flag u.a. bei // SdrView::GetPreferedPointer() aus. Hat nur Wirkung, wenn das Dokument - // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==TRUE). - void SetMacroMode(BOOL bOn) { bMacroMode=bOn; } - BOOL IsMacroMode() const { return bMacroMode; } - BOOL BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin); - BOOL BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); } + // Draw-Objekte mit Macrofunktionalitaet hat (SdrObject::HasMacro()==sal_True). + void SetMacroMode(sal_Bool bOn) { bMacroMode=bOn; } + sal_Bool IsMacroMode() const { return bMacroMode; } + sal_Bool BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin); + sal_Bool BegMacroObj(const Point& rPnt, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { return BegMacroObj(rPnt,-2,pObj,pPV,pWin); } void MovMacroObj(const Point& rPnt); void BrkMacroObj(); - BOOL EndMacroObj(); - BOOL IsMacroObj() const { return pMacroObj!=NULL; } - BOOL IsMacroObjDown() const { return bMacroDown; } + sal_Bool EndMacroObj(); + sal_Bool IsMacroObj() const { return pMacroObj!=NULL; } + sal_Bool IsMacroObjDown() const { return bMacroDown; } /** fills the given any with a XTextCursor for the current text selection. Leaves the any untouched if there currently is no text selected */ @@ -283,7 +283,7 @@ public: rtl::Reference< sdr::SelectionController > getSelectionController() const { return mxSelectionController; } /** returns true if the shape identified by its inventor and identifier supports format paint brush operation */ - virtual bool SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const; + virtual bool SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const; /** returns a format paint brush set from the current selection */ virtual bool TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFormatSet ); diff --git a/svx/inc/svx/svdetc.hxx b/svx/inc/svx/svdetc.hxx index d649bd7683..2a8f92ec19 100644..100755 --- a/svx/inc/svx/svdetc.hxx +++ b/svx/inc/svx/svdetc.hxx @@ -40,11 +40,11 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// // ExchangeFormat-Id der DrawingEngine holen. Daten koennen dann per -// static BOOL CopyData(pData,nLen,nFormat); +// static sal_Bool CopyData(pData,nLen,nFormat); // bereitgestellt werden, wobei pData/nLen einen SvMemoryStream beschreiben in // dem ein SdrModel gestreamt wird an dem fuer die Zeitdauer des Streamens das -// Flag SdrModel::SetStreamingSdrModel(TRUE) gesetzt wird. -// ULONG SdrGetExchangeFormat(); -- JP 18.01.99 - dafuer gibt es ein define +// Flag SdrModel::SetStreamingSdrModel(sal_True) gesetzt wird. +// sal_uIntPtr SdrGetExchangeFormat(); -- JP 18.01.99 - dafuer gibt es ein define class SdrOutliner; class SdrModel; @@ -61,7 +61,7 @@ namespace com { namespace sun { namespace star { namespace lang { // Ist pMod<>NULL, dann wird der MapMode des uebergebenen // Models verwendet. Die resultierende Default-Fonthoehe bleibt // jedoch dieselbe (die logische Fonthoehe wird umgerechnet). -SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pMod ); +SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pMod ); // Globale Defaulteinstellungen fuer die DrawingEngine. // Diese Einstellungen sollte man direkt beim Applikationsstart @@ -72,7 +72,7 @@ friend class SdrAttrObj; String aFontName; FontFamily eFontFamily; Color aFontColor; - ULONG nFontHeight; + sal_uIntPtr nFontHeight; MapUnit eMapUnit; Fraction aMapFraction; @@ -95,8 +95,8 @@ public: // 847/100mm entspricht also ca. 24 Point. Verwendet man stattdessen // beispielsweise Twips (SetMapUnit(MAP_TWIP)) (20 Twip = 1 Point) muss // man als Fonthoehe 480 angeben um 24 Point als default zu erhalten. - static void SetFontHeight(ULONG nHeight) { GetDefaults().nFontHeight=nHeight; } - static ULONG GetFontHeight() { return GetDefaults().nFontHeight; } + static void SetFontHeight(sal_uIntPtr nHeight) { GetDefaults().nFontHeight=nHeight; } + static sal_uIntPtr GetFontHeight() { return GetDefaults().nFontHeight; } // Der MapMode wird fuer den globalen Outliner benoetigt. // Gleichzeitig bekommt auch jedes neu instanziierte SdrModel // diesen MapMode default zugewiesen. @@ -118,26 +118,26 @@ public: // Ist pMod<>NULL, dann wird der MapMode des uebergebenen // Models verwendet. Die resultierende Default-Fonthoehe bleibt // jedoch dieselbe (die logische Fonthoehe wird umgerechnet). - friend SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pMod ); + friend SVX_DLLPUBLIC SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pMod ); }; class SfxItemSet; // Liefert eine Ersatzdarstellung fuer einen XFillStyle -// Bei XFILL_NONE gibt's FALSE und rCol bleibt unveraendert. +// Bei XFILL_NONE gibt's sal_False und rCol bleibt unveraendert. SVX_DLLPUBLIC bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol); // Ein Container fuer USHORTs (im Prinzip ein dynamisches Array) class UShortCont { Container aArr; public: - UShortCont(USHORT nBlock, USHORT nInit, USHORT nResize): aArr(nBlock,nInit,nResize) {} + UShortCont(sal_uInt16 nBlock, sal_uInt16 nInit, sal_uInt16 nResize): aArr(nBlock,nInit,nResize) {} void Clear() { aArr.Clear(); } - void Insert(USHORT nElem, ULONG nPos=CONTAINER_APPEND) { aArr.Insert((void*)ULONG(nElem),nPos); } - void Remove(ULONG nPos) { aArr.Remove(nPos); } - void Replace(USHORT nElem, ULONG nPos) { aArr.Replace((void*)ULONG(nElem),nPos); } - USHORT GetObject(ULONG nPos) const { return USHORT(ULONG(aArr.GetObject(nPos))); } - ULONG GetPos(USHORT nElem) const { return aArr.GetPos((void*)(ULONG)nElem); } - ULONG GetCount() const { return aArr.Count(); } + void Insert(sal_uInt16 nElem, sal_uIntPtr nPos=CONTAINER_APPEND) { aArr.Insert((void*)sal_uIntPtr(nElem),nPos); } + void Remove(sal_uIntPtr nPos) { aArr.Remove(nPos); } + void Replace(sal_uInt16 nElem, sal_uIntPtr nPos) { aArr.Replace((void*)sal_uIntPtr(nElem),nPos); } + sal_uInt16 GetObject(sal_uIntPtr nPos) const { return sal_uInt16(sal_uIntPtr(aArr.GetObject(nPos))); } + sal_uIntPtr GetPos(sal_uInt16 nElem) const { return aArr.GetPos((void*)(sal_uIntPtr)nElem); } + sal_uIntPtr GetCount() const { return aArr.Count(); } void Sort(); }; @@ -148,7 +148,7 @@ private: void ImpSubSort(long nL, long nR) const; public: ContainerSorter(Container& rNewCont): rCont(rNewCont) {} - void DoSort(ULONG a=0, ULONG b=0xFFFFFFFF) const; + void DoSort(sal_uIntPtr a=0, sal_uIntPtr b=0xFFFFFFFF) const; // Compare() has to return: // -1 if *pElem1<*pElem2 @@ -178,24 +178,24 @@ class ImpSdrHdcMerk ImpColorMerk* pFarbMerk; ImpClipMerk* pClipMerk; Color* pLineColorMerk; - USHORT nMode; + sal_uInt16 nMode; public: - ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode=SDRHDC_SAVEALL, bool bAutoMerk = true); + ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode=SDRHDC_SAVEALL, bool bAutoMerk = true); ~ImpSdrHdcMerk(); void Save(const OutputDevice& rOut); bool IsSaved() const { return pFarbMerk!=NULL || pClipMerk!=NULL || pLineColorMerk!=NULL; } - void Restore(OutputDevice& rOut, USHORT nMask=SDRHDC_SAVEALL) const; + void Restore(OutputDevice& rOut, sal_uInt16 nMask=SDRHDC_SAVEALL) const; }; //////////////////////////////////////////////////////////////////////////////////////////////////// // Ein ItemSet auf Outliner- bzw. EditEngine-Items durchsuchen -// Liefert TRUE, wenn der Set solchen Items enthaelt. -BOOL SearchOutlinerItems(const SfxItemSet& rSet, BOOL bInklDefaults, BOOL* pbOnlyEE=NULL); +// Liefert sal_True, wenn der Set solchen Items enthaelt. +sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE=NULL); // zurueck erhaelt man einen neuen WhichTable den // man dann irgendwann mit delete platthauen muss. -USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT nRangeEnd); +sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd); //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -210,46 +210,46 @@ class Link; class SVX_DLLPUBLIC SvdProgressInfo { private: - ULONG nSumActionCount; // Summe aller Actions - ULONG nSumCurAction; // Summe aller bearbeiteten Actions + sal_uIntPtr nSumActionCount; // Summe aller Actions + sal_uIntPtr nSumCurAction; // Summe aller bearbeiteten Actions - ULONG nActionCount; // Anzahl der Actions im akt. Obj. - ULONG nCurAction; // Anzahl bearbeiteter Act. im akt. Obj. + sal_uIntPtr nActionCount; // Anzahl der Actions im akt. Obj. + sal_uIntPtr nCurAction; // Anzahl bearbeiteter Act. im akt. Obj. - ULONG nInsertCount; // Anzahl einzufuegender Act. im akt. Obj. - ULONG nCurInsert; // Anzahl bereits eingefuegter Actions + sal_uIntPtr nInsertCount; // Anzahl einzufuegender Act. im akt. Obj. + sal_uIntPtr nCurInsert; // Anzahl bereits eingefuegter Actions - ULONG nObjCount; // Anzahl der selektierten Objekte - ULONG nCurObj; // Aktuelles Objekt + sal_uIntPtr nObjCount; // Anzahl der selektierten Objekte + sal_uIntPtr nCurObj; // Aktuelles Objekt Link *pLink; public: SvdProgressInfo( Link *_pLink ); - void Init( ULONG _nSumActionCount, ULONG _nObjCount ); + void Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount ); - BOOL SetNextObject(); + sal_Bool SetNextObject(); - void SetActionCount( ULONG _nActionCount ); - void SetInsertCount( ULONG _nInsertCount ); + void SetActionCount( sal_uIntPtr _nActionCount ); + void SetInsertCount( sal_uIntPtr _nInsertCount ); - BOOL ReportActions( ULONG nAnzActions ); - BOOL ReportInserts( ULONG nAnzInserts ); + sal_Bool ReportActions( sal_uIntPtr nAnzActions ); + sal_Bool ReportInserts( sal_uIntPtr nAnzInserts ); - ULONG GetSumActionCount() const { return nSumActionCount; }; - ULONG GetSumCurAction() const { return nSumCurAction; }; - ULONG GetObjCount() const { return nObjCount; }; - ULONG GetCurObj() const { return nCurObj; }; + sal_uIntPtr GetSumActionCount() const { return nSumActionCount; }; + sal_uIntPtr GetSumCurAction() const { return nSumCurAction; }; + sal_uIntPtr GetObjCount() const { return nObjCount; }; + sal_uIntPtr GetCurObj() const { return nCurObj; }; - ULONG GetActionCount() const { return nActionCount; }; - ULONG GetCurAction() const { return nCurAction; }; + sal_uIntPtr GetActionCount() const { return nActionCount; }; + sal_uIntPtr GetCurAction() const { return nCurAction; }; - ULONG GetInsertCount() const { return nInsertCount; }; - ULONG GetCurInsert() const { return nCurInsert; }; + sal_uIntPtr GetInsertCount() const { return nInsertCount; }; + sal_uIntPtr GetCurInsert() const { return nCurInsert; }; void ReportError(); - BOOL ReportRescales( ULONG nAnzRescales ); + sal_Bool ReportRescales( sal_uIntPtr nAnzRescales ); }; @@ -280,18 +280,18 @@ class AutoTimer; class OLEObjCache : public Container { - ULONG nSize; + sal_uIntPtr nSize; AutoTimer* pTimer; void UnloadOnDemand(); - BOOL UnloadObj( SdrOle2Obj* pObj ); + sal_Bool UnloadObj( SdrOle2Obj* pObj ); DECL_LINK( UnloadCheckHdl, AutoTimer* ); public: OLEObjCache(); SVX_DLLPUBLIC ~OLEObjCache(); - void SetSize(ULONG nNewSize); + void SetSize(sal_uIntPtr nNewSize); void InsertObj(SdrOle2Obj* pObj); void RemoveObj(SdrOle2Obj* pObj); }; @@ -308,7 +308,7 @@ public: SdrOutliner* pOutliner; SdrEngineDefaults* pDefaults; ResMgr* pResMgr; - ULONG nExchangeFormat; + sal_uIntPtr nExchangeFormat; OLEObjCache aOLEObjCache; diff --git a/svx/inc/svx/svdfield.hxx b/svx/inc/svx/svdfield.hxx index bb323a7bb5..bb323a7bb5 100644..100755 --- a/svx/inc/svx/svdfield.hxx +++ b/svx/inc/svx/svdfield.hxx diff --git a/svx/inc/svx/svdglev.hxx b/svx/inc/svx/svdglev.hxx index d47f01fc70..71a9ed18f1 100644..100755 --- a/svx/inc/svx/svdglev.hxx +++ b/svx/inc/svx/svdglev.hxx @@ -62,7 +62,7 @@ class SVX_DLLPUBLIC SdrGlueEditView: public SdrPolyEditView void ImpCopyMarkedGluePoints(); typedef void (*PGlueDoFunc)(SdrGluePoint&, const SdrObject* pObj, const void*, const void*, const void*, const void*, const void*); typedef void (*PGlueTrFunc)(Point&, const void*, const void*, const void*, const void*, const void*); - void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL); + void ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL); void ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1=NULL, const void* p2=NULL, const void* p3=NULL, const void* p4=NULL, const void* p5=NULL); protected: @@ -75,15 +75,15 @@ public: // checken bzw. setzen/loeschen will. // Moegliche Werte fuer nThisEsc sind z.Zt. // SDRESC_LEFT, SDRESC_RIGHT, SDRESC_TOP und SDRESC_BOTTOM - TRISTATE IsMarkedGluePointsEscDir(USHORT nThisEsc) const; - void SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn); - BOOL IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } + TRISTATE IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const; + void SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bOn); + sal_Bool IsSetMarkedGluePointsEscDirPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } // Checken/setzen, ob die Klebepunktpositionen relativ zur - // Objektgroesse sind (Percent=TRUE) oder nicht (Percent=FALSE) + // Objektgroesse sind (Percent=sal_True) oder nicht (Percent=sal_False) TRISTATE IsMarkedGluePointsPercent() const; - void SetMarkedGluePointsPercent(BOOL bOn); - BOOL IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } + void SetMarkedGluePointsPercent(sal_Bool bOn); + sal_Bool IsSetMarkedGluePointsPercentPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } // bVert=FALSE: Horizontales Alignment checken/setzen // SDRHORZALIGN_CENTER @@ -95,23 +95,23 @@ public: // SDRVERTALIGN_TOP // SDRVERTALIGN_BOTTOM // SDRVERTALIGN_DONTCARE (nur bei Get()) - USHORT GetMarkedGluePointsAlign(BOOL bVert) const; - void SetMarkedGluePointsAlign(BOOL bVert, USHORT nAlign); - BOOL IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } + sal_uInt16 GetMarkedGluePointsAlign(sal_Bool bVert) const; + void SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign); + sal_Bool IsSetMarkedGluePointsAlignPossible() const { return !IsReadOnly() && HasMarkedGluePoints(); } // Alle merkierten Klebepunkte entfernen void DeleteMarkedGluePoints(); - BOOL IsDeleteMarkedGluePointsPossible() const; + sal_Bool IsDeleteMarkedGluePointsPossible() const; void MoveMarkedGluePoints (const Size& rSiz, bool bCopy=false); void ResizeMarkedGluePoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); void RotateMarkedGluePoints(const Point& rRef, long nWink, bool bCopy=false); - void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, BOOL bCopy=FALSE); - void MirrorMarkedGluePointsHorizontal(BOOL bCopy=FALSE); - void MirrorMarkedGluePointsVertical(BOOL bCopy=FALSE); - void ShearMarkedGluePoints(const Point& rRef, long nWink, BOOL bVShear=FALSE, BOOL bCopy=FALSE); - void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, BOOL bVertical=FALSE, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE); - void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion=FALSE, BOOL bCopy=FALSE); + void MirrorMarkedGluePoints(const Point& rRef1, const Point& rRef2, sal_Bool bCopy=sal_False); + void MirrorMarkedGluePointsHorizontal(sal_Bool bCopy=sal_False); + void MirrorMarkedGluePointsVertical(sal_Bool bCopy=sal_False); + void ShearMarkedGluePoints(const Point& rRef, long nWink, sal_Bool bVShear=sal_False, sal_Bool bCopy=sal_False); + void CrookMarkedGluePoints(const Point& rRef, const Point& rRad, SdrCrookMode eMode, sal_Bool bVertical=sal_False, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False); + void DistortMarkedGluePoints(const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion=sal_False, sal_Bool bCopy=sal_False); void AlignMarkedGluePoints(SdrHorAlign eHor, SdrVertAlign eVert); }; diff --git a/svx/inc/svdglob.hxx b/svx/inc/svx/svdglob.hxx index 8aca60b0e0..4c1e7838db 100644..100755 --- a/svx/inc/svdglob.hxx +++ b/svx/inc/svx/svdglob.hxx @@ -54,7 +54,7 @@ ResMgr* ImpGetResMgr(); class SdrResId: ResId { public: - SdrResId(USHORT nId): ResId(nId,*ImpGetResMgr()) {} + SdrResId(sal_uInt16 nId): ResId(nId,*ImpGetResMgr()) {} }; // ResourceCache for frequently used strings. diff --git a/svx/inc/svx/svdglue.hxx b/svx/inc/svx/svdglue.hxx index 6be0640aea..7e8b4f7657 100644..100755 --- a/svx/inc/svx/svdglue.hxx +++ b/svx/inc/svx/svdglue.hxx @@ -65,25 +65,25 @@ class SdrObject; class SVX_DLLPUBLIC SdrGluePoint { // Bezugspunkt ist SdrObject::GetSnapRect().Center() // bNoPercent=FALSE: Position ist -5000..5000 (1/100)% bzw. 0..10000 (je nach Align) - // bNoPercent=TRUE : Position ist in log Einh, rel zum Bezugspunkt + // bNoPercent=sal_True : Position ist in log Einh, rel zum Bezugspunkt Point aPos; - USHORT nEscDir; - USHORT nId; - USHORT nAlign; + sal_uInt16 nEscDir; + sal_uInt16 nId; + sal_uInt16 nAlign; sal_uInt8 bNoPercent:1; sal_uInt8 bReallyAbsolute:1; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt sal_uInt8 bUserDefined:1; // #i38892# public: - SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=FALSE; bReallyAbsolute=FALSE; bUserDefined=TRUE; } - SdrGluePoint(const Point& rNewPos, bool bNewPercent=TRUE, USHORT nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute=FALSE; bUserDefined=TRUE; } + SdrGluePoint(): nEscDir(SDRESC_SMART),nId(0),nAlign(0) { bNoPercent=sal_False; bReallyAbsolute=sal_False; bUserDefined=sal_True; } + SdrGluePoint(const Point& rNewPos, bool bNewPercent= sal_True, sal_uInt16 nNewAlign=0): aPos(rNewPos),nEscDir(SDRESC_SMART),nId(0),nAlign(nNewAlign) { bNoPercent=!bNewPercent; bReallyAbsolute = sal_False; bUserDefined = sal_True; } bool operator==(const SdrGluePoint& rCmpGP) const { return aPos==rCmpGP.aPos && nEscDir==rCmpGP.nEscDir && nId==rCmpGP.nId && nAlign==rCmpGP.nAlign && bNoPercent==rCmpGP.bNoPercent && bReallyAbsolute==rCmpGP.bReallyAbsolute && bUserDefined==rCmpGP.bUserDefined; } bool operator!=(const SdrGluePoint& rCmpGP) const { return !operator==(rCmpGP); } const Point& GetPos() const { return aPos; } void SetPos(const Point& rNewPos) { aPos=rNewPos; } - USHORT GetEscDir() const { return nEscDir; } - void SetEscDir(USHORT nNewEsc) { nEscDir=nNewEsc; } - USHORT GetId() const { return nId; } - void SetId(USHORT nNewId) { nId=nNewId; } + sal_uInt16 GetEscDir() const { return nEscDir; } + void SetEscDir(sal_uInt16 nNewEsc) { nEscDir=nNewEsc; } + sal_uInt16 GetId() const { return nId; } + void SetId(sal_uInt16 nNewId) { nId=nNewId; } bool IsPercent() const { return bNoPercent ? false : true; } void SetPercent(bool bOn) { bNoPercent = !bOn; } // Temporaer zu setzen fuer Transformationen am Bezugsobjekt @@ -94,12 +94,12 @@ public: bool IsUserDefined() const { return bUserDefined ? true : false; } void SetUserDefined(bool bNew) { bUserDefined = bNew ? true : false; } - USHORT GetAlign() const { return nAlign; } - void SetAlign(USHORT nAlg) { nAlign=nAlg; } - USHORT GetHorzAlign() const { return nAlign&0x00FF; } - void SetHorzAlign(USHORT nAlg) { nAlign=(nAlign&0xFF00)|(nAlg&0x00FF); } - USHORT GetVertAlign() const { return nAlign&0xFF00; } - void SetVertAlign(USHORT nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); } + sal_uInt16 GetAlign() const { return nAlign; } + void SetAlign(sal_uInt16 nAlg) { nAlign=nAlg; } + sal_uInt16 GetHorzAlign() const { return nAlign&0x00FF; } + void SetHorzAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0xFF00)|(nAlg&0x00FF); } + sal_uInt16 GetVertAlign() const { return nAlign&0xFF00; } + void SetVertAlign(sal_uInt16 nAlg) { nAlign=(nAlign&0x00FF)|(nAlg&0xFF00); } void Draw(OutputDevice& rOut, const SdrObject* pObj) const; bool IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj) const; void Invalidate(Window& rWin, const SdrObject* pObj) const; @@ -107,8 +107,8 @@ public: void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj); long GetAlignAngle() const; void SetAlignAngle(long nWink); - long EscDirToAngle(USHORT nEsc) const; - USHORT EscAngleToDir(long nWink) const; + long EscDirToAngle(sal_uInt16 nEsc) const; + sal_uInt16 EscAngleToDir(long nWink) const; void Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, const SdrObject* pObj); void Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj); @@ -120,22 +120,22 @@ public: class SVX_DLLPUBLIC SdrGluePointList { Container aList; protected: - SdrGluePoint* GetObject(USHORT i) const { return (SdrGluePoint*)(aList.GetObject(i)); } + SdrGluePoint* GetObject(sal_uInt16 i) const { return (SdrGluePoint*)(aList.GetObject(i)); } public: SdrGluePointList(): aList(1024,4,4) {} SdrGluePointList(const SdrGluePointList& rSrcList): aList(1024,4,4) { *this=rSrcList; } ~SdrGluePointList() { Clear(); } void Clear(); void operator=(const SdrGluePointList& rSrcList); - USHORT GetCount() const { return USHORT(aList.Count()); } + sal_uInt16 GetCount() const { return sal_uInt16(aList.Count()); } // Beim Insert wird dem Objekt (also dem GluePoint) automatisch eine Id zugewiesen. // ReturnCode ist der Index des neuen GluePoints in der Liste - USHORT Insert(const SdrGluePoint& rGP); - void Delete(USHORT nPos) { delete (SdrGluePoint*)aList.Remove(nPos); } - SdrGluePoint& operator[](USHORT nPos) { return *GetObject(nPos); } - const SdrGluePoint& operator[](USHORT nPos) const { return *GetObject(nPos); } - USHORT FindGluePoint(USHORT nId) const; - USHORT HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack=FALSE, bool bNext = false, USHORT nId0=0) const; + sal_uInt16 Insert(const SdrGluePoint& rGP); + void Delete(sal_uInt16 nPos) { delete (SdrGluePoint*)aList.Remove(nPos); } + SdrGluePoint& operator[](sal_uInt16 nPos) { return *GetObject(nPos); } + const SdrGluePoint& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } + sal_uInt16 FindGluePoint(sal_uInt16 nId) const; + sal_uInt16 HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack = false, bool bNext = false, sal_uInt16 nId0=0) const; void Invalidate(Window& rWin, const SdrObject* pObj) const; // Temporaer zu setzen fuer Transformationen am Bezugsobjekt void SetReallyAbsolute(bool bOn, const SdrObject& rObj); diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx index 4d40eac061..722a674176 100644..100755 --- a/svx/inc/svx/svdhdl.hxx +++ b/svx/inc/svx/svdhdl.hxx @@ -173,9 +173,9 @@ protected: unsigned bSelect : 1; // Ein selektierter Polygonpunkt? unsigned b1PixMore : 1; // True=Handle wird 1 Pixel groesser dargestellt unsigned bPlusHdl : 1; // u.a. fuer Hld-Paint Optimierung bei MarkPoint/UnmarkPoint, ... - + bool mbMoveOutside; // forces this handle to be moved outside of the selection rectangle - + // create marker for this kind virtual void CreateB2dIAObject(); @@ -211,14 +211,14 @@ public: SdrObject* GetObj() const { return pObj; } void SetObj(SdrObject* pNewObj); - BOOL IsSelected() const { return bSelect; } - void SetSelected(BOOL bJa=TRUE); + sal_Bool IsSelected() const { return bSelect; } + void SetSelected(sal_Bool bJa=sal_True); - void Set1PixMore(BOOL bJa=TRUE); + void Set1PixMore(sal_Bool bJa=sal_True); void SetDrehWink(long n); - BOOL IsCornerHdl() const { return eKind==HDL_UPLFT || eKind==HDL_UPRGT || eKind==HDL_LWLFT || eKind==HDL_LWRGT; } - BOOL IsVertexHdl() const { return eKind==HDL_UPPER || eKind==HDL_LOWER || eKind==HDL_LEFT || eKind==HDL_RIGHT; } + sal_Bool IsCornerHdl() const { return eKind==HDL_UPLFT || eKind==HDL_UPRGT || eKind==HDL_LWLFT || eKind==HDL_LWRGT; } + sal_Bool IsVertexHdl() const { return eKind==HDL_UPPER || eKind==HDL_LOWER || eKind==HDL_LEFT || eKind==HDL_RIGHT; } void SetObjHdlNum(sal_uInt32 nNum) { nObjHdlNum=nNum; } sal_uInt32 GetObjHdlNum() const { return nObjHdlNum; } @@ -229,8 +229,8 @@ public: void SetPointNum(sal_uInt32 nNum) { nPPntNum=nNum; } sal_uInt32 GetPointNum() const { return nPPntNum; } - void SetPlusHdl(BOOL bOn) { bPlusHdl=bOn; } - BOOL IsPlusHdl() const { return bPlusHdl; } + void SetPlusHdl(sal_Bool bOn) { bPlusHdl=bOn; } + sal_Bool IsPlusHdl() const { return bPlusHdl; } void SetSourceHdlNum(sal_uInt32 nNum) { nSourceHdlNum=nNum; } sal_uInt32 GetSourceHdlNum() const { return nSourceHdlNum; } @@ -239,7 +239,7 @@ public: bool IsHdlHit(const Point& rPnt) const; // #97016# II - virtual BOOL IsFocusHdl() const; + virtual sal_Bool IsFocusHdl() const; void SetMoveOutside( bool bMoveOutside ); @@ -283,13 +283,13 @@ private: SVX_DLLPRIVATE void CallColorChangeLink(); public: - SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), BOOL bLum = FALSE); + SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), sal_Bool bLum = sal_False); virtual ~SdrHdlColor(); - BOOL IsUseLuminance() const { return bUseLuminance; } + sal_Bool IsUseLuminance() const { return bUseLuminance; } Color GetColor() const { return aMarkerColor; } - void SetColor(Color aNew, BOOL bCallLink = FALSE); + void SetColor(Color aNew, sal_Bool bCallLink = sal_False); const Size& GetSize() const { return aMarkerSize; } void SetSize(const Size& rNew); @@ -321,10 +321,10 @@ private: virtual void CreateB2dIAObject(); public: - SdrHdlGradient(const Point& rRef1, const Point& rRef2, BOOL bGrad = TRUE); + SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad = sal_True); virtual ~SdrHdlGradient(); - BOOL IsGradient() const { return bGradient; } + sal_Bool IsGradient() const { return bGradient; } // set the associated color handles void SetColorHandles(SdrHdlColor* pL1, SdrHdlColor* pL2) { pColHdl1 = pL1; pColHdl2 = pL2; } @@ -338,13 +338,13 @@ public: DECL_LINK(ColorChangeHdl, SdrHdl*); // transformation call, create gradient from this handle - void FromIAOToItem(SdrObject* pObj, BOOL bSetItemOnObject, BOOL bUndo); + void FromIAOToItem(SdrObject* pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo); // selection flags for interaction - BOOL IsMoveSingleHandle() const { return bMoveSingleHandle; } - void SetMoveSingleHandle(BOOL bNew) { bMoveSingleHandle = bNew; } - BOOL IsMoveFirstHandle() const { return bMoveFirstHandle; } - void SetMoveFirstHandle(BOOL bNew) { bMoveFirstHandle = bNew; } + sal_Bool IsMoveSingleHandle() const { return bMoveSingleHandle; } + void SetMoveSingleHandle(sal_Bool bNew) { bMoveSingleHandle = bNew; } + sal_Bool IsMoveFirstHandle() const { return bMoveFirstHandle; } + void SetMoveFirstHandle(sal_Bool bNew) { bMoveFirstHandle = bNew; } }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -411,7 +411,7 @@ public: void SetLineCode(SdrEdgeLineCode eCode); SdrEdgeLineCode GetLineCode() const { return eLineCode; } - BOOL IsHorzDrag() const; + sal_Bool IsHorzDrag() const; virtual Pointer GetPointer() const; }; @@ -452,10 +452,10 @@ class ImplHdlListData; class SVX_DLLPUBLIC SdrHdlList { protected: - ULONG mnFocusIndex; + sal_uIntPtr mnFocusIndex; SdrMarkView* pView; Container aList; - USHORT nHdlSize; + sal_uInt16 nHdlSize; unsigned bRotateShear : 1; unsigned bDistortShear : 1; @@ -465,8 +465,8 @@ protected: private: SVX_DLLPRIVATE SdrHdlList(const SdrHdlList&): aList(1024,64,64) {} SVX_DLLPRIVATE void operator=(const SdrHdlList&) {} - SVX_DLLPRIVATE BOOL operator==(const SdrHdlList&) const { return FALSE; } - SVX_DLLPRIVATE BOOL operator!=(const SdrHdlList&) const { return FALSE; } + SVX_DLLPRIVATE sal_Bool operator==(const SdrHdlList&) const { return sal_False; } + SVX_DLLPRIVATE sal_Bool operator!=(const SdrHdlList&) const { return sal_False; } public: SdrHdlList(SdrMarkView* pV); @@ -486,28 +486,28 @@ public: // 2.Level PageView (Pointer) // 3.Level Position (x+y) void Sort(); - ULONG GetHdlCount() const { return aList.Count(); } - SdrHdl* GetHdl(ULONG nNum) const { return (SdrHdl*)(aList.GetObject(nNum)); } - ULONG GetHdlNum(const SdrHdl* pHdl) const; - void SetHdlSize(USHORT nSiz); - USHORT GetHdlSize() const { return nHdlSize; } - void SetMoveOutside(BOOL bOn); - BOOL IsMoveOutside() const { return bMoveOutside; } - void SetRotateShear(BOOL bOn); - BOOL IsRotateShear() const { return bRotateShear; } - void SetDistortShear(BOOL bOn); - BOOL IsDistortShear() const { return bDistortShear; } - void SetFineHdl(BOOL bOn); - BOOL IsFineHdl() const { return bFineHandles; } + sal_uIntPtr GetHdlCount() const { return aList.Count(); } + SdrHdl* GetHdl(sal_uIntPtr nNum) const { return (SdrHdl*)(aList.GetObject(nNum)); } + sal_uIntPtr GetHdlNum(const SdrHdl* pHdl) const; + void SetHdlSize(sal_uInt16 nSiz); + sal_uInt16 GetHdlSize() const { return nHdlSize; } + void SetMoveOutside(sal_Bool bOn); + sal_Bool IsMoveOutside() const { return bMoveOutside; } + void SetRotateShear(sal_Bool bOn); + sal_Bool IsRotateShear() const { return bRotateShear; } + void SetDistortShear(sal_Bool bOn); + sal_Bool IsDistortShear() const { return bDistortShear; } + void SetFineHdl(sal_Bool bOn); + sal_Bool IsFineHdl() const { return bFineHandles; } // AddHdl uebernimmt das Handle in sein Eigentum. Es muss // also auf dem Heap stehen, da Clear() ein delete macht. - void AddHdl(SdrHdl* pHdl, BOOL bAtBegin=FALSE); - SdrHdl* RemoveHdl(ULONG nNum); + void AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin=sal_False); + SdrHdl* RemoveHdl(sal_uIntPtr nNum); // Zuletzt eingefuegte Handles werden am ehesten getroffen // (wenn Handles uebereinander liegen). - SdrHdl* IsHdlListHit(const Point& rPnt, BOOL bBack=FALSE, BOOL bNext=FALSE, SdrHdl* pHdl0=NULL) const; + SdrHdl* IsHdlListHit(const Point& rPnt, sal_Bool bBack=sal_False, sal_Bool bNext=sal_False, SdrHdl* pHdl0=NULL) const; SdrHdl* GetHdl(SdrHdlKind eKind1) const; }; diff --git a/svx/inc/svx/svdhlpln.hxx b/svx/inc/svx/svdhlpln.hxx index c5782d167b..5ac4d6a3da 100644..100755 --- a/svx/inc/svx/svdhlpln.hxx +++ b/svx/inc/svx/svdhlpln.hxx @@ -67,7 +67,7 @@ public: const Point& GetPos() const { return aPos; } Pointer GetPointer() const; - bool IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const; + bool IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; // OutputDevice wird benoetigt, da Fangpunkte eine feste Pixelgroesse haben Rectangle GetBoundRect(const OutputDevice& rOut) const; @@ -82,7 +82,7 @@ public: class SVX_DLLPUBLIC SdrHelpLineList { Container aList; protected: - SdrHelpLine* GetObject(USHORT i) const { return (SdrHelpLine*)(aList.GetObject(i)); } + SdrHelpLine* GetObject(sal_uInt16 i) const { return (SdrHelpLine*)(aList.GetObject(i)); } public: SdrHelpLineList(): aList(1024,4,4) {} SdrHelpLineList(const SdrHelpLineList& rSrcList): aList(1024,4,4) { *this=rSrcList; } @@ -91,13 +91,13 @@ public: void operator=(const SdrHelpLineList& rSrcList); bool operator==(const SdrHelpLineList& rCmp) const; bool operator!=(const SdrHelpLineList& rCmp) const { return !operator==(rCmp); } - USHORT GetCount() const { return USHORT(aList.Count()); } - void Insert(const SdrHelpLine& rHL, USHORT nPos=0xFFFF) { aList.Insert(new SdrHelpLine(rHL),nPos); } - void Delete(USHORT nPos) { delete (SdrHelpLine*)aList.Remove(nPos); } // #i24900# - void Move(USHORT nPos, USHORT nNewPos) { aList.Insert(aList.Remove(nPos),nNewPos); } - SdrHelpLine& operator[](USHORT nPos) { return *GetObject(nPos); } - const SdrHelpLine& operator[](USHORT nPos) const { return *GetObject(nPos); } - USHORT HitTest(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const; + sal_uInt16 GetCount() const { return sal_uInt16(aList.Count()); } + void Insert(const SdrHelpLine& rHL, sal_uInt16 nPos=0xFFFF) { aList.Insert(new SdrHelpLine(rHL),nPos); } + void Delete(sal_uInt16 nPos) { delete (SdrHelpLine*)aList.Remove(nPos); } // #i24900# + void Move(sal_uInt16 nPos, sal_uInt16 nNewPos) { aList.Insert(aList.Remove(nPos),nNewPos); } + SdrHelpLine& operator[](sal_uInt16 nPos) { return *GetObject(nPos); } + const SdrHelpLine& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } + sal_uInt16 HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const; }; //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svditer.hxx b/svx/inc/svx/svditer.hxx index d6c67e3fac..d6c67e3fac 100644..100755 --- a/svx/inc/svditer.hxx +++ b/svx/inc/svx/svditer.hxx diff --git a/svx/source/svdraw/svditext.hxx b/svx/inc/svx/svditext.hxx index a2d3169aeb..a2d3169aeb 100644..100755 --- a/svx/source/svdraw/svditext.hxx +++ b/svx/inc/svx/svditext.hxx diff --git a/svx/inc/svx/svdlayer.hxx b/svx/inc/svx/svdlayer.hxx index a32ca1b8eb..b85afc8fa5 100644..100755 --- a/svx/inc/svx/svdlayer.hxx +++ b/svx/inc/svx/svdlayer.hxx @@ -45,7 +45,7 @@ protected: String maTitle; String maDescription; SdrModel* pModel; // zum Broadcasten - UINT16 nType; // 0=Userdefined,1=Standardlayer + sal_uInt16 nType; // 0=Userdefined,1=Standardlayer SdrLayerID nID; protected: SdrLayer(SdrLayerID nNewID, const String& rNewName) { nID=nNewID; aName=rNewName; nType=0; pModel=NULL; } @@ -106,30 +106,30 @@ public: void SetParent(SdrLayerAdmin* pNewParent) { pParent=pNewParent; } void SetModel(SdrModel* pNewModel); SdrModel* GetModel() const { return pModel; } - void InsertLayer(SdrLayer* pLayer, USHORT nPos=0xFFFF) { aLayer.Insert(pLayer,nPos); pLayer->SetModel(pModel); Broadcast(); } - SdrLayer* RemoveLayer(USHORT nPos); + void InsertLayer(SdrLayer* pLayer, sal_uInt16 nPos=0xFFFF) { aLayer.Insert(pLayer,nPos); pLayer->SetModel(pModel); Broadcast(); } + SdrLayer* RemoveLayer(sal_uInt16 nPos); // Alle Layer loeschen void ClearLayer(); // Neuer Layer wird angelegt und eingefuegt - SdrLayer* NewLayer(const String& rName, USHORT nPos=0xFFFF); + SdrLayer* NewLayer(const String& rName, sal_uInt16 nPos=0xFFFF); void DeleteLayer(SdrLayer* pLayer) { aLayer.Remove(pLayer); delete pLayer; Broadcast(); } - void MoveLayer(SdrLayer* pLayer, USHORT nNewPos=0xFFFF); - SdrLayer* MoveLayer(USHORT nPos, USHORT nNewPos); + void MoveLayer(SdrLayer* pLayer, sal_uInt16 nNewPos=0xFFFF); + SdrLayer* MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos); // Neuer Layer, Name wird aus der Resource geholt - SdrLayer* NewStandardLayer(USHORT nPos=0xFFFF); + SdrLayer* NewStandardLayer(sal_uInt16 nPos=0xFFFF); // Iterieren ueber alle Layer - USHORT GetLayerCount() const { return USHORT(aLayer.Count()); } - SdrLayer* GetLayer(USHORT i) { return (SdrLayer*)(aLayer.GetObject(i)); } - const SdrLayer* GetLayer(USHORT i) const { return (SdrLayer*)(aLayer.GetObject(i)); } + sal_uInt16 GetLayerCount() const { return sal_uInt16(aLayer.Count()); } + SdrLayer* GetLayer(sal_uInt16 i) { return (SdrLayer*)(aLayer.GetObject(i)); } + const SdrLayer* GetLayer(sal_uInt16 i) const { return (SdrLayer*)(aLayer.GetObject(i)); } - USHORT GetLayerPos(SdrLayer* pLayer) const; + sal_uInt16 GetLayerPos(SdrLayer* pLayer) const; SdrLayer* GetLayer(const String& rName, bool bInherited) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayer(rName,bInherited)); } const SdrLayer* GetLayer(const String& rName, bool bInherited) const; SdrLayerID GetLayerID(const String& rName, bool bInherited) const; - SdrLayer* GetLayerPerID(USHORT nID) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); } - const SdrLayer* GetLayerPerID(USHORT nID) const; + SdrLayer* GetLayerPerID(sal_uInt16 nID) { return (SdrLayer*)(((const SdrLayerAdmin*)this)->GetLayerPerID(nID)); } + const SdrLayer* GetLayerPerID(sal_uInt16 nID) const; void SetControlLayerName(const String& rNewName) { aControlLayerName=rNewName; } const String& GetControlLayerName() const { return aControlLayerName; } @@ -153,7 +153,7 @@ bInherited: TRUE: Wird der Layer/LayerSet nicht gefunden, so wird im Parent-LayerAdmin nachgesehen, ob es dort einen entsprechende Definition gibt. FALSE: Es wird nur dieser LayerAdmin durchsucht. - Jeder LayerAdmin einer Seite hat einen Parent-LayerAdmin, nämlich den des + Jeder LayerAdmin einer Seite hat einen Parent-LayerAdmin, n�mlich den des Model. Das Model selbst hat keinen Parent. */ diff --git a/svx/inc/svx/svdmark.hxx b/svx/inc/svx/svdmark.hxx index b9d3aaa016..f65be24306 100644..100755 --- a/svx/inc/svx/svdmark.hxx +++ b/svx/inc/svx/svdmark.hxx @@ -51,7 +51,7 @@ class SVX_DLLPUBLIC SdrUShortCont sal_Bool mbSorted; private: - void CheckSort(ULONG nPos); + void CheckSort(sal_uLong nPos); public: SdrUShortCont(sal_uInt16 nBlock, sal_uInt16 nInit, sal_uInt16 nResize) @@ -100,9 +100,9 @@ public: } } - void Insert(sal_uInt16 nElem, ULONG nPos = CONTAINER_APPEND) + void Insert(sal_uInt16 nElem, sal_uLong nPos = CONTAINER_APPEND) { - maArray.Insert((void*)ULONG(nElem),nPos); + maArray.Insert((void*)sal_uLong(nElem),nPos); if(mbSorted) { @@ -110,14 +110,14 @@ public: } } - void Remove(ULONG nPos) + void Remove(sal_uLong nPos) { maArray.Remove(nPos); } - void Replace(sal_uInt16 nElem, ULONG nPos) + void Replace(sal_uInt16 nElem, sal_uLong nPos) { - maArray.Replace((void*)ULONG(nElem), nPos); + maArray.Replace((void*)sal_uLong(nElem), nPos); if(mbSorted) { @@ -125,24 +125,24 @@ public: } } - sal_uInt16 GetObject(ULONG nPos) const + sal_uInt16 GetObject(sal_uLong nPos) const { return sal_uInt16(sal_uIntPtr(maArray.GetObject(nPos))); } - ULONG GetPos(sal_uInt16 nElem) const + sal_uLong GetPos(sal_uInt16 nElem) const { - return maArray.GetPos((void*)(ULONG)nElem); + return maArray.GetPos((void*)(sal_uLong)nElem); } - ULONG GetCount() const + sal_uLong GetCount() const { return maArray.Count(); } sal_Bool Exist(sal_uInt16 nElem) const { - return (CONTAINER_ENTRY_NOTFOUND != maArray.GetPos((void*)(ULONG)nElem)); + return (CONTAINER_ENTRY_NOTFOUND != maArray.GetPos((void*)(sal_uLong)nElem)); } }; @@ -323,20 +323,20 @@ public: mbSorted = sal_False; } - ULONG GetMarkCount() const + sal_uLong GetMarkCount() const { return maList.Count(); } - SdrMark* GetMark(ULONG nNum) const + SdrMark* GetMark(sal_uLong nNum) const { return (SdrMark*)(maList.GetObject(nNum)); } - ULONG FindObject(const SdrObject* pObj) const; + sal_uLong FindObject(const SdrObject* pObj) const; void InsertEntry(const SdrMark& rMark, sal_Bool bChkSort = sal_True); - void DeleteMark(ULONG nNum); - void ReplaceMark(const SdrMark& rNewMark, ULONG nNum); + void DeleteMark(sal_uLong nNum); + void ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum); void Merge(const SdrMarkList& rSrcList, sal_Bool bReverse = sal_False); sal_Bool DeletePageView(const SdrPageView& rPV); sal_Bool InsertPageView(const SdrPageView& rPV); diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 4369b3994d..0628a93e6d 100644..100755 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -54,11 +54,11 @@ class OutputDevice; #include <rtl/ref.hxx> -#if defined(UNX) || defined(WIN) || defined(WNT) +#if defined(UNX) || defined(WNT) #define DEGREE_CHAR ((sal_Unicode)176) /* 0xB0 = Ansi */ #endif -#if defined(DOS) || defined(OS2) +#if defined(OS2) #define DEGREE_CHAR ((sal_Unicode)248) /* 0xF8 = IBM PC (Erw. ASCII) */ #endif @@ -167,7 +167,7 @@ public: //////////////////////////////////////////////////////////////////////////////////////////////////// // Flag um nach dem Laden des Pools Aufzuraeumen (d.h. die RefCounts -// neu zu bestimmen und unbenutztes wegzuwerfen). FALSE == aktiv +// neu zu bestimmen und unbenutztes wegzuwerfen). sal_False == aktiv #define LOADREFCOUNTS (false) struct SdrDocumentStreamInfo @@ -175,7 +175,7 @@ struct SdrDocumentStreamInfo bool mbDeleteAfterUse; String maUserData; com::sun::star::uno::Reference < com::sun::star::embed::XStorage > mxStorageRef; - BOOL mbDummy1 : 1; + sal_Bool mbDummy1 : 1; }; struct SdrModelImpl; @@ -206,21 +206,21 @@ protected: m_pEmbeddedHelper; // helper for embedded objects to get rid of the SfxObjectShell SdrOutliner* pDrawOutliner; // ein Outliner zur Textausgabe SdrOutliner* pHitTestOutliner;// ein Outliner fuer den HitTest - ULONG nDefTextHgt; // Default Texthoehe in logischen Einheiten + sal_uIntPtr nDefTextHgt; // Default Texthoehe in logischen Einheiten OutputDevice* pRefOutDev; // ReferenzDevice fuer die EditEngine - ULONG nProgressAkt; // fuer den - ULONG nProgressMax; // ProgressBar- - ULONG nProgressOfs; // -Handler + sal_uIntPtr nProgressAkt; // fuer den + sal_uIntPtr nProgressMax; // ProgressBar- + sal_uIntPtr nProgressOfs; // -Handler rtl::Reference< SfxStyleSheetBasePool > mxStyleSheetPool; SfxStyleSheet* pDefaultStyleSheet; sfx2::LinkManager* pLinkManager; // LinkManager Container* pUndoStack; Container* pRedoStack; SdrUndoGroup* pAktUndoGroup; // Fuer mehrstufige - USHORT nUndoLevel; // Undo-Klammerung + sal_uInt16 nUndoLevel; // Undo-Klammerung bool mbUndoEnabled; // If false no undo is recorded or we are during the execution of an undo action - USHORT nProgressPercent; // fuer den ProgressBar-Handler - USHORT nLoadVersion; // Versionsnummer der geladenen Datei + sal_uInt16 nProgressPercent; // fuer den ProgressBar-Handler + sal_uInt16 nLoadVersion; // Versionsnummer der geladenen Datei bool bExtColorTable; // Keinen eigenen ColorTable sal_Bool mbChanged; bool bInfoChanged; @@ -235,12 +235,12 @@ protected: bool bSwapGraphics; bool bPasteResize; // Objekte werden gerade resized wegen Paste mit anderem MapMode bool bSaveOLEPreview; // save preview metafile of OLE objects - UINT16 nStreamCompressMode; // Komprimiert schreiben? - UINT16 nStreamNumberFormat; - UINT16 nDefaultTabulator; - UINT32 nMaxUndoCount; + sal_uInt16 nStreamCompressMode; // Komprimiert schreiben? + sal_uInt16 nStreamNumberFormat; + sal_uInt16 nDefaultTabulator; + sal_uInt32 nMaxUndoCount; bool bSaveNative; - BOOL bStarDrawPreviewMode; + sal_Bool bStarDrawPreviewMode; ////////////////////////////////////////////////////////////////////////////// @@ -267,18 +267,18 @@ public: bool IsAllowShapePropertyChangeListener() const; void SetAllowShapePropertyChangeListener( bool bAllow ); - UINT16 nStarDrawPreviewMasterPageNum; + sal_uInt16 nStarDrawPreviewMasterPageNum; // Reserven fuer kompatible Erweiterungen SotStorage* pModelStorage; SvxForbiddenCharactersTable* mpForbiddenCharactersTable; - ULONG nSwapGraphicsMode; + sal_uIntPtr nSwapGraphicsMode; SdrOutlinerCache* mpOutlinerCache; SdrModelImpl* mpImpl; - UINT16 mnCharCompressType; - UINT16 mnHandoutPageCount; - UINT16 nReserveUInt6; - UINT16 nReserveUInt7; + sal_uInt16 mnCharCompressType; + sal_uInt16 mnHandoutPageCount; + sal_uInt16 nReserveUInt6; + sal_uInt16 nReserveUInt7; bool mbModelLocked; bool mbKernAsianPunctuation; bool mbAddExtLeading; @@ -299,8 +299,8 @@ public: public: const SvNumberFormatter& GetNumberFormatter() const; - UINT16 getHandoutPageCount() const { return mnHandoutPageCount; } - void setHandoutPageCount( UINT16 nHandoutPageCount ) { mnHandoutPageCount = nHandoutPageCount; } + sal_uInt16 getHandoutPageCount() const { return mnHandoutPageCount; } + void setHandoutPageCount( sal_uInt16 nHandoutPageCount ) { mnHandoutPageCount = nHandoutPageCount; } protected: @@ -313,7 +313,7 @@ private: SVX_DLLPRIVATE bool operator==(const SdrModel& rCmpModel) const; SVX_DLLPRIVATE void ImpPostUndoAction(SdrUndoAction* pUndo); SVX_DLLPRIVATE void ImpSetUIUnit(); - SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit = FALSE ); + SVX_DLLPRIVATE void ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit = sal_False ); SVX_DLLPRIVATE void ImpReformatAllTextObjects(); SVX_DLLPRIVATE void ImpReformatAllEdgeObjects(); // #103122# SVX_DLLPRIVATE void ImpCreateTables(); @@ -349,7 +349,7 @@ public: // Hier kann man erfragen, ob das Model gerade eingrstreamt wird bool IsLoading() const { return sal_False /*BFS01 bLoading */; } // Muss z.B. ueberladen werden, um das Swappen/LoadOnDemand von Grafiken - // zu ermoeglichen. Wird rbDeleteAfterUse auf TRUE gesetzt, so wird + // zu ermoeglichen. Wird rbDeleteAfterUse auf sal_True gesetzt, so wird // die SvStream-Instanz vom Aufrufer nach Gebrauch destruiert. // Wenn diese Methode NULL liefert, wird zum Swappen eine temporaere // Datei angelegt. @@ -381,7 +381,7 @@ public: const SdrTextObj* GetFormattingTextObj() const; // Die TextDefaults (Font,Hoehe,Farbe) in ein Set putten void SetTextDefaults() const; - static void SetTextDefaults( SfxItemPool* pItemPool, ULONG nDefTextHgt ); + static void SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt ); // ReferenzDevice fuer die EditEngine void SetRefDevice(OutputDevice* pDev); @@ -389,11 +389,11 @@ public: // Wenn ein neuer MapMode am RefDevice gesetzt wird o.ae. void RefDeviceChanged(); // noch nicht implementiert // Default-Schrifthoehe in logischen Einheiten - void SetDefaultFontHeight(ULONG nVal); - ULONG GetDefaultFontHeight() const { return nDefTextHgt; } + void SetDefaultFontHeight(sal_uIntPtr nVal); + sal_uIntPtr GetDefaultFontHeight() const { return nDefTextHgt; } // Default-Tabulatorweite fuer die EditEngine - void SetDefaultTabulator(USHORT nVal); - USHORT GetDefaultTabulator() const { return nDefaultTabulator; } + void SetDefaultTabulator(sal_uInt16 nVal); + sal_uInt16 GetDefaultTabulator() const { return nDefaultTabulator; } // Der DefaultStyleSheet wird jedem Zeichenobjekt verbraten das in diesem // Model eingefuegt wird und kein StyleSheet gesetzt hat. @@ -457,11 +457,11 @@ public: bool IsMPgNumsDirty() const { return bMPgNumsDirty; }; void RecalcPageNums(bool bMaster); // Nach dem Insert gehoert die Page dem SdrModel. - virtual void InsertPage(SdrPage* pPage, USHORT nPos=0xFFFF); - virtual void DeletePage(USHORT nPgNum); + virtual void InsertPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); + virtual void DeletePage(sal_uInt16 nPgNum); // Remove bedeutet Eigentumsuebereignung an den Aufrufer (Gegenteil von Insert) - virtual SdrPage* RemovePage(USHORT nPgNum); - virtual void MovePage(USHORT nPgNum, USHORT nNewPos); + virtual SdrPage* RemovePage(sal_uInt16 nPgNum); + virtual void MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos); const SdrPage* GetPage(sal_uInt16 nPgNum) const; SdrPage* GetPage(sal_uInt16 nPgNum); sal_uInt16 GetPageCount() const; @@ -469,11 +469,11 @@ public: virtual void PageListChanged(); // Masterpages - virtual void InsertMasterPage(SdrPage* pPage, USHORT nPos=0xFFFF); - virtual void DeleteMasterPage(USHORT nPgNum); + virtual void InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos=0xFFFF); + virtual void DeleteMasterPage(sal_uInt16 nPgNum); // Remove bedeutet Eigentumsuebereignung an den Aufrufer (Gegenteil von Insert) - virtual SdrPage* RemoveMasterPage(USHORT nPgNum); - virtual void MoveMasterPage(USHORT nPgNum, USHORT nNewPos); + virtual SdrPage* RemoveMasterPage(sal_uInt16 nPgNum); + virtual void MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos); const SdrPage* GetMasterPage(sal_uInt16 nPgNum) const; SdrPage* GetMasterPage(sal_uInt16 nPgNum); sal_uInt16 GetMasterPageCount() const; @@ -492,27 +492,27 @@ public: bool IsPageNotValid() const { return bPageNotValid; } void SetPageNotValid(bool bJa = true) { bPageNotValid=bJa; } - // Schaltet man dieses Flag auf TRUE, so werden Grafikobjekte + // Schaltet man dieses Flag auf sal_True, so werden Grafikobjekte // portabel gespeichert. Es findet dann beim Speichern ggf. // eine implizite Wandlung von Metafiles statt. // Default=FALSE. Flag ist nicht persistent. bool IsSavePortable() const { return bSavePortable; } void SetSavePortable(bool bJa = true) { bSavePortable=bJa; } - // Schaltet man dieses Flag auf TRUE, so werden + // Schaltet man dieses Flag auf sal_True, so werden // Pixelobjekte (stark) komprimiert gespeichert. // Default=FALSE. Flag ist nicht persistent. bool IsSaveCompressed() const { return bSaveCompressed; } void SetSaveCompressed(bool bJa = true) { bSaveCompressed=bJa; } - // Schaltet man dieses Flag auf TRUE, so werden + // Schaltet man dieses Flag auf sal_True, so werden // Grafikobjekte mit gesetztem Native-Link // native gespeichert. // Default=FALSE. Flag ist nicht persistent. bool IsSaveNative() const { return bSaveNative; } void SetSaveNative(bool bJa = true) { bSaveNative=bJa; } - // Schaltet man dieses Flag auf TRUE, so werden die Grafiken + // Schaltet man dieses Flag auf sal_True, so werden die Grafiken // von Grafikobjekten: // - beim Laden eines Dokuments nicht sofort mitgeladen, // sondern erst wenn sie gebraucht (z.B. angezeigt) werden. @@ -523,8 +523,8 @@ public: // Default=FALSE. Flag ist nicht persistent. bool IsSwapGraphics() const { return bSwapGraphics; } void SetSwapGraphics(bool bJa = true); - void SetSwapGraphicsMode(ULONG nMode) { nSwapGraphicsMode = nMode; } - ULONG GetSwapGraphicsMode() const { return nSwapGraphicsMode; } + void SetSwapGraphicsMode(sal_uIntPtr nMode) { nSwapGraphicsMode = nMode; } + sal_uIntPtr GetSwapGraphicsMode() const { return nSwapGraphicsMode; } bool IsSaveOLEPreview() const { return bSaveOLEPreview; } void SetSaveOLEPreview( bool bSet) { bSaveOLEPreview = bSet; } @@ -539,7 +539,7 @@ public: bool IsBitmapCaching() const { return !bNoBitmapCaching; } void SetBitmapCaching(bool bJa = true) { bNoBitmapCaching=!bJa; } - // Defaultmaessig (FALSE) kann man Textrahmen ohne Fuellung durch + // Defaultmaessig (sal_False) kann man Textrahmen ohne Fuellung durch // Mausklick selektieren. Nach Aktivierung dieses Flags trifft man sie // nur noch in dem Bereich, wo sich auch tatsaechlich Text befindet. bool IsPickThroughTransparentTextFrames() const { return bTransparentTextFrames; } @@ -549,7 +549,7 @@ public: // Wird nur von den Possibility-Methoden der View ausgewerdet. // Direkte Manipulationen am Model, ... berueksichtigen dieses Flag nicht. // Sollte ueberladen werden und entsprechend des ReadOnly-Status des Files - // TRUE oder FALSE liefern (Methode wird oeffters gerufen, also ein Flag + // sal_True oder sal_False liefern (Methode wird oeffters gerufen, also ein Flag // verwenden!). virtual bool IsReadOnly() const; virtual void SetReadOnly(bool bYes); @@ -559,25 +559,25 @@ public: // rSourceModel ist anschliessend u.U. weitgehend leer. // nFirstPageNum,nLastPageNum: Die aus rSourceModel zu uebernehmenden Seiten // nDestPos..................: Einfuegeposition - // bMergeMasterPages.........: TRUE =benoetigte MasterPages werden aus + // bMergeMasterPages.........: sal_True =benoetigte MasterPages werden aus // rSourceModel ebenfalls uebernommen - // FALSE=Die MasterPageDescriptoren der Seiten + // sal_False=Die MasterPageDescriptoren der Seiten // aus rSourceModel werden auf die // vorhandenen MasterPages gemappt. // bUndo.....................: Fuer das Merging wird eine UndoAction generiert. // Undo ist nur fuer das ZielModel, nicht fuer // rSourceModel. - // bTreadSourceAsConst.......: TRUE=Das SourceModel wird nicht veraendert,. + // bTreadSourceAsConst.......: sal_True=Das SourceModel wird nicht veraendert,. // d.h die Seiten werden kopiert. virtual void Merge(SdrModel& rSourceModel, - USHORT nFirstPageNum=0, USHORT nLastPageNum=0xFFFF, - USHORT nDestPos=0xFFFF, + sal_uInt16 nFirstPageNum=0, sal_uInt16 nLastPageNum=0xFFFF, + sal_uInt16 nDestPos=0xFFFF, bool bMergeMasterPages = false, bool bAllMasterPages = false, bool bUndo = true, bool bTreadSourceAsConst = false); - // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,FALSE,FALSE,bUndo,!bMoveNoCopy); - void CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum, - USHORT nDestPos, + // Ist wie Merge(SourceModel=DestModel,nFirst,nLast,nDest,sal_False,sal_False,bUndo,!bMoveNoCopy); + void CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, + sal_uInt16 nDestPos, bool bUndo = true, bool bMoveNoCopy = false); // Mit BegUndo() / EndUndo() ist es moeglich beliebig viele UndoActions @@ -594,7 +594,7 @@ public: void BegUndo(SdrUndoGroup* pUndoGrp); // Undo-Klammerung auf void EndUndo(); // Undo-Klammerung zu void AddUndo(SdrUndoAction* pUndo); - USHORT GetUndoBracketLevel() const { return nUndoLevel; } + sal_uInt16 GetUndoBracketLevel() const { return nUndoLevel; } const SdrUndoGroup* GetAktUndoGroup() const { return pAktUndoGroup; } // nur nach dem 1. BegUndo oder vor dem letzten EndUndo: void SetUndoComment(const String& rComment); @@ -603,15 +603,15 @@ public: // Das Undo-Managment findet nur statt, wenn kein NotifyUndoAction-Handler // gesetzt ist. // Default ist 16. Minimaler MaxUndoActionCount ist 1! - void SetMaxUndoActionCount(ULONG nAnz); - ULONG GetMaxUndoActionCount() const { return nMaxUndoCount; } + void SetMaxUndoActionCount(sal_uIntPtr nAnz); + sal_uIntPtr GetMaxUndoActionCount() const { return nMaxUndoCount; } void ClearUndoBuffer(); // UndoAction(0) ist die aktuelle (also die zuletzt eingegangene) - ULONG GetUndoActionCount() const { return pUndoStack!=NULL ? pUndoStack->Count() : 0; } - const SfxUndoAction* GetUndoAction(ULONG nNum) const { return (SfxUndoAction*)(pUndoStack!=NULL ? pUndoStack->GetObject(nNum) : NULL); } + sal_uIntPtr GetUndoActionCount() const { return pUndoStack!=NULL ? pUndoStack->Count() : 0; } + const SfxUndoAction* GetUndoAction(sal_uIntPtr nNum) const { return (SfxUndoAction*)(pUndoStack!=NULL ? pUndoStack->GetObject(nNum) : NULL); } // RedoAction(0) ist die aktuelle (also die des letzten Undo) - ULONG GetRedoActionCount() const { return pRedoStack!=NULL ? pRedoStack->Count() : 0; } - const SfxUndoAction* GetRedoAction(ULONG nNum) const { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); } + sal_uIntPtr GetRedoActionCount() const { return pRedoStack!=NULL ? pRedoStack->Count() : 0; } + const SfxUndoAction* GetRedoAction(sal_uIntPtr nNum) const { return (SfxUndoAction*)(pRedoStack!=NULL ? pRedoStack->GetObject(nNum) : NULL); } bool Undo(); bool Redo(); @@ -628,6 +628,7 @@ public: /** application can set it's own undo manager, BegUndo, EndUndo and AddUndoAction calls are routet to this interface if given */ void SetSdrUndoManager( SfxUndoManager* pUndoManager ); + SfxUndoManager* GetSdrUndoManager() const; /** applications can set their own undo factory to overide creation of undo actions. The SdrModel will become owner of the given SdrUndoFactory @@ -674,13 +675,13 @@ public: // durch. Geprueft wird insbesondere die Verkettung von Verschachtelten // Gruppenobjekten, aber auch Stati wie bInserted sowie Model* und Page* // der Objects, SubLists und Pages. Bei korrekter Struktur liefert die - // Methode TRUE, andernfalls FALSE. + // Methode sal_True, andernfalls FALSE. // Dieser Check steht nur zur Verfuegung, wenn die Engine mit DBG_UTIL // uebersetzt wurde. Andernfalls liefert die Methode immer TRUE. (ni) bool CheckConsistence() const; - void SetStarDrawPreviewMode(BOOL bPreview); - BOOL IsStarDrawPreviewMode() { return bStarDrawPreviewMode; } + void SetStarDrawPreviewMode(sal_Bool bPreview); + sal_Bool IsStarDrawPreviewMode() { return bStarDrawPreviewMode; } SotStorage* GetModelStorage() const { return pModelStorage; } void SetModelStorage( SotStorage* pStor ) { pModelStorage = pStor; } @@ -696,8 +697,8 @@ public: void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ); rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable() const; - void SetCharCompressType( UINT16 nType ); - UINT16 GetCharCompressType() const { return mnCharCompressType; } + void SetCharCompressType( sal_uInt16 nType ); + sal_uInt16 GetCharCompressType() const { return mnCharCompressType; } void SetKernAsianPunctuation( sal_Bool bEnabled ); sal_Bool IsKernAsianPunctuation() const { return (sal_Bool)mbKernAsianPunctuation; } @@ -707,9 +708,9 @@ public: void ReformatAllTextObjects(); - bool HasTransparentObjects( BOOL bCheckForAlphaChannel = FALSE ) const; + bool HasTransparentObjects( bool bCheckForAlphaChannel = false ) const; - SdrOutliner* createOutliner( USHORT nOutlinerMode ); + SdrOutliner* createOutliner( sal_uInt16 nOutlinerMode ); void disposeOutliner( SdrOutliner* pOutliner ); sal_Bool IsWriter() const { return !bMyPool; } diff --git a/svx/inc/svx/svdmrkv.hxx b/svx/inc/svx/svdmrkv.hxx index 30da68ed00..b2630127e0 100644..100755 --- a/svx/inc/svx/svdmrkv.hxx +++ b/svx/inc/svx/svdmrkv.hxx @@ -135,9 +135,9 @@ protected: Rectangle aMarkedPointsRect; Rectangle aMarkedGluePointsRect; - USHORT nFrameHandlesLimit; - ULONG mnInsPointNum; // Nummer des InsPoint - ULONG nMarkableObjCount; + sal_uInt16 nFrameHandlesLimit; + sal_uIntPtr mnInsPointNum; // Nummer des InsPoint + sal_uIntPtr nMarkableObjCount; SdrDragMode eDragMode; // Persistent SdrViewEditMode eEditMode; // Persistent @@ -170,7 +170,7 @@ protected: virtual void SetMarkRects(); // Rects an den PageViews virtual void CheckMarked(); // MarkList nach Del und Lock Layer durchsuchen... virtual void AddDragModeHdl(SdrDragMode eMode); - virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); // add custom handles (used by other apps, e.g. AnchorPos) virtual void AddCustomHdl(); @@ -179,18 +179,18 @@ protected: void ForceUndirtyMrkPnt() const { if (bMrkPntDirty) UndirtyMrkPnt(); } //HMHvoid ImpShowMarkHdl(bool bNoRefHdl); - virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const; - virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObjList* pOL, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const; - BOOL ImpIsFrameHandles() const; - void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT nVal=0, USHORT nOpt=0) const; + virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay) const; + virtual SdrObject* CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const; + sal_Bool ImpIsFrameHandles() const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 nVal=0, sal_uInt16 nOpt=0) const; // Macht aus einer Winkelangabe in 1/100deg einen String inkl. Grad-Zeichen - BOOL ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark); - virtual BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark); - BOOL MarkGluePoints(const Rectangle* pRect, BOOL bUnmark); + sal_Bool ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark); + virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark); + sal_Bool MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark); - void SetMoveOutside(BOOL bOn); - BOOL IsMoveOutside() const; + void SetMoveOutside(sal_Bool bOn); + sal_Bool IsMoveOutside() const; protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView @@ -198,7 +198,7 @@ protected: virtual ~SdrMarkView(); public: - virtual BOOL IsAction() const; + virtual sal_Bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); @@ -207,9 +207,9 @@ public: virtual void ClearPageView(); virtual void HideSdrPage(); - virtual BOOL IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; + virtual sal_Bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const; - // Liefert TRUE wenn Objekte, Punkte oder Klebepunkte durch Rahmenaufziehen + // Liefert sal_True wenn Objekte, Punkte oder Klebepunkte durch Rahmenaufziehen // selektiert werden (solange wie der Rahmen aufgezogen wird). sal_Bool IsMarking() const { return IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); } @@ -225,35 +225,35 @@ public: // Das Interface wird hier evtl noch geaendert wg. Ortho-Drag void SetDragMode(SdrDragMode eMode); SdrDragMode GetDragMode() const { return eDragMode; } - BOOL ChkDragMode(SdrDragMode eMode) const; - void SetFrameHandles(BOOL bOn); - BOOL IsFrameHandles() const { return bForceFrameHandles; } + sal_Bool ChkDragMode(SdrDragMode eMode) const; + void SetFrameHandles(sal_Bool bOn); + sal_Bool IsFrameHandles() const { return bForceFrameHandles; } // Limit, ab wann implizit auf FrameHandles umgeschaltet wird. default=50. - void SetFrameHandlesLimit(USHORT nAnz) { nFrameHandlesLimit=nAnz; } - USHORT GetFrameHandlesLimit() const { return nFrameHandlesLimit; } + void SetFrameHandlesLimit(sal_uInt16 nAnz) { nFrameHandlesLimit=nAnz; } + sal_uInt16 GetFrameHandlesLimit() const { return nFrameHandlesLimit; } void SetEditMode(SdrViewEditMode eMode); SdrViewEditMode GetEditMode() const { return eEditMode; } - void SetEditMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); } - BOOL IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; } - void SetCreateMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); } - BOOL IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; } - void SetGluePointEditMode(BOOL bOn=TRUE) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); } - BOOL IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT;; } + void SetEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_EDIT:SDREDITMODE_CREATE); } + sal_Bool IsEditMode() const { return eEditMode==SDREDITMODE_EDIT; } + void SetCreateMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_CREATE:SDREDITMODE_EDIT); } + sal_Bool IsCreateMode() const { return eEditMode==SDREDITMODE_CREATE; } + void SetGluePointEditMode(sal_Bool bOn=sal_True) { SetEditMode(bOn?SDREDITMODE_GLUEPOINTEDIT:eEditMode0); } + sal_Bool IsGluePointEditMode() const { return eEditMode==SDREDITMODE_GLUEPOINTEDIT;; } - void SetDesignMode(BOOL bOn=TRUE); - BOOL IsDesignMode() const { return bDesignMode; } + void SetDesignMode(sal_Bool bOn=sal_True); + sal_Bool IsDesignMode() const { return bDesignMode; } - void SetFrameDragSingles(BOOL bOn=TRUE) { SetFrameHandles(bOn); } - BOOL IsFrameDragSingles() const { return IsFrameHandles(); } + void SetFrameDragSingles(sal_Bool bOn=sal_True) { SetFrameHandles(bOn); } + sal_Bool IsFrameDragSingles() const { return IsFrameHandles(); } // Feststellen, ob und wo ein Objekt bzw. ob ein Referenzpunkt // (Rotationsmittelpunkt,Spiegelachse) getroffen wird (SW special). SdrHitKind PickSomething(const Point& rPnt, short nTol=-2) const; - BOOL HasMarkableObj() const; - ULONG GetMarkableObjCount() const; + sal_Bool HasMarkableObj() const; + sal_uIntPtr GetMarkableObjCount() const; //HMHvoid ShowMarkHdl(bool bNoRefHdl = false); //HMHvoid HideMarkHdl(bool bNoRefHdl = false); //HMHBOOL IsMarkHdlShown() const { return bHdlShown; } @@ -269,11 +269,11 @@ protected: public: // all available const methods for read access to selection const SdrMarkList& GetMarkedObjectList() const { return mpSdrViewSelection->GetMarkedObjectList(); } - ULONG TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); } - SdrPageView* GetSdrPageViewOfMarkedByIndex(ULONG nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); } - SdrMark* GetSdrMarkByIndex(ULONG nNum) const { return GetMarkedObjectList().GetMark(nNum); } - SdrObject* GetMarkedObjectByIndex(ULONG nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); } - ULONG GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); } + sal_uIntPtr TryToFindMarkedObject(const SdrObject* pObj) const { return GetMarkedObjectList().FindObject(pObj); } + SdrPageView* GetSdrPageViewOfMarkedByIndex(sal_uIntPtr nNum) const { return GetMarkedObjectList().GetMark(nNum)->GetPageView(); } + SdrMark* GetSdrMarkByIndex(sal_uIntPtr nNum) const { return GetMarkedObjectList().GetMark(nNum); } + SdrObject* GetMarkedObjectByIndex(sal_uIntPtr nNum) const { return (GetMarkedObjectList().GetMark(nNum))->GetMarkedSdrObj(); } + sal_uIntPtr GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); } void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); } sal_Bool AreObjectsMarked() const { return (0L != GetMarkedObjectList().GetMarkCount()); } String GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); } @@ -297,47 +297,47 @@ public: void showMarkHandles(); bool areMarkHandlesHidden() const { return mbMarkHandlesHidden; } - BOOL IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); } - BOOL IsMarkedObjHit(const Point& rPnt, short nTol=-2) const; + sal_Bool IsMarkedHit(const Point& rPnt, short nTol=-2) const { return IsMarkedObjHit(rPnt,nTol); } + sal_Bool IsMarkedObjHit(const Point& rPnt, short nTol=-2) const; // Pick: Unterstuetzte Optionen fuer nOptions sind SEARCH_NEXT, SEARCH_BACKWARD (ni) - SdrHdl* PickHandle(const Point& rPnt, ULONG nOptions=0, SdrHdl* pHdl0=NULL) const; + SdrHdl* PickHandle(const Point& rPnt, sal_uIntPtr nOptions=0, SdrHdl* pHdl0=NULL) const; // Pick: Unterstuetzte Optionen fuer nOptions sind: // SDRSEARCH_DEEP SDRSEARCH_ALSOONMASTER SDRSEARCH_TESTMARKABLE SDRSEARCH_TESTTEXTEDIT // SDRSEARCH_WITHTEXT SDRSEARCH_TESTTEXTAREA SDRSEARCH_BACKWARD SDRSEARCH_MARKED // SDRSEARCH_WHOLEPAGE - virtual BOOL PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions, SdrObject** ppRootObj, ULONG* pnMarkNum=NULL, USHORT* pnPassNum=NULL) const; - virtual BOOL PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions=0) const; - // BOOL PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); } - BOOL MarkObj(const Point& rPnt, short nTol=-2, BOOL bToggle=FALSE, BOOL bDeep=FALSE); + virtual sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum=NULL, sal_uInt16* pnPassNum=NULL) const; + virtual sal_Bool PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const; + // sal_Bool PickObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const { return PickObj(rPnt,nHitTolLog,rpObj,rpPV,nOptions); } + sal_Bool MarkObj(const Point& rPnt, short nTol=-2, sal_Bool bToggle=sal_False, sal_Bool bDeep=sal_False); // Pick: Unterstuetzte Optionen fuer nOptions sind SDRSEARCH_PASS2BOUND und SDRSEARCH_PASS3NEAREST - BOOL PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG* pnMarkNum=NULL, ULONG nOptions=0) const; + sal_Bool PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum=NULL, sal_uIntPtr nOptions=0) const; // Sucht sich das Oberste der markierten Objekte (O1) und sucht von dort // aus in Richtung nach Unten dann das erste nichtmarkierte Objekt (O2). // Bei Erfolg wird die Markierung von O1 entfernt, an O2 gesetzt und TRUE - // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die + // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die // andere Richtung. - BOOL MarkNextObj(BOOL bPrev=FALSE); + sal_Bool MarkNextObj(sal_Bool bPrev=sal_False); // Sucht sich das Oberste der markierten Objekte (O1) das von rPnt/nTol // getroffen wird und sucht von dort aus in Richtung nach Unten dann das // erste nichtmarkierte Objekt (O2). Bei Erfolg wird die Markierung von - // O1 entfernt, an O2 gesetzt und TRUE returniert. - // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung. - BOOL MarkNextObj(const Point& rPnt, short nTol=-2, BOOL bPrev=FALSE); + // O1 entfernt, an O2 gesetzt und sal_True returniert. + // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung. + sal_Bool MarkNextObj(const Point& rPnt, short nTol=-2, sal_Bool bPrev=sal_False); // Alle Objekte innerhalb eines rechteckigen Bereichs markieren // Markiert werden nur Objekte, die vollstaendig eingeschlossen sind. - BOOL MarkObj(const Rectangle& rRect, BOOL bUnmark=FALSE); - void MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark=FALSE, BOOL bImpNoSetMarkHdl=FALSE); + sal_Bool MarkObj(const Rectangle& rRect, sal_Bool bUnmark=sal_False); + void MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark=sal_False, sal_Bool bImpNoSetMarkHdl=sal_False); void MarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => alle angezeigten Seiten void UnmarkAllObj(SdrPageView* pPV=NULL); // pPage=NULL => alle angezeigten Seiten // Diese Funktion kostet etwas Zeit, da die MarkList durchsucht werden muss. - BOOL IsObjMarked(SdrObject* pObj) const; + sal_Bool IsObjMarked(SdrObject* pObj) const; // void MarkAll(SdrPageView* pPV=NULL) { MarkAllObj(pPV); } -> replace with inline void UnMarkAll(SdrPageView* pPV=NULL) { UnmarkAllObj(pPV); } @@ -345,8 +345,8 @@ public: // Der Wert ist als Kantenlaenge zu betrachten. Gerade Werte werden // auf Ungerade aufgerundet: 3->3, 4->5, 5->5, 6->7, 7->7, ... // Defaultwert ist 7, Mindestwert 3 Pixel. - USHORT GetMarkHdlSizePixel() const; - void SetMarkHdlSizePixel(USHORT nSiz); + sal_uInt16 GetMarkHdlSizePixel() const; + void SetMarkHdlSizePixel(sal_uInt16 nSiz); // Die Groesse der Markierungs-Handles wird ueber die jeweilige Aufloesung // und die Groesse des Bereichs der markierten Objekte so angepasst, dass @@ -354,53 +354,53 @@ public: // Dazu muessen die Handles ggf. verkleinert dargestellt werden. Mit der // MinMarkHdlSize kann man hierfuer eine Mindestgroesse angeben. // Defaultwert ist 3, Mindestwert 3 Pixel. - BOOL IsSolidMarkHdl() const { return aHdl.IsFineHdl(); } - void SetSolidMarkHdl(BOOL bOn); + sal_Bool IsSolidMarkHdl() const { return aHdl.IsFineHdl(); } + void SetSolidMarkHdl(sal_Bool bOn); - virtual BOOL HasMarkablePoints() const; - virtual ULONG GetMarkablePointCount() const; - virtual BOOL HasMarkedPoints() const; - virtual ULONG GetMarkedPointCount() const; + virtual sal_Bool HasMarkablePoints() const; + virtual sal_uIntPtr GetMarkablePointCount() const; + virtual sal_Bool HasMarkedPoints() const; + virtual sal_uIntPtr GetMarkedPointCount() const; // Nicht alle Punkte lassen sich markieren: - virtual BOOL IsPointMarkable(const SdrHdl& rHdl) const; - virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE); + virtual sal_Bool IsPointMarkable(const SdrHdl& rHdl) const; + virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False); /** should only be used from outside svx for special ui elements */ - BOOL MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark); + sal_Bool MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark); // alle Punkte innerhalb dieses Rechtecks markieren (Viewkoordinaten) - BOOL MarkPoints(const Rectangle& rRect, BOOL bUnmark=FALSE) { return MarkPoints(&rRect,bUnmark); } - BOOL UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,TRUE); } - BOOL UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,TRUE); } - BOOL IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return &rHdl!=NULL && rHdl.IsSelected(); } - BOOL MarkAllPoints() { return MarkPoints(NULL,FALSE); } - BOOL UnmarkAllPoints() { return MarkPoints(NULL,TRUE); } - BOOL UnMarkAllPoints() { return MarkPoints(NULL,TRUE); } + sal_Bool MarkPoints(const Rectangle& rRect, sal_Bool bUnmark=sal_False) { return MarkPoints(&rRect,bUnmark); } + sal_Bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,sal_True); } + sal_Bool UnMarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,sal_True); } + sal_Bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return &rHdl!=NULL && rHdl.IsSelected(); } + sal_Bool MarkAllPoints() { return MarkPoints(NULL,sal_False); } + sal_Bool UnmarkAllPoints() { return MarkPoints(NULL,sal_True); } + sal_Bool UnMarkAllPoints() { return MarkPoints(NULL,sal_True); } // Sucht sich den ersten markierten Punkt (P1) und sucht von dort // aus in den ersten nichtmarkierte Punkt (P2). // Bei Erfolg wird die Markierung von P1 entfernt, an P2 gesetzt und TRUE - // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die + // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die // andere Richtung. - BOOL MarkNextPoint(BOOL bPrev=FALSE); + sal_Bool MarkNextPoint(sal_Bool bPrev=sal_False); // Sucht sich den ersten markierten Punkt (P1) das von rPnt // getroffen wird und sucht von dort aus den // ersten nichtmarkierten Punkt (P2). Bei Erfolg wird die Markierung von - // P1 entfernt, an P2 gesetzt und TRUE returniert. - // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung. - BOOL MarkNextPoint(const Point& rPnt, BOOL bPrev=FALSE); + // P1 entfernt, an P2 gesetzt und sal_True returniert. + // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung. + sal_Bool MarkNextPoint(const Point& rPnt, sal_Bool bPrev=sal_False); // Die Nummer des passenden Handles raussuchen. Nicht gefunden // liefert CONTAINER_ENTRY_NOTFOUND. - ULONG GetHdlNum(SdrHdl* pHdl) const { return aHdl.GetHdlNum(pHdl); } - SdrHdl* GetHdl(ULONG nHdlNum) const { return aHdl.GetHdl(nHdlNum); } + sal_uIntPtr GetHdlNum(SdrHdl* pHdl) const { return aHdl.GetHdlNum(pHdl); } + SdrHdl* GetHdl(sal_uIntPtr nHdlNum) const { return aHdl.GetHdl(nHdlNum); } const SdrHdlList& GetHdlList() const { return aHdl; } // Selektionsrahmen fuer Punktmarkierung aufziehen. - // Wird nur gestartet, wenn HasMarkablePoints() TRUE liefert. - // BOOL BegMarkPoints(const Point& rPnt, OutputDevice* pOut); + // Wird nur gestartet, wenn HasMarkablePoints() sal_True liefert. + // sal_Bool BegMarkPoints(const Point& rPnt, OutputDevice* pOut); sal_Bool BegMarkPoints(const Point& rPnt, sal_Bool bUnmark = sal_False); void MovMarkPoints(const Point& rPnt); sal_Bool EndMarkPoints(); @@ -408,21 +408,21 @@ public: sal_Bool IsMarkPoints() const { return (0L != mpMarkPointsOverlay); } // Zusatzhandles dauerhaft sichtbar schalten - void SetPlusHandlesAlwaysVisible(BOOL bOn); - BOOL IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; } + void SetPlusHandlesAlwaysVisible(sal_Bool bOn); + sal_Bool IsPlusHandlesAlwaysVisible() const { return bPlusHdlAlways; } // Handles sichrbar waerend TextEdit (in doppelter Groesse)? // Persistent, default=FALSE - void SetMarkHdlWhenTextEdit(BOOL bOn) { bMarkHdlWhenTextEdit=bOn; } - BOOL IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; } + void SetMarkHdlWhenTextEdit(sal_Bool bOn) { bMarkHdlWhenTextEdit=bOn; } + sal_Bool IsMarkHdlWhenTextEdit() const { return bMarkHdlWhenTextEdit; } - BOOL HasMarkableGluePoints() const; - ULONG GetMarkableGluePointCount() const; - BOOL HasMarkedGluePoints() const; - ULONG GetMarkedGluePointCount() const; + sal_Bool HasMarkableGluePoints() const; + sal_uIntPtr GetMarkableGluePointCount() const; + sal_Bool HasMarkedGluePoints() const; + sal_uIntPtr GetMarkedGluePointCount() const; // Ein Klebepunkt wird eindeutig identifiziert durch das SdrObject - // (dem er zugehoert) sowie einem USHORT nId (da jedes SdrObject je + // (dem er zugehoert) sowie einem sal_uInt16 nId (da jedes SdrObject je // mehrere Klebepunkte haben kann. Hier an der View kommt zudem noch // eine SdrPageView, die stets korrekt gesetzt sein sollte. // Alternativ kann ein Klebepunkt durch ein SdrHdl bezeichnet werden. @@ -433,52 +433,52 @@ public: // Handleliste erneut berechnet. Alle vorher gemerkten SdrHdl* sind // damit ungueltig, ebenso die Punkt-Id's! // Pick: Unterstuetzte Optionen fuer nOptions sind SEARCH_NEXT, SEARCH_BACKWARD - BOOL PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rnId, SdrPageView*& rpPV, ULONG nOptions=0) const; - BOOL MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* pPV, BOOL bUnmark=FALSE); - BOOL UnmarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,TRUE); } - BOOL IsGluePointMarked(const SdrObject* pObj, USHORT nId) const; - BOOL UnmarkGluePoint(const SdrHdl& rHdl); + sal_Bool PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions=0) const; + sal_Bool MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV, sal_Bool bUnmark=sal_False); + sal_Bool UnmarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* pPV) { return MarkGluePoint(pObj,nId,pPV,sal_True); } + sal_Bool IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const; + sal_Bool UnmarkGluePoint(const SdrHdl& rHdl); // Hdl eines markierten GluePoints holen. Nicht markierte // GluePoints haben keine Handles - SdrHdl* GetGluePointHdl(const SdrObject* pObj, USHORT nId) const; - BOOL IsGluePoint(const SdrHdl& rHdl) const { return &rHdl!=NULL && rHdl.GetKind()==HDL_GLUE; } + SdrHdl* GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const; + sal_Bool IsGluePoint(const SdrHdl& rHdl) const { return &rHdl!=NULL && rHdl.GetKind()==HDL_GLUE; } // alle Punkte innerhalb dieses Rechtecks markieren (Viewkoordinaten) - BOOL MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,FALSE); } - BOOL UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,TRUE); } - BOOL MarkAllGluePoints() { return MarkGluePoints(NULL,FALSE); } - BOOL UnmarkAllGluePoints() { return MarkGluePoints(NULL,TRUE); } + sal_Bool MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,sal_False); } + sal_Bool UnmarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,sal_True); } + sal_Bool MarkAllGluePoints() { return MarkGluePoints(NULL,sal_False); } + sal_Bool UnmarkAllGluePoints() { return MarkGluePoints(NULL,sal_True); } // Sucht sich den ersten markierten Klebepunkt (P1) und sucht von dort // aus in den ersten nichtmarkierte Klebepunkt (P2). // Bei Erfolg wird die Markierung von P1 entfernt, an P2 gesetzt und TRUE - // returniert. Mit dem Parameter bPrev=TRUE geht die Suche genau in die + // returniert. Mit dem Parameter bPrev=sal_True geht die Suche genau in die // andere Richtung. - BOOL MarkNextGluePoint(BOOL bPrev=FALSE); + sal_Bool MarkNextGluePoint(sal_Bool bPrev=sal_False); // Sucht sich den ersten markierten Klebepunkt (P1) das von rPnt // getroffen wird und sucht von dort aus den // ersten nichtmarkierten Klebepunkt (P2). Bei Erfolg wird die Markierung - // von P1 entfernt, an P2 gesetzt und TRUE returniert. - // Mit dem Parameter bPrev=TRUE geht die Suche genau in die andere Richtung. - BOOL MarkNextGluePoint(const Point& rPnt, BOOL bPrev=FALSE); + // von P1 entfernt, an P2 gesetzt und sal_True returniert. + // Mit dem Parameter bPrev=sal_True geht die Suche genau in die andere Richtung. + sal_Bool MarkNextGluePoint(const Point& rPnt, sal_Bool bPrev=sal_False); // Selektionsrahmen fuer Klebepunktmarkierung aufziehen. - // Wird nur gestartet, wenn HasMarkableGluePoints() TRUE liefert. - // Der GlueEditMode TRUE wird nicht abgefragt. - // BOOL BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut); + // Wird nur gestartet, wenn HasMarkableGluePoints() sal_True liefert. + // Der GlueEditMode sal_True wird nicht abgefragt. + // sal_Bool BegMarkGluePoints(const Point& rPnt, OutputDevice* pOut); sal_Bool BegMarkGluePoints(const Point& rPnt, sal_Bool bUnmark = sal_False); void MovMarkGluePoints(const Point& rPnt); sal_Bool EndMarkGluePoints(); void BrkMarkGluePoints(); sal_Bool IsMarkGluePoints() const { return (0L != mpMarkGluePointsOverlay); } - // bRestraintPaint=FALSE bewirkt, dass die Handles nicht sofort wieder gemalt werden. + // bRestraintPaint=sal_False bewirkt, dass die Handles nicht sofort wieder gemalt werden. // AdjustMarkHdl wird eh' nur gerufen, wenn was geaendert wurde; was idR ein Invalidate // zur Folge hat. Am Ende von des Redraw werden die Handles automatisch gezeichnet. - // Der Zweck ist, unnoetiges Flackern zu vermeiden. -> Funkt noch nich, deshalb TRUE! - void AdjustMarkHdl(); //HMHBOOL bRestraintPaint=TRUE); + // Der Zweck ist, unnoetiges Flackern zu vermeiden. -> Funkt noch nich, deshalb sal_True! + void AdjustMarkHdl(); //HMHBOOL bRestraintPaint=sal_True); const Rectangle& GetMarkedObjRect() const; // SnapRects der Objekte, ohne Strichstaerke Rectangle GetMarkedObjBoundRect() const; // inkl. Strichstaerke, ueberstehende Fetzen, ... @@ -498,9 +498,9 @@ public: // liegen alle Memberobjekte der Gruppe im direkten Zugriff. Alle anderen // Objekte koennen waerendessen nicht bearbeitet werden (bis zum naechsten // LeaveGroup()). Bei einer seitenuebergreifenden Markierung wird jede Page - // separat abgearbeitet. Die Methode liefert TRUE, wenn wenigstens eine + // separat abgearbeitet. Die Methode liefert sal_True, wenn wenigstens eine // Gruppe betreten wurde. - BOOL EnterMarkedGroup(); + sal_Bool EnterMarkedGroup(); // Den Mittelpunkt des letzten Crook-Dragging abholen. Den kann man // bei einem anschliessenden Rotate sinnvoll als Drehmittelpunkt setzen. diff --git a/svx/inc/svx/svdoashp.hxx b/svx/inc/svx/svdoashp.hxx index 239f345909..1f05850ad2 100644..100755 --- a/svx/inc/svx/svdoashp.hxx +++ b/svx/inc/svx/svdoashp.hxx @@ -175,7 +175,7 @@ public: }; sal_Bool IsDefaultGeometry( const DefaultType eDefaultType ) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual void SetModel(SdrModel* pNewModel); @@ -200,7 +200,7 @@ public: virtual void NbcSetSnapRect(const Rectangle& rRect); virtual void NbcSetLogicRect(const Rectangle& rRect); - virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const; + virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; virtual void NbcSetStyleSheet( SfxStyleSheet* pNewStyleSheet, sal_Bool bDontRemoveHardAttr ); @@ -224,7 +224,7 @@ public: virtual void EndTextEdit( SdrOutliner& rOutl ); virtual void TakeTextAnchorRect( Rectangle& rAnchorRect ) const; virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, - Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; + Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void operator=(const SdrObject& rObj); virtual void TakeObjNameSingul(String& rName) const; @@ -237,7 +237,7 @@ public: virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual void SetPage( SdrPage* pNewPage ); diff --git a/svx/inc/svx/svdoattr.hxx b/svx/inc/svx/svdoattr.hxx index 63899a2ae9..71494b37b4 100644..100755 --- a/svx/inc/svx/svdoattr.hxx +++ b/svx/inc/svx/svdoattr.hxx @@ -75,10 +75,10 @@ public: TYPEINFO(); // Feststellen, ob bFilledObj && Fuellung!=FillNone - BOOL HasFill() const; + sal_Bool HasFill() const; // Feststellen, ob Linie!=LineNone - BOOL HasLine() const; + sal_Bool HasLine() const; virtual const Rectangle& GetSnapRect() const; diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 8dd6551c3a..f1660702ef 100644..100755 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -183,7 +183,7 @@ public: OutputDevice* pOut; const SetOfByte* pVisiLayer; const SdrPageView* pPageView; - USHORT nTol; + sal_uInt16 nTol; bool bDown; public: @@ -192,7 +192,7 @@ public: pVisiLayer(NULL), pPageView(NULL), nTol(0), - bDown(FALSE) + bDown(sal_False) {} }; @@ -209,9 +209,9 @@ public: class SVX_DLLPUBLIC SdrObjUserData { protected: - UINT32 nInventor; - UINT16 nIdentifier; - UINT16 nVersion; + sal_uInt32 nInventor; + sal_uInt16 nIdentifier; + sal_uInt16 nVersion; private: SVX_DLLPRIVATE void operator=(const SdrObjUserData& rData); // nicht implementiert @@ -221,7 +221,7 @@ private: public: TYPEINFO(); - SdrObjUserData(UINT32 nInv, UINT16 nId, UINT16 nVer) + SdrObjUserData(sal_uInt32 nInv, sal_uInt16 nId, sal_uInt16 nVer) : nInventor(nInv), nIdentifier(nId), nVersion(nVer) @@ -234,8 +234,8 @@ public: virtual ~SdrObjUserData(); virtual SdrObjUserData* Clone(SdrObject* pObj1) const = 0; // #i71039# NULL -> 0 - UINT32 GetInventor() const { return nInventor; } - UINT16 GetId() const { return nIdentifier; } + sal_uInt32 GetInventor() const { return nInventor; } + sal_uInt16 GetId() const { return nIdentifier; } virtual bool HasMacro (const SdrObject* pObj) const; virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const; @@ -260,17 +260,17 @@ public: ~SdrObjUserDataList() { Clear(); } void Clear(); - USHORT GetUserDataCount() const { return USHORT(aList.Count()); } - SdrObjUserData* GetUserData(USHORT nNum) const { return (SdrObjUserData*)aList.GetObject(nNum); } - void InsertUserData(SdrObjUserData* pData, USHORT nPos=0xFFFF) { aList.Insert(pData,nPos); } - SdrObjUserData* RemoveUserData(USHORT nNum) { return (SdrObjUserData*)aList.Remove(nNum);} - void DeleteUserData(USHORT nNum) { delete RemoveUserData(nNum); } + sal_uInt16 GetUserDataCount() const { return sal_uInt16(aList.Count()); } + SdrObjUserData* GetUserData(sal_uInt16 nNum) const { return (SdrObjUserData*)aList.GetObject(nNum); } + void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF) { aList.Insert(pData,nPos); } + SdrObjUserData* RemoveUserData(sal_uInt16 nNum) { return (SdrObjUserData*)aList.Remove(nNum);} + void DeleteUserData(sal_uInt16 nNum) { delete RemoveUserData(nNum); } }; //************************************************************ // Hilfsklasse SdrObjGeoData // -// Alle geometrischen Daten eines beliebigen Objektes zur Übergabe an's Undo/Redo +// Alle geometrischen Daten eines beliebigen Objektes zur �bergabe an's Undo/Redo // //************************************************************ @@ -280,10 +280,10 @@ public: Rectangle aBoundRect; Point aAnchor; SdrGluePointList* pGPL; - BOOL bMovProt; - BOOL bSizProt; - BOOL bNoPrint; - BOOL bClosedObj; + sal_Bool bMovProt; + sal_Bool bSizProt; + sal_Bool bNoPrint; + sal_Bool bClosedObj; bool mbVisible; SdrLayerID mnLayerID; @@ -304,7 +304,7 @@ class SdrObjPlusData friend class SdrObject; public: - SfxBroadcaster* pBroadcast; // Broadcaster, falls dieses Obj referenziert wird (bVirtObj=TRUE). Auch fuer Konnektoren etc. + SfxBroadcaster* pBroadcast; // Broadcaster, falls dieses Obj referenziert wird (bVirtObj=sal_True). Auch fuer Konnektoren etc. SdrObjUserDataList* pUserDataList; // applikationsspeziefische Daten SdrGluePointList* pGluePoints; // Klebepunkte zum Ankleben von Objektverbindern AutoTimer* pAutoTimer; @@ -335,49 +335,49 @@ public: class SdrObjTransformInfoRec { public: - unsigned bSelectAllowed : 1; // FALSE=Obj kann nicht selektiert werden - unsigned bMoveAllowed : 1; // FALSE=Obj kann nicht verschoben werden - unsigned bResizeFreeAllowed : 1; // FALSE=Obj kann nicht frei resized werden - unsigned bResizePropAllowed : 1; // FALSE=Obj kann nichtmal proportional resized werden - unsigned bRotateFreeAllowed : 1; // FALSE=Obj kann nicht frei gedreht werden - unsigned bRotate90Allowed : 1; // FALSE=Obj kann nichtmal im 90deg Raster gedreht werden - unsigned bMirrorFreeAllowed : 1; // FALSE=Obj kann nicht frei gespiegelt werden - unsigned bMirror45Allowed : 1; // FALSE=Obj kann nichtmal ueber Achse im 45deg Raster gespiegelt werden - unsigned bMirror90Allowed : 1; // FALSE=Obj kann ebenfalls nicht ueber Achse im 90deg Raster gespiegelt werden - unsigned bTransparenceAllowed : 1; // FALSE=Obj does not have an interactive transparence control - unsigned bGradientAllowed : 1; // FALSE=Obj dooes not have an interactive gradient control - unsigned bShearAllowed : 1; // FALSE=Obj kann nicht verzerrt werden + unsigned bSelectAllowed : 1; // sal_False=Obj kann nicht selektiert werden + unsigned bMoveAllowed : 1; // sal_False=Obj kann nicht verschoben werden + unsigned bResizeFreeAllowed : 1; // sal_False=Obj kann nicht frei resized werden + unsigned bResizePropAllowed : 1; // sal_False=Obj kann nichtmal proportional resized werden + unsigned bRotateFreeAllowed : 1; // sal_False=Obj kann nicht frei gedreht werden + unsigned bRotate90Allowed : 1; // sal_False=Obj kann nichtmal im 90deg Raster gedreht werden + unsigned bMirrorFreeAllowed : 1; // sal_False=Obj kann nicht frei gespiegelt werden + unsigned bMirror45Allowed : 1; // sal_False=Obj kann nichtmal ueber Achse im 45deg Raster gespiegelt werden + unsigned bMirror90Allowed : 1; // sal_False=Obj kann ebenfalls nicht ueber Achse im 90deg Raster gespiegelt werden + unsigned bTransparenceAllowed : 1; // sal_False=Obj does not have an interactive transparence control + unsigned bGradientAllowed : 1; // sal_False=Obj dooes not have an interactive gradient control + unsigned bShearAllowed : 1; // sal_False=Obj kann nicht verzerrt werden unsigned bEdgeRadiusAllowed : 1; - unsigned bNoOrthoDesired : 1; // TRUE bei Rect; ... FALSE bei BMP,MTF; - unsigned bNoContortion : 1; // FALSE=Kein verzerren (bei Crook) moeglich (nur TRUE bei PathObj und Gruppierten PathObjs) - unsigned bCanConvToPath : 1; // FALSE=Keine Konvertierung in PathObj moeglich - unsigned bCanConvToPoly : 1; // FALSE=Keine Konvertierung in PolyObj moeglich - unsigned bCanConvToContour : 1; // FALSE=no conversion down to whole contour possible - unsigned bCanConvToPathLineToArea : 1; // FALSE=Keine Konvertierung in PathObj moeglich mit Wandlung von LineToArea - unsigned bCanConvToPolyLineToArea : 1; // FALSE=Keine Konvertierung in PolyObj moeglich mit Wandlung von LineToArea + unsigned bNoOrthoDesired : 1; // sal_True bei Rect; ... sal_False bei BMP,MTF; + unsigned bNoContortion : 1; // sal_False=Kein verzerren (bei Crook) moeglich (nur sal_True bei PathObj und Gruppierten PathObjs) + unsigned bCanConvToPath : 1; // sal_False=Keine Konvertierung in PathObj moeglich + unsigned bCanConvToPoly : 1; // sal_False=Keine Konvertierung in PolyObj moeglich + unsigned bCanConvToContour : 1; // sal_False=no conversion down to whole contour possible + unsigned bCanConvToPathLineToArea : 1; // sal_False=Keine Konvertierung in PathObj moeglich mit Wandlung von LineToArea + unsigned bCanConvToPolyLineToArea : 1; // sal_False=Keine Konvertierung in PolyObj moeglich mit Wandlung von LineToArea public: SdrObjTransformInfoRec() - : bSelectAllowed(TRUE), - bMoveAllowed(TRUE), - bResizeFreeAllowed(TRUE), - bResizePropAllowed(TRUE), - bRotateFreeAllowed(TRUE), - bRotate90Allowed(TRUE), - bMirrorFreeAllowed(TRUE), - bMirror45Allowed(TRUE), - bMirror90Allowed(TRUE), - bTransparenceAllowed(TRUE), - bGradientAllowed(TRUE), - bShearAllowed(TRUE), - bEdgeRadiusAllowed(TRUE), - bNoOrthoDesired(TRUE), - bNoContortion(TRUE), - bCanConvToPath(TRUE), - bCanConvToPoly(TRUE), - bCanConvToContour(FALSE), - bCanConvToPathLineToArea(TRUE), - bCanConvToPolyLineToArea(TRUE) + : bSelectAllowed(sal_True), + bMoveAllowed(sal_True), + bResizeFreeAllowed(sal_True), + bResizePropAllowed(sal_True), + bRotateFreeAllowed(sal_True), + bRotate90Allowed(sal_True), + bMirrorFreeAllowed(sal_True), + bMirror45Allowed(sal_True), + bMirror90Allowed(sal_True), + bTransparenceAllowed(sal_True), + bGradientAllowed(sal_True), + bShearAllowed(sal_True), + bEdgeRadiusAllowed(sal_True), + bNoOrthoDesired(sal_True), + bNoContortion(sal_True), + bCanConvToPath(sal_True), + bCanConvToPoly(sal_True), + bCanConvToContour(sal_False), + bCanConvToPathLineToArea(sal_True), + bCanConvToPolyLineToArea(sal_True) {} }; @@ -467,7 +467,7 @@ protected: unsigned bVirtObj : 1; unsigned bSnapRectDirty : 1; unsigned bNetLock : 1; // ni - unsigned bInserted : 1; // nur wenn TRUE gibt's RepaintBroadcast & SetModify + unsigned bInserted : 1; // nur wenn sal_True gibt's RepaintBroadcast & SetModify unsigned bGrouped : 1; // Member eines GroupObjektes? // Die folgende Flags werden gestreamt @@ -475,7 +475,7 @@ protected: unsigned bSizProt : 1; // If true, the size is protected unsigned bNoPrint : 1; // If true, the object is not printed. unsigned mbVisible : 1; // If false, the object is not visible on screen (but maybe on printer, depending on bNoprint - // Wenn bEmptyPresObj TRUE ist, handelt es sich um ein + // Wenn bEmptyPresObj sal_True ist, handelt es sich um ein // Praesentationsobjekt, dem noch kein Inhalt zugewiesen // wurde. Default ist das Flag auf FALSE. Die Verwaltung // uebernimmt die Applikation. Im Zuweisungsoperator sowie @@ -483,10 +483,10 @@ protected: // Das Flag ist persistent. unsigned bEmptyPresObj : 1; // Leeres Praesentationsobjekt (Draw) - // TRUE=Objekt ist als Objekt der MasterPage nicht sichtbar + // sal_True=Objekt ist als Objekt der MasterPage nicht sichtbar unsigned bNotVisibleAsMaster : 1; - // TRUE=Es handelt sich hierbei um ein geschlossenes Objekt, also nicht Linie oder Kreisbogen ... + // sal_True=Es handelt sich hierbei um ein geschlossenes Objekt, also nicht Linie oder Kreisbogen ... unsigned bClosedObj : 1; unsigned bIsEdge : 1; @@ -519,14 +519,14 @@ protected: Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; // Fuer GetDragComment - void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT nVal=0) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 nVal=0) const; void ImpForcePlusData() { if (pPlusData==NULL) pPlusData=NewPlusData(); } String GetWinkStr(long nWink, bool bNoDegChar = false) const; String GetMetrStr(long nVal, MapUnit eWantMap=MAP_MM, bool bNoUnitChars = false) const; - // bNotMyself=TRUE bedeutet: Nur die ObjList auf Dirty setzen, nicht mich. + // bNotMyself=sal_True bedeutet: Nur die ObjList auf Dirty setzen, nicht mich. // Wird z.B. benoetigt fuer NbcMove, denn da movt man SnapRect und aOutRect // i.d.R. gleich mit um die Neuberechnung zu sparen. public: @@ -578,8 +578,8 @@ public: virtual void AddReference(SdrVirtObj& rVrtObj); virtual void DelReference(SdrVirtObj& rVrtObj); - virtual UINT32 GetObjInventor() const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt32 GetObjInventor() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; // Layer interface @@ -627,15 +627,15 @@ public: // Wird die Reihenfolge der Objekte in der Liste veraendert, so wird ein // Dirty-Flag gesetzt (an der Page). Beim naechsten SdrObject::GetOrdNum() // werden die Ordnungsnummer aller Objekte der Liste neu bestimmt. - UINT32 GetOrdNum() const; + sal_uInt32 GetOrdNum() const; // Diese Methode sollte nur verwendet werden, wenn man ganz genau weiss, // was man macht: - UINT32 GetOrdNumDirect() const { return nOrdNum; } + sal_uInt32 GetOrdNumDirect() const { return nOrdNum; } // Das Setzen der Ordnungsnummer sollte nur vom Model bzw. von der Page // geschehen. - void SetOrdNum(UINT32 nNum) { nOrdNum=nNum; } + void SetOrdNum(sal_uInt32 nNum) { nOrdNum=nNum; } /** Return the position in the navigation order for the called object. Note that this method may update the navigation position of the @@ -684,7 +684,7 @@ public: // Tooling for painting a single object to a OutputDevice. This will be needed as long // as not all painting is changed to use DrawContact objects. sal_Bool SingleObjectPainter(OutputDevice& rOut) const; - BOOL LineGeometryUsageIsNecessary() const; + sal_Bool LineGeometryUsageIsNecessary() const; // Clone() soll eine komplette Kopie des Objektes erzeugen. virtual SdrObject* Clone() const; @@ -711,7 +711,7 @@ public: // Polygon wird das wohl ein einfacher Selektionshandle sein, bei einer // Bezierkurve dagegen koennen das schon bis zu 3 Handles werden (inkl Gewichte). // GetHdl() und GetPlusHdl() muessen Handleinstanzen mit new erzeugen! - // Ein Objekt, das bei HasSpacialDrag() TRUE liefert muss diese Methoden + // Ein Objekt, das bei HasSpacialDrag() sal_True liefert muss diese Methoden // zur Verfuegung stellen (inkl. FillHdlList). virtual sal_uInt32 GetHdlCount() const; virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const; @@ -725,8 +725,8 @@ public: // Stuetzstellen bei Splines, Gewichte bei Bezierkurven und Pointer von // Labelobjekten muss vom Objekt selbst gehandled werden. Um das Model // Statusfrei zu halten werden die Statusdaten an der View gehalten und dem - // Objekt dann uebergeben. EndDrag liefrt im Normalfall TRUE fuer Erfolg. - // FALSE kann zurueckgegeben werden, wenn das Dragging das Objekt nicht + // Objekt dann uebergeben. EndDrag liefrt im Normalfall sal_True fuer Erfolg. + // sal_False kann zurueckgegeben werden, wenn das Dragging das Objekt nicht // veraendert hat, wobei dir evtl. Tatsache das die Maus nicht bewegt wurde // bereits von der View abgefangen wird. virtual bool hasSpecialDrag() const; @@ -750,14 +750,14 @@ public: // BegCreate()-Methode gerufen. Bei jedem MausMode wird dann MovCreate // gerufen. BrkCreate() bedeutet, dass der User die interaktive Objekt- // erzeugung abgebrochen hat. EndCreate() wird gerufen beim MouseUp-Event. - // Liefert EndCreate() ein TRUE, so ist die Objekterzeugung abgeschlossen; + // Liefert EndCreate() ein sal_True, so ist die Objekterzeugung abgeschlossen; // das Objekt wird in die entsprechende Liste eingefuegt. Andernfalls - // (EndCreate()==FALSE) gehe ich davon aus, dass weitere Punkte zur + // (EndCreate()==sal_False) gehe ich davon aus, dass weitere Punkte zur // Objekterzeugung notwendig sind (Polygon,...). Der Parameter eCmd // enthaelt die Anzahl der Mausklicks (so die App diese durchreicht). // BckCreate() -> Letztes EndCreate() rueckgaengig machen (z.B. letzten // Polygonpunkt wieder loeschen). - // RetrunCode: TRUE=Weiter gehts, FALSE=Create dadurch abgebrochen. + // RetrunCode: sal_True=Weiter gehts, sal_False=Create dadurch abgebrochen. virtual bool BegCreate(SdrDragStat& rStat); virtual bool MovCreate(SdrDragStat& rStat); // TRUE=Xor muss repainted werden virtual bool EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd); @@ -923,10 +923,10 @@ public: // Automatische Klebepunkte: // je 4 Scheitelpunkt- und Eckpositionen muss ein Knotenobjekt liefern // i.d.R. 0=oben, 1=rechts, 2=unten, 3=links - virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const; + virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; // i.d.R. 0=linksoben, 1=rechtsoben, 2=rechtsunten, 3=linksunten - virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const; + virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const; // Liste aller Klebepunkte. Kann NULL sein. virtual const SdrGluePointList* GetGluePointList() const; @@ -971,9 +971,9 @@ public: // Bezierkurve (oder beides) zu verwandeln, dann sollten die folgenden // Methoden ueberladen werden. // Z.B. Ein RectObj mit Strichstaerke 10, SOLID_PEN in Polygon wandeln: - // Im Modus bLineToArea=FALSE soll ein PolyObj mit 4 Stuetzstellen, + // Im Modus bLineToArea=sal_False soll ein PolyObj mit 4 Stuetzstellen, // Strichstaerke 10 und SOLiD_PEN erzeugt werden. - // Im Modus bLineToArea=TRUE dagegen soll das generierte Obj immer ein + // Im Modus bLineToArea=sal_True dagegen soll das generierte Obj immer ein // LinienAttribut NULL_PEN haben, und die Linie (auch Linienmuster) selbst // durch Polygonflaechen emuliert werden, die dadurch anschliessend vom // Anwender manipuliert werden koennen. Das RectObj kann sich somit also @@ -985,21 +985,21 @@ public: // Der Returnwert ist jeweils ein SdrObject*, da als Rueckgabe zur Not // auch Gruppenobjekte erlaubt sind (z.B. fuer SdrTextObj). // Bei der Konvertierung von TextObj nach PathObj wird es wohl so sein, - // dass beide Modi (bLineToArea=TRUE/FALSE) identisch sind. + // dass beide Modi (bLineToArea=sal_True/sal_False) identisch sind. // Defaulted sind diese Methoden auf "Ich kann das nicht" (FALSE/NULL). - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; - SdrObject* ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; + SdrObject* ConvertToPolyObj(sal_Bool bBezier, sal_Bool bLineToArea) const; // convert this path object to contour object; bForceLineDash converts even // when there is no filled new polygon created from line-to-polygon conversion, // specially used for XLINE_DASH and 3D conversion - SdrObject* ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash = FALSE) const; - SdrObject* ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash = FALSE) const; + SdrObject* ConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash = sal_False) const; + SdrObject* ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash = sal_False) const; // TRUE: Referenz auf ein Obj sal_Bool IsVirtualObj() const { return bVirtObj; } - // TRUE=Obj kann warsch. gefuellt werden; FALSE=Obj kann warsch. Linienenden haben. + // sal_True=Obj kann warsch. gefuellt werden; sal_False=Obj kann warsch. Linienenden haben. // ungueltig, wenn es sich um ein GroupObj handelt. sal_Bool IsClosedObj() const { return bClosedObj; } @@ -1007,8 +1007,8 @@ public: sal_Bool Is3DObj() const { return bIs3DObj; } sal_Bool IsUnoObj() const { return bIsUnoObj; } sal_Bool IsMasterCachable() const { return !bNotMasterCachable; } - sal_Bool ShareLock() { sal_Bool r=!bNetLock; bNetLock=TRUE; return r; } - void ShareUnlock() { bNetLock=FALSE; } + sal_Bool ShareLock() { sal_Bool r=!bNetLock; bNetLock=sal_True; return r; } + void ShareUnlock() { bNetLock=sal_False; } sal_Bool IsShareLock() const { return bNetLock; } void SetMarkProtect(sal_Bool bProt) { bMarkProt=bProt; } sal_Bool IsMarkProtect() const { return bMarkProt; } @@ -1036,16 +1036,16 @@ public: sal_Bool DoesSupportTextIndentingOnLineWidthChange() const { return mbSupportTextIndentingOnLineWidthChange; } // applikationsspeziefische Daten - USHORT GetUserDataCount() const; - SdrObjUserData* GetUserData(USHORT nNum) const; + sal_uInt16 GetUserDataCount() const; + SdrObjUserData* GetUserData(sal_uInt16 nNum) const; // Insert uebernimmt den auf dem Heap angelegten Record in den Besitz // des Zeichenobjekts - void InsertUserData(SdrObjUserData* pData, USHORT nPos=0xFFFF); + void InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos=0xFFFF); // Delete entfernt den Record aus der Liste und ruft // ein delete (FreeMem+Dtor). - void DeleteUserData(USHORT nNum); + void DeleteUserData(sal_uInt16 nNum); // ItemPool fuer dieses Objekt wechseln void MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, SdrModel* pNewModel = 0L); @@ -1109,7 +1109,7 @@ public: // to use (0,0) as upper left and will be scaled to the given size in the matrix. virtual void TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const basegfx::B2DPolyPolygon& rPolyPolygon); - sal_Bool IsTransparent( BOOL bCheckForAlphaChannel = FALSE ) const; + sal_Bool IsTransparent( sal_Bool bCheckForAlphaChannel = sal_False ) const; // #116168# // Give info if object is in destruction @@ -1156,8 +1156,8 @@ private: class SVX_DLLPUBLIC SdrObjFactory { public: - UINT32 nInventor; - UINT16 nIdentifier; + sal_uInt32 nInventor; + sal_uInt16 nIdentifier; // fuer MakeNewObj(): SdrPage* pPage; @@ -1169,14 +1169,14 @@ public: SdrObjUserData* pNewData; private: - SVX_DLLPRIVATE SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel); - SVX_DLLPRIVATE SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1); + SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel); + SVX_DLLPRIVATE SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1); public: - static SdrObject* MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL); + static SdrObject* MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel=NULL); static void InsertMakeObjectHdl(const Link& rLink); static void RemoveMakeObjectHdl(const Link& rLink); - static SdrObjUserData* MakeNewObjUserData(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj); + static SdrObjUserData* MakeNewObjUserData(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj); static void InsertMakeUserDataHdl(const Link& rLink); static void RemoveMakeUserDataHdl(const Link& rLink); }; diff --git a/svx/inc/svx/svdocapt.hxx b/svx/inc/svx/svdocapt.hxx index 4a6ae09b98..454a6b1471 100644..100755 --- a/svx/inc/svx/svdocapt.hxx +++ b/svx/inc/svx/svdocapt.hxx @@ -93,15 +93,15 @@ public: virtual ~SdrCaptionObj(); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void operator=(const SdrObject& rObj); // for calc: special shadow only for text box - void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = TRUE; } + void SetSpecialTextBoxShadow() { mbSpecialTextBoxShadow = sal_True; } sal_Bool GetSpecialTextBoxShadow() const { return mbSpecialTextBoxShadow; } // for calc: fixed note tail position. - void SetFixedTail() { mbFixedTail = TRUE; } + void SetFixedTail() { mbFixedTail = sal_True; } virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; @@ -150,7 +150,7 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo); public: - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; const Point& GetTailPos() const; void SetTailPos(const Point& rPos); diff --git a/svx/inc/svx/svdocirc.hxx b/svx/inc/svx/svdocirc.hxx index 0d692db288..9b65e459fd 100644..100755 --- a/svx/inc/svx/svdocirc.hxx +++ b/svx/inc/svx/svdocirc.hxx @@ -82,7 +82,7 @@ private: SVX_DLLPRIVATE void ImpSetAttrToCircInfo(); // Werte vom Pool kopieren SVX_DLLPRIVATE void ImpSetCircInfoToAttr(); // Werte in den Pool kopieren - // Liefert TRUE, wenn das Painten ein XPolygon erfordert. + // Liefert sal_True, wenn das Painten ein XPolygon erfordert. SVX_DLLPRIVATE bool PaintNeedsXPolyCirc() const; // PaintNeedsXPoly-> PaintNeedsXPolyCirc SVX_DLLPRIVATE virtual void RecalcXPoly(); @@ -104,7 +104,7 @@ public: virtual ~SdrCircObj(); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; virtual void TakeObjNameSingul(String& rName) const; @@ -138,7 +138,7 @@ public: virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); virtual void NbcMirror(const Point& rRef1, const Point& rRef2); virtual void NbcShear (const Point& rRef, long nWink, double tn, bool bVShear); - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; protected: virtual SdrObjGeoData* NewGeoData() const; diff --git a/svx/inc/svx/svdoedge.hxx b/svx/inc/svx/svdoedge.hxx index 9ebd7028fb..6186670b85 100644..100755 --- a/svx/inc/svx/svdoedge.hxx +++ b/svx/inc/svx/svdoedge.hxx @@ -59,13 +59,13 @@ protected: SdrObject* pObj; // Referenziertes Objekt long nXDist; // Hor. Objektabstand wenn bXDistOvr=TRUE long nYDist; // Vert. Objektabstand wenn bYDistOvr=TRUE - USHORT nConId; // Konnektornummer + sal_uInt16 nConId; // Konnektornummer // bitfield - unsigned bBestConn : 1; // TRUE= es wird der guenstigste Konnektor gesucht - unsigned bBestVertex : 1; // TRUE= es wird der guenstigste Scheitelpunkt zum konnekten gesucht - unsigned bXDistOvr : 1; // TRUE= Hor. Objektabstand wurde gedragt (Overwrite) - unsigned bYDistOvr : 1; // TRUE= Vert. Objektabstand wurde gedragt (Overwrite) + unsigned bBestConn : 1; // sal_True= es wird der guenstigste Konnektor gesucht + unsigned bBestVertex : 1; // sal_True= es wird der guenstigste Scheitelpunkt zum konnekten gesucht + unsigned bXDistOvr : 1; // sal_True= Hor. Objektabstand wurde gedragt (Overwrite) + unsigned bYDistOvr : 1; // sal_True= Vert. Objektabstand wurde gedragt (Overwrite) unsigned bAutoVertex : 1; // AutoConnector am Scheitelpunkt nCon unsigned bAutoCorner : 1; // AutoConnector am Eckpunkt nCon @@ -76,14 +76,14 @@ public: void ResetVars(); bool TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsolutePos) const; - inline void SetBestConnection( BOOL rB ) { bBestConn = rB; }; - inline void SetBestVertex( BOOL rB ) { bBestVertex = rB; }; - inline void SetAutoVertex( BOOL rB ) { bAutoVertex = rB; }; - inline void SetConnectorId( USHORT nId ) { nConId = nId; }; + inline void SetBestConnection( sal_Bool rB ) { bBestConn = rB; }; + inline void SetBestVertex( sal_Bool rB ) { bBestVertex = rB; }; + inline void SetAutoVertex( sal_Bool rB ) { bAutoVertex = rB; }; + inline void SetConnectorId( sal_uInt16 nId ) { nConId = nId; }; - inline BOOL IsBestConnection() const { return bBestConn; }; - inline BOOL IsBestVertex() const { return bBestVertex; }; - inline BOOL IsAutoVertex() const { return bAutoVertex; }; + inline sal_Bool IsBestConnection() const { return bBestConn; }; + inline sal_Bool IsBestVertex() const { return bBestVertex; }; + inline sal_Bool IsAutoVertex() const { return bAutoVertex; }; inline sal_uInt16 GetConnectorId() const { return nConId; }; inline SdrObject* GetObject() const { return pObj; } }; @@ -109,9 +109,9 @@ public: // Nachfolgende Werte werden von ImpCalcEdgeTrack gesetzt long nAngle1; // Austrittswinkel am Obj1 long nAngle2; // Austrittswinkel am Obj2 - USHORT nObj1Lines; // 1..3 - USHORT nObj2Lines; // 1..3 - USHORT nMiddleLine; // 0xFFFF=keine, sonst Punktnummer des Linienbeginns + sal_uInt16 nObj1Lines; // 1..3 + sal_uInt16 nObj2Lines; // 1..3 + sal_uInt16 nMiddleLine; // 0xFFFF=keine, sonst Punktnummer des Linienbeginns char cOrthoForm; // Form des Ortho-Verbindes, z.B. 'Z','U',I','L','S',... public: @@ -126,7 +126,7 @@ public: Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode); const Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode) const { return ((SdrEdgeInfoRec*)this)->ImpGetLineVersatzPoint(eLineCode); } - USHORT ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; + sal_uInt16 ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; bool ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; void ImpSetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal); long ImpGetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; @@ -142,7 +142,7 @@ public: SdrObjConnection aCon1; // Verbindungszustand des Linienanfangs SdrObjConnection aCon2; // Verbindungszustand des Linienendes XPolygon* pEdgeTrack; - sal_Bool bEdgeTrackDirty;// TRUE=Verbindungsverlauf muss neu berechnet werden. + sal_Bool bEdgeTrackDirty;// sal_True=Verbindungsverlauf muss neu berechnet werden. sal_Bool bEdgeTrackUserDefined; SdrEdgeInfoRec aEdgeInfo; @@ -176,7 +176,7 @@ protected: SdrEdgeInfoRec aEdgeInfo; // bitfield - unsigned bEdgeTrackDirty : 1; // TRUE=Verbindungsverlauf muss neu berechnet werden. + unsigned bEdgeTrackDirty : 1; // sal_True=Verbindungsverlauf muss neu berechnet werden. unsigned bEdgeTrackUserDefined : 1; // #109007# @@ -208,9 +208,9 @@ protected: XPolygon ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& rCon1, SdrObjConnection& rCon2, SdrEdgeInfoRec* pInfo) const; XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1, const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2, - ULONG* pnQuality, SdrEdgeInfoRec* pInfo) const; + sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const; static bool ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL); - USHORT ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const; + sal_uInt16 ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const; bool ImpStripPolyPoints(XPolygon& rXP) const; // entfernen ueberfluessiger Punkte void ImpSetTailPoint(bool bTail1, const Point& rPt); void ImpUndirtyEdgeTrack(); // eventuelle Neuberechnung des Verbindungsverlaufs @@ -226,19 +226,19 @@ public: SdrObjConnection& GetConnection(bool bTail1) { return *(bTail1 ? &aCon1 : &aCon2); } virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual const Rectangle& GetCurrentBoundRect() const; virtual const Rectangle& GetSnapRect() const; virtual bool IsNode() const; - virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const; - virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const; + virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; + virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const; virtual const SdrGluePointList* GetGluePointList() const; virtual SdrGluePointList* ForceGluePointList(); virtual bool IsEdge() const; // bTail1=TRUE: Linienanfang, sonst LinienEnde // pObj=NULL: Disconnect - void SetEdgeTrackDirty() { bEdgeTrackDirty=TRUE; } + void SetEdgeTrackDirty() { bEdgeTrackDirty=sal_True; } void ConnectToNode(bool bTail1, SdrObject* pObj); void DisconnectFromNode(bool bTail1); SdrObject* GetConnectedNode(bool bTail1) const; @@ -281,7 +281,7 @@ public: virtual void BrkCreate(SdrDragStat& rStat); virtual basegfx::B2DPolyPolygon TakeCreatePoly(const SdrDragStat& rDrag) const; virtual Pointer GetCreatePointer() const; - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual sal_uInt32 GetSnapPointCount() const; virtual Point GetSnapPoint(sal_uInt32 i) const; @@ -301,8 +301,8 @@ public: void Reformat(); // helper methods for the StarOffice api - Point GetTailPoint( BOOL bTail ) const; - void SetTailPoint( BOOL bTail, const Point& rPt ); + Point GetTailPoint( sal_Bool bTail ) const; + void SetTailPoint( sal_Bool bTail, const Point& rPt ); void setGluePointIndex( sal_Bool bTail, sal_Int32 nId = -1 ); sal_Int32 getGluePointIndex( sal_Bool bTail ); @@ -321,24 +321,24 @@ public: // // Zur Bestimmung der Verlaufslinie werden folgende Item-Parameter des SdrItemPool verwendet: // -// USHORT EdgeFlowAngle Default 9000 (=90.00 Deg), min 0, max 9000 +// sal_uInt16 EdgeFlowAngle Default 9000 (=90.00 Deg), min 0, max 9000 // Verlauffreiheitswinkel. // Der Winkel, in dem die Verbindungslinie verlaufen darf. // -// USHORT EdgeEscAngle Default 9000 (=90.00 Deg), min 0, max 9000 +// sal_uInt16 EdgeEscAngle Default 9000 (=90.00 Deg), min 0, max 9000 // Objektaustrittswinkel. // Der Winkel, in dem die Verbindungslinie aus dem Objekt austreten darf. // -// BOOL EdgeEscAsRay Default FALSE -// TRUE= die Verbindungslinie tritt aus dem Obj Strahlenfoermig aus. +// sal_Bool EdgeEscAsRay Default FALSE +// sal_True= die Verbindungslinie tritt aus dem Obj Strahlenfoermig aus. // Also Winkelvorgabe durch die Strecke ObjMitte/Konnektor. // -// BOOL EdgeEscUseObjAngle Default FALSE +// sal_Bool EdgeEscUseObjAngle Default FALSE // Objektdrehwinkelberuecksichtigung. -// TRUE= Bei der Bestimmung des Objektaustrittswinkels wird der +// sal_True= Bei der Bestimmung des Objektaustrittswinkels wird der // Drehwinkel des Objekts als Offset beruecksichtigt. // -// ULONG EdgeFlowDefDist Default 0, min 0, max ? +// sal_uIntPtr EdgeFlowDefDist Default 0, min 0, max ? // Das ist der Default-Mindestabstand der bei der Berechnung der // Verbindungslinie zu den angedockten Objekten in logischen Einheiten. // Dieser Abstand wird innerhalb des Objektes "ueberschrieben", sobald diff --git a/svx/inc/svx/svdograf.hxx b/svx/inc/svx/svdograf.hxx index 232755f390..f361f01adc 100644..100755 --- a/svx/inc/svx/svdograf.hxx +++ b/svx/inc/svx/svdograf.hxx @@ -121,7 +121,8 @@ protected: void ImpLinkAnmeldung(); void ImpLinkAbmeldung(); - sal_Bool ImpUpdateGraphicLink() const; + sal_Bool ImpUpdateGraphicLink( sal_Bool bAsynchron = sal_True ) const; + void ImpSetLinkedGraphic( const Graphic& rGraphic ); DECL_LINK( ImpSwapHdl, GraphicObject* ); public: @@ -140,7 +141,7 @@ public: void SetGraphic(const Graphic& rGrf); const Graphic& GetGraphic() const; - Graphic GetTransformedGraphic( ULONG nTransformFlags = SDRGRAFOBJ_TRANSFORMATTR_ALL ) const; + Graphic GetTransformedGraphic( sal_uIntPtr nTransformFlags = SDRGRAFOBJ_TRANSFORMATTR_ALL ) const; GraphicType GetGraphicType() const; @@ -161,7 +162,7 @@ public: void SetGraphicLink(const String& rFileName, const String& rFilterName); void ReleaseGraphicLink(); - sal_Bool IsLinkedGraphic() const { return (BOOL)aFileName.Len(); } + sal_Bool IsLinkedGraphic() const { return (sal_Bool)aFileName.Len(); } void SetFileName(const String& rFileName); const String& GetFileName() const { return aFileName; } @@ -172,7 +173,7 @@ public: void StopAnimation(OutputDevice* pOutDev=NULL, long nExtraData=0L); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; @@ -201,7 +202,7 @@ public: virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual void AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly = false ); diff --git a/svx/inc/svx/svdogrp.hxx b/svx/inc/svx/svdogrp.hxx index 1f3a6046a3..c34ff7210f 100644..100755 --- a/svx/inc/svx/svdogrp.hxx +++ b/svx/inc/svx/svdogrp.hxx @@ -65,7 +65,7 @@ public: virtual ~SdrObjGroup(); virtual void SetBoundRectDirty(); - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual SdrLayerID GetLayer() const; virtual void NbcSetLayer(SdrLayerID nLayer); @@ -119,7 +119,7 @@ public: virtual void NbcReformatText(); virtual void ReformatText(); - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; }; #endif //_SVDOGRP_HXX diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx index ddab8e37a1..129ad66c30 100644..100755 --- a/svx/inc/svx/svdomeas.hxx +++ b/svx/inc/svx/svdomeas.hxx @@ -86,7 +86,7 @@ protected: void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const; basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol) const; void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const; - void SetTextDirty() { bTextDirty=TRUE; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(sal_True); } } + void SetTextDirty() { bTextDirty=sal_True; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(sal_True); } } void UndirtyText() const; virtual SdrObjGeoData* NewGeoData() const; @@ -100,7 +100,7 @@ public: virtual ~SdrMeasureObj(); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; virtual void operator=(const SdrObject& rObj); @@ -141,19 +141,19 @@ public: virtual Point GetPoint(sal_uInt32 i) const; virtual void NbcSetPoint(const Point& rPnt, sal_uInt32 i); - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); virtual const Size& GetTextSize() const; virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, - Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; + Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void TakeTextAnchorRect(Rectangle& rAnchorRect) const; virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; - virtual USHORT GetOutlinerViewAnchorMode() const; + virtual sal_uInt16 GetOutlinerViewAnchorMode() const; virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); virtual OutlinerParaObject* GetOutlinerParaObject() const; - virtual bool CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, + virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; // #i97878# diff --git a/svx/inc/svx/svdomedia.hxx b/svx/inc/svx/svdomedia.hxx index cccd7e308c..87ed2f5e78 100644..100755 --- a/svx/inc/svx/svdomedia.hxx +++ b/svx/inc/svx/svdomedia.hxx @@ -57,7 +57,7 @@ public: virtual bool HasTextEdit() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; diff --git a/svx/inc/svx/svdoole2.hxx b/svx/inc/svx/svdoole2.hxx index 3f3cf3b911..515ad8d214 100644..100755 --- a/svx/inc/svx/svdoole2.hxx +++ b/svx/inc/svx/svdoole2.hxx @@ -69,8 +69,8 @@ protected: String aProgName; // wg. Kompatibilitaet erstmal am SdrTextObj - BOOL bFrame : 1; - BOOL bInDestruction : 1; + sal_Bool bFrame : 1; + sal_Bool bInDestruction : 1; mutable bool m_bTypeAsked; mutable bool m_bChart; @@ -141,7 +141,7 @@ public: virtual SdrObject* getFullDragClone() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjNameSingul(String& rName) const; virtual void TakeObjNamePlural(String& rName) const; @@ -156,7 +156,7 @@ public: static sal_Bool CanUnloadRunningObj( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); static sal_Bool Unload( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject >& xObj, sal_Int64 nAspect ); - BOOL Unload(); + sal_Bool Unload(); void Connect(); void Disconnect(); void ObjectLoaded(); diff --git a/svx/inc/svx/svdopage.hxx b/svx/inc/svx/svdopage.hxx index 789251ccb2..31c607edb0 100644..100755 --- a/svx/inc/svx/svdopage.hxx +++ b/svx/inc/svx/svdopage.hxx @@ -63,7 +63,7 @@ public: // #i96598# virtual void SetBoundRectDirty(); - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; virtual void operator=(const SdrObject& rObj); diff --git a/svx/inc/svx/svdopath.hxx b/svx/inc/svx/svdopath.hxx index 3327719875..57ebf01e81 100644..100755 --- a/svx/inc/svx/svdopath.hxx +++ b/svx/inc/svx/svdopath.hxx @@ -94,7 +94,7 @@ public: virtual ~SdrPathObj(); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; virtual void operator=(const SdrObject& rObj); @@ -155,7 +155,7 @@ protected: virtual void RestGeoData(const SdrObjGeoData& rGeo); public: - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; // Bezierpolygon holen/setzen const basegfx::B2DPolyPolygon& GetPathPoly() const { return maPathPolygon; } diff --git a/svx/inc/svx/svdorect.hxx b/svx/inc/svx/svdorect.hxx index 354afb7552..e17bd4a205 100644..100755 --- a/svx/inc/svx/svdorect.hxx +++ b/svx/inc/svx/svdorect.hxx @@ -63,7 +63,7 @@ protected: XPolygon* mpXPoly; protected: - // Liefert TRUE, wenn das Painten ein Polygon erfordert. + // Liefert sal_True, wenn das Painten ein Polygon erfordert. bool PaintNeedsXPoly(long nEckRad) const; protected: @@ -88,12 +88,12 @@ public: // Konstruktion eines Textrahmens SdrRectObj(SdrObjKind eNewTextKind); SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect); - // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen - SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat); + // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen + SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); virtual ~SdrRectObj(); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; virtual void TakeObjNameSingul(String& rName) const; @@ -126,10 +126,10 @@ public: virtual bool DoMacro(const SdrObjMacroHitRec& rRec); virtual XubString GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const; - virtual SdrGluePoint GetVertexGluePoint(USHORT nNum) const; - virtual SdrGluePoint GetCornerGluePoint(USHORT nNum) const; + virtual SdrGluePoint GetVertexGluePoint(sal_uInt16 nNum) const; + virtual SdrGluePoint GetCornerGluePoint(sal_uInt16 nNum) const; - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); }; diff --git a/svx/inc/svx/svdotable.hxx b/svx/inc/svx/svdotable.hxx index 9c67f4e872..22f80d3462 100644..100755 --- a/svx/inc/svx/svdotable.hxx +++ b/svx/inc/svx/svdotable.hxx @@ -202,8 +202,8 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. - virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; - virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; + virtual void TakeTextRect( const sdr::table::CellPos& rPos, SdrOutliner& rOutliner, ::Rectangle& rTextRect, bool bNoEditText = false, ::Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; + virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, Rectangle* pAnchorRect=NULL, bool bLineWidth = true ) const; virtual void TakeTextAnchorRect(const sdr::table::CellPos& rPos, ::Rectangle& rAnchorRect ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; @@ -219,7 +219,7 @@ public: virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void SetChanged(); virtual bool AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt = true, bool bWdt = true) const; @@ -266,7 +266,7 @@ public: virtual void EndTextEdit(SdrOutliner& rOutl); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void TakeTextEditArea(const sdr::table::CellPos& rPos, Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; - virtual USHORT GetOutlinerViewAnchorMode() const; + virtual sal_uInt16 GetOutlinerViewAnchorMode() const; virtual void NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject); diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx index 967a7ddcc9..23ac8c5eaa 100644..100755 --- a/svx/inc/svx/svdotext.hxx +++ b/svx/inc/svx/svdotext.hxx @@ -180,8 +180,8 @@ private: protected: // Das aRect ist gleichzeig auch das Rect vom RectObj und CircObj. - // Bei bTextFrame=TRUE wird der Text in dieses Rect hineinformatiert. - // Bei bTextFrame=FALSE wird der Text am Mittelpunkt des Rect zentriert. + // Bei bTextFrame=sal_True wird der Text in dieses Rect hineinformatiert. + // Bei bTextFrame=sal_False wird der Text am Mittelpunkt des Rect zentriert. Rectangle aRect; // Der GeoStat enthaelt den Drehwinkel und einen Shearwinkel @@ -208,7 +208,7 @@ protected: // OBJ_TEXTEXT Textfortsetzungsrahmen // OBJ_TITLETEXT TitleText fuer StarDraw-Praesentation // OBJ_OUTLINETEXT OutlineText fuer StarDraw-Praesentation - // eTextKind hat nur Bedeutung, wenn bTextFrame=TRUE, da es sich sonst + // eTextKind hat nur Bedeutung, wenn bTextFrame=sal_True, da es sich sonst // um ein beschriftetes Grafikobjekt handelt. SdrObjKind eTextKind; @@ -225,39 +225,39 @@ public: protected: // Fuer beschriftete Zeichenobjekte ist bTextFrame=FALSE. Der Textblock // wird dann hoizontal und vertikal an aRect zentriert. Bei bTextFrame= - // TRUE wird der Text in aRect hineinformatiert. Der eigentliche Textrahmen - // ist durch ein SdrRectObj mit bTextFrame=TRUE realisiert. - BOOL bTextFrame : 1; - BOOL bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten - BOOL bNoShear : 1; // Obj darf nicht gesheart werden (->Graf+Ole+TextFrame) - BOOL bNoRotate : 1; // Obj darf nicht gedreht werden (->Ole) - BOOL bNoMirror : 1; // Obj darf nicht gespiegelt werden (->Ole,TextFrame) - BOOL bTextSizeDirty : 1; + // sal_True wird der Text in aRect hineinformatiert. Der eigentliche Textrahmen + // ist durch ein SdrRectObj mit bTextFrame=sal_True realisiert. + sal_Bool bTextFrame : 1; + sal_Bool bPortionInfoChecked : 1; // Fuer Optimierung von Textobjekten + sal_Bool bNoShear : 1; // Obj darf nicht gesheart werden (->Graf+Ole+TextFrame) + sal_Bool bNoRotate : 1; // Obj darf nicht gedreht werden (->Ole) + sal_Bool bNoMirror : 1; // Obj darf nicht gespiegelt werden (->Ole,TextFrame) + sal_Bool bTextSizeDirty : 1; // #101684# - BOOL mbInEditMode : 1; // Is this text obejct in edit mode? + sal_Bool mbInEditMode : 1; // Is this text obejct in edit mode? // Fuer Objekt mit freier Groesse im Draw (Mengentext). Das Flag wird vom // der App beim Create gesetzt. // Wenn das Objekt dann spaeter in der Breite resized wird, wird - // AutoGrowWidth abgeschaltet (Hart auf FALSE attributiert). Das Flag wird - // dann ebenfalls auf FALSE gesetzt, sodass sich das Objekt anschliessend + // AutoGrowWidth abgeschaltet (Hart auf sal_False attributiert). Das Flag wird + // dann ebenfalls auf sal_False gesetzt, sodass sich das Objekt anschliessend // wie ein normales Textobjekt verhaelt. // Resize in der Breite kann sein: // - Interaktives Resize in Einfach- oder Mehrfachselektion // - Positions+Groesse Dialog - BOOL bDisableAutoWidthOnDragging : 1; + sal_Bool bDisableAutoWidthOnDragging : 1; // #111096# // Allow text suppression - BOOL mbTextHidden : 1; + sal_Bool mbTextHidden : 1; // #111096# // Flag for allowing text animation. Default is sal_true. - BOOL mbTextAnimationAllowed : 1; + sal_Bool mbTextAnimationAllowed : 1; // flag for preventing recursive onEditOutlinerStatusEvent calls - BOOL mbInDownScale : 1; + sal_Bool mbInDownScale : 1; SdrOutliner& ImpGetDrawOutliner() const; @@ -290,10 +290,10 @@ protected: void ImpCheckShear(); Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const; void ImpSetTextEditParams() const; - void SetTextSizeDirty() { bTextSizeDirty=TRUE; } + void SetTextSizeDirty() { bTextSizeDirty=sal_True; } // rAnchorRect ist InOut-Parameter! - void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, BOOL bLineWidth ) const; + void ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const; virtual SdrObjGeoData* NewGeoData() const; virtual void SaveGeoData(SdrObjGeoData& rGeo) const; @@ -315,15 +315,15 @@ protected: SdrTextObj(SdrObjKind eNewTextKind); SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect); - // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen - SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat); + // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen + SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); virtual ~SdrTextObj(); public: TYPEINFO(); // #101684# - BOOL IsInEditMode() const { return mbInEditMode; } + sal_Bool IsInEditMode() const { return mbInEditMode; } // via eCharSet kann der CharSet der vorliegenden Datei uebergeben werden. // Bei RTL_TEXTENCODING_DONTKNOW wird der CharSet der aktuellen Plattform verwendet. @@ -379,8 +379,8 @@ public: bool IsDisableAutoWidthOnDragging() { return bDisableAutoWidthOnDragging; } void NbcSetText(const String& rStr); void SetText(const String& rStr); - void NbcSetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat); - void SetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat); + void NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); + void SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat); // FitToSize und Fontwork wird bei GetTextSize() nicht berueksichtigt! virtual const Size& GetTextSize() const; @@ -389,7 +389,7 @@ public: // Gleichzeitig wird der Text in den Outliner gesetzt (ggf. // der des EditOutliners) und die PaperSize gesetzt. virtual void TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText = false, - Rectangle* pAnchorRect=NULL, BOOL bLineWidth=TRUE ) const; + Rectangle* pAnchorRect=NULL, sal_Bool bLineWidth=sal_True ) const; virtual void TakeTextAnchorRect(::Rectangle& rAnchorRect) const; const GeoStat& GetGeoStat() const { return aGeo; } @@ -432,7 +432,7 @@ public: virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pNewModel); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; // Wird zur Bestimmung des Textankerbereichs benoetigt virtual void TakeUnrotatedSnapRect(Rectangle& rRect) const; @@ -477,7 +477,7 @@ public: virtual sal_Bool BegTextEdit(SdrOutliner& rOutl); virtual void TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* pViewInit, Rectangle* pViewMin) const; virtual void EndTextEdit(SdrOutliner& rOutl); - virtual USHORT GetOutlinerViewAnchorMode() const; + virtual sal_uInt16 GetOutlinerViewAnchorMode() const; void StartTextAnimation(OutputDevice* pOutDev, const Point& rOffset, long nExtraData=0L); void StopTextAnimation(OutputDevice* pOutDev=NULL, long nExtraData=0L); @@ -491,10 +491,10 @@ public: virtual void NbcReformatText(); virtual void ReformatText(); - virtual bool CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, + virtual bool CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, String& rRet) const; - virtual SdrObject* DoConvertToPolyObj(BOOL bBezier) const; + virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier) const; void SetTextEditOutliner(SdrOutliner* pOutl) { pEdtOutl=pOutl; } diff --git a/svx/inc/svx/svdouno.hxx b/svx/inc/svx/svdouno.hxx index 36a53e7554..09acde6f16 100644..100755 --- a/svx/inc/svx/svdouno.hxx +++ b/svx/inc/svx/svdouno.hxx @@ -62,7 +62,7 @@ class SVX_DLLPUBLIC SdrUnoObj : public SdrRectObj String aUnoControlModelTypeName; String aUnoControlTypeName; - BOOL bOwnUnoControlModel; + sal_Bool bOwnUnoControlModel; protected: ::com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > xUnoControlModel; // kann auch von aussen gesetzt werden @@ -75,17 +75,17 @@ private: public: TYPEINFO(); - SdrUnoObj(const String& rModelName, BOOL bOwnsModel = TRUE); + SdrUnoObj(const String& rModelName, sal_Bool bOwnsModel = sal_True); SdrUnoObj(const String& rModelName, const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rxSFac, - BOOL bOwnsModel = TRUE); + sal_Bool bOwnsModel = sal_True); virtual ~SdrUnoObj(); virtual void SetPage(SdrPage* pNewPage); virtual void SetModel(SdrModel* pModel); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual void operator = (const SdrObject& rObj); virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact); diff --git a/svx/inc/svx/svdoutl.hxx b/svx/inc/svx/svdoutl.hxx index b0ff54caab..0e309d633c 100644..100755 --- a/svx/inc/svx/svdoutl.hxx +++ b/svx/inc/svx/svdoutl.hxx @@ -44,7 +44,7 @@ protected: const SdrPage* mpVisualizedPage; public: - SdrOutliner( SfxItemPool* pItemPool, USHORT nMode ); + SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode ); virtual ~SdrOutliner() ; void SetTextObj( const SdrTextObj* pObj ); @@ -54,7 +54,7 @@ public: void setVisualizedPage(const SdrPage* pPage) { if(pPage != mpVisualizedPage) mpVisualizedPage = pPage; } const SdrPage* getVisualizedPage() const { return mpVisualizedPage; } - virtual String CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor); + virtual String CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor); }; #endif //_SVDOUTL_HXX diff --git a/svx/inc/svx/svdovirt.hxx b/svx/inc/svx/svdovirt.hxx index d92b57e72d..022638e498 100644..100755 --- a/svx/inc/svx/svdovirt.hxx +++ b/svx/inc/svx/svdovirt.hxx @@ -71,8 +71,8 @@ public: virtual void SetModel(SdrModel* pNewModel); virtual void TakeObjInfo(SdrObjTransformInfoRec& rInfo) const; - virtual UINT32 GetObjInventor() const; - virtual UINT16 GetObjIdentifier() const; + virtual sal_uInt32 GetObjInventor() const; + virtual sal_uInt16 GetObjIdentifier() const; virtual SdrObjList* GetSubList() const; virtual const Rectangle& GetCurrentBoundRect() const; diff --git a/svx/inc/svx/svdpage.hxx b/svx/inc/svx/svdpage.hxx index dfc4899ce8..d44fa604da 100644..100755 --- a/svx/inc/svx/svdpage.hxx +++ b/svx/inc/svx/svdpage.hxx @@ -114,7 +114,7 @@ public: // !!! Diese Methode nur fuer Leute, die ganz genau wissen was sie tun !!! // #110094# This should not be needed (!) - void SetObjOrdNumsDirty() { bObjOrdNumsDirty=TRUE; } + void SetObjOrdNumsDirty() { bObjOrdNumsDirty=sal_True; } // pModel, pPage, pUpList und pOwnerObj werden Zuweisungeoperator nicht veraendert! void operator=(const SdrObjList& rSrcList); void CopyObjects(const SdrObjList& rSrcList); @@ -133,23 +133,23 @@ public: // Neuberechnung der Objekt-Ordnungsnummern void RecalcObjOrdNums(); bool IsObjOrdNumsDirty() const { return bObjOrdNumsDirty; } - virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND + virtual void NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND , const SdrInsertReason* pReason=NULL ); - virtual void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND + virtual void InsertObject(SdrObject* pObj, sal_uIntPtr nPos=CONTAINER_APPEND , const SdrInsertReason* pReason=NULL ); // aus Liste entfernen ohne delete - virtual SdrObject* NbcRemoveObject(ULONG nObjNum); - virtual SdrObject* RemoveObject(ULONG nObjNum); + virtual SdrObject* NbcRemoveObject(sal_uIntPtr nObjNum); + virtual SdrObject* RemoveObject(sal_uIntPtr nObjNum); // Vorhandenes Objekt durch ein anderes ersetzen. // Wie Remove&Insert jedoch performanter, da die Ordnungsnummern // nicht Dirty gesetzt werden muessen. - virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum); - virtual SdrObject* ReplaceObject(SdrObject* pNewObj, ULONG nObjNum); + virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum); + virtual SdrObject* ReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum); // Die Z-Order eines Objekts veraendern - virtual SdrObject* NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum); - virtual SdrObject* SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum); + virtual SdrObject* NbcSetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum); + virtual SdrObject* SetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum); virtual void SetRectsDirty(); @@ -166,14 +166,14 @@ public: // Die Vorlagenattribute der Zeichenobjekte in harte Attribute verwandeln. void BurnInStyleSheetAttributes(); - ULONG GetObjCount() const; - SdrObject* GetObj(ULONG nNum) const; + sal_uIntPtr GetObjCount() const; + SdrObject* GetObj(sal_uIntPtr nNum) const; // Gelinkte Seite oder gelinktes Gruppenobjekt virtual bool IsReadOnly() const; // Zaehlt alle Objekte inkl. Objekte in Objektgruppen, ... - ULONG CountAllObjects() const; + sal_uIntPtr CountAllObjects() const; // Alle aufgelagerten Teile (z.B. Grafiken) der Liste in den // Speicher laden. @@ -200,7 +200,7 @@ public: operation is performed recursively, such that the content of the given object contains no groups afterwards. */ - virtual void UnGroupObj( ULONG nObjNum ); + virtual void UnGroupObj( sal_uIntPtr nObjNum ); /** Return whether there is an explicit, user defined, object navigation order. When there is one this method returns <TRUE/> and the @@ -343,17 +343,17 @@ private: SVX_DLLPRIVATE SdrPageGridFrameList(const SdrPageGridFrameList& rSrcList); // never implemented SVX_DLLPRIVATE void operator=(const SdrPageGridFrameList& rSrcList); // never implemented protected: - SdrPageGridFrame* GetObject(USHORT i) const { return (SdrPageGridFrame*)(aList.GetObject(i)); } + SdrPageGridFrame* GetObject(sal_uInt16 i) const { return (SdrPageGridFrame*)(aList.GetObject(i)); } public: SdrPageGridFrameList(): aList(1024,4,4) {} ~SdrPageGridFrameList() { Clear(); } void Clear(); - USHORT GetCount() const { return USHORT(aList.Count()); } - void Insert(const SdrPageGridFrame& rGF, USHORT nPos=0xFFFF) { aList.Insert(new SdrPageGridFrame(rGF),nPos); } - void Delete(USHORT nPos) { delete (SdrPageGridFrame*)aList.Remove(nPos); } - void Move(USHORT nPos, USHORT nNewPos) { aList.Insert(aList.Remove(nPos),nNewPos); } - SdrPageGridFrame& operator[](USHORT nPos) { return *GetObject(nPos); } - const SdrPageGridFrame& operator[](USHORT nPos) const { return *GetObject(nPos); } + sal_uInt16 GetCount() const { return sal_uInt16(aList.Count()); } + void Insert(const SdrPageGridFrame& rGF, sal_uInt16 nPos=0xFFFF) { aList.Insert(new SdrPageGridFrame(rGF),nPos); } + void Delete(sal_uInt16 nPos) { delete (SdrPageGridFrame*)aList.Remove(nPos); } + void Move(sal_uInt16 nPos, sal_uInt16 nNewPos) { aList.Insert(aList.Remove(nPos),nNewPos); } + SdrPageGridFrame& operator[](sal_uInt16 nPos) { return *GetObject(nPos); } + const SdrPageGridFrame& operator[](sal_uInt16 nPos) const { return *GetObject(nPos); } }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -431,12 +431,12 @@ public: // and thus has to set mxUnoPage friend class ChXChartDocument; - INT32 nWdt; // Seitengroesse - INT32 nHgt; // Seitengroesse - INT32 nBordLft; // Seitenrand links - INT32 nBordUpp; // Seitenrand oben - INT32 nBordRgt; // Seitenrand rechts - INT32 nBordLwr; // Seitenrand unten + sal_Int32 nWdt; // Seitengroesse + sal_Int32 nHgt; // Seitengroesse + sal_Int32 nBordLft; // Seitenrand links + sal_Int32 nBordUpp; // Seitenrand oben + sal_Int32 nBordRgt; // Seitenrand rechts + sal_Int32 nBordLwr; // Seitenrand unten // this is a weak reference to a possible living api wrapper for this page ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxUnoPage; @@ -456,7 +456,7 @@ protected: ::sdr::MasterPageDescriptor* mpMasterPageDescriptor; SetOfByte aPrefVisiLayers; - USHORT nPageNum; + sal_uInt16 nPageNum; // bitfield unsigned mbMaster : 1; // flag if this is a MasterPage @@ -497,17 +497,17 @@ public: virtual Size GetSize() const; virtual void SetOrientation(Orientation eOri); virtual Orientation GetOrientation() const; - virtual INT32 GetWdt() const; - virtual INT32 GetHgt() const; - virtual void SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 Lwr); - virtual void SetLftBorder(INT32 nBorder); - virtual void SetUppBorder(INT32 nBorder); - virtual void SetRgtBorder(INT32 nBorder); - virtual void SetLwrBorder(INT32 nBorder); - virtual INT32 GetLftBorder() const; - virtual INT32 GetUppBorder() const; - virtual INT32 GetRgtBorder() const; - virtual INT32 GetLwrBorder() const; + virtual sal_Int32 GetWdt() const; + virtual sal_Int32 GetHgt() const; + virtual void SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 Lwr); + virtual void SetLftBorder(sal_Int32 nBorder); + virtual void SetUppBorder(sal_Int32 nBorder); + virtual void SetRgtBorder(sal_Int32 nBorder); + virtual void SetLwrBorder(sal_Int32 nBorder); + virtual sal_Int32 GetLftBorder() const; + virtual sal_Int32 GetUppBorder() const; + virtual sal_Int32 GetRgtBorder() const; + virtual sal_Int32 GetLwrBorder() const; virtual void SetModel(SdrModel* pNewModel); @@ -558,7 +558,7 @@ public: virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const; - bool HasTransparentObjects( BOOL bCheckForAlphaChannel = false ) const; + bool HasTransparentObjects( bool bCheckForAlphaChannel = false ) const; /** *deprecated* returns an averaged background color of this page */ // #i75566# GetBackgroundColor -> GetPageBackgroundColor diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx index 9c6b09e168..af32187316 100644..100755 --- a/svx/inc/svx/svdpagv.hxx +++ b/svx/inc/svx/svdpagv.hxx @@ -129,7 +129,7 @@ private: SVX_DLLPRIVATE SdrPageWindow& CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow); protected: - void ImpInvalidateHelpLineArea(USHORT nNum) const; + void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const; protected: void SetLayer(const String& rName, SetOfByte& rBS, sal_Bool bJa); @@ -180,11 +180,14 @@ public: void InvalidateAllWin(); // rRect bezieht sich auf die Page - void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=FALSE); + void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=sal_False); // PrePaint call forwarded from app windows void PrePaint(); + // PostPaint call forwarded from app windows + void PostPaint(); + // rReg bezieht sich auf's OutDev, nicht auf die Page void CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) const; @@ -247,13 +250,13 @@ public: const SdrHelpLineList& GetHelpLines() const { return aHelpLines; } void SetHelpLines(const SdrHelpLineList& rHLL); - //void SetHelpLinePos(USHORT nNum, const Point& rNewPos); - void SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine); - void DeleteHelpLine(USHORT nNum); - void InsertHelpLine(const SdrHelpLine& rHL, USHORT nNum=0xFFFF); - void MoveHelpLine(USHORT nNum, USHORT nNewNum) { aHelpLines.Move(nNum,nNewNum); } + //void SetHelpLinePos(sal_uInt16 nNum, const Point& rNewPos); + void SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine); + void DeleteHelpLine(sal_uInt16 nNum); + void InsertHelpLine(const SdrHelpLine& rHL, sal_uInt16 nNum=0xFFFF); + void MoveHelpLine(sal_uInt16 nNum, sal_uInt16 nNewNum) { aHelpLines.Move(nNum,nNewNum); } - // Liefert TRUE, wenn Layer des Obj sichtbar und nicht gesperrt. + // Liefert sal_True, wenn Layer des Obj sichtbar und nicht gesperrt. // Beim Gruppenobjekt muss wenigstens ein Member sichtbar sein, // gesperrt sein darf keiner. sal_Bool IsObjMarkable(SdrObject* pObj) const; @@ -271,7 +274,7 @@ public: void LeaveAllGroup(); // Feststellen, wie weit hinabgestiegen wurde (0=Root(Page)) - USHORT GetEnteredLevel() const; + sal_uInt16 GetEnteredLevel() const; // Name der aktuellen Objektgruppe String GetActualGroupName() const; diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx index eae3543a20..cb9c97e70a 100644..100755 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -163,12 +163,12 @@ protected: SdrAnimationMode eAnimationMode; - USHORT nHitTolPix; - USHORT nMinMovPix; - USHORT nHitTolLog; - USHORT nMinMovLog; - ULONG nMasterCacheMode; - ULONG nGraphicManagerDrawMode; + sal_uInt16 nHitTolPix; + sal_uInt16 nMinMovPix; + sal_uInt16 nHitTolLog; + sal_uInt16 nMinMovLog; + sal_uIntPtr nMasterCacheMode; + sal_uIntPtr nGraphicManagerDrawMode; // hold an incarnation of Drawinglayer configuration options SvtOptionsDrawinglayer maDrawinglayerOpt; @@ -189,9 +189,9 @@ protected: unsigned bSwapAsynchron : 1; unsigned bPrintPreview : 1; - // BOOL fuer die Verwaltung des anzuzeigenden Status - // Gruppe Betreten/Verlassen. Default ist TRUE, wird aber - // beispielsweise beim Chart auf FALSE gesetzt, da dort + // sal_Bool fuer die Verwaltung des anzuzeigenden Status + // Gruppe Betreten/Verlassen. Default ist sal_True, wird aber + // beispielsweise beim Chart auf sal_False gesetzt, da dort // die Ghosted-Effekte zur Darstellug unerwuenscht sind. unsigned bVisualizeEnteredGroup : 1; unsigned bAnimationPause : 1; @@ -255,8 +255,8 @@ private: DECL_LINK(ImpComeBackHdl,Timer*); protected: - USHORT ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const; - USHORT ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const; + sal_uInt16 ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const; + sal_uInt16 ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const; // Wenn man den IdleStatus des Systems nicht abwarten will (auf const geschummelt): void FlushComeBackTimer() const; @@ -264,12 +264,12 @@ protected: void ImpSetGlueVisible2(bool bOn) { if (bGlueVisible2!=(unsigned)bOn) { bGlueVisible2=bOn; if (!bGlueVisible && !bGlueVisible3 && !bGlueVisible4) GlueInvalidate(); } } void ImpSetGlueVisible3(bool bOn) { if (bGlueVisible3!=(unsigned)bOn) { bGlueVisible3=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible4) GlueInvalidate(); } } void ImpSetGlueVisible4(bool bOn) { if (bGlueVisible4!=(unsigned)bOn) { bGlueVisible4=bOn; if (!bGlueVisible && !bGlueVisible2 && !bGlueVisible3) GlueInvalidate(); } } - BOOL ImpIsGlueVisible2() const { return bGlueVisible2; } - BOOL ImpIsGlueVisible3() const { return bGlueVisible3; } - BOOL ImpIsGlueVisible4() const { return bGlueVisible4; } + sal_Bool ImpIsGlueVisible2() const { return bGlueVisible2; } + sal_Bool ImpIsGlueVisible3() const { return bGlueVisible3; } + sal_Bool ImpIsGlueVisible4() const { return bGlueVisible4; } public: - BOOL ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; } + sal_Bool ImpIsGlueVisible() { return bGlueVisible || bGlueVisible2 || bGlueVisible3 || bGlueVisible4; } protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); @@ -297,7 +297,7 @@ public: // virtual void Clear(); // PageViews loeschen, Markierungen weg, ... SdrModel* GetModel() const { return pMod; } - virtual BOOL IsAction() const; + virtual sal_Bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); @@ -315,18 +315,18 @@ public: // jedem MapMode(Scaling)-wechsel gerufen werden, damit ich aus meinen // Pixelwerten logische Werte berechnen kann. void SetActualWin(const OutputDevice* pWin); - void SetMinMoveDistancePixel(USHORT nVal) { nMinMovPix=nVal; TheresNewMapMode(); } - USHORT GetMinMoveDistancePixel() const { return (USHORT)nMinMovPix; } - void SetHitTolerancePixel(USHORT nVal) { nHitTolPix=nVal; TheresNewMapMode(); } - USHORT GetHitTolerancePixel() const { return (USHORT)nHitTolPix; } + void SetMinMoveDistancePixel(sal_uInt16 nVal) { nMinMovPix=nVal; TheresNewMapMode(); } + sal_uInt16 GetMinMoveDistancePixel() const { return (sal_uInt16)nMinMovPix; } + void SetHitTolerancePixel(sal_uInt16 nVal) { nHitTolPix=nVal; TheresNewMapMode(); } + sal_uInt16 GetHitTolerancePixel() const { return (sal_uInt16)nHitTolPix; } // data read access on logic HitTolerance and MinMoveTolerance - USHORT getHitTolLog() const { return nHitTolLog; } - USHORT getMinMovLog() const { return nMinMovLog; } + sal_uInt16 getHitTolLog() const { return nHitTolLog; } + sal_uInt16 getMinMovLog() const { return nMinMovLog; } // Flag zur Visualisierung von Gruppen abfragen/testen - BOOL DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; } - void SetVisualizeEnteredGroup(BOOL bNew) { bVisualizeEnteredGroup = bNew; } + sal_Bool DoVisualizeEnteredGroup() const { return bVisualizeEnteredGroup; } + void SetVisualizeEnteredGroup(sal_Bool bNew) { bVisualizeEnteredGroup = bNew; } // Am DragStatus laesst sich beispielsweise erfragen, welche // entfernung bereits gedraggd wurde, etc. @@ -342,8 +342,8 @@ public: virtual void HideSdrPage(); // Iterieren ueber alle angemeldeten PageViews -// USHORT GetPageViewCount() const { return USHORT(aPagV.Count()); } -// SdrPageView* GetPageViewByIndex(USHORT nPvNum) const { return ((SdrPageView*)aPagV.GetObject(nPvNum)); } +// sal_uInt16 GetPageViewCount() const { return sal_uInt16(aPagV.Count()); } +// SdrPageView* GetPageViewByIndex(sal_uInt16 nPvNum) const { return ((SdrPageView*)aPagV.GetObject(nPvNum)); } SdrPageView* GetSdrPageView() const { return mpPageView; } // Pageview einer bestimmten Seite ermitteln @@ -361,21 +361,24 @@ public: virtual void AddWindowToPaintView(OutputDevice* pNewWin); virtual void DeleteWindowFromPaintView(OutputDevice* pOldWin); - void SetLayerVisible(const String& rName, BOOL bShow=TRUE); + void SetLayerVisible(const String& rName, sal_Bool bShow=sal_True); bool IsLayerVisible(const String& rName) const; - void SetAllLayersVisible(BOOL bShow=TRUE); + void SetAllLayersVisible(sal_Bool bShow=sal_True); - void SetLayerLocked(const String& rName, BOOL bLock=TRUE); + void SetLayerLocked(const String& rName, sal_Bool bLock=sal_True); bool IsLayerLocked(const String& rName) const; - void SetAllLayersLocked(BOOL bLock=TRUE); + void SetAllLayersLocked(sal_Bool bLock=sal_True); - void SetLayerPrintable(const String& rName, BOOL bPrn=TRUE); + void SetLayerPrintable(const String& rName, sal_Bool bPrn=sal_True); bool IsLayerPrintable(const String& rName) const; - void SetAllLayersPrintable(BOOL bPrn=TRUE); + void SetAllLayersPrintable(sal_Bool bPrn=sal_True); // PrePaint call forwarded from app windows void PrePaint(); + // PostPaint call forwarded from app windows + void PostPaint(); + //////////////////////////////////////////////////////////////////////////////////////////////////// // used internally for Draw/Impress/sch/chart2 virtual void CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); @@ -410,14 +413,14 @@ protected: void ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const; public: - BOOL IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht - BOOL IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht - BOOL IsBordVisible() const { return bBordVisible; } // Seitenrandlinie malen oder nicht - BOOL IsGridVisible() const { return bGridVisible; } // Rastergitter malen oder nicht - BOOL IsGridFront() const { return bGridFront ; } // Rastergitter ueber die Objekte druebermalen oder dahinter - BOOL IsHlplVisible() const { return bHlplVisible; } // Hilfslinien der Seiten malen oder nicht - BOOL IsHlplFront() const { return bHlplFront ; } // Hilfslinie ueber die Objekte druebermalen oder dahinter - BOOL IsGlueVisible() const { return bGlueVisible; } // Konnektoren der objekte sichtbar oder nicht + sal_Bool IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht + sal_Bool IsPageBorderVisible() const { return bPageBorderVisible; } // Seite (weisse Flaeche) malen oder nicht + sal_Bool IsBordVisible() const { return bBordVisible; } // Seitenrandlinie malen oder nicht + sal_Bool IsGridVisible() const { return bGridVisible; } // Rastergitter malen oder nicht + sal_Bool IsGridFront() const { return bGridFront ; } // Rastergitter ueber die Objekte druebermalen oder dahinter + sal_Bool IsHlplVisible() const { return bHlplVisible; } // Hilfslinien der Seiten malen oder nicht + sal_Bool IsHlplFront() const { return bHlplFront ; } // Hilfslinie ueber die Objekte druebermalen oder dahinter + sal_Bool IsGlueVisible() const { return bGlueVisible; } // Konnektoren der objekte sichtbar oder nicht Color GetGridColor() const; void SetPageVisible(bool bOn = true) { bPageVisible=bOn; InvalidateAllWin(); } void SetPageBorderVisible(bool bOn = true) { bPageBorderVisible=bOn; InvalidateAllWin(); } @@ -448,7 +451,7 @@ public: const Size& GetGridFine() const { return aGridFin; } void InvalidateAllWin(); - void InvalidateAllWin(const Rectangle& rRect, BOOL bPlus1Pix=FALSE); + void InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix=sal_False); // Wenn die View kein Invalidate() an den Fenstern durchfuehren soll, muss // man diese beiden folgenden Methoden ueberladen und entsprechend anders @@ -472,13 +475,13 @@ public: // DefaultAttribute an der View: Neu erzeugte Objekte bekommen diese // Attribute direkt nach dem Erzeugen erstmal zugewiesen. - void SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll); + void SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll); const SfxItemSet& GetDefaultAttr() const { return aDefaultAttr; } - void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr); + void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); SfxStyleSheet* GetDefaultStyleSheet() const { return pDefaultStyleSheet; } - void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll); - void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const; + void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll); + void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const; // Aufziehen eines animierten Rechtecks fuer Applikationsspeziefische // Verwendung. Alle Positionsangaben in logischen View-Koordinaten. @@ -492,32 +495,32 @@ public: sal_Bool IsEncirclement() const { return (0L != mpEncirclementOverlay); } // use this mode as mode to draw all internal GraphicManager objects with - ULONG GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; } - void SetGraphicManagerDrawMode( ULONG nMode ) { nGraphicManagerDrawMode = nMode; } + sal_uIntPtr GetGraphicManagerDrawMode() const { return nGraphicManagerDrawMode; } + void SetGraphicManagerDrawMode( sal_uIntPtr nMode ) { nGraphicManagerDrawMode = nMode; } // SwapIn (z.B. von Grafiken) asynchron durchfuehren. Also nicht // beim Paint sofort nachladen, sondern dort das Nachladen anstossen. // Nach Abschluss des Nachladens wird das Objekt dann angezeigt. // Hat nur z.Zt. Wirkung, wenn SwapGraphics am Model eingeschaltet ist. // Default=FALSE. Flag ist nicht persistent. - BOOL IsSwapAsynchron() const { return bSwapAsynchron; } - void SetSwapAsynchron(BOOL bJa=TRUE) { bSwapAsynchron=bJa; } - virtual BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin); - - virtual BOOL MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; } - virtual BOOL MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; } - virtual BOOL MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return FALSE; } - virtual BOOL Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return FALSE; } - BOOL Cut(ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; } - BOOL Yank(ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; } - BOOL Paste(Window* /*pWin*/=NULL, ULONG /*nFormat*/=SDR_ANYFORMAT) { return FALSE; } + sal_Bool IsSwapAsynchron() const { return bSwapAsynchron; } + void SetSwapAsynchron(sal_Bool bJa=sal_True) { bSwapAsynchron=bJa; } + virtual sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); + + virtual sal_Bool MouseButtonDown(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; } + virtual sal_Bool MouseButtonUp(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; } + virtual sal_Bool MouseMove(const MouseEvent& /*rMEvt*/, Window* /*pWin*/) { return sal_False; } + virtual sal_Bool Command(const CommandEvent& /*rCEvt*/, Window* /*pWin*/) { return sal_False; } + sal_Bool Cut(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; } + sal_Bool Yank(sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; } + sal_Bool Paste(Window* /*pWin*/=NULL, sal_uIntPtr /*nFormat*/=SDR_ANYFORMAT) { return sal_False; } /* new interface src537 */ - BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const; + sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; - BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll); - SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(BOOL& rOk) const; - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr); + sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll); + SfxStyleSheet* GetStyleSheet() const; // SfxStyleSheet* GetStyleSheet(sal_Bool& rOk) const; + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); virtual void MakeVisible(const Rectangle& rRect, Window& rWin); @@ -527,8 +530,8 @@ public: // Animation aktivieren/deaktivieren fuer ::Paint // wird z.Zt. ausgewertet von SdrGrafObj, wenn in dem eine Animation steckt // Das Unterbinden der automatischen Animation wird z.B. fuer die Dia-Show benoetigt - BOOL IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); } - void SetAnimationEnabled( BOOL bEnable=TRUE ); + sal_Bool IsAnimationEnabled() const { return ( SDR_ANIMATION_ANIMATE == eAnimationMode ); } + void SetAnimationEnabled( sal_Bool bEnable=sal_True ); // set/unset pause state for animations bool IsAnimationPause() const { return bAnimationPause; } @@ -541,10 +544,10 @@ public: void SetAnimationMode( const SdrAnimationMode eMode ); SdrAnimationMode GetAnimationMode() const { return eAnimationMode; } - // bei bShow=FALSE wird der Browser destruiert + // bei bShow=sal_False wird der Browser destruiert #ifdef DBG_UTIL - void ShowItemBrowser(BOOL bShow=TRUE); - BOOL IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); } + void ShowItemBrowser(sal_Bool bShow=sal_True); + sal_Bool IsItemBrowserVisible() const { return pItemBrowser!=NULL && ((Window*)pItemBrowser)->IsVisible(); } Window* GetItemBrowser() const { return (Window*)pItemBrowser; } #endif @@ -553,7 +556,7 @@ public: void VisAreaChanged(const OutputDevice* pOut=NULL); void VisAreaChanged(const SdrPageWindow& rWindow); - BOOL IsPrintPreview() const { return bPrintPreview; } + sal_Bool IsPrintPreview() const { return bPrintPreview; } void SetPrintPreview(bool bOn = true) { bPrintPreview=bOn; } const svtools::ColorConfig& getColorConfig() const; diff --git a/svx/inc/svx/svdpoev.hxx b/svx/inc/svx/svdpoev.hxx index 65641a2174..0b6e75229a 100644..100755 --- a/svx/inc/svx/svdpoev.hxx +++ b/svx/inc/svx/svdpoev.hxx @@ -53,8 +53,8 @@ class SVX_DLLPUBLIC SdrPolyEditView: public SdrEditView, public IPolyPolygonEdit friend class SdrEditView; protected: - BOOL bSetMarkedPointsSmoothPossible : 1; - BOOL bSetMarkedSegmentsKindPossible : 1; + sal_Bool bSetMarkedPointsSmoothPossible : 1; + sal_Bool bSetMarkedSegmentsKindPossible : 1; SdrPathSmoothKind eMarkedPointsSmooth; SdrPathSegmentKind eMarkedSegmentsKind; @@ -76,18 +76,18 @@ protected: virtual ~SdrPolyEditView(); public: - BOOL IsSetMarkedPointsSmoothPossible() const; + sal_Bool IsSetMarkedPointsSmoothPossible() const; SdrPathSmoothKind GetMarkedPointsSmooth() const; void SetMarkedPointsSmooth(SdrPathSmoothKind eKind); // Ein PolySegment kann eine Strecke oder eine Bezierkurve sein. - BOOL IsSetMarkedSegmentsKindPossible() const; + sal_Bool IsSetMarkedSegmentsKindPossible() const; SdrPathSegmentKind GetMarkedSegmentsKind() const; void SetMarkedSegmentsKind(SdrPathSegmentKind eKind); // Moeglicherweise ist das Obj hinterher geloescht: void DeleteMarkedPoints(); - BOOL IsDeleteMarkedPointsPossible() const; + sal_Bool IsDeleteMarkedPointsPossible() const; void MoveMarkedPoints(const Size& rSiz, bool bCopy=false); void ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy=false); @@ -100,7 +100,7 @@ public: // Alle markierten Polylines werden zu Polygonen, alle offenen // Bezierkurven zu geschlossenen. void ShutMarkedObjects(); - void CloseMarkedObjects(BOOL bToggle=FALSE, BOOL bOpen=FALSE); // , long nOpenDistance=0); + void CloseMarkedObjects(sal_Bool bToggle=sal_False, sal_Bool bOpen=sal_False); // , long nOpenDistance=0); bool IsOpenCloseMarkedObjectsPossible() const; SdrObjClosedKind GetMarkedObjectsClosedState() const; diff --git a/svx/inc/svx/svdpool.hxx b/svx/inc/svx/svdpool.hxx index 7cec1665cc..7cec1665cc 100644..100755 --- a/svx/inc/svx/svdpool.hxx +++ b/svx/inc/svx/svdpool.hxx diff --git a/svx/inc/svx/svdsnpv.hxx b/svx/inc/svx/svdsnpv.hxx index 6c1ac12259..727f317895 100644..100755 --- a/svx/inc/svx/svdsnpv.hxx +++ b/svx/inc/svx/svdsnpv.hxx @@ -79,7 +79,7 @@ protected: Fraction aSnapWdtX; Fraction aSnapWdtY; - USHORT nMagnSizPix; + sal_uInt16 nMagnSizPix; long nSnapAngle; long nEliminatePolyPointLimitAngle; @@ -104,7 +104,7 @@ protected: unsigned bMoveOnlyDragging : 1; // Objekte nur verschieben bei Resize/Rotate/... unsigned bSlantButShear : 1; // Slant anstelle von Shear anwenden unsigned bCrookNoContortion : 1; // Objekte bei Crook nicht verzerren - unsigned bHlplFixed : 1; // TRUE=Hilfslinien fixiert, also nicht verschiebbar + unsigned bHlplFixed : 1; // sal_True=Hilfslinien fixiert, also nicht verschiebbar unsigned bEliminatePolyPoints : 1; private: @@ -116,7 +116,7 @@ protected: virtual ~SdrSnapView(); public: - virtual BOOL IsAction() const; + virtual sal_Bool IsAction() const; virtual void MovAction(const Point& rPnt); virtual void EndAction(); virtual void BckAction(); @@ -129,8 +129,8 @@ public: void SetSnapMagnetic(const Size& rSiz) { if (rSiz!=aMagnSiz) { aMagnSiz=rSiz; } } const Size& GetSnapMagnetic() const { return aMagnSiz; } - void SetSnapMagneticPixel(USHORT nPix) { nMagnSizPix=nPix; } - USHORT GetSnapMagneticPixel() const { return nMagnSizPix; } + void SetSnapMagneticPixel(sal_uInt16 nPix) { nMagnSizPix=nPix; } + sal_uInt16 GetSnapMagneticPixel() const { return nMagnSizPix; } // RecalcLogicSnapMagnetic muss bei jedem Wechsel des OutputDevices // sowie bei jedem Wechsel des MapModes gerufen werden! @@ -140,48 +140,48 @@ public: // Auf die View bezogene Koordinaten! // Rueckgabewerte sind SDRSNAP_NOTSNAPPED,SDRSNAP_XSNAPPED, // SDRSNAP_YSNAPPED oder SDRSNAP_XYSNAPPED - USHORT SnapPos(Point& rPnt, const SdrPageView* pPV) const; + sal_uInt16 SnapPos(Point& rPnt, const SdrPageView* pPV) const; Point GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const; - USHORT SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const; + sal_uInt16 SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const; void CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const; // Alle Fangeinstellungen sind Persistent. - BOOL IsSnapEnabled() const { return bSnapEnab; } - BOOL IsGridSnap() const { return bGridSnap; } // Fang auf Rastergitter - BOOL IsBordSnap() const { return bBordSnap; } // Fang auf Seitenraender - BOOL IsHlplSnap() const { return bHlplSnap; } // Fang auf Hilfslinien - BOOL IsOFrmSnap() const { return bOFrmSnap; } // Fang auf LogFram von umgebenden Zeichenobjekten - BOOL IsOPntSnap() const { return bOPntSnap; } // Fang auf ausgepraegte Punkte von umgebenden Zeichenobjekten - BOOL IsOConSnap() const { return bOConSnap; } // Fang auf Konnektoren der Zeichenobjekte - void SetSnapEnabled(BOOL bOn) { bSnapEnab=bOn; } - void SetGridSnap(BOOL bOn) { bGridSnap=bOn; } - void SetBordSnap(BOOL bOn) { bBordSnap=bOn; } - void SetHlplSnap(BOOL bOn) { bHlplSnap=bOn; } - void SetOFrmSnap(BOOL bOn) { bOFrmSnap=bOn; } - void SetOPntSnap(BOOL bOn) { bOPntSnap=bOn; } - void SetOConSnap(BOOL bOn) { bOConSnap=bOn; } + sal_Bool IsSnapEnabled() const { return bSnapEnab; } + sal_Bool IsGridSnap() const { return bGridSnap; } // Fang auf Rastergitter + sal_Bool IsBordSnap() const { return bBordSnap; } // Fang auf Seitenraender + sal_Bool IsHlplSnap() const { return bHlplSnap; } // Fang auf Hilfslinien + sal_Bool IsOFrmSnap() const { return bOFrmSnap; } // Fang auf LogFram von umgebenden Zeichenobjekten + sal_Bool IsOPntSnap() const { return bOPntSnap; } // Fang auf ausgepraegte Punkte von umgebenden Zeichenobjekten + sal_Bool IsOConSnap() const { return bOConSnap; } // Fang auf Konnektoren der Zeichenobjekte + void SetSnapEnabled(sal_Bool bOn) { bSnapEnab=bOn; } + void SetGridSnap(sal_Bool bOn) { bGridSnap=bOn; } + void SetBordSnap(sal_Bool bOn) { bBordSnap=bOn; } + void SetHlplSnap(sal_Bool bOn) { bHlplSnap=bOn; } + void SetOFrmSnap(sal_Bool bOn) { bOFrmSnap=bOn; } + void SetOPntSnap(sal_Bool bOn) { bOPntSnap=bOn; } + void SetOConSnap(sal_Bool bOn) { bOConSnap=bOn; } // Normalerweise werden beim Move-Dragging von Zeichenobjekten alle // 4 Ecken des Object-SnapRects gefangen. Folgende Einstellmoeglichkeit, // wenn man nur auf die linke obere Ecke fangen will (z.B. DialogEditor): // Persistent, Default=FALSE. - void SetMoveSnapOnlyTopLeft(BOOL bOn) { bMoveSnapOnlyTopLeft=bOn; } - BOOL IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; } + void SetMoveSnapOnlyTopLeft(sal_Bool bOn) { bMoveSnapOnlyTopLeft=bOn; } + sal_Bool IsMoveSnapOnlyTopLeft() const { return bMoveSnapOnlyTopLeft; } // Hilfslinien fixiert (nicht verschiebbar) // Persistent, Default=FALSE. - BOOL IsHlplFixed() const { return bHlplFixed; } - void SetHlplFixed(BOOL bOn) { bHlplFixed=bOn; } + sal_Bool IsHlplFixed() const { return bHlplFixed; } + void SetHlplFixed(sal_Bool bOn) { bHlplFixed=bOn; } - BOOL IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte - BOOL IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte - BOOL IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte - BOOL IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte + sal_Bool IsMoveMFrmSnap() const { return bMoveMFrmSnap; } // Fang des LogFram aller markierten Objekte + sal_Bool IsMoveOFrmSnap() const { return bMoveOFrmSnap; } // Fang aller LogFram der markierten Objekte + sal_Bool IsMoveOPntSnap() const { return bMoveOPntSnap; } // Fang ausgepraegter Punkte der markierten Objekte + sal_Bool IsMoveOConSnap() const { return bMoveOConSnap; } // Fang der Konnektoren der markierten Objekte - void SetMoveMFrmSnap(BOOL bOn) { bMoveMFrmSnap=bOn; } - void SetMoveOFrmSnap(BOOL bOn) { bMoveOFrmSnap=bOn; } - void SetMoveOPntSnap(BOOL bOn) { bMoveOPntSnap=bOn; } - void SetMoveOConSnap(BOOL bOn) { bMoveOConSnap=bOn; } + void SetMoveMFrmSnap(sal_Bool bOn) { bMoveMFrmSnap=bOn; } + void SetMoveOFrmSnap(sal_Bool bOn) { bMoveOFrmSnap=bOn; } + void SetMoveOPntSnap(sal_Bool bOn) { bMoveOPntSnap=bOn; } + void SetMoveOConSnap(sal_Bool bOn) { bMoveOConSnap=bOn; } // #114409#-1 Migrate PageOrigin sal_Bool BegSetPageOrg(const Point& rPnt); @@ -190,12 +190,12 @@ public: void BrkSetPageOrg(); sal_Bool IsSetPageOrg() const { return (0L != mpPageOriginOverlay); } - // HitTest. Bei TRUE steht in rnHelpLineNum die Nummer der Hilfslinie und in rpPV + // HitTest. Bei sal_True steht in rnHelpLineNum die Nummer der Hilfslinie und in rpPV // die zugehoerige PageView. - sal_Bool PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, USHORT& rnHelpLineNum, SdrPageView*& rpPV) const; + sal_Bool PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const; // Verschieben einer vorhandenen Hilfslinie. nHelpLineNum und pPV von PickHelpLine verwenden. - sal_Bool BegDragHelpLine(USHORT nHelpLineNum, SdrPageView* pPV); + sal_Bool BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV); // Interaktives einfuegen einer neuen Hilfslinie sal_Bool BegDragHelpLine(const Point& rPnt, SdrHelpLineKind eNewKind); Pointer GetDraggedHelpLinePointer() const; @@ -209,7 +209,7 @@ public: // SnapAngle ist fuer Winkel im Kreis, RotateDragging, ... // Der Winkelfang wird unterdrueckt, wenn er mit - // durch SetAngleSnapEnabled(FALSE) ausgeschaltet ist. + // durch SetAngleSnapEnabled(sal_False) ausgeschaltet ist. // Der Winkelfang ist unabhaengig vom Koordinatenfang // und somit von der Einstellung IsSnapEnabled() // Es sollten nur Werte angegeben werden fuer die gilt: @@ -219,8 +219,8 @@ public: // - Shear (Dragging) // - Kreisbogen/-sektor/-abschnitt Winkel (Create und Dragging) // Persistent. - void SetAngleSnapEnabled(BOOL bOn) { bAngleSnapEnab=bOn; } - BOOL IsAngleSnapEnabled() const { return bAngleSnapEnab; } + void SetAngleSnapEnabled(sal_Bool bOn) { bAngleSnapEnab=bOn; } + sal_Bool IsAngleSnapEnabled() const { return bAngleSnapEnab; } void SetSnapAngle(long nWink) { nSnapAngle=nWink; } long GetSnapAngle() const { return nSnapAngle; } @@ -260,20 +260,20 @@ public: void SetBigOrtho(bool bOn) { bBigOrtho=bOn; } bool IsBigOrtho() const { return bBigOrtho; } - // bei MoveOnlyDragging=TRUE wird bei Resize/Rotate/Shear/Mirror/Crook + // bei MoveOnlyDragging=sal_True wird bei Resize/Rotate/Shear/Mirror/Crook // nur das Zentrum der markierten Objekte transformiert. Groesse, Form // und Drehwinkel der Objekte bleiben erhalten, nur ihre Positionen // aendern sich. Persistent. Default=FALSE. (ni) - void SetMoveOnlyDragging(BOOL bOn) { bMoveOnlyDragging=bOn; } - BOOL IsMoveOnlyDragging() const { return bMoveOnlyDragging; } + void SetMoveOnlyDragging(sal_Bool bOn) { bMoveOnlyDragging=bOn; } + sal_Bool IsMoveOnlyDragging() const { return bMoveOnlyDragging; } // Slant anstelle von Shear anwenden. Persistent. Default=FALSE. - void SetSlantButShear(BOOL bOn) { bSlantButShear=bOn; } - BOOL IsSlantButShear() const { return bSlantButShear; } + void SetSlantButShear(sal_Bool bOn) { bSlantButShear=bOn; } + sal_Bool IsSlantButShear() const { return bSlantButShear; } // Objekte bei Crook nicht verzerren. Persistent. Default=FALSE. (ni) - void SetCrookNoContortion(BOOL bOn) { bCrookNoContortion=bOn; } - BOOL IsCrookNoContortion() const { return bCrookNoContortion; } + void SetCrookNoContortion(sal_Bool bOn) { bCrookNoContortion=bOn; } + sal_Bool IsCrookNoContortion() const { return bCrookNoContortion; } // Crook-Modus. Persistent. Default=SDRCROOK_ROTATE. (ni) void SetCrookMode(SdrCrookMode eMode) { eCrookMode=eMode; } @@ -282,8 +282,8 @@ public: // Special fuer IBM: Beim Draggen eines Polygonpunkts wird dieser // geloescht, wenn seine beiden angrenzenden Linien eh' fast eine // durchgehende Linie sind. - void SetEliminatePolyPoints(BOOL bOn) { bEliminatePolyPoints=bOn; } - BOOL IsEliminatePolyPoints() const { return bEliminatePolyPoints; } + void SetEliminatePolyPoints(sal_Bool bOn) { bEliminatePolyPoints=bOn; } + sal_Bool IsEliminatePolyPoints() const { return bEliminatePolyPoints; } void SetEliminatePolyPointLimitAngle(long nAngle) { nEliminatePolyPointLimitAngle=nAngle; } long GetEliminatePolyPointLimitAngle() const { return nEliminatePolyPointLimitAngle; } }; diff --git a/svx/inc/svx/svdsob.hxx b/svx/inc/svx/svdsob.hxx index 5b75195028..5b75195028 100644..100755 --- a/svx/inc/svx/svdsob.hxx +++ b/svx/inc/svx/svdsob.hxx diff --git a/svx/inc/svdstr.hrc b/svx/inc/svx/svdstr.hrc index 841f987a1a..2264f86656 100644..100755 --- a/svx/inc/svdstr.hrc +++ b/svx/inc/svx/svdstr.hrc @@ -181,8 +181,12 @@ #define STR_ObjNameSingulMEDIA (STR_ObjNameBegin + 143) #define STR_ObjNamePluralMEDIA (STR_ObjNameBegin + 144) -#define STR_ObjNameEnd (STR_ObjNamePluralMEDIA) - +//#define STR_ObjNameEnd (STR_ObjNamePluralMEDIA) +//IAccessibility2 Implementation 2009----- +#define STR_ObjNameSingulFONTWORK (STR_ObjNameBegin+145) +#define STR_ObjNamePluralFONTWORK (STR_ObjNameBegin+146) +#define STR_ObjNameEnd (STR_ObjNamePluralFONTWORK) +//-----IAccessibility2 Implementation 2009 #define STR_EditBegin (STR_ObjNameEnd+1) #define STR_EditWithCopy (STR_EditBegin + 0) #define STR_EditPosSize (STR_EditBegin + 1) @@ -697,6 +701,7 @@ #define SIP_SA_GRAFRESERVE6 (SIP_Begin + 257) #define SIP_SA_MARKERS (SIP_Begin + 258) +#define SIP_SA_PAGESHADOW35X35 (SIP_Begin + 259) #define SIP_SA_FINE_MARKERS (SIP_Begin + 260) #define BMP_SVXOLEOBJ (SIP_Begin + 261) diff --git a/svx/inc/svx/svdtext.hxx b/svx/inc/svx/svdtext.hxx index 0443012b00..5cff1a9fb9 100644..100755 --- a/svx/inc/svx/svdtext.hxx +++ b/svx/inc/svx/svdtext.hxx @@ -55,7 +55,7 @@ public: virtual ~SdrText(); virtual void SetModel(SdrModel* pNewModel); - virtual void ForceOutlinerParaObject( USHORT nOutlMode ); + virtual void ForceOutlinerParaObject( sal_uInt16 nOutlMode ); virtual void SetOutlinerParaObject( OutlinerParaObject* pTextObject ); virtual OutlinerParaObject* GetOutlinerParaObject() const; diff --git a/svx/inc/svx/svdtrans.hxx b/svx/inc/svx/svdtrans.hxx index c7718fcb27..568212a228 100644..100755 --- a/svx/inc/svx/svdtrans.hxx +++ b/svx/inc/svx/svdtrans.hxx @@ -179,7 +179,7 @@ inline double GetCrookAngle(Point& rPnt, const Point& rCenter, const Point& rRad SVX_DLLPUBLIC long GetAngle(const Point& rPnt); long NormAngle180(long a); // Winkel normalisieren auf -180.00..179.99 SVX_DLLPUBLIC long NormAngle360(long a); // Winkel normalisieren auf 0.00..359.99 -USHORT GetAngleSector(long nWink); // Sektor im kartesischen Koordinatensystem bestimmen +sal_uInt16 GetAngleSector(long nWink); // Sektor im kartesischen Koordinatensystem bestimmen // Berechnet die Laenge von (0,0) via a^2 + b^2 = c^2 // Zur Vermeidung von Ueberlaeufen werden ggf. einige Stellen ignoriert. long GetLen(const Point& rPnt); @@ -304,14 +304,14 @@ private: SVX_DLLPRIVATE void Undirty(); SVX_DLLPRIVATE void ForceUndirty() const { if (bDirty) ((SdrFormatter*)this)->Undirty(); } public: - SdrFormatter(MapUnit eSrc, MapUnit eDst) { eSrcMU=eSrc; bSrcFU=FALSE; eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; } - SdrFormatter(MapUnit eSrc, FieldUnit eDst) { eSrcMU=eSrc; bSrcFU=FALSE; eDstFU=eDst; bDstFU=TRUE; bDirty=TRUE; } - SdrFormatter(FieldUnit eSrc, MapUnit eDst) { eSrcFU=eSrc; bSrcFU=TRUE; eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; } - SdrFormatter(FieldUnit eSrc, FieldUnit eDst) { eSrcFU=eSrc; bSrcFU=TRUE; eDstFU=eDst; bDstFU=TRUE; bDirty=TRUE; } - void SetSourceUnit(MapUnit eSrc) { eSrcMU=eSrc; bSrcFU=FALSE; bDirty=TRUE; } - void SetSourceUnit(FieldUnit eSrc) { eSrcFU=eSrc; bSrcFU=TRUE; bDirty=TRUE; } - void SetDestinationUnit(MapUnit eDst) { eDstMU=eDst; bDstFU=FALSE; bDirty=TRUE; } - void SetDestinationUnit(FieldUnit eDst) { eDstFU=eDst; bDstFU=TRUE; bDirty=TRUE; } + SdrFormatter(MapUnit eSrc, MapUnit eDst) { eSrcMU=eSrc; bSrcFU=sal_False; eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; } + SdrFormatter(MapUnit eSrc, FieldUnit eDst) { eSrcMU=eSrc; bSrcFU=sal_False; eDstFU=eDst; bDstFU=sal_True; bDirty=sal_True; } + SdrFormatter(FieldUnit eSrc, MapUnit eDst) { eSrcFU=eSrc; bSrcFU=sal_True; eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; } + SdrFormatter(FieldUnit eSrc, FieldUnit eDst) { eSrcFU=eSrc; bSrcFU=sal_True; eDstFU=eDst; bDstFU=sal_True; bDirty=sal_True; } + void SetSourceUnit(MapUnit eSrc) { eSrcMU=eSrc; bSrcFU=sal_False; bDirty=sal_True; } + void SetSourceUnit(FieldUnit eSrc) { eSrcFU=eSrc; bSrcFU=sal_True; bDirty=sal_True; } + void SetDestinationUnit(MapUnit eDst) { eDstMU=eDst; bDstFU=sal_False; bDirty=sal_True; } + void SetDestinationUnit(FieldUnit eDst) { eDstFU=eDst; bDstFU=sal_True; bDirty=sal_True; } void TakeStr(long nVal, XubString& rStr) const; static void TakeUnitStr(MapUnit eUnit, XubString& rStr); static void TakeUnitStr(FieldUnit eUnit, XubString& rStr); diff --git a/svx/inc/svx/svdtypes.hxx b/svx/inc/svx/svdtypes.hxx index 75ed074a60..c2478e19c3 100644..100755 --- a/svx/inc/svx/svdtypes.hxx +++ b/svx/inc/svx/svdtypes.hxx @@ -41,10 +41,10 @@ // @@@@ @@@@@ @@ @@ @@@@ @@@@@ @@@@ @@@@@ @@@@ @@ //////////////////////////////////////////////////////////////////////////////////////////////////// -const UINT32 SdrInventor=UINT32('S')*0x00000001+ - UINT32('V')*0x00000100+ - UINT32('D')*0x00010000+ - UINT32('r')*0x01000000; +const sal_uInt32 SdrInventor=sal_uInt32('S')*0x00000001+ + sal_uInt32('V')*0x00000100+ + sal_uInt32('D')*0x00010000+ + sal_uInt32('r')*0x01000000; // Kommandos fuer EndCreate() enum SdrCreateCmd {SDRCREATE_NEXTPOINT, // Naechster Polygonpunkt, Kreissegment: Naechste Koordinate @@ -91,10 +91,10 @@ enum SdrConvertType {SDRCONVERT_POLY, // reines Polygon erzeugen // dann diesen Wert: #define SDRLAYER_NOTFOUND 0xFF // Man kann diesen Wert jodoch ohne Bedenken den Methoden des SdrLayerSet -// zuwerfen, bekommt dann jedoch immer FALSE, bzw. tut die Methode nix. +// zuwerfen, bekommt dann jedoch immer sal_False, bzw. tut die Methode nix. //////////////////////////////////////////////////////////////////////////////////////////////////// // Typdeklaration fuer Layer-IDs -typedef BYTE SdrLayerID; +typedef sal_uInt8 SdrLayerID; //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index 5f2d509d71..67cc1b70b3 100644..100755 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -73,7 +73,7 @@ protected: public: TYPEINFO(); - virtual BOOL CanRepeat(SfxRepeatTarget& rView) const; + virtual sal_Bool CanRepeat(SfxRepeatTarget& rView) const; virtual void Repeat(SfxRepeatTarget& rView); virtual String GetRepeatComment(SfxRepeatTarget& rView) const; @@ -110,8 +110,8 @@ public: virtual ~SdrUndoGroup(); void Clear(); - ULONG GetActionCount() const { return aBuf.Count(); } - SdrUndoAction* GetAction(ULONG nNum) const { return (SdrUndoAction*)(aBuf.GetObject(nNum)); } + sal_uIntPtr GetActionCount() const { return aBuf.Count(); } + SdrUndoAction* GetAction(sal_uIntPtr nNum) const { return (SdrUndoAction*)(aBuf.GetObject(nNum)); } void AddAction(SdrUndoAction* pAct); void push_front( SdrUndoAction* pAct ); @@ -144,9 +144,9 @@ protected: protected: SdrUndoObj(SdrObject& rNewObj); - void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, bool bRepeat = false) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, bool bRepeat = false) const; - static void GetDescriptionStringForObject( const SdrObject& _rForObject, USHORT nStrCacheID, String& rStr, bool bRepeat = false ); + static void GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, bool bRepeat = false ); // #94278# new method for evtl. PageChange at UNDO/REDO void ImpShowPageOfThisObject(); @@ -269,7 +269,7 @@ protected: SdrObjList* pObjList; SdrView* pView; // um bei ObjDel, Undo die SdrPageView* pPageView; // Selektion widerherstellen zu koennen - UINT32 nOrdNum; + sal_uInt32 nOrdNum; // Bei einem Undo/Redo findet moeglicherweise Uebereignung des Objektes // statt. Im Dtor wird das Obj deleted, wenn bOwner==TRUE @@ -332,7 +332,7 @@ class SVX_DLLPUBLIC SdrUndoDelObj : public SdrUndoRemoveObj { public: SdrUndoDelObj(SdrObject& rNewObj, bool bOrdNumDirect = false) - : SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(TRUE); } + : SdrUndoRemoveObj(rNewObj,bOrdNumDirect) { SetOwner(sal_True); } virtual void Undo(); virtual void Redo(); @@ -381,7 +381,7 @@ class SVX_DLLPUBLIC SdrUndoReplaceObj : public SdrUndoObj protected: SdrObjList* pObjList; - UINT32 nOrdNum; + sal_uInt32 nOrdNum; SdrObject* pNewObj; public: @@ -422,11 +422,11 @@ public: class SdrUndoObjOrdNum : public SdrUndoObj { protected: - UINT32 nOldOrdNum; - UINT32 nNewOrdNum; + sal_uInt32 nOldOrdNum; + sal_uInt32 nNewOrdNum; public: - SdrUndoObjOrdNum(SdrObject& rNewObj, UINT32 nOldOrdNum1, UINT32 nNewOrdNum1); + SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1); virtual void Undo(); virtual void Redo(); @@ -460,7 +460,7 @@ protected: OutlinerParaObject* pOldText; OutlinerParaObject* pNewText; bool bNewTextAvailable; - BOOL bEmptyPresObj; + sal_Bool bEmptyPresObj; sal_Int32 mnText; public: @@ -532,11 +532,11 @@ class SdrUndoLayer : public SdrUndoAction protected: SdrLayer* pLayer; SdrLayerAdmin* pLayerAdmin; - USHORT nNum; + sal_uInt16 nNum; bool bItsMine; protected: - SdrUndoLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); + SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel); virtual ~SdrUndoLayer(); }; @@ -550,7 +550,7 @@ protected: class SdrUndoNewLayer : public SdrUndoLayer { public: - SdrUndoNewLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) + SdrUndoNewLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) {} virtual void Undo(); @@ -569,8 +569,8 @@ public: class SdrUndoDelLayer : public SdrUndoLayer { public: - SdrUndoDelLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) - : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=TRUE; } + SdrUndoDelLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel) + : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel) { bItsMine=sal_True; } virtual void Undo(); virtual void Redo(); @@ -587,10 +587,10 @@ public: class SdrUndoMoveLayer : public SdrUndoLayer { - USHORT nNeuPos; + sal_uInt16 nNeuPos; public: - SdrUndoMoveLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, USHORT nNeuPos1) + SdrUndoMoveLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel, sal_uInt16 nNeuPos1) : SdrUndoLayer(nLayerNum,rNewLayerAdmin,rNewModel), nNeuPos(nNeuPos1) {} virtual void Undo(); @@ -624,14 +624,14 @@ protected: SdrPage& mrPage; protected: - void ImpInsertPage(USHORT nNum); - void ImpRemovePage(USHORT nNum); - void ImpMovePage(USHORT nOldNum, USHORT nNewNum); + void ImpInsertPage(sal_uInt16 nNum); + void ImpRemovePage(sal_uInt16 nNum); + void ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum); protected: SdrUndoPage(SdrPage& rNewPg); - void ImpTakeDescriptionStr(USHORT nStrCacheID, String& rStr, USHORT n=0, bool bRepeat = false) const; + void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, String& rStr, sal_uInt16 n=0, bool bRepeat = false) const; }; //************************************************************ @@ -645,7 +645,7 @@ protected: class SVX_DLLPUBLIC SdrUndoPageList : public SdrUndoPage { protected: - USHORT nPageNum; + sal_uInt16 nPageNum; // Bei einem Undo/Redo findet moeglicherweise Uebereignung der Page // statt. Im Dtor wird die Page deleted, wenn bItsMine==TRUE @@ -734,11 +734,11 @@ public: class SVX_DLLPUBLIC SdrUndoSetPageNum : public SdrUndoPage { protected: - USHORT nOldPageNum; - USHORT nNewPageNum; + sal_uInt16 nOldPageNum; + sal_uInt16 nNewPageNum; public: - SdrUndoSetPageNum(SdrPage& rNewPg, USHORT nOldPageNum1, USHORT nNewPageNum1) + SdrUndoSetPageNum(SdrPage& rNewPg, sal_uInt16 nOldPageNum1, sal_uInt16 nNewPageNum1) : SdrUndoPage(rNewPg),nOldPageNum(nOldPageNum1),nNewPageNum(nNewPageNum1) {} virtual void Undo(); diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx index 0786a2e3cb..7123ba1baa 100644..100755 --- a/svx/inc/svx/svdview.hxx +++ b/svx/inc/svx/svdview.hxx @@ -123,11 +123,11 @@ struct SVX_DLLPUBLIC SdrViewEvent SdrHdlKind eHdlKind; SdrCreateCmd eEndCreateCmd; // auch fuer EndInsPoint - UINT16 nMouseClicks; - UINT16 nMouseMode; - UINT16 nMouseCode; - UINT16 nHlplIdx; - UINT16 nGlueId; + sal_uInt16 nMouseClicks; + sal_uInt16 nMouseMode; + sal_uInt16 nMouseCode; + sal_uInt16 nHlplIdx; + sal_uInt16 nGlueId; unsigned bMouseDown : 1; unsigned bMouseUp : 1; @@ -149,7 +149,7 @@ public: ~SdrViewEvent(); // nEventKind ist SDRMOUSEBUTTONDOWN, SDRMOUSEMOVE oder SDRMOUSEBUTTONUP - void SetMouseEvent(const MouseEvent& rMEvt, USHORT nEventKind); + void SetMouseEvent(const MouseEvent& rMEvt, sal_uInt16 nEventKind); }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -211,44 +211,44 @@ public: // pSdrView->DoMouseEvent(aVEvt); // SetPointer(GetPreferedPointer(...)) // CaptureMouse(...) - void EnableExtendedMouseEventDispatcher(BOOL bOn) { bNoExtendedMouseDispatcher = !bOn; } - BOOL IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; } + void EnableExtendedMouseEventDispatcher(sal_Bool bOn) { bNoExtendedMouseDispatcher = !bOn; } + sal_Bool IsExtendedMouseEventDispatcherEnabled() const { return bNoExtendedMouseDispatcher; } - void EnableExtendedKeyInputDispatcher(BOOL bOn) { bNoExtendedKeyDispatcher=!bOn; } - BOOL IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; } + void EnableExtendedKeyInputDispatcher(sal_Bool bOn) { bNoExtendedKeyDispatcher=!bOn; } + sal_Bool IsExtendedKeyInputDispatcherEnabled() const { return bNoExtendedKeyDispatcher; } - void EnableExtendedCommandEventDispatcher(BOOL bOn) { bNoExtendedCommandDispatcher=!bOn; } - BOOL IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; } + void EnableExtendedCommandEventDispatcher(sal_Bool bOn) { bNoExtendedCommandDispatcher=!bOn; } + sal_Bool IsExtendedCommandEventDispatcherEnabled() const { return bNoExtendedCommandDispatcher; } - void EnableTextEditOnObjectsWithoutTextIfTextTool(BOOL bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; } - BOOL IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; } + void EnableTextEditOnObjectsWithoutTextIfTextTool(sal_Bool bOn) { bTextEditOnObjectsWithoutTextIfTextTool=bOn; } + sal_Bool IsEnableTextEditOnObjectsWithoutTextIfTextToolEnabled() const { return bTextEditOnObjectsWithoutTextIfTextTool; } void SetMasterPagePaintCaching(sal_Bool bOn); sal_Bool IsMasterPagePaintCaching() const { return mbMasterPagePaintCaching; } - BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); - virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin); - virtual BOOL Command(const CommandEvent& rCEvt, Window* pWin); + sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); + virtual sal_Bool Command(const CommandEvent& rCEvt, Window* pWin); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); - BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll=FALSE) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); } - BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr=FALSE) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); } + sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll=sal_False) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); } + sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr=sal_False) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); } /* new interface src537 */ - BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const; + sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; SfxStyleSheet* GetStyleSheet() const; // unvollstaendige Implementation: // Das OutputDevice ist notwendig, damit ich die HandleSize ermitteln kann. // Bei NULL wird das 1. angemeldete Win verwendet. - Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nModifier=0, BOOL bLeftDown=FALSE) const; - SdrHitKind PickAnything(const MouseEvent& rMEvt, USHORT nMouseDownOrMoveOrUp, SdrViewEvent& rVEvt) const; + Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier=0, sal_Bool bLeftDown=sal_False) const; + SdrHitKind PickAnything(const MouseEvent& rMEvt, sal_uInt16 nMouseDownOrMoveOrUp, SdrViewEvent& rVEvt) const; SdrHitKind PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) const; - BOOL DoMouseEvent(const SdrViewEvent& rVEvt); + sal_Bool DoMouseEvent(const SdrViewEvent& rVEvt); virtual SdrViewContext GetContext() const; // Die Methoden beruecksichtigen den jeweiligen Kontex: @@ -257,27 +257,27 @@ public: // - Klebepunkt-Editmode // - TextEdit // - ... to be continued - BOOL IsMarkPossible() const; + sal_Bool IsMarkPossible() const; void MarkAll(); void UnmarkAll(); - BOOL IsAllMarked() const; - BOOL IsAllMarkPrevNextPossible() const; // das geht naemlich nicht bei TextEdit! - BOOL MarkNext(BOOL bPrev=FALSE); - BOOL MarkNext(const Point& rPnt, BOOL bPrev=FALSE); + sal_Bool IsAllMarked() const; + sal_Bool IsAllMarkPrevNextPossible() const; // das geht naemlich nicht bei TextEdit! + sal_Bool MarkNext(sal_Bool bPrev=sal_False); + sal_Bool MarkNext(const Point& rPnt, sal_Bool bPrev=sal_False); const Rectangle& GetMarkedRect() const; void SetMarkedRect(const Rectangle& rRect); virtual void DeleteMarked(); - BOOL IsDeleteMarkedPossible() const; - BOOL IsDeletePossible() const { return IsDeleteMarkedPossible(); } + sal_Bool IsDeleteMarkedPossible() const; + sal_Bool IsDeletePossible() const { return IsDeleteMarkedPossible(); } // Markieren von Objekten, Polygonpunkten oder Klebepunkten (je nach View- // Kontext) durch Aufziehen eines Selektionsrahmens. // bAddMark=TRUE: zur bestehenden Selektion hinzumarkieren (->Shift) // bUnmark=TRUE: Bereits selektierte Objekte/Punkte/Klebepunkte die innerhalb // des aufgezogenen Rahmens liegen werden deselektiert. - BOOL BegMark(const Point& rPnt, BOOL bAddMark=FALSE, BOOL bUnmark=FALSE); + sal_Bool BegMark(const Point& rPnt, sal_Bool bAddMark=sal_False, sal_Bool bUnmark=sal_False); // Folgende Actions sind moeglich: // - ObjectCreating @@ -312,28 +312,28 @@ public: // ~~~~~~~~~~~~~~~~~~~~ // Einfache Events: // ~~~~~~~~~~~~~~~~ -// BOOL KeyInput(const KeyEvent& rKEvt, Window* pWin); -// BOOL MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); -// BOOL MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); -// BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin); -// BOOL Command(const CommandEvent& rCEvt, Window* pWin); +// sal_Bool KeyInput(const KeyEvent& rKEvt, Window* pWin); +// sal_Bool MouseButtonDown(const MouseEvent& rMEvt, Window* pWin); +// sal_Bool MouseButtonUp(const MouseEvent& rMEvt, Window* pWin); +// sal_Bool MouseMove(const MouseEvent& rMEvt, Window* pWin); +// sal_Bool Command(const CommandEvent& rCEvt, Window* pWin); // // Exchange (Clipboard derzeit noch ohne SdrPrivateData): // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// BOOL Cut(ULONG nFormat=SDR_ANYFORMAT); -// BOOL Yank(ULONG nFormat=SDR_ANYFORMAT); -// BOOL Paste(Window* pWin=NULL, ULONG nFormat=SDR_ANYFORMAT); +// sal_Bool Cut(sal_uIntPtr nFormat=SDR_ANYFORMAT); +// sal_Bool Yank(sal_uIntPtr nFormat=SDR_ANYFORMAT); +// sal_Bool Paste(Window* pWin=NULL, sal_uIntPtr nFormat=SDR_ANYFORMAT); // // SfxItems: // ~~~~~~~~~ -// BOOL GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr=FALSE) const; -// BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll); +// sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; +// sal_Bool SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll); // SfxStyleSheet* GetStyleSheet() const; -// BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr); +// sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr); // // Sonstiges: // ~~~~~~~~~~ -// Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nTol=0) const; +// Pointer GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nTol=0) const; // String GetStatusText(); // ///////////////////////////////////////////////////////////////////////////////////////////////// */ diff --git a/svx/inc/svdviter.hxx b/svx/inc/svx/svdviter.hxx index 922d0221ac..922d0221ac 100644..100755 --- a/svx/inc/svdviter.hxx +++ b/svx/inc/svx/svdviter.hxx diff --git a/svx/inc/svx/svdxcgv.hxx b/svx/inc/svx/svdxcgv.hxx index 363e3bd040..76cc67b2b1 100644..100755 --- a/svx/inc/svx/svdxcgv.hxx +++ b/svx/inc/svx/svdxcgv.hxx @@ -55,12 +55,12 @@ class SVX_DLLPUBLIC SdrExchangeView: public SdrObjEditView protected: void ImpGetPasteObjList(Point& rPos, SdrObjList*& rpLst); - void ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, UINT32 nOptions); - BOOL ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const; + void ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions); + sal_Bool ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const; Point GetPastePos(SdrObjList* pLst, OutputDevice* pOut=NULL); // liefert True, wenn rPt geaendert wurde - BOOL ImpLimitToWorkArea(Point& rPt) const; + sal_Bool ImpLimitToWorkArea(Point& rPt) const; protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView @@ -74,11 +74,11 @@ public: // Alle markierten Objekte in ein Metafile stecken. Z.Zt. noch etwas // buggee (Offset..., Fremdgrafikobjekte (SdrGrafObj), Virtuelle // Objektkopien (SdrVirtObj) mit Ankerpos<>(0,0)). - virtual GDIMetaFile GetMarkedObjMetaFile(BOOL bNoVDevIfOneMtfMarked=FALSE) const; + virtual GDIMetaFile GetMarkedObjMetaFile(sal_Bool bNoVDevIfOneMtfMarked=sal_False) const; // Alle markierten Objekte auf eine Bitmap malen. Diese hat die Farbtiefe // und Aufloesung des Bildschirms. - virtual Bitmap GetMarkedObjBitmap(BOOL bNoVDevIfOneBmpMarked=FALSE) const; + virtual Bitmap GetMarkedObjBitmap(sal_Bool bNoVDevIfOneBmpMarked=sal_False) const; // Alle markierten Objekte in ein neues Model kopieren. Dieses neue Model // hat dann genau eine Page. Das Flag PageNotValid an diesem Model ist @@ -92,8 +92,8 @@ public: // der Default-Layer zugewiesen (Layer 0, (dokumentglobaler Standardlayer). virtual SdrModel* GetMarkedObjModel() const; - GDIMetaFile GetAllMarkedMetaFile(BOOL bNoVDevIfOneMtfMarked=FALSE) const { return GetMarkedObjMetaFile(bNoVDevIfOneMtfMarked); } - Bitmap GetAllMarkedBitmap(BOOL bNoVDevIfOneBmpMarked=FALSE) const { return GetMarkedObjBitmap(bNoVDevIfOneBmpMarked); } + GDIMetaFile GetAllMarkedMetaFile(sal_Bool bNoVDevIfOneMtfMarked=sal_False) const { return GetMarkedObjMetaFile(bNoVDevIfOneMtfMarked); } + Bitmap GetAllMarkedBitmap(sal_Bool bNoVDevIfOneBmpMarked=sal_False) const { return GetMarkedObjBitmap(bNoVDevIfOneBmpMarked); } Graphic GetAllMarkedGraphic() const; SdrModel* GetAllMarkedModel() const { return GetMarkedObjModel(); } @@ -116,7 +116,7 @@ public: Point GetViewCenter(const OutputDevice* pOut=NULL) const; // Bei allen Paste-Methoden werden die neuen Draw-Objekte markiert. - // Wird der Parameter bAddMark auf TRUE gesetzt, so werden die neuen + // Wird der Parameter bAddMark auf sal_True gesetzt, so werden die neuen // DrawObjekte zu einer bereits bestehenden Selektion "hinzumarkiert". // Dieser Fall ist fuer Drag&Drop mit mehreren Items gedacht. // Die Methoden mit Point-Parameter fuegen neue Objekte zentriert an @@ -125,37 +125,37 @@ public: // eingefuegt. Die Positionierung (rPos bzw. Zentrierung) bezieht sich // dann nichtmehr auf die View sondern auf die Page. // Hinweis: SdrObjList ist Basisklasse von SdrPage. - // Die Methoden liefern TRUE, wenn die Objekte erfolgreich erzeugt und - // eingefuegt wurden. Bei pLst=FALSE und kein TextEdit aktiv kann man + // Die Methoden liefern sal_True, wenn die Objekte erfolgreich erzeugt und + // eingefuegt wurden. Bei pLst=sal_False und kein TextEdit aktiv kann man // sich dann auch darauf verlassen, dass diese an der View markiert sind. // Andernfalls erfolgt die Markierung nur, wenn pLst z.Zt. auch an der // View angezeigt wird. // Gueltige Werte fuer nOptions sind SDRINSERT_DONTMARK und // SDRINSERT_ADDMARK (siehe svdedtv.hxx). - BOOL Paste(const GDIMetaFile& rMtf, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rMtf,GetPastePos(pLst,pOut),pLst,nOptions); } - BOOL Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); - BOOL Paste(const Bitmap& rBmp, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rBmp,GetPastePos(pLst,pOut),pLst,nOptions); } - BOOL Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); - BOOL Paste(const SdrModel& rMod, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rMod,GetPastePos(pLst,pOut),pLst,nOptions); } - virtual BOOL Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); - BOOL Paste(const String& rStr, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rStr,GetPastePos(pLst,pOut),pLst,nOptions); } - BOOL Paste(const String& rStr, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); - // der USHORT eFormat nimmt Werte des enum EETextFormat entgegen - BOOL Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, UINT32 nOptions=0) { return Paste(rInput,rBaseURL,eFormat,GetPastePos(pLst,pOut),pLst,nOptions); } - BOOL Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); + sal_Bool Paste(const GDIMetaFile& rMtf, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rMtf,GetPastePos(pLst,pOut),pLst,nOptions); } + sal_Bool Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + sal_Bool Paste(const Bitmap& rBmp, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rBmp,GetPastePos(pLst,pOut),pLst,nOptions); } + sal_Bool Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + sal_Bool Paste(const SdrModel& rMod, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rMod,GetPastePos(pLst,pOut),pLst,nOptions); } + virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + sal_Bool Paste(const String& rStr, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rStr,GetPastePos(pLst,pOut),pLst,nOptions); } + sal_Bool Paste(const String& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); + // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen + sal_Bool Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, SdrObjList* pLst=NULL, OutputDevice* pOut=NULL, sal_uInt32 nOptions=0) { return Paste(rInput,rBaseURL,eFormat,GetPastePos(pLst,pOut),pLst,nOptions); } + sal_Bool Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); // Feststellen, ob ein bestimmtes Format ueber Drag&Drop bzw. ueber's // Clipboard angenommen werden kann. - BOOL IsExchangeFormatSupported(ULONG nFormat) const; + sal_Bool IsExchangeFormatSupported(sal_uIntPtr nFormat) const; - BOOL Cut( ULONG nFormat = SDR_ANYFORMAT ); - void CutMarked( ULONG nFormat=SDR_ANYFORMAT ); + sal_Bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT ); + void CutMarked( sal_uIntPtr nFormat=SDR_ANYFORMAT ); - BOOL Yank( ULONG nFormat = SDR_ANYFORMAT ); - void YankMarked( ULONG nFormat=SDR_ANYFORMAT ); + sal_Bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT ); + void YankMarked( sal_uIntPtr nFormat=SDR_ANYFORMAT ); - BOOL Paste( Window* pWin = NULL, ULONG nFormat = SDR_ANYFORMAT ); - BOOL PasteClipboard( OutputDevice* pOut = NULL, ULONG nFormat = SDR_ANYFORMAT, UINT32 nOptions = 0 ); + sal_Bool Paste( Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT ); + sal_Bool PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 ); }; #endif //_SVDXCGV_HXX diff --git a/svx/inc/svimbase.hxx b/svx/inc/svx/svimbase.hxx index 5b8e893613..3e2653adff 100644..100755 --- a/svx/inc/svimbase.hxx +++ b/svx/inc/svx/svimbase.hxx @@ -37,11 +37,7 @@ // - Defines - // ----------- -#ifdef WIN -#define _SVHUGE huge -#else #define _SVHUGE -#endif // ---------------- // - SimDepthType - @@ -61,14 +57,14 @@ enum SimDepthType struct SimColor { - BYTE cBlue; - BYTE cGreen; - BYTE cRed; + sal_uInt8 cBlue; + sal_uInt8 cGreen; + sal_uInt8 cRed; }; // ------------------------------------------------------------------------ -inline BOOL operator==( const SimColor& rCol1, const SimColor& rCol2 ) +inline sal_Bool operator==( const SimColor& rCol1, const SimColor& rCol2 ) { return ( ( rCol1.cRed == rCol2.cRed ) && ( rCol1.cGreen == rCol2.cGreen ) && @@ -81,7 +77,7 @@ inline BOOL operator==( const SimColor& rCol1, const SimColor& rCol2 ) struct SimPalette { - ULONG nColors; + sal_uIntPtr nColors; SimColor aColorArray[ 256 ]; }; @@ -107,39 +103,39 @@ private: SimPalette* pPal2; SimPalette* pPal3; SimPalette* pPal4; - ULONG nWidth1; - ULONG nWidth2; - ULONG nWidth3; - ULONG nWidth4; - ULONG nHeight1; - ULONG nHeight2; - ULONG nHeight3; - ULONG nHeight4; - ULONG nAlignedWidth1; - ULONG nAlignedWidth2; - ULONG nAlignedWidth3; - ULONG nAlignedWidth4; - ULONG nWhichOrg; + sal_uIntPtr nWidth1; + sal_uIntPtr nWidth2; + sal_uIntPtr nWidth3; + sal_uIntPtr nWidth4; + sal_uIntPtr nHeight1; + sal_uIntPtr nHeight2; + sal_uIntPtr nHeight3; + sal_uIntPtr nHeight4; + sal_uIntPtr nAlignedWidth1; + sal_uIntPtr nAlignedWidth2; + sal_uIntPtr nAlignedWidth3; + sal_uIntPtr nAlignedWidth4; + sal_uIntPtr nWhichOrg; SimDepthType eOrgDepth; SimDepthType eUndoDepth; SimDepthType eRedoDepth; - BOOL bIsUndo; - BOOL bIsRedo; - BOOL bCreateUndo; - BOOL bValid; - BOOL bDitherAll; - - HPBYTE BitmapToArray24( const Bitmap& rBitmap, ULONG* pWidth, - ULONG* pHeight, ULONG* pAlignedWidth, + sal_Bool bIsUndo; + sal_Bool bIsRedo; + sal_Bool bCreateUndo; + sal_Bool bValid; + sal_Bool bDitherAll; + + HPBYTE BitmapToArray24( const Bitmap& rBitmap, sal_uIntPtr* pWidth, + sal_uIntPtr* pHeight, sal_uIntPtr* pAlignedWidth, SfxViewFrame *pFrame = NULL ); - BOOL Array24ToBitmap( HPBYTE pArray, Bitmap &rBitmap, - const ULONG nWidth, const ULONG nHeight, - const ULONG nColorCount = 256, - ULONG nLast = 0, SfxProgress* pProgress = NULL ); + sal_Bool Array24ToBitmap( HPBYTE pArray, Bitmap &rBitmap, + const sal_uIntPtr nWidth, const sal_uIntPtr nHeight, + const sal_uIntPtr nColorCount = 256, + sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL ); Bitmap CreateSaveBitmap( const SimDepthType eDepth, SfxViewFrame *pFrame = NULL ); - HPBYTE CreateArray24( ULONG nWidth, ULONG nHeight ); + HPBYTE CreateArray24( sal_uIntPtr nWidth, sal_uIntPtr nHeight ); void DeleteArray( HPBYTE pArray ); SvImageBase(const SvImageBase& rSvImageBase); @@ -149,23 +145,23 @@ public: SvImageBase(); SvImageBase( const Bitmap& rBitmap, - const ULONG nColorCount = 256, - ULONG nLast = 0, SfxProgress* pProgress = NULL ); + const sal_uIntPtr nColorCount = 256, + sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL ); ~SvImageBase(); - BOOL IsValid() { return bValid; } + sal_Bool IsValid() { return bValid; } - ULONG GetOrgWidth() const { return nWhichOrg == 1 ? nWidth1 : nWidth2; } - ULONG GetDestWidth() const { return nWhichOrg == 1 ? nWidth2 : nWidth1; } + sal_uIntPtr GetOrgWidth() const { return nWhichOrg == 1 ? nWidth1 : nWidth2; } + sal_uIntPtr GetDestWidth() const { return nWhichOrg == 1 ? nWidth2 : nWidth1; } - ULONG GetOrgHeight() const { return nWhichOrg == 1 ? nHeight1 : nHeight2; } - ULONG GetDestHeight() const { return nWhichOrg == 1 ? nHeight2 : nHeight1; } + sal_uIntPtr GetOrgHeight() const { return nWhichOrg == 1 ? nHeight1 : nHeight2; } + sal_uIntPtr GetDestHeight() const { return nWhichOrg == 1 ? nHeight2 : nHeight1; } - ULONG GetOrgAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth1 : nAlignedWidth2; } - ULONG GetDestAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth2 : nAlignedWidth1; } + sal_uIntPtr GetOrgAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth1 : nAlignedWidth2; } + sal_uIntPtr GetDestAlignedWidth() const { return nWhichOrg == 1 ? nAlignedWidth2 : nAlignedWidth1; } - ULONG GetOrgAlignedSize() const { return GetOrgAlignedWidth() * GetOrgHeight(); } - ULONG GetDestAlignedSize() const { return GetDestAlignedWidth() * GetDestHeight(); } + sal_uIntPtr GetOrgAlignedSize() const { return GetOrgAlignedWidth() * GetOrgHeight(); } + sal_uIntPtr GetDestAlignedSize() const { return GetDestAlignedWidth() * GetDestHeight(); } // Get and set the color depth of the origin picture SimDepthType GetDepth() const { return eOrgDepth; } @@ -178,20 +174,20 @@ public: SimDepthType GetRedoDepth() const { return eRedoDepth; } void SetRedoDepth(const SimDepthType eDepth) { eRedoDepth = eDepth; } - BOOL BeginProcessing( BOOL bUndo = TRUE ); + sal_Bool BeginProcessing( sal_Bool bUndo = sal_True ); void EndProcessing(); - BOOL BeginProcessingExt(ULONG nWidth, ULONG nHeight, BOOL bUndo = TRUE); + sal_Bool BeginProcessingExt(sal_uIntPtr nWidth, sal_uIntPtr nHeight, sal_Bool bUndo = sal_True); void EndProcessingExt() { EndProcessing(); } HPBYTE GetOrgPointer() { return pOrgArray; } HPBYTE GetDestPointer() { return pDestArray; } - BOOL CreateOutBitmap( const ULONG nColorCount = 256, ULONG nLast = 0, + sal_Bool CreateOutBitmap( const sal_uIntPtr nColorCount = 256, sal_uIntPtr nLast = 0, SfxProgress* pProgress = NULL ); - BOOL DoUndo( SfxProgress* pProgress = NULL ); - BOOL DoRedo( SfxProgress* pProgress = NULL ); + sal_Bool DoUndo( SfxProgress* pProgress = NULL ); + sal_Bool DoRedo( SfxProgress* pProgress = NULL ); const Bitmap& GetOutBitmap() const; @@ -205,7 +201,7 @@ public: // - DitherBitmap - // ---------------- -BOOL DitherBitmap( Bitmap& rBitmap, BOOL bDitherAlways = FALSE ); +sal_Bool DitherBitmap( Bitmap& rBitmap, sal_Bool bDitherAlways = sal_False ); #endif // _SVIMBASE_HXX diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx index e02b98fab6..2bdf028db0 100644..100755 --- a/svx/inc/svx/svx3ditems.hxx +++ b/svx/inc/svx/svx3ditems.hxx @@ -71,14 +71,14 @@ public: class SVX_DLLPUBLIC Svx3DDoubleSidedItem : public SfxBoolItem { public: - Svx3DDoubleSidedItem(BOOL bVal = 0); + Svx3DDoubleSidedItem(sal_Bool bVal = 0); }; // #i28528# // Added extra Item (Bool) for chart2 to be able to show reduced line geometry class Svx3DReducedLineGeometryItem : public SfxBoolItem { public: - Svx3DReducedLineGeometryItem(BOOL bVal = 0); + Svx3DReducedLineGeometryItem(sal_Bool bVal = 0); virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; }; @@ -88,14 +88,14 @@ public: Svx3DNormalsKindItem(sal_uInt16 nVal = 0); // use drawing::NormalsKind - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; class Svx3DNormalsInvertItem : public SfxBoolItem { public: - SVX_DLLPUBLIC Svx3DNormalsInvertItem(BOOL bVal = 0); + SVX_DLLPUBLIC Svx3DNormalsInvertItem(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DTextureProjectionXItem : public SfxUInt16Item { @@ -103,8 +103,8 @@ public: Svx3DTextureProjectionXItem(sal_uInt16 nVal = 0); // use drawing::TextureProjectionMode - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -113,14 +113,14 @@ public: Svx3DTextureProjectionYItem(sal_uInt16 nVal = 0); // use drawing::TextureProjectionMode - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; class Svx3DShadow3DItem : public SfxBoolItem { public: - SVX_DLLPUBLIC Svx3DShadow3DItem(BOOL bVal = 0); + SVX_DLLPUBLIC Svx3DShadow3DItem(sal_Bool bVal = 0); }; class Svx3DMaterialColorItem : public SvxColorItem { @@ -148,8 +148,8 @@ public: Svx3DTextureKindItem(sal_uInt16 nVal = 3); // use drawing::TextureKind - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -158,14 +158,14 @@ public: Svx3DTextureModeItem(sal_uInt16 nVal = 2); // use drawing:TextureMode - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; class Svx3DTextureFilterItem : public SfxBoolItem { public: - SVX_DLLPUBLIC Svx3DTextureFilterItem(BOOL bVal = 0); + SVX_DLLPUBLIC Svx3DTextureFilterItem(sal_Bool bVal = 0); }; // Svx3D _3DSCENE_ Items @@ -174,8 +174,8 @@ public: Svx3DPerspectiveItem(sal_uInt16 nVal = (sal_uInt16)PR_PERSPECTIVE); // use drawing::ProjectionMode - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -191,7 +191,7 @@ public: class Svx3DTwoSidedLightingItem : public SfxBoolItem { public: - SVX_DLLPUBLIC Svx3DTwoSidedLightingItem(BOOL bVal = 0); + SVX_DLLPUBLIC Svx3DTwoSidedLightingItem(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightcolor1Item : public SvxColorItem { @@ -241,42 +241,42 @@ public: class SVX_DLLPUBLIC Svx3DLightOnOff1Item : public SfxBoolItem { public: - Svx3DLightOnOff1Item(BOOL bVal = 1); + Svx3DLightOnOff1Item(sal_Bool bVal = 1); }; class SVX_DLLPUBLIC Svx3DLightOnOff2Item : public SfxBoolItem { public: - Svx3DLightOnOff2Item(BOOL bVal = 0); + Svx3DLightOnOff2Item(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightOnOff3Item : public SfxBoolItem { public: - Svx3DLightOnOff3Item(BOOL bVal = 0); + Svx3DLightOnOff3Item(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightOnOff4Item : public SfxBoolItem { public: - Svx3DLightOnOff4Item(BOOL bVal = 0); + Svx3DLightOnOff4Item(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightOnOff5Item : public SfxBoolItem { public: - Svx3DLightOnOff5Item(BOOL bVal = 0); + Svx3DLightOnOff5Item(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightOnOff6Item : public SfxBoolItem { public: - Svx3DLightOnOff6Item(BOOL bVal = 0); + Svx3DLightOnOff6Item(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightOnOff7Item : public SfxBoolItem { public: - Svx3DLightOnOff7Item(BOOL bVal = 0); + Svx3DLightOnOff7Item(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightOnOff8Item : public SfxBoolItem { public: - Svx3DLightOnOff8Item(BOOL bVal = 0); + Svx3DLightOnOff8Item(sal_Bool bVal = 0); }; class SVX_DLLPUBLIC Svx3DLightDirection1Item : public SvxB3DVectorItem { @@ -329,8 +329,8 @@ public: Svx3DShadeModeItem(sal_uInt16 nVal = 2); // use drawing::ShadeMode - SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + SVX_DLLPRIVATE virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + SVX_DLLPRIVATE virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; }; @@ -338,7 +338,7 @@ public: // #107245# Item to replace bExtrudeSmoothed and bLatheSmoothed class Svx3DSmoothNormalsItem : public SfxBoolItem { public: - Svx3DSmoothNormalsItem(BOOL bVal = 1); + Svx3DSmoothNormalsItem(sal_Bool bVal = 1); virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; }; @@ -346,7 +346,7 @@ public: // #107245# Item to replace bExtrudeSmoothFrontBack and bLatheSmoothFrontBack class Svx3DSmoothLidsItem : public SfxBoolItem { public: - Svx3DSmoothLidsItem(BOOL bVal = 0); + Svx3DSmoothLidsItem(sal_Bool bVal = 0); virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; }; @@ -354,7 +354,7 @@ public: // #107245# Item to replace bExtrudeCharacterMode and bLatheCharacterMode class Svx3DCharacterModeItem : public SfxBoolItem { public: - Svx3DCharacterModeItem(BOOL bVal = 0); + Svx3DCharacterModeItem(sal_Bool bVal = 0); virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; }; @@ -362,7 +362,7 @@ public: // #107245# Item to replace bExtrudeCloseFront and bLatheCloseFront class SVX_DLLPUBLIC Svx3DCloseFrontItem : public SfxBoolItem { public: - Svx3DCloseFrontItem(BOOL bVal = 1); + Svx3DCloseFrontItem(sal_Bool bVal = 1); SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; }; @@ -370,7 +370,7 @@ public: // #107245# Item to replace bExtrudeCloseBack and bLatheCloseBack class SVX_DLLPUBLIC Svx3DCloseBackItem : public SfxBoolItem { public: - Svx3DCloseBackItem(BOOL bVal = 1); + Svx3DCloseBackItem(sal_Bool bVal = 1); SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nItemVersion) const; SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const; }; diff --git a/svx/inc/svx/svxcommands.h b/svx/inc/svx/svxcommands.h new file mode 100755 index 0000000000..01ff0bcd95 --- /dev/null +++ b/svx/inc/svx/svxcommands.h @@ -0,0 +1,604 @@ +/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef SVX_SVXCOMMANDS_HRC
+#define SVX_SVXCOMMANDS_HRC
+
+#define CMD_SID_INET_DLG ".uno:InternetDialog"
+#define CMD_SID_FM_RECORD_ABSOLUTE ".uno:AbsoluteRecord"
+#define CMD_SID_FM_ADD_FIELD ".uno:AddField"
+#define CMD_SID_FM_ADDTABLE ".uno:AddTable"
+#define CMD_SID_OBJECT_ALIGN_CENTER ".uno:AlignCenter"
+#define CMD_SID_OBJECT_ALIGN_DOWN ".uno:AlignDown"
+#define CMD_SID_OBJECT_ALIGN_LEFT ".uno:ObjectAlignLeft"
+#define CMD_SID_ATTR_PARA_ADJUST ".uno:Alignment"
+#define CMD_SID_OBJECT_ALIGN_MIDDLE ".uno:AlignMiddle"
+#define CMD_SID_OBJECT_ALIGN_RIGHT ".uno:ObjectAlignRight"
+#define CMD_SID_OBJECT_ALIGN_UP ".uno:AlignUp"
+#define CMD_SID_DRAW_ARC ".uno:Arc"
+#define CMD_SID_3D_ASSIGN ".uno:Assign3D"
+#define CMD_SID_FM_AUTOCONTROLFOCUS ".uno:AutoControlFocus"
+#define CMD_SID_FM_AUTOFILTER ".uno:AutoFilter"
+#define CMD_SID_AUTOFORMAT ".uno:AutoFormat"
+#define CMD_SID_TABLE_STYLE ".uno:TableStyle"
+#define CMD_SID_TABLE_STYLE_SETTINGS ".uno:TableStyleSettings"
+#define CMD_SID_TABLEDESIGN ".uno:TableDesign"
+#define CMD_SID_BACKGROUND_COLOR ".uno:BackgroundColor"
+#define CMD_SID_ATTR_BRUSH ".uno:BackgroundPattern"
+#define CMD_SID_BACKGROUND_PATTERN ".uno:BackgroundPatternController"
+#define CMD_SID_DRAW_BEZIER_NOFILL ".uno:Bezier_Unfilled"
+#define CMD_SID_BEZIER_APPEND ".uno:BezierAppend"
+#define CMD_SID_BEZIER_CLOSE ".uno:BezierClose"
+#define CMD_SID_BEZIER_CONVERT ".uno:BezierConvert"
+#define CMD_SID_BEZIER_CUTLINE ".uno:BezierCutLine"
+#define CMD_SID_BEZIER_DELETE ".uno:BezierDelete"
+#define CMD_SID_BEZIER_EDGE ".uno:BezierEdge"
+#define CMD_SID_BEZIER_ELIMINATE_POINTS ".uno:BezierEliminatePoints"
+#define CMD_SID_DRAW_BEZIER_FILL ".uno:BezierFill"
+#define CMD_SID_BEZIER_INSERT ".uno:BezierInsert"
+#define CMD_SID_BEZIER_MOVE ".uno:BezierMove"
+#define CMD_SID_BEZIER_SMOOTH ".uno:BezierSmooth"
+#define CMD_SID_BEZIER_SYMMTR ".uno:BezierSymmetric"
+#define CMD_SID_BEZIERTO ".uno:BezierTo"
+#define CMD_SID_BMPMASK ".uno:BmpMask"
+#define CMD_SID_BMPMASK_EXEC ".uno:BmpMaskExec"
+#define CMD_SID_BMPMASK_PIPETTE ".uno:BmpMaskPipette"
+#define CMD_SID_ATTR_CHAR_WEIGHT ".uno:Bold"
+#define CMD_SID_ATTR_CHAR_LATIN_WEIGHT ".uno:BoldLatin"
+#define CMD_SID_ATTR_CHAR_CJK_WEIGHT ".uno:BoldCJK"
+#define CMD_SID_ATTR_CHAR_CTL_WEIGHT ".uno:BoldCTL"
+#define CMD_SID_BORDER_OBJECT ".uno:Border"
+#define CMD_SID_ATTR_BORDER_INNER ".uno:BorderInner"
+#define CMD_SID_ATTR_BORDER_OUTER ".uno:BorderOuter"
+#define CMD_SID_ATTR_BORDER ".uno:SetBorderStyle"
+#define CMD_SID_FRAME_TO_TOP ".uno:BringToFront"
+#define CMD_SID_DRAW_CAPTION ".uno:DrawCaption"
+#define CMD_SID_ATTR_CHAR_CASEMAP ".uno:CaseMap"
+#define CMD_SID_ATTR_PARA_ADJUST_CENTER ".uno:CenterPara"
+#define CMD_SID_TRANSLITERATE_FULLWIDTH ".uno:ChangeCaseToFullWidth"
+#define CMD_SID_TRANSLITERATE_HALFWIDTH ".uno:ChangeCaseToHalfWidth"
+#define CMD_SID_TRANSLITERATE_HIRAGANA ".uno:ChangeCaseToHiragana"
+#define CMD_SID_TRANSLITERATE_KATAGANA ".uno:ChangeCaseToKatakana"
+#define CMD_SID_TRANSLITERATE_LOWER ".uno:ChangeCaseToLower"
+#define CMD_SID_TRANSLITERATE_UPPER ".uno:ChangeCaseToUpper"
+#define CMD_SID_FM_CHANGECONTROLTYPE ".uno:ChangeControlType"
+#define CMD_SID_ATTR_CHAR_FONT ".uno:CharFontName"
+#define CMD_SID_ATTR_CHAR_LATIN_FONT ".uno:CharFontNameLatin"
+#define CMD_SID_ATTR_CHAR_CJK_FONT ".uno:CharFontNameCJK"
+#define CMD_SID_ATTR_CHAR_CTL_FONT ".uno:CharFontNameCTL"
+#define CMD_SID_INSERT_CHECKBOX ".uno:Checkbox"
+#define CMD_SID_FM_CHECKBOX ".uno:CheckBox"
+#define CMD_SID_CHOOSE_CONTROLS ".uno:ChooseControls"
+#define CMD_SID_CHOOSE_POLYGON ".uno:ChoosePolygon"
+#define CMD_SID_DRAW_CIRCLE ".uno:Circle"
+#define CMD_SID_DRAW_CIRCLE_NOFILL ".uno:Circle_Unfilled"
+#define CMD_SID_DRAW_CIRCLEARC ".uno:CircleArc"
+#define CMD_SID_DRAW_CIRCLECUT ".uno:CircleCut"
+#define CMD_SID_DRAW_CIRCLECUT_NOFILL ".uno:CircleCut_Unfilled"
+#define CMD_SID_DRAW_CIRCLEPIE ".uno:CirclePie"
+#define CMD_SID_DRAW_CIRCLEPIE_NOFILL ".uno:CirclePie_Unfilled"
+#define CMD_SID_OUTLINE_DELETEALL ".uno:ClearOutline"
+#define CMD_SID_ATTR_CHAR_COLOR ".uno:Color"
+#define CMD_SID_COLOR_CONTROL ".uno:ColorControl"
+#define CMD_SID_FM_COMBOBOX ".uno:ComboBox"
+#define CMD_SID_FM_NAVIGATIONBAR ".uno:NavigationBar"
+#define CMD_SID_INSERT_COMBOBOX ".uno:Combobox"
+#define CMD_SID_FM_CONFIG ".uno:Config"
+#define CMD_SID_FM_MORE_CONTROLS ".uno:MoreControls"
+#define CMD_SID_FM_FORM_DESIGN_TOOLS ".uno:FormDesignTools"
+#define CMD_SID_CONTOUR_DLG ".uno:ContourDialog"
+#define CMD_SID_CONTOUR_EXEC ".uno:ContourExecute"
+#define CMD_SID_FM_CTL_PROPERTIES ".uno:ControlProperties"
+#define CMD_SID_FM_CONVERTTO_BUTTON ".uno:ConvertToButton"
+#define CMD_SID_FM_CONVERTTO_CHECKBOX ".uno:ConvertToCheckBox"
+#define CMD_SID_FM_CONVERTTO_COMBOBOX ".uno:ConvertToCombo"
+#define CMD_SID_FM_CONVERTTO_CURRENCY ".uno:ConvertToCurrency"
+#define CMD_SID_FM_CONVERTTO_DATE ".uno:ConvertToDate"
+#define CMD_SID_FM_CONVERTTO_EDIT ".uno:ConvertToEdit"
+#define CMD_SID_FM_CONVERTTO_FILECONTROL ".uno:ConvertToFileControl"
+#define CMD_SID_FM_CONVERTTO_FIXEDTEXT ".uno:ConvertToFixed"
+#define CMD_SID_FM_CONVERTTO_FORMATTED ".uno:ConvertToFormatted"
+#define CMD_SID_FM_CONVERTTO_SCROLLBAR ".uno:ConvertToScrollBar"
+#define CMD_SID_FM_CONVERTTO_SPINBUTTON ".uno:ConvertToSpinButton"
+#define CMD_SID_FM_CONVERTTO_GROUPBOX ".uno:ConvertToGroup"
+#define CMD_SID_FM_CONVERTTO_IMAGEBUTTON ".uno:ConvertToImageBtn"
+#define CMD_SID_FM_CONVERTTO_IMAGECONTROL ".uno:ConvertToImageControl"
+#define CMD_SID_FM_CONVERTTO_LISTBOX ".uno:ConvertToList"
+#define CMD_SID_FM_CONVERTTO_NUMERIC ".uno:ConvertToNumeric"
+#define CMD_SID_FM_CONVERTTO_PATTERN ".uno:ConvertToPattern"
+#define CMD_SID_FM_CONVERTTO_RADIOBUTTON ".uno:ConvertToRadio"
+#define CMD_SID_FM_CONVERTTO_TIME ".uno:ConvertToTime"
+#define CMD_SID_FM_CONVERTTO_NAVIGATIONBAR ".uno:ConvertToNavigationBar"
+#define CMD_SID_FM_COUNTALL ".uno:CountAll"
+#define CMD_SID_FM_CREATE_CONTROL ".uno:CreateControl"
+#define CMD_SID_INSERT_CURRENCYFIELD ".uno:InsertCurrencyField"
+#define CMD_SID_FM_CURRENCYFIELD ".uno:CurrencyField"
+#define CMD_SID_DASH ".uno:Dash"
+#define CMD_SID_INSERT_DATEFIELD ".uno:AddDateField"
+#define CMD_SID_FM_DATEFIELD ".uno:DateField"
+#define CMD_FN_NUM_BULLET_ON ".uno:DefaultBullet"
+#define CMD_SID_FM_RECORD_DELETE ".uno:DeleteRecord"
+#define CMD_SID_FM_DESIGN_MODE ".uno:SwitchControlDesignMode"
+#define CMD_SID_DISTRIBUTE_DLG ".uno:DistributeSelection"
+#define CMD_SID_DRAW_SELECT ".uno:DrawSelect"
+#define CMD_SID_INSERT_DRAW ".uno:InsertDraw"
+#define CMD_SID_DSBROWSER_EXPLORER ".uno:DSBrowserExplorer"
+#define CMD_SID_FM_EDIT ".uno:Edit"
+#define CMD_SID_INSERT_EDIT ".uno:InsertEdit"
+#define CMD_SID_DRAW_ELLIPSE ".uno:Ellipse"
+#define CMD_SID_DRAW_ELLIPSE_NOFILL ".uno:Ellipse_Unfilled"
+#define CMD_SID_DRAW_ELLIPSECUT ".uno:EllipseCut"
+#define CMD_SID_DRAW_ELLIPSECUT_NOFILL ".uno:EllipseCut_Unfilled"
+#define CMD_SID_ENTER_GROUP ".uno:EnterGroup"
+#define CMD_SID_ATTR_CHAR_ESCAPEMENT ".uno:Escapement"
+#define CMD_SID_FM_FIELDS_CONTROL ".uno:FieldController"
+#define CMD_SID_FM_FILECONTROL ".uno:FileControl"
+#define CMD_SID_INSERT_FILECONTROL ".uno:InsertFileControl"
+#define CMD_SID_INSERT_TREECONTROL ".uno:InsertTreeControl"
+#define CMD_SID_ATTR_FILL_BITMAP ".uno:FillBitmap"
+#define CMD_SID_ATTR_FILL_COLOR ".uno:FillColor"
+#define CMD_SID_ATTR_FILL_GRADIENT ".uno:FillGradient"
+#define CMD_SID_ATTR_FILL_HATCH ".uno:FillHatch"
+#define CMD_SID_ATTR_FILL_STYLE ".uno:FillStyle"
+#define CMD_SID_FM_FILTERCRIT ".uno:FilterCrit"
+#define CMD_SID_FM_RECORD_FIRST ".uno:FirstRecord"
+#define CMD_SID_ATTR_FLASH ".uno:Flash"
+#define CMD_SID_FM_FMEXPLORER_CONTROL ".uno:FmExplorerController"
+#define CMD_SID_FM_FILTER_NAVIGATOR_CONTROL ".uno:FmFilterNavigatorController"
+#define CMD_SID_CHAR_DLG ".uno:FontDialog"
+#define CMD_SID_ATTR_CHAR_FONTHEIGHT ".uno:FontHeight"
+#define CMD_SID_ATTR_CHAR_LATIN_FONTHEIGHT ".uno:FontHeighLatin"
+#define CMD_SID_ATTR_CHAR_CJK_FONTHEIGHT ".uno:FontHeightCJK"
+#define CMD_SID_ATTR_CHAR_CTL_FONTHEIGHT ".uno:FontHeightCTL"
+#define CMD_SID_FONTWORK ".uno:FontWork"
+#define CMD_SID_FORMTEXT_ADJUST ".uno:FontWorkTextAdjust"
+#define CMD_SID_FORMTEXT_STDFORM ".uno:FontWorkTextClearAttributes"
+#define CMD_SID_FORMTEXT_DISTANCE ".uno:FontWorkTextDistance"
+#define CMD_SID_FORMTEXT_MIRROR ".uno:FontWorkTextMirror"
+#define CMD_SID_FORMTEXT_OUTLINE ".uno:FontWorkTextOutline"
+#define CMD_SID_FORMTEXT_SHADOW ".uno:FontWorkTextShadow"
+#define CMD_SID_FORMTEXT_SHDWCOLOR ".uno:FontWorkTextShadowColor"
+#define CMD_SID_FORMTEXT_SHDWXVAL ".uno:FontWorkTextShadowXVal"
+#define CMD_SID_FORMTEXT_SHDWYVAL ".uno:FontWorkTextShadowYVal"
+#define CMD_SID_FORMTEXT_START ".uno:FontWorkTextStart"
+#define CMD_SID_FORMTEXT_STYLE ".uno:FontWorkTextStyle"
+#define CMD_SID_ATTRIBUTES_AREA ".uno:FormatArea"
+#define CMD_SID_FORMTEXT_HIDEFORM ".uno:FormatFontWorkClose"
+#define CMD_SID_GROUP ".uno:FormatGroup"
+#define CMD_SID_ATTRIBUTES_LINE ".uno:FormatLine"
+#define CMD_SID_FM_FORMATTEDFIELD ".uno:FormattedField"
+#define CMD_SID_FM_SCROLLBAR ".uno:ScrollBar"
+#define CMD_SID_FM_SPINBUTTON ".uno:SpinButton"
+#define CMD_SID_INSERT_FORMATTEDFIELD ".uno:InsertFormattedField"
+#define CMD_SID_UNGROUP ".uno:FormatUngroup"
+#define CMD_SID_FM_FILTER_START ".uno:FormFilter"
+#define CMD_SID_FM_FORM_FILTERED ".uno:FormFiltered"
+#define CMD_SID_FM_FILTER_EXECUTE ".uno:FormFilterExecute"
+#define CMD_SID_FM_FILTER_EXIT ".uno:FormFilterExit"
+#define CMD_SID_FM_FILTER_NAVIGATOR ".uno:FormFilterNavigator"
+#define CMD_SID_FM_PROPERTIES ".uno:FormProperties"
+#define CMD_SID_DRAW_FREELINE ".uno:Freeline"
+#define CMD_SID_DRAW_FREELINE_NOFILL ".uno:Freeline_Unfilled"
+#define CMD_SID_ATTR_AUTO_COLOR_INVALID ".uno:AutoColorInvalid"
+#define CMD_SID_GALLERY ".uno:Gallery"
+#define CMD_SID_GALLERY_ENABLE_ADDCOPY ".uno:GalleryEnableAddCopy"
+#define CMD_SID_GETREDOSTRINGS ".uno:GetRedoStrings"
+#define CMD_SID_GETUNDOSTRINGS ".uno:GetUndoStrings"
+#define CMD_SID_ATTR_GRAF_CROP ".uno:GrafAttrCrop"
+#define CMD_SID_ATTR_GRAF_BLUE ".uno:GrafBlue"
+#define CMD_SID_ATTR_GRAF_CONTRAST ".uno:GrafContrast"
+#define CMD_SID_ATTR_GRAF_GAMMA ".uno:GrafGamma"
+#define CMD_SID_ATTR_GRAF_GREEN ".uno:GrafGreen"
+#define CMD_SID_ATTR_GRAF_INVERT ".uno:GrafInvert"
+#define CMD_SID_ATTR_GRAF_LUMINANCE ".uno:GrafLuminance"
+#define CMD_SID_ATTR_GRAF_MODE ".uno:GrafMode"
+#define CMD_SID_ATTR_GRAF_RED ".uno:GrafRed"
+#define CMD_SID_ATTR_GRAF_TRANSPARENCE ".uno:GrafTransparence"
+#define CMD_SID_GRFFILTER_INVERT ".uno:GraphicFilterInvert"
+#define CMD_SID_GRFFILTER_MOSAIC ".uno:GraphicFilterMosaic"
+#define CMD_SID_GRFFILTER_POPART ".uno:GraphicFilterPopart"
+#define CMD_SID_GRFFILTER_POSTER ".uno:GraphicFilterPoster"
+#define CMD_SID_GRFFILTER_EMBOSS ".uno:GraphicFilterRelief"
+#define CMD_SID_GRFFILTER_REMOVENOISE ".uno:GraphicFilterRemoveNoise"
+#define CMD_SID_GRFFILTER_SEPIA ".uno:GraphicFilterSepia"
+#define CMD_SID_GRFFILTER_SHARPEN ".uno:GraphicFilterSharpen"
+#define CMD_SID_GRFFILTER_SMOOTH ".uno:GraphicFilterSmooth"
+#define CMD_SID_GRFFILTER_SOBEL ".uno:GraphicFilterSobel"
+#define CMD_SID_GRFFILTER_SOLARIZE ".uno:GraphicFilterSolarize"
+#define CMD_SID_GRFFILTER ".uno:GraphicFilterToolbox"
+#define CMD_SID_FM_DBGRID ".uno:Grid"
+#define CMD_SID_GRID_USE ".uno:GridUse"
+#define CMD_SID_GRID_VISIBLE ".uno:GridVisible"
+#define CMD_SID_OUTLINE_MAKE ".uno:Group"
+#define CMD_SID_FM_GROUPBOX ".uno:GroupBox"
+#define CMD_SID_INSERT_GROUPBOX ".uno:Groupbox"
+#define CMD_SID_RULER_LR_MIN_MAX ".uno:HeaderFooterBorder"
+#define CMD_SID_HELPLINES_MOVE ".uno:HelplinesMove"
+#define CMD_SID_INSERT_HFIXEDLINE ".uno:HFixedLine"
+#define CMD_SID_OUTLINE_HIDE ".uno:HideDetail"
+#define CMD_SID_INSERT_HSCROLLBAR ".uno:HScrollbar"
+#define CMD_SID_HYPERLINK_GETLINK ".uno:Hyperlink"
+#define CMD_SID_FM_IMAGEBUTTON ".uno:Imagebutton"
+#define CMD_SID_FM_IMAGECONTROL ".uno:ImageControl"
+#define CMD_SID_INSERT_IMAGECONTROL ".uno:InsertImageControl"
+#define CMD_SID_IMAP ".uno:ImageMapDialog"
+#define CMD_SID_IMAP_EXEC ".uno:ImageMapExecute"
+#define CMD_SID_3D_INIT ".uno:Init3D"
+#define CMD_SID_OBJECTRESIZE ".uno:InPlaceObjectResize"
+#define CMD_SID_ENTER_STRING ".uno:EnterString"
+#define CMD_SID_INSERT_POSTIT ".uno:InsertAnnotation"
+#define CMD_SID_SHOW_POSTIT ".uno:ShowAnnotations"
+#define CMD_SID_REPLYTO_POSTIT ".uno:ReplyToAnnotation"
+#define CMD_SID_DELETE_POSTIT ".uno:DeleteAnnotation"
+#define CMD_SID_DELETEALL_POSTIT ".uno:DeleteAllAnnotation"
+#define CMD_SID_DELETEALLBYAUTHOR_POSTIT ".uno:DeleteAllAnnotationByAuthor"
+#define CMD_SID_NEXT_POSTIT ".uno:NextAnnotation"
+#define CMD_SID_PREVIOUS_POSTIT ".uno:PreviousAnnotation"
+#define CMD_SID_INSERT_APPLET ".uno:InsertApplet"
+#define CMD_SID_GALLERY_FORMATS ".uno:InsertGalleryPic"
+#define CMD_SID_INSERT_GRAPHIC ".uno:InsertGraphic"
+#define CMD_SID_INSERT_IMAGE ".uno:InsertImage"
+#define CMD_SID_INSERT_MATH ".uno:InsertMath"
+#define CMD_SID_ATTR_INSERT ".uno:InsertMode"
+#define CMD_FN_NUM_NUMBERING_ON ".uno:DefaultNumbering"
+#define CMD_SID_INSERT_OBJECT ".uno:InsertObject"
+#define CMD_SID_INSERT_DIAGRAM ".uno:InsertObjectChart"
+#define CMD_SID_INSERT_PLUGIN ".uno:InsertPlugin"
+#define CMD_SID_INSERT_SOUND ".uno:InsertSound"
+#define CMD_SID_CHARMAP ".uno:InsertSymbol"
+#define CMD_SID_ATTR_TABLE ".uno:InsertSpreadsheet"
+#define CMD_SID_INSERT_TABLE ".uno:InsertTable"
+#define CMD_SID_INSERT_FRAME ".uno:InsertTextFrame"
+#define CMD_SID_INSERT_VIDEO ".uno:InsertVideo"
+#define CMD_SID_POLY_INTERSECT ".uno:Intersect"
+#define CMD_SID_ATTR_CHAR_POSTURE ".uno:Italic"
+#define CMD_SID_ATTR_CHAR_LATIN_POSTURE ".uno:ItalicLatin"
+#define CMD_SID_ATTR_CHAR_CJK_POSTURE ".uno:ItalicCJK"
+#define CMD_SID_ATTR_CHAR_CTL_POSTURE ".uno:ItalicCTL"
+#define CMD_SID_ATTR_PARA_ADJUST_BLOCK ".uno:JustifyPara"
+#define CMD_SID_INSERT_FIXEDTEXT ".uno:InsertFixedText"
+#define CMD_SID_FM_FIXEDTEXT ".uno:Label"
+#define CMD_SID_ATTR_CHAR_LANGUAGE ".uno:Language"
+#define CMD_SID_ATTR_CHAR_LATIN_LANGUAGE ".uno:LanguageLatin"
+#define CMD_SID_FM_RECORD_LAST ".uno:LastRecord"
+#define CMD_SID_FM_LEAVE_CREATE ".uno:LeaveFMCreateMode"
+#define CMD_SID_LEAVE_GROUP ".uno:LeaveGroup"
+#define CMD_SID_ATTR_PARA_ADJUST_LEFT ".uno:LeftPara"
+#define CMD_SID_ATTR_LRSPACE ".uno:LeftRightMargin"
+#define CMD_SID_ATTR_PARA_LRSPACE ".uno:LeftRightParaMargin"
+#define CMD_SID_ATTR_PARA_LRSPACE_VERTICAL ".uno:LeftRightParaMargin_Vertical"
+#define CMD_SID_DRAW_LINE ".uno:Line"
+#define CMD_SID_DRAW_XLINE ".uno:Line_Diagonal"
+#define CMD_SID_FRAME_LINECOLOR ".uno:FrameLineColor"
+#define CMD_SID_ATTR_LINE_DASH ".uno:LineDash"
+#define CMD_SID_ATTR_LINEEND_STYLE ".uno:LineEndStyle"
+#define CMD_SID_ATTR_PARA_LINESPACE ".uno:LineSpacing"
+#define CMD_SID_FRAME_LINESTYLE ".uno:LineStyle"
+#define CMD_SID_ATTR_LINE_WIDTH ".uno:LineWidth"
+#define CMD_SID_FM_LISTBOX ".uno:ListBox"
+#define CMD_SID_INSERT_LISTBOX ".uno:InsertListbox"
+#define CMD_SID_POLY_MERGE ".uno:Merge"
+#define CMD_SID_BASICIDE_NEWJAVAMODULE ".uno:NewJavaModule"
+#define CMD_SID_FM_RECORD_NEW ".uno:NewRecord"
+#define CMD_SID_FM_RECORD_NEXT ".uno:NextRecord"
+#define CMD_SID_FM_NUMERICFIELD ".uno:NumericField"
+#define CMD_SID_INSERT_NUMERICFIELD ".uno:InsertNumericField"
+#define CMD_SID_OBJECT_ALIGN ".uno:ObjectAlign"
+#define CMD_SID_FRAME_DOWN ".uno:ObjectBackOne"
+#define CMD_SID_FRAME_UP ".uno:ObjectForwardOne"
+#define CMD_SID_FM_OPEN_READONLY ".uno:OpenReadOnly"
+#define CMD_SID_FM_ORDERCRIT ".uno:OrderCrit"
+#define CMD_SID_ATTR_PARA_ORPHANS ".uno:Orphan"
+#define CMD_SID_OUTLINE_BULLET ".uno:OutlineBullet"
+#define CMD_SID_OUTLINE_COLLAPSE ".uno:OutlineCollapse"
+#define CMD_SID_OUTLINE_COLLAPSE_ALL ".uno:OutlineCollapseAll"
+#define CMD_SID_OUTLINE_DOWN ".uno:OutlineDown"
+#define CMD_SID_OUTLINE_EXPAND ".uno:OutlineExpand"
+#define CMD_SID_OUTLINE_EXPAND_ALL ".uno:OutlineExpandAll"
+#define CMD_SID_ATTR_CHAR_CONTOUR ".uno:OutlineFont"
+#define CMD_SID_OUTLINE_FORMAT ".uno:OutlineFormat"
+#define CMD_SID_OUTLINE_LEFT ".uno:OutlineLeft"
+#define CMD_SID_OUTLINE_RIGHT ".uno:OutlineRight"
+#define CMD_SID_OUTLINE_UP ".uno:OutlineUp"
+#define CMD_SID_ATTR_PARA_PAGEBREAK ".uno:Pagebreak"
+#define CMD_SID_ATTR_PAGE_PAPERBIN ".uno:PagePaperBin"
+#define CMD_SID_ATTR_PAGE_SIZE ".uno:AttributePageSize"
+#define CMD_SID_ATTR_PARA_MODEL ".uno:AttributeParaModel"
+#define CMD_SID_ATTR_PAGE ".uno:AttributePage"
+#define CMD_SID_ATTR_CHAR_AUTOKERN ".uno:PairKerning"
+#define CMD_SID_PARA_DLG ".uno:ParagraphDialog"
+#define CMD_SID_ATTR_PARA_KEEP ".uno:ParaKeepTogether"
+#define CMD_SID_ATTR_PARA_SPLIT ".uno:ParaSplit"
+#define CMD_SID_INSERT_PATTERNFIELD ".uno:InsertPatternField"
+#define CMD_SID_FM_PATTERNFIELD ".uno:PatternField"
+#define CMD_SID_DRAW_PIE ".uno:Pie"
+#define CMD_SID_DRAW_PIE_NOFILL ".uno:Pie_Unfilled"
+#define CMD_SID_POLY_FORMEN ".uno:PolyFormen"
+#define CMD_SID_DRAW_XPOLYGON ".uno:Polygon_Diagonal"
+#define CMD_SID_DRAW_XPOLYGON_NOFILL ".uno:Polygon_Diagonal_Unfilled"
+#define CMD_SID_DRAW_POLYGON_NOFILL ".uno:Polygon_Unfilled"
+#define CMD_SID_ATTR_POSITION ".uno:Position"
+#define CMD_SID_INSERT_PREVIEW ".uno:Preview"
+#define CMD_SID_FM_RECORD_PREV ".uno:PrevRecord"
+#define CMD_SID_INSERT_PROGRESSBAR ".uno:ProgressBar"
+#define CMD_SID_FM_PROPERTY_CONTROL ".uno:PropertyController"
+#define CMD_SID_FM_PUSHBUTTON ".uno:Pushbutton"
+#define CMD_SID_INSERT_PUSHBUTTON ".uno:InsertPushbutton"
+#define CMD_SID_INSERT_RADIOBUTTON ".uno:Radiobutton"
+#define CMD_SID_FM_RADIOBUTTON ".uno:RadioButton"
+#define CMD_SID_READONLY_MODE ".uno:ReadOnlyMode"
+#define CMD_SID_FM_RECORD_FROM_TEXT ".uno:RecFromText"
+#define CMD_SID_FM_RECORD_SAVE ".uno:RecSave"
+#define CMD_SID_FM_SEARCH ".uno:RecSearch"
+#define CMD_SID_DRAW_RECT ".uno:Rect"
+#define CMD_SID_DRAW_RECT_ROUND ".uno:Rect_Rounded"
+#define CMD_SID_DRAW_RECT_ROUND_NOFILL ".uno:Rect_Rounded_Unfilled"
+#define CMD_SID_DRAW_RECT_NOFILL ".uno:Rect_Unfilled"
+#define CMD_SID_FM_RECORD_TEXT ".uno:RecText"
+#define CMD_SID_FM_RECORD_TOTAL ".uno:RecTotal"
+#define CMD_SID_FM_RECORD_UNDO ".uno:RecUndo"
+#define CMD_SID_FM_REFRESH ".uno:Refresh"
+#define CMD_SID_FM_REFRESH_FORM_CONTROL ".uno:RefreshFormControl"
+#define CMD_SID_FM_FILTER_REMOVE ".uno:RemoveFilter"
+#define CMD_SID_FM_REMOVE_FILTER_SORT ".uno:RemoveFilterSort"
+#define CMD_FID_SEARCH_REPLACESET ".uno:ReplaceSet"
+#define CMD_SID_ATTR_PARA_ADJUST_RIGHT ".uno:RightPara"
+#define CMD_SID_RULER_BORDER_DISTANCE ".uno:RulerBorderDistance"
+#define CMD_SID_RULER_BORDERS ".uno:RulerBorders"
+#define CMD_SID_RULER_BORDERS_VERTICAL ".uno:RulerBordersVertical"
+#define CMD_SID_RULER_NULL_OFFSET ".uno:RulerNullOffset"
+#define CMD_SID_RULER_PAGE_POS ".uno:RulerPagePos"
+#define CMD_SID_RULER_PROTECT ".uno:RulerProtect"
+#define CMD_SID_FM_EXECUTE ".uno:SbaExecuteSql"
+#define CMD_SID_FM_NATIVESQL ".uno:SbaNativeSql"
+#define CMD_SID_SCAN ".uno:Scan"
+#define CMD_SID_SC_EDITOPTIONS ".uno:ScEditOptions"
+#define CMD_SID_SCH_EDITOPTIONS ".uno:SchEditOptions"
+#define CMD_SID_SD_EDITOPTIONS ".uno:SdEditOptions"
+#define CMD_SID_SD_GRAPHIC_OPTIONS ".uno:SdGraphicOptions"
+#define CMD_FID_SEARCH_OFF ".uno:SearchOff"
+#define CMD_FID_SEARCH_ON ".uno:SearchOn"
+#define CMD_FID_SEARCH_SEARCHSET ".uno:SearchSet"
+#define CMD_SID_SELECT ".uno:Select"
+#define CMD_SID_FRAME_TO_BOTTOM ".uno:SendToBack"
+#define CMD_SID_SET_DEFAULT ".uno:SetDefault"
+#define CMD_SID_HYPERLINK_SETLINK ".uno:SetHyperlink"
+#define CMD_SID_ATTR_PARA_HYPHENZONE ".uno:SetHyphenZone"
+#define CMD_SID_ATTR_LONG_LRSPACE ".uno:SetLongLeftRightMargin"
+#define CMD_SID_ATTR_LONG_ULSPACE ".uno:SetLongTopBottomMargin"
+#define CMD_SID_OBJECT_HELL ".uno:SetObjectToBackground"
+#define CMD_SID_OBJECT_HEAVEN ".uno:SetObjectToForeground"
+#define CMD_SID_ATTR_PAGE_MAXSIZE ".uno:SetPageMaxSize"
+#define CMD_SID_ATTR_BORDER_SHADOW ".uno:BorderShadow"
+#define CMD_SID_ATTR_FILL_SHADOW ".uno:FillShadow"
+#define CMD_SID_ATTR_CHAR_SHADOWED ".uno:Shadowed"
+#define CMD_SID_OUTLINE_SHOW ".uno:ShowDetail"
+#define CMD_SID_FM_SHOW_FMEXPLORER ".uno:ShowFmExplorer"
+#define CMD_SID_SHOW_ITEMBROWSER ".uno:ShowItemBrowser"
+#define CMD_SID_SHOW_PROPERTYBROWSER ".uno:ShowPropBrowser"
+#define CMD_SID_FM_SHOW_PROPERTIES ".uno:ShowProperties"
+#define CMD_SID_FM_SHOW_PROPERTY_BROWSER ".uno:ShowPropertyBrowser"
+#define CMD_SID_RULER ".uno:ShowRuler"
+#define CMD_SID_SIM_EDITOPTIONS ".uno:SimEditOptions"
+#define CMD_SID_ATTR_SIZE ".uno:Size"
+#define CMD_SID_SM_EDITOPTIONS ".uno:SmEditOptions"
+#define CMD_SID_FM_SORTDOWN ".uno:SortDown"
+#define CMD_SID_FM_SORTUP ".uno:Sortup"
+#define CMD_SID_ATTR_PARA_LINESPACE_10 ".uno:SpacePara1"
+#define CMD_SID_ATTR_PARA_LINESPACE_15 ".uno:SpacePara15"
+#define CMD_SID_ATTR_PARA_LINESPACE_20 ".uno:SpacePara2"
+#define CMD_SID_ATTR_CHAR_KERNING ".uno:Spacing"
+#define CMD_SID_AUTOSPELL_CHECK ".uno:SpellOnline"
+#define CMD_SID_INSERT_SPINBUTTON ".uno:Spinbutton"
+#define CMD_SID_DRAW_SQUARE ".uno:Square"
+#define CMD_SID_DRAW_SQUARE_ROUND ".uno:Square_Rounded"
+#define CMD_SID_DRAW_SQUARE_ROUND_NOFILL ".uno:Square_Rounded_Unfilled"
+#define CMD_SID_DRAW_SQUARE_NOFILL ".uno:Square_Unfilled"
+#define CMD_SID_3D_STATE ".uno:State3D"
+#define CMD_SID_ATTR_CHAR_STRIKEOUT ".uno:Strikeout"
+#define CMD_SID_SET_SUB_SCRIPT ".uno:SubScript"
+#define CMD_SID_POLY_SUBSTRACT ".uno:Substract"
+#define CMD_SID_SET_SUPER_SCRIPT ".uno:SuperScript"
+#define CMD_SID_SW_EDITOPTIONS ".uno:SwEditOptions"
+#define CMD_SID_FM_TAB_DIALOG ".uno:TabDialog"
+#define CMD_SID_ATTR_TABSTOP ".uno:Tabstops"
+#define CMD_SID_ATTR_TABSTOP_VERTICAL ".uno:TabstopsVertical"
+#define CMD_SID_DIALOG_TESTMODE ".uno:TestMode"
+#define CMD_SID_ATTR_CHAR ".uno:Text"
+#define CMD_SID_DRAW_TEXT ".uno:DrawText"
+#define CMD_SID_DRAW_TEXT_MARQUEE ".uno:Text_Marquee"
+#define CMD_SID_TEXTDIRECTION_LEFT_TO_RIGHT ".uno:TextdirectionLeftToRight"
+#define CMD_SID_TEXTDIRECTION_TOP_TO_BOTTOM ".uno:TextdirectionTopToBottom"
+#define CMD_SID_ATTR_TEXT_FITTOSIZE ".uno:TextFitToSize"
+#define CMD_SID_THESAURUS ".uno:ThesaurusDialog"
+#define CMD_SID_INSERT_TIMEFIELD ".uno:InsertTimeField"
+#define CMD_SID_FM_TIMEFIELD ".uno:TimeField"
+#define CMD_SID_BEZIER_EDIT ".uno:ToggleObjectBezierMode"
+#define CMD_SID_OBJECT_ROTATE ".uno:ToggleObjectRotateMode"
+#define CMD_SID_TEXTEDIT ".uno:ToolEdit"
+#define CMD_SID_OBJECT_SELECT ".uno:SelectObject"
+#define CMD_SID_ATTR_ULSPACE ".uno:TopBottomMargin"
+#define CMD_SID_ATTR_TRANSFORM ".uno:TransformDialog"
+#define CMD_SID_TWAIN_SELECT ".uno:TwainSelect"
+#define CMD_SID_TWAIN_TRANSFER ".uno:TwainTransfer"
+#define CMD_SID_ATTR_CHAR_UNDERLINE ".uno:Underline"
+#define CMD_SID_ATTR_CHAR_OVERLINE ".uno:Overline"
+#define CMD_SID_OUTLINE_REMOVE ".uno:Ungroup"
+#define CMD_SID_INSERT_URLBUTTON ".uno:URLButton"
+#define CMD_SID_FM_USE_WIZARDS ".uno:UseWizards"
+#define CMD_SID_DRAW_CAPTION_VERTICAL ".uno:VerticalCaption"
+#define CMD_SID_DRAW_TEXT_VERTICAL ".uno:VerticalText"
+#define CMD_SID_INSERT_VFIXEDLINE ".uno:VFixedLine"
+#define CMD_SID_FM_VIEW_AS_GRID ".uno:ViewFormAsGrid"
+#define CMD_SID_INSERT_VSCROLLBAR ".uno:VScrollbar"
+#define CMD_SID_ATTR_PARA_WIDOWS ".uno:Widow"
+#define CMD_SID_3D_WIN ".uno:Window3D"
+#define CMD_SID_ATTR_CHAR_WORDLINEMODE ".uno:WordMode"
+#define CMD_SID_ATTR_LINE_COLOR ".uno:XLineColor"
+#define CMD_SID_ATTR_LINE_STYLE ".uno:XLineStyle"
+#define CMD_SID_ATTR_ZOOM ".uno:Zoom"
+#define CMD_SID_SIZE_REAL ".uno:Zoom100Percent"
+#define CMD_SID_SIZE_OPTIMAL ".uno:ZoomObjects"
+#define CMD_SID_SIZE_ALL ".uno:ZoomOptimal"
+#define CMD_SID_SIZE_PAGE ".uno:ZoomPage"
+#define CMD_SID_SIZE_PAGE_WIDTH ".uno:ZoomPageWidth"
+#define CMD_SID_SIZE_VISAREA ".uno:ZoomVisArea"
+#define CMD_SID_FM_GRABCONTROLFOCUS ".uno:GrabControlFocus"
+#define CMD_SID_FM_CREATE_FIELDCONTROL ".uno:CreateFieldControl"
+#define CMD_SID_INSERT_SELECT ".uno:SelectMode"
+#define CMD_SID_PARA_VERTALIGN ".uno:VerticalParagraphAlignment"
+#define CMD_SID_ATTR_CHAR_RELIEF ".uno:CharacterRelief"
+#define CMD_SID_ATTR_BRUSH_CHAR ".uno:CharacterBackgroundPattern"
+#define CMD_SID_ATTR_CHAR_ROTATED ".uno:CharacterRotation"
+#define CMD_SID_ATTR_CHAR_SCALEWIDTH ".uno:CharacterWidthScalingFactor"
+#define CMD_SID_ATTR_NUMBERFORMAT_VALUE ".uno:NumberFormatValue"
+#define CMD_SID_ATTR_ALIGN_HOR_JUSTIFY ".uno:HorizontalJustification"
+#define CMD_SID_ATTR_ALIGN_VER_JUSTIFY ".uno:VerticalJustification"
+#define CMD_SID_ATTR_ALIGN_INDENT ".uno:AlignmentIndent"
+#define CMD_SID_ATTR_ALIGN_HYPHENATION ".uno:AlignmentHyphenation"
+#define CMD_SID_ATTR_ALIGN_DEGREES ".uno:AlignmentRotation"
+#define CMD_SID_ATTR_ALIGN_LOCKPOS ".uno:AlignmentRotationMode"
+#define CMD_SID_ATTR_ALIGN_MARGIN ".uno:AlignmentMargin"
+#define CMD_SID_ATTR_ALIGN_STACKED ".uno:AlignmentStacked"
+#define CMD_SID_ATTR_PARA_LEFT_TO_RIGHT ".uno:ParaLeftToRight"
+#define CMD_SID_ATTR_PARA_RIGHT_TO_LEFT ".uno:ParaRightToLeft"
+#define CMD_SID_RULER_TEXT_RIGHT_TO_LEFT ".uno:TextRTL"
+#define CMD_SID_OPEN_HYPERLINK ".uno:OpenHyperlinkOnCursor"
+#define CMD_SID_CTLFONT_STATE ".uno:CTLFontState"
+#define CMD_SID_VERTICALTEXT_STATE ".uno:VerticalTextState"
+#define CMD_SID_OPEN_XML_FILTERSETTINGS ".uno:OpenXMLFilterSettings"
+#define CMD_SID_HANGUL_HANJA_CONVERSION ".uno:HangulHanjaConversion"
+#define CMD_SID_CHINESE_CONVERSION ".uno:ChineseConversion"
+#define CMD_SID_SPELL_DIALOG ".uno:SpellDialog"
+#define CMD_SID_RULER_ROWS ".uno:RulerRows"
+#define CMD_SID_RULER_ROWS_VERTICAL ".uno:RulerRowsVertical"
+#define CMD_SID_ATTR_CHAR_FONTLIST ".uno:FontNameList"
+#define CMD_SID_EXTRUSION_TOOGLE ".uno:ExtrusionToggle"
+#define CMD_SID_EXTRUSION_TILT_DOWN ".uno:ExtrusionTiltDown"
+#define CMD_SID_EXTRUSION_TILT_UP ".uno:ExtrusionTiltUp"
+#define CMD_SID_EXTRUSION_TILT_LEFT ".uno:ExtrusionTiltLeft"
+#define CMD_SID_EXTRUSION_TILT_RIGHT ".uno:ExtrusionTiltRight"
+#define CMD_SID_EXTRUSION_DEPTH_FLOATER ".uno:ExtrusionDepthFloater"
+#define CMD_SID_EXTRUSION_DEPTH_DIALOG ".uno:ExtrusionDepthDialog"
+#define CMD_SID_EXTRUSION_DIRECTION_FLOATER ".uno:ExtrusionDirectionFloater"
+#define CMD_SID_EXTRUSION_LIGHTING_FLOATER ".uno:ExtrusionLightingFloater"
+#define CMD_SID_EXTRUSION_SURFACE_FLOATER ".uno:ExtrusionSurfaceFloater"
+#define CMD_SID_EXTRUSION_3D_COLOR ".uno:Extrusion3DColor"
+#define CMD_SID_EXTRUSION_DEPTH ".uno:ExtrusionDepth"
+#define CMD_SID_EXTRUSION_DIRECTION ".uno:ExtrusionDirection"
+#define CMD_SID_EXTRUSION_PROJECTION ".uno:ExtrusionProjection"
+#define CMD_SID_EXTRUSION_LIGHTING_DIRECTION ".uno:ExtrusionLightingDirection"
+#define CMD_SID_EXTRUSION_LIGHTING_INTENSITY ".uno:ExtrusionLightingIntensity"
+#define CMD_SID_EXTRUSION_SURFACE ".uno:ExtrusionSurface"
+#define CMD_SID_FONTWORK_GALLERY_FLOATER ".uno:FontworkGalleryFloater"
+#define CMD_SID_FONTWORK_SHAPE_TYPE ".uno:FontworkShapeType"
+#define CMD_SID_FONTWORK_SAME_LETTER_HEIGHTS ".uno:FontworkSameLetterHeights"
+#define CMD_SID_FONTWORK_ALIGNMENT_FLOATER ".uno:FontworkAlignmentFloater"
+#define CMD_SID_FONTWORK_CHARACTER_SPACING_FLOATER ".uno:FontworkCharacterSpacingFloater"
+#define CMD_SID_FONTWORK_SHAPE ".uno:FontworkShape"
+#define CMD_SID_FONTWORK_ALIGNMENT ".uno:FontworkAlignment"
+#define CMD_SID_FONTWORK_CHARACTER_SPACING ".uno:FontworkCharacterSpacing"
+#define CMD_SID_FONTWORK_CHARACTER_SPACING_DIALOG ".uno:FontworkCharacterSpacingDialog"
+#define CMD_SID_FONTWORK_KERN_CHARACTER_PAIRS ".uno:FontworkKernCharacterPairs"
+#define CMD_SID_GET_COLORTABLE ".uno:GetColorTable"
+#define CMD_SID_SPELLCHECKER_CHANGED ".uno:SpellCheckerChanged"
+#define CMD_SID_ATTR_YEAR2000 ".uno:Year2000"
+#define CMD_SID_INC_INDENT ".uno:IncrementIndent"
+#define CMD_SID_DEC_INDENT ".uno:DecrementIndent"
+#define CMD_SID_TABLE_CELL ".uno:StateTableCell"
+#define CMD_SID_OUTLINE_TO_IMPRESS ".uno:SendOutlineToImpress"
+#define CMD_SID_ATTR_DEFTABSTOP ".uno:DefTabStop"
+#define CMD_SID_ATTR_LANGUAGE ".uno:DocumentLanguage"
+#define CMD_SID_ATTR_CHAR_CJK_LANGUAGE ".uno:DocumentLanguageCJK"
+#define CMD_SID_ATTR_CHAR_CTL_LANGUAGE ".uno:DocumentLanguageCTL"
+#define CMD_SID_OPT_LOCALE_CHANGED ".uno:OptionsLocaleChanged"
+#define CMD_SID_SBA_BRW_INSERT ".uno:SbaBrwInsert"
+#define CMD_SID_DRAWTBX_CS_BASIC ".uno:BasicShapes"
+#define CMD_SID_DRAWTBX_CS_SYMBOL ".uno:SymbolShapes"
+#define CMD_SID_DRAWTBX_CS_ARROW ".uno:ArrowShapes"
+#define CMD_SID_DRAWTBX_CS_FLOWCHART ".uno:FlowChartShapes"
+#define CMD_SID_DRAWTBX_CS_CALLOUT ".uno:CalloutShapes"
+#define CMD_SID_DRAWTBX_CS_STAR ".uno:StarShapes"
+#define CMD_SID_DRAW_CS_ID ".uno:CustomShape"
+#define CMD_SID_DASH_LIST ".uno:DashListState"
+#define CMD_SID_LINEEND_LIST ".uno:LineEndListState"
+#define CMD_SID_COLOR_TABLE ".uno:ColorTableState"
+#define CMD_SID_GRADIENT_LIST ".uno:GradientListState"
+#define CMD_SID_HATCH_LIST ".uno:HatchListState"
+#define CMD_SID_BITMAP_LIST ".uno:BitmapListState"
+#define CMD_SID_ATTR_CHAR_EMPHASISMARK ".uno:EmphasisMark"
+#define CMD_SID_FM_SHOW_DATANAVIGATOR ".uno:ShowDataNavigator"
+#define CMD_SID_FM_DATANAVIGATOR_CONTROL ".uno:FmDataNavigatorController"
+#define CMD_SID_ALIGN_ANY_LEFT ".uno:CommonAlignLeft"
+#define CMD_SID_ALIGN_ANY_HCENTER ".uno:CommonAlignHorizontalCenter"
+#define CMD_SID_ALIGN_ANY_RIGHT ".uno:CommonAlignRight"
+#define CMD_SID_ALIGN_ANY_JUSTIFIED ".uno:CommonAlignJustified"
+#define CMD_SID_ALIGN_ANY_TOP ".uno:CommonAlignTop"
+#define CMD_SID_ALIGN_ANY_VCENTER ".uno:CommonAlignVerticalCenter"
+#define CMD_SID_ALIGN_ANY_BOTTOM ".uno:CommonAlignBottom"
+#define CMD_SID_ALIGN_ANY_HDEFAULT ".uno:CommonAlignHorizontalDefault"
+#define CMD_SID_ALIGN_ANY_VDEFAULT ".uno:CommonAlignVerticalDefault"
+#define CMD_SID_AVMEDIA_TOOLBOX ".uno:AVMediaToolBox"
+#define CMD_SID_BORDER_REDUCED_MODE ".uno:BorderReducedMode"
+#define CMD_SID_COLOR_SETTINGS ".uno:ColorSettings"
+#define CMD_SID_MAIL_EXPORT_FINISHED ".uno:MailExportFinished"
+#define CMD_SID_INSERT_ZWSP ".uno:InsertZWSP"
+#define CMD_SID_INSERT_ZWNBSP ".uno:InsertZWNBSP"
+#define CMD_SID_INSERT_LRM ".uno:InsertLRM"
+#define CMD_SID_INSERT_RLM ".uno:InsertRLM"
+#define CMD_FN_INSERT_SOFT_HYPHEN ".uno:InsertSoftHyphen"
+#define CMD_FN_INSERT_HARDHYPHEN ".uno:InsertHardHyphen"
+#define CMD_FN_INSERT_HARD_SPACE ".uno:InsertNonBreakingSpace"
+#define CMD_SID_BASICIDE_MANAGE_LANG ".uno:ManageLanguage"
+#define CMD_SID_BASICIDE_CURRENT_LANG ".uno:CurrentLanguage"
+#define CMD_SID_TABLE_MERGE_CELLS ".uno:MergeCells"
+#define CMD_SID_TABLE_SPLIT_CELLS ".uno:SplitCell"
+#define CMD_SID_OPTIMIZE_TABLE ".uno:OptimizeTable"
+#define CMD_SID_TABLE_VERT_BOTTOM ".uno:CellVertBottom"
+#define CMD_SID_TABLE_VERT_CENTER ".uno:CellVertCenter"
+#define CMD_SID_TABLE_VERT_NONE ".uno:CellVertTop"
+#define CMD_SID_TABLE_INSERT_ROW ".uno:InsertRows"
+#define CMD_SID_TABLE_INSERT_COL ".uno:InsertColumns"
+#define CMD_SID_TABLE_DELETE_ROW ".uno:DeleteRows"
+#define CMD_SID_TABLE_DELETE_COL ".uno:DeleteColumns"
+#define CMD_SID_TABLE_SELECT_ALL ".uno:SelectTable"
+#define CMD_SID_TABLE_SELECT_COL ".uno:EntireColumn"
+#define CMD_SID_TABLE_SELECT_ROW ".uno:EntireRow"
+#define CMD_SID_FORMAT_TABLE_DLG ".uno:TableDialog"
+#define CMD_SID_TABLE_AUTOSUM ".uno:AutoSum"
+#define CMD_SID_TABLE_SORT_DIALOG ".uno:TableSort"
+#define CMD_SID_OPEN_SMARTTAGMENU ".uno:OpenSmartTagMenuOnCursor"
+#define CMD_SID_ATTR_ZOOMSLIDER ".uno:ZoomSlider"
+#define CMD_SID_FONTNAMELIST ".uno:FontNameStringList"
+#define CMD_SID_LANGUAGE_STATUS ".uno:LanguageStatus"
+#define CMD_SID_CHAR_DLG_FOR_PARAGRAPH ".uno:FontDialogForParagraph"
+#define CMD_SID_GROW_FONT_SIZE ".uno:Grow"
+#define CMD_SID_SHRINK_FONT_SIZE ".uno:Shrink"
+#define CMD_SID_RECHECK_DOCUMENT ".uno:RecheckDocument"
+#define CMD_SID_TABLE_INSERT_COL_DLG ".uno:InsertColumnDialog"
+#define CMD_SID_TABLE_INSERT_ROW_DLG ".uno:InsertRowDialog"
+
+#endif
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index 2024e4e46c..1858d1ee27 100644..100755 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -52,7 +52,7 @@ namespace linguistic2{ }}}} class SvxSpellWrapper; //add for SvxSpellCheckDialog typedef SfxTabPage* (*CreateSvxDistributePage)(Window *pParent, const SfxItemSet &rAttrSet, SvxDistributeHorizontal eHor, SvxDistributeVertical eVer); -typedef USHORT* (*DialogGetRanges)(); +typedef sal_uInt16* (*DialogGetRanges)(); struct ExchangeData; class INetURLObject; @@ -87,8 +87,8 @@ class AbstractFmShowColsDialog : public VclAbstractDialog //add for FmShowColsDi class AbstractSvxZoomDialog : public VclAbstractDialog //add for SvxZoomDialog { public: - virtual void SetLimits( USHORT nMin, USHORT nMax ) = 0; - virtual void HideButton( USHORT nBtnId )= 0; + virtual void SetLimits( sal_uInt16 nMin, sal_uInt16 nMax ) = 0; + virtual void HideButton( sal_uInt16 nBtnId )= 0; virtual const SfxItemSet* GetOutputItemSet() const = 0 ; }; @@ -128,7 +128,7 @@ public: class AbstractGalleryIdDialog :public VclAbstractDialog //add for GalleryIdDialog { public: - virtual ULONG GetId() const =0; + virtual sal_uIntPtr GetId() const =0; }; class AbstractURLDlg :public VclAbstractDialog //add for URLDlg @@ -144,17 +144,17 @@ public: class AbstractSvxHlinkDlgMarkWnd :public VclAbstractDialog //add for SvxHlinkDlgMarkWnd { public: - virtual BOOL MoveTo ( Point aNewPos )const = 0; - virtual BOOL ConnectToDialog( BOOL bDoit = TRUE )const = 0; + virtual sal_Bool MoveTo ( Point aNewPos )const = 0; + virtual sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True )const = 0; virtual void RefreshTree ( String aStrURL ) = 0; virtual void SelectEntry ( String aStrMark ) = 0; - virtual USHORT SetError( USHORT nError) = 0; + virtual sal_uInt16 SetError( sal_uInt16 nError) = 0; // in class Window virtual void SetSizePixel( const Size& rNewSize ) = 0; virtual Size GetSizePixel() const = 0; - virtual void Hide( USHORT nFlags = 0 ) = 0; - virtual BOOL IsVisible() const = 0; - virtual void Invalidate( USHORT nFlags = 0 ) = 0; + virtual void Hide( sal_uInt16 nFlags = 0 ) = 0; + virtual sal_Bool IsVisible() const = 0; + virtual void Invalidate( sal_uInt16 nFlags = 0 ) = 0; }; class AbstractSvxSearchFormatDialog : public SfxAbstractTabDialog //for SvxSearchFormatDialog @@ -168,16 +168,16 @@ public: class AbstractSvxSearchSimilarityDialog :public VclAbstractDialog //add for SvxSearchSimilarityDialog { public: - virtual USHORT GetOther() =0 ; - virtual USHORT GetShorter() =0 ; - virtual USHORT GetLonger() =0 ; - virtual BOOL IsRelaxed() =0 ; + virtual sal_uInt16 GetOther() =0 ; + virtual sal_uInt16 GetShorter() =0 ; + virtual sal_uInt16 GetLonger() =0 ; + virtual sal_Bool IsRelaxed() =0 ; }; class AbstractSvxJSearchOptionsDialog :public VclAbstractDialog //add for SvxJSearchOptionsDialog { public: - virtual INT32 GetTransliterationFlags() const = 0; + virtual sal_Int32 GetTransliterationFlags() const = 0; }; class AbstractFmInputRecordNoDialog :public VclAbstractDialog //add for FmInputRecordNoDialog @@ -198,9 +198,9 @@ class AbstractSvxNameDialog :public VclAbstractDialog //add for SvxNameDialog public: virtual void GetName( String& rName ) = 0; virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) = 0; - virtual void SetEditHelpId(ULONG nHelpId) = 0; + virtual void SetEditHelpId(const rtl::OString&) = 0; //from class Window - virtual void SetHelpId( ULONG nHelpId ) = 0; + virtual void SetHelpId( const rtl::OString& ) = 0; virtual void SetText( const XubString& rStr ) = 0; }; @@ -226,7 +226,7 @@ public: class AbstractSvxMessDialog :public VclAbstractDialog //add for SvxMessDialog { public: - virtual void SetButtonText( USHORT nBtnId, const String& rNewTxt ) = 0; + virtual void SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt ) = 0; }; class AbstractSvxMultiPathDialog :public VclAbstractDialog //add for SvxMultiPathDialog @@ -246,7 +246,7 @@ public: //from SvxMultiPathDialog virtual void SetClassPathMode() = 0; //From Class Window - virtual void SetHelpId( ULONG nHelpId ) = 0; + virtual void SetHelpId( const rtl::OString& ) = 0; }; class AbstractSvxHpLinkDlg : public VclAbstractDialog //add for SvxHpLinkDlg @@ -295,14 +295,14 @@ public: virtual const SfxItemSet* GetOutputItemSet() const = 0; virtual void SetPrevHdl( const Link& rLink ) = 0; virtual void SetNextHdl( const Link& rLink ) = 0; - virtual void EnableTravel(BOOL bNext, BOOL bPrev) = 0; + virtual void EnableTravel(sal_Bool bNext, sal_Bool bPrev) = 0; virtual String GetNote() = 0; virtual void SetNote(const String& rTxt) = 0; virtual void ShowLastAuthor(const String& rAuthor, const String& rDate) = 0; virtual void DontChangeAuthor() = 0; virtual void HideAuthor() = 0; - virtual void SetReadonlyPostIt(BOOL bDisable) = 0; - virtual BOOL IsOkEnabled() const = 0; + virtual void SetReadonlyPostIt(sal_Bool bDisable) = 0; + virtual sal_Bool IsOkEnabled() const = 0; virtual Window * GetWindow() = 0; }; @@ -349,7 +349,7 @@ public: virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, const SdrView* pView, - USHORT nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog + sal_uInt16 nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, @@ -357,7 +357,7 @@ public: SvxDistributeVertical eVer = SvxDistributeVerticalNone)= 0; virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0; - + virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog const SfxItemSet& rCoreSet )=0; @@ -388,19 +388,19 @@ public: sal_uInt32 nResId) = 0; virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, //add for SvxSearchAttributeDialog SearchAttrItemList& rLst, - const USHORT* pWhRanges)=0; + const sal_uInt16* pWhRanges)=0; virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent, //add for SvxSearchSimilarityDialog - BOOL bRelax, - USHORT nOther, - USHORT nShorter, - USHORT nLonger ) = 0; + sal_Bool bRelax, + sal_uInt16 nOther, + sal_uInt16 nShorter, + sal_uInt16 nLonger ) = 0; virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg const SfxItemSet& rCoreSet, - BOOL bEnableSelector = FALSE) = 0; + sal_Bool bEnableSelector = sal_False) = 0; virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog const SfxItemSet* pAttr, const SdrView* pView, - USHORT nAnchorTypes = 0) = 0; + sal_uInt16 nAnchorTypes = 0) = 0; virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, //add for SchTransformTabDialog const SfxItemSet* pAttr, const SdrView* pSdrView, @@ -409,7 +409,7 @@ public: )=0; virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent, const SfxItemSet& rOptionsSet, - INT32 nInitialFlags )=0; + sal_Int32 nInitialFlags )=0; virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) = 0; virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl, @@ -429,8 +429,8 @@ public: const String& rText, const String& rDesc, Image* pImg = NULL ) = 0; //add for SvxMessDialog - virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiPathDialog - virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiFileDialog + virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ; //add for SvxMultiPathDialog + virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ) = 0 ; //add for SvxMultiFileDialog virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, //add for SvxMultiFileDialog SfxBindings* pBindings, sal_uInt32 nResId)=0; @@ -444,14 +444,14 @@ public: RECT_POINT eLightSource, sal_uInt32 nResId )=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia const Graphic& rGraphic, - USHORT nCount, + sal_uInt16 nCount, sal_uInt32 nResId)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize const Graphic& rGraphic, - BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId)=0; + sal_uInt8 nGreyThreshold, sal_Bool bInvert, sal_uInt32 nResId)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic const Graphic& rGraphic, - USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId)=0; + sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges, sal_uInt32 nResId)=0; virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog const SfxItemSet* pAttr, SdrModel* pModel, @@ -459,7 +459,7 @@ public: virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog SdrModel* pModel, const SdrObject* pObj = NULL, - BOOL bHasObj = TRUE )=0; + sal_Bool bHasObj = sal_True )=0; virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0; virtual SfxAbstractDialog* CreateSfxDialog( Window* pParent, //add for SvxMeasureDialog & SvxConnectionDialog const SfxItemSet& rAttr, @@ -473,16 +473,16 @@ public: )=0; virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog const SfxItemSet& rCoreSet, - BOOL bPrevNext = FALSE, BOOL bRedline = FALSE )=0; + sal_Bool bPrevNext = sal_False, sal_Bool bRedline = sal_False )=0; virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage ) = 0; virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc() = 0; // add for SvxDistributePage - virtual DialogGetRanges GetDialogGetRangesFunc( USHORT nId ) = 0; //add for SvxPostItDialog + virtual DialogGetRanges GetDialogGetRangesFunc( sal_uInt16 nId ) = 0; //add for SvxPostItDialog virtual AbstractScriptSelectorDialog* CreateScriptSelectorDialog( Window* pParent, - BOOL bShowSlots, + sal_Bool bShowSlots, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame ) = 0; @@ -502,8 +502,8 @@ public: virtual SvxAbstractSplittTableDialog* CreateSvxSplittTableDialog( Window* pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )=0; virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) = 0; - - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ) = 0; + + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) = 0; }; #endif diff --git a/svx/inc/svx/svxdllapi.h b/svx/inc/svx/svxdllapi.h index ad39812fc4..ad39812fc4 100644..100755 --- a/svx/inc/svx/svxdllapi.h +++ b/svx/inc/svx/svxdllapi.h diff --git a/svx/inc/svxerr.hxx b/svx/inc/svx/svxerr.hxx index eef4adafca..eef4adafca 100644..100755 --- a/svx/inc/svxerr.hxx +++ b/svx/inc/svx/svxerr.hxx diff --git a/svx/inc/svxgrahicitem.hxx b/svx/inc/svx/svxgrahicitem.hxx index 03fe3a6abc..748e5b8332 100644..100755 --- a/svx/inc/svxgrahicitem.hxx +++ b/svx/inc/svx/svxgrahicitem.hxx @@ -41,7 +41,7 @@ class SVX_DLLPUBLIC SvxGraphicItem: public SfxPoolItem public: TYPEINFO(); SvxGraphicItem(); - SvxGraphicItem( USHORT nWhich ,const Graphic& rGraphic); + SvxGraphicItem( sal_uInt16 nWhich ,const Graphic& rGraphic); SvxGraphicItem( const SvxGraphicItem& ); diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc index 8a1a2cd3d6..8a1a2cd3d6 100644..100755 --- a/svx/inc/svx/svxitems.hrc +++ b/svx/inc/svx/svxitems.hrc diff --git a/svx/inc/swframeexample.hxx b/svx/inc/svx/swframeexample.hxx index 543a5575a3..f161be7421 100644..100755 --- a/svx/inc/swframeexample.hxx +++ b/svx/inc/svx/swframeexample.hxx @@ -66,7 +66,7 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public Window short nWrap; short nAnchor; - BOOL bTrans; + sal_Bool bTrans; Point aRelPos; @@ -84,7 +84,7 @@ public: SvxSwFrameExample(Window* pParent, const ResId& rResID); ~SvxSwFrameExample(); - inline void SetWrap(USHORT nW) { nWrap = nW; } + inline void SetWrap(sal_uInt16 nW) { nWrap = nW; } inline void SetHAlign(short nH) { nHAlign = nH; } inline void SetHoriRel(short nR) { nHRel = nR; } @@ -92,7 +92,7 @@ public: inline void SetVAlign(short nV) { nVAlign = nV; } inline void SetVertRel(short nR) { nVRel = nR; } - inline void SetTransparent(BOOL bT) { bTrans = bT; } + inline void SetTransparent(sal_Bool bT) { bTrans = bT; } inline void SetAnchor(short nA) { nAnchor = nA; } void SetRelPos(const Point& rP); diff --git a/svx/inc/swframeposstrings.hxx b/svx/inc/svx/swframeposstrings.hxx index 71fe439ef8..71fe439ef8 100644..100755 --- a/svx/inc/swframeposstrings.hxx +++ b/svx/inc/svx/swframeposstrings.hxx diff --git a/svx/inc/swframevalidation.hxx b/svx/inc/svx/swframevalidation.hxx index ded6a1cda4..ded6a1cda4 100644..100755 --- a/svx/inc/swframevalidation.hxx +++ b/svx/inc/svx/swframevalidation.hxx diff --git a/svx/inc/svx/sxallitm.hxx b/svx/inc/svx/sxallitm.hxx index da6b6ac7b3..da6b6ac7b3 100644..100755 --- a/svx/inc/svx/sxallitm.hxx +++ b/svx/inc/svx/sxallitm.hxx diff --git a/svx/inc/svx/sxcaitm.hxx b/svx/inc/svx/sxcaitm.hxx index da4c5b3670..9b6dd2a2e0 100644..100755 --- a/svx/inc/svx/sxcaitm.hxx +++ b/svx/inc/svx/sxcaitm.hxx @@ -35,12 +35,12 @@ //------------------------------------ // class SdrCaptionFixedAngleItem -// TRUE=Winkel durch SdrCaptionAngleItem vorgegeben -// FALSE=Freier Winkel +// sal_True=Winkel durch SdrCaptionAngleItem vorgegeben +// sal_False=Freier Winkel //------------------------------------ class SdrCaptionFixedAngleItem: public SdrOnOffItem { public: - SdrCaptionFixedAngleItem(BOOL bFix=TRUE): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {} + SdrCaptionFixedAngleItem(sal_Bool bFix=sal_True): SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,bFix) {} SdrCaptionFixedAngleItem(SvStream& rIn) : SdrOnOffItem(SDRATTR_CAPTIONFIXEDANGLE,rIn) {} }; diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx index d2c8d11069..8f3e3467ea 100644..100755 --- a/svx/inc/svx/sxcecitm.hxx +++ b/svx/inc/svx/sxcecitm.hxx @@ -42,26 +42,26 @@ enum SdrCaptionEscDir {SDRCAPT_ESCHORIZONTAL,SDRCAPT_ESCVERTICAL,SDRCAPT_ESCBEST class SVX_DLLPUBLIC SdrCaptionEscDirItem: public SfxEnumItem { public: TYPEINFO(); - SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< USHORT >(eDir)) {} + SdrCaptionEscDirItem(SdrCaptionEscDir eDir=SDRCAPT_ESCHORIZONTAL): SfxEnumItem(SDRATTR_CAPTIONESCDIR,sal::static_int_cast< sal_uInt16 >(eDir)) {} SdrCaptionEscDirItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONESCDIR,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 3; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 3; } SdrCaptionEscDir GetValue() const { return (SdrCaptionEscDir)SfxEnumItem::GetValue(); } - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; //------------------------------------ // class SdrCaptionEscIsRelItem -// TRUE=Linienaustrittsposition relativ -// FALSE=Linienaustrittsposition absolut +// sal_True=Linienaustrittsposition relativ +// sal_False=Linienaustrittsposition absolut //------------------------------------ class SdrCaptionEscIsRelItem: public SdrYesNoItem { public: - SdrCaptionEscIsRelItem(BOOL bRel=TRUE): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {} + SdrCaptionEscIsRelItem(sal_Bool bRel=sal_True): SdrYesNoItem(SDRATTR_CAPTIONESCISREL,bRel) {} SdrCaptionEscIsRelItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONESCISREL,rIn) {} }; diff --git a/svx/inc/svx/sxcgitm.hxx b/svx/inc/svx/sxcgitm.hxx index 74e11d812c..74e11d812c 100644..100755 --- a/svx/inc/svx/sxcgitm.hxx +++ b/svx/inc/svx/sxcgitm.hxx diff --git a/svx/inc/svx/sxciaitm.hxx b/svx/inc/svx/sxciaitm.hxx index 2ebd236973..2ebd236973 100644..100755 --- a/svx/inc/svx/sxciaitm.hxx +++ b/svx/inc/svx/sxciaitm.hxx diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx index 006bd0b6e4..47d5f395e5 100644..100755 --- a/svx/inc/svx/sxcikitm.hxx +++ b/svx/inc/svx/sxcikitm.hxx @@ -39,17 +39,17 @@ enum SdrCircKind {SDRCIRC_FULL, class SdrCircKindItem: public SfxEnumItem { public: TYPEINFO(); - SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< USHORT >(eKind)) {} + SdrCircKindItem(SdrCircKind eKind=SDRCIRC_FULL): SfxEnumItem(SDRATTR_CIRCKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {} SdrCircKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CIRCKIND,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 4; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 4; } SdrCircKind GetValue() const { return (SdrCircKind)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxcllitm.hxx b/svx/inc/svx/sxcllitm.hxx index 915c39e60e..0ff81593b6 100644..100755 --- a/svx/inc/svx/sxcllitm.hxx +++ b/svx/inc/svx/sxcllitm.hxx @@ -52,7 +52,7 @@ public: //------------------------------------ class SdrCaptionFitLineLenItem: public SdrYesNoItem { public: - SdrCaptionFitLineLenItem(BOOL bBestFit=TRUE): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {} + SdrCaptionFitLineLenItem(sal_Bool bBestFit=sal_True): SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,bBestFit) {} SdrCaptionFitLineLenItem(SvStream& rIn) : SdrYesNoItem(SDRATTR_CAPTIONFITLINELEN,rIn) {} }; diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx index 568328ddaa..12ceec6a73 100644..100755 --- a/svx/inc/svx/sxctitm.hxx +++ b/svx/inc/svx/sxctitm.hxx @@ -40,13 +40,13 @@ enum SdrCaptionType {SDRCAPT_TYPE1,SDRCAPT_TYPE2,SDRCAPT_TYPE3,SDRCAPT_TYPE4}; class SVX_DLLPUBLIC SdrCaptionTypeItem: public SfxEnumItem { public: TYPEINFO(); - SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< USHORT >(eStyle)) {} + SdrCaptionTypeItem(SdrCaptionType eStyle=SDRCAPT_TYPE3): SfxEnumItem(SDRATTR_CAPTIONTYPE,sal::static_int_cast< sal_uInt16 >(eStyle)) {} SdrCaptionTypeItem(SvStream& rIn) : SfxEnumItem(SDRATTR_CAPTIONTYPE,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 4; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 4; } SdrCaptionType GetValue() const { return (SdrCaptionType)SfxEnumItem::GetValue(); } - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx index 99face04ea..7edb6762d9 100644..100755 --- a/svx/inc/svx/sxekitm.hxx +++ b/svx/inc/svx/sxekitm.hxx @@ -44,15 +44,15 @@ enum SdrEdgeKind {SDREDGE_ORTHOLINES, class SVX_DLLPUBLIC SdrEdgeKindItem: public SfxEnumItem { public: TYPEINFO(); - SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< USHORT >(eStyle)) {} + SdrEdgeKindItem(SdrEdgeKind eStyle=SDREDGE_ORTHOLINES): SfxEnumItem(SDRATTR_EDGEKIND,sal::static_int_cast< sal_uInt16 >(eStyle)) {} SdrEdgeKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_EDGEKIND,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 5; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 5; } SdrEdgeKind GetValue() const { return (SdrEdgeKind)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxelditm.hxx b/svx/inc/svx/sxelditm.hxx index 0d9f294867..b0e3b70cd3 100644..100755 --- a/svx/inc/svx/sxelditm.hxx +++ b/svx/inc/svx/sxelditm.hxx @@ -34,7 +34,7 @@ class SdrEdgeLineDeltaAnzItem: public SfxUInt16Item { public: - SdrEdgeLineDeltaAnzItem(UINT16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,nVal) {} + SdrEdgeLineDeltaAnzItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,nVal) {} SdrEdgeLineDeltaAnzItem(SvStream& rIn): SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,rIn) {} }; @@ -42,24 +42,24 @@ class SVX_DLLPUBLIC SdrEdgeLine1DeltaItem: public SdrMetricItem { public: SdrEdgeLine1DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE1DELTA,nVal) {} SdrEdgeLine1DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE1DELTA,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeLine2DeltaItem: public SdrMetricItem { public: SdrEdgeLine2DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE2DELTA,nVal) {} SdrEdgeLine2DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE2DELTA,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeLine3DeltaItem: public SdrMetricItem { public: SdrEdgeLine3DeltaItem(long nVal=0): SdrMetricItem(SDRATTR_EDGELINE3DELTA,nVal) {} SdrEdgeLine3DeltaItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGELINE3DELTA,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif diff --git a/svx/inc/svx/sxenditm.hxx b/svx/inc/svx/sxenditm.hxx index 403dff7f33..76d136d761 100644..100755 --- a/svx/inc/svx/sxenditm.hxx +++ b/svx/inc/svx/sxenditm.hxx @@ -36,32 +36,32 @@ class SVX_DLLPUBLIC SdrEdgeNode1HorzDistItem: public SdrMetricItem { public: SdrEdgeNode1HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,nVal) {} SdrEdgeNode1HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1HORZDIST,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeNode1VertDistItem: public SdrMetricItem { public: SdrEdgeNode1VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,nVal) {} SdrEdgeNode1VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE1VERTDIST,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeNode2HorzDistItem: public SdrMetricItem { public: SdrEdgeNode2HorzDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,nVal) {} SdrEdgeNode2HorzDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2HORZDIST,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SVX_DLLPUBLIC SdrEdgeNode2VertDistItem: public SdrMetricItem { public: SdrEdgeNode2VertDistItem(long nVal=0): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,nVal) {} SdrEdgeNode2VertDistItem(SvStream& rIn): SdrMetricItem(SDRATTR_EDGENODE2VERTDIST,rIn) {} - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; class SdrEdgeNode1GlueDistItem: public SdrMetricItem { diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx index 42b94506e1..603aa18210 100644..100755 --- a/svx/inc/svx/sxfiitm.hxx +++ b/svx/inc/svx/sxfiitm.hxx @@ -39,13 +39,13 @@ class SdrFractionItem: public SfxPoolItem { Fraction nValue; public: TYPEINFO_VISIBILITY( SVX_DLLPUBLIC ); - SdrFractionItem(USHORT nId=0): SfxPoolItem(nId) {} - SdrFractionItem(USHORT nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} - SdrFractionItem(USHORT nId, SvStream& rIn); + SdrFractionItem(sal_uInt16 nId=0): SfxPoolItem(nId) {} + SdrFractionItem(sal_uInt16 nId, const Fraction& rVal): SfxPoolItem(nId), nValue(rVal) {} + SdrFractionItem(sal_uInt16 nId, SvStream& rIn); virtual int operator==(const SfxPoolItem&) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, String &rText, const IntlWrapper * = 0) const; - virtual SfxPoolItem* Create(SvStream&, USHORT nVer) const; - virtual SvStream& Store(SvStream&, USHORT nItemVers) const; + virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream&, sal_uInt16 nItemVers) const; virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const; const Fraction& GetValue() const { return nValue; } void SetValue(const Fraction& rVal) { nValue = rVal; } diff --git a/svx/inc/svx/sxlayitm.hxx b/svx/inc/svx/sxlayitm.hxx index 9bb548df81..3cba5b4145 100644..100755 --- a/svx/inc/svx/sxlayitm.hxx +++ b/svx/inc/svx/sxlayitm.hxx @@ -38,7 +38,7 @@ //------------------------------ class SdrLayerIdItem: public SfxUInt16Item { public: - SdrLayerIdItem(USHORT nId=0): SfxUInt16Item(SDRATTR_LAYERID,nId) {} + SdrLayerIdItem(sal_uInt16 nId=0): SfxUInt16Item(SDRATTR_LAYERID,nId) {} SdrLayerIdItem(SvStream& rIn): SfxUInt16Item(SDRATTR_LAYERID,rIn) {} SdrLayerID GetValue() const { return (SdrLayerID)SfxUInt16Item::GetValue(); } }; diff --git a/svx/inc/svx/sxlogitm.hxx b/svx/inc/svx/sxlogitm.hxx index ccf0ef8209..ccf0ef8209 100644..100755 --- a/svx/inc/svx/sxlogitm.hxx +++ b/svx/inc/svx/sxlogitm.hxx diff --git a/svx/inc/svx/sxmbritm.hxx b/svx/inc/svx/sxmbritm.hxx index 04141d4784..04141d4784 100644..100755 --- a/svx/inc/svx/sxmbritm.hxx +++ b/svx/inc/svx/sxmbritm.hxx diff --git a/svx/inc/svx/sxmfsitm.hxx b/svx/inc/svx/sxmfsitm.hxx index b977813587..b977813587 100644..100755 --- a/svx/inc/svx/sxmfsitm.hxx +++ b/svx/inc/svx/sxmfsitm.hxx diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx index 9c172e35f9..abe4fe2593 100644..100755 --- a/svx/inc/svx/sxmkitm.hxx +++ b/svx/inc/svx/sxmkitm.hxx @@ -39,17 +39,17 @@ enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i. class SdrMeasureKindItem: public SfxEnumItem { public: TYPEINFO(); - SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< USHORT >(eKind)) {} + SdrMeasureKindItem(SdrMeasureKind eKind=SDRMEASURE_STD): SfxEnumItem(SDRATTR_MEASUREKIND,sal::static_int_cast< sal_uInt16 >(eKind)) {} SdrMeasureKindItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREKIND,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 2; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 2; } SdrMeasureKind GetValue() const { return (SdrMeasureKind)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxmlhitm.hxx b/svx/inc/svx/sxmlhitm.hxx index 608d004f7d..608d004f7d 100644..100755 --- a/svx/inc/svx/sxmlhitm.hxx +++ b/svx/inc/svx/sxmlhitm.hxx diff --git a/svx/inc/svx/sxmoitm.hxx b/svx/inc/svx/sxmoitm.hxx index 6c7d8f7525..6c7d8f7525 100644..100755 --- a/svx/inc/svx/sxmoitm.hxx +++ b/svx/inc/svx/sxmoitm.hxx diff --git a/svx/inc/svx/sxmovitm.hxx b/svx/inc/svx/sxmovitm.hxx index 2fe2d0989d..2fe2d0989d 100644..100755 --- a/svx/inc/svx/sxmovitm.hxx +++ b/svx/inc/svx/sxmovitm.hxx diff --git a/svx/inc/svx/sxmsitm.hxx b/svx/inc/svx/sxmsitm.hxx index 07b31963fd..07b31963fd 100644..100755 --- a/svx/inc/svx/sxmsitm.hxx +++ b/svx/inc/svx/sxmsitm.hxx diff --git a/svx/inc/svx/sxmspitm.hxx b/svx/inc/svx/sxmspitm.hxx index 41753b4b93..41753b4b93 100644..100755 --- a/svx/inc/svx/sxmspitm.hxx +++ b/svx/inc/svx/sxmspitm.hxx diff --git a/svx/inc/svx/sxmsuitm.hxx b/svx/inc/svx/sxmsuitm.hxx index af9109caf8..af9109caf8 100644..100755 --- a/svx/inc/svx/sxmsuitm.hxx +++ b/svx/inc/svx/sxmsuitm.hxx diff --git a/svx/inc/svx/sxmtaitm.hxx b/svx/inc/svx/sxmtaitm.hxx index 8d60ba3c7c..8c0932e679 100644..100755 --- a/svx/inc/svx/sxmtaitm.hxx +++ b/svx/inc/svx/sxmtaitm.hxx @@ -34,7 +34,7 @@ // Den Text automatisch zurechtdrehen (Automatisches UpsideDown). // TextUpsideDown bleibt trotzdem weiterhin wirksam und dreht -// den Text bei TRUE nochmal. +// den Text bei sal_True nochmal. class SdrMeasureTextAutoAngleItem: public SdrYesNoItem { public: SdrMeasureTextAutoAngleItem(bool bOn=true): SdrYesNoItem(SDRATTR_MEASURETEXTAUTOANGLE,bOn) {} diff --git a/svx/inc/svx/sxmtfitm.hxx b/svx/inc/svx/sxmtfitm.hxx index d358bf7555..ae3ef057b6 100644..100755 --- a/svx/inc/svx/sxmtfitm.hxx +++ b/svx/inc/svx/sxmtfitm.hxx @@ -52,7 +52,7 @@ public: // The decimal places used for the measure value class SdrMeasureDecimalPlacesItem: public SfxInt16Item { public: - SdrMeasureDecimalPlacesItem(INT16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal) {} + SdrMeasureDecimalPlacesItem(sal_Int16 nVal=2): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,nVal) {} SdrMeasureDecimalPlacesItem(SvStream& rIn): SfxInt16Item(SDRATTR_MEASUREDECIMALPLACES,rIn) {} }; diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx index edd37c9b08..88fab8d7e7 100644..100755 --- a/svx/inc/svx/sxmtpitm.hxx +++ b/svx/inc/svx/sxmtpitm.hxx @@ -41,17 +41,17 @@ enum SdrMeasureTextVPos {SDRMEASURE_TEXTVAUTO,SDRMEASURE_ABOVE,SDRMEASURETEXT_BR class SVX_DLLPUBLIC SdrMeasureTextHPosItem: public SfxEnumItem { public: TYPEINFO(); - SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< USHORT >(ePos)) {} + SdrMeasureTextHPosItem(SdrMeasureTextHPos ePos=SDRMEASURE_TEXTHAUTO): SfxEnumItem(SDRATTR_MEASURETEXTHPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {} SdrMeasureTextHPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTHPOS,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 4; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 4; } SdrMeasureTextHPos GetValue() const { return (SdrMeasureTextHPos)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; @@ -61,17 +61,17 @@ public: class SVX_DLLPUBLIC SdrMeasureTextVPosItem: public SfxEnumItem { public: TYPEINFO(); - SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< USHORT >(ePos)) {} + SdrMeasureTextVPosItem(SdrMeasureTextVPos ePos=SDRMEASURE_TEXTVAUTO): SfxEnumItem(SDRATTR_MEASURETEXTVPOS,sal::static_int_cast< sal_uInt16 >(ePos)) {} SdrMeasureTextVPosItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASURETEXTVPOS,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 5; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 5; } SdrMeasureTextVPos GetValue() const { return (SdrMeasureTextVPos)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxmtritm.hxx b/svx/inc/svx/sxmtritm.hxx index 89581fa28d..89581fa28d 100644..100755 --- a/svx/inc/svx/sxmtritm.hxx +++ b/svx/inc/svx/sxmtritm.hxx diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx index a0dec32fd3..ba17f3765b 100644..100755 --- a/svx/inc/svx/sxmuitm.hxx +++ b/svx/inc/svx/sxmuitm.hxx @@ -38,17 +38,17 @@ class SVX_DLLPUBLIC SdrMeasureUnitItem: public SfxEnumItem { public: TYPEINFO(); - SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< USHORT >(eUnit)) {} + SdrMeasureUnitItem(FieldUnit eUnit=FUNIT_NONE): SfxEnumItem(SDRATTR_MEASUREUNIT,sal::static_int_cast< sal_uInt16 >(eUnit)) {} SdrMeasureUnitItem(SvStream& rIn) : SfxEnumItem(SDRATTR_MEASUREUNIT,rIn) {} virtual SfxPoolItem* Clone(SfxItemPool* pPool=NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; // { return 14; } + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; // { return 14; } FieldUnit GetValue() const { return (FieldUnit)SfxEnumItem::GetValue(); } - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - virtual String GetValueTextByPos(USHORT nPos) const; + virtual String GetValueTextByPos(sal_uInt16 nPos) const; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String& rText, const IntlWrapper * = 0) const; }; diff --git a/svx/inc/svx/sxoneitm.hxx b/svx/inc/svx/sxoneitm.hxx index a80bc692a5..a80bc692a5 100644..100755 --- a/svx/inc/svx/sxoneitm.hxx +++ b/svx/inc/svx/sxoneitm.hxx diff --git a/svx/inc/svx/sxonitm.hxx b/svx/inc/svx/sxonitm.hxx index de3a855e25..de3a855e25 100644..100755 --- a/svx/inc/svx/sxonitm.hxx +++ b/svx/inc/svx/sxonitm.hxx diff --git a/svx/inc/svx/sxopitm.hxx b/svx/inc/svx/sxopitm.hxx index 4bb7954dd8..4bb7954dd8 100644..100755 --- a/svx/inc/svx/sxopitm.hxx +++ b/svx/inc/svx/sxopitm.hxx diff --git a/svx/inc/svx/sxraitm.hxx b/svx/inc/svx/sxraitm.hxx index 2edebe2d6d..2edebe2d6d 100644..100755 --- a/svx/inc/svx/sxraitm.hxx +++ b/svx/inc/svx/sxraitm.hxx diff --git a/svx/inc/svx/sxreaitm.hxx b/svx/inc/svx/sxreaitm.hxx index 727b85df72..727b85df72 100644..100755 --- a/svx/inc/svx/sxreaitm.hxx +++ b/svx/inc/svx/sxreaitm.hxx diff --git a/svx/inc/svx/sxreoitm.hxx b/svx/inc/svx/sxreoitm.hxx index d33fea2dee..d33fea2dee 100644..100755 --- a/svx/inc/svx/sxreoitm.hxx +++ b/svx/inc/svx/sxreoitm.hxx diff --git a/svx/inc/svx/sxroaitm.hxx b/svx/inc/svx/sxroaitm.hxx index a257e399fe..a257e399fe 100644..100755 --- a/svx/inc/svx/sxroaitm.hxx +++ b/svx/inc/svx/sxroaitm.hxx diff --git a/svx/inc/svx/sxrooitm.hxx b/svx/inc/svx/sxrooitm.hxx index fa1614efa0..fa1614efa0 100644..100755 --- a/svx/inc/svx/sxrooitm.hxx +++ b/svx/inc/svx/sxrooitm.hxx diff --git a/svx/inc/svx/sxsaitm.hxx b/svx/inc/svx/sxsaitm.hxx index 7648722da8..7648722da8 100644..100755 --- a/svx/inc/svx/sxsaitm.hxx +++ b/svx/inc/svx/sxsaitm.hxx diff --git a/svx/inc/svx/sxsalitm.hxx b/svx/inc/svx/sxsalitm.hxx index c2d40dbe44..c2d40dbe44 100644..100755 --- a/svx/inc/svx/sxsalitm.hxx +++ b/svx/inc/svx/sxsalitm.hxx diff --git a/svx/inc/svx/sxsiitm.hxx b/svx/inc/svx/sxsiitm.hxx index 5a1cc93447..ddcd2552d9 100644..100755 --- a/svx/inc/svx/sxsiitm.hxx +++ b/svx/inc/svx/sxsiitm.hxx @@ -33,11 +33,11 @@ class SdrScaleItem: public SdrFractionItem { public: TYPEINFO(); - SdrScaleItem(USHORT nId=0): SdrFractionItem(nId,Fraction(1,1)) {} - SdrScaleItem(USHORT nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} - SdrScaleItem(USHORT nId, SvStream& rIn): SdrFractionItem(nId,rIn) {} + SdrScaleItem(sal_uInt16 nId=0): SdrFractionItem(nId,Fraction(1,1)) {} + SdrScaleItem(sal_uInt16 nId, const Fraction& rVal): SdrFractionItem(nId,rVal) {} + SdrScaleItem(sal_uInt16 nId, SvStream& rIn): SdrFractionItem(nId,rIn) {} virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, SfxMapUnit eCoreMetric, SfxMapUnit ePresentationMetric, String &rText, const IntlWrapper * = 0) const; - virtual SfxPoolItem* Create(SvStream&, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream&, sal_uInt16 nVer) const; virtual SfxPoolItem* Clone(SfxItemPool *pPool=NULL) const; }; diff --git a/svx/inc/svx/sxsoitm.hxx b/svx/inc/svx/sxsoitm.hxx index b4ed5ec88d..b4ed5ec88d 100644..100755 --- a/svx/inc/svx/sxsoitm.hxx +++ b/svx/inc/svx/sxsoitm.hxx diff --git a/svx/inc/svx/sxtraitm.hxx b/svx/inc/svx/sxtraitm.hxx index 2b2bb6c4be..2b2bb6c4be 100644..100755 --- a/svx/inc/svx/sxtraitm.hxx +++ b/svx/inc/svx/sxtraitm.hxx diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx index 34fba7567c..2cc2510b06 100644..100755 --- a/svx/inc/svx/tabarea.hxx +++ b/svx/inc/svx/tabarea.hxx @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- #include <svtools/valueset.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <vcl/fixed.hxx> #include <svx/dlgctrl.hxx> #include <svx/xsetit.hxx> @@ -59,7 +59,7 @@ enum PageType // define ---------------------------------------------------------------- -typedef USHORT ChangeType; // auch in tab_line.hxx (mitpflegen !!!) +typedef sal_uInt16 ChangeType; // auch in tab_line.hxx (mitpflegen !!!) #define CT_NONE ( (ChangeType) 0x0000 ) #define CT_MODIFIED ( (ChangeType) 0x0001 ) diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx index 1e9830079b..9aa117fec3 100644..100755 --- a/svx/inc/svx/tabline.hxx +++ b/svx/inc/svx/tabline.hxx @@ -30,7 +30,7 @@ // include --------------------------------------------------------------- -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <vcl/group.hxx> #include <svtools/stdctrl.hxx> #include <svx/svdpage.hxx> @@ -42,7 +42,7 @@ class SvxBrushItem; // define ---------------------------------------------------------------- -typedef USHORT ChangeType; // auch in tab_area.hxx (mitpflegen !!!) +typedef sal_uInt16 ChangeType; // auch in tab_area.hxx (mitpflegen !!!) #define CT_NONE ( (ChangeType) 0x0000 ) #define CT_MODIFIED ( (ChangeType) 0x0001 ) diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx index fd1fb8aca4..37793b8b0c 100644..100755 --- a/svx/inc/svx/tbcontrl.hxx +++ b/svx/inc/svx/tbcontrl.hxx @@ -187,12 +187,12 @@ class SVX_DLLPUBLIC SvxStyleToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxStyleToolBoxControl(); virtual Window* CreateItemWindow( Window *pParent ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); DECL_LINK( VisibilityNotification, void* ); @@ -214,11 +214,11 @@ private: SfxStyleControllerItem_Impl* pBoundItems [MAX_FAMILIES]; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xBoundItems[MAX_FAMILIES]; SfxTemplateItem* pFamilyState[MAX_FAMILIES]; - USHORT nActFamily; // Id in der ToolBox = Position - 1 - USHORT nActFilter; // FilterIdx - USHORT nAppFilter; // Filter, den die App gesetzt hat + sal_uInt16 nActFamily; // Id in der ToolBox = Position - 1 + sal_uInt16 nActFilter; // FilterIdx + sal_uInt16 nAppFilter; // Filter, den die App gesetzt hat String aCurSel; - BOOL bListening; + sal_Bool bListening; Impl* pImpl; SVX_DLLPRIVATE void Update(); @@ -227,7 +227,7 @@ private: friend class SfxStyleControllerItem_Impl; - SVX_DLLPRIVATE void SetFamilyState ( USHORT nIdx, const SfxTemplateItem* pItem ); + SVX_DLLPRIVATE void SetFamilyState ( sal_uInt16 nIdx, const SfxTemplateItem* pItem ); SVX_DLLPRIVATE SfxStyleFamily GetActFamily (); }; @@ -240,9 +240,9 @@ class SVX_DLLPUBLIC SvxFontNameToolBoxControl : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFontNameToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFontNameToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - virtual void StateChanged ( USHORT nSID, SfxItemState eState, + virtual void StateChanged ( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual Window* CreateItemWindow ( Window *pParent ); }; @@ -265,7 +265,7 @@ class SVX_DLLPUBLIC SvxFontHeightToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFontHeightToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFontHeightToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFontHeightToolBoxControl(); // new controller API @@ -291,10 +291,10 @@ class SVX_DLLPUBLIC SvxFontColorToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFontColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFontColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFontColorToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); @@ -319,14 +319,14 @@ class SVX_DLLPUBLIC SvxFontColorExtToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFontColorExtToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFontColorExtToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFontColorExtToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); - virtual void Select( BOOL bMod1 = FALSE ); + virtual void Select( sal_Bool bMod1 = sal_False ); }; @@ -344,10 +344,10 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxColorToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); @@ -364,11 +364,11 @@ class SVX_DLLPUBLIC SvxFrameToolBoxControl : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFrameToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFrameToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -384,11 +384,11 @@ class SVX_DLLPUBLIC SvxFrameLineStyleToolBoxControl : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFrameLineStyleToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFrameLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -406,12 +406,12 @@ class SVX_DLLPUBLIC SvxFrameLineColorToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFrameLineColorToolBoxControl( USHORT nSlotId, - USHORT nId, + SvxFrameLineColorToolBoxControl( sal_uInt16 nSlotId, + sal_uInt16 nId, ToolBox& rTbx ); ~SvxFrameLineColorToolBoxControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); @@ -427,13 +427,13 @@ private: public: SFX_DECL_TOOLBOX_CONTROL(); - SvxReloadControllerItem( USHORT nSlotId, - USHORT nId, + SvxReloadControllerItem( sal_uInt16 nSlotId, + sal_uInt16 nId, ToolBox& rTbx ); ~SvxReloadControllerItem(); protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -444,10 +444,10 @@ private: public: SFX_DECL_TOOLBOX_CONTROL(); - SvxSimpleUndoRedoController( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxSimpleUndoRedoController(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; diff --git a/svx/inc/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx index 6e97892565..863a9da58c 100644..100755 --- a/svx/inc/tbxalign.hxx +++ b/svx/inc/svx/tbxalign.hxx @@ -45,7 +45,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); - SvxTbxCtlAlign( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxTbxCtlAlign() {} private: rtl::OUString m_aSubTbName; diff --git a/svx/inc/tbxcolor.hxx b/svx/inc/svx/tbxcolor.hxx index b06afcfe7e..3581093654 100644..100755 --- a/svx/inc/tbxcolor.hxx +++ b/svx/inc/svx/tbxcolor.hxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,4 +69,3 @@ namespace svx #endif // #ifndef _SVX_TBXCOLOR_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/inc/svx/tbxcolorupdate.hxx b/svx/inc/svx/tbxcolorupdate.hxx index c2f61b8ae3..ee67d2c172 100644..100755 --- a/svx/inc/svx/tbxcolorupdate.hxx +++ b/svx/inc/svx/tbxcolorupdate.hxx @@ -57,10 +57,10 @@ namespace svx class SVX_DLLPUBLIC ToolboxButtonColorUpdater { public: - ToolboxButtonColorUpdater( USHORT nSlotId, - USHORT nTbxBtnId, + ToolboxButtonColorUpdater( sal_uInt16 nSlotId, + sal_uInt16 nTbxBtnId, ToolBox* ptrTbx, - USHORT nMode = 0 ); + sal_uInt16 nMode = 0 ); ~ToolboxButtonColorUpdater(); void Update( const Color& rColor ); @@ -69,14 +69,14 @@ namespace svx void DrawChar(VirtualDevice&, const Color&); private: - USHORT mnDrawMode; - USHORT mnBtnId; - USHORT mnSlotId; + sal_uInt16 mnDrawMode; + sal_uInt16 mnBtnId; + sal_uInt16 mnSlotId; ToolBox* mpTbx; Color maCurColor; Rectangle maUpdRect; Size maBmpSize; - BOOL mbWasHiContrastMode; + sal_Bool mbWasHiContrastMode; }; //........................................................................ diff --git a/svx/inc/tbxctl.hxx b/svx/inc/svx/tbxctl.hxx index e3a5c155fa..8391ac8e91 100644..100755 --- a/svx/inc/tbxctl.hxx +++ b/svx/inc/svx/tbxctl.hxx @@ -48,13 +48,13 @@ protected: using SfxToolBoxControl::Select; public: - SvxTbxCtlDraw( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxTbxCtlDraw() {} SFX_DECL_TOOLBOX_CONTROL(); - virtual void Select( BOOL bMod1 = FALSE ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void Select( sal_Bool bMod1 = sal_False ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; }; diff --git a/svx/inc/tbxcustomshapes.hxx b/svx/inc/svx/tbxcustomshapes.hxx index 581d7ed52b..c4ba218ca1 100644..100755 --- a/svx/inc/tbxcustomshapes.hxx +++ b/svx/inc/svx/tbxcustomshapes.hxx @@ -41,15 +41,15 @@ class SVX_DLLPUBLIC SvxTbxCtlCustomShapes : public SfxToolBoxControl { public: using SfxToolBoxControl::Select; - virtual void Select( BOOL bMod1 = FALSE ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void Select( sal_Bool bMod1 = sal_False ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); SFX_DECL_TOOLBOX_CONTROL(); - SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxTbxCtlCustomShapes() {} //interface XSubToolbarController: diff --git a/svx/inc/tbxdraw.hxx b/svx/inc/svx/tbxdraw.hxx index 6ca407184b..5d5cc97bef 100644..100755 --- a/svx/inc/tbxdraw.hxx +++ b/svx/inc/svx/tbxdraw.hxx @@ -50,17 +50,17 @@ protected: using SfxPopupWindow::StateChanged; public: - SvxPopupWindowTbxMgr( USHORT nId, + SvxPopupWindowTbxMgr( sal_uInt16 nId, SfxToolBoxControl* pTbxCtl, ResId aRIdWin, ResId aRIdTbx ); - SvxPopupWindowTbxMgr( USHORT nId, + SvxPopupWindowTbxMgr( sal_uInt16 nId, WindowAlign eAlign, ResId aRIdWin, ResId aRIdTbx ); ~SvxPopupWindowTbxMgr(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState); virtual SfxPopupWindow* Clone() const; virtual void PopupModeEnd(); @@ -68,7 +68,7 @@ public: void StartSelection(); // toolbox click or execute may chage the default selection in the tools toolbox - virtual void UserEvent( ULONG nEvent, void* pEventData ); + virtual void UserEvent( sal_uIntPtr nEvent, void* pEventData ); }; diff --git a/svx/inc/txencbox.hxx b/svx/inc/svx/txencbox.hxx index 80462b6aa2..63e9c34540 100644..100755 --- a/svx/inc/txencbox.hxx +++ b/svx/inc/svx/txencbox.hxx @@ -41,7 +41,7 @@ class SVX_DLLPUBLIC SvxTextEncodingBox : public ListBox private: const SvxTextEncodingTable* m_pEncTable; - SVX_DLLPRIVATE USHORT EncodingToPos_Impl( rtl_TextEncoding nEnc ) const; + SVX_DLLPRIVATE sal_uInt16 EncodingToPos_Impl( rtl_TextEncoding nEnc ) const; public: SvxTextEncodingBox( Window* pParent, const ResId& rResId ); @@ -63,7 +63,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 = FALSE, + sal_Bool bExcludeImportSubsets = sal_False, sal_uInt32 nExcludeInfoFlags = 0, sal_uInt32 nButIncludeInfoFlags = 0 ); @@ -84,7 +84,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 = FALSE, + sal_Bool bExcludeImportSubsets = sal_False, sal_uInt32 nExcludeInfoFlags = 0, sal_uInt32 nButIncludeInfoFlags = 0 ); @@ -98,22 +98,22 @@ public: { return m_pEncTable; } void InsertTextEncoding( const rtl_TextEncoding nEnc, - USHORT nPos = LISTBOX_APPEND ); + sal_uInt16 nPos = LISTBOX_APPEND ); void InsertTextEncoding( const rtl_TextEncoding nEnc, const String& rEntry, - USHORT nPos = LISTBOX_APPEND ); + sal_uInt16 nPos = LISTBOX_APPEND ); void RemoveTextEncoding( const rtl_TextEncoding nEnc ); void SelectTextEncoding( const rtl_TextEncoding nEnc, - BOOL bSelect = TRUE ); + sal_Bool bSelect = sal_True ); rtl_TextEncoding GetSelectTextEncoding() const; const String& GetSelectTextString() const; - BOOL IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const; + sal_Bool IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const; }; #endif diff --git a/svx/inc/txenctab.hxx b/svx/inc/svx/txenctab.hxx index 5baa6444f4..5baa6444f4 100644..100755 --- a/svx/inc/txenctab.hxx +++ b/svx/inc/svx/txenctab.hxx diff --git a/svx/inc/svx/ucsubset.hrc b/svx/inc/svx/ucsubset.hrc index d7e79490fd..d7e79490fd 100644..100755 --- a/svx/inc/svx/ucsubset.hrc +++ b/svx/inc/svx/ucsubset.hrc diff --git a/svx/inc/svx/ucsubset.hxx b/svx/inc/svx/ucsubset.hxx index 22e8ce7f1e..22e8ce7f1e 100644..100755 --- a/svx/inc/svx/ucsubset.hxx +++ b/svx/inc/svx/ucsubset.hxx diff --git a/svx/inc/unoapi.hxx b/svx/inc/svx/unoapi.hxx index c40e276702..c40e276702 100644..100755 --- a/svx/inc/unoapi.hxx +++ b/svx/inc/svx/unoapi.hxx diff --git a/svx/inc/unofill.hxx b/svx/inc/svx/unofill.hxx index 3f05501d0c..3f05501d0c 100644..100755 --- a/svx/inc/unofill.hxx +++ b/svx/inc/svx/unofill.hxx diff --git a/svx/inc/unomaster.hxx b/svx/inc/svx/unomaster.hxx index e34ab41ed3..e34ab41ed3 100644..100755 --- a/svx/inc/unomaster.hxx +++ b/svx/inc/svx/unomaster.hxx diff --git a/svx/inc/svx/unomid.hxx b/svx/inc/svx/unomid.hxx index 5d991e6a0e..5d991e6a0e 100644..100755 --- a/svx/inc/svx/unomid.hxx +++ b/svx/inc/svx/unomid.hxx diff --git a/svx/inc/svx/unomod.hxx b/svx/inc/svx/unomod.hxx index 3daaf4af36..3daaf4af36 100644..100755 --- a/svx/inc/svx/unomod.hxx +++ b/svx/inc/svx/unomod.hxx diff --git a/svx/inc/svx/unomodel.hxx b/svx/inc/svx/unomodel.hxx index 1d6fc949cf..1d6fc949cf 100644..100755 --- a/svx/inc/svx/unomodel.hxx +++ b/svx/inc/svx/unomodel.hxx diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx index dcd32409e4..dcd32409e4 100644..100755 --- a/svx/inc/svx/unopage.hxx +++ b/svx/inc/svx/unopage.hxx diff --git a/svx/inc/unopool.hxx b/svx/inc/svx/unopool.hxx index d74003faf4..d74003faf4 100644..100755 --- a/svx/inc/unopool.hxx +++ b/svx/inc/svx/unopool.hxx diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx index 3e787fd07f..45697daa95 100644..100755 --- a/svx/inc/svx/unoprov.hxx +++ b/svx/inc/svx/unoprov.hxx @@ -41,7 +41,7 @@ class SfxItemPool; * class UHashMap * ***********************************************************************/ -#define UHASHMAP_NOTFOUND sal::static_int_cast< UINT32 >(~0) +#define UHASHMAP_NOTFOUND sal::static_int_cast< sal_uInt32 >(~0) class UHashMap { UHashMap() {} @@ -89,12 +89,12 @@ class SVX_DLLPUBLIC SvxUnoPropertyMapProvider { SfxItemPropertyMapEntry* aMapArr[SVXMAP_END]; SvxItemPropertySet* aSetArr[SVXMAP_END]; -// void Sort(USHORT nId); +// void Sort(sal_uInt16 nId); public: SvxUnoPropertyMapProvider(); ~SvxUnoPropertyMapProvider(); - const SfxItemPropertyMapEntry* GetMap(UINT16 nPropertyId); - const SvxItemPropertySet* GetPropertySet(UINT16 nPropertyId, SfxItemPool& rPool); + const SfxItemPropertyMapEntry* GetMap(sal_uInt16 nPropertyId); + const SvxItemPropertySet* GetPropertySet(sal_uInt16 nPropertyId, SfxItemPool& rPool); }; /*********************************************************************** diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx index 2e3df7a9b4..aa11c77c2b 100644..100755 --- a/svx/inc/svx/unoshape.hxx +++ b/svx/inc/svx/unoshape.hxx @@ -192,7 +192,7 @@ public: const SvxItemPropertySet& GetPropertySet() { return *mpPropSet; } SdrObject* GetSdrObject() const {return mpObj.get();} void SetShapeType( const ::rtl::OUString& ShapeType ) { maShapeType = ShapeType; } - ::com::sun::star::uno::Any GetBitmap( BOOL bMetaFile = FALSE ) const throw (); + ::com::sun::star::uno::Any GetBitmap( sal_Bool bMetaFile = sal_False ) const throw (); static SvxShape* GetShapeForSdrObj( SdrObject* pObj ) throw (); ::svx::PropertyChangeNotifier& getShapePropertyChangeNotifier(); diff --git a/svx/inc/unoshcol.hxx b/svx/inc/svx/unoshcol.hxx index 711d317664..711d317664 100644..100755 --- a/svx/inc/unoshcol.hxx +++ b/svx/inc/svx/unoshcol.hxx diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx index bf3291ab5b..bf3291ab5b 100644..100755 --- a/svx/inc/svx/unoshprp.hxx +++ b/svx/inc/svx/unoshprp.hxx diff --git a/svx/inc/svx/unoshtxt.hxx b/svx/inc/svx/unoshtxt.hxx index 88db2f36b4..c1cc552f22 100644..100755 --- a/svx/inc/svx/unoshtxt.hxx +++ b/svx/inc/svx/unoshtxt.hxx @@ -84,13 +84,15 @@ public: // static sal_Bool hasLevels( const SdrObject* pObject ); // the SvxViewForwarder interface - virtual BOOL IsValid() const; + virtual sal_Bool IsValid() const; virtual Rectangle GetVisArea() const; virtual Point LogicToPixel( const Point&, const MapMode& ) const; virtual Point PixelToLogic( const Point&, const MapMode& ) const; void ChangeModel( SdrModel* pNewModel ); + void UpdateOutliner(); + private: SVX_DLLPRIVATE SvxTextEditSource( SvxTextEditSourceImpl* pImpl ); diff --git a/svx/inc/verttexttbxctrl.hxx b/svx/inc/svx/verttexttbxctrl.hxx index 0401ac43f3..cfddce7e1d 100644..100755 --- a/svx/inc/verttexttbxctrl.hxx +++ b/svx/inc/svx/verttexttbxctrl.hxx @@ -38,10 +38,10 @@ class SvxVertCTLTextTbxCtrl : public SfxToolBoxControl { sal_Bool bCheckVertical; //determines whether vertical mode or CTL mode has to be checked public: - SvxVertCTLTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxVertCTLTextTbxCtrl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); void SetVert(sal_Bool bSet) {bCheckVertical = bSet;} @@ -51,14 +51,14 @@ class SVX_DLLPUBLIC SvxCTLTextTbxCtrl : public SvxVertCTLTextTbxCtrl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxCTLTextTbxCtrl(USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; class SVX_DLLPUBLIC SvxVertTextTbxCtrl : public SvxVertCTLTextTbxCtrl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxVertTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; #endif diff --git a/svx/inc/svx/view3d.hxx b/svx/inc/svx/view3d.hxx index e335daeb10..05cf956eb0 100644..100755 --- a/svx/inc/svx/view3d.hxx +++ b/svx/inc/svx/view3d.hxx @@ -75,17 +75,17 @@ protected: // Migrate selections Impl3DMirrorConstructOverlay* mpMirrorOverlay; - BOOL bDoubleSided; + sal_Bool bDoubleSided; void InitView(); - void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat); - void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat); + void ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat); + void ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat); void ImpChangeSomeAttributesFor3DConversion(SdrObject* pObj); void ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj); void InitScene(E3dScene* pScene, double fW, double fH, double fCamZ); - void ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D, BOOL& rGroupSelected) const; + void ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D, sal_Bool& rGroupSelected) const; void BreakSingle3DObj(E3dObject* pObj); public: @@ -98,7 +98,7 @@ public: // Zugriff auf die Default-Attribute E3dDefaultAttributes& Get3DDefaultAttributes() { return a3DDefaultAttr; } - virtual BOOL BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL); + virtual sal_Bool BegDragObj(const Point& rPnt, OutputDevice* pOut = NULL, SdrHdl* pHdl = NULL, short nMinMov = -3, SdrDragMethod* pForcedMeth = NULL); virtual void CheckPossibilities(); // Event setzen/rausruecken @@ -112,21 +112,21 @@ public: // Bei Paste muss - falls in eine Scene eingefuegt wird - die // Objekte der Szene eingefuegt werden, die Szene selbst aber nicht using SdrView::Paste; - virtual BOOL Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, UINT32 nOptions=0); + virtual sal_Bool Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0); // #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) - BOOL ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset); + sal_Bool ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point aOffset); - BOOL HasMarkedScene(); + sal_Bool HasMarkedScene(); E3dScene* GetMarkedScene(); - BOOL IsConvertTo3DObjPossible() const; - void ConvertMarkedObjTo3D(BOOL bExtrude=TRUE, basegfx::B2DPoint aPnt1 = basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0, 1.0)); + sal_Bool IsConvertTo3DObjPossible() const; + void ConvertMarkedObjTo3D(sal_Bool bExtrude=sal_True, basegfx::B2DPoint aPnt1 = basegfx::B2DPoint(0.0, 0.0), basegfx::B2DPoint aPnt2 = basegfx::B2DPoint(0.0, 1.0)); // Nachtraeglichhe Korrekturmoeglichkeit um alle Extrudes in einer // bestimmten Tiefensortierung anzulegen void DoDepthArrange(E3dScene* pScene, double fDepth); - void ConvertMarkedToPolyObj(BOOL bLineToArea); + void ConvertMarkedToPolyObj(sal_Bool bLineToArea); E3dScene* SetCurrent3DObj(E3dObject* p3DObj); void Start3DCreation(); @@ -134,7 +134,7 @@ public: sal_Bool Is3DRotationCreationActive() const { return (0L != mpMirrorOverlay); } virtual void MovAction(const Point& rPnt); - void End3DCreation(BOOL bUseDefaultValuesForMirrorAxes=FALSE); + void End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes=sal_False); void ResetCreationActive(); double GetDefaultCamPosZ(); @@ -257,22 +257,22 @@ public: long GetVDefaultSegments() const { return nVDefaultSegments; } void SetVDefaultSegments(long nSegs) { nVDefaultSegments = nSegs; } - BOOL IsBreak3DObjPossible() const; + sal_Bool IsBreak3DObjPossible() const; void Break3DObj(); - BOOL DoubleSided () const + sal_Bool DoubleSided () const { return bDoubleSided; } - BOOL &DoubleSided () + sal_Bool &DoubleSided () { return bDoubleSided; } void MergeScenes(); - SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, BOOL bOnly3DAttr=FALSE) const; - void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, BOOL bOnly3DAttr=FALSE); + SfxItemSet Get3DAttributes(E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False) const; + void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False); }; #endif // _E3D_VIEW3D_HXX diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx index 2c0b4034ef..90bc9472fd 100644..100755 --- a/svx/inc/svx/viewlayoutitem.hxx +++ b/svx/inc/svx/viewlayoutitem.hxx @@ -41,7 +41,7 @@ class SVX_DLLPUBLIC SvxViewLayoutItem: public SfxUInt16Item public: TYPEINFO(); - SvxViewLayoutItem( USHORT nColumns = 0, bool bBookMode = false, USHORT nWhich = SID_ATTR_VIEWLAYOUT ); + SvxViewLayoutItem( sal_uInt16 nColumns = 0, bool bBookMode = false, sal_uInt16 nWhich = SID_ATTR_VIEWLAYOUT ); SvxViewLayoutItem( const SvxViewLayoutItem& ); ~SvxViewLayoutItem(); @@ -51,10 +51,10 @@ public: // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStrm, USHORT nVersion ) const; // leer - virtual SvStream& Store( SvStream& rStrm , USHORT nItemVersion ) const; // leer - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; // leer - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); // leer + virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; // leer + virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; // leer + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; // leer + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // leer }; //------------------------------------------------------------------------ diff --git a/svx/inc/svx/viewpt3d.hxx b/svx/inc/svx/viewpt3d.hxx index 35340aa97d..2090a5b331 100644..100755 --- a/svx/inc/svx/viewpt3d.hxx +++ b/svx/inc/svx/viewpt3d.hxx @@ -79,7 +79,7 @@ class SVX_DLLPUBLIC Viewport3D basegfx::B3DPoint aViewPoint; // Beobachterstandpunkt in Weltkoordinaten; // wird mit der Transformation berechnet - BOOL bTfValid; // Flag, ob Transformation gueltig ist + sal_Bool bTfValid; // Flag, ob Transformation gueltig ist double fWRatio; // Device/View-Seitenverhaeltnisse double fHRatio; @@ -106,11 +106,11 @@ class SVX_DLLPUBLIC Viewport3D double GetFarClipDist() const { return fFarClipDist; } void SetProjection(ProjectionType ePrj) - { eProjection = ePrj; bTfValid = FALSE; } + { eProjection = ePrj; bTfValid = sal_False; } ProjectionType GetProjection() const { return(eProjection); } void SetAspectMapping(AspectMapType eAsp) - { eAspectMapping = eAsp; bTfValid = FALSE; } + { eAspectMapping = eAsp; bTfValid = sal_False; } AspectMapType GetAspectMapping() { return eAspectMapping; } void SetViewWindow(double fX, double fY, double fW, double fH); diff --git a/svx/inc/svx/volume3d.hxx b/svx/inc/svx/volume3d.hxx index 513fa53527..513fa53527 100644..100755 --- a/svx/inc/svx/volume3d.hxx +++ b/svx/inc/svx/volume3d.hxx diff --git a/svx/inc/wrapfield.hxx b/svx/inc/svx/wrapfield.hxx index 8270fb1091..8270fb1091 100644..100755 --- a/svx/inc/wrapfield.hxx +++ b/svx/inc/svx/wrapfield.hxx diff --git a/svx/inc/xattr.hxx b/svx/inc/svx/xattr.hxx index 30f9981804..30f9981804 100644..100755 --- a/svx/inc/xattr.hxx +++ b/svx/inc/svx/xattr.hxx diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx index 97fad001e8..c3ff68a765 100644..100755 --- a/svx/inc/svx/xbitmap.hxx +++ b/svx/inc/svx/xbitmap.hxx @@ -45,17 +45,17 @@ protected: XBitmapType eType; XBitmapStyle eStyle; GraphicObject aGraphicObject; - USHORT* pPixelArray; + sal_uInt16* pPixelArray; Size aArraySize; Color aPixelColor; Color aBckgrColor; - BOOL bGraphicDirty; + sal_Bool bGraphicDirty; public: XOBitmap(); XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eStyle = XBITMAP_TILE ); XOBitmap( const Bitmap& rBitmap, XBitmapStyle eStyle = XBITMAP_TILE ); - XOBitmap( const USHORT* pArray, const Color& aPixelColor, + XOBitmap( const sal_uInt16* pArray, const Color& aPixelColor, const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ), XBitmapStyle eStyle = XBITMAP_TILE ); XOBitmap( const XOBitmap& rXBmp ); @@ -67,20 +67,20 @@ public: void Bitmap2Array(); void Array2Bitmap(); - void SetGraphicObject( const GraphicObject& rObj ) { aGraphicObject = rObj; bGraphicDirty = FALSE; } - void SetBitmap( const Bitmap& rBmp ) { aGraphicObject = GraphicObject( Graphic( rBmp ) ); bGraphicDirty = FALSE; } + void SetGraphicObject( const GraphicObject& rObj ) { aGraphicObject = rObj; bGraphicDirty = sal_False; } + void SetBitmap( const Bitmap& rBmp ) { aGraphicObject = GraphicObject( Graphic( rBmp ) ); bGraphicDirty = sal_False; } void SetBitmapType( XBitmapType eNewType ) { eType = eNewType; } void SetBitmapStyle( XBitmapStyle eNewStyle ) { eStyle = eNewStyle; } - void SetPixelArray( const USHORT* pArray ); - void SetPixelSize( const Size& rSize ) { aArraySize = rSize; bGraphicDirty = TRUE; } - void SetPixelColor( const Color& rColor ) { aPixelColor = rColor; bGraphicDirty = TRUE; } - void SetBackgroundColor( const Color& rColor ) { aBckgrColor = rColor; bGraphicDirty = TRUE; } + void SetPixelArray( const sal_uInt16* pArray ); + void SetPixelSize( const Size& rSize ) { aArraySize = rSize; bGraphicDirty = sal_True; } + void SetPixelColor( const Color& rColor ) { aPixelColor = rColor; bGraphicDirty = sal_True; } + void SetBackgroundColor( const Color& rColor ) { aBckgrColor = rColor; bGraphicDirty = sal_True; } XBitmapType GetBitmapType() const { return eType; } XBitmapStyle GetBitmapStyle() const { return eStyle; } const GraphicObject& GetGraphicObject() const; Bitmap GetBitmap() const; - USHORT* GetPixelArray() const { return pPixelArray; } + sal_uInt16* GetPixelArray() const { return pPixelArray; } Color GetPixelColor() const { return aPixelColor; } Color GetBackgroundColor() const { return aBckgrColor; } }; diff --git a/svx/inc/svx/xbtmpit.hxx b/svx/inc/svx/xbtmpit.hxx index f604b99493..aefe801f44 100644..100755 --- a/svx/inc/svx/xbtmpit.hxx +++ b/svx/inc/svx/xbtmpit.hxx @@ -51,16 +51,16 @@ public: XFillBitmapItem( SfxItemPool* pPool, const XOBitmap& rTheBitmap ); XFillBitmapItem( SfxItemPool* pPool ); XFillBitmapItem( const XFillBitmapItem& rItem ); - XFillBitmapItem( SvStream& rIn, USHORT nVer = 0 ); + XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer = 0 ); virtual int operator==( const SfxPoolItem& rItem ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; - virtual SvStream& Store( SvStream& rOut, USHORT nItemVersion ) const; - virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; + virtual SvStream& Store( SvStream& rOut, sal_uInt16 nItemVersion ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -70,7 +70,7 @@ public: const XOBitmap& GetBitmapValue( const XBitmapTable* pTable = 0 ) const; // GetValue -> GetBitmapValue void SetBitmapValue( const XOBitmap& rNew ) { aXOBitmap = rNew; Detach(); } // SetValue -> SetBitmapValue - static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XFillBitmapItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/svx/inc/svx/xcolit.hxx b/svx/inc/svx/xcolit.hxx index 884da1e411..0be2dcb1cd 100644..100755 --- a/svx/inc/svx/xcolit.hxx +++ b/svx/inc/svx/xcolit.hxx @@ -46,19 +46,19 @@ class SVX_DLLPUBLIC XColorItem : public NameOrIndex public: TYPEINFO(); XColorItem() {} - XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor); + XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor); - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - XColorItem(USHORT nWhich, const String& rName, const Color& rTheColor); - XColorItem(USHORT nWhich, SvStream& rIn); + XColorItem(sal_uInt16 nWhich, const String& rName, const Color& rTheColor); + XColorItem(sal_uInt16 nWhich, SvStream& rIn); XColorItem(const XColorItem& rItem); virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; const Color& GetColorValue(const XColorTable* pTable = 0) const; void SetColorValue(const Color& rNew) { aColor = rNew; Detach(); } diff --git a/svx/inc/svx/xdash.hxx b/svx/inc/svx/xdash.hxx index 151e89edeb..a736c5dea4 100644..100755 --- a/svx/inc/svx/xdash.hxx +++ b/svx/inc/svx/xdash.hxx @@ -42,32 +42,32 @@ class SVX_DLLPUBLIC XDash { protected: XDashStyle eDash; - USHORT nDots; - ULONG nDotLen; - USHORT nDashes; - ULONG nDashLen; - ULONG nDistance; + sal_uInt16 nDots; + sal_uIntPtr nDotLen; + sal_uInt16 nDashes; + sal_uIntPtr nDashLen; + sal_uIntPtr nDistance; public: XDash(XDashStyle eDash = XDASH_RECT, - USHORT nDots = 1, ULONG nDotLen = 20, - USHORT nDashes = 1, ULONG nDashLen = 20, ULONG nDistance = 20); + sal_uInt16 nDots = 1, sal_uIntPtr nDotLen = 20, + sal_uInt16 nDashes = 1, sal_uIntPtr nDashLen = 20, sal_uIntPtr nDistance = 20); bool operator==(const XDash& rDash) const; void SetDashStyle(XDashStyle eNewStyle) { eDash = eNewStyle; } - void SetDots(USHORT nNewDots) { nDots = nNewDots; } - void SetDotLen(ULONG nNewDotLen) { nDotLen = nNewDotLen; } - void SetDashes(USHORT nNewDashes) { nDashes = nNewDashes; } - void SetDashLen(ULONG nNewDashLen) { nDashLen = nNewDashLen; } - void SetDistance(ULONG nNewDistance) { nDistance = nNewDistance; } + void SetDots(sal_uInt16 nNewDots) { nDots = nNewDots; } + void SetDotLen(sal_uIntPtr nNewDotLen) { nDotLen = nNewDotLen; } + void SetDashes(sal_uInt16 nNewDashes) { nDashes = nNewDashes; } + void SetDashLen(sal_uIntPtr nNewDashLen) { nDashLen = nNewDashLen; } + void SetDistance(sal_uIntPtr nNewDistance) { nDistance = nNewDistance; } XDashStyle GetDashStyle() const { return eDash; } - USHORT GetDots() const { return nDots; } - ULONG GetDotLen() const { return nDotLen; } - USHORT GetDashes() const { return nDashes; } - ULONG GetDashLen() const { return nDashLen; } - ULONG GetDistance() const { return nDistance; } + sal_uInt16 GetDots() const { return nDots; } + sal_uIntPtr GetDotLen() const { return nDotLen; } + sal_uInt16 GetDashes() const { return nDashes; } + sal_uIntPtr GetDashLen() const { return nDashLen; } + sal_uIntPtr GetDistance() const { return nDistance; } // XDash is translated into an array of doubles which describe the lengths of the // dashes, dots and empty passages. It returns the complete length of the full DashDot diff --git a/svx/inc/svx/xdef.hxx b/svx/inc/svx/xdef.hxx index 3b9f5c0cc1..6600a8e202 100644..100755 --- a/svx/inc/svx/xdef.hxx +++ b/svx/inc/svx/xdef.hxx @@ -37,7 +37,8 @@ |* \************************************************************************/ -#define COL_DEFAULT_SHAPE_FILLING RGB_COLORDATA( 153, 204, 255 ) // blue 8 +#define COL_DEFAULT_SHAPE_FILLING RGB_COLORDATA( 0xCF, 0xE7, 0xE5 ) +#define COL_DEFAULT_SHAPE_STROKE RGB_COLORDATA( 128, 128, 128 ) #define XATTR_START 1000 diff --git a/svx/inc/svx/xenum.hxx b/svx/inc/svx/xenum.hxx index 6a19588533..6a19588533 100644..100755 --- a/svx/inc/svx/xenum.hxx +++ b/svx/inc/svx/xenum.hxx diff --git a/svx/inc/xexch.hxx b/svx/inc/svx/xexch.hxx index ae997866e0..1b2092625d 100644..100755 --- a/svx/inc/xexch.hxx +++ b/svx/inc/svx/xexch.hxx @@ -60,7 +60,7 @@ public: SVX_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rXFillExchangeData ); SVX_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, XFillExchangeData& rXFillExchangeData ); - static ULONG RegisterClipboardFormatName(); + static sal_uLong RegisterClipboardFormatName(); XFillAttrSetItem* GetXFillAttrSetItem() { return pXFillAttrSetItem; } }; diff --git a/svx/inc/svx/xfillit.hxx b/svx/inc/svx/xfillit.hxx index 3a0d9aa7b7..3a0d9aa7b7 100644..100755 --- a/svx/inc/svx/xfillit.hxx +++ b/svx/inc/svx/xfillit.hxx diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx index 50e63a0137..1d00fc03de 100644..100755 --- a/svx/inc/svx/xfillit0.hxx +++ b/svx/inc/svx/xfillit0.hxx @@ -47,16 +47,16 @@ public: XFillStyleItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; XFillStyle GetValue() const { return (XFillStyle) SfxEnumItem::GetValue(); } }; diff --git a/svx/inc/svx/xflasit.hxx b/svx/inc/svx/xflasit.hxx index 363463cdd0..2a8b7350dd 100644..100755 --- a/svx/inc/svx/xflasit.hxx +++ b/svx/inc/svx/xflasit.hxx @@ -48,8 +48,8 @@ public: XFillAttrSetItem(const XFillAttrSetItem& rAttr, SfxItemPool* pItemPool); virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVersion ) const; - virtual SvStream& Store( SvStream& rStream, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVersion ) const; + virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const; }; #endif diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx index 5c74202fa5..05643f7eea 100644..100755 --- a/svx/inc/svx/xflbckit.hxx +++ b/svx/inc/svx/xflbckit.hxx @@ -43,12 +43,12 @@ class SVX_DLLPUBLIC XFillBackgroundItem : public SfxBoolItem public: TYPEINFO(); - XFillBackgroundItem( BOOL bFill = FALSE ); + XFillBackgroundItem( sal_Bool bFill = sal_False ); SVX_DLLPRIVATE XFillBackgroundItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx index d4591193cd..f354477929 100644..100755 --- a/svx/inc/svx/xflbmpit.hxx +++ b/svx/inc/svx/xflbmpit.hxx @@ -46,14 +46,14 @@ public: SVX_DLLPRIVATE XFillBmpPosItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - SVX_DLLPRIVATE virtual USHORT GetValueCount() const; + SVX_DLLPRIVATE virtual sal_uInt16 GetValueCount() const; SVX_DLLPRIVATE RECT_POINT GetValue() const { return (RECT_POINT) SfxEnumItem::GetValue(); } }; diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx index f420c1f7bc..9bcbe5f638 100644..100755 --- a/svx/inc/svx/xflbmsli.hxx +++ b/svx/inc/svx/xflbmsli.hxx @@ -42,11 +42,11 @@ class SVX_DLLPUBLIC XFillBmpSizeLogItem : public SfxBoolItem { public: TYPEINFO(); - XFillBmpSizeLogItem( BOOL bLog = TRUE ); + XFillBmpSizeLogItem( sal_Bool bLog = sal_True ); SVX_DLLPRIVATE XFillBmpSizeLogItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx index 2007430545..98f6eacaff 100644..100755 --- a/svx/inc/svx/xflbmsxy.hxx +++ b/svx/inc/svx/xflbmsxy.hxx @@ -46,7 +46,7 @@ public: SVX_DLLPRIVATE XFillBmpSizeXItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -73,7 +73,7 @@ public: SVX_DLLPRIVATE XFillBmpSizeYItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx index e2c1f81821..d712a6f74a 100644..100755 --- a/svx/inc/svx/xflbmtit.hxx +++ b/svx/inc/svx/xflbmtit.hxx @@ -42,11 +42,11 @@ class SVX_DLLPUBLIC XFillBmpTileItem : public SfxBoolItem { public: TYPEINFO(); - XFillBmpTileItem( BOOL bTile = TRUE ); + XFillBmpTileItem( sal_Bool bTile = sal_True ); XFillBmpTileItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx index eb9b5173a9..280f6aeeb1 100644..100755 --- a/svx/inc/svx/xflboxy.hxx +++ b/svx/inc/svx/xflboxy.hxx @@ -42,11 +42,11 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetXItem : public SfxUInt16Item { public: TYPEINFO(); - XFillBmpPosOffsetXItem( USHORT nOffPosX = 0 ); + XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX = 0 ); SVX_DLLPRIVATE XFillBmpPosOffsetXItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -65,11 +65,11 @@ class SVX_DLLPUBLIC XFillBmpPosOffsetYItem : public SfxUInt16Item { public: TYPEINFO(); - XFillBmpPosOffsetYItem( USHORT nOffPosY = 0 ); + XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY = 0 ); SVX_DLLPRIVATE XFillBmpPosOffsetYItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx index 804582933a..d4b7d321f9 100644..100755 --- a/svx/inc/svx/xflbstit.hxx +++ b/svx/inc/svx/xflbstit.hxx @@ -42,11 +42,11 @@ class SVX_DLLPUBLIC XFillBmpStretchItem : public SfxBoolItem { public: TYPEINFO(); - XFillBmpStretchItem( BOOL bStretch = TRUE ); + XFillBmpStretchItem( sal_Bool bStretch = sal_True ); XFillBmpStretchItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx index 4fe87bcffe..c6a15c5b76 100644..100755 --- a/svx/inc/svx/xflbtoxy.hxx +++ b/svx/inc/svx/xflbtoxy.hxx @@ -42,11 +42,11 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetXItem : public SfxUInt16Item { public: TYPEINFO(); - XFillBmpTileOffsetXItem( USHORT nOffX = 0 ); + XFillBmpTileOffsetXItem( sal_uInt16 nOffX = 0 ); SVX_DLLPRIVATE XFillBmpTileOffsetXItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -65,11 +65,11 @@ class SVX_DLLPUBLIC XFillBmpTileOffsetYItem : public SfxUInt16Item { public: TYPEINFO(); - XFillBmpTileOffsetYItem( USHORT nOffX = 0 ); + XFillBmpTileOffsetYItem( sal_uInt16 nOffX = 0 ); SVX_DLLPRIVATE XFillBmpTileOffsetYItem( SvStream& rIn ); SVX_DLLPRIVATE virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflclit.hxx b/svx/inc/svx/xflclit.hxx index b6194eb9b5..b11aae9a50 100644..100755 --- a/svx/inc/svx/xflclit.hxx +++ b/svx/inc/svx/xflclit.hxx @@ -44,15 +44,15 @@ class SVX_DLLPUBLIC XFillColorItem : public XColorItem public: TYPEINFO(); XFillColorItem() {} - XFillColorItem(INT32 nIndex, const Color& rTheColor); + XFillColorItem(sal_Int32 nIndex, const Color& rTheColor); XFillColorItem(const String& rName, const Color& rTheColor); XFillColorItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xflftrit.hxx b/svx/inc/svx/xflftrit.hxx index 92c85b6304..6288f4c9d4 100644..100755 --- a/svx/inc/svx/xflftrit.hxx +++ b/svx/inc/svx/xflftrit.hxx @@ -42,31 +42,31 @@ private: long nDummy1; long nDummy2; - BOOL bEnabled; + sal_Bool bEnabled; public: TYPEINFO(); XFillFloatTransparenceItem(); - XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable = TRUE ); - XFillFloatTransparenceItem(const String& rName, const XGradient& rGradient, BOOL bEnable = TRUE ); - XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, BOOL bEnable = TRUE ); + XFillFloatTransparenceItem( sal_Int32 nIndex, const XGradient& rGradient, sal_Bool bEnable = sal_True ); + XFillFloatTransparenceItem(const String& rName, const XGradient& rGradient, sal_Bool bEnable = sal_True ); + XFillFloatTransparenceItem(SfxItemPool* pPool, const XGradient& rTheGradient, sal_Bool bEnable = sal_True ); XFillFloatTransparenceItem(SfxItemPool* pPool ); XFillFloatTransparenceItem( const XFillFloatTransparenceItem& rItem ); virtual int operator==( const SfxPoolItem& rItem ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * pIntlWrapper = 0 ) const; - BOOL IsEnabled() const { return bEnabled; } - void SetEnabled( BOOL bEnable ) { bEnabled = bEnable; } + sal_Bool IsEnabled() const { return bEnabled; } + void SetEnabled( sal_Bool bEnable ) { bEnabled = bEnable; } - static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XFillFloatTransparenceItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/svx/inc/svx/xflgrit.hxx b/svx/inc/svx/xflgrit.hxx index a3fb726ffc..324a6a589c 100644..100755 --- a/svx/inc/svx/xflgrit.hxx +++ b/svx/inc/svx/xflgrit.hxx @@ -45,21 +45,21 @@ class SVX_DLLPUBLIC XFillGradientItem : public NameOrIndex public: TYPEINFO(); XFillGradientItem() : NameOrIndex(XATTR_FILLGRADIENT, -1) {} - XFillGradientItem(INT32 nIndex, const XGradient& rTheGradient); + XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient); XFillGradientItem(const UniString& rName, const XGradient& rTheGradient); XFillGradientItem(SfxItemPool* pPool, const XGradient& rTheGradient); XFillGradientItem(SfxItemPool* pPool ); XFillGradientItem(const XFillGradientItem& rItem); - XFillGradientItem(SvStream& rIn, USHORT nVer = 0); + XFillGradientItem(SvStream& rIn, sal_uInt16 nVer = 0); virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; - virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -67,7 +67,7 @@ public: const XGradient& GetGradientValue(const XGradientTable* pTable = 0) const; // GetValue -> GetGradientValue void SetGradientValue(const XGradient& rNew) { aGradient = rNew; Detach(); } // SetValue -> SetGradientValue - static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XFillGradientItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/svx/inc/svx/xflhtit.hxx b/svx/inc/svx/xflhtit.hxx index ce12f8a832..be27b4136e 100644..100755 --- a/svx/inc/svx/xflhtit.hxx +++ b/svx/inc/svx/xflhtit.hxx @@ -45,7 +45,7 @@ class SVX_DLLPUBLIC XFillHatchItem : public NameOrIndex public: TYPEINFO(); XFillHatchItem() : NameOrIndex(XATTR_FILLHATCH, -1) {} - XFillHatchItem(INT32 nIndex, const XHatch& rTheHatch); + XFillHatchItem(sal_Int32 nIndex, const XHatch& rTheHatch); XFillHatchItem(const String& rName, const XHatch& rTheHatch); XFillHatchItem(SfxItemPool* pPool, const XHatch& rTheHatch); XFillHatchItem(SfxItemPool* pPool ); @@ -54,11 +54,11 @@ public: virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -69,7 +69,7 @@ public: const XHatch& GetHatchValue(const XHatchTable* pTable = 0) const; // GetValue -> GetHatchValue void SetHatchValue(const XHatch& rNew) { aHatch = rNew; Detach(); } // SetValue -> SetHatchValue - static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XFillHatchItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx index a6d9b11e57..4c9a229273 100644..100755 --- a/svx/inc/svx/xfltrit.hxx +++ b/svx/inc/svx/xfltrit.hxx @@ -42,10 +42,10 @@ class SVX_DLLPUBLIC XFillTransparenceItem: public SfxUInt16Item { public: TYPEINFO(); - XFillTransparenceItem(USHORT nFillTransparence = 0); + XFillTransparenceItem(sal_uInt16 nFillTransparence = 0); XFillTransparenceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx index 0973c0c596..021135bca8 100644..100755 --- a/svx/inc/svx/xftadit.hxx +++ b/svx/inc/svx/xftadit.hxx @@ -45,12 +45,12 @@ public: XFormTextAdjustItem(XFormTextAdjust = XFT_CENTER); XFormTextAdjustItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; XFormTextAdjust GetValue() const { return (XFormTextAdjust) SfxEnumItem::GetValue(); } // #FontWork# - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif diff --git a/svx/inc/svx/xftdiit.hxx b/svx/inc/svx/xftdiit.hxx index 5236533d6c..f0de84f397 100644..100755 --- a/svx/inc/svx/xftdiit.hxx +++ b/svx/inc/svx/xftdiit.hxx @@ -45,7 +45,7 @@ public: XFormTextDistanceItem(long nDist = 0); XFormTextDistanceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/xftmrit.hxx b/svx/inc/svx/xftmrit.hxx index 7a549d1500..2a2d431bef 100644..100755 --- a/svx/inc/svx/xftmrit.hxx +++ b/svx/inc/svx/xftmrit.hxx @@ -42,10 +42,10 @@ class SVX_DLLPUBLIC XFormTextMirrorItem : public SfxBoolItem { public: TYPEINFO(); - XFormTextMirrorItem(BOOL bMirror = FALSE); + XFormTextMirrorItem(sal_Bool bMirror = sal_False); XFormTextMirrorItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/xftouit.hxx b/svx/inc/svx/xftouit.hxx index e7f05862f8..54db94c896 100644..100755 --- a/svx/inc/svx/xftouit.hxx +++ b/svx/inc/svx/xftouit.hxx @@ -41,10 +41,10 @@ class SVX_DLLPUBLIC XFormTextOutlineItem : public SfxBoolItem { public: TYPEINFO(); - XFormTextOutlineItem(BOOL bOutline = FALSE); + XFormTextOutlineItem(sal_Bool bOutline = sal_False); XFormTextOutlineItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/xftsfit.hxx b/svx/inc/svx/xftsfit.hxx index 58ee833d2d..d929d43f19 100644..100755 --- a/svx/inc/svx/xftsfit.hxx +++ b/svx/inc/svx/xftsfit.hxx @@ -44,12 +44,12 @@ public: XFormTextStdFormItem(XFormTextStdForm = XFTFORM_NONE); XFormTextStdFormItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; XFormTextStdForm GetValue() const { return (XFormTextStdForm) SfxEnumItem::GetValue(); } // #FontWork# - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif diff --git a/svx/inc/svx/xftshcit.hxx b/svx/inc/svx/xftshcit.hxx index eb8d670750..c924a81d11 100644..100755 --- a/svx/inc/svx/xftshcit.hxx +++ b/svx/inc/svx/xftshcit.hxx @@ -43,12 +43,12 @@ class SVX_DLLPUBLIC XFormTextShadowColorItem : public XColorItem public: TYPEINFO(); XFormTextShadowColorItem() {} - XFormTextShadowColorItem(INT32 nIndex, const Color& rTheColor); + XFormTextShadowColorItem(sal_Int32 nIndex, const Color& rTheColor); XFormTextShadowColorItem(const String& rName, const Color& rTheColor); XFormTextShadowColorItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx index 5d098153af..c4646666fb 100644..100755 --- a/svx/inc/svx/xftshit.hxx +++ b/svx/inc/svx/xftshit.hxx @@ -45,12 +45,12 @@ public: XFormTextShadowItem(XFormTextShadow = XFTSHADOW_NONE); XFormTextShadowItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; XFormTextShadow GetValue() const { return (XFormTextShadow) SfxEnumItem::GetValue(); } // #FontWork# - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; #endif diff --git a/svx/inc/svx/xftshtit.hxx b/svx/inc/svx/xftshtit.hxx index 0abb9a3a4d..d641a34565 100644..100755 --- a/svx/inc/svx/xftshtit.hxx +++ b/svx/inc/svx/xftshtit.hxx @@ -41,10 +41,10 @@ class XFormTextShadowTranspItem: public SfxUInt16Item { public: TYPEINFO(); - XFormTextShadowTranspItem(USHORT nShdwTransparence = 0); + XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence = 0); XFormTextShadowTranspItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/xftshxy.hxx b/svx/inc/svx/xftshxy.hxx index 7c5dbae59b..f46dfb5c8a 100644..100755 --- a/svx/inc/svx/xftshxy.hxx +++ b/svx/inc/svx/xftshxy.hxx @@ -45,7 +45,7 @@ public: XFormTextShadowXValItem(long nVal = 0); XFormTextShadowXValItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; /************************************************************************* @@ -61,7 +61,7 @@ public: XFormTextShadowYValItem(long nVal = 0); XFormTextShadowYValItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/xftstit.hxx b/svx/inc/svx/xftstit.hxx index 5cc74b2979..23c06d56dc 100644..100755 --- a/svx/inc/svx/xftstit.hxx +++ b/svx/inc/svx/xftstit.hxx @@ -45,7 +45,7 @@ public: XFormTextStartItem(long nStart = 0); XFormTextStartItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/xgrad.hxx b/svx/inc/svx/xgrad.hxx index f905c3b0c0..62ba584480 100644..100755 --- a/svx/inc/svx/xgrad.hxx +++ b/svx/inc/svx/xgrad.hxx @@ -44,20 +44,20 @@ protected: Color aStartColor; Color aEndColor; long nAngle; - USHORT nBorder; - USHORT nOfsX; - USHORT nOfsY; - USHORT nIntensStart; - USHORT nIntensEnd; - USHORT nStepCount; + sal_uInt16 nBorder; + sal_uInt16 nOfsX; + sal_uInt16 nOfsY; + sal_uInt16 nIntensStart; + sal_uInt16 nIntensEnd; + sal_uInt16 nStepCount; public: XGradient(); XGradient( const Color& rStart, const Color& rEnd, XGradientStyle eStyle = XGRAD_LINEAR, long nAngle = 0, - USHORT nXOfs = 50, USHORT nYOfs = 50, USHORT nBorder = 0, - USHORT nStartIntens = 100, USHORT nEndIntens = 100, - USHORT nSteps = 0 ); + sal_uInt16 nXOfs = 50, sal_uInt16 nYOfs = 50, sal_uInt16 nBorder = 0, + sal_uInt16 nStartIntens = 100, sal_uInt16 nEndIntens = 100, + sal_uInt16 nSteps = 0 ); bool operator==(const XGradient& rGradient) const; @@ -65,23 +65,23 @@ public: void SetStartColor(const Color& rColor) { aStartColor = rColor; } void SetEndColor(const Color& rColor) { aEndColor = rColor; } void SetAngle(long nNewAngle) { nAngle = nNewAngle; } - void SetBorder(USHORT nNewBorder) { nBorder = nNewBorder; } - void SetXOffset(USHORT nNewOffset) { nOfsX = nNewOffset; } - void SetYOffset(USHORT nNewOffset) { nOfsY = nNewOffset; } - void SetStartIntens(USHORT nNewIntens) { nIntensStart = nNewIntens; } - void SetEndIntens(USHORT nNewIntens) { nIntensEnd = nNewIntens; } - void SetSteps(USHORT nSteps) { nStepCount = nSteps; } + void SetBorder(sal_uInt16 nNewBorder) { nBorder = nNewBorder; } + void SetXOffset(sal_uInt16 nNewOffset) { nOfsX = nNewOffset; } + void SetYOffset(sal_uInt16 nNewOffset) { nOfsY = nNewOffset; } + void SetStartIntens(sal_uInt16 nNewIntens) { nIntensStart = nNewIntens; } + void SetEndIntens(sal_uInt16 nNewIntens) { nIntensEnd = nNewIntens; } + void SetSteps(sal_uInt16 nSteps) { nStepCount = nSteps; } XGradientStyle GetGradientStyle() const { return eStyle; } Color GetStartColor() const { return aStartColor; } Color GetEndColor() const { return aEndColor; } long GetAngle() const { return nAngle; } - USHORT GetBorder() const { return nBorder; } - USHORT GetXOffset() const { return nOfsX; } - USHORT GetYOffset() const { return nOfsY; } - USHORT GetStartIntens() const { return nIntensStart; } - USHORT GetEndIntens() const { return nIntensEnd; } - USHORT GetSteps() const { return nStepCount; } + sal_uInt16 GetBorder() const { return nBorder; } + sal_uInt16 GetXOffset() const { return nOfsX; } + sal_uInt16 GetYOffset() const { return nOfsY; } + sal_uInt16 GetStartIntens() const { return nIntensStart; } + sal_uInt16 GetEndIntens() const { return nIntensEnd; } + sal_uInt16 GetSteps() const { return nStepCount; } }; #endif diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx index 43f0b476b3..3af33c8447 100644..100755 --- a/svx/inc/svx/xgrscit.hxx +++ b/svx/inc/svx/xgrscit.hxx @@ -42,10 +42,10 @@ class SVX_DLLPUBLIC XGradientStepCountItem: public SfxUInt16Item { public: TYPEINFO(); - XGradientStepCountItem( USHORT nStepCount = 0 ); + XGradientStepCountItem( sal_uInt16 nStepCount = 0 ); XGradientStepCountItem( SvStream& rIn ); virtual SfxPoolItem* Clone( SfxItemPool* pPool = NULL ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/svx/inc/svx/xhatch.hxx b/svx/inc/svx/xhatch.hxx index 4c1761a01d..4c1761a01d 100644..100755 --- a/svx/inc/svx/xhatch.hxx +++ b/svx/inc/svx/xhatch.hxx diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx index a825b84237..0ce35e8cda 100644..100755 --- a/svx/inc/svx/xit.hxx +++ b/svx/inc/svx/xit.hxx @@ -45,14 +45,14 @@ class SfxItemPool; class NameOrIndex; class XPropertyList; -typedef BOOL (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 ); +typedef sal_Bool (*SvxCompareValueFunc)( const NameOrIndex* p1, const NameOrIndex* p2 ); //------------------- // class NameOrIndex //------------------- class SVX_DLLPUBLIC NameOrIndex : public SfxStringItem { - INT32 nPalIndex; + sal_Int32 nPalIndex; protected: void Detach() { nPalIndex = -1; } @@ -60,30 +60,30 @@ protected: public: TYPEINFO(); NameOrIndex() { nPalIndex = -1; } - NameOrIndex(USHORT nWhich, INT32 nIndex); - NameOrIndex(USHORT nWhich, + NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex); + NameOrIndex(sal_uInt16 nWhich, const String& rName= String()); - NameOrIndex(USHORT nWhich, SvStream& rIn); + NameOrIndex(sal_uInt16 nWhich, SvStream& rIn); NameOrIndex(const NameOrIndex& rNameOrIndex); ~NameOrIndex() {}; virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; String GetName() const { return GetValue(); } void SetName(const String& rName) { SetValue(rName); } - INT32 GetIndex() const { return nPalIndex; } - void SetIndex(INT32 nIndex) { nPalIndex = nIndex; } - BOOL IsIndex() const { return (nPalIndex >= 0); } + sal_Int32 GetIndex() const { return nPalIndex; } + void SetIndex(sal_Int32 nIndex) { nPalIndex = nIndex; } + sal_Bool IsIndex() const { return (nPalIndex >= 0); } /** this static checks if the given NameOrIndex item has a unique name for its value. The returned String is a unique name for an item with this value in both given pools. Argument pPool2 can be null. If returned string equals NameOrIndex->GetName(), the name was already unique. */ - static String CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, USHORT nPrefixResId, XPropertyList* pDefaults = NULL ); + static String CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* pPool2, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, XPropertyList* pDefaults = NULL ); }; #endif diff --git a/svx/inc/svx/xlineit.hxx b/svx/inc/svx/xlineit.hxx index d9afba2cfa..d9afba2cfa 100644..100755 --- a/svx/inc/svx/xlineit.hxx +++ b/svx/inc/svx/xlineit.hxx diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx index 26f5027db4..2a3ca2d0da 100644..100755 --- a/svx/inc/svx/xlineit0.hxx +++ b/svx/inc/svx/xlineit0.hxx @@ -43,16 +43,16 @@ public: XLineStyleItem(XLineStyle = XLINE_SOLID); XLineStyleItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; XLineStyle GetValue() const { return (XLineStyle) SfxEnumItem::GetValue(); } }; diff --git a/svx/inc/svx/xlinjoit.hxx b/svx/inc/svx/xlinjoit.hxx index 5680d2b26b..1f14ca05b3 100644..100755 --- a/svx/inc/svx/xlinjoit.hxx +++ b/svx/inc/svx/xlinjoit.hxx @@ -44,17 +44,17 @@ public: XLineJointItem( XLineJoint eLineJoint = XLINEJOINT_ROUND ); XLineJointItem( SvStream& rIn ); - virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; + virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + virtual SfxPoolItem* Create( SvStream& rIn, sal_uInt16 nVer ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; XLineJoint GetValue() const { return (XLineJoint) SfxEnumItem::GetValue(); } }; diff --git a/svx/inc/svx/xlnasit.hxx b/svx/inc/svx/xlnasit.hxx index 8a09266e3a..6c60814ba6 100644..100755 --- a/svx/inc/svx/xlnasit.hxx +++ b/svx/inc/svx/xlnasit.hxx @@ -49,8 +49,8 @@ public: XLineAttrSetItem(const XLineAttrSetItem& rAttr, SfxItemPool* pItemPool); virtual SfxPoolItem* Clone( SfxItemPool* pToPool ) const; - virtual SfxPoolItem* Create( SvStream& rStream, USHORT nVersion ) const; - virtual SvStream& Store( SvStream& rStream, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVersion ) const; + virtual SvStream& Store( SvStream& rStream, sal_uInt16 nItemVersion ) const; }; #endif diff --git a/svx/inc/svx/xlnclit.hxx b/svx/inc/svx/xlnclit.hxx index e5b930c3ba..c9fafe788d 100644..100755 --- a/svx/inc/svx/xlnclit.hxx +++ b/svx/inc/svx/xlnclit.hxx @@ -40,15 +40,15 @@ class SVX_DLLPUBLIC XLineColorItem : public XColorItem public: TYPEINFO(); XLineColorItem() {} - XLineColorItem(INT32 nIndex, const Color& rTheColor); + XLineColorItem(sal_Int32 nIndex, const Color& rTheColor); XLineColorItem(const String& rName, const Color& rTheColor); XLineColorItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx index d091ea9cc7..d66e130049 100644..100755 --- a/svx/inc/svx/xlndsit.hxx +++ b/svx/inc/svx/xlndsit.hxx @@ -46,7 +46,7 @@ class SVX_DLLPUBLIC XLineDashItem : public NameOrIndex public: TYPEINFO(); XLineDashItem() : NameOrIndex(XATTR_LINEDASH, -1) {} - XLineDashItem(INT32 nIndex, const XDash& rTheDash); + XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash); XLineDashItem(const String& rName, const XDash& rTheDash); XLineDashItem(SfxItemPool* pPool, const XDash& rTheDash); XLineDashItem(SfxItemPool* pPool ); @@ -55,11 +55,11 @@ public: virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -71,7 +71,7 @@ public: const XDash& GetDashValue(const XDashTable* pTable = 0) const; // GetValue -> GetDashValue void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue - static BOOL CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); + static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ); XLineDashItem* checkForUniqueItem( SdrModel* pModel ) const; }; diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx index 13a9bd9897..40e517e066 100644..100755 --- a/svx/inc/svx/xlnedcit.hxx +++ b/svx/inc/svx/xlnedcit.hxx @@ -39,13 +39,13 @@ class SVX_DLLPUBLIC XLineEndCenterItem : public SfxBoolItem { public: TYPEINFO(); - XLineEndCenterItem(BOOL bEndCenter = FALSE); + XLineEndCenterItem(sal_Bool bEndCenter = sal_False); XLineEndCenterItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xlnedit.hxx b/svx/inc/svx/xlnedit.hxx index e9f131e2e1..57a761c326 100644..100755 --- a/svx/inc/svx/xlnedit.hxx +++ b/svx/inc/svx/xlnedit.hxx @@ -44,7 +44,7 @@ class SVX_DLLPUBLIC XLineEndItem : public NameOrIndex public: TYPEINFO(); - XLineEndItem(INT32 nIndex = -1); + XLineEndItem(sal_Int32 nIndex = -1); XLineEndItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon); XLineEndItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon); XLineEndItem(SfxItemPool* pPool ); @@ -53,11 +53,11 @@ public: virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx index de84722e46..855f2ce30f 100644..100755 --- a/svx/inc/svx/xlnedwit.hxx +++ b/svx/inc/svx/xlnedwit.hxx @@ -45,10 +45,10 @@ public: XLineEndWidthItem(long nWidth = LINE_END_WIDTH_DEFAULT); XLineEndWidthItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx index 3e4a8da2fd..c46423b471 100644..100755 --- a/svx/inc/svx/xlnstcit.hxx +++ b/svx/inc/svx/xlnstcit.hxx @@ -39,13 +39,13 @@ class SVX_DLLPUBLIC XLineStartCenterItem : public SfxBoolItem { public: TYPEINFO(); - XLineStartCenterItem(BOOL bStartCenter = FALSE); + XLineStartCenterItem(sal_Bool bStartCenter = sal_False); XLineStartCenterItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xlnstit.hxx b/svx/inc/svx/xlnstit.hxx index 393a68367a..fdb54a1411 100644..100755 --- a/svx/inc/svx/xlnstit.hxx +++ b/svx/inc/svx/xlnstit.hxx @@ -44,7 +44,7 @@ class SVX_DLLPUBLIC XLineStartItem : public NameOrIndex public: TYPEINFO(); - XLineStartItem(INT32 nIndex = -1); + XLineStartItem(sal_Int32 nIndex = -1); XLineStartItem(const String& rName, const basegfx::B2DPolyPolygon& rPolyPolygon); XLineStartItem(SfxItemPool* pPool, const basegfx::B2DPolyPolygon& rPolyPolygon); XLineStartItem(SfxItemPool* pPool ); @@ -53,11 +53,11 @@ public: virtual int operator==(const SfxPoolItem& rItem) const; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual SvStream& Store(SvStream& rOut, USHORT nItemVersion ) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual SvStream& Store(SvStream& rOut, sal_uInt16 nItemVersion ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx index 6f17e4ff8b..4001ee39ed 100644..100755 --- a/svx/inc/svx/xlnstwit.hxx +++ b/svx/inc/svx/xlnstwit.hxx @@ -44,10 +44,10 @@ public: XLineStartWidthItem(long nWidth = LINE_START_WIDTH_DEFAULT); XLineStartWidthItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx index 213ac41478..bf9af91f61 100644..100755 --- a/svx/inc/svx/xlntrit.hxx +++ b/svx/inc/svx/xlntrit.hxx @@ -42,10 +42,10 @@ class SVX_DLLPUBLIC XLineTransparenceItem: public SfxUInt16Item { public: TYPEINFO(); - XLineTransparenceItem(USHORT nLineTransparence = 0); + XLineTransparenceItem(sal_uInt16 nLineTransparence = 0); XLineTransparenceItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = NULL) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx index 3ba8daf089..f12e356145 100644..100755 --- a/svx/inc/svx/xlnwtit.hxx +++ b/svx/inc/svx/xlnwtit.hxx @@ -42,10 +42,10 @@ public: XLineWidthItem(long nWidth = 0); XLineWidthItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/svx/inc/xmleohlp.hxx b/svx/inc/svx/xmleohlp.hxx index aa532d2388..aa532d2388 100644..100755 --- a/svx/inc/xmleohlp.hxx +++ b/svx/inc/svx/xmleohlp.hxx diff --git a/svx/inc/xmlexchg.hxx b/svx/inc/svx/xmlexchg.hxx index 08e753adf6..08e753adf6 100644..100755 --- a/svx/inc/xmlexchg.hxx +++ b/svx/inc/svx/xmlexchg.hxx diff --git a/svx/inc/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx index 67c637f8cf..669c3b8855 100644..100755 --- a/svx/inc/xmlgrhlp.hxx +++ b/svx/inc/svx/xmlgrhlp.hxx @@ -86,7 +86,7 @@ private: SVX_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage > ImplGetGraphicStorage( const ::rtl::OUString& rPictureStorageName ); SVX_DLLPRIVATE SvxGraphicHelperStream_Impl ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName, const ::rtl::OUString& rPictureStreamName, - BOOL bTruncate ); + sal_Bool bTruncate ); SVX_DLLPRIVATE String ImplGetGraphicMimeType( const String& rFileName ) const; SVX_DLLPRIVATE Graphic ImplReadGraphic( const ::rtl::OUString& rPictureStorageName, const ::rtl::OUString& rPictureStreamName ); @@ -100,7 +100,7 @@ protected: ~SvXMLGraphicHelper(); void Init( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& xXMLStorage, SvXMLGraphicHelperMode eCreateMode, - BOOL bDirect ); + sal_Bool bDirect ); virtual void SAL_CALL disposing(); @@ -109,7 +109,7 @@ public: static SvXMLGraphicHelper* Create( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& rXMLStorage, SvXMLGraphicHelperMode eCreateMode, - BOOL bDirect = TRUE ); + sal_Bool bDirect = sal_True ); static SvXMLGraphicHelper* Create( SvXMLGraphicHelperMode eCreateMode ); static void Destroy( SvXMLGraphicHelper* pSvXMLGraphicHelper ); @@ -137,7 +137,7 @@ namespace svx You should call dispose after you no longer need this component. - uses eCreateMode == GRAPHICHELPER_MODE_READ, bDirect == TRUE in + uses eCreateMode == GRAPHICHELPER_MODE_READ, bDirect == sal_True in SvXMLGraphicHelper */ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvXMLGraphicImportHelper_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception ); @@ -153,7 +153,7 @@ SVX_DLLPUBLIC ::rtl::OUString SAL_CALL SvXMLGraphicImportHelper_getImplementatio To write the Pictures stream, you have to call dispose at this component. Make sure you call dipose before you commit the parent storage. - uses eCreateMode == GRAPHICHELPER_MODE_WRITE, bDirect == TRUE in + uses eCreateMode == GRAPHICHELPER_MODE_WRITE, bDirect == sal_True in SvXMLGraphicHelper */ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvXMLGraphicExportHelper_createInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & rSMgr) throw( ::com::sun::star::uno::Exception ); diff --git a/svx/inc/xmlsecctrl.hxx b/svx/inc/svx/xmlsecctrl.hxx index f6da616aee..70a0620dac 100644..100755 --- a/svx/inc/xmlsecctrl.hxx +++ b/svx/inc/svx/xmlsecctrl.hxx @@ -47,10 +47,10 @@ private: public: SFX_DECL_STATUSBAR_CONTROL(); - XmlSecStatusBarControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb ); + XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ); ~XmlSecStatusBarControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); virtual void Command( const CommandEvent& rCEvt ); static long GetDefItemWidth( StatusBar& _rStatusBar ); diff --git a/svx/inc/xoutbmp.hxx b/svx/inc/svx/xoutbmp.hxx index d531947f0d..7a01ac7af6 100644..100755 --- a/svx/inc/xoutbmp.hxx +++ b/svx/inc/svx/xoutbmp.hxx @@ -68,24 +68,24 @@ public: static BitmapEx CreateQuickDrawBitmapEx( const Graphic& rGraphic, const OutputDevice& rCompDev, const MapMode& rMapMode, const Size& rLogSize, const Point& rPoint, const Size& rSize ); - static Graphic MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorFlags ); - static Animation MirrorAnimation( const Animation& rAnimation, BOOL bHMirr, BOOL bVMirr ); - static USHORT WriteGraphic( const Graphic& rGraphic, String& rFileName, - const String& rFilterName, const ULONG nFlags = 0L, + static Graphic MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags ); + static Animation MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr ); + static sal_uInt16 WriteGraphic( const Graphic& rGraphic, String& rFileName, + const String& rFilterName, const sal_uIntPtr nFlags = 0L, const Size* pMtfSize_100TH_MM = NULL ); static void DrawQuickDrawBitmapEx( OutputDevice* pOutDev, const Point& rPt, const Size& rSize, const BitmapEx& rBmpEx ); static void DrawTiledBitmapEx( OutputDevice* pOutDev, const Point& rStartPt, const Size& rGrfSize, const Rectangle& rTileRect, const BitmapEx& rBmpEx ); - static USHORT ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL, - GraphicFilter& rFilter, const USHORT nFormat, + static sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL, + GraphicFilter& rFilter, const sal_uInt16 nFormat, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData = NULL ); - static Bitmap DetectEdges( const Bitmap& rBmp, const BYTE cThreshold ); + static Bitmap DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ); - static Polygon GetCountour( const Bitmap& rBmp, const ULONG nContourFlags, - const BYTE cEdgeDetectThreshold = 50, + static Polygon GetCountour( const Bitmap& rBmp, const sal_uIntPtr nContourFlags, + const sal_uInt8 cEdgeDetectThreshold = 50, const Rectangle* pWorkRect = NULL ); }; @@ -93,7 +93,7 @@ public: // - DitherBitmap - // ---------------- -SVX_DLLPUBLIC BOOL DitherBitmap( Bitmap& rBitmap ); +SVX_DLLPUBLIC sal_Bool DitherBitmap( Bitmap& rBitmap ); #endif // _XOUTBMP_HXX diff --git a/svx/inc/svx/xpoly.hxx b/svx/inc/svx/xpoly.hxx index 0b41e3fd8f..42c783a79b 100644..100755 --- a/svx/inc/svx/xpoly.hxx +++ b/svx/inc/svx/xpoly.hxx @@ -46,11 +46,7 @@ class OutputDevice; #define XPOLYPOLY_APPEND 0xFFFF #define XPOLY_APPEND 0xFFFF -#ifdef WIN // Windows 16 Bit -#define XPOLY_MAXPOINTS 8160 /* =0xFF00/sizeof(Point), also mit etwas Platz! */ -#else #define XPOLY_MAXPOINTS 0xFFF0 /* Auch fuer die 32-Bitter etwas Luft lassen */ -#endif /************************************************************************/ // Punktstile im XPolygon: @@ -80,59 +76,59 @@ protected: void CheckReference(); // Hilfsfunktionen fuer Bezierkonvertierung - void SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT); + void SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT); void GenBezArc(const Point& rCenter, long nRx, long nRy, - long nXHdl, long nYHdl, USHORT nStart, USHORT nEnd, - USHORT nQuad, USHORT nFirst); - BOOL CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2); + long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd, + sal_uInt16 nQuad, sal_uInt16 nFirst); + sal_Bool CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2); public: - XPolygon( USHORT nSize=16, USHORT nResize=16 ); + XPolygon( sal_uInt16 nSize=16, sal_uInt16 nResize=16 ); XPolygon( const XPolygon& rXPoly ); XPolygon( const Polygon& rPoly ); XPolygon( const Rectangle& rRect, long nRx = 0, long nRy = 0 ); XPolygon( const Point& rCenter, long nRx, long nRy, - USHORT nStartAngle = 0, USHORT nEndAngle = 3600, - BOOL bClose = TRUE ); + sal_uInt16 nStartAngle = 0, sal_uInt16 nEndAngle = 3600, + sal_Bool bClose = sal_True ); ~XPolygon(); - void SetSize( USHORT nSize ); - USHORT GetSize() const; + void SetSize( sal_uInt16 nSize ); + sal_uInt16 GetSize() const; - void SetPointCount( USHORT nPoints ); - USHORT GetPointCount() const; + void SetPointCount( sal_uInt16 nPoints ); + sal_uInt16 GetPointCount() const; - void Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags ); - void Insert( USHORT nPos, const XPolygon& rXPoly ); - void Insert( USHORT nPos, const Polygon& rPoly ); - void Remove( USHORT nPos, USHORT nCount ); + void Insert( sal_uInt16 nPos, const Point& rPt, XPolyFlags eFlags ); + void Insert( sal_uInt16 nPos, const XPolygon& rXPoly ); + void Insert( sal_uInt16 nPos, const Polygon& rPoly ); + void Remove( sal_uInt16 nPos, sal_uInt16 nCount ); void Move( long nHorzMove, long nVertMove ); Rectangle GetBoundRect() const; - const Point& operator[]( USHORT nPos ) const; - Point& operator[]( USHORT nPos ); + const Point& operator[]( sal_uInt16 nPos ) const; + Point& operator[]( sal_uInt16 nPos ); XPolygon& operator=( const XPolygon& rXPoly ); - BOOL operator==( const XPolygon& rXPoly ) const; - BOOL operator!=( const XPolygon& rXPoly ) const; + sal_Bool operator==( const XPolygon& rXPoly ) const; + sal_Bool operator!=( const XPolygon& rXPoly ) const; - XPolyFlags GetFlags( USHORT nPos ) const; - void SetFlags( USHORT nPos, XPolyFlags eFlags ); - BOOL IsControl(USHORT nPos) const; - BOOL IsSmooth(USHORT nPos) const; + XPolyFlags GetFlags( sal_uInt16 nPos ) const; + void SetFlags( sal_uInt16 nPos, XPolyFlags eFlags ); + sal_Bool IsControl(sal_uInt16 nPos) const; + sal_Bool IsSmooth(sal_uInt16 nPos) const; // Abstand zwischen zwei Punkten - double CalcDistance(USHORT nP1, USHORT nP2); + double CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2); // Bezierkonvertierungen - void CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt); - void CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext); - void PointsToBezier(USHORT nFirst); + void CalcSmoothJoin(sal_uInt16 nCenter, sal_uInt16 nDrag, sal_uInt16 nPnt); + void CalcTangent(sal_uInt16 nCenter, sal_uInt16 nPrev, sal_uInt16 nNext); + void PointsToBezier(sal_uInt16 nFirst); // Transformationen void Translate(const Point& rTrans); void Rotate(const Point& rCenter, double fSin, double fCos); - void Rotate(const Point& rCenter, USHORT nAngle); + void Rotate(const Point& rCenter, sal_uInt16 nAngle); void Scale(double fSx, double fSy); void SlantX(long nYRef, double fSin, double fCos); void SlantY(long nXRef, double fSin, double fCos); @@ -165,7 +161,7 @@ protected: void CheckReference(); public: - XPolyPolygon( USHORT nInitSize = 16, USHORT nResize = 16 ); + XPolyPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize = 16 ); XPolyPolygon( const XPolygon& rXPoly ); XPolyPolygon( const XPolyPolygon& rXPolyPoly ); XPolyPolygon( const PolyPolygon& rPolyPoly); @@ -173,31 +169,31 @@ public: ~XPolyPolygon(); void Insert( const XPolygon& rXPoly, - USHORT nPos = XPOLYPOLY_APPEND ); + sal_uInt16 nPos = XPOLYPOLY_APPEND ); void Insert( const XPolyPolygon& rXPoly, - USHORT nPos=XPOLYPOLY_APPEND ); - XPolygon Remove( USHORT nPos ); - XPolygon Replace( const XPolygon& rXPoly, USHORT nPos ); - const XPolygon& GetObject( USHORT nPos ) const; + sal_uInt16 nPos=XPOLYPOLY_APPEND ); + XPolygon Remove( sal_uInt16 nPos ); + XPolygon Replace( const XPolygon& rXPoly, sal_uInt16 nPos ); + const XPolygon& GetObject( sal_uInt16 nPos ) const; void Clear(); - USHORT Count() const; + sal_uInt16 Count() const; void Move( long nHorzMove, long nVertMove ); Rectangle GetBoundRect() const; - const XPolygon& operator[]( USHORT nPos ) const + const XPolygon& operator[]( sal_uInt16 nPos ) const { return GetObject( nPos ); } - XPolygon& operator[]( USHORT nPos ); + XPolygon& operator[]( sal_uInt16 nPos ); XPolyPolygon& operator=( const XPolyPolygon& rXPolyPoly ); - BOOL operator==( const XPolyPolygon& rXPolyPoly ) const; - BOOL operator!=( const XPolyPolygon& rXPolyPoly ) const; + sal_Bool operator==( const XPolyPolygon& rXPolyPoly ) const; + sal_Bool operator!=( const XPolyPolygon& rXPolyPoly ) const; // Transformationen void Translate(const Point& rTrans); void Rotate(const Point& rCenter, double fSin, double fCos); - void Rotate(const Point& rCenter, USHORT nAngle); + void Rotate(const Point& rCenter, sal_uInt16 nAngle); void Scale(double fSx, double fSy); void SlantX(long nYRef, double fSin, double fCos); void SlantY(long nXRef, double fSin, double fCos); diff --git a/svx/inc/svx/xpool.hxx b/svx/inc/svx/xpool.hxx index 0fee8edfae..0fee8edfae 100644..100755 --- a/svx/inc/svx/xpool.hxx +++ b/svx/inc/svx/xpool.hxx diff --git a/svx/inc/svx/xsetit.hxx b/svx/inc/svx/xsetit.hxx index c964684bf4..c964684bf4 100644..100755 --- a/svx/inc/svx/xsetit.hxx +++ b/svx/inc/svx/xsetit.hxx diff --git a/svx/inc/svx/xsflclit.hxx b/svx/inc/svx/xsflclit.hxx index f3838dc39c..7d179c3cd8 100644..100755 --- a/svx/inc/svx/xsflclit.hxx +++ b/svx/inc/svx/xsflclit.hxx @@ -39,19 +39,19 @@ class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem public: TYPEINFO(); SVX_DLLPRIVATE XSecondaryFillColorItem() {} - SVX_DLLPRIVATE XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor); + SVX_DLLPRIVATE XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor); XSecondaryFillColorItem(const String& rName, const Color& rTheColor); SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn); SVX_DLLPRIVATE virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + SVX_DLLPRIVATE virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; SVX_DLLPRIVATE virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, String &rText, const IntlWrapper * = 0 ) const; - SVX_DLLPRIVATE virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; + SVX_DLLPRIVATE virtual sal_uInt16 GetVersion( sal_uInt16 nFileFormatVersion ) const; }; diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx index 053bf1303e..5a26bff796 100644..100755 --- a/svx/inc/svx/xtable.hxx +++ b/svx/inc/svx/xtable.hxx @@ -198,14 +198,14 @@ protected: Table aTable; Table* pBmpTable; - BOOL bTableDirty; - BOOL bBitmapsDirty; - BOOL bOwnPool; + sal_Bool bTableDirty; + sal_Bool bBitmapsDirty; + sal_Bool bOwnPool; XPropertyTable( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); XPropertyTable( SvStream& rIn ); void Clear(); @@ -214,10 +214,10 @@ public: long Count() const; - BOOL Insert(long nIndex, XPropertyEntry* pEntry); + sal_Bool Insert(long nIndex, XPropertyEntry* pEntry); XPropertyEntry* Replace(long nIndex, XPropertyEntry* pEntry); - XPropertyEntry* Remove(long nIndex, USHORT nDummy); - XPropertyEntry* Get( long nIndex, USHORT nDummy ) const; + XPropertyEntry* Remove(long nIndex, sal_uInt16 nDummy); + XPropertyEntry* Get( long nIndex, sal_uInt16 nDummy ) const; long Get(const String& rName); Bitmap* GetBitmap( long nIndex ) const; @@ -226,15 +226,15 @@ public: void SetName( const String& rString ); const String& GetPath() const { return aPath; } void SetPath( const String& rString ) { aPath = rString; } - BOOL IsDirty() const { return bTableDirty && bBitmapsDirty; } - void SetDirty( BOOL bDirty = TRUE ) + sal_Bool IsDirty() const { return bTableDirty && bBitmapsDirty; } + void SetDirty( sal_Bool bDirty = sal_True ) { bTableDirty = bDirty; bBitmapsDirty = bDirty; } - virtual BOOL Load() = 0; - virtual BOOL Save() = 0; - virtual BOOL Create() = 0; - virtual BOOL CreateBitmapsForUI() = 0; - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ) = 0; + virtual sal_Bool Load() = 0; + virtual sal_Bool Save() = 0; + virtual sal_Bool Create() = 0; + virtual sal_Bool CreateBitmapsForUI() = 0; + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0; }; // -------------------- @@ -251,14 +251,14 @@ protected: List aList; List* pBmpList; - BOOL bListDirty; - BOOL bBitmapsDirty; - BOOL bOwnPool; + sal_Bool bListDirty; + sal_Bool bBitmapsDirty; + sal_Bool bOwnPool; XPropertyList( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); XPropertyList( SvStream& rIn ); void Clear(); @@ -269,8 +269,8 @@ public: void Insert( XPropertyEntry* pEntry, long nIndex = LIST_APPEND ); XPropertyEntry* Replace( XPropertyEntry* pEntry, long nIndex ); - XPropertyEntry* Remove( long nIndex, USHORT nDummy ); - XPropertyEntry* Get( long nIndex, USHORT nDummy ) const; + XPropertyEntry* Remove( long nIndex, sal_uInt16 nDummy ); + XPropertyEntry* Get( long nIndex, sal_uInt16 nDummy ) const; long Get(const String& rName); Bitmap* GetBitmap( long nIndex ) const; @@ -279,15 +279,15 @@ public: void SetName( const String& rString ); const String& GetPath() const { return aPath; } void SetPath( const String& rString ) { aPath = rString; } - BOOL IsDirty() const { return bListDirty && bBitmapsDirty; } - void SetDirty( BOOL bDirty = TRUE ) + sal_Bool IsDirty() const { return bListDirty && bBitmapsDirty; } + void SetDirty( sal_Bool bDirty = sal_True ) { bListDirty = bDirty; bBitmapsDirty = bDirty; } - virtual BOOL Load() = 0; - virtual BOOL Save() = 0; - virtual BOOL Create() = 0; - virtual BOOL CreateBitmapsForUI() = 0; - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ) = 0; + virtual sal_Bool Load() = 0; + virtual sal_Bool Save() = 0; + virtual sal_Bool Create() = 0; + virtual sal_Bool CreateBitmapsForUI() = 0; + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ) = 0; }; // ------------------ @@ -299,8 +299,8 @@ class SVX_DLLPUBLIC XColorTable : public XPropertyTable public: explicit XColorTable( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XColorTable(); using XPropertyTable::Replace; @@ -310,11 +310,11 @@ public: using XPropertyTable::Get; XColorEntry* GetColor(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); static XColorTable* GetStdColorTable(); }; @@ -328,8 +328,8 @@ class XColorList : public XPropertyList public: explicit XColorList( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XColorList(); using XPropertyList::Replace; @@ -339,11 +339,11 @@ public: using XPropertyList::Get; XColorEntry* GetColor(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); }; // -------------------- @@ -355,8 +355,8 @@ class XLineEndTable : public XPropertyTable public: explicit XLineEndTable( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XLineEndTable(); using XPropertyTable::Replace; @@ -366,11 +366,11 @@ public: using XPropertyTable::Get; XLineEndEntry* GetLineEnd(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); }; // ------------------- @@ -397,11 +397,11 @@ public: using XPropertyList::Get; XLineEndEntry* GetLineEnd(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True); }; // -------------------- @@ -413,8 +413,8 @@ class XDashTable : public XPropertyTable public: explicit XDashTable( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XDashTable(); using XPropertyTable::Replace; @@ -424,11 +424,11 @@ public: using XPropertyTable::Get; XDashEntry* GetDash(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); }; // ------------------- @@ -455,11 +455,11 @@ public: using XPropertyList::Get; XDashEntry* GetDash(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True); }; // -------------------- @@ -471,8 +471,8 @@ class XHatchTable : public XPropertyTable public: explicit XHatchTable( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XHatchTable(); using XPropertyTable::Replace; @@ -482,11 +482,11 @@ public: using XPropertyTable::Get; XHatchEntry* GetHatch(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); }; // ------------------- @@ -513,11 +513,11 @@ public: using XPropertyList::Get; XHatchEntry* GetHatch(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True); }; // --------------------- @@ -529,8 +529,8 @@ class XGradientTable : public XPropertyTable public: explicit XGradientTable( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XGradientTable(); using XPropertyTable::Replace; @@ -540,11 +540,11 @@ public: using XPropertyTable::Get; XGradientEntry* GetGradient(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); }; // ------------------- @@ -571,11 +571,11 @@ public: using XPropertyList::Get; XGradientEntry* GetGradient(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI(long nIndex, BOOL bDelete = TRUE); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True); }; // --------------------- @@ -587,8 +587,8 @@ class XBitmapTable : public XPropertyTable public: explicit XBitmapTable( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XBitmapTable(); using XPropertyTable::Replace; @@ -598,11 +598,11 @@ public: using XPropertyTable::Get; XBitmapEntry* GetBitmap(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); }; // ------------------- @@ -614,8 +614,8 @@ class SVX_DLLPUBLIC XBitmapList : public XPropertyList public: explicit XBitmapList( const String& rPath, XOutdevItemPool* pXPool = NULL, - USHORT nInitSize = 16, - USHORT nReSize = 16 ); + sal_uInt16 nInitSize = 16, + sal_uInt16 nReSize = 16 ); virtual ~XBitmapList(); using XPropertyList::Replace; @@ -625,11 +625,11 @@ public: using XPropertyList::Get; XBitmapEntry* GetBitmap(long nIndex) const; - virtual BOOL Load(); - virtual BOOL Save(); - virtual BOOL Create(); - virtual BOOL CreateBitmapsForUI(); - virtual Bitmap* CreateBitmapForUI( long nIndex, BOOL bDelete = TRUE ); + virtual sal_Bool Load(); + virtual sal_Bool Save(); + virtual sal_Bool Create(); + virtual sal_Bool CreateBitmapsForUI(); + virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True ); }; #endif // _XTABLE_HXX diff --git a/svx/inc/svx/xtextit.hxx b/svx/inc/svx/xtextit.hxx index f8a4d39d34..f8a4d39d34 100644..100755 --- a/svx/inc/svx/xtextit.hxx +++ b/svx/inc/svx/xtextit.hxx diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx index 1edf46edca..50ce6fea8c 100644..100755 --- a/svx/inc/svx/xtextit0.hxx +++ b/svx/inc/svx/xtextit0.hxx @@ -46,12 +46,12 @@ public: XFormTextStyleItem(XFormTextStyle = XFT_NONE); XFormTextStyleItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; - virtual USHORT GetValueCount() const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; + virtual sal_uInt16 GetValueCount() const; XFormTextStyle GetValue() const { return (XFormTextStyle) SfxEnumItem::GetValue(); } // #FontWork# - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; /************************************************************************* @@ -64,10 +64,10 @@ class SVX_DLLPUBLIC XFormTextHideFormItem : public SfxBoolItem { public: TYPEINFO(); - XFormTextHideFormItem(BOOL bHide = FALSE); + XFormTextHideFormItem(sal_Bool bHide = sal_False); XFormTextHideFormItem(SvStream& rIn); virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const; - virtual SfxPoolItem* Create(SvStream& rIn, USHORT nVer) const; + virtual SfxPoolItem* Create(SvStream& rIn, sal_uInt16 nVer) const; }; #endif diff --git a/svx/inc/svx/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx new file mode 100755 index 0000000000..e16fe1b14d --- /dev/null +++ b/svx/inc/svx/zoom_def.hxx @@ -0,0 +1,8 @@ +#ifndef _SVX_ZOOM_DEF_HXX +#define _SVX_ZOOM_DEF_HXX + +#define ZOOMBTN_OPTIMAL ((sal_uInt16)0x0001) +#define ZOOMBTN_PAGEWIDTH ((sal_uInt16)0x0002) +#define ZOOMBTN_WHOLEPAGE ((sal_uInt16)0x0004) + +#endif diff --git a/svx/inc/zoomctrl.hxx b/svx/inc/svx/zoomctrl.hxx index 42dc766639..09b8139161 100644..100755 --- a/svx/inc/zoomctrl.hxx +++ b/svx/inc/svx/zoomctrl.hxx @@ -38,20 +38,20 @@ class SVX_DLLPUBLIC SvxZoomStatusBarControl : public SfxStatusBarControl { private: - USHORT nZoom; - USHORT nValueSet; + sal_uInt16 nZoom; + sal_uInt16 nValueSet; public: - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); virtual void Command( const CommandEvent& rCEvt ); SFX_DECL_STATUSBAR_CONTROL(); - SvxZoomStatusBarControl( USHORT nSlotId, USHORT nId, StatusBar& rStb ); + SvxZoomStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); - static ULONG GetDefItemWidth(const StatusBar& rStb); + static sal_uIntPtr GetDefItemWidth(const StatusBar& rStb); }; diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx index f3b73832ef..58c09f6d0b 100644..100755 --- a/svx/inc/svx/zoomitem.hxx +++ b/svx/inc/svx/zoomitem.hxx @@ -47,20 +47,20 @@ enum SvxZoomType class SVX_DLLPUBLIC SvxZoomItem: public SfxUInt16Item { - USHORT nValueSet; // erlaubte Werte (siehe #defines unten) + sal_uInt16 nValueSet; // erlaubte Werte (siehe #defines unten) SvxZoomType eType; public: TYPEINFO(); SvxZoomItem( SvxZoomType eZoomType = SVX_ZOOM_PERCENT, - USHORT nVal = 0, USHORT nWhich = SID_ATTR_ZOOM ); + sal_uInt16 nVal = 0, sal_uInt16 nWhich = SID_ATTR_ZOOM ); SvxZoomItem( const SvxZoomItem& ); ~SvxZoomItem(); - void SetValueSet( USHORT nValues ) { nValueSet = nValues; } - USHORT GetValueSet() const { return nValueSet; } - bool IsValueAllowed( USHORT nValue ) const + void SetValueSet( sal_uInt16 nValues ) { nValueSet = nValues; } + sal_uInt16 GetValueSet() const { return nValueSet; } + bool IsValueAllowed( sal_uInt16 nValue ) const { return nValue == ( nValue & nValueSet ); } SvxZoomType GetType() const { return eType; } @@ -68,11 +68,11 @@ public: { eType = eNewType; } virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStrm, USHORT nVersion ) const; - virtual SvStream& Store( SvStream& rStrm , USHORT nItemVersion ) const; + virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; + virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; virtual int operator==( const SfxPoolItem& ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; //------------------------------------------------------------------------ diff --git a/svx/inc/svx/zoomsliderctrl.hxx b/svx/inc/svx/zoomsliderctrl.hxx index 6db597a455..ff7331455f 100644..100755 --- a/svx/inc/svx/zoomsliderctrl.hxx +++ b/svx/inc/svx/zoomsliderctrl.hxx @@ -43,20 +43,20 @@ private: struct SvxZoomSliderControl_Impl; SvxZoomSliderControl_Impl* mpImpl; - USHORT Offset2Zoom( long nOffset ) const; - long Zoom2Offset( USHORT nZoom ) const; + sal_uInt16 Offset2Zoom( long nOffset ) const; + long Zoom2Offset( sal_uInt16 nZoom ) const; public: SFX_DECL_STATUSBAR_CONTROL(); - SvxZoomSliderControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb ); + SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ); ~SvxZoomSliderControl(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual void Paint( const UserDrawEvent& rEvt ); - virtual BOOL MouseButtonDown( const MouseEvent & ); - virtual BOOL MouseMove( const MouseEvent & rEvt ); + virtual sal_Bool MouseButtonDown( const MouseEvent & ); + virtual sal_Bool MouseMove( const MouseEvent & rEvt ); }; #endif diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx index be1d6ade10..b8df939fff 100644..100755 --- a/svx/inc/svx/zoomslideritem.hxx +++ b/svx/inc/svx/zoomslideritem.hxx @@ -38,28 +38,28 @@ class SVX_DLLPUBLIC SvxZoomSliderItem: public SfxUInt16Item { com::sun::star::uno::Sequence < sal_Int32 > maValues; - USHORT mnMinZoom; - USHORT mnMaxZoom; + sal_uInt16 mnMinZoom; + sal_uInt16 mnMaxZoom; public: TYPEINFO(); - SvxZoomSliderItem( USHORT nCurrentZoom = 100, USHORT nMinZoom = 20, USHORT nMaxZoom = 600, USHORT nWhich = SID_ATTR_ZOOMSLIDER ); + SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, sal_uInt16 nWhich = SID_ATTR_ZOOMSLIDER ); SvxZoomSliderItem( const SvxZoomSliderItem& ); ~SvxZoomSliderItem(); void AddSnappingPoint( sal_Int32 nNew ); const com::sun::star::uno::Sequence < sal_Int32 >& GetSnappingPoints() const; - USHORT GetMinZoom() const {return mnMinZoom;} - USHORT GetMaxZoom() const {return mnMaxZoom;} + sal_uInt16 GetMinZoom() const {return mnMinZoom;} + sal_uInt16 GetMaxZoom() const {return mnMaxZoom;} // "pure virtual Methoden" vom SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; - virtual SfxPoolItem* Create( SvStream& rStrm, USHORT nVersion ) const; // leer - virtual SvStream& Store( SvStream& rStrm , USHORT nItemVersion ) const; // leer - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual SfxPoolItem* Create( SvStream& rStrm, sal_uInt16 nVersion ) const; // leer + virtual SvStream& Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const; // leer + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); }; //------------------------------------------------------------------------ diff --git a/svx/inc/svxempty.hxx b/svx/inc/svxempty.hxx index 4c40416ea9..4c40416ea9 100644..100755 --- a/svx/inc/svxempty.hxx +++ b/svx/inc/svxempty.hxx diff --git a/svx/inc/tbunocontroller.hxx b/svx/inc/tbunocontroller.hxx index d85c051818..d85c051818 100644..100755 --- a/svx/inc/tbunocontroller.hxx +++ b/svx/inc/tbunocontroller.hxx diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index b6e23f509a..c480ccfcb0 100644..100755 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -140,8 +140,8 @@ private: FindTextFieldControl* m_pFindTextFieldControl; - USHORT m_nDownSearchId; // item position of findbar - USHORT m_nUpSearchId; // item position of findbar + sal_uInt16 m_nDownSearchId; // item position of findbar + sal_uInt16 m_nUpSearchId; // item position of findbar }; diff --git a/svx/inc/uiks.hxx b/svx/inc/uiks.hxx index 6bbd772519..6bbd772519 100644..100755 --- a/svx/inc/uiks.hxx +++ b/svx/inc/uiks.hxx diff --git a/svx/inc/unomlstr.hxx b/svx/inc/unomlstr.hxx index ab00693e71..ab00693e71 100644..100755 --- a/svx/inc/unomlstr.hxx +++ b/svx/inc/unomlstr.hxx diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx index 1b347942db..89bb149e32 100644..100755 --- a/svx/inc/xpolyimp.hxx +++ b/svx/inc/xpolyimp.hxx @@ -37,15 +37,15 @@ class ImpXPolygon { public: Point* pPointAry; - BYTE* pFlagAry; + sal_uInt8* pFlagAry; Point* pOldPointAry; - BOOL bDeleteOldPoints; - USHORT nSize; - USHORT nResize; - USHORT nPoints; - USHORT nRefCount; + sal_Bool bDeleteOldPoints; + sal_uInt16 nSize; + sal_uInt16 nResize; + sal_uInt16 nPoints; + sal_uInt16 nRefCount; - ImpXPolygon( USHORT nInitSize = 16, USHORT nResize=16 ); + ImpXPolygon( sal_uInt16 nInitSize = 16, sal_uInt16 nResize=16 ); ImpXPolygon( const ImpXPolygon& rImpXPoly ); ~ImpXPolygon(); @@ -57,13 +57,13 @@ public: if ( bDeleteOldPoints ) { delete[] (char*)pOldPointAry; - bDeleteOldPoints = FALSE; + bDeleteOldPoints = sal_False; } } - void Resize( USHORT nNewSize, BOOL bDeletePoints = TRUE ); - void InsertSpace( USHORT nPos, USHORT nCount ); - void Remove( USHORT nPos, USHORT nCount ); + void Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints = sal_True ); + void InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount ); + void Remove( sal_uInt16 nPos, sal_uInt16 nCount ); }; typedef ::std::vector< XPolygon* > XPolygonList; @@ -72,7 +72,7 @@ class ImpXPolyPolygon { public: XPolygonList aXPolyList; - USHORT nRefCount; + sal_uInt16 nRefCount; ImpXPolyPolygon() { nRefCount = 1; } ImpXPolyPolygon( const ImpXPolyPolygon& rImpXPolyPoly ); diff --git a/svx/inc/zoom_def.hxx b/svx/inc/zoom_def.hxx deleted file mode 100644 index a377b6ece1..0000000000 --- a/svx/inc/zoom_def.hxx +++ /dev/null @@ -1,11 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -#ifndef _SVX_ZOOM_DEF_HXX -#define _SVX_ZOOM_DEF_HXX - -#define ZOOMBTN_OPTIMAL ((USHORT)0x0001) -#define ZOOMBTN_PAGEWIDTH ((USHORT)0x0002) -#define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/prj/build.lst b/svx/prj/build.lst index 9f75974886..641f4e5287 100644..100755 --- a/svx/prj/build.lst +++ b/svx/prj/build.lst @@ -1,39 +1,2 @@ -sx svx : sfx2 l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng NULL -sx svx usr1 - all sx_mkout NULL -sx svx\inc nmake - all sx_inc NULL -sx svx\uiconfig\layout nmake - all sx_layout NULL -sx svx\source\unodialogs\textconversiondlgs nmake - all sx_textconversiondlgs sx_inc NULL -sx svx\sdi nmake - all sx_sdi sx_inc NULL -sx svx\source\src nmake - all sx_src sx_inc sx_sdi NULL -sx svx\source\intro nmake - all sx_intro sx_inc NULL -sx svx\source\items nmake - all sx_items sx_inc sx_sdi NULL -sx svx\source\xoutdev nmake - all sx_xout sx_items sx_inc NULL -sx svx\source\svdraw nmake - all sx_draw sx_inc NULL -sx svx\source\sdr\attribute nmake - all sx_attribute sx_inc NULL -sx svx\source\sdr\primitive2d nmake - all sx_primitive2d sx_inc NULL -sx svx\source\sdr\primitive3d nmake - all sx_primitive3d sx_inc NULL -sx svx\source\table nmake - all sx_table sx_inc NULL -sx svx\source\sdr\properties nmake - all sx_properties sx_inc NULL -sx svx\source\sdr\contact nmake - all sx_contact sx_inc NULL -sx svx\source\sdr\event nmake - all sx_event sx_inc NULL -sx svx\source\sdr\animation nmake - all sx_animation sx_inc NULL -sx svx\source\sdr\overlay nmake - all sx_overlay sx_inc NULL -sx svx\source\smarttags nmake - all sx_smarttags sx_inc NULL -sx svx\source\stbctrls nmake - all sx_stbc sx_inc NULL -sx svx\source\mnuctrls nmake - all sx_mnuc sx_inc NULL -sx svx\source\engine3d nmake - all sx_3deng sx_inc NULL -sx svx\source\form nmake - all sx_form sx_sdi sx_inc NULL -sx svx\source\fmcomp nmake - all sx_fmcmp sx_sdi sx_inc NULL -sx svx\source\tbxctrls nmake - all sx_tbxc sx_inc NULL -sx svx\source\dialog nmake - all sx_dlg sx_inc NULL -sx svx\source\unodraw nmake - all sx_undrw sx_inc NULL -sx svx\source\unogallery nmake - all sx_ungal sx_inc NULL -sx svx\source\gallery2 nmake - all sx_gall sx_inc NULL -sx svx\source\xml nmake - all sx_xml sx_inc NULL -sx svx\source\core nmake - all sx_core sx_inc NULL -sx svx\source\accessibility nmake - all sx_accessibility sx_inc NULL -sx svx\source\customshapes nmake - all sx_customshapes sx_inc NULL -sx svx\source\toolbars nmake - all sx_toolbars sx_inc NULL -sx svx\util nmake - all sx_util sx_3deng sx_dlg sx_draw sx_attribute sx_properties sx_contact sx_event sx_animation sx_primitive2d sx_primitive3d sx_overlay sx_fmcmp sx_form sx_gall sx_items sx_mnuc sx_sdi sx_stbc sx_tbxc sx_undrw sx_ungal sx_xml sx_core sx_xout sx_accessibility sx_intro sx_customshapes sx_toolbars sx_table sx_smarttags NULL -sx svx\source\gengal nmake - all sx_gengal sx_util NULL -sx svx\qa\unoapi nmake - all sx_qa_unoapi NULL +sx svx : sfx2 L10N:l10n oovbaapi connectivity xmloff linguistic jvmfwk avmedia drawinglayer editeng LIBXSLT:libxslt NULL +sx svx\prj nmake - all sx_prj NULL diff --git a/svx/prj/d.lst b/svx/prj/d.lst index 3d6092f5ac..a52a9074f4 100644..100755 --- a/svx/prj/d.lst +++ b/svx/prj/d.lst @@ -1,558 +1,5 @@ -mkdir: %COMMON_DEST%\bin%_EXT%\hid -mkdir: %COMMON_DEST%\res%_EXT% -mkdir: %_DEST%\xml%_EXT%\uiconfig -mkdir: %_DEST%\xml%_EXT%\uiconfig\global - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.* -..\%__SRC%\lib\isvx*.lib %_DEST%\lib%_EXT%\isvx*.lib -..\%__SRC%\bin\gengal* %_DEST%\bin%_EXT%\gengal* -..\%__SRC%\bin\gengalrc %_DEST%\bin%_EXT%\gengal.ini -..\%__SRC%\bin\cui*.dll %_DEST%\bin%_EXT%\cui*.dll -..\%__SRC%\bin\svx*.dll %_DEST%\bin%_EXT%\svx*.dll -..\%__SRC%\bin\textconv*.dll %_DEST%\bin%_EXT%\textconv*.dll -..\%__SRC%\bin\txcnv*.dll %_DEST%\bin%_EXT%\txcnv*.dll -..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res - -mkdir: %_DEST%\inc%_EXT%\svx -..\sdi\svx.sdi %_DEST%\inc%_EXT%\svx\svx.sdi -..\sdi\svxitems.sdi %_DEST%\inc%_EXT%\svx\svxitems.sdi -..\sdi\xoitems.sdi %_DEST%\inc%_EXT%\svx\xoitems.sdi - -..\source\inc\fmsrccfg.hxx %_DEST%\inc%_EXT%\svx\fmsrccfg.hxx -..\source\inc\fmsrcimp.hxx %_DEST%\inc%_EXT%\svx\fmsrcimp.hxx -..\inc\galtheme.hxx %_DEST%\inc%_EXT%\svx\galtheme.hxx -..\inc\galctrl.hxx %_DEST%\inc%_EXT%\svx\galctrl.hxx -..\inc\svx\galmisc.hxx %_DEST%\inc%_EXT%\svx\galmisc.hxx -..\inc\svx\gallery1.hxx %_DEST%\inc%_EXT%\svx\gallery1.hxx -..\inc\svx\fmtools.hxx %_DEST%\inc%_EXT%\svx\fmtools.hxx -..\inc\svx\exthelpid.hrc %_DEST%\inc%_EXT%\svx\exthelpid.hrc - -..\inc\flagsdef.hxx %_DEST%\inc%_EXT%\svx\flagsdef.hxx -..\%__SRC%\inc\svxslots.hxx %_DEST%\inc%_EXT%\svx\svxslots.hxx -..\%__SRC%\inc\globlmn.hrc %_DEST%\inc%_EXT%\svx\globlmn.hrc -..\source\inc\fmresids.hrc %_DEST%\inc%_EXT%\svx\fmresids.hrc - -../source/customshapes/EnhancedCustomShapeTypeNames.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeTypeNames.hxx -../source/customshapes/EnhancedCustomShapeGeometry.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeGeometry.hxx -../inc/svx/EnhancedCustomShapeFunctionParser.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeFunctionParser.hxx -../source/customshapes/EnhancedCustomShape2d.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShape2d.hxx -../inc/xattr.hxx %_DEST%\inc%_EXT%\svx\xattr.hxx -../inc/svdglob.hxx %_DEST%\inc%_EXT%\svx\svdglob.hxx -../source/svdraw/svditext.hxx %_DEST%\inc%_EXT%\svx\svditext.hxx - -..\inc\ActionDescriptionProvider.hxx %_DEST%\inc%_EXT%\svx\ActionDescriptionProvider.hxx -..\inc\anchorid.hxx %_DEST%\inc%_EXT%\svx\anchorid.hxx -..\inc\chrtitem.hxx %_DEST%\inc%_EXT%\svx\chrtitem.hxx -..\inc\clipboardctl.hxx %_DEST%\inc%_EXT%\svx\clipboardctl.hxx -..\inc\clipfmtitem.hxx %_DEST%\inc%_EXT%\svx\clipfmtitem.hxx -..\inc\connctrl.hxx %_DEST%\inc%_EXT%\svx\connctrl.hxx -..\inc\databaseregistrationui.hxx %_DEST%\inc%_EXT%\svx\databaseregistrationui.hxx -..\inc\dbexch.hrc %_DEST%\inc%_EXT%\svx\dbexch.hrc -..\inc\DescriptionGenerator.hxx %_DEST%\inc%_EXT%\svx\DescriptionGenerator.hxx -..\inc\dialcontrol.hxx %_DEST%\inc%_EXT%\svx\dialcontrol.hxx -..\inc\dlgutil.hxx %_DEST%\inc%_EXT%\svx\dlgutil.hxx -..\inc\drawitem.hxx %_DEST%\inc%_EXT%\svx\drawitem.hxx -..\inc\editstat.hxx %_DEST%\inc%_EXT%\svx\editstat.hxx -..\inc\editund2.hxx %_DEST%\inc%_EXT%\svx\editund2.hxx -..\inc\eerdll.hxx %_DEST%\inc%_EXT%\svx\editdll.hxx -..\inc\flstitem.hxx %_DEST%\inc%_EXT%\svx\flstitem.hxx -..\inc\extrusioncontrols.hxx %_DEST%\inc%_EXT%\svx\extrusioncontrols.hxx -..\inc\fmgridif.hxx %_DEST%\inc%_EXT%\svx\fmgridif.hxx -..\inc\fmobjfac.hxx %_DEST%\inc%_EXT%\svx\fmobjfac.hxx -..\inc\fontlb.hxx %_DEST%\inc%_EXT%\svx\fontlb.hxx -..\inc\fontworkgallery.hxx %_DEST%\inc%_EXT%\svx\fontworkgallery.hxx -..\inc\formatpaintbrushctrl.hxx %_DEST%\inc%_EXT%\svx\formatpaintbrushctrl.hxx -..\inc\gallery.hxx %_DEST%\inc%_EXT%\svx\gallery.hxx -..\inc\galbrws.hxx %_DEST%\inc%_EXT%\svx\galbrws.hxx -..\inc\globlac.hrc %_DEST%\inc%_EXT%\svx\globlac.hrc -..\inc\globl3d.hxx %_DEST%\inc%_EXT%\svx\globl3d.hxx -..\inc\grafctrl.hxx %_DEST%\inc%_EXT%\svx\grafctrl.hxx -..\inc\hlnkitem.hxx %_DEST%\inc%_EXT%\svx\hlnkitem.hxx -..\inc\htmlmode.hxx %_DEST%\inc%_EXT%\svx\htmlmode.hxx -..\inc\hyperdlg.hxx %_DEST%\inc%_EXT%\svx\hyperdlg.hxx -..\inc\imapdlg.hxx %_DEST%\inc%_EXT%\svx\imapdlg.hxx -..\inc\insctrl.hxx %_DEST%\inc%_EXT%\svx\insctrl.hxx -..\inc\layctrl.hxx %_DEST%\inc%_EXT%\svx\layctrl.hxx -..\inc\lboxctrl.hxx %_DEST%\inc%_EXT%\svx\lboxctrl.hxx -..\inc\linectrl.hxx %_DEST%\inc%_EXT%\svx\linectrl.hxx -..\inc\measctrl.hxx %_DEST%\inc%_EXT%\svx\measctrl.hxx -..\inc\modctrl.hxx %_DEST%\inc%_EXT%\svx\modctrl.hxx -..\inc\numvset.hxx %_DEST%\inc%_EXT%\svx\numvset.hxx -..\inc\objfac3d.hxx %_DEST%\inc%_EXT%\svx\objfac3d.hxx -..\inc\ofaitem.hxx %_DEST%\inc%_EXT%\svx\ofaitem.hxx -..\inc\optgenrl.hxx %_DEST%\inc%_EXT%\svx\optgenrl.hxx -..\inc\optgrid.hxx %_DEST%\inc%_EXT%\svx\optgrid.hxx -..\inc\orienthelper.hxx %_DEST%\inc%_EXT%\svx\orienthelper.hxx -..\inc\ParseContext.hxx %_DEST%\inc%_EXT%\svx\ParseContext.hxx -..\inc\passwd.hxx %_DEST%\inc%_EXT%\svx\passwd.hxx -..\inc\pfiledlg.hxx %_DEST%\inc%_EXT%\svx\pfiledlg.hxx -..\inc\postattr.hxx %_DEST%\inc%_EXT%\svx\postattr.hxx -..\inc\prtqry.hxx %_DEST%\inc%_EXT%\svx\prtqry.hxx -..\inc\pszctrl.hxx %_DEST%\inc%_EXT%\svx\pszctrl.hxx -..\inc\relfld.hxx %_DEST%\inc%_EXT%\svx\relfld.hxx -..\inc\rotmodit.hxx %_DEST%\inc%_EXT%\svx\rotmodit.hxx -..\inc\rubydialog.hxx %_DEST%\inc%_EXT%\svx\rubydialog.hxx -..\inc\rulritem.hxx %_DEST%\inc%_EXT%\svx\rulritem.hxx -..\inc\sdrpaintwindow.hxx %_DEST%\inc%_EXT%\svx\sdrpaintwindow.hxx -..\inc\selctrl.hxx %_DEST%\inc%_EXT%\svx\selctrl.hxx -..\inc\srchdlg.hxx %_DEST%\inc%_EXT%\svx\srchdlg.hxx -..\inc\srchitem.hxx %_DEST%\inc%_EXT%\svx\srchitem.hxx -..\inc\svditer.hxx %_DEST%\inc%_EXT%\svx\svditer.hxx -..\inc\svdstr.hrc %_DEST%\inc%_EXT%\svx\svdstr.hrc -..\inc\svdviter.hxx %_DEST%\inc%_EXT%\svx\svdviter.hxx -..\inc\svimbase.hxx %_DEST%\inc%_EXT%\svx\svimbase.hxx -..\inc\svxerr.hxx %_DEST%\inc%_EXT%\svx\svxerr.hxx -..\inc\svxgrahicitem.hxx %_DEST%\inc%_EXT%\svx\svxgrahicitem.hxx -..\inc\swframeposstrings.hxx %_DEST%\inc%_EXT%\svx\swframeposstrings.hxx -..\inc\swframevalidation.hxx %_DEST%\inc%_EXT%\svx\swframevalidation.hxx -..\inc\swframeexample.hxx %_DEST%\inc%_EXT%\svx\swframeexample.hxx -..\inc\tbxalign.hxx %_DEST%\inc%_EXT%\svx\tbxalign.hxx -..\inc\tbxcolor.hxx %_DEST%\inc%_EXT%\svx\tbxcolor.hxx -..\inc\tbxctl.hxx %_DEST%\inc%_EXT%\svx\tbxctl.hxx -..\inc\tbxcustomshapes.hxx %_DEST%\inc%_EXT%\svx\tbxcustomshapes.hxx -..\inc\tbxdraw.hxx %_DEST%\inc%_EXT%\svx\tbxdraw.hxx -..\inc\txencbox.hxx %_DEST%\inc%_EXT%\svx\txencbox.hxx -..\inc\txenctab.hxx %_DEST%\inc%_EXT%\svx\txenctab.hxx -..\inc\unoapi.hxx %_DEST%\inc%_EXT%\svx\unoapi.hxx -..\inc\unofill.hxx %_DEST%\inc%_EXT%\svx\unofill.hxx -..\inc\unomaster.hxx %_DEST%\inc%_EXT%\svx\unomaster.hxx -..\inc\UnoNamespaceMap.hxx %_DEST%\inc%_EXT%\svx\UnoNamespaceMap.hxx -..\inc\unopool.hxx %_DEST%\inc%_EXT%\svx\unopool.hxx -..\inc\unoshcol.hxx %_DEST%\inc%_EXT%\svx\unoshcol.hxx -..\inc\verttexttbxctrl.hxx %_DEST%\inc%_EXT%\svx\verttexttbxctrl.hxx -..\inc\wrapfield.hxx %_DEST%\inc%_EXT%\svx\wrapfield.hxx -..\inc\xexch.hxx %_DEST%\inc%_EXT%\svx\xexch.hxx -..\inc\xmleohlp.hxx %_DEST%\inc%_EXT%\svx\xmleohlp.hxx -..\inc\xmlexchg.hxx %_DEST%\inc%_EXT%\svx\xmlexchg.hxx -..\inc\xmlgrhlp.hxx %_DEST%\inc%_EXT%\svx\xmlgrhlp.hxx -..\inc\xmlsecctrl.hxx %_DEST%\inc%_EXT%\svx\xmlsecctrl.hxx -..\inc\xoutbmp.hxx %_DEST%\inc%_EXT%\svx\xoutbmp.hxx -..\inc\XPropertyTable.hxx %_DEST%\inc%_EXT%\svx\XPropertyTable.hxx -..\inc\zoom_def.hxx %_DEST%\inc%_EXT%\svx\zoom_def.hxx -..\inc\zoomctrl.hxx %_DEST%\inc%_EXT%\svx\zoomctrl.hxx - -..\inc\svx\xlinjoit.hxx %_DEST%\inc%_EXT%\svx\xlinjoit.hxx -..\inc\svx\dstribut_enum.hxx %_DEST%\inc%_EXT%\svx\dstribut_enum.hxx -..\inc\svx\svdfield.hxx %_DEST%\inc%_EXT%\svx\svdfield.hxx -..\inc\svx\svxitems.hrc %_DEST%\inc%_EXT%\svx\svxitems.hrc -..\inc\svx\svddef.hxx %_DEST%\inc%_EXT%\svx\svddef.hxx -..\inc\svx\ipolypolygoneditorcontroller.hxx %_DEST%\inc%_EXT%\svx\ipolypolygoneditorcontroller.hxx -..\inc\svx\polypolygoneditor.hxx %_DEST%\inc%_EXT%\svx\polypolygoneditor.hxx -..\inc\svx\svdsob.hxx %_DEST%\inc%_EXT%\svx\svdsob.hxx -..\inc\svx\svdlayer.hxx %_DEST%\inc%_EXT%\svx\svdlayer.hxx -..\inc\svx\algitem.hxx %_DEST%\inc%_EXT%\svx\algitem.hxx -..\inc\svx\simptabl.hxx %_DEST%\inc%_EXT%\svx\simptabl.hxx -..\inc\svx\ctredlin.hxx %_DEST%\inc%_EXT%\svx\ctredlin.hxx -..\inc\svx\bmpmask.hxx %_DEST%\inc%_EXT%\svx\bmpmask.hxx ..\inc\svx\linkwarn.hxx %_DEST%\inc%_EXT%\svx\linkwarn.hxx ..\inc\svx\borderline.hxx %_DEST%\inc%_EXT%\svx\borderline.hxx ..\inc\svx\boxitem.hxx %_DEST%\inc%_EXT%\svx\boxitem.hxx ..\inc\svx\brkitem.hxx %_DEST%\inc%_EXT%\svx\brkitem.hxx ..\inc\svx\brshitem.hxx %_DEST%\inc%_EXT%\svx\brshitem.hxx -..\inc\svx\camera3d.hxx %_DEST%\inc%_EXT%\svx\camera3d.hxx -..\inc\svx\charmap.hxx %_DEST%\inc%_EXT%\svx\charmap.hxx -..\inc\svx\checklbx.hxx %_DEST%\inc%_EXT%\svx\checklbx.hxx -..\inc\svx\contdlg.hxx %_DEST%\inc%_EXT%\svx\contdlg.hxx -..\inc\svx\tabarea.hxx %_DEST%\inc%_EXT%\svx\tabarea.hxx -..\inc\svx\tabline.hxx %_DEST%\inc%_EXT%\svx\tabline.hxx -..\inc\svx\colrctrl.hxx %_DEST%\inc%_EXT%\svx\colrctrl.hxx -..\inc\svx\cube3d.hxx %_DEST%\inc%_EXT%\svx\cube3d.hxx -..\inc\svx\polygn3d.hxx %_DEST%\inc%_EXT%\svx\polygn3d.hxx -..\inc\svx\lathe3d.hxx %_DEST%\inc%_EXT%\svx\lathe3d.hxx -..\inc\svx\e3ditem.hxx %_DEST%\inc%_EXT%\svx\e3ditem.hxx -..\inc\svx\def3d.hxx %_DEST%\inc%_EXT%\svx\def3d.hxx -..\inc\svx\svdtypes.hxx %_DEST%\inc%_EXT%\svx\svdtypes.hxx -..\inc\svx\volume3d.hxx %_DEST%\inc%_EXT%\svx\volume3d.hxx -..\inc\svx\xenum.hxx %_DEST%\inc%_EXT%\svx\xenum.hxx -..\inc\svx\dialmgr.hxx %_DEST%\inc%_EXT%\svx\dialmgr.hxx -..\inc\svx\dlgctl3d.hxx %_DEST%\inc%_EXT%\svx\dlgctl3d.hxx -..\inc\svx\dlgctrl.hxx %_DEST%\inc%_EXT%\svx\dlgctrl.hxx -..\inc\svx\dialogs.hrc %_DEST%\inc%_EXT%\svx\dialogs.hrc -..\inc\svx\extrud3d.hxx %_DEST%\inc%_EXT%\svx\extrud3d.hxx -..\inc\svx\f3dchild.hxx %_DEST%\inc%_EXT%\svx\f3dchild.hxx -..\inc\svx\fillctrl.hxx %_DEST%\inc%_EXT%\svx\fillctrl.hxx -..\inc\svx\float3d.hxx %_DEST%\inc%_EXT%\svx\float3d.hxx -..\inc\svx\fntctl.hxx %_DEST%\inc%_EXT%\svx\fntctl.hxx -..\inc\svx\fntctrl.hxx %_DEST%\inc%_EXT%\svx\fntctrl.hxx -..\inc\svx\fntszctl.hxx %_DEST%\inc%_EXT%\svx\fntszctl.hxx -..\inc\svx\fontwork.hxx %_DEST%\inc%_EXT%\svx\fontwork.hxx -..\inc\svx\framebordertype.hxx %_DEST%\inc%_EXT%\svx\framebordertype.hxx -..\inc\svx\framelink.hxx %_DEST%\inc%_EXT%\svx\framelink.hxx -..\inc\svx\framelinkarray.hxx %_DEST%\inc%_EXT%\svx\framelinkarray.hxx -..\inc\svx\frmsel.hxx %_DEST%\inc%_EXT%\svx\frmsel.hxx -..\inc\svx\graphctl.hxx %_DEST%\inc%_EXT%\svx\graphctl.hxx -..\inc\svx\hdft.hxx %_DEST%\inc%_EXT%\svx\hdft2.hxx -..\inc\svx\ifaceids.hxx %_DEST%\inc%_EXT%\svx\ifaceids.hxx -..\inc\svx\itemwin.hxx %_DEST%\inc%_EXT%\svx\itemwin.hxx -..\inc\svx\langbox.hxx %_DEST%\inc%_EXT%\svx\langbox.hxx -..\inc\svx\numinf.hxx %_DEST%\inc%_EXT%\svx\numinf.hxx -..\inc\svx\numfmtsh.hxx %_DEST%\inc%_EXT%\svx\numfmtsh.hxx -..\inc\svx\obj3d.hxx %_DEST%\inc%_EXT%\svx\obj3d.hxx -..\inc\svx\pagectrl.hxx %_DEST%\inc%_EXT%\svx\pagectrl.hxx -..\inc\svx\pageitem.hxx %_DEST%\inc%_EXT%\svx\pageitem.hxx -..\inc\svx\paraprev.hxx %_DEST%\inc%_EXT%\svx\paraprev.hxx -..\inc\svx\polysc3d.hxx %_DEST%\inc%_EXT%\svx\polysc3d.hxx -..\inc\svx\rectenum.hxx %_DEST%\inc%_EXT%\svx\rectenum.hxx -..\inc\svx\ruler.hxx %_DEST%\inc%_EXT%\svx\ruler.hxx -..\inc\svx\scene3d.hxx %_DEST%\inc%_EXT%\svx\scene3d.hxx -..\inc\svx\e3dsceneupdater.hxx %_DEST%\inc%_EXT%\svx\e3dsceneupdater.hxx -..\inc\svx\sdangitm.hxx %_DEST%\inc%_EXT%\svx\sdangitm.hxx -..\inc\svx\sderitm.hxx %_DEST%\inc%_EXT%\svx\sderitm.hxx -..\inc\svx\sdgcoitm.hxx %_DEST%\inc%_EXT%\svx\sdgcoitm.hxx -..\inc\svx\sdgcpitm.hxx %_DEST%\inc%_EXT%\svx\sdgcpitm.hxx -..\inc\svx\sdgluitm.hxx %_DEST%\inc%_EXT%\svx\sdgluitm.hxx -..\inc\svx\sdginitm.hxx %_DEST%\inc%_EXT%\svx\sdginitm.hxx -..\inc\svx\sdggaitm.hxx %_DEST%\inc%_EXT%\svx\sdggaitm.hxx -..\inc\svx\sdgmoitm.hxx %_DEST%\inc%_EXT%\svx\sdgmoitm.hxx -..\inc\svx\sdgtritm.hxx %_DEST%\inc%_EXT%\svx\sdgtritm.hxx -..\inc\svx\sdmetitm.hxx %_DEST%\inc%_EXT%\svx\sdmetitm.hxx -..\inc\svx\sdooitm.hxx %_DEST%\inc%_EXT%\svx\sdooitm.hxx -..\inc\svx\sdprcitm.hxx %_DEST%\inc%_EXT%\svx\sdprcitm.hxx -..\inc\svx\sdshcitm.hxx %_DEST%\inc%_EXT%\svx\sdshcitm.hxx -..\inc\svx\sdshitm.hxx %_DEST%\inc%_EXT%\svx\sdshitm.hxx -..\inc\svx\sdshtitm.hxx %_DEST%\inc%_EXT%\svx\sdshtitm.hxx -..\inc\svx\sdsxyitm.hxx %_DEST%\inc%_EXT%\svx\sdsxyitm.hxx -..\inc\svx\sdtaaitm.hxx %_DEST%\inc%_EXT%\svx\sdtaaitm.hxx -..\inc\svx\sdtacitm.hxx %_DEST%\inc%_EXT%\svx\sdtacitm.hxx -..\inc\svx\sdtaditm.hxx %_DEST%\inc%_EXT%\svx\sdtaditm.hxx -..\inc\svx\sdtagitm.hxx %_DEST%\inc%_EXT%\svx\sdtagitm.hxx -..\inc\svx\sdtaiitm.hxx %_DEST%\inc%_EXT%\svx\sdtaiitm.hxx -..\inc\svx\sdtfchim.hxx %_DEST%\inc%_EXT%\svx\sdtfchim.hxx -..\inc\svx\sdtaitm.hxx %_DEST%\inc%_EXT%\svx\sdtaitm.hxx -..\inc\svx\sdtakitm.hxx %_DEST%\inc%_EXT%\svx\sdtakitm.hxx -..\inc\svx\sdtayitm.hxx %_DEST%\inc%_EXT%\svx\sdtayitm.hxx -..\inc\svx\sdtcfitm.hxx %_DEST%\inc%_EXT%\svx\sdtcfitm.hxx -..\inc\svx\sdtditm.hxx %_DEST%\inc%_EXT%\svx\sdtditm.hxx -..\inc\svx\sdtfsitm.hxx %_DEST%\inc%_EXT%\svx\sdtfsitm.hxx -..\inc\svx\sdtmfitm.hxx %_DEST%\inc%_EXT%\svx\sdtmfitm.hxx -..\inc\svx\sdynitm.hxx %_DEST%\inc%_EXT%\svx\sdynitm.hxx -..\inc\svx\sphere3d.hxx %_DEST%\inc%_EXT%\svx\sphere3d.hxx -..\inc\svx\SpellDialogChildWindow.hxx %_DEST%\inc%_EXT%\svx\SpellDialogChildWindow.hxx -..\inc\svx\stddlg.hxx %_DEST%\inc%_EXT%\svx\stddlg.hxx -..\inc\svx\strarray.hxx %_DEST%\inc%_EXT%\svx\strarray.hxx -..\inc\svx\svdattr.hxx %_DEST%\inc%_EXT%\svx\svdattr.hxx -..\inc\svx\svdattrx.hxx %_DEST%\inc%_EXT%\svx\svdattrx.hxx -..\inc\svx\svdcrtv.hxx %_DEST%\inc%_EXT%\svx\svdcrtv.hxx -..\inc\svx\svddrag.hxx %_DEST%\inc%_EXT%\svx\svddrag.hxx -..\inc\svx\svddrgmt.hxx %_DEST%\inc%_EXT%\svx\svddrgmt.hxx -..\inc\svx\svddrgv.hxx %_DEST%\inc%_EXT%\svx\svddrgv.hxx -..\inc\svx\svdedtv.hxx %_DEST%\inc%_EXT%\svx\svdedtv.hxx -..\inc\svx\svdedxv.hxx %_DEST%\inc%_EXT%\svx\svdedxv.hxx -..\inc\svx\svdetc.hxx %_DEST%\inc%_EXT%\svx\svdetc.hxx -..\inc\svx\sdrhittesthelper.hxx %_DEST%\inc%_EXT%\svx\sdrhittesthelper.hxx -..\inc\svx\svdglev.hxx %_DEST%\inc%_EXT%\svx\svdglev.hxx -..\inc\svx\svdglue.hxx %_DEST%\inc%_EXT%\svx\svdglue.hxx -..\inc\svx\svdhdl.hxx %_DEST%\inc%_EXT%\svx\svdhdl.hxx -..\inc\svx\svdhlpln.hxx %_DEST%\inc%_EXT%\svx\svdhlpln.hxx -..\inc\svx\svdmark.hxx %_DEST%\inc%_EXT%\svx\svdmark.hxx -..\inc\svx\svdmodel.hxx %_DEST%\inc%_EXT%\svx\svdmodel.hxx -..\inc\svx\svdmrkv.hxx %_DEST%\inc%_EXT%\svx\svdmrkv.hxx -..\inc\svx\svdoattr.hxx %_DEST%\inc%_EXT%\svx\svdoattr.hxx -..\inc\svx\svdobj.hxx %_DEST%\inc%_EXT%\svx\svdobj.hxx -..\inc\svx\sdrobjectuser.hxx %_DEST%\inc%_EXT%\svx\sdrobjectuser.hxx -..\inc\svx\svdocapt.hxx %_DEST%\inc%_EXT%\svx\svdocapt.hxx -..\inc\svx\svdocirc.hxx %_DEST%\inc%_EXT%\svx\svdocirc.hxx -..\inc\svx\svdoedge.hxx %_DEST%\inc%_EXT%\svx\svdoedge.hxx -..\inc\svx\svdograf.hxx %_DEST%\inc%_EXT%\svx\svdograf.hxx -..\inc\svx\svdogrp.hxx %_DEST%\inc%_EXT%\svx\svdogrp.hxx -..\inc\svx\svdomeas.hxx %_DEST%\inc%_EXT%\svx\svdomeas.hxx -..\inc\svx\svdomedia.hxx %_DEST%\inc%_EXT%\svx\svdomedia.hxx -..\inc\svx\svdoole2.hxx %_DEST%\inc%_EXT%\svx\svdoole2.hxx -..\inc\svx\svdopage.hxx %_DEST%\inc%_EXT%\svx\svdopage.hxx -..\inc\svx\svdopath.hxx %_DEST%\inc%_EXT%\svx\svdopath.hxx -..\inc\svx\svdorect.hxx %_DEST%\inc%_EXT%\svx\svdorect.hxx -..\inc\svx\svdotext.hxx %_DEST%\inc%_EXT%\svx\svdotext.hxx -..\inc\svx\svdovirt.hxx %_DEST%\inc%_EXT%\svx\svdovirt.hxx -..\inc\svx\svdpage.hxx %_DEST%\inc%_EXT%\svx\svdpage.hxx -..\inc\svx\sdrmasterpagedescriptor.hxx %_DEST%\inc%_EXT%\svx\sdrmasterpagedescriptor.hxx -..\inc\svx\sdrcomment.hxx %_DEST%\inc%_EXT%\svx\sdrcomment.hxx -..\inc\svx\sdrpageuser.hxx %_DEST%\inc%_EXT%\svx\sdrpageuser.hxx -..\inc\svx\svdpagv.hxx %_DEST%\inc%_EXT%\svx\svdpagv.hxx -..\inc\svx\sdrpagewindow.hxx %_DEST%\inc%_EXT%\svx\sdrpagewindow.hxx -..\inc\svx\svdpntv.hxx %_DEST%\inc%_EXT%\svx\svdpntv.hxx -..\inc\svx\svdpoev.hxx %_DEST%\inc%_EXT%\svx\svdpoev.hxx -..\inc\svx\svdpool.hxx %_DEST%\inc%_EXT%\svx\svdpool.hxx -..\inc\svx\svdsnpv.hxx %_DEST%\inc%_EXT%\svx\svdsnpv.hxx -..\inc\svx\svdtrans.hxx %_DEST%\inc%_EXT%\svx\svdtrans.hxx -..\inc\svx\svdundo.hxx %_DEST%\inc%_EXT%\svx\svdundo.hxx -..\inc\svx\svdoutl.hxx %_DEST%\inc%_EXT%\svx\svdoutl.hxx -..\inc\svx\svdview.hxx %_DEST%\inc%_EXT%\svx\svdview.hxx -..\inc\svx\svdxcgv.hxx %_DEST%\inc%_EXT%\svx\svdxcgv.hxx -..\inc\svx\svxids.hrc %_DEST%\inc%_EXT%\svx\svxids.hrc -..\inc\svx\sxallitm.hxx %_DEST%\inc%_EXT%\svx\sxallitm.hxx -..\inc\svx\sxcaitm.hxx %_DEST%\inc%_EXT%\svx\sxcaitm.hxx -..\inc\svx\sxcecitm.hxx %_DEST%\inc%_EXT%\svx\sxcecitm.hxx -..\inc\svx\sxcgitm.hxx %_DEST%\inc%_EXT%\svx\sxcgitm.hxx -..\inc\svx\sxciaitm.hxx %_DEST%\inc%_EXT%\svx\sxciaitm.hxx -..\inc\svx\sxcikitm.hxx %_DEST%\inc%_EXT%\svx\sxcikitm.hxx -..\inc\svx\sxcllitm.hxx %_DEST%\inc%_EXT%\svx\sxcllitm.hxx -..\inc\svx\sxctitm.hxx %_DEST%\inc%_EXT%\svx\sxctitm.hxx -..\inc\svx\sxekitm.hxx %_DEST%\inc%_EXT%\svx\sxekitm.hxx -..\inc\svx\sxelditm.hxx %_DEST%\inc%_EXT%\svx\sxelditm.hxx -..\inc\svx\sxenditm.hxx %_DEST%\inc%_EXT%\svx\sxenditm.hxx -..\inc\svx\sxfiitm.hxx %_DEST%\inc%_EXT%\svx\sxfiitm.hxx -..\inc\svx\sxlayitm.hxx %_DEST%\inc%_EXT%\svx\sxlayitm.hxx -..\inc\svx\sxlogitm.hxx %_DEST%\inc%_EXT%\svx\sxlogitm.hxx -..\inc\svx\sxmbritm.hxx %_DEST%\inc%_EXT%\svx\sxmbritm.hxx -..\inc\svx\sxmfsitm.hxx %_DEST%\inc%_EXT%\svx\sxmfsitm.hxx -..\inc\svx\sxmkitm.hxx %_DEST%\inc%_EXT%\svx\sxmkitm.hxx -..\inc\svx\sxmlhitm.hxx %_DEST%\inc%_EXT%\svx\sxmlhitm.hxx -..\inc\svx\sxmoitm.hxx %_DEST%\inc%_EXT%\svx\sxmoitm.hxx -..\inc\svx\sxmovitm.hxx %_DEST%\inc%_EXT%\svx\sxmovitm.hxx -..\inc\svx\sxmsitm.hxx %_DEST%\inc%_EXT%\svx\sxmsitm.hxx -..\inc\svx\sxmspitm.hxx %_DEST%\inc%_EXT%\svx\sxmspitm.hxx -..\inc\svx\sxmsuitm.hxx %_DEST%\inc%_EXT%\svx\sxmsuitm.hxx -..\inc\svx\sxmtaitm.hxx %_DEST%\inc%_EXT%\svx\sxmtaitm.hxx -..\inc\svx\sxmtfitm.hxx %_DEST%\inc%_EXT%\svx\sxmtfitm.hxx -..\inc\svx\sxmtpitm.hxx %_DEST%\inc%_EXT%\svx\sxmtpitm.hxx -..\inc\svx\sxmtritm.hxx %_DEST%\inc%_EXT%\svx\sxmtritm.hxx -..\inc\svx\sxmuitm.hxx %_DEST%\inc%_EXT%\svx\sxmuitm.hxx -..\inc\svx\sxoneitm.hxx %_DEST%\inc%_EXT%\svx\sxoneitm.hxx -..\inc\svx\sxonitm.hxx %_DEST%\inc%_EXT%\svx\sxonitm.hxx -..\inc\svx\sxopitm.hxx %_DEST%\inc%_EXT%\svx\sxopitm.hxx -..\inc\svx\sxraitm.hxx %_DEST%\inc%_EXT%\svx\sxraitm.hxx -..\inc\svx\sxreaitm.hxx %_DEST%\inc%_EXT%\svx\sxreaitm.hxx -..\inc\svx\sxreoitm.hxx %_DEST%\inc%_EXT%\svx\sxreoitm.hxx -..\inc\svx\sxroaitm.hxx %_DEST%\inc%_EXT%\svx\sxroaitm.hxx -..\inc\svx\sxrooitm.hxx %_DEST%\inc%_EXT%\svx\sxrooitm.hxx -..\inc\svx\sxsaitm.hxx %_DEST%\inc%_EXT%\svx\sxsaitm.hxx -..\inc\svx\sxsalitm.hxx %_DEST%\inc%_EXT%\svx\sxsalitm.hxx -..\inc\svx\sxsiitm.hxx %_DEST%\inc%_EXT%\svx\sxsiitm.hxx -..\inc\svx\sxsoitm.hxx %_DEST%\inc%_EXT%\svx\sxsoitm.hxx -..\inc\svx\sxtraitm.hxx %_DEST%\inc%_EXT%\svx\sxtraitm.hxx -..\inc\svx\tbcontrl.hxx %_DEST%\inc%_EXT%\svx\tbcontrl.hxx -..\inc\svx\unomid.hxx %_DEST%\inc%_EXT%\svx\unomid.hxx -..\inc\svx\unopage.hxx %_DEST%\inc%_EXT%\svx\unopage.hxx -..\inc\svx\unoshape.hxx %_DEST%\inc%_EXT%\svx\unoshape.hxx -..\inc\svx\shapepropertynotifier.hxx %_DEST%\inc%_EXT%\svx\shapepropertynotifier.hxx -..\inc\svx\shapeproperty.hxx %_DEST%\inc%_EXT%\svx\shapeproperty.hxx -..\inc\svx\unoprov.hxx %_DEST%\inc%_EXT%\svx\unoprov.hxx -..\inc\svx\unomod.hxx %_DEST%\inc%_EXT%\svx\unomod.hxx -..\inc\svx\unomodel.hxx %_DEST%\inc%_EXT%\svx\unomodel.hxx -..\inc\svx\fmdpage.hxx %_DEST%\inc%_EXT%\svx\fmdpage.hxx -..\inc\svx\fmsearch.hxx %_DEST%\inc%_EXT%\svx\fmsearch.hxx -..\inc\svx\view3d.hxx %_DEST%\inc%_EXT%\svx\view3d.hxx -..\inc\svx\viewpt3d.hxx %_DEST%\inc%_EXT%\svx\viewpt3d.hxx -..\inc\svx\xbitmap.hxx %_DEST%\inc%_EXT%\svx\xbitmap.hxx -..\inc\svx\xbtmpit.hxx %_DEST%\inc%_EXT%\svx\xbtmpit.hxx -..\inc\svx\xcolit.hxx %_DEST%\inc%_EXT%\svx\xcolit.hxx -..\inc\svx\xdef.hxx %_DEST%\inc%_EXT%\svx\xdef.hxx -..\inc\svx\xdash.hxx %_DEST%\inc%_EXT%\svx\xdash.hxx -..\inc\svx\xfillit.hxx %_DEST%\inc%_EXT%\svx\xfillit.hxx -..\inc\svx\xfillit0.hxx %_DEST%\inc%_EXT%\svx\xfillit0.hxx -..\inc\svx\xflasit.hxx %_DEST%\inc%_EXT%\svx\xflasit.hxx -..\inc\svx\xflbckit.hxx %_DEST%\inc%_EXT%\svx\xflbckit.hxx -..\inc\svx\xflbmpit.hxx %_DEST%\inc%_EXT%\svx\xflbmpit.hxx -..\inc\svx\xflbmsli.hxx %_DEST%\inc%_EXT%\svx\xflbmsli.hxx -..\inc\svx\xflbmsxy.hxx %_DEST%\inc%_EXT%\svx\xflbmsxy.hxx -..\inc\svx\xflbmtit.hxx %_DEST%\inc%_EXT%\svx\xflbmtit.hxx -..\inc\svx\xflboxy.hxx %_DEST%\inc%_EXT%\svx\xflboxy.hxx -..\inc\svx\xflbstit.hxx %_DEST%\inc%_EXT%\svx\xflbstit.hxx -..\inc\svx\xflbtoxy.hxx %_DEST%\inc%_EXT%\svx\xflbtoxy.hxx -..\inc\svx\xflclit.hxx %_DEST%\inc%_EXT%\svx\xflclit.hxx -..\inc\svx\xsflclit.hxx %_DEST%\inc%_EXT%\svx\xsflclit.hxx -..\inc\svx\xflgrit.hxx %_DEST%\inc%_EXT%\svx\xflgrit.hxx -..\inc\svx\xflftrit.hxx %_DEST%\inc%_EXT%\svx\xflftrit.hxx -..\inc\svx\xflhtit.hxx %_DEST%\inc%_EXT%\svx\xflhtit.hxx -..\inc\svx\xfltrit.hxx %_DEST%\inc%_EXT%\svx\xfltrit.hxx -..\inc\svx\xftadit.hxx %_DEST%\inc%_EXT%\svx\xftadit.hxx -..\inc\svx\xftdiit.hxx %_DEST%\inc%_EXT%\svx\xftdiit.hxx -..\inc\svx\xftmrit.hxx %_DEST%\inc%_EXT%\svx\xftmrit.hxx -..\inc\svx\xftouit.hxx %_DEST%\inc%_EXT%\svx\xftouit.hxx -..\inc\svx\xftsfit.hxx %_DEST%\inc%_EXT%\svx\xftsfit.hxx -..\inc\svx\xftshcit.hxx %_DEST%\inc%_EXT%\svx\xftshcit.hxx -..\inc\svx\xftshit.hxx %_DEST%\inc%_EXT%\svx\xftshit.hxx -..\inc\svx\xftshtit.hxx %_DEST%\inc%_EXT%\svx\xftshtit.hxx -..\inc\svx\xftshxy.hxx %_DEST%\inc%_EXT%\svx\xftshxy.hxx -..\inc\svx\xftstit.hxx %_DEST%\inc%_EXT%\svx\xftstit.hxx -..\inc\svx\xgrad.hxx %_DEST%\inc%_EXT%\svx\xgrad.hxx -..\inc\svx\xgrscit.hxx %_DEST%\inc%_EXT%\svx\xgrscit.hxx -..\inc\svx\xhatch.hxx %_DEST%\inc%_EXT%\svx\xhatch.hxx -..\inc\svx\xit.hxx %_DEST%\inc%_EXT%\svx\xit.hxx -..\inc\svx\xlineit.hxx %_DEST%\inc%_EXT%\svx\xlineit.hxx -..\inc\svx\xlineit.hxx %_DEST%\inc%_EXT%\svx\xlineit.hxx -..\inc\svx\xlineit0.hxx %_DEST%\inc%_EXT%\svx\xlineit0.hxx -..\inc\svx\xlineit0.hxx %_DEST%\inc%_EXT%\svx\xlineit0.hxx -..\inc\svx\xlnasit.hxx %_DEST%\inc%_EXT%\svx\xlnasit.hxx -..\inc\svx\xlnclit.hxx %_DEST%\inc%_EXT%\svx\xlnclit.hxx -..\inc\svx\xlndsit.hxx %_DEST%\inc%_EXT%\svx\xlndsit.hxx -..\inc\svx\xlnedcit.hxx %_DEST%\inc%_EXT%\svx\xlnedcit.hxx -..\inc\svx\xlnedit.hxx %_DEST%\inc%_EXT%\svx\xlnedit.hxx -..\inc\svx\xlnedwit.hxx %_DEST%\inc%_EXT%\svx\xlnedwit.hxx -..\inc\svx\xlnstcit.hxx %_DEST%\inc%_EXT%\svx\xlnstcit.hxx -..\inc\svx\xlnstit.hxx %_DEST%\inc%_EXT%\svx\xlnstit.hxx -..\inc\svx\xlnstwit.hxx %_DEST%\inc%_EXT%\svx\xlnstwit.hxx -..\inc\svx\xlntrit.hxx %_DEST%\inc%_EXT%\svx\xlntrit.hxx -..\inc\svx\xlnwtit.hxx %_DEST%\inc%_EXT%\svx\xlnwtit.hxx -..\inc\svx\xpoly.hxx %_DEST%\inc%_EXT%\svx\xpoly.hxx -..\inc\svx\xpool.hxx %_DEST%\inc%_EXT%\svx\xpool.hxx -..\inc\svx\xpool.hxx %_DEST%\inc%_EXT%\xpool.hxx -..\inc\svx\xsetit.hxx %_DEST%\inc%_EXT%\svx\xsetit.hxx -..\inc\svx\xsetit.hxx %_DEST%\inc%_EXT%\xsetit.hxx -..\inc\svx\xtable.hxx %_DEST%\inc%_EXT%\svx\xtable.hxx -..\inc\svx\xtable.hxx %_DEST%\inc%_EXT%\xtable.hxx -..\inc\svx\xtextit.hxx %_DEST%\inc%_EXT%\svx\xtextit.hxx -..\inc\svx\xtextit.hxx %_DEST%\inc%_EXT%\xtextit.hxx -..\inc\svx\xtextit0.hxx %_DEST%\inc%_EXT%\svx\xtextit0.hxx -..\inc\svx\xtextit0.hxx %_DEST%\inc%_EXT%\xtextit0.hxx -..\inc\svx\zoomitem.hxx %_DEST%\inc%_EXT%\svx\zoomitem.hxx -..\inc\svx\viewlayoutitem.hxx %_DEST%\inc%_EXT%\svx\viewlayoutitem.hxx -..\inc\svx\zoomslideritem.hxx %_DEST%\inc%_EXT%\svx\zoomslideritem.hxx -..\inc\svx\zoomsliderctrl.hxx %_DEST%\inc%_EXT%\svx\zoomsliderctrl.hxx -..\inc\svx\extrusioncolorcontrol.hxx %_DEST%\inc%_EXT%\svx\extrusioncolorcontrol.hxx - -..\inc\svx\fmmodel.hxx %_DEST%\inc%_EXT%\svx\fmmodel.hxx -..\inc\svx\fmpage.hxx %_DEST%\inc%_EXT%\svx\fmpage.hxx -..\inc\svx\fmview.hxx %_DEST%\inc%_EXT%\svx\fmview.hxx -..\inc\svx\fmglob.hxx %_DEST%\inc%_EXT%\svx\fmglob.hxx -..\inc\svx\fmshell.hxx %_DEST%\inc%_EXT%\svx\fmshell.hxx -..\inc\svx\svdouno.hxx %_DEST%\inc%_EXT%\svx\svdouno.hxx -..\inc\svx\deflt3d.hxx %_DEST%\inc%_EXT%\svx\deflt3d.hxx -..\inc\svx\AccessibleTextHelper.hxx %_DEST%\inc%_EXT%\svx\AccessibleTextHelper.hxx -..\inc\svx\e3dundo.hxx %_DEST%\inc%_EXT%\svx\e3dundo.hxx -..\inc\svx\msdffdef.hxx %_DEST%\inc%_EXT%\svx\msdffdef.hxx -..\inc\svx\unoshtxt.hxx %_DEST%\inc%_EXT%\svx\unoshtxt.hxx -..\inc\svx\fmdmod.hxx %_DEST%\inc%_EXT%\svx\fmdmod.hxx -..\inc\svx\fmgridcl.hxx %_DEST%\inc%_EXT%\svx\fmgridcl.hxx -..\inc\svx\gridctrl.hxx %_DEST%\inc%_EXT%\svx\gridctrl.hxx -..\inc\svx\unoshprp.hxx %_DEST%\inc%_EXT%\svx\unoshprp.hxx -..\inc\svx\sdasaitm.hxx %_DEST%\inc%_EXT%\svx\sdasaitm.hxx -..\inc\svx\sdasitm.hxx %_DEST%\inc%_EXT%\svx\sdasitm.hxx -..\inc\svx\grfcrop.hxx %_DEST%\inc%_EXT%\svx\grfcrop.hxx -..\inc\svx\grfflt.hxx %_DEST%\inc%_EXT%\svx\grfflt.hxx -..\inc\svx\svx3ditems.hxx %_DEST%\inc%_EXT%\svx\svx3ditems.hxx -..\inc\svx\dbaexchange.hxx %_DEST%\inc%_EXT%\svx\dbaexchange.hxx -..\inc\svx\dbaobjectex.hxx %_DEST%\inc%_EXT%\svx\dbaobjectex.hxx -..\inc\svx\ucsubset.hxx %_DEST%\inc%_EXT%\svx\ucsubset.hxx -..\inc\svx\ucsubset.hrc %_DEST%\inc%_EXT%\svx\ucsubset.hrc -..\inc\svx\dataaccessdescriptor.hxx %_DEST%\inc%_EXT%\svx\dataaccessdescriptor.hxx -..\inc\svx\frmdirlbox.hxx %_DEST%\inc%_EXT%\svx\frmdirlbox.hxx -..\inc\svx\AccessibleShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleShape.hxx -..\inc\svx\AccessibleGraphicShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleGraphicShape.hxx -..\inc\svx\AccessibleOLEShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleOLEShape.hxx -..\inc\svx\AccessibleShapeTreeInfo.hxx %_DEST%\inc%_EXT%\svx\AccessibleShapeTreeInfo.hxx -..\inc\svx\AccessibleShapeInfo.hxx %_DEST%\inc%_EXT%\svx\AccessibleShapeInfo.hxx -..\inc\svx\AccessibleControlShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleControlShape.hxx -..\inc\svx\IAccessibleViewForwarder.hxx %_DEST%\inc%_EXT%\svx\IAccessibleViewForwarder.hxx -..\inc\svx\IAccessibleViewForwarderListener.hxx %_DEST%\inc%_EXT%\svx\IAccessibleViewForwarderListener.hxx -..\inc\svx\IAccessibleParent.hxx %_DEST%\inc%_EXT%\svx\IAccessibleParent.hxx -..\inc\svx\ChildrenManager.hxx %_DEST%\inc%_EXT%\svx\ChildrenManager.hxx -..\inc\svx\ShapeTypeHandler.hxx %_DEST%\inc%_EXT%\svx\ShapeTypeHandler.hxx -..\inc\svx\SvxShapeTypes.hxx %_DEST%\inc%_EXT%\svx\SvxShapeTypes.hxx -..\inc\svx\svdoashp.hxx %_DEST%\inc%_EXT%\svx\svdoashp.hxx -..\inc\svx\extrusionbar.hxx %_DEST%\inc%_EXT%\svx\extrusionbar.hxx -..\inc\svx\fontworkbar.hxx %_DEST%\inc%_EXT%\svx\fontworkbar.hxx -..\inc\svx\svxdlg.hxx %_DEST%\inc%_EXT%\svx\svxdlg.hxx -..\inc\svx\tbxcolorupdate.hxx %_DEST%\inc%_EXT%\svx\tbxcolorupdate.hxx -..\inc\svx\svxdllapi.h %_DEST%\inc%_EXT%\svx\svxdllapi.h -..\inc\svx\SmartTagMgr.hxx %_DEST%\inc%_EXT%\svx\SmartTagMgr.hxx -..\inc\svx\SmartTagItem.hxx %_DEST%\inc%_EXT%\svx\SmartTagItem.hxx -..\inc\svx\SmartTagCtl.hxx %_DEST%\inc%_EXT%\svx\SmartTagCtl.hxx -..\inc\svx\databaselocationinput.hxx %_DEST%\inc%_EXT%\svx\databaselocationinput.hxx -..\inc\svx\dbcharsethelper.hxx %_DEST%\inc%_EXT%\svx\dbcharsethelper.hxx -..\inc\svx\dbtoolsclient.hxx %_DEST%\inc%_EXT%\svx\dbtoolsclient.hxx -..\inc\svx\sdrobjectfilter.hxx %_DEST%\inc%_EXT%\svx\sdrobjectfilter.hxx - -..\inc\svx\subtoolboxcontrol.hxx %_DEST%\inc%_EXT%\svx\subtoolboxcontrol.hxx -..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx -..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx -..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx -..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx - -mkdir: %_DEST%\inc%_EXT%\svx\sdr -mkdir: %_DEST%\inc%_EXT%\svx\sdr\properties -..\inc\svx\sdr\properties\properties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\properties.hxx -..\inc\svx\sdr\properties\emptyproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\emptyproperties.hxx -..\inc\svx\sdr\properties\e3dlatheproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\e3dlatheproperties.hxx -..\inc\svx\sdr\properties\e3dextrudeproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\e3dextrudeproperties.hxx -..\inc\svx\sdr\properties\e3dcompoundproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\e3dcompoundproperties.hxx -..\inc\svx\sdr\properties\e3dproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\e3dproperties.hxx -..\inc\svx\sdr\properties\rectangleproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\rectangleproperties.hxx -..\inc\svx\sdr\properties\attributeproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\attributeproperties.hxx -..\inc\svx\sdr\properties\defaultproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\defaultproperties.hxx -..\inc\svx\sdr\properties\textproperties.hxx %_DEST%\inc%_EXT%\svx\sdr\properties\textproperties.hxx - -mkdir: %_DEST%\inc%_EXT%\svx\sdr\contact -..\inc\svx\sdr\contact\displayinfo.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\displayinfo.hxx -..\inc\svx\sdr\contact\objectcontact.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\objectcontact.hxx -..\inc\svx\sdr\contact\objectcontactofpageview.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\objectcontactofpageview.hxx -..\inc\svx\sdr\contact\viewcontact.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontact.hxx -..\inc\svx\sdr\contact\viewcontactofsdrobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofsdrobj.hxx -..\inc\svx\sdr\contact\viewcontactofsdrmediaobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofsdrmediaobj.hxx -..\inc\svx\sdr\contact\viewcontactofe3dscene.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofe3dscene.hxx -..\inc\svx\sdr\contact\viewcontactofgraphic.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofgraphic.hxx -..\inc\svx\sdr\contact\viewcontactofgroup.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofgroup.hxx -..\inc\svx\sdr\contact\viewcontactofmasterpagedescriptor.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofmasterpagedescriptor.hxx -..\inc\svx\sdr\contact\viewcontactofpageobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofpageobj.hxx -..\inc\svx\sdr\contact\viewcontactofsdrobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofsdrobj.hxx -..\inc\svx\sdr\contact\viewcontactofsdrpage.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofsdrpage.hxx -..\inc\svx\sdr\contact\viewcontactoftextobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactoftextobj.hxx -..\inc\svx\sdr\contact\viewcontactofvirtobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewcontactofvirtobj.hxx -..\inc\svx\sdr\contact\viewobjectcontact.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontact.hxx -..\inc\svx\sdr\contact\objectcontactofobjlistpainter.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\objectcontactofobjlistpainter.hxx -..\inc\svx\sdr\contact\viewobjectcontactredirector.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactredirector.hxx -..\inc\svx\sdr\contact\viewobjectcontactofpageobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactofpageobj.hxx -..\inc\svx\sdr\contact\viewobjectcontactofsdrobj.hxx %_DEST%\inc%_EXT%\svx\sdr\contact\viewobjectcontactofsdrobj.hxx - -mkdir: %_DEST%\inc%_EXT%\svx\sdr\overlay -..\inc\svx\sdr\overlay\overlayanimatedbitmapex.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayanimatedbitmapex.hxx -..\inc\svx\sdr\overlay\overlaybitmapex.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaybitmapex.hxx -..\inc\svx\sdr\overlay\overlayline.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayline.hxx -..\inc\svx\sdr\overlay\overlayhelpline.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayhelpline.hxx -..\inc\svx\sdr\overlay\overlaymanager.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaymanager.hxx -..\inc\svx\sdr\overlay\overlaymanagerbuffered.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaymanagerbuffered.hxx -..\inc\svx\sdr\overlay\overlayobject.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayobject.hxx -..\inc\svx\sdr\overlay\overlayobjectlist.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayobjectlist.hxx -..\inc\svx\sdr\overlay\overlaytriangle.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaytriangle.hxx -..\inc\svx\sdr\overlay\overlaypolypolygon.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaypolypolygon.hxx -..\inc\svx\sdr\overlay\overlayobjectcell.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayobjectcell.hxx -..\inc\svx\sdr\overlay\overlayprimitive2dsequenceobject.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayprimitive2dsequenceobject.hxx -..\inc\svx\sdr\overlay\overlayselection.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlayselection.hxx -..\inc\svx\sdr\overlay\overlaytools.hxx %_DEST%\inc%_EXT%\svx\sdr\overlay\overlaytools.hxx - -mkdir: %_DEST%\inc%_EXT%\svx\sdr\primitive2d -..\inc\svx\sdr\primitive2d\sdrprimitivetools.hxx %_DEST%\inc%_EXT%\svx\sdr\primitive2d\sdrprimitivetools.hxx - -mkdir: %_DEST%\inc%_EXT%\svx\sdr\animation -..\inc\svx\sdr\animation\animationstate.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\animationstate.hxx -..\inc\svx\sdr\animation\objectanimator.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\objectanimator.hxx -..\inc\svx\sdr\animation\scheduler.hxx %_DEST%\inc%_EXT%\svx\sdr\animation\scheduler.hxx - -mkdir: %_DEST%\inc%_EXT%\svx\sdr\table -..\inc\svx\sdr\table\tabledesign.hxx %_DEST%\inc%_EXT%\svx\sdr\table\tabledesign.hxx - -..\xml\SvxDrawPage.xml %_DEST%\xml%_EXT%\SvxDrawPage.xml -..\xml\SvxGraphicObject.xml %_DEST%\xml%_EXT%\SvxGraphicObject.xml -..\xml\SvxShape.xml %_DEST%\xml%_EXT%\SvxShape.xml -..\xml\SvxShapeCircle.xml %_DEST%\xml%_EXT%\SvxShapeCircle.xml -..\xml\SvxShapeCollection.xml %_DEST%\xml%_EXT%\SvxShapeCollection.xml -..\xml\SvxShapeConnector.xml %_DEST%\xml%_EXT%\SvxShapeConnector.xml -..\xml\SvxShapeControl.xml %_DEST%\xml%_EXT%\SvxShapeControl.xml -..\xml\SvxShapeDimensioning.xml %_DEST%\xml%_EXT%\SvxShapeDimensioning.xml -..\xml\SvxShapeGroup.xml %_DEST%\xml%_EXT%\SvxShapeGroup.xml -..\xml\SvxShapePolyPolygon.xml %_DEST%\xml%_EXT%\SvxShapePolyPolygon.xml -..\xml\SvxShapePolyPolygonBezier.xml %_DEST%\xml%_EXT%\SvxShapePolyPolygonBezier.xml -..\xml\SvxUnoNumberingRules.xml %_DEST%\xml%_EXT%\SvxUnoNumberingRules.xml -..\xml\SvxUnoText.xml %_DEST%\xml%_EXT%\SvxUnoText.xml -..\xml\SvxUnoTextContent.xml %_DEST%\xml%_EXT%\SvxUnoTextContent.xml -..\xml\SvxUnoTextContentEnum.xml %_DEST%\xml%_EXT%\SvxUnoTextContentEnum.xml -..\xml\SvxUnoTextCursor.xml %_DEST%\xml%_EXT%\SvxUnoTextCursor.xml -..\xml\SvxUnoTextField.xml %_DEST%\xml%_EXT%\SvxUnoTextField.xml -..\xml\SvxUnoTextRange.xml %_DEST%\xml%_EXT%\SvxUnoTextRange.xml -..\xml\SvxUnoTextRangeEnumeration.xml %_DEST%\xml%_EXT%\SvxUnoTextRangeEnumeration.xml -..\xml\SvxGraphicExporter.xml %_DEST%\xml%_EXT%\SvxGraphicExporter.xml -..\xml\SvxGraphCtrlAccessibleContext.xml %_DEST%\xml%_EXT%\SvxGraphCtrlAccessibleContext.xml -..\xml\AccessibleShape.xml %_DEST%\xml%_EXT%\AccessibleShape.xml -..\xml\AccessibleGraphicShape.xml %_DEST%\xml%_EXT%\AccessibleGraphicShape.xml -..\xml\AccessibleOLEShape.xml %_DEST%\xml%_EXT%\AccessibleOLEShape.xml -..\xml\AccessibleControlShape.xml %_DEST%\xml%_EXT%\AccessibleControlShape.xml -..\xml\AccessibleEditableTextPara.xml %_DEST%\xml%_EXT%\AccessibleEditableTextPara.xml - -..\inc\svx\subtoolboxcontrol.hxx %_DEST%\inc%_EXT%\svx\subtoolboxcontrol.hxx -..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx -..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx -..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx -..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx - -..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.* diff --git a/svx/util/makefile.pmk b/svx/prj/makefile.mk index e0fffdb1fd..e312a7ccab 100644..100755 --- a/svx/util/makefile.pmk +++ b/svx/prj/makefile.mk @@ -25,19 +25,16 @@ # #************************************************************************* -# define SVX_DLLIMPLEMENTATION (see @ svxdllapi.h) -CDEFS += -DSVX_DLLIMPLEMENTATION +PRJ=.. +TARGET=prj -.IF "$(ENABLE_GTK)" != "" -CFLAGS+=-DENABLE_GTK -.ENDIF - -.IF "$(ENABLE_KDE)" != "" -CFLAGS+=-DENABLE_KDE -.ENDIF +.INCLUDE : settings.mk -.IF "$(ENABLE_KDE4)" != "" -CFLAGS+=-DENABLE_KDE4 +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s .ENDIF -VISIBILITY_HIDDEN=TRUE +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/svx/qa/unoapi/Test.java b/svx/qa/unoapi/Test.java index 90abd12776..2f7581e22e 100644..100755 --- a/svx/qa/unoapi/Test.java +++ b/svx/qa/unoapi/Test.java @@ -27,6 +27,7 @@ package org.openoffice.svx.qa.unoapi; import org.openoffice.Runner; import org.openoffice.test.OfficeConnection; +import org.openoffice.test.Argument; import static org.junit.Assert.*; public final class Test { @@ -43,8 +44,8 @@ public final class Test { @org.junit.Test public void test() { assertTrue( Runner.run( - "-sce", "svx.sce", "-xcl", "knownissues.xcl", "-tdoc", - "testdocuments", "-cs", connection.getDescription())); + "-sce", Argument.get("sce"), "-xcl", Argument.get("xcl"), "-tdoc", + Argument.get("tdoc"), "-cs", connection.getDescription())); } private final OfficeConnection connection = new OfficeConnection(); diff --git a/svx/qa/unoapi/knownissues.xcl b/svx/qa/unoapi/knownissues.xcl index 89369160bb..b26db6b7f9 100644..100755 --- a/svx/qa/unoapi/knownissues.xcl +++ b/svx/qa/unoapi/knownissues.xcl @@ -85,3 +85,6 @@ svx.AccessiblePresentationOLEShape::com::sun::star::accessibility::XAccessibleCo ### i111169 ### svx.AccessiblePageShape::com::sun::star::accessibility::XAccessibleComponent + +### i114642 ### +svx.SvxUnoTextContent::com::sun::star::style::CharacterProperties diff --git a/svx/qa/unoapi/makefile.mk b/svx/qa/unoapi/makefile.mk deleted file mode 100644 index 133e9a3458..0000000000 --- a/svx/qa/unoapi/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -#***********************************************************************/ - -.IF "$(OOO_SUBSEQUENT_TESTS)" == "" -nothing .PHONY: -.ELSE - -PRJ = ../.. -PRJNAME = svx -TARGET = qa_unoapi - -.IF "$(OOO_JUNIT_JAR)" != "" -PACKAGE = org/openoffice/svx/qa/unoapi -JAVATESTFILES = Test.java -JAVAFILES = $(JAVATESTFILES) -JARFILES = OOoRunner.jar ridl.jar test.jar -EXTRAJARFILES = $(OOO_JUNIT_JAR) -.END - -.INCLUDE: settings.mk -.INCLUDE: target.mk -.INCLUDE: installationtest.mk - -ALLTAR : javatest - -.END diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce index 82ee2ea6b1..82ee2ea6b1 100644..100755 --- a/svx/qa/unoapi/svx.sce +++ b/svx/qa/unoapi/svx.sce diff --git a/svx/qa/unoapi/testdocuments/SvxShape.sxd b/svx/qa/unoapi/testdocuments/SvxShape.sxd Binary files differindex 27f06d5416..27f06d5416 100644..100755 --- a/svx/qa/unoapi/testdocuments/SvxShape.sxd +++ b/svx/qa/unoapi/testdocuments/SvxShape.sxd diff --git a/svx/qa/unoapi/testdocuments/crazy-blue.jpg b/svx/qa/unoapi/testdocuments/crazy-blue.jpg Binary files differindex 001c88b63d..001c88b63d 100644..100755 --- a/svx/qa/unoapi/testdocuments/crazy-blue.jpg +++ b/svx/qa/unoapi/testdocuments/crazy-blue.jpg diff --git a/svx/qa/unoapi/testdocuments/space-metal.jpg b/svx/qa/unoapi/testdocuments/space-metal.jpg Binary files differindex d233443890..d233443890 100644..100755 --- a/svx/qa/unoapi/testdocuments/space-metal.jpg +++ b/svx/qa/unoapi/testdocuments/space-metal.jpg diff --git a/svx/sdi/fmslots.sdi b/svx/sdi/fmslots.sdi index 2ba8bbaff1..2ba8bbaff1 100644..100755 --- a/svx/sdi/fmslots.sdi +++ b/svx/sdi/fmslots.sdi diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index c5069ad2eb..cd23586cc6 100644..100755 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -6205,33 +6205,6 @@ SfxVoidItem PreviousAnnotation SID_PREVIOUS_POSTIT ] //-------------------------------------------------------------------------- -SfxVoidItem InsertApplet SID_INSERT_APPLET -(SfxStringItem Class FN_PARAM_1, - SfxStringItem ClassLocation FN_PARAM_2, - SfxStringItem Commands FN_PARAM_3) -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INSERT; -] - -//-------------------------------------------------------------------------- SfxUInt32Item InsertGalleryPic SID_GALLERY_FORMATS () [ @@ -15135,3 +15108,31 @@ SfxVoidItem InsertRowDialog SID_TABLE_INSERT_ROW_DLG ToolBoxConfig = FALSE, GroupId = GID_TABLE; ] +//-------------------------------------------------------------------------- +SfxVoidItem PrepareMailExport SID_MAIL_PREPAREEXPORT +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* status: */ + SlotType = SfxBoolItem + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_EXPLORER; +] + diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi index d88807e38d..d88807e38d 100644..100755 --- a/svx/sdi/svxitems.sdi +++ b/svx/sdi/svxitems.sdi diff --git a/svx/sdi/svxslots.hrc b/svx/sdi/svxslots.hrc index b6756506e9..b6756506e9 100644..100755 --- a/svx/sdi/svxslots.hrc +++ b/svx/sdi/svxslots.hrc diff --git a/svx/sdi/svxslots.sdi b/svx/sdi/svxslots.sdi index c8a6d80135..c8a6d80135 100644..100755 --- a/svx/sdi/svxslots.sdi +++ b/svx/sdi/svxslots.sdi diff --git a/svx/sdi/xoitems.sdi b/svx/sdi/xoitems.sdi index cbc9342227..cbc9342227 100644..100755 --- a/svx/sdi/xoitems.sdi +++ b/svx/sdi/xoitems.sdi diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 791df84e66..3c93d42f4f 100644..100755 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/AccessibleControlShape.hxx> #include <svx/AccessibleShapeInfo.hxx> -#include "DescriptionGenerator.hxx" +#include "svx/DescriptionGenerator.hxx" #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> @@ -40,14 +40,14 @@ #include <comphelper/processfactory.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <svx/svdouno.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/ShapeTypeHandler.hxx> #include <svx/SvxShapeTypes.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/accessiblewrapper.hxx> #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> -#include "svdstr.hrc" +#include "svx/svdstr.hrc" #include <algorithm> using namespace ::comphelper; diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx index cb1e23c6a5..c39c11238b 100644..100755 --- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx @@ -106,23 +106,23 @@ namespace accessibility SfxBroadcaster& GetBroadcaster() const { return *(const_cast<AccessibleEmptyEditSource_Impl*>(this)); } // SvxTextForwarder - USHORT GetParagraphCount() const { return 1; } - USHORT GetTextLen( USHORT /*nParagraph*/ ) const { return 0; } + sal_uInt16 GetParagraphCount() const { return 1; } + sal_uInt16 GetTextLen( sal_uInt16 /*nParagraph*/ ) const { return 0; } String GetText( const ESelection& /*rSel*/ ) const { return String(); } - SfxItemSet GetAttribs( const ESelection& /*rSel*/, BOOL /*bOnlyHardAttrib*/ = 0 ) const + SfxItemSet GetAttribs( const ESelection& /*rSel*/, sal_Bool /*bOnlyHardAttrib*/ = 0 ) const { // AW: Very dangerous: The former implementation used a SfxItemPool created on the // fly which of course was deleted again ASAP. Thus, the returned SfxItemSet was using // a deleted Pool by design. return SfxItemSet(SdrObject::GetGlobalDrawObjectItemPool()); } - SfxItemSet GetParaAttribs( USHORT /*nPara*/ ) const { return GetAttribs(ESelection()); } - void SetParaAttribs( USHORT /*nPara*/, const SfxItemSet& /*rSet*/ ) {} + SfxItemSet GetParaAttribs( sal_uInt16 /*nPara*/ ) const { return GetAttribs(ESelection()); } + void SetParaAttribs( sal_uInt16 /*nPara*/, const SfxItemSet& /*rSet*/ ) {} void RemoveAttribs( const ESelection& /*rSelection*/, sal_Bool /*bRemoveParaAttribs*/, sal_uInt16 /*nWhich*/ ){} - void GetPortions( USHORT /*nPara*/, SvUShorts& /*rList*/ ) const {} + void GetPortions( sal_uInt16 /*nPara*/, SvUShorts& /*rList*/ ) const {} - USHORT GetItemState( const ESelection& /*rSel*/, USHORT /*nWhich*/ ) const { return 0; } - USHORT GetItemState( USHORT /*nPara*/, USHORT /*nWhich*/ ) const { return 0; } + sal_uInt16 GetItemState( const ESelection& /*rSel*/, sal_uInt16 /*nWhich*/ ) const { return 0; } + sal_uInt16 GetItemState( sal_uInt16 /*nPara*/, sal_uInt16 /*nWhich*/ ) const { return 0; } SfxItemPool* GetPool() const { return NULL; } @@ -134,35 +134,35 @@ namespace accessibility const SfxItemSet * GetEmptyItemSetPtr() { return 0; } void AppendParagraph() {} - xub_StrLen AppendTextPortion( USHORT /*nPara*/, const String & /*rText*/, const SfxItemSet & /*rSet*/ ) { return 0; } + xub_StrLen AppendTextPortion( sal_uInt16 /*nPara*/, const String & /*rText*/, const SfxItemSet & /*rSet*/ ) { return 0; } //XTextCopy void CopyText(const SvxTextForwarder& ){} - XubString CalcFieldValue( const SvxFieldItem& /*rField*/, USHORT /*nPara*/, USHORT /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ ) + XubString CalcFieldValue( const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/ ) { return XubString(); } - void FieldClicked( const SvxFieldItem&, USHORT, xub_StrLen ) {;} + void FieldClicked( const SvxFieldItem&, sal_uInt16, xub_StrLen ) {;} - BOOL IsValid() const { return sal_True; } + sal_Bool IsValid() const { return sal_True; } void SetNotifyHdl( const Link& ) {} - LanguageType GetLanguage( USHORT, USHORT ) const { return LANGUAGE_DONTKNOW; } - USHORT GetFieldCount( USHORT ) const { return 0; } - EFieldInfo GetFieldInfo( USHORT, USHORT ) const { return EFieldInfo(); } - EBulletInfo GetBulletInfo( USHORT ) const { return EBulletInfo(); } - Rectangle GetCharBounds( USHORT, USHORT ) const { return Rectangle(); } - Rectangle GetParaBounds( USHORT ) const { return Rectangle(); } + LanguageType GetLanguage( sal_uInt16, sal_uInt16 ) const { return LANGUAGE_DONTKNOW; } + sal_uInt16 GetFieldCount( sal_uInt16 ) const { return 0; } + EFieldInfo GetFieldInfo( sal_uInt16, sal_uInt16 ) const { return EFieldInfo(); } + EBulletInfo GetBulletInfo( sal_uInt16 ) const { return EBulletInfo(); } + Rectangle GetCharBounds( sal_uInt16, sal_uInt16 ) const { return Rectangle(); } + Rectangle GetParaBounds( sal_uInt16 ) const { return Rectangle(); } MapMode GetMapMode() const { return MapMode(); } OutputDevice* GetRefDevice() const { return NULL; } - sal_Bool GetIndexAtPoint( const Point&, USHORT&, USHORT& ) const { return sal_False; } - sal_Bool GetWordIndices( USHORT, USHORT, USHORT&, USHORT& ) const { return sal_False; } - sal_Bool GetAttributeRun( USHORT&, USHORT&, USHORT, USHORT ) const { return sal_False; } - USHORT GetLineCount( USHORT nPara ) const { return nPara == 0 ? 1 : 0; } - USHORT GetLineLen( USHORT, USHORT ) const { return 0; } - void GetLineBoundaries( /*out*/USHORT & rStart, /*out*/USHORT & rEnd, USHORT /*nParagraph*/, USHORT /*nLine*/ ) const { rStart = rEnd = 0; } - USHORT GetLineNumberAtIndex( USHORT /*nPara*/, USHORT /*nIndex*/ ) const { return 0; } + sal_Bool GetIndexAtPoint( const Point&, sal_uInt16&, sal_uInt16& ) const { return sal_False; } + sal_Bool GetWordIndices( sal_uInt16, sal_uInt16, sal_uInt16&, sal_uInt16& ) const { return sal_False; } + sal_Bool GetAttributeRun( sal_uInt16&, sal_uInt16&, sal_uInt16, sal_uInt16 ) const { return sal_False; } + sal_uInt16 GetLineCount( sal_uInt16 nPara ) const { return nPara == 0 ? 1 : 0; } + sal_uInt16 GetLineLen( sal_uInt16, sal_uInt16 ) const { return 0; } + void GetLineBoundaries( /*out*/sal_uInt16 & rStart, /*out*/sal_uInt16 & rEnd, sal_uInt16 /*nParagraph*/, sal_uInt16 /*nLine*/ ) const { rStart = rEnd = 0; } + sal_uInt16 GetLineNumberAtIndex( sal_uInt16 /*nPara*/, sal_uInt16 /*nIndex*/ ) const { return 0; } // the following two methods would, strictly speaking, require // a switch to a real EditSource, too. Fortunately, the @@ -174,9 +174,9 @@ namespace accessibility // shapes). sal_Bool Delete( const ESelection& ) { return sal_False; } sal_Bool InsertText( const String&, const ESelection& ) { return sal_False; } - sal_Bool QuickFormatDoc( BOOL ) { return sal_True; } - sal_Int16 GetDepth( USHORT ) const { return -1; } - sal_Bool SetDepth( USHORT, sal_Int16 ) { return sal_True; } + sal_Bool QuickFormatDoc( sal_Bool ) { return sal_True; } + sal_Int16 GetDepth( sal_uInt16 ) const { return -1; } + sal_Bool SetDepth( sal_uInt16, sal_Int16 ) { return sal_True; } Rectangle GetVisArea() const { return Rectangle(); } Point LogicToPixel( const Point& rPoint, const MapMode& /*rMapMode*/ ) const { return rPoint; } diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx index b2d6765847..b2d6765847 100644..100755 --- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx +++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 6cbf92362b..c953d0529f 100644..100755 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -170,7 +170,7 @@ sal_Int32 AccFrameSelector::getAccessibleIndexInParent( ) Window* pTabPage = mpFrameSel->GetParent(); sal_Int32 nChildren = pTabPage->GetChildCount(); for( nIdx = 0; nIdx < nChildren; ++nIdx ) - if( pTabPage->GetChild( static_cast< USHORT >( nIdx ) ) == mpFrameSel ) + if( pTabPage->GetChild( static_cast< sal_uInt16 >( nIdx ) ) == mpFrameSel ) break; } else @@ -610,7 +610,7 @@ void AccFrameSelector::NotifyFocusListeners(sal_Bool bGetFocus) aEvent.FocusFlags = 0; if(bGetFocus) { - USHORT nFocusFlags = mpFrameSel->GetGetFocusFlags(); + sal_uInt16 nFocusFlags = mpFrameSel->GetGetFocusFlags(); if(nFocusFlags&GETFOCUS_TAB) aEvent.FocusFlags |= AwtFocusChangeReason::TAB; if(nFocusFlags&GETFOCUS_CURSOR) diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx index a3cfcbf1d9..a3cfcbf1d9 100644..100755 --- a/svx/source/accessibility/AccessibleGraphicShape.cxx +++ b/svx/source/accessibility/AccessibleGraphicShape.cxx diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx index 764d4d8bfa..764d4d8bfa 100644..100755 --- a/svx/source/accessibility/AccessibleOLEShape.cxx +++ b/svx/source/accessibility/AccessibleOLEShape.cxx diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 5682ada391..230705a11c 100644..100755 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/AccessibleShape.hxx> -#include "DescriptionGenerator.hxx" +#include "svx/DescriptionGenerator.hxx" #include <svx/AccessibleShapeInfo.hxx> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <rtl/uuid.h> @@ -48,13 +48,13 @@ #include <svx/unoshtxt.hxx> #include <svx/svdobj.hxx> #include <svx/svdmodel.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <com/sun/star/uno/Exception.hpp> #include <svx/ShapeTypeHandler.hxx> #include <svx/SvxShapeTypes.hxx> #include "accessibility.hrc" -#include "svdstr.hrc" +#include "svx/svdstr.hrc" #include <svx/dialmgr.hxx> #include <vcl/svapp.hxx> #include <unotools/accessiblestatesethelper.hxx> @@ -249,7 +249,7 @@ void AccessibleShape::UpdateStates (void) // XXX fix_me this has to be done with an extra interface later on if ( m_pShape && maShapeTreeInfo.GetSdrView() ) { - bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == TRUE; + bShapeIsSelected = maShapeTreeInfo.GetSdrView()->IsObjMarked(m_pShape) == sal_True; } if (bShapeIsSelected) diff --git a/svx/source/accessibility/AccessibleShapeInfo.cxx b/svx/source/accessibility/AccessibleShapeInfo.cxx index 756a02f145..756a02f145 100644..100755 --- a/svx/source/accessibility/AccessibleShapeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeInfo.cxx diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx index 879f7ed637..879f7ed637 100644..100755 --- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx +++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx diff --git a/svx/source/accessibility/AccessibleTextEventQueue.cxx b/svx/source/accessibility/AccessibleTextEventQueue.cxx index 894c8d004a..894c8d004a 100644..100755 --- a/svx/source/accessibility/AccessibleTextEventQueue.cxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.cxx diff --git a/svx/source/accessibility/AccessibleTextEventQueue.hxx b/svx/source/accessibility/AccessibleTextEventQueue.hxx index 3fab23b063..3fab23b063 100644..100755 --- a/svx/source/accessibility/AccessibleTextEventQueue.hxx +++ b/svx/source/accessibility/AccessibleTextEventQueue.hxx diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index 15dbfdec58..1653f03961 100644..100755 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -577,7 +577,7 @@ namespace accessibility OSL_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): Parent has focus!"); } - USHORT nMaxValidParaIndex( static_cast< USHORT >( GetTextForwarder().GetParagraphCount() ) - 1 ); + sal_uInt16 nMaxValidParaIndex( static_cast< sal_uInt16 >( GetTextForwarder().GetParagraphCount() ) - 1 ); // notify all affected paragraphs (TODO: may be suboptimal, // since some paragraphs might stay selected) @@ -846,7 +846,7 @@ namespace accessibility DBG_ASSERT(nCurrPara >= 0 && nCurrPara <= USHRT_MAX, "AccessibleTextHelper_Impl::UpdateVisibleChildren: index value overflow"); - aTmpBB = rCacheTF.GetParaBounds( static_cast< USHORT >( nCurrPara ) ); + aTmpBB = rCacheTF.GetParaBounds( static_cast< sal_uInt16 >( nCurrPara ) ); // convert to screen coordinates aParaBB = ::accessibility::AccessibleEditableTextPara::LogicToPixel( aTmpBB, rCacheTF.GetMapMode(), rCacheVF ); @@ -1704,7 +1704,7 @@ namespace accessibility DBG_ASSERT(nChild >= 0 && nChild <= USHRT_MAX, "AccessibleTextHelper_Impl::getAccessibleAt: index value overflow"); - Rectangle aParaBounds( rCacheTF.GetParaBounds( static_cast< USHORT > (nChild) ) ); + Rectangle aParaBounds( rCacheTF.GetParaBounds( static_cast< sal_uInt16 > (nChild) ) ); if( aParaBounds.IsInside( aLogPoint ) ) return getAccessibleChild( nChild - mnFirstVisibleChild + GetStartIndex() ); diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index 20328e658e..20328e658e 100644..100755 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index 5ed4deae99..5ed4deae99 100644..100755 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index c863721f21..c863721f21 100644..100755 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx diff --git a/svx/source/accessibility/DGColorNameLookUp.cxx b/svx/source/accessibility/DGColorNameLookUp.cxx index 7dc583f834..7dc583f834 100644..100755 --- a/svx/source/accessibility/DGColorNameLookUp.cxx +++ b/svx/source/accessibility/DGColorNameLookUp.cxx diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 54c288a044..e6c245279b 100644..100755 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "DescriptionGenerator.hxx" +#include "svx/DescriptionGenerator.hxx" #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> @@ -51,12 +51,12 @@ // Includes for string resources. #include "accessibility.hrc" -#include "svdstr.hrc" +#include "svx/svdstr.hrc" #include <svx/dialmgr.hxx> #include <tools/string.hxx> #include <svx/xdef.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include "accessibility.hrc" #include "DGColorNameLookUp.hxx" diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index 1d05ca3351..5e76aa8b9f 100644..100755 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -46,7 +46,7 @@ #include <toolkit/helper/convert.hxx> #include <svtools/colorcfg.hxx> #include <comphelper/accessibleeventnotifier.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //===== local includes ======================================================== #include <svx/ShapeTypeHandler.hxx> @@ -554,7 +554,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void) throw (::com::sun::star::uno::RuntimeException) { svtools::ColorConfig aColorConfig; - UINT32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; + sal_uInt32 nColor = aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor; return static_cast<sal_Int32>(nColor); } @@ -564,7 +564,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getForeground (void) sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground (void) throw (::com::sun::star::uno::RuntimeException) { - UINT32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); + sal_uInt32 nColor = Application::GetSettings().GetStyleSettings().GetWindowColor().GetColor(); return static_cast<sal_Int32>(nColor); } diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 3103305e47..66d9ed1ef4 100644..100755 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -36,7 +36,7 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svx/dialmgr.hxx> -#include "svdstr.hrc" +#include "svx/svdstr.hrc" using namespace ::rtl; diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx index cacfde900b..cacfde900b 100644..100755 --- a/svx/source/accessibility/SvxShapeTypes.cxx +++ b/svx/source/accessibility/SvxShapeTypes.cxx diff --git a/svx/source/accessibility/accessibility.src b/svx/source/accessibility/accessibility.src index 0fd5579898..0fd5579898 100644..100755 --- a/svx/source/accessibility/accessibility.src +++ b/svx/source/accessibility/accessibility.src diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 8cee0d84e2..879adecf6e 100644..100755 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -101,9 +101,9 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetVirtualAcc:: ensureAlive(); uno::Reference< accessibility::XAccessible > xRet; - const USHORT nItemId = sal::static_int_cast<USHORT>(mpParent->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) )); + const sal_uInt16 nItemId = sal::static_int_cast<sal_uInt16>(mpParent->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) )); - if( USHORT(-1) != nItemId ) + if( sal_uInt16(-1) != nItemId ) { if ( !m_pTable ) m_pTable = new SvxShowCharSetAcc(this); @@ -250,7 +250,7 @@ void SAL_CALL SvxShowCharSetVirtualAcc::disposing() // - SvxShowCharSetItem - // ---------------- -SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,USHORT _nPos ) : +SvxShowCharSetItem::SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,sal_uInt16 _nPos ) : mrParent( rParent ) ,mnId( _nPos ) ,m_pItem(NULL) @@ -334,7 +334,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( SvxShowCharSetAcc, OAccessibleSelectionHelper, sal_Bool SvxShowCharSetAcc::implIsSelected( sal_Int32 nAccessibleChildIndex ) throw (RuntimeException) { return m_pParent && m_pParent->getCharSetControl()->IsSelected( - sal::static_int_cast<USHORT>(nAccessibleChildIndex)); + sal::static_int_cast<sal_uInt16>(nAccessibleChildIndex)); } // ----------------------------------------------------------------------------- // select the specified child => watch for special ChildIndexes (ACCESSIBLE_SELECTION_CHILD_xxx) @@ -386,7 +386,7 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAcce OExternalLockGuard aGuard( this ); ensureAlive(); uno::Reference< accessibility::XAccessible > xRet; - SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( static_cast< USHORT >( i ) ); + SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( static_cast< sal_uInt16 >( i ) ); if( pItem ) { @@ -484,10 +484,10 @@ uno::Reference< accessibility::XAccessible > SAL_CALL SvxShowCharSetAcc::getAcce ensureAlive(); uno::Reference< accessibility::XAccessible > xRet; - const USHORT nItemId = sal::static_int_cast<USHORT>( + const sal_uInt16 nItemId = sal::static_int_cast<sal_uInt16>( m_pParent->getCharSetControl()->PixelToMapIndex( Point( aPoint.X, aPoint.Y ) )); - if( USHORT(-1) != nItemId ) + if( sal_uInt16(-1) != nItemId ) { SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( nItemId ); xRet = pItem->GetAccessible(); @@ -591,7 +591,7 @@ Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_In OExternalLockGuard aGuard( this ); ensureAlive(); ::svx::SvxShowCharSetItem* pItem = m_pParent->getCharSetControl()->ImplGetItem( - sal::static_int_cast<USHORT>(getAccessibleIndex(nRow,nColumn) )); + sal::static_int_cast<sal_uInt16>(getAccessibleIndex(nRow,nColumn) )); if ( !pItem ) throw IndexOutOfBoundsException(); return pItem->GetAccessible(); @@ -623,14 +623,14 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); ensureAlive(); - return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<USHORT>(nChildIndex)); + return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); } // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); ensureAlive(); - return m_pParent->getCharSetControl()->GetColumnPos(sal::static_int_cast<USHORT>(nChildIndex)); + return m_pParent->getCharSetControl()->GetColumnPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); } // ----------------------------------------------------------------------------- diff --git a/svx/source/accessibility/makefile.mk b/svx/source/accessibility/makefile.mk deleted file mode 100755 index 9ac9cff08a..0000000000 --- a/svx/source/accessibility/makefile.mk +++ /dev/null @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=accessibility -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/charmapacc.obj \ - $(SLO)$/svxrectctaccessiblecontext.obj \ - $(SLO)$/GraphCtlAccessibleContext.obj \ - $(SLO)$/ChildrenManager.obj \ - $(SLO)$/ChildrenManagerImpl.obj \ - $(SLO)$/DescriptionGenerator.obj \ - $(SLO)$/AccessibleShape.obj \ - $(SLO)$/AccessibleGraphicShape.obj \ - $(SLO)$/AccessibleOLEShape.obj \ - $(SLO)$/AccessibleShapeInfo.obj \ - $(SLO)$/AccessibleShapeTreeInfo.obj \ - $(SLO)$/AccessibleTextHelper.obj \ - $(SLO)$/AccessibleEmptyEditSource.obj \ - $(SLO)$/AccessibleTextEventQueue.obj \ - $(SLO)$/ShapeTypeHandler.obj \ - $(SLO)$/SvxShapeTypes.obj \ - $(SLO)$/AccessibleControlShape.obj \ - $(SLO)$/DGColorNameLookUp.obj \ - $(SLO)$/AccessibleFrameSelector.obj - -SRS2NAME = accessibility -SRC2FILES = accessibility.src - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index 781280f920..781280f920 100644..100755 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx diff --git a/svx/source/core/coreservices.cxx b/svx/source/core/coreservices.cxx index c6073aea39..0e88b287c5 100644..100755 --- a/svx/source/core/coreservices.cxx +++ b/svx/source/core/coreservices.cxx @@ -78,44 +78,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -static void writeInfo ( - XRegistryKey * pRegistryKey, - const OUString& rImplementationName, - const Sequence< OUString >& rServices) -{ - Reference< XRegistryKey > xNewKey( - pRegistryKey->createKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) ); - - for( sal_Int32 i = 0; i < rServices.getLength(); i++ ) - xNewKey->createKey( rServices.getConstArray()[i]); -} - -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( - void * , void * pRegistryKey) -{ - if( pRegistryKey ) - { - try - { - XRegistryKey *pKey = reinterpret_cast< XRegistryKey * >( pRegistryKey ); - - writeInfo( pKey, ::svx::ExtrusionDepthController_getImplementationName(),::svx::ExtrusionDepthController_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::ExtrusionDirectionControl_getImplementationName(),::svx::ExtrusionDirectionControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::ExtrusionLightingControl_getImplementationName(),::svx::ExtrusionLightingControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::ExtrusionSurfaceControl_getImplementationName(),::svx::ExtrusionSurfaceControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::FontWorkAlignmentControl_getImplementationName(),::svx::FontWorkAlignmentControl_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::FontWorkCharacterSpacingControl_getImplementationName(),::svx::FontWorkCharacterSpacingControl_getSupportedServiceNames() ); - } - catch (InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return sal_True; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 787f045c9e..37350c7ef4 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -28,9 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "EnhancedCustomShape2d.hxx" -#include "EnhancedCustomShapeGeometry.hxx" -#include "EnhancedCustomShapeTypeNames.hxx" +#include "svx/EnhancedCustomShape2d.hxx" +#include "svx/EnhancedCustomShapeGeometry.hxx" +#include "svx/EnhancedCustomShapeTypeNames.hxx" #include <svx/svdoashp.hxx> #include <svx/svdtrans.hxx> #include <svx/svdocirc.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 8276e78234..72498fe6d9 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -32,7 +32,7 @@ #include <svx/svdetc.hxx> #include <svx/svdmodel.hxx> #include <tools/poly.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <svx/svdobj.hxx> #include <svx/svdoashp.hxx> #include <svl/poolitem.hxx> @@ -348,8 +348,8 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con ProjectionType eProjectionType( eProjectionMode == drawing::ProjectionMode_PARALLEL ? PR_PARALLEL : PR_PERSPECTIVE ); // pShape2d Convert in scenes which include 3D Objects E3dDefaultAttributes a3DDefaultAttr; - a3DDefaultAttr.SetDefaultLatheCharacterMode( TRUE ); - a3DDefaultAttr.SetDefaultExtrudeCharacterMode( TRUE ); + a3DDefaultAttr.SetDefaultLatheCharacterMode( sal_True ); + a3DDefaultAttr.SetDefaultExtrudeCharacterMode( sal_True ); E3dScene* pScene = new E3dPolyScene( a3DDefaultAttr ); @@ -370,7 +370,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con { aSet.Put( XLineStyleItem( XLINE_SOLID ) ); aSet.Put( XFillStyleItem ( XFILL_NONE ) ); - aSet.Put( Svx3DDoubleSidedItem( TRUE ) ); + aSet.Put( Svx3DDoubleSidedItem( sal_True ) ); } else { @@ -410,7 +410,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con } else { - SdrObject* pNewObj = pNext->ConvertToPolyObj( FALSE, FALSE ); + SdrObject* pNewObj = pNext->ConvertToPolyObj( sal_False, sal_False ); SdrPathObj* pPath = PTR_CAST( SdrPathObj, pNewObj ); if ( pPath ) aPolyPoly = pPath->GetPathPoly(); @@ -516,7 +516,7 @@ SdrObject* EnhancedCustomShape3d::Create3DObject( const SdrObject* pShape2d, con double fW = rVolume.getWidth(); double fH = rVolume.getHeight(); - rCamera.SetAutoAdjustProjection( FALSE ); + rCamera.SetAutoAdjustProjection( sal_False ); rCamera.SetViewWindow( -fW / 2, - fH / 2, fW, fH); basegfx::B3DPoint aLookAt( 0.0, 0.0, 0.0 ); basegfx::B3DPoint aCamPos( 0.0, 0.0, 100.0 ); diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx index 8007d9829b..8007d9829b 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShape3d.hxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index fb6beaa98a..b8e557ed8a 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -29,14 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "EnhancedCustomShapeEngine.hxx" -#include "EnhancedCustomShape2d.hxx" +#include "svx/EnhancedCustomShape2d.hxx" #include "EnhancedCustomShape3d.hxx" #include "EnhancedCustomShapeFontWork.hxx" #include "EnhancedCustomShapeHandle.hxx" -#include "EnhancedCustomShapeGeometry.hxx" +#include "svx/EnhancedCustomShapeGeometry.hxx" #include <svx/unoshape.hxx> #include "svx/unopage.hxx" -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/svdobj.hxx> #include <svx/svdoashp.hxx> #include <svx/svdogrp.hxx> @@ -48,7 +48,7 @@ #include <svx/svdopath.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "unopolyhelper.hxx" #include <uno/mapping.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> @@ -315,7 +315,7 @@ REF( com::sun::star::drawing::XShape ) SAL_CALL EnhancedCustomShapeEngine::rende nShearWink = -nShearWink; nTan = -nTan; } - pRenderedShape->Shear( pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, FALSE); + pRenderedShape->Shear( pSdrObjCustomShape->GetSnapRect().Center(), nShearWink, nTan, sal_False); } if( nRotateAngle ) { @@ -398,7 +398,7 @@ com::sun::star::drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEng nShearWink = -nShearWink; nTan = -nTan; } - pObj->Shear( aRect.Center(), nShearWink, nTan, FALSE); + pObj->Shear( aRect.Center(), nShearWink, nTan, sal_False); } sal_Int32 nRotateAngle = aCustomShape2d.GetRotateAngle(); if( nRotateAngle ) @@ -434,7 +434,7 @@ com::sun::star::drawing::PolyPolygonBezierCoords SAL_CALL EnhancedCustomShapeEng } else { - pNewObj = pNext->ConvertToPolyObj( FALSE, FALSE ); + pNewObj = pNext->ConvertToPolyObj( sal_False, sal_False ); SdrPathObj* pPath = PTR_CAST( SdrPathObj, pNewObj ); if ( pPath ) aPP = pPath->GetPathPoly(); diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx index 919f1a11f6..919f1a11f6 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 957f24c603..a56ca8e9a6 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -39,7 +39,7 @@ #include <svx/sdasaitm.hxx> #include <svx/sdtfsitm.hxx> #include <vcl/virdev.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <vcl/metric.hxx> #include <editeng/eeitem.hxx> #include <editeng/frmdiritem.hxx> @@ -47,7 +47,7 @@ #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/charscaleitem.hxx> -#include "EnhancedCustomShapeTypeNames.hxx" +#include "svx/EnhancedCustomShapeTypeNames.hxx" #include <svx/svdorect.hxx> #include <svx/svdoashp.hxx> #include <editeng/outliner.hxx> @@ -236,7 +236,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F if ( rText.getLength() ) { // generating vcl/font - USHORT nScriptType = i18n::ScriptType::LATIN; + sal_uInt16 nScriptType = i18n::ScriptType::LATIN; Reference< i18n::XBreakIterator > xBI( EnhancedCustomShapeFontWork::GetBreakIterator() ); if ( xBI.is() ) { @@ -251,7 +251,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F nScriptType = i18n::ScriptType::LATIN; } } - UINT16 nFntItm = EE_CHAR_FONTINFO; + sal_uInt16 nFntItm = EE_CHAR_FONTINFO; if ( nScriptType == i18n::ScriptType::COMPLEX ) nFntItm = EE_CHAR_FONTINFO_CTL; else if ( nScriptType == i18n::ScriptType::ASIAN ) @@ -296,7 +296,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F { FWCharacterData aCharacterData; rtl::OUString aCharText( (sal_Unicode)rText[ i ] ); - if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, aCharText, 0, 0, STRING_LEN, TRUE, nWidth, pDXArry ) ) + if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, aCharText, 0, 0, STRING_LEN, sal_True, nWidth, pDXArry ) ) { sal_Int32 nTextWidth = aVirDev.GetTextWidth( aCharText, 0, STRING_LEN ); std::vector< PolyPolygon >::iterator aOutlineIter = aCharacterData.vOutlines.begin(); @@ -354,7 +354,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F aVirDev.SetFont( aFont ); } FWCharacterData aCharacterData; - if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, 0, STRING_LEN, TRUE, nWidth, pDXArry ) ) + if ( aVirDev.GetTextOutlines( aCharacterData.vOutlines, rText, 0, 0, STRING_LEN, sal_True, nWidth, pDXArry ) ) { aParagraphIter->vCharacters.push_back( aCharacterData ); } diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx index 4b3a90e0dc..4b3a90e0dc 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 1996f6b545..19b3eaf333 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "EnhancedCustomShape2d.hxx" +#include "svx/EnhancedCustomShape2d.hxx" #include <rtl/ustring.hxx> #include <tools/fract.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx index 278246a308..0714bf2a56 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "EnhancedCustomShapeGeometry.hxx" +#include "svx/EnhancedCustomShapeGeometry.hxx" #include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp> /* static const SvxMSDffVertPair Vert[] = diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx index 6b2f8699b7..db094d5862 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx @@ -29,8 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "EnhancedCustomShapeHandle.hxx" -#include "EnhancedCustomShape2d.hxx" -#include "unoapi.hxx" +#include "svx/EnhancedCustomShape2d.hxx" +#include "svx/unoapi.hxx" // ----------------------------------------------------------------------------- diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx index 68ac2bc784..68ac2bc784 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx index 8239fffdbe..b7afa68e36 100644..100755 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "EnhancedCustomShapeTypeNames.hxx" +#include "svx/EnhancedCustomShapeTypeNames.hxx" #include <osl/mutex.hxx> #include <boost/unordered_map.hpp> diff --git a/svx/source/customshapes/makefile.mk b/svx/source/customshapes/makefile.mk deleted file mode 100644 index 3feca8f250..0000000000 --- a/svx/source/customshapes/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=svx -TARGET=customshapes -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Types ------------------------------------- - -# Disable optimization for SunCC SPARC and MACOSX (funny loops -# when parsing e.g. "x+width/2"), -# also http://gcc.gnu.org/PR22392 -.IF ("$(OS)$(CPU)"=="SOLARISS" && "$(COM)"!="GCC") || "$(OS)"=="MACOSX" || ("$(OS)"=="LINUX" && "$(CPU)"=="P") -NOOPTFILES= $(SLO)$/EnhancedCustomShapeFunctionParser.obj -.ENDIF - -ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE - -# --- Files ------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/EnhancedCustomShapeTypeNames.obj \ - $(SLO)$/EnhancedCustomShapeGeometry.obj \ - $(SLO)$/EnhancedCustomShape2d.obj \ - $(SLO)$/EnhancedCustomShapeFunctionParser.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/EnhancedCustomShapeEngine.obj \ - $(SLO)$/EnhancedCustomShape3d.obj \ - $(SLO)$/EnhancedCustomShapeFontWork.obj \ - $(SLO)$/EnhancedCustomShapeHandle.obj \ - $(SLO)$/tbxcustomshapes.obj - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx index 49ff258200..511a7987fc 100644..100755 --- a/svx/source/customshapes/tbxcustomshapes.cxx +++ b/svx/source/customshapes/tbxcustomshapes.cxx @@ -42,7 +42,7 @@ #include <sfx2/imagemgr.hxx> #include <vcl/svapp.hxx> -#include "tbxcustomshapes.hxx" +#include "svx/tbxcustomshapes.hxx" SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlCustomShapes, SfxBoolItem); @@ -52,7 +52,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlCustomShapes, SfxBoolItem); |* \************************************************************************/ -SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), m_aSubTbxResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/" ) ) { @@ -112,7 +112,7 @@ SvxTbxCtlCustomShapes::SvxTbxCtlCustomShapes( USHORT nSlotId, USHORT nId, ToolBo |* \************************************************************************/ -void SvxTbxCtlCustomShapes::StateChanged( USHORT nSID, SfxItemState eState, +void SvxTbxCtlCustomShapes::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { SfxToolBoxControl::StateChanged( nSID, eState, pState ); @@ -145,7 +145,7 @@ SfxPopupWindow* SvxTbxCtlCustomShapes::CreatePopupWindow() // ----------------------------------------------------------------------- -void SvxTbxCtlCustomShapes::Select( BOOL /*bMod1*/ ) +void SvxTbxCtlCustomShapes::Select( sal_Bool /*bMod1*/ ) { if ( m_aCommand.getLength() > 0 ) { diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index b29ce0cb3b..f096dfa238 100644..100755 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -37,7 +37,7 @@ namespace svx { SpellDialogChildWindow::SpellDialogChildWindow ( Window* _pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* /*pInfo*/) : SfxChildWindow (_pParent, nId) @@ -51,7 +51,7 @@ SpellDialogChildWindow::SpellDialogChildWindow ( this ); pWindow = m_pAbstractSpellDialog->GetWindow(); eChildAlignment = SFX_ALIGN_NOALIGNMENT; - SetHideNotDelete (TRUE); + SetHideNotDelete (sal_True); } SpellDialogChildWindow::~SpellDialogChildWindow (void) diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index ad0b1b04a8..d16a5b9397 100644..100755 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -62,7 +62,7 @@ ( pMinG[i] <= nG ) && ( pMaxG[i] >= nG ) && \ ( pMinB[i] <= nB ) && ( pMaxB[i] >= nB ) ) \ { \ - aCol = pDstCols[i]; bReplace = TRUE; break; \ + aCol = pDstCols[i]; bReplace = sal_True; break; \ } \ } \ } @@ -187,16 +187,16 @@ void MaskSet::onEditColor() class MaskData { SvxBmpMask* pMask; - BOOL bIsReady; - BOOL bExecState; + sal_Bool bIsReady; + sal_Bool bExecState; SfxBindings& rBindings; public: MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ); - BOOL IsCbxReady() const { return bIsReady; } - void SetExecState( BOOL bState ) { bExecState = bState; } - BOOL IsExecReady() const { return bExecState; } + sal_Bool IsCbxReady() const { return bIsReady; } + void SetExecState( sal_Bool bState ) { bExecState = bState; } + sal_Bool IsExecReady() const { return bExecState; } DECL_LINK( PipetteHdl, ToolBox* pTbx ); DECL_LINK( CbxHdl, CheckBox* pCbx ); @@ -210,8 +210,8 @@ public: MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) : pMask ( pBmpMask ), - bIsReady ( FALSE ), - bExecState ( FALSE ), + bIsReady ( sal_False ), + bExecState ( sal_False ), rBindings ( rBind ) { @@ -258,7 +258,7 @@ IMPL_LINK( MaskData, CbxHdl, CheckBox*, pCbx ) pSet->SelectItem( 1 ); pSet->Select(); - pMask->aTbxPipette.CheckItem( TBI_PIPETTE, TRUE ); + pMask->aTbxPipette.CheckItem( TBI_PIPETTE, sal_True ); PipetteHdl( &( pMask->aTbxPipette ) ); } @@ -344,7 +344,7 @@ IMPL_LINK( MaskData, FocusLbHdl, ColorLB*, pLb ) IMPL_LINK( MaskData, ExecHdl, PushButton*, EMPTYARG ) { - SfxBoolItem aBItem( SID_BMPMASK_EXEC, TRUE ); + SfxBoolItem aBItem( SID_BMPMASK_EXEC, sal_True ); rBindings.GetDispatcher()->Execute( SID_BMPMASK_EXEC, OWN_CALLMODE, &aBItem, 0L ); return 0L; @@ -368,7 +368,7 @@ void ColorWindow::Paint( const Rectangle &/*Rect*/ ) //------------------------------------------------------------------------- -SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( USHORT nId_, SvxBmpMask& rMask, +SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( sal_uInt16 nId_, SvxBmpMask& rMask, SfxBindings& rBindings ) : SfxControllerItem ( nId_, rBindings ), rBmpMask ( rMask) @@ -377,7 +377,7 @@ SvxBmpMaskSelectItem::SvxBmpMaskSelectItem( USHORT nId_, SvxBmpMask& rMask, //------------------------------------------------------------------------- -void SvxBmpMaskSelectItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, +void SvxBmpMaskSelectItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) { if ( ( nSID == SID_BMPMASK_EXEC ) && pItem ) @@ -392,7 +392,7 @@ void SvxBmpMaskSelectItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, //------------------------------------------------------------------------- -SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, USHORT nId, +SvxBmpMaskChildWindow::SvxBmpMaskChildWindow( Window* pParent_, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( pParent_, nId ) @@ -418,6 +418,10 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx, aBtnExec ( this, BMP_RESID( BTN_EXEC ) ), aGrpQ ( this, BMP_RESID( GRP_Q ) ), + aFt1 ( this, BMP_RESID ( FT_1 ) ), + aFt2 ( this, BMP_RESID ( FT_2 ) ), + aFt3 ( this, BMP_RESID ( FT_3 ) ), + aCbx1 ( this, BMP_RESID( CBX_1 ) ), pQSet1 ( new MaskSet( this, BMP_RESID( QCOL_1 ) ) ), aSp1 ( this, BMP_RESID( SP_1 ) ), @@ -441,9 +445,6 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx, pData ( new MaskData( this, *pBindinx ) ), aCbxTrans ( this, BMP_RESID( CBX_TRANS ) ), aLbColorTrans ( this, BMP_RESID ( LB_TRANS ) ), - aFt1 ( this, BMP_RESID ( FT_1 ) ), - aFt2 ( this, BMP_RESID ( FT_2 ) ), - aFt3 ( this, BMP_RESID ( FT_3 ) ), pColTab ( NULL ), aPipetteColor ( COL_WHITE ), aSelItem ( SID_BMPMASK_EXEC, *this, *pBindinx ), @@ -504,6 +505,42 @@ SvxBmpMask::SvxBmpMask( SfxBindings *pBindinx, pQSet2->Show(); pQSet3->Show(); pQSet4->Show(); + + aCbx1.SetAccessibleRelationMemberOf( &aGrpQ ); + pQSet1->SetAccessibleRelationMemberOf( &aGrpQ ); + aSp1.SetAccessibleRelationMemberOf( &aGrpQ ); + aLbColor1.SetAccessibleRelationMemberOf( &aGrpQ ); + aCbx1.SetAccessibleRelationLabeledBy( &aFt1 ); + pQSet1->SetAccessibleRelationLabeledBy( &aFt1 ); + aSp1.SetAccessibleRelationLabeledBy( &aFt2 ); + aLbColor1.SetAccessibleRelationLabeledBy( &aFt3 ); + aCbx2.SetAccessibleRelationMemberOf( &aGrpQ ); + pQSet2->SetAccessibleRelationMemberOf( &aGrpQ ); + aSp2.SetAccessibleRelationMemberOf( &aGrpQ ); + aLbColor2.SetAccessibleRelationMemberOf( &aGrpQ ); + aCbx2.SetAccessibleRelationLabeledBy( &aFt1 ); + pQSet2->SetAccessibleRelationLabeledBy( &aFt1 ); + aSp2.SetAccessibleRelationLabeledBy( &aFt2 ); + aLbColor2.SetAccessibleRelationLabeledBy( &aFt3 ); + aCbx3.SetAccessibleRelationMemberOf( &aGrpQ ); + pQSet3->SetAccessibleRelationMemberOf( &aGrpQ ); + aSp3.SetAccessibleRelationMemberOf( &aGrpQ ); + aLbColor3.SetAccessibleRelationMemberOf( &aGrpQ ); + aCbx3.SetAccessibleRelationLabeledBy( &aFt1 ); + pQSet3->SetAccessibleRelationLabeledBy( &aFt1 ); + aSp3.SetAccessibleRelationLabeledBy( &aFt2 ); + aLbColor3.SetAccessibleRelationLabeledBy( &aFt3 ); + aCbx4.SetAccessibleRelationMemberOf( &aGrpQ ); + pQSet4->SetAccessibleRelationMemberOf( &aGrpQ ); + aSp4.SetAccessibleRelationMemberOf( &aGrpQ ); + aLbColor4.SetAccessibleRelationMemberOf( &aGrpQ ); + aCbx4.SetAccessibleRelationLabeledBy( &aFt1 ); + pQSet4->SetAccessibleRelationLabeledBy( &aFt1 ); + aSp4.SetAccessibleRelationLabeledBy( &aFt2 ); + aLbColor4.SetAccessibleRelationLabeledBy( &aFt3 ); + aLbColorTrans.SetAccessibleRelationLabeledBy( &aCbxTrans ); + aLbColorTrans.SetAccessibleRelationMemberOf( &aGrpQ ); + aCbxTrans.SetAccessibleRelationMemberOf( &aGrpQ ); } //------------------------------------------------------------------------- @@ -539,9 +576,9 @@ void SvxBmpMask::onSelect( MaskSet* pSet ) //------------------------------------------------------------------------- -BOOL SvxBmpMask::Close() +sal_Bool SvxBmpMask::Close() { - SfxBoolItem aItem2( SID_BMPMASK_PIPETTE, FALSE ); + SfxBoolItem aItem2( SID_BMPMASK_PIPETTE, sal_False ); GetBindings().GetDispatcher()->Execute( SID_BMPMASK_PIPETTE, OWN_CALLMODE, &aItem2, 0L ); return SfxDockingWindow::Close(); @@ -549,7 +586,7 @@ BOOL SvxBmpMask::Close() //------------------------------------------------------------------------- -BOOL SvxBmpMask::NeedsColorTable() const +sal_Bool SvxBmpMask::NeedsColorTable() const { return ( aLbColor1.GetEntryCount() == 0 ); } @@ -599,36 +636,36 @@ void SvxBmpMask::PipetteClicked() { if( pQSet1->GetSelectItemId() == 1 ) { - aCbx1.Check( TRUE ); + aCbx1.Check( sal_True ); pData->CbxHdl( &aCbx1 ); pQSet1->SetItemColor( 1, aPipetteColor ); } else if( pQSet2->GetSelectItemId() == 1 ) { - aCbx2.Check( TRUE ); + aCbx2.Check( sal_True ); pData->CbxHdl( &aCbx2 ); pQSet2->SetItemColor( 1, aPipetteColor ); } else if( pQSet3->GetSelectItemId() == 1 ) { - aCbx3.Check( TRUE ); + aCbx3.Check( sal_True ); pData->CbxHdl( &aCbx3 ); pQSet3->SetItemColor( 1, aPipetteColor ); } else if( pQSet4->GetSelectItemId() == 1 ) { - aCbx4.Check( TRUE ); + aCbx4.Check( sal_True ); pData->CbxHdl( &aCbx4 ); pQSet4->SetItemColor( 1, aPipetteColor ); } - aTbxPipette.CheckItem( TBI_PIPETTE, FALSE ); + aTbxPipette.CheckItem( TBI_PIPETTE, sal_False ); pData->PipetteHdl( &aTbxPipette ); } //------------------------------------------------------------------------- -void SvxBmpMask::SetExecState( BOOL bEnable ) +void SvxBmpMask::SetExecState( sal_Bool bEnable ) { pData->SetExecState( bEnable ); @@ -640,36 +677,36 @@ void SvxBmpMask::SetExecState( BOOL bEnable ) //------------------------------------------------------------------------- -USHORT SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, ULONG* pTols ) +sal_uInt16 SvxBmpMask::InitColorArrays( Color* pSrcCols, Color* pDstCols, sal_uIntPtr* pTols ) { - USHORT nCount = 0; + sal_uInt16 nCount = 0; if ( aCbx1.IsChecked() ) { pSrcCols[nCount] = pQSet1->GetItemColor( 1 ); pDstCols[nCount] = aLbColor1.GetSelectEntryColor(); - pTols[nCount++] = static_cast<ULONG>(aSp1.GetValue()); + pTols[nCount++] = static_cast<sal_uIntPtr>(aSp1.GetValue()); } if ( aCbx2.IsChecked() ) { pSrcCols[nCount] = pQSet2->GetItemColor( 1 ); pDstCols[nCount] = aLbColor2.GetSelectEntryColor(); - pTols[nCount++] = static_cast<ULONG>(aSp2.GetValue()); + pTols[nCount++] = static_cast<sal_uIntPtr>(aSp2.GetValue()); } if ( aCbx3.IsChecked() ) { pSrcCols[nCount] = pQSet3->GetItemColor( 1 ); pDstCols[nCount] = aLbColor3.GetSelectEntryColor(); - pTols[nCount++] = static_cast<ULONG>(aSp3.GetValue()); + pTols[nCount++] = static_cast<sal_uIntPtr>(aSp3.GetValue()); } if ( aCbx4.IsChecked() ) { pSrcCols[nCount] = pQSet4->GetItemColor( 1 ); pDstCols[nCount] = aLbColor4.GetSelectEntryColor(); - pTols[nCount++] = static_cast<ULONG>(aSp4.GetValue()); + pTols[nCount++] = static_cast<sal_uIntPtr>(aSp4.GetValue()); } return nCount; @@ -682,8 +719,8 @@ Bitmap SvxBmpMask::ImpMask( const Bitmap& rBitmap ) Bitmap aBitmap( rBitmap ); Color pSrcCols[4]; Color pDstCols[4]; - ULONG pTols[4]; - const USHORT nCount = InitColorArrays( pSrcCols, pDstCols, pTols ); + sal_uIntPtr pTols[4]; + const sal_uInt16 nCount = InitColorArrays( pSrcCols, pDstCols, pTols ); EnterWait(); aBitmap.Replace( pSrcCols, pDstCols, nCount, pTols ); @@ -724,11 +761,11 @@ Animation SvxBmpMask::ImpMask( const Animation& rAnimation ) Animation aAnimation( rAnimation ); Color pSrcCols[4]; Color pDstCols[4]; - ULONG pTols[4]; + sal_uIntPtr pTols[4]; InitColorArrays( pSrcCols, pDstCols, pTols ); - USHORT nAnimationCount = aAnimation.Count(); + sal_uInt16 nAnimationCount = aAnimation.Count(); - for( USHORT i = 0; i < nAnimationCount; i++ ) + for( sal_uInt16 i = 0; i < nAnimationCount; i++ ) { AnimationBitmap aAnimBmp( aAnimation.Get( i ) ); aAnimBmp.aBmpEx = Mask( aAnimBmp.aBmpEx ).GetBitmapEx(); @@ -745,9 +782,9 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) GDIMetaFile aMtf; Color pSrcCols[4]; Color pDstCols[4]; - ULONG pTols[4]; - USHORT nCount = InitColorArrays( pSrcCols, pDstCols, pTols ); - BOOL pTrans[4]; + sal_uIntPtr pTols[4]; + sal_uInt16 nCount = InitColorArrays( pSrcCols, pDstCols, pTols ); + sal_Bool pTrans[4]; // If no color is selected, we copy only the Mtf if( !nCount ) @@ -766,8 +803,8 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) long* pMaxG = new long[nCount]; long* pMinB = new long[nCount]; long* pMaxB = new long[nCount]; - USHORT i; - BOOL bReplace; + sal_uInt16 i; + sal_Bool bReplace; aMtf.SetPrefSize( rMtf.GetPrefSize() ); aMtf.SetPrefMapMode( rMtf.GetPrefMapMode() ); @@ -793,11 +830,11 @@ GDIMetaFile SvxBmpMask::ImpMask( const GDIMetaFile& rMtf ) } // Investigate actions and if necessary replace colors - for( ULONG nAct = 0UL, nActCount = rMtf.GetActionCount(); nAct < nActCount; nAct++ ) + for( sal_uIntPtr nAct = 0UL, nActCount = rMtf.GetActionCount(); nAct < nActCount; nAct++ ) { MetaAction* pAction = rMtf.GetAction( nAct ); - bReplace = FALSE; + bReplace = sal_False; switch( pAction->GetType() ) { @@ -1024,9 +1061,9 @@ BitmapEx SvxBmpMask::ImpReplaceTransparency( const BitmapEx& rBmpEx, const Color Animation SvxBmpMask::ImpReplaceTransparency( const Animation& rAnim, const Color& rColor ) { Animation aAnimation( rAnim ); - USHORT nAnimationCount = aAnimation.Count(); + sal_uInt16 nAnimationCount = aAnimation.Count(); - for( USHORT i = 0; i < nAnimationCount; i++ ) + for( sal_uInt16 i = 0; i < nAnimationCount; i++ ) { AnimationBitmap aAnimBmp( aAnimation.Get( i ) ); aAnimBmp.aBmpEx = ImpReplaceTransparency( aAnimBmp.aBmpEx, rColor ); @@ -1044,9 +1081,9 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C GDIMetaFile aMtf; const MapMode& rPrefMap = rMtf.GetPrefMapMode(); const Size& rPrefSize = rMtf.GetPrefSize(); - const ULONG nActionCount = rMtf.GetActionCount(); + const sal_uIntPtr nActionCount = rMtf.GetActionCount(); - aVDev.EnableOutput( FALSE ); + aVDev.EnableOutput( sal_False ); aMtf.Record( &aVDev ); aMtf.SetPrefSize( rPrefSize ); aMtf.SetPrefMapMode( rPrefMap ); @@ -1056,7 +1093,7 @@ GDIMetaFile SvxBmpMask::ImpReplaceTransparency( const GDIMetaFile& rMtf, const C // retrieve one action at the time; first // set the whole area to the replacement color. aVDev.DrawRect( Rectangle( rPrefMap.GetOrigin(), rPrefSize ) ); - for ( ULONG i = 0; i < nActionCount; i++ ) + for ( sal_uIntPtr i = 0; i < nActionCount; i++ ) { MetaAction* pAct = rMtf.GetAction( i ); @@ -1107,13 +1144,13 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) { Color pSrcCols[4]; Color pDstCols[4]; - ULONG pTols[4]; - USHORT nCount = InitColorArrays( pSrcCols, pDstCols, pTols ); + sal_uIntPtr pTols[4]; + sal_uInt16 nCount = InitColorArrays( pSrcCols, pDstCols, pTols ); if( nCount ) { // first set all transparent colors - for( USHORT i = 0; i < nCount; i++ ) + for( sal_uInt16 i = 0; i < nCount; i++ ) { // Do we have a transparent color? if( pDstCols[i] == TRANSP_COL ) @@ -1178,7 +1215,7 @@ Graphic SvxBmpMask::Mask( const Graphic& rGraphic ) //------------------------------------------------------------------------- -BOOL SvxBmpMask::IsEyedropping() const +sal_Bool SvxBmpMask::IsEyedropping() const { return aTbxPipette.IsItemChecked( TBI_PIPETTE ); } diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 20487c166a..f18c83b3aa 100644..100755 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -51,7 +51,7 @@ #define _XOUTBMP_STATICS_ONLY #include <svx/dialmgr.hxx> -#include "xoutbmp.hxx" +#include "svx/xoutbmp.hxx" #include <svx/dialogs.hrc> #include <svx/svxids.hrc> #include <svx/contdlg.hxx> @@ -60,7 +60,7 @@ #include "contwnd.hxx" #include <svx/svdtrans.hxx> #include <svx/svdopath.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <vcl/svapp.hxx> /******************************************************************************/ @@ -88,13 +88,13 @@ SFX_IMPL_FLOATINGWINDOW( SvxContourDlgChildWindow, SID_CONTOUR_DLG ); /******************************************************************************/ -SvxContourDlgItem::SvxContourDlgItem( USHORT _nId, SvxSuperContourDlg& rContourDlg, SfxBindings& rBindings ) : +SvxContourDlgItem::SvxContourDlgItem( sal_uInt16 _nId, SvxSuperContourDlg& rContourDlg, SfxBindings& rBindings ) : SfxControllerItem ( _nId, rBindings ), rDlg ( rContourDlg ) { } -void SvxContourDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) +void SvxContourDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) { if ( pItem && ( SID_CONTOUR_EXEC == nSID ) ) { @@ -109,7 +109,7 @@ void SvxContourDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, cons /******************************************************************************/ -SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, USHORT nId, +SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) { @@ -124,7 +124,7 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( Window* _pParent, USHORT nId pDlg->Initialize( pInfo ); } -void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, BOOL bGraphicLinked, +void SvxContourDlgChildWindow::UpdateContourDlg( const Graphic& rGraphic, sal_Bool bGraphicLinked, const PolyPolygon* pPolyPoly, void* pEditingObj ) { if ( SfxViewFrame::Current() && @@ -146,10 +146,10 @@ SvxContourDlg::~SvxContourDlg() PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, const Rectangle* pRect, - const ULONG nFlags ) + const sal_uIntPtr nFlags ) { Bitmap aBmp; - ULONG nContourFlags = XOUTBMP_CONTOUR_HORZ; + sal_uIntPtr nContourFlags = XOUTBMP_CONTOUR_HORZ; if ( rGraphic.GetType() == GRAPHIC_BITMAP ) { @@ -160,14 +160,14 @@ PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, PolyPolygon aAnimPolyPoly; const Animation aAnim( rGraphic.GetAnimation() ); const Size& rSizePix = aAnim.GetDisplaySizePixel(); - const USHORT nCount = aAnim.Count(); + const sal_uInt16 nCount = aAnim.Count(); if ( aVDev.SetOutputSizePixel( rSizePix ) ) { aVDev.SetLineColor( Color( COL_BLACK ) ); aVDev.SetFillColor( Color( COL_BLACK ) ); - for( USHORT i = 0; i < nCount; i++ ) + for( sal_uInt16 i = 0; i < nCount; i++ ) { const AnimationBitmap& rStepBmp = aAnim.Get( i ); @@ -235,7 +235,7 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic const Size aGrfSize( rGraphic.GetPrefSize() ); Size aOrgSize; Point aNewPoint; - BOOL bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; + sal_Bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; if ( bPixelMap ) aOrgSize = pOutDev->PixelToLogic( aGrfSize, aDispMap ); @@ -247,11 +247,11 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic double fScaleX = (double) rDisplaySize.Width() / aOrgSize.Width(); double fScaleY = (double) rDisplaySize.Height() / aOrgSize.Height(); - for ( USHORT j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ ) + for ( sal_uInt16 j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ ) { Polygon& rPoly = rContour[ j ]; - for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) + for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) { if ( bPixelMap ) aNewPoint = pOutDev->PixelToLogic( rPoly[ i ], aDispMap ); @@ -267,7 +267,7 @@ void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic // Loop through to super class, no virtual Methods to not become incompatible // due to IF changes -void SvxContourDlg::SetExecState( BOOL bEnable ) +void SvxContourDlg::SetExecState( sal_Bool bEnable ) { pSuperClass->SetExecState( bEnable ); } @@ -277,7 +277,7 @@ void SvxContourDlg::SetGraphic( const Graphic& rGraphic ) pSuperClass->SetGraphic( rGraphic ); } -void SvxContourDlg::SetGraphicLinked( BOOL bGraphicLinked ) +void SvxContourDlg::SetGraphicLinked( sal_Bool bGraphicLinked ) { pSuperClass->SetGraphicLinked( bGraphicLinked ); } @@ -287,7 +287,7 @@ const Graphic& SvxContourDlg::GetGraphic() const return pSuperClass->GetGraphic(); } -BOOL SvxContourDlg::IsGraphicChanged() const +sal_Bool SvxContourDlg::IsGraphicChanged() const { return pSuperClass->IsGraphicChanged(); } @@ -299,7 +299,7 @@ void SvxContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly ) PolyPolygon SvxContourDlg::GetPolyPolygon() { - return pSuperClass->GetPolyPolygon( TRUE ); + return pSuperClass->GetPolyPolygon( sal_True ); } void SvxContourDlg::SetEditingObject( void* pObj ) @@ -312,7 +312,7 @@ const void* SvxContourDlg::GetEditingObject() const return pSuperClass->GetEditingObject(); } -void SvxContourDlg::Update( const Graphic& rGraphic, BOOL bGraphicLinked, +void SvxContourDlg::Update( const Graphic& rGraphic, sal_Bool bGraphicLinked, const PolyPolygon* pPolyPoly, void* pEditingObj ) { pSuperClass->UpdateGraphic( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj ); @@ -328,8 +328,8 @@ SvxSuperContourDlg::SvxSuperContourDlg( SfxBindings *_pBindings, SfxChildWindow aContourWnd ( this, ResId( CTL_CONTOUR, *rResId.GetResMgr() ) ), aStbStatus ( this, WB_BORDER | WB_3DLOOK | WB_LEFT ), nGrfChanged ( 0UL ), - bExecState ( FALSE ), - bGraphicLinked ( FALSE ), + bExecState ( sal_False ), + bGraphicLinked ( sal_False ), maImageList ( SVX_RES( CD_IMAPDLG ) ) { ApplyImageList(); @@ -408,9 +408,9 @@ void SvxSuperContourDlg::Resize() // Close methods -BOOL SvxSuperContourDlg::Close() +sal_Bool SvxSuperContourDlg::Close() { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if ( aTbx1.IsItemEnabled( TBI_APPLY ) ) { @@ -420,20 +420,20 @@ BOOL SvxSuperContourDlg::Close() if ( nRet == RET_YES ) { - SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, TRUE ); + SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, sal_True ); GetBindings().GetDispatcher()->Execute( SID_CONTOUR_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L ); } else if ( nRet == RET_CANCEL ) - bRet = FALSE; + bRet = sal_False; } - return( bRet ? SfxFloatingWindow::Close() : FALSE ); + return( bRet ? SfxFloatingWindow::Close() : sal_False ); } // Enabled or disabled all Controls -void SvxSuperContourDlg::SetExecState( BOOL bEnable ) +void SvxSuperContourDlg::SetExecState( sal_Bool bEnable ) { bExecState = bEnable; } @@ -454,13 +454,13 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly ) const MapMode aMap100( MAP_100TH_MM ); const MapMode aGrfMap( aGraphic.GetPrefMapMode() ); OutputDevice* pOutDev = Application::GetDefaultDevice(); - BOOL bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; + sal_Bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; - for ( USHORT j = 0, nPolyCount = aPolyPoly.Count(); j < nPolyCount; j++ ) + for ( sal_uInt16 j = 0, nPolyCount = aPolyPoly.Count(); j < nPolyCount; j++ ) { Polygon& rPoly = aPolyPoly[ j ]; - for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) + for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) { Point& rPt = rPoly[ i ]; @@ -475,7 +475,7 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly ) aContourWnd.GetSdrModel()->SetChanged( sal_True ); } -PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic ) +PolyPolygon SvxSuperContourDlg::GetPolyPolygon( sal_Bool bRescaleToGraphic ) { PolyPolygon aRetPolyPoly( aContourWnd.GetPolyPolygon() ); @@ -484,13 +484,13 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic ) const MapMode aMap100( MAP_100TH_MM ); const MapMode aGrfMap( aGraphic.GetPrefMapMode() ); OutputDevice* pOutDev = Application::GetDefaultDevice(); - BOOL bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; + sal_Bool bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL; - for ( USHORT j = 0, nPolyCount = aRetPolyPoly.Count(); j < nPolyCount; j++ ) + for ( sal_uInt16 j = 0, nPolyCount = aRetPolyPoly.Count(); j < nPolyCount; j++ ) { Polygon& rPoly = aRetPolyPoly[ j ]; - for ( USHORT i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) + for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ ) { Point& rPt = rPoly[ i ]; @@ -505,7 +505,7 @@ PolyPolygon SvxSuperContourDlg::GetPolyPolygon( BOOL bRescaleToGraphic ) return aRetPolyPoly; } -void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, BOOL _bGraphicLinked, +void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, sal_Bool _bGraphicLinked, const PolyPolygon* pPolyPoly, void* pEditingObj ) { aUpdateGraphic = rGraphic; @@ -520,12 +520,12 @@ void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, BOOL _bGraphicL aUpdateTimer.Start(); } -BOOL SvxSuperContourDlg::IsUndoPossible() const +sal_Bool SvxSuperContourDlg::IsUndoPossible() const { return aUndoGraphic.GetType() != GRAPHIC_NONE; } -BOOL SvxSuperContourDlg::IsRedoPossible() const +sal_Bool SvxSuperContourDlg::IsRedoPossible() const { return aRedoGraphic.GetType() != GRAPHIC_NONE; } @@ -537,7 +537,7 @@ void SvxSuperContourDlg::DoAutoCreate() void SvxSuperContourDlg::ReducePoints( const long nTol ) { - PolyPolygon aPolyPoly( GetPolyPolygon( FALSE ) ); + PolyPolygon aPolyPoly( GetPolyPolygon( sal_False ) ); if ( aPolyPoly.Count() ) { @@ -546,13 +546,13 @@ void SvxSuperContourDlg::ReducePoints( const long nTol ) Polygon& rPoly = aPolyPoly[ 0 ]; OutputDevice* pOutDev = Application::GetDefaultDevice(); Point aPtPix; - const USHORT nSize = rPoly.GetSize(); - USHORT nCounter = 0; + const sal_uInt16 nSize = rPoly.GetSize(); + sal_uInt16 nCounter = 0; if ( nSize ) aPtPix = pOutDev->LogicToPixel( rPoly[ 0 ], aMapMode ); - for( USHORT i = 1; i < nSize; i++ ) + for( sal_uInt16 i = 1; i < nSize; i++ ) { const Point& rNewPt = rPoly[ i ]; const Point aNewPtPix( pOutDev->LogicToPixel( rNewPt, aMapMode ) ); @@ -578,13 +578,13 @@ void SvxSuperContourDlg::ReducePoints( const long nTol ) IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) { - USHORT nNewItemId = pTbx->GetCurItemId(); + sal_uInt16 nNewItemId = pTbx->GetCurItemId(); switch( pTbx->GetCurItemId() ) { case( TBI_APPLY ): { - SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, TRUE ); + SfxBoolItem aBoolItem( SID_CONTOUR_EXEC, sal_True ); GetBindings().GetDispatcher()->Execute( SID_CONTOUR_EXEC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L ); } @@ -597,32 +597,32 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) QueryBox aQBox( this, WB_YES_NO | WB_DEF_NO, String( CONT_RESID( STR_CONTOURDLG_WORKPLACE ) ) ); if ( !aContourWnd.IsContourChanged() || ( aQBox.Execute() == RET_YES ) ) - aContourWnd.SetWorkplaceMode( TRUE ); + aContourWnd.SetWorkplaceMode( sal_True ); else - aTbx1.CheckItem( TBI_WORKPLACE, FALSE ); + aTbx1.CheckItem( TBI_WORKPLACE, sal_False ); } else - aContourWnd.SetWorkplaceMode( FALSE ); + aContourWnd.SetWorkplaceMode( sal_False ); } break; case( TBI_SELECT ): { - pTbx->CheckItem( nNewItemId, TRUE ); - aContourWnd.SetEditMode( TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); + aContourWnd.SetEditMode( sal_True ); } break; case( TBI_RECT ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); aContourWnd.SetObjKind( OBJ_RECT ); } break; case( TBI_CIRCLE ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); aContourWnd.SetObjKind( OBJ_CIRC ); } @@ -630,14 +630,14 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) case( TBI_POLY ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); aContourWnd.SetObjKind( OBJ_POLY ); } break; case( TBI_FREEPOLY ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); aContourWnd.SetObjKind( OBJ_FREEFILL ); } break; @@ -664,7 +664,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) aRedoGraphic = aGraphic; aGraphic = aUndoGraphic; aUndoGraphic = Graphic(); - aContourWnd.SetGraphic( aGraphic, FALSE ); + aContourWnd.SetGraphic( aGraphic, sal_False ); } break; @@ -674,7 +674,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) aUndoGraphic = aGraphic; aGraphic = aRedoGraphic; aRedoGraphic = Graphic(); - aContourWnd.SetGraphic( aGraphic, FALSE ); + aContourWnd.SetGraphic( aGraphic, sal_False ); } break; @@ -684,7 +684,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) case( TBI_PIPETTE ): { - BOOL bPipette = aTbx1.IsItemChecked( TBI_PIPETTE ); + sal_Bool bPipette = aTbx1.IsItemChecked( TBI_PIPETTE ); if ( !bPipette ) aStbStatus.Invalidate(); @@ -694,7 +694,7 @@ IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx ) if ( aQBox.Execute() != RET_YES ) { - aTbx1.CheckItem( TBI_PIPETTE, bPipette = FALSE ); + aTbx1.CheckItem( TBI_PIPETTE, bPipette = sal_False ); aStbStatus.Invalidate(); } } @@ -760,7 +760,7 @@ IMPL_LINK( SvxSuperContourDlg, UpdateHdl, Timer*, EMPTYARG ) aUpdateGraphic = Graphic(); aUpdatePolyPoly = PolyPolygon(); - bUpdateGraphicLinked = FALSE; + bUpdateGraphicLinked = sal_False; aContourWnd.GetSdrModel()->SetChanged( sal_False ); } @@ -776,7 +776,7 @@ IMPL_LINK( SvxSuperContourDlg, CreateHdl, Timer*, EMPTYARG ) const Rectangle aWorkRect = aContourWnd.LogicToPixel( aContourWnd.GetWorkRect(), MapMode( MAP_100TH_MM ) ); const Graphic& rGraphic = aContourWnd.GetGraphic(); - const BOOL bValid = aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom(); + const sal_Bool bValid = aWorkRect.Left() != aWorkRect.Right() && aWorkRect.Top() != aWorkRect.Bottom(); EnterWait(); SetPolyPolygon( CreateAutoContour( rGraphic, bValid ? &aWorkRect : NULL ) ); @@ -789,12 +789,12 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd ) { const SdrObject* pObj = pWnd->GetSelectedSdrObject(); const SdrView* pView = pWnd->GetSdrView(); - const BOOL bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj ); - const BOOL bDrawEnabled = !( bPolyEdit && aTbx1.IsItemChecked( TBI_POLYEDIT ) ); - const BOOL bPipette = aTbx1.IsItemChecked( TBI_PIPETTE ); - const BOOL bWorkplace = aTbx1.IsItemChecked( TBI_WORKPLACE ); - const BOOL bDontHide = !( bPipette || bWorkplace ); - const BOOL bBitmap = pWnd->GetGraphic().GetType() == GRAPHIC_BITMAP; + const sal_Bool bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj ); + const sal_Bool bDrawEnabled = !( bPolyEdit && aTbx1.IsItemChecked( TBI_POLYEDIT ) ); + const sal_Bool bPipette = aTbx1.IsItemChecked( TBI_PIPETTE ); + const sal_Bool bWorkplace = aTbx1.IsItemChecked( TBI_WORKPLACE ); + const sal_Bool bDontHide = !( bPipette || bWorkplace ); + const sal_Bool bBitmap = pWnd->GetGraphic().GetType() == GRAPHIC_BITMAP; aTbx1.EnableItem( TBI_APPLY, bDontHide && bExecState && pWnd->IsChanged() ); @@ -819,7 +819,7 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd ) if ( bPolyEdit ) { - USHORT nId = 0; + sal_uInt16 nId = 0; switch( pWnd->GetPolyEditMode() ) { @@ -830,13 +830,13 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd ) break; } - aTbx1.CheckItem( nId, TRUE ); + aTbx1.CheckItem( nId, sal_True ); } else { - aTbx1.CheckItem( TBI_POLYEDIT, FALSE ); - aTbx1.CheckItem( TBI_POLYMOVE, TRUE ); - aTbx1.CheckItem( TBI_POLYINSERT, FALSE ); + aTbx1.CheckItem( TBI_POLYEDIT, sal_False ); + aTbx1.CheckItem( TBI_POLYMOVE, sal_True ); + aTbx1.CheckItem( TBI_POLYINSERT, sal_False ); pWnd->SetPolyEditMode( 0 ); } @@ -889,7 +889,7 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd ) if( !!aMask ) { QueryBox aQBox( this, WB_YES_NO | WB_DEF_YES, String( CONT_RESID( STR_CONTOURDLG_NEWPIPETTE ) ) ); - BOOL bNewContour; + sal_Bool bNewContour; aRedoGraphic = Graphic(); aUndoGraphic = aGraphic; @@ -907,8 +907,8 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd ) LeaveWait(); } - aTbx1.CheckItem( TBI_PIPETTE, FALSE ); - pWnd->SetPipetteMode( FALSE ); + aTbx1.CheckItem( TBI_PIPETTE, sal_False ); + pWnd->SetPipetteMode( sal_False ); aStbStatus.Invalidate(); return 0L; @@ -916,9 +916,9 @@ IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow*, pWnd ) IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow*, pWnd ) { - aTbx1.CheckItem( TBI_WORKPLACE, FALSE ); - aTbx1.CheckItem( TBI_SELECT, TRUE ); - pWnd->SetWorkplaceMode( FALSE ); + aTbx1.CheckItem( TBI_WORKPLACE, sal_False ); + aTbx1.CheckItem( TBI_SELECT, sal_True ); + pWnd->SetWorkplaceMode( sal_False ); return 0L; } @@ -940,7 +940,7 @@ void SvxSuperContourDlg::DataChanged( const DataChangedEvent& rDCEvt ) IMPL_LINK( SvxSuperContourDlg, MiscHdl, void*, EMPTYARG ) { - SvtMiscOptions aMiscOptions; + SvtMiscOptions aMiscOptions; aTbx1.SetOutStyle( aMiscOptions.GetToolboxStyle() ); return 0L; diff --git a/svx/source/dialog/bmpmask.hrc b/svx/source/dialog/bmpmask.hrc index eaad8ea459..1a4d825679 100644..100755 --- a/svx/source/dialog/bmpmask.hrc +++ b/svx/source/dialog/bmpmask.hrc @@ -27,7 +27,11 @@ #define RID_SVXDLG_BMPMASK (RID_SVX_BMPMASK_START) #define RID_SVXDLG_BMPMASK_STR_TRANSP (RID_SVX_BMPMASK_START + 1) #define RID_SVXDLG_BMPMASK_STR_SOURCECOLOR (RID_SVX_BMPMASK_START + 2) - +/*IAccessibility2 Implementation 2009-----*/ +#define RID_SVXDLG_BMPMASK_STR_PALETTE (RID_SVX_BMPMASK_START + 3) +#define RID_SVXDLG_BMPMASK_STR_TOLERANCE (RID_SVX_BMPMASK_START + 4) +#define RID_SVXDLG_BMPMASK_STR_REPLACEWITH (RID_SVX_BMPMASK_START + 5) +/*-----IAccessibility2 Implementation 2009*/ #define GRP_Q 1 #define CTR_PIPETTE 1 #define CBX_1 1 diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src index b92a3626a7..0971a55647 100644..100755 --- a/svx/source/dialog/bmpmask.src +++ b/svx/source/dialog/bmpmask.src @@ -37,7 +37,7 @@ // RID_SVXDLG_BMPMASK ---------------------------------------------------- DockingWindow RID_SVXDLG_BMPMASK { - HelpId = SID_BMPMASK ; + HelpId = CMD_SID_BMPMASK ; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -78,6 +78,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_1 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_1"; Pos = MAP_APPFONT ( 12 , 50 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -92,6 +93,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_1 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_1"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 48 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -106,6 +108,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_1 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_1"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 48 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -118,6 +121,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_2 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_2"; Pos = MAP_APPFONT ( 12 , 65 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -132,6 +136,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_2 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_2"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 63 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -146,6 +151,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_2 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_2"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 63 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -158,6 +164,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_3 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_3"; Pos = MAP_APPFONT ( 12 , 80 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -172,6 +179,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_3 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_3"; Border = TRUE ; Pos = MAP_APPFONT ( 58, 78 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -186,6 +194,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_3 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_3"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 78 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -198,6 +207,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_4 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_4"; Pos = MAP_APPFONT ( 12 , 95 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -212,6 +222,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_4 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_4"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 93 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -226,6 +237,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_4 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_4"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 93 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -236,6 +248,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_TRANS { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_TRANS"; Pos = MAP_APPFONT ( 12 , 110 ) ; Size = MAP_APPFONT ( 71 , 10 ) ; TabStop = TRUE ; @@ -244,6 +257,7 @@ DockingWindow RID_SVXDLG_BMPMASK PushButton BTN_EXEC { + HelpID = "svx:PushButton:RID_SVXDLG_BMPMASK:BTN_EXEC"; Pos = MAP_APPFONT ( 93 , 6 ) ; Size = MAP_APPFONT ( 64 , 14 ) ; Text [ en-US ] = "~Replace" ; @@ -251,6 +265,7 @@ DockingWindow RID_SVXDLG_BMPMASK ListBox LB_TRANS { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_TRANS"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 108 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -274,7 +289,7 @@ DockingWindow RID_SVXDLG_BMPMASK ImageBitmap = Bitmap { File = "sc10350.bmp" ; }; MASKCOLOR }; - Text [ en-US ] = "Eyedropper" ; + Text [ en-US ] = "Pipette" ; }; }; }; @@ -285,7 +300,7 @@ DockingWindow RID_SVXDLG_BMPMASK Pos = MAP_APPFONT ( 22 , 6 ) ; Size = MAP_APPFONT ( 43 , 14 ) ; }; - Text [ en-US ] = "Eyedropper" ; + Text [ en-US ] = "Color Replacer" ; Image IMG_PIPETTE { @@ -307,47 +322,16 @@ String RID_SVXDLG_BMPMASK_STR_SOURCECOLOR Text [ en-US ] = "Source Color"; }; - // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +String RID_SVXDLG_BMPMASK_STR_PALETTE +{ + Text [ en-US ] = "Color Palette"; +}; +String RID_SVXDLG_BMPMASK_STR_TOLERANCE +{ + Text [ en-US ] = "Tolerance"; +}; +String RID_SVXDLG_BMPMASK_STR_REPLACEWITH +{ + Text [ en-US ] = "Replace with"; +}; diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index df7d2affe2..57b508ddba 100644..100755 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -82,11 +82,11 @@ SvxShowCharSet::SvxShowCharSet( Window* pParent, const ResId& rResId ) : SetStyle( GetStyle() | WB_CLIPCHILDREN ); aVscrollSB.SetScrollHdl( LINK( this, SvxShowCharSet, VscrollHdl ) ); - aVscrollSB.EnableDrag( TRUE ); + aVscrollSB.EnableDrag( sal_True ); // other settings like aVscroll depend on selected font => see SetFont - bDrag = FALSE; - InitSettings( TRUE, TRUE ); + bDrag = sal_False; + InitSettings( sal_True, sal_True ); } // ----------------------------------------------------------------------- @@ -94,7 +94,7 @@ SvxShowCharSet::SvxShowCharSet( Window* pParent, const ResId& rResId ) : void SvxShowCharSet::GetFocus() { Control::GetFocus(); - SelectIndex( nSelectedIndex, TRUE ); + SelectIndex( nSelectedIndex, sal_True ); } // ----------------------------------------------------------------------- @@ -102,7 +102,7 @@ void SvxShowCharSet::GetFocus() void SvxShowCharSet::LoseFocus() { Control::LoseFocus(); - SelectIndex( nSelectedIndex, FALSE ); + SelectIndex( nSelectedIndex, sal_False ); } // ----------------------------------------------------------------------- @@ -110,9 +110,9 @@ void SvxShowCharSet::LoseFocus() void SvxShowCharSet::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) - InitSettings( TRUE, FALSE ); + InitSettings( sal_True, sal_False ); else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) - InitSettings( FALSE, TRUE ); + InitSettings( sal_False, sal_True ); Control::StateChanged( nType ); } @@ -123,7 +123,7 @@ void SvxShowCharSet::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) - InitSettings( TRUE, TRUE ); + InitSettings( sal_True, sal_True ); else Control::DataChanged( rDCEvt ); } @@ -137,7 +137,7 @@ void SvxShowCharSet::MouseButtonDown( const MouseEvent& rMEvt ) if ( rMEvt.GetClicks() == 1 ) { GrabFocus(); - bDrag = TRUE; + bDrag = sal_True; CaptureMouse(); int nIndex = PixelToMapIndex( rMEvt.GetPosPixel() ); @@ -159,7 +159,7 @@ void SvxShowCharSet::MouseButtonUp( const MouseEvent& rMEvt ) if ( Rectangle(Point(), GetOutputSize()).IsInside(rMEvt.GetPosPixel())) aSelectHdl.Call( this ); ReleaseMouse(); - bDrag = FALSE; + bDrag = sal_False; } } @@ -196,14 +196,14 @@ void SvxShowCharSet::Command( const CommandEvent& rCEvt ) // ----------------------------------------------------------------------------- -USHORT SvxShowCharSet::GetRowPos(USHORT _nPos) const +sal_uInt16 SvxShowCharSet::GetRowPos(sal_uInt16 _nPos) const { return _nPos / COLUMN_COUNT ; } // ----------------------------------------------------------------------------- -USHORT SvxShowCharSet::GetColumnPos(USHORT _nPos) const +sal_uInt16 SvxShowCharSet::GetColumnPos(sal_uInt16 _nPos) const { return _nPos % COLUMN_COUNT ; } @@ -222,9 +222,9 @@ int SvxShowCharSet::FirstInView( void ) const int SvxShowCharSet::LastInView( void ) const { - ULONG nIndex = FirstInView(); + sal_uIntPtr nIndex = FirstInView(); nIndex += ROW_COUNT * COLUMN_COUNT - 1; - ULONG nCompare = sal::static_int_cast<ULONG>( maFontCharMap.GetCharCount() - 1 ); + sal_uIntPtr nCompare = sal::static_int_cast<sal_uIntPtr>( maFontCharMap.GetCharCount() - 1 ); if( nIndex > nCompare ) nIndex = nCompare; return nIndex; @@ -311,7 +311,7 @@ void SvxShowCharSet::KeyInput( const KeyEvent& rKEvt ) if ( tmpSelected >= 0 ) { - SelectIndex( tmpSelected, TRUE ); + SelectIndex( tmpSelected, sal_True ); aPreSelectHdl.Call( this ); } } @@ -441,7 +441,7 @@ void SvxShowCharSet::DrawChars_Impl( int n1, int n2 ) // ----------------------------------------------------------------------- -void SvxShowCharSet::InitSettings( BOOL bForeground, BOOL bBackground ) +void SvxShowCharSet::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -487,12 +487,12 @@ void SvxShowCharSet::SetFont( const Font& rFont ) aFont.SetAlign( ALIGN_TOP ); int nFontHeight = (aOrigSize.Height() - 5) * 2 / (3 * ROW_COUNT); aFont.SetSize( PixelToLogic( Size( 0, nFontHeight ) ) ); - aFont.SetTransparent( TRUE ); + aFont.SetTransparent( sal_True ); Control::SetFont( aFont ); GetFontCharMap( maFontCharMap ); // hide scrollbar when there is nothing to scroll - BOOL bNeedVscroll = (maFontCharMap.GetCharCount() > ROW_COUNT*COLUMN_COUNT); + sal_Bool bNeedVscroll = (maFontCharMap.GetCharCount() > ROW_COUNT*COLUMN_COUNT); nX = (aOrigSize.Width() - (bNeedVscroll ? SBWIDTH : 0)) / COLUMN_COUNT; nY = aOrigSize.Height() / ROW_COUNT; @@ -523,7 +523,7 @@ void SvxShowCharSet::SetFont( const Font& rFont ) // ----------------------------------------------------------------------- -void SvxShowCharSet::SelectIndex( int nNewIndex, BOOL bFocus ) +void SvxShowCharSet::SelectIndex( int nNewIndex, sal_Bool bFocus ) { if( nNewIndex < 0 ) { @@ -608,7 +608,7 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, BOOL bFocus ) // ----------------------------------------------------------------------- -void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, BOOL bFocus ) +void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, sal_Bool bFocus ) { // get next available char of current font sal_UCS4 cNext = maFontCharMap.GetNextChar( cNew - 1 ); @@ -679,7 +679,7 @@ void SvxShowCharSet::ReleaseAccessible() if ( aFind == m_aItems.end() ) { OSL_ENSURE(m_pAccessible,"Who wants to create a child of my table without a parent?"); - aFind = m_aItems.insert(ItemsMap::value_type(_nPos,new ::svx::SvxShowCharSetItem(*this,m_pAccessible->getTable(),sal::static_int_cast< USHORT >(_nPos)))).first; + aFind = m_aItems.insert(ItemsMap::value_type(_nPos,new ::svx::SvxShowCharSetItem(*this,m_pAccessible->getTable(),sal::static_int_cast< sal_uInt16 >(_nPos)))).first; rtl::OUStringBuffer buf; buf.appendUtf32( maFontCharMap.GetCharFromIndex( _nPos ) ); aFind->second->maText = buf.makeStringAndClear(); diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index 7d7f97518c..7422365b18 100644..100755 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -87,17 +87,17 @@ void SvxCheckListBox::Init_Impl() // ----------------------------------------------------------------------- -void SvxCheckListBox::InsertEntry( const String& rStr, USHORT nPos, +void SvxCheckListBox::InsertEntry( const String& rStr, sal_uInt16 nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) { - SvTreeListBox::InsertEntry( rStr, NULL, FALSE, nPos, pUserData, + SvTreeListBox::InsertEntry( rStr, NULL, sal_False, nPos, pUserData, eButtonKind ); } // ----------------------------------------------------------------------- -void SvxCheckListBox::RemoveEntry( USHORT nPos ) +void SvxCheckListBox::RemoveEntry( sal_uInt16 nPos ) { if ( nPos < GetEntryCount() ) SvTreeListBox::GetModel()->Remove( GetEntry( nPos ) ); @@ -105,7 +105,7 @@ void SvxCheckListBox::RemoveEntry( USHORT nPos ) // ----------------------------------------------------------------------- -void SvxCheckListBox::SelectEntryPos( USHORT nPos, BOOL bSelect ) +void SvxCheckListBox::SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect ) { if ( nPos < GetEntryCount() ) Select( GetEntry( nPos ), bSelect ); @@ -113,18 +113,18 @@ void SvxCheckListBox::SelectEntryPos( USHORT nPos, BOOL bSelect ) // ----------------------------------------------------------------------- -USHORT SvxCheckListBox::GetSelectEntryPos() const +sal_uInt16 SvxCheckListBox::GetSelectEntryPos() const { SvLBoxEntry* pEntry = GetCurEntry(); if ( pEntry ) - return (USHORT)GetModel()->GetAbsPos( pEntry ); + return (sal_uInt16)GetModel()->GetAbsPos( pEntry ); return LISTBOX_ENTRY_NOTFOUND; } // ----------------------------------------------------------------------- -String SvxCheckListBox::GetText( USHORT nPos ) const +String SvxCheckListBox::GetText( sal_uInt16 nPos ) const { SvLBoxEntry* pEntry = GetEntry( nPos ); @@ -135,12 +135,12 @@ String SvxCheckListBox::GetText( USHORT nPos ) const // ----------------------------------------------------------------------- -USHORT SvxCheckListBox::GetCheckedEntryCount() const +sal_uInt16 SvxCheckListBox::GetCheckedEntryCount() const { - USHORT nCheckCount = 0; - USHORT nCount = (USHORT)GetEntryCount(); + sal_uInt16 nCheckCount = 0; + sal_uInt16 nCount = (sal_uInt16)GetEntryCount(); - for ( USHORT i = 0; i < nCount; ++i ) + for ( sal_uInt16 i = 0; i < nCount; ++i ) { if ( IsChecked( i ) ) nCheckCount++; @@ -150,7 +150,7 @@ USHORT SvxCheckListBox::GetCheckedEntryCount() const // ----------------------------------------------------------------------- -void SvxCheckListBox::CheckEntryPos( USHORT nPos, BOOL bCheck ) +void SvxCheckListBox::CheckEntryPos( sal_uInt16 nPos, sal_Bool bCheck ) { if ( nPos < GetEntryCount() ) SetCheckButtonState( @@ -160,17 +160,17 @@ void SvxCheckListBox::CheckEntryPos( USHORT nPos, BOOL bCheck ) // ----------------------------------------------------------------------- -BOOL SvxCheckListBox::IsChecked( USHORT nPos ) const +sal_Bool SvxCheckListBox::IsChecked( sal_uInt16 nPos ) const { if ( nPos < GetEntryCount() ) return (GetCheckButtonState( GetEntry( nPos ) ) == SV_BUTTON_CHECKED); else - return FALSE; + return sal_False; } // ----------------------------------------------------------------------- -void* SvxCheckListBox::SetEntryData ( USHORT nPos, void* pNewData ) +void* SvxCheckListBox::SetEntryData ( sal_uInt16 nPos, void* pNewData ) { void* pOld = NULL; @@ -184,7 +184,7 @@ void* SvxCheckListBox::SetEntryData ( USHORT nPos, void* pNewData ) // ----------------------------------------------------------------------- -void* SvxCheckListBox::GetEntryData( USHORT nPos ) const +void* SvxCheckListBox::GetEntryData( sal_uInt16 nPos ) const { if ( nPos < GetEntryCount() ) return GetEntry( nPos )->GetUserData(); @@ -216,13 +216,13 @@ void SvxCheckListBox::MouseButtonDown( const MouseEvent& rMEvt ) if ( pEntry ) { - BOOL bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ); + sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ); SvLBoxItem* pItem = GetItem( pEntry, aPnt.X() ); if ( pItem && pItem->IsA() == SV_ITEM_ID_LBOXBUTTON ) { SvTreeListBox::MouseButtonDown( rMEvt ); - Select( pEntry, TRUE ); + Select( pEntry, sal_True ); return; } else @@ -257,7 +257,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) if ( pEntry ) { - BOOL bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ); + sal_Bool bCheck = ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ); ToggleCheckButton( pEntry ); if ( bCheck != ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED ) ) CheckButtonHdl(); @@ -269,7 +269,7 @@ void SvxCheckListBox::KeyInput( const KeyEvent& rKEvt ) // ----------------------------------------------------------------------- -SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, BOOL bChildsOnDemand, ULONG nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) +SvLBoxEntry* SvxCheckListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent, sal_Bool bChildsOnDemand, sal_uIntPtr nPos, void* pUserData, SvLBoxButtonKind eButtonKind ) { return SvTreeListBox::InsertEntry( rText, pParent, bChildsOnDemand, nPos, pUserData, eButtonKind ); } diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 6f410b356c..f4e3a7d45f 100644..100755 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -38,9 +38,9 @@ #include <svx/svdpage.hxx> // SdrObjList -#include "connctrl.hxx" +#include "svx/connctrl.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> @@ -69,33 +69,33 @@ void SvxXConnectionPreview::Construct() DBG_ASSERT( pView, "No valid view is passed on! "); const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - ULONG nMarkCount = rMarkList.GetMarkCount(); + sal_uIntPtr nMarkCount = rMarkList.GetMarkCount(); if( nMarkCount >= 1 ) { - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - for( USHORT i = 0; i < nMarkCount && !bFound; i++ ) + for( sal_uInt16 i = 0; i < nMarkCount && !bFound; i++ ) { pObj = rMarkList.GetMark( i )->GetMarkedSdrObj(); - UINT32 nInv = pObj->GetObjInventor(); - UINT16 nId = pObj->GetObjIdentifier(); + sal_uInt32 nInv = pObj->GetObjInventor(); + sal_uInt16 nId = pObj->GetObjIdentifier(); if( nInv == SdrInventor && nId == OBJ_EDGE ) { - bFound = TRUE; + bFound = sal_True; SdrEdgeObj* pTmpEdgeObj = (SdrEdgeObj*) pObj; pEdgeObj = (SdrEdgeObj*) pTmpEdgeObj->Clone(); - SdrObjConnection& rConn1 = (SdrObjConnection&)pEdgeObj->GetConnection( TRUE ); - SdrObjConnection& rConn2 = (SdrObjConnection&)pEdgeObj->GetConnection( FALSE ); + SdrObjConnection& rConn1 = (SdrObjConnection&)pEdgeObj->GetConnection( sal_True ); + SdrObjConnection& rConn2 = (SdrObjConnection&)pEdgeObj->GetConnection( sal_False ); - rConn1 = pTmpEdgeObj->GetConnection( TRUE ); - rConn2 = pTmpEdgeObj->GetConnection( FALSE ); + rConn1 = pTmpEdgeObj->GetConnection( sal_True ); + rConn2 = pTmpEdgeObj->GetConnection( sal_False ); - SdrObject* pTmpObj1 = pTmpEdgeObj->GetConnectedNode( TRUE ); - SdrObject* pTmpObj2 = pTmpEdgeObj->GetConnectedNode( FALSE ); + SdrObject* pTmpObj1 = pTmpEdgeObj->GetConnectedNode( sal_True ); + SdrObject* pTmpObj2 = pTmpEdgeObj->GetConnectedNode( sal_False ); // potential memory leak here (!). Create SdrObjList only when there is // not yet one. @@ -108,13 +108,13 @@ void SvxXConnectionPreview::Construct() { SdrObject* pObj1 = pTmpObj1->Clone(); pObjList->InsertObject( pObj1 ); - pEdgeObj->ConnectToNode( TRUE, pObj1 ); + pEdgeObj->ConnectToNode( sal_True, pObj1 ); } if( pTmpObj2 ) { SdrObject* pObj2 = pTmpObj2->Clone(); pObjList->InsertObject( pObj2 ); - pEdgeObj->ConnectToNode( FALSE, pObj2 ); + pEdgeObj->ConnectToNode( sal_False, pObj2 ); } pObjList->InsertObject( pEdgeObj ); } @@ -223,7 +223,7 @@ void SvxXConnectionPreview::SetAttributes( const SfxItemSet& rInAttrs ) // Get number of lines which are offset based on the preview object -USHORT SvxXConnectionPreview::GetLineDeltaAnz() +sal_uInt16 SvxXConnectionPreview::GetLineDeltaAnz() { const SfxItemSet& rSet = pEdgeObj->GetMergedItemSet(); sal_uInt16 nCount(0); @@ -236,9 +236,9 @@ USHORT SvxXConnectionPreview::GetLineDeltaAnz() void SvxXConnectionPreview::MouseButtonDown( const MouseEvent& rMEvt ) { - BOOL bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift(); - BOOL bZoomOut = rMEvt.IsRight() || rMEvt.IsShift(); - BOOL bCtrl = rMEvt.IsMod1(); + sal_Bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift(); + sal_Bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift(); + sal_Bool bCtrl = rMEvt.IsMod1(); if( bZoomIn || bZoomOut ) { diff --git a/svx/source/dialog/contdlg.hrc b/svx/source/dialog/contdlg.hrc index 1cbe9ba62f..1cbe9ba62f 100644..100755 --- a/svx/source/dialog/contdlg.hrc +++ b/svx/source/dialog/contdlg.hrc diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src index a5d9599aef..e50aae0056 100644..100755 --- a/svx/source/dialog/contdlg.src +++ b/svx/source/dialog/contdlg.src @@ -33,6 +33,7 @@ // RID_SVXDLG_CONTOUR ---------------------------------------------------- FloatingWindow RID_SVXDLG_CONTOUR { + HelpID = "svx:FloatingWindow:RID_SVXDLG_CONTOUR"; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -169,13 +170,14 @@ FloatingWindow RID_SVXDLG_CONTOUR { Identifier = TBI_PIPETTE ; HelpId = HID_CONTDLG_PIPETTE ; - Text [ en-US ] = "Eyedropper" ; + Text [ en-US ] = "Pipette" ; AutoCheck = TRUE ; }; }; }; MetricField MTF_TOLERANCE { + HelpID = "svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE"; Border = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( 28 , 12 ) ; diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index 74b81837fb..9d2fa9ef93 100644..100755 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -54,16 +54,16 @@ class SvxSuperContourDlg : public SvxContourDlg MetricField aMtfTolerance; ContourWindow aContourWnd; StatusBar aStbStatus; - ULONG nGrfChanged; - BOOL bExecState; - BOOL bPipetteMode; - BOOL bWorkplaceMode; - BOOL bUpdateGraphicLinked; - BOOL bGraphicLinked; + sal_uIntPtr nGrfChanged; + sal_Bool bExecState; + sal_Bool bPipetteMode; + sal_Bool bWorkplaceMode; + sal_Bool bUpdateGraphicLinked; + sal_Bool bGraphicLinked; ImageList maImageList; virtual void Resize(); - virtual BOOL Close(); + virtual sal_Bool Close(); void DoAutoCreate(); void ReducePoints( const long nTol = 8 ); @@ -85,23 +85,23 @@ public: Window* pParent, const ResId& rResId ); ~SvxSuperContourDlg(); - void SetExecState( BOOL bEnable ); + void SetExecState( sal_Bool bEnable ); void SetGraphic( const Graphic& rGraphic ); - void SetGraphicLinked( BOOL bLinked ) { bGraphicLinked = bLinked; } + void SetGraphicLinked( sal_Bool bLinked ) { bGraphicLinked = bLinked; } const Graphic& GetGraphic() const { return aGraphic; } - BOOL IsGraphicChanged() const { return nGrfChanged > 0UL; } + sal_Bool IsGraphicChanged() const { return nGrfChanged > 0UL; } void SetPolyPolygon( const PolyPolygon& rPolyPoly ); - PolyPolygon GetPolyPolygon( BOOL bRescaleToGraphic = TRUE ); + PolyPolygon GetPolyPolygon( sal_Bool bRescaleToGraphic = sal_True ); void SetEditingObject( void* pObj ) { pCheckObj = pObj; } const void* GetEditingObject() const { return pCheckObj; } - BOOL IsUndoPossible() const; - BOOL IsRedoPossible() const; + sal_Bool IsUndoPossible() const; + sal_Bool IsRedoPossible() const; - void UpdateGraphic( const Graphic& rGraphic, BOOL bGraphicLinked, + void UpdateGraphic( const Graphic& rGraphic, sal_Bool bGraphicLinked, const PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL ); diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index b42dda058e..997df95ac6 100644..100755 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <xoutbmp.hxx> +#include <svx/xoutbmp.hxx> #include <svx/dialogs.hrc> #include <svx/svxids.hrc> #include <contdlg.hrc> @@ -41,16 +41,16 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> // #i75482# -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" #define TRANSCOL Color( COL_WHITE ) ContourWindow::ContourWindow( Window* pParent, const ResId& rResId ) : GraphCtrl ( pParent, rResId ), aWorkRect ( 0, 0, 0, 0 ), - bPipetteMode ( FALSE ), - bWorkplaceMode ( FALSE ), - bClickValid ( FALSE ) + bPipetteMode ( sal_False ), + bWorkplaceMode ( sal_False ), + bClickValid ( sal_False ) { SetWinStyle( WB_SDRMODE ); } @@ -62,7 +62,7 @@ ContourWindow::~ContourWindow() void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) { SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); - const USHORT nPolyCount = rPolyPoly.Count(); + const sal_uInt16 nPolyCount = rPolyPoly.Count(); // First delete all drawing objects aPolyPoly = rPolyPoly; @@ -73,7 +73,7 @@ void ContourWindow::SetPolyPolygon( const PolyPolygon& rPolyPoly ) pPage->Clear(); - for ( USHORT i = 0; i < nPolyCount; i++ ) + for ( sal_uInt16 i = 0; i < nPolyCount; i++ ) { basegfx::B2DPolyPolygon aPolyPolygon; aPolyPolygon.append(aPolyPoly[ i ].getB2DPolygon()); @@ -134,7 +134,7 @@ void ContourWindow::InitSdrModel() aSet.Put( XFillColorItem( String(), TRANSCOL ) ); aSet.Put( XFillTransparenceItem( 50 ) ); pView->SetAttributes( aSet ); - pView->SetFrameDragSingles( TRUE ); + pView->SetFrameDragSingles( sal_True ); } void ContourWindow::SdrObjCreated( const SdrObject& ) @@ -143,10 +143,10 @@ void ContourWindow::SdrObjCreated( const SdrObject& ) pView->CombineMarkedObjects( sal_False ); } -BOOL ContourWindow::IsContourChanged() const +sal_Bool ContourWindow::IsContourChanged() const { SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( pPage && pPage->GetObjCount() ) bRet = ( (SdrPathObj*) pPage->GetObj( 0 ) )->GetPathPoly().count() && pModel->IsChanged(); @@ -163,7 +163,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt ) SetPolyPolygon( PolyPolygon() ); aWorkRect = Rectangle( aLogPt, aLogPt ); Paint( Rectangle( Point(), GetGraphicSize() ) ); - SetEditMode( TRUE ); + SetEditMode( sal_True ); } if ( !bPipetteMode ) @@ -172,7 +172,7 @@ void ContourWindow::MouseButtonDown( const MouseEvent& rMEvt ) void ContourWindow::MouseMove( const MouseEvent& rMEvt ) { - bClickValid = FALSE; + bClickValid = sal_False; if ( bPipetteMode ) { diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx index fb6b963f28..d27597bdcb 100644..100755 --- a/svx/source/dialog/contwnd.hxx +++ b/svx/source/dialog/contwnd.hxx @@ -40,9 +40,9 @@ class ContourWindow : public GraphCtrl Link aPipetteLink; Link aPipetteClickLink; Link aWorkplaceClickLink; - BOOL bPipetteMode; - BOOL bWorkplaceMode; - BOOL bClickValid; + sal_Bool bPipetteMode; + sal_Bool bWorkplaceMode; + sal_Bool bClickValid; protected: @@ -63,15 +63,15 @@ public: void SetPolyPolygon( const PolyPolygon& rPolyPoly ); const PolyPolygon& GetPolyPolygon(); - void SetPipetteMode( const BOOL bPipette ) { bPipetteMode = bPipette; } - BOOL IsPipetteMode() const { return bPipetteMode; } + void SetPipetteMode( const sal_Bool bPipette ) { bPipetteMode = bPipette; } + sal_Bool IsPipetteMode() const { return bPipetteMode; } const Color& GetPipetteColor() const { return aPipetteColor; } - BOOL IsClickValid() const { return bClickValid; } - BOOL IsContourChanged() const; + sal_Bool IsClickValid() const { return bClickValid; } + sal_Bool IsContourChanged() const; - void SetWorkplaceMode( const BOOL bWorkplace ) { bWorkplaceMode = bWorkplace; } - BOOL IsWorkplaceMode() const { return bWorkplaceMode; } + void SetWorkplaceMode( const sal_Bool bWorkplace ) { bWorkplaceMode = bWorkplace; } + sal_Bool IsWorkplaceMode() const { return bWorkplaceMode; } const Rectangle& GetWorkRect() const { return aWorkRect; } void SetPipetteHdl( const Link& rLink ) { aPipetteLink = rLink; } diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 68580c6710..4c5db4a756 100644..100755 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -47,7 +47,7 @@ // Local Defines and Function //---------------------------------------------------------------------------- -inline void EnableDisable( Window& rWin, BOOL bEnable ) +inline void EnableDisable( Window& rWin, sal_Bool bEnable ) { if (bEnable) rWin.Enable(); @@ -68,7 +68,7 @@ static long nStaticTabs[]= RedlinData::RedlinData() { - bDisabled=FALSE; + bDisabled=sal_False; pData=NULL; } RedlinData::~RedlinData() @@ -97,7 +97,7 @@ SvxRedlinEntry::~SvxRedlinEntry() DBG_NAME(SvLBoxColorString); -SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,USHORT nFlags,const XubString& rStr, +SvLBoxColorString::SvLBoxColorString( SvLBoxEntry*pEntry,sal_uInt16 nFlags,const XubString& rStr, const Color& rCol) : SvLBoxString( pEntry, nFlags, rStr ) @@ -125,7 +125,7 @@ SvLBoxItem* SvLBoxColorString::Create() const } void SvLBoxColorString::Paint( const Point& rPos, SvLBox& rDev, - USHORT nFlags, SvLBoxEntry* pEntry ) + sal_uInt16 nFlags, SvLBoxEntry* pEntry ) /* [Description] Paint function of the SvLBoxColorString class. The relevant text with the @@ -150,10 +150,10 @@ void SvLBoxColorString::Paint( const Point& rPos, SvLBox& rDev, SvxRedlinTable::SvxRedlinTable( Window* pParent,WinBits nBits ): SvxSimpleTable(pParent,nBits ) { - bAuthor=FALSE; - bDate=FALSE; - bIsCalc=FALSE; - bComment=FALSE; + bAuthor=sal_False; + bDate=sal_False; + bIsCalc=sal_False; + bComment=sal_False; nDatePos=WRITER_DATE; pCommentSearcher=NULL; SetNodeDefaultImages(); @@ -162,10 +162,10 @@ SvxRedlinTable::SvxRedlinTable( Window* pParent,WinBits nBits ): SvxRedlinTable::SvxRedlinTable( Window* pParent,const ResId& rResId): SvxSimpleTable(pParent,rResId) { - bAuthor=FALSE; - bDate=FALSE; - bIsCalc=FALSE; - bComment=FALSE; + bAuthor=sal_False; + bDate=sal_False; + bIsCalc=sal_False; + bComment=sal_False; nDatePos=WRITER_DATE; pCommentSearcher=NULL; SetNodeDefaultImages(); @@ -218,7 +218,7 @@ StringCompare SvxRedlinTable::ColCompare(SvLBoxEntry* pLeft,SvLBoxEntry* pRight) return eCompare; } -void SvxRedlinTable::SetCalcView(BOOL bFlag) +void SvxRedlinTable::SetCalcView(sal_Bool bFlag) { bIsCalc=bFlag; if(bFlag) @@ -235,7 +235,7 @@ void SvxRedlinTable::SetCalcView(BOOL bFlag) void SvxRedlinTable::UpdateFilterTest() { Date aDateMax; - USHORT nYEAR=aDateMax.GetYear()+100; + sal_uInt16 nYEAR=aDateMax.GetYear()+100; aDateMax.SetYear(nYEAR); Date aDateMin(1,1,1989); Time aTMin(0); @@ -276,12 +276,12 @@ void SvxRedlinTable::UpdateFilterTest() } -void SvxRedlinTable::SetFilterDate(BOOL bFlag) +void SvxRedlinTable::SetFilterDate(sal_Bool bFlag) { bDate=bFlag; } -void SvxRedlinTable::SetDateTimeMode(USHORT nMode) +void SvxRedlinTable::SetDateTimeMode(sal_uInt16 nMode) { nDaTiMode=nMode; } @@ -306,7 +306,7 @@ void SvxRedlinTable::SetLastTime(const Time& aTime) aDaTiLast.SetTime(aTime.GetTime()); } -void SvxRedlinTable::SetFilterAuthor(BOOL bFlag) +void SvxRedlinTable::SetFilterAuthor(sal_Bool bFlag) { bAuthor=bFlag; } @@ -316,7 +316,7 @@ void SvxRedlinTable::SetAuthor(const String &aString) aAuthor=aString; } -void SvxRedlinTable::SetFilterComment(BOOL bFlag) +void SvxRedlinTable::SetFilterComment(sal_Bool bFlag) { bComment=bFlag; } @@ -331,18 +331,18 @@ void SvxRedlinTable::SetCommentParams( const utl::SearchParam* pSearchPara ) } } -BOOL SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserData) +sal_Bool SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserData) { - BOOL nTheFlag=TRUE; + sal_Bool nTheFlag=sal_True; String aString=rString.GetToken(WRITER_AUTHOR,'\t'); if(pUserData==NULL) { if(bAuthor) { if(aAuthor.CompareTo(aString)==COMPARE_EQUAL) - nTheFlag=TRUE; + nTheFlag=sal_True; else - nTheFlag=FALSE; + nTheFlag=sal_False; } } else @@ -353,18 +353,18 @@ BOOL SvxRedlinTable::IsValidWriterEntry(const String& rString,RedlinData *pUserD return nTheFlag; } -BOOL SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserData) +sal_Bool SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserData) { - BOOL nTheFlag=TRUE; + sal_Bool nTheFlag=sal_True; String aString=rString.GetToken(CALC_AUTHOR,'\t'); if(pUserData==NULL) { if(bAuthor) { if(aAuthor.CompareTo(aString)==COMPARE_EQUAL) - nTheFlag=TRUE; + nTheFlag=sal_True; else - nTheFlag=FALSE; + nTheFlag=sal_False; } } else @@ -375,7 +375,7 @@ BOOL SvxRedlinTable::IsValidCalcEntry(const String& rString,RedlinData *pUserDat return nTheFlag; } -BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr, +sal_Bool SvxRedlinTable::IsValidEntry(const String* pAuthorStr, const DateTime *pDateTime,const String* pCommentStr) { bool nTheFlag=true; @@ -404,15 +404,15 @@ BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr, return nTheFlag; } -BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDateTime) +sal_Bool SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDateTime) { - BOOL nTheFlag=TRUE; + sal_Bool nTheFlag=sal_True; if(bAuthor) { if(aAuthor.CompareTo(*pAuthorStr)==COMPARE_EQUAL) - nTheFlag=TRUE; + nTheFlag=sal_True; else - nTheFlag=FALSE; + nTheFlag=sal_False; } if(bDate && nTheFlag) { @@ -428,7 +428,7 @@ BOOL SvxRedlinTable::IsValidEntry(const String* pAuthorStr,const DateTime *pDate return nTheFlag; } -BOOL SvxRedlinTable::IsValidComment(const String* pCommentStr) +sal_Bool SvxRedlinTable::IsValidComment(const String* pCommentStr) { bool nTheFlag=true; @@ -443,7 +443,7 @@ BOOL SvxRedlinTable::IsValidComment(const String* pCommentStr) } SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserData, - SvLBoxEntry* pParent,ULONG nPos) + SvLBoxEntry* pParent,sal_uIntPtr nPos) { aEntryColor=GetTextColor(); if(pUserData!=NULL) @@ -465,12 +465,12 @@ SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserDat else aCurEntry.Erase(); - return SvTreeListBox::InsertEntry( aFirstStr, pParent, FALSE, nPos, pUserData ); + return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData ); } SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserData,const Color& aColor, - SvLBoxEntry* pParent,ULONG nPos) + SvLBoxEntry* pParent,sal_uIntPtr nPos) { aEntryColor=aColor; @@ -487,7 +487,7 @@ SvLBoxEntry* SvxRedlinTable::InsertEntry(const String& rStr,RedlinData *pUserDat else aCurEntry.Erase(); - return SvTreeListBox::InsertEntry( aFirstStr, pParent, FALSE, nPos, pUserData ); + return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUserData ); } SvLBoxEntry* SvxRedlinTable::CreateEntry() const @@ -518,11 +518,11 @@ void SvxRedlinTable::InitEntry( SvLBoxEntry* pEntry, const XubString& rStr, XubString aToken; xub_Unicode* pCurToken = (xub_Unicode*)aCurEntry.GetBuffer(); - USHORT nCurTokenLen; + sal_uInt16 nCurTokenLen; xub_Unicode* pNextToken = (xub_Unicode*)GetToken( pCurToken, nCurTokenLen ); - USHORT nCount = TabCount(); nCount--; + sal_uInt16 nCount = TabCount(); nCount--; - for( USHORT nToken = 0; nToken < nCount; nToken++ ) + for( sal_uInt16 nToken = 0; nToken < nCount; nToken++ ) { if( pCurToken && nCurTokenLen ) aToken = XubString( pCurToken, nCurTokenLen ); @@ -562,6 +562,7 @@ SvxTPView::SvxTPView( Window * pParent) aTitle5 ( SVX_RES( STR_TITLE5 ) ), aStrMyName ( SVX_RES( STR_VIEW) ) { + aViewData.SetAccessibleName(String(SVX_RES(STR_TREE))); FreeResource(); aViewData.SetHelpId(HID_REDLINING_VIEW_DG_VIEW_TABLE); @@ -646,32 +647,32 @@ void SvxTPView::InsertCalcHeader() aViewData.InsertHeaderEntry(aString); } -void SvxTPView::EnableAccept(BOOL nFlag) +void SvxTPView::EnableAccept(sal_Bool nFlag) { PbAccept.Enable(nFlag); } -void SvxTPView::EnableAcceptAll(BOOL nFlag) +void SvxTPView::EnableAcceptAll(sal_Bool nFlag) { PbAcceptAll.Enable(nFlag); } -void SvxTPView::EnableReject(BOOL nFlag) +void SvxTPView::EnableReject(sal_Bool nFlag) { PbReject.Enable(nFlag); } -void SvxTPView::EnableRejectAll(BOOL nFlag) +void SvxTPView::EnableRejectAll(sal_Bool nFlag) { PbRejectAll.Enable(nFlag); } -void SvxTPView::ShowUndo(BOOL nFlag) +void SvxTPView::ShowUndo(sal_Bool nFlag) { PbUndo.Show(nFlag); } -void SvxTPView::EnableUndo(BOOL nFlag) +void SvxTPView::EnableUndo(sal_Bool nFlag) { PbUndo.Enable(nFlag); } @@ -681,7 +682,7 @@ Size SvxTPView::GetMinSizePixel() Size aSize=aMinSize; if(PbUndo.IsVisible()) { - ULONG nSize=PbUndo.GetSizePixel().Width() + sal_uIntPtr nSize=PbUndo.GetSizePixel().Width() +PbUndo.GetPosPixel().X() +PbAccept.GetPosPixel().X(); @@ -752,12 +753,20 @@ SvxTPFilter::SvxTPFilter( Window * pParent) aEdComment ( this, SVX_RES( ED_COMMENT) ), aActionStr ( SVX_RES( STR_ACTION) ), aStrMyName ( SVX_RES( STR_FILTER) ), - bModified (FALSE) -{ + bModified (sal_False) +{ + aLbDate.SetAccessibleName( String( SVX_RES( STR_DATE_COMBOX) ) ); + aDfDate.SetAccessibleName( String( SVX_RES( STR_DATE_SPIN) ) ); + aTfDate.SetAccessibleName( String( SVX_RES( STR_DATE_TIME_SPIN) ) ); + aDfDate2.SetAccessibleName( String( SVX_RES( STR_DATE_SPIN1) ) ); + aTfDate2.SetAccessibleName( String( SVX_RES( STR_DATE_TIME_SPIN1) ) ); + aLbAuthor.SetAccessibleName(aCbAuthor.GetText()); + aLbAction.SetAccessibleName( String( SVX_RES( STR_ACTION) ) ); + aEdComment.SetAccessibleName(aCbComment.GetText()); FreeResource(); - aDfDate.SetShowDateCentury( TRUE ); - aDfDate2.SetShowDateCentury( TRUE ); + aDfDate.SetShowDateCentury( sal_True ); + aDfDate2.SetShowDateCentury( sal_True ); aRangeStr=aCbRange.GetText(); aLbDate.SelectEntryPos(0); @@ -797,7 +806,16 @@ SvxTPFilter::SvxTPFilter( Window * pParent) aTfDate2.SetTime(aTime); HideRange(); ShowAction(); - bModified=FALSE; + bModified=sal_False; + + aLbDate.SetAccessibleRelationLabeledBy(&aCbDate); + aLbAuthor.SetAccessibleRelationLabeledBy(&aCbAuthor); + aLbAction.SetAccessibleRelationLabeledBy(&aCbRange); + aEdRange.SetAccessibleRelationLabeledBy(&aCbRange); + aBtnRange.SetAccessibleRelationLabeledBy(&aCbRange); + aEdComment.SetAccessibleRelationLabeledBy(&aCbComment); + aDfDate2.SetAccessibleRelationLabeledBy(&aDfDate2); + aTfDate2.SetAccessibleRelationLabeledBy(&aTfDate2); } void SvxTPFilter::SetRedlinTable(SvxRedlinTable* pTable) @@ -810,7 +828,7 @@ String SvxTPFilter::GetMyName() const return aStrMyName; } -void SvxTPFilter::DisableRange(BOOL bFlag) +void SvxTPFilter::DisableRange(sal_Bool bFlag) { if(bFlag) { @@ -826,43 +844,43 @@ void SvxTPFilter::DisableRange(BOOL bFlag) } } -void SvxTPFilter::ShowDateFields(USHORT nKind) +void SvxTPFilter::ShowDateFields(sal_uInt16 nKind) { String aEmpty; switch(nKind) { case FLT_DATE_BEFORE: - EnableDateLine1(TRUE); - EnableDateLine2(FALSE); + EnableDateLine1(sal_True); + EnableDateLine2(sal_False); break; case FLT_DATE_SINCE: - EnableDateLine1(TRUE); - EnableDateLine2(FALSE); + EnableDateLine1(sal_True); + EnableDateLine2(sal_False); break; case FLT_DATE_EQUAL: - EnableDateLine1(TRUE); + EnableDateLine1(sal_True); aTfDate.Disable(); aTfDate.SetText(aEmpty); - EnableDateLine2(FALSE); + EnableDateLine2(sal_False); break; case FLT_DATE_NOTEQUAL: - EnableDateLine1(TRUE); + EnableDateLine1(sal_True); aTfDate.Disable(); aTfDate.SetText(aEmpty); - EnableDateLine2(FALSE); + EnableDateLine2(sal_False); break; case FLT_DATE_BETWEEN: - EnableDateLine1(TRUE); - EnableDateLine2(TRUE); + EnableDateLine1(sal_True); + EnableDateLine2(sal_True); break; case FLT_DATE_SAVE: - EnableDateLine1(FALSE); - EnableDateLine2(FALSE); + EnableDateLine1(sal_False); + EnableDateLine2(sal_False); break; } } -void SvxTPFilter::EnableDateLine1(BOOL bFlag) +void SvxTPFilter::EnableDateLine1(sal_Bool bFlag) { if(bFlag && aCbDate.IsChecked()) { @@ -877,7 +895,7 @@ void SvxTPFilter::EnableDateLine1(BOOL bFlag) aIbClock.Disable(); } } -void SvxTPFilter::EnableDateLine2(BOOL bFlag) +void SvxTPFilter::EnableDateLine2(sal_Bool bFlag) { String aEmpty; if(bFlag && aCbDate.IsChecked()) @@ -939,22 +957,22 @@ void SvxTPFilter::SetLastTime(const Time &aTime) aTfDate2.SetTime(aTime); } -void SvxTPFilter::SetDateMode(USHORT nMode) +void SvxTPFilter::SetDateMode(sal_uInt16 nMode) { aLbDate.SelectEntryPos(nMode); SelDateHdl(&aLbDate); } -USHORT SvxTPFilter::GetDateMode() +sal_uInt16 SvxTPFilter::GetDateMode() { - return (USHORT) aLbDate.GetSelectEntryPos(); + return (sal_uInt16) aLbDate.GetSelectEntryPos(); } void SvxTPFilter::ClearAuthors() { aLbAuthor.Clear(); } -void SvxTPFilter::InsertAuthor( const String& rString, USHORT nPos) +void SvxTPFilter::InsertAuthor( const String& rString, sal_uInt16 nPos) { aLbAuthor.InsertEntry(rString,nPos); } @@ -964,17 +982,17 @@ String SvxTPFilter::GetSelectedAuthor() const return aLbAuthor.GetSelectEntry(); } -USHORT SvxTPFilter::GetSelectedAuthorPos() +sal_uInt16 SvxTPFilter::GetSelectedAuthorPos() { - return (USHORT) aLbAuthor.GetSelectEntryPos(); + return (sal_uInt16) aLbAuthor.GetSelectEntryPos(); } -void SvxTPFilter::SelectedAuthorPos(USHORT nPos) +void SvxTPFilter::SelectedAuthorPos(sal_uInt16 nPos) { aLbAuthor.SelectEntryPos(nPos); } -USHORT SvxTPFilter::SelectAuthor(const String& aString) +sal_uInt16 SvxTPFilter::SelectAuthor(const String& aString) { aLbAuthor.SelectEntry(aString); return aLbAuthor.GetSelectEntryPos(); @@ -995,7 +1013,7 @@ void SvxTPFilter::SetFocusToRange() aEdRange.GrabFocus(); } -void SvxTPFilter::HideRange(BOOL bHide) +void SvxTPFilter::HideRange(sal_Bool bHide) { if(bHide) { @@ -1005,7 +1023,7 @@ void SvxTPFilter::HideRange(BOOL bHide) } else { - ShowAction(FALSE); + ShowAction(sal_False); aCbRange.SetText(aRangeStr); aCbRange.Show(); aEdRange.Show(); @@ -1013,7 +1031,7 @@ void SvxTPFilter::HideRange(BOOL bHide) } } -void SvxTPFilter::HideClocks(BOOL bHide) +void SvxTPFilter::HideClocks(sal_Bool bHide) { if(bHide) { @@ -1036,66 +1054,66 @@ String SvxTPFilter::GetComment()const return aEdComment.GetText(); } -BOOL SvxTPFilter::IsDate() +sal_Bool SvxTPFilter::IsDate() { return aCbDate.IsChecked(); } -BOOL SvxTPFilter::IsAuthor() +sal_Bool SvxTPFilter::IsAuthor() { return aCbAuthor.IsChecked(); } -BOOL SvxTPFilter::IsRange() +sal_Bool SvxTPFilter::IsRange() { return aCbRange.IsChecked(); } -BOOL SvxTPFilter::IsAction() +sal_Bool SvxTPFilter::IsAction() { return aCbRange.IsChecked(); } -BOOL SvxTPFilter::IsComment() +sal_Bool SvxTPFilter::IsComment() { return aCbComment.IsChecked(); } -void SvxTPFilter::CheckDate(BOOL bFlag) +void SvxTPFilter::CheckDate(sal_Bool bFlag) { aCbDate.Check(bFlag); RowEnableHdl(&aCbDate); - bModified=FALSE; + bModified=sal_False; } -void SvxTPFilter::CheckAuthor(BOOL bFlag) +void SvxTPFilter::CheckAuthor(sal_Bool bFlag) { aCbAuthor.Check(bFlag); RowEnableHdl(&aCbAuthor); - bModified=FALSE; + bModified=sal_False; } -void SvxTPFilter::CheckRange(BOOL bFlag) +void SvxTPFilter::CheckRange(sal_Bool bFlag) { aCbRange.Check(bFlag); RowEnableHdl(&aCbRange); - bModified=FALSE; + bModified=sal_False; } -void SvxTPFilter::CheckAction(BOOL bFlag) +void SvxTPFilter::CheckAction(sal_Bool bFlag) { aCbRange.Check(bFlag); RowEnableHdl(&aCbRange); - bModified=FALSE; + bModified=sal_False; } -void SvxTPFilter::CheckComment(BOOL bFlag) +void SvxTPFilter::CheckComment(sal_Bool bFlag) { aCbComment.Check(bFlag); RowEnableHdl(&aCbComment); - bModified=FALSE; + bModified=sal_False; } -void SvxTPFilter::ShowAction(BOOL bShow) +void SvxTPFilter::ShowAction(sal_Bool bShow) { if(!bShow) { @@ -1121,7 +1139,7 @@ ListBox* SvxTPFilter::GetLbAction() IMPL_LINK( SvxTPFilter, SelDateHdl, ListBox*, pLb ) { - ShowDateFields((USHORT)aLbDate.GetSelectEntryPos()); + ShowDateFields((sal_uInt16)aLbDate.GetSelectEntryPos()); ModifyHdl(pLb); return 0; } @@ -1132,8 +1150,8 @@ IMPL_LINK( SvxTPFilter, RowEnableHdl, CheckBox*, pCB ) { aLbDate.Enable(aCbDate.IsChecked()); aLbDate.Invalidate(); - EnableDateLine1(FALSE); - EnableDateLine2(FALSE); + EnableDateLine1(sal_False); + EnableDateLine2(sal_False); if(aCbDate.IsChecked()) SelDateHdl(&aLbDate); } else if(pCB==&aCbAuthor) @@ -1202,7 +1220,7 @@ IMPL_LINK( SvxTPFilter, ModifyHdl, void*, pCtr) aModifyComLink.Call(this); } - bModified=TRUE; + bModified=sal_True; aModifyLink.Call(this); } return 0; @@ -1226,7 +1244,7 @@ void SvxTPFilter::DeactivatePage() pRedlinTable->SetFilterComment(IsComment()); utl::SearchParam aSearchParam( aEdComment.GetText(), - utl::SearchParam::SRCH_REGEXP,FALSE,FALSE,FALSE ); + utl::SearchParam::SRCH_REGEXP,sal_False,sal_False,sal_False ); pRedlinTable->SetCommentParams(&aSearchParam); @@ -1235,7 +1253,7 @@ void SvxTPFilter::DeactivatePage() aReadyLink.Call(this); } - bModified=FALSE; + bModified=sal_False; TabPage::DeactivatePage(); } @@ -1378,17 +1396,17 @@ void SvxAcceptChgCtr::Resize() { aMinSize=pTPView->GetMinSizePixel(); Size aSize=GetOutputSizePixel(); - BOOL bFlag=FALSE; + sal_Bool bFlag=sal_False; if(aMinSize.Height()>aSize.Height()) { aSize.Height()=aMinSize.Height(); - bFlag=TRUE; + bFlag=sal_True; } if(aMinSize.Width()>aSize.Width()) { aSize.Width()=aMinSize.Width(); - bFlag=TRUE; + bFlag=sal_True; } if(bFlag) @@ -1420,12 +1438,12 @@ void SvxAcceptChgCtr::ShowViewPage() aTCAccept.SetCurPageId(TP_VIEW); } -BOOL SvxAcceptChgCtr::IsFilterPageVisible() +sal_Bool SvxAcceptChgCtr::IsFilterPageVisible() { return (aTCAccept.GetCurPageId()==TP_FILTER); } -BOOL SvxAcceptChgCtr::IsViewPageVisible() +sal_Bool SvxAcceptChgCtr::IsViewPageVisible() { return (aTCAccept.GetCurPageId()==TP_VIEW); } diff --git a/svx/source/dialog/ctredlin.hrc b/svx/source/dialog/ctredlin.hrc index aa8fb0ccb3..d88a660037 100644..100755 --- a/svx/source/dialog/ctredlin.hrc +++ b/svx/source/dialog/ctredlin.hrc @@ -65,3 +65,11 @@ #define STR_TITLE3 3 #define STR_TITLE4 4 #define STR_TITLE5 5 +//IAccessibility2 Implementation 2009----- +#define STR_DATE_COMBOX 6 +#define STR_DATE_SPIN 7 +#define STR_DATE_SPIN1 8 +#define STR_DATE_TIME_SPIN 9 +#define STR_DATE_TIME_SPIN1 10 +#define STR_TREE 11 +//-----IAccessibility2 Implementation 2009 diff --git a/svx/source/dialog/ctredlin.src b/svx/source/dialog/ctredlin.src index ab82e92304..0edd5e5398 100644..100755 --- a/svx/source/dialog/ctredlin.src +++ b/svx/source/dialog/ctredlin.src @@ -114,7 +114,10 @@ TabPage SID_REDLIN_FILTER_PAGE ImageBitmap = Bitmap { File = "time.bmp" ; }; MASKCOLOR }; - QuickHelpText [ en-US ] = "Set Date/Time" ; + // IAccessibility2 implementation 2009. ------ + //QuickHelpText [ en-US ] = "Set Date/Time" ; + QuickHelpText [ en-US ] = "Set Start Date/Time" ; + // ------ IAccessibility2 implementation 2009. }; FixedText FT_DATE2 { @@ -170,7 +173,10 @@ TabPage SID_REDLIN_FILTER_PAGE ImageBitmap = Bitmap { File = "time.bmp" ; }; MASKCOLOR }; - QuickHelpText [ en-US ] = "Set Date/Time" ; + // IAccessibility2 implementation 2009. ------ + //QuickHelpText [ en-US ] = "Set Date/Time" ; + QuickHelpText [ en-US ] = "Set End Date/Time" ; + // ------ IAccessibility2 implementation 2009. }; CheckBox CB_AUTOR { @@ -249,6 +255,32 @@ TabPage SID_REDLIN_FILTER_PAGE Size = MAP_APPFONT ( 178 , 12 ) ; TabStop = TRUE ; }; + /*IAccessibility2 Implementation 2009-----*/ + String STR_DATE_COMBOX + { + Text [ en-US ] = "Date Condition" ; + }; + String STR_DATE_SPIN + { + Text [ en-US ] = "Start Date" ; + }; + String STR_DATE_SPIN1 + { + Text [ en-US ] = "End Date" ; + }; + String STR_DATE_TIME_SPIN + { + Text [ en-US ] = "Start Time" ; + }; + String STR_DATE_TIME_SPIN1 + { + Text [ en-US ] = "End Time" ; + }; + String STR_TREE + { + Text [ en-US ] = "Changes" ; + }; + /*-----IAccessibility2 Implementation 2009*/ }; TabPage SID_REDLIN_VIEW_PAGE { diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index ce496d4272..0dbac557b0 100644..100755 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" // === includes (declaration) ============================================ -#include "databaseregistrationui.hxx" +#include "svx/databaseregistrationui.hxx" // === includes (project) ================================================ #include <svx/svxdlg.hxx> @@ -44,9 +44,9 @@ namespace svx { - USHORT administrateDatabaseRegistration( Window* _parentWindow ) + sal_uInt16 administrateDatabaseRegistration( Window* _parentWindow ) { - USHORT nResult = RET_CANCEL; + sal_uInt16 nResult = RET_CANCEL; SfxItemSet aRegistrationItems( SFX_APP()->GetPool(), SID_SB_DB_REGISTER, SID_SB_DB_REGISTER, 0 ); diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 39c6758375..315c1052b7 100644..100755 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "dialcontrol.hxx" +#include "svx/dialcontrol.hxx" #include <math.h> #include <vcl/virdev.hxx> @@ -81,7 +81,7 @@ DialControlBmp::DialControlBmp( Window& rParent ) : mnCenterY(0), mbEnabled( true ) { - EnableRTL( FALSE ); + EnableRTL( sal_False ); } void DialControlBmp::InitBitmap( const Size& rSize, const Font& rFont ) @@ -186,7 +186,7 @@ void DialControlBmp::DrawBackground() SetFillColor(); Erase(); - EnableRTL( TRUE ); // draw 3D effect in correct direction + EnableRTL( sal_True ); // draw 3D effect in correct direction sal_uInt8 nDiff = mbEnabled ? 0x18 : 0x10; Color aColor; @@ -213,7 +213,7 @@ void DialControlBmp::DrawBackground() SetFillColor( aColor ); DrawPie( maRect, maRect.TopLeft(), maRect.LeftCenter() ); - EnableRTL( FALSE ); + EnableRTL( sal_False ); // *** calibration *** @@ -282,7 +282,7 @@ void DialControl_Impl::Init( const Size& rWinSize, const Font& rWinFont ) mnCenterX = maWinSize.Width() / 2; mnCenterY = maWinSize.Height() / 2; - maWinFont.SetTransparent( TRUE ); + maWinFont.SetTransparent( sal_True ); maBmpEnabled.DrawBackground( maWinSize, true ); maBmpDisabled.DrawBackground( maWinSize, false ); @@ -456,7 +456,7 @@ const Link& DialControl::GetModifyHdl() const void DialControl::Init( const Size& rWinSize, const Font& rWinFont ) { mpImpl->Init( rWinSize, rWinFont ); - EnableRTL( FALSE ); // don't mirror mouse handling + EnableRTL( sal_False ); // don't mirror mouse handling SetOutputSizePixel( mpImpl->maWinSize ); SetBackground(); } diff --git a/svx/source/dialog/dialmgr.cxx b/svx/source/dialog/dialmgr.cxx index 0b3c259338..0b3c259338 100644..100755 --- a/svx/source/dialog/dialmgr.cxx +++ b/svx/source/dialog/dialmgr.cxx diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 67a2c1c99f..6ff8d02705 100644..100755 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -46,6 +46,7 @@ #include <svx/xlnwtit.hxx> #include "helpid.hrc" #include <algorithm> +#include <svx/dialmgr.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -91,7 +92,7 @@ void Svx3DPreviewControl::Construct() { // Do never mirror the preview window. This explicitly includes right // to left writing environments. - EnableRTL (FALSE); + EnableRTL (sal_False); SetMapMode( MAP_100TH_MM ); // Model @@ -120,7 +121,7 @@ void Svx3DPreviewControl::Construct() double fH = rVolume.getHeight(); double fCamZ = rVolume.getMaxZ() + ((fW + fH) / 2.0); - rCamera.SetAutoAdjustProjection(FALSE); + rCamera.SetAutoAdjustProjection(sal_False); rCamera.SetViewWindow(- fW / 2, - fH / 2, fW, fH); basegfx::B3DPoint aLookAt; double fDefaultCamPosZ = mp3DView->GetDefaultCamPosZ(); @@ -388,7 +389,7 @@ void Svx3DLightControl::Construct2() double fH = rVolume.getHeight(); double fCamZ = rVolume.getMaxZ() + ((fW + fH) / 2.0); - rCamera.SetAutoAdjustProjection(FALSE); + rCamera.SetAutoAdjustProjection(sal_False); rCamera.SetViewWindow(- fW / 2, - fH / 2, fW, fH); basegfx::B3DPoint aLookAt; double fDefaultCamPosZ = mp3DView->GetDefaultCamPosZ(); @@ -1012,6 +1013,7 @@ void SvxLightCtl3D::Init() maHorScroller.SetHelpId(HID_CTRL3D_HSCROLL); maVerScroller.SetHelpId(HID_CTRL3D_VSCROLL); maSwitcher.SetHelpId(HID_CTRL3D_SWITCHER); + maSwitcher.SetAccessibleName(String(SVX_RES(STR_SWITCH))); // Light preview maLightControl.Show(); @@ -1095,8 +1097,8 @@ void SvxLightCtl3D::CheckSelection() { double fHor, fVer; maLightControl.GetPosition(fHor, fVer); - maHorScroller.SetThumbPos( INT32(fHor * 100.0) ); - maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) ); + maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) ); + maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) ); } } @@ -1115,8 +1117,8 @@ void SvxLightCtl3D::move( double fDeltaHor, double fDeltaVer ) return; maLightControl.SetPosition(fHor, fVer); - maHorScroller.SetThumbPos( INT32(fHor * 100.0) ); - maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) ); + maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) ); + maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) ); if(maUserInteractiveChangeCallback.IsSet()) { @@ -1296,8 +1298,8 @@ IMPL_LINK( SvxLightCtl3D, InternalInteractiveChange, void*, EMPTYARG) double fHor, fVer; maLightControl.GetPosition(fHor, fVer); - maHorScroller.SetThumbPos( INT32(fHor * 100.0) ); - maVerScroller.SetThumbPos( 18000 - INT32((fVer + 90.0) * 100.0) ); + maHorScroller.SetThumbPos( sal_Int32(fHor * 100.0) ); + maVerScroller.SetThumbPos( 18000 - sal_Int32((fVer + 90.0) * 100.0) ); if(maUserInteractiveChangeCallback.IsSet()) { diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index eeb4bc4dc7..b0610c2fbe 100644..100755 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -77,7 +77,7 @@ Bitmap& SvxRectCtl::GetRectBitmap( void ) } SvxRectCtl::SvxRectCtl( Window* pParent, const ResId& rResId, RECT_POINT eRpt, - USHORT nBorder, USHORT nCircle, CTL_STYLE eStyle ) : + sal_uInt16 nBorder, sal_uInt16 nCircle, CTL_STYLE eStyle ) : Control( pParent, rResId ), @@ -150,7 +150,7 @@ void SvxRectCtl::Resize_Impl() break; } Reset(); - InitSettings( TRUE, TRUE ); + InitSettings( sal_True, sal_True ); } // ----------------------------------------------------------------------- @@ -183,18 +183,18 @@ void SvxRectCtl::InitRectBitmap( void ) aColorAry2[6] = rStyles.GetDialogColor(); #ifdef DBG_UTIL - static BOOL bModify = FALSE; - BOOL& rModify = bModify; + static sal_Bool bModify = sal_False; + sal_Bool& rModify = bModify; if( rModify ) { static int n = 0; - static UINT8 r = 0xFF; - static UINT8 g = 0x00; - static UINT8 b = 0xFF; + static sal_uInt8 r = 0xFF; + static sal_uInt8 g = 0x00; + static sal_uInt8 b = 0xFF; int& rn = n; - UINT8& rr = r; - UINT8& rg = g; - UINT8& rb = b; + sal_uInt8& rr = r; + sal_uInt8& rg = g; + sal_uInt8& rb = b; aColorAry2[ rn ] = Color( rr, rg, rb ); } #endif @@ -204,7 +204,7 @@ void SvxRectCtl::InitRectBitmap( void ) // ----------------------------------------------------------------------- -void SvxRectCtl::InitSettings( BOOL bForeground, BOOL bBackground ) +void SvxRectCtl::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -271,7 +271,7 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) if(!IsCompletelyDisabled()) { RECT_POINT eNewRP = eRP; - BOOL bUseMM = (eCS != CS_SHADOW) && (eCS != CS_ANGLE); + sal_Bool bUseMM = (eCS != CS_SHADOW) && (eCS != CS_ANGLE); switch( rKeyEvt.GetKeyCode().GetCode() ) { @@ -356,9 +356,9 @@ void SvxRectCtl::KeyInput( const KeyEvent& rKeyEvt ) void SvxRectCtl::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) - InitSettings( TRUE, FALSE ); + InitSettings( sal_True, sal_False ); else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) - InitSettings( FALSE, TRUE ); + InitSettings( sal_False, sal_True ); Window::StateChanged( nType ); } @@ -368,7 +368,7 @@ void SvxRectCtl::StateChanged( StateChangedType nType ) void SvxRectCtl::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) - InitSettings( TRUE, TRUE ); + InitSettings( sal_True, sal_True ); else Window::DataChanged( rDCEvt ); } @@ -449,8 +449,8 @@ void SvxRectCtl::Paint( const Rectangle& ) Point aBtnPnt2( 11,0 ); Point aBtnPnt3( 22,0 ); - BOOL bNoHorz = (m_nState & CS_NOHORZ) != 0; - BOOL bNoVert = (m_nState & CS_NOVERT) != 0; + sal_Bool bNoHorz = (m_nState & CS_NOHORZ) != 0; + sal_Bool bNoVert = (m_nState & CS_NOVERT) != 0; Bitmap& rBitmap = GetRectBitmap(); @@ -661,7 +661,7 @@ void SvxRectCtl::SetState( CTL_STATE nState ) ( (SvxTabPage*) GetParent() )->PointChanged( this, eRP ); } -UINT8 SvxRectCtl::GetNumOfChilds( void ) const +sal_uInt8 SvxRectCtl::GetNumOfChilds( void ) const { return ( eCS == CS_ANGLE )? 8 : 9; } @@ -750,11 +750,11 @@ SvxAngleCtl::SvxAngleCtl( Window* pParent, const ResId& rResId, Size _aSize ) : void SvxAngleCtl::Initialize() { - bPositive = TRUE; + bPositive = sal_True; aFont.SetSize( aFontSize ); aFont.SetWeight( WEIGHT_NORMAL ); - aFont.SetTransparent( FALSE ); + aFont.SetTransparent( sal_False ); SetFont( aFont ); } @@ -813,10 +813,10 @@ void SvxAngleCtl::Paint( const Rectangle& ) // Control for editing bitmaps -SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, USHORT nNumber ) : +SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, sal_uInt16 nNumber ) : Control ( pParent, rResId ), nLines ( nNumber ), - bPaintable ( TRUE ) + bPaintable ( sal_True ) { aRectSize = GetOutputSize(); @@ -825,8 +825,8 @@ SvxPixelCtl::SvxPixelCtl( Window* pParent, const ResId& rResId, USHORT nNumber ) SetLineColor( Application::GetSettings().GetStyleSettings().GetShadowColor() ); nSquares = nLines * nLines; - pPixel = new USHORT[ nSquares ]; - rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT)); + pPixel = new sal_uInt16[ nSquares ]; + rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16)); } // Destructor dealocating the dynamic array @@ -838,7 +838,7 @@ SvxPixelCtl::~SvxPixelCtl( ) // Changes the foreground or Background color -void SvxPixelCtl::ChangePixel( USHORT nPixel ) +void SvxPixelCtl::ChangePixel( sal_uInt16 nPixel ) { if( *( pPixel + nPixel) == 0 ) *( pPixel + nPixel) = 1; // could be extended to more colors @@ -852,10 +852,10 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt ) { Point aPt = PixelToLogic( rMEvt.GetPosPixel() ); Point aPtTl, aPtBr; - USHORT nX, nY; + sal_uInt16 nX, nY; - nX = (USHORT) ( aPt.X() * nLines / aRectSize.Width() ); - nY = (USHORT) ( aPt.Y() * nLines / aRectSize.Height() ); + nX = (sal_uInt16) ( aPt.X() * nLines / aRectSize.Width() ); + nY = (sal_uInt16) ( aPt.Y() * nLines / aRectSize.Height() ); ChangePixel( nX + nY * nLines ); @@ -874,7 +874,7 @@ void SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt ) void SvxPixelCtl::Paint( const Rectangle& ) { - USHORT i, j, nTmp; + sal_uInt16 i, j, nTmp; Point aPtTl, aPtBr; if( bPaintable ) @@ -884,16 +884,16 @@ void SvxPixelCtl::Paint( const Rectangle& ) for( i = 1; i < nLines; i++) { // horizontal - nTmp = (USHORT) ( aRectSize.Height() * i / nLines ); + nTmp = (sal_uInt16) ( aRectSize.Height() * i / nLines ); DrawLine( Point( 0, nTmp ), Point( aRectSize.Width(), nTmp ) ); // vertically - nTmp = (USHORT) ( aRectSize.Width() * i / nLines ); + nTmp = (sal_uInt16) ( aRectSize.Width() * i / nLines ); DrawLine( Point( nTmp, 0 ), Point( nTmp, aRectSize.Height() ) ); } //Draw Rectangles (squares) Control::SetLineColor(); - USHORT nLastPixel = *pPixel ? 0 : 1; + sal_uInt16 nLastPixel = *pPixel ? 0 : 1; for( i = 0; i < nLines; i++) { @@ -931,16 +931,16 @@ void SvxPixelCtl::SetXBitmap( const XOBitmap& rXBmp ) aPixelColor = rXBmp.GetPixelColor(); aBackgroundColor = rXBmp.GetBackgroundColor(); - USHORT* pArray = rXBmp.GetPixelArray(); + sal_uInt16* pArray = rXBmp.GetPixelArray(); - for( USHORT i = 0; i < nSquares; i++ ) + for( sal_uInt16 i = 0; i < nSquares; i++ ) *( pPixel + i ) = *( pArray + i ); } } // Returns a specific pixel -USHORT SvxPixelCtl::GetBitmapPixel( const USHORT nPixel ) +sal_uInt16 SvxPixelCtl::GetBitmapPixel( const sal_uInt16 nPixel ) { return( *( pPixel + nPixel ) ); } @@ -950,7 +950,7 @@ USHORT SvxPixelCtl::GetBitmapPixel( const USHORT nPixel ) void SvxPixelCtl::Reset() { // clear pixel area - rtl_zeroMemory(pPixel, nSquares * sizeof(USHORT)); + rtl_zeroMemory(pPixel, nSquares * sizeof(sal_uInt16)); Invalidate(); } @@ -980,14 +980,14 @@ void ColorLB::Fill( const XColorTable* pColorTab ) { long nCount = pColorTab->Count(); XColorEntry* pEntry; - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); for( long i = 0; i < nCount; i++ ) { pEntry = pColorTab->GetColor( i ); InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } /************************************************************************/ @@ -999,7 +999,7 @@ void ColorLB::Append( XColorEntry* pEntry, Bitmap* ) /************************************************************************/ -void ColorLB::Modify( XColorEntry* pEntry, USHORT nPos, Bitmap* ) +void ColorLB::Modify( XColorEntry* pEntry, sal_uInt16 nPos, Bitmap* ) { RemoveEntry( nPos ); InsertEntry( pEntry->GetColor(), pEntry->GetName(), nPos ); @@ -1011,19 +1011,19 @@ void FillAttrLB::Fill( const XColorTable* pColorTab ) { long nCount = pColorTab->Count(); XColorEntry* pEntry; - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); for( long i = 0; i < nCount; i++ ) { pEntry = pColorTab->GetColor( i ); InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } // Fills the listbox (provisional) with strings -HatchingLB::HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ ) +HatchingLB::HatchingLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ ) : ListBox( pParent, Id ), mpList ( NULL ), mbUserDraw( bUserDraw ) @@ -1031,7 +1031,7 @@ HatchingLB::HatchingLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ ) EnableUserDraw( mbUserDraw ); } -HatchingLB::HatchingLB( Window* pParent, WinBits aWB, BOOL bUserDraw /*= TRUE*/ ) +HatchingLB::HatchingLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw /*= sal_True*/ ) : ListBox( pParent, aWB ), mpList ( NULL ), mbUserDraw( bUserDraw ) @@ -1045,7 +1045,7 @@ void HatchingLB::Fill( const XHatchList* pList ) XHatchEntry* pEntry; long nCount = pList->Count(); - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); if( mbUserDraw ) { @@ -1065,7 +1065,7 @@ void HatchingLB::Fill( const XHatchList* pList ) } } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } void HatchingLB::UserDraw( const UserDrawEvent& rUDEvt ) @@ -1081,7 +1081,7 @@ void HatchingLB::UserDraw( const UserDrawEvent& rUDEvt ) { OutputDevice* pDevice = rUDEvt.GetDevice(); - ULONG nOldDrawMode = pDevice->GetDrawMode(); + sal_uIntPtr nOldDrawMode = pDevice->GetDrawMode(); pDevice->SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR ); XHatch& rXHatch = mpList->GetHatch( rUDEvt.GetItemId() )->GetHatch(); @@ -1118,7 +1118,7 @@ void HatchingLB::Append( XHatchEntry* pEntry, Bitmap* pBmp ) /************************************************************************/ -void HatchingLB::Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp ) +void HatchingLB::Modify( XHatchEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp ) { RemoveEntry( nPos ); @@ -1131,11 +1131,11 @@ void HatchingLB::Modify( XHatchEntry* pEntry, USHORT nPos, Bitmap* pBmp ) /************************************************************************/ void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr, - const XHatch& rHatch, USHORT nDist ) + const XHatch& rHatch, sal_uInt16 nDist ) { long nCount = pList->Count(); XHatchEntry* pEntry; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; String aStr; long i; @@ -1146,10 +1146,10 @@ void HatchingLB::SelectEntryByList( const XHatchList* pList, const String& rStr, aStr = pEntry->GetName(); if( rStr == aStr && rHatch == pEntry->GetHatch() ) - bFound = TRUE; + bFound = sal_True; } if( bFound ) - SelectEntryPos( (USHORT) ( i - 1 + nDist ) ); + SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) ); } // Fills the listbox (provisional) with strings @@ -1158,7 +1158,7 @@ void FillAttrLB::Fill( const XHatchList* pList ) { long nCount = pList->Count(); XHatchEntry* pEntry; - ListBox::SetUpdateMode( FALSE ); + ListBox::SetUpdateMode( sal_False ); for( long i = 0; i < nCount; i++ ) { @@ -1169,12 +1169,12 @@ void FillAttrLB::Fill( const XHatchList* pList ) else InsertEntry( pEntry->GetName() ); } - ListBox::SetUpdateMode( TRUE ); + ListBox::SetUpdateMode( sal_True ); } // Fills the listbox (provisional) with strings -GradientLB::GradientLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ ) +GradientLB::GradientLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ ) : ListBox( pParent, Id ), mpList(NULL), mbUserDraw( bUserDraw ) @@ -1182,7 +1182,7 @@ GradientLB::GradientLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ ) EnableUserDraw( mbUserDraw); } -GradientLB::GradientLB( Window* pParent, WinBits aWB, BOOL bUserDraw /*= TRUE*/ ) +GradientLB::GradientLB( Window* pParent, WinBits aWB, sal_Bool bUserDraw /*= sal_True*/ ) : ListBox( pParent, aWB ), mpList(NULL), mbUserDraw( bUserDraw ) @@ -1196,7 +1196,7 @@ void GradientLB::Fill( const XGradientList* pList ) XGradientEntry* pEntry; long nCount = pList->Count(); - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); if( mbUserDraw ) { @@ -1216,7 +1216,7 @@ void GradientLB::Fill( const XGradientList* pList ) } } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } void GradientLB::UserDraw( const UserDrawEvent& rUDEvt ) @@ -1234,7 +1234,7 @@ void GradientLB::UserDraw( const UserDrawEvent& rUDEvt ) XGradient& rXGrad = mpList->GetGradient( rUDEvt.GetItemId() )->GetGradient(); Gradient aGradient( (GradientStyle) rXGrad.GetGradientStyle(), rXGrad.GetStartColor(), rXGrad.GetEndColor() ); - aGradient.SetAngle( (USHORT)rXGrad.GetAngle() ); + aGradient.SetAngle( (sal_uInt16)rXGrad.GetAngle() ); aGradient.SetBorder( rXGrad.GetBorder() ); aGradient.SetOfsX( rXGrad.GetXOffset() ); aGradient.SetOfsY( rXGrad.GetYOffset() ); @@ -1248,14 +1248,14 @@ void GradientLB::UserDraw( const UserDrawEvent& rUDEvt ) { long nWidth = pDevice->GetOutputSize().Width(); - pWin->EnableRTL( FALSE ); + pWin->EnableRTL( sal_False ); Rectangle aMirrorRect( Point( nWidth - aRect.Left() - aRect.GetWidth(), aRect.Top() ), aRect.GetSize() ); pDevice->DrawGradient( aMirrorRect, aGradient ); - pWin->EnableRTL( TRUE ); + pWin->EnableRTL( sal_True ); } else pDevice->DrawGradient( aRect, aGradient ); @@ -1282,7 +1282,7 @@ void GradientLB::Append( XGradientEntry* pEntry, Bitmap* pBmp ) /************************************************************************/ -void GradientLB::Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp ) +void GradientLB::Modify( XGradientEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp ) { RemoveEntry( nPos ); @@ -1295,11 +1295,11 @@ void GradientLB::Modify( XGradientEntry* pEntry, USHORT nPos, Bitmap* pBmp ) /************************************************************************/ void GradientLB::SelectEntryByList( const XGradientList* pList, const String& rStr, - const XGradient& rGradient, USHORT nDist ) + const XGradient& rGradient, sal_uInt16 nDist ) { long nCount = pList->Count(); XGradientEntry* pEntry; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; String aStr; long i; @@ -1310,10 +1310,10 @@ void GradientLB::SelectEntryByList( const XGradientList* pList, const String& rS aStr = pEntry->GetName(); if( rStr == aStr && rGradient == pEntry->GetGradient() ) - bFound = TRUE; + bFound = sal_True; } if( bFound ) - SelectEntryPos( (USHORT) ( i - 1 + nDist ) ); + SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) ); } // Fills the listbox (provisional) with strings @@ -1322,7 +1322,7 @@ void FillAttrLB::Fill( const XGradientList* pList ) { long nCount = pList->Count(); XGradientEntry* pEntry; - ListBox::SetUpdateMode( FALSE ); + ListBox::SetUpdateMode( sal_False ); for( long i = 0; i < nCount; i++ ) { @@ -1333,12 +1333,12 @@ void FillAttrLB::Fill( const XGradientList* pList ) else InsertEntry( pEntry->GetName() ); } - ListBox::SetUpdateMode( TRUE ); + ListBox::SetUpdateMode( sal_True ); } // BitmapLB Constructor -BitmapLB::BitmapLB( Window* pParent, ResId Id, BOOL bUserDraw /*= TRUE*/ ) +BitmapLB::BitmapLB( Window* pParent, ResId Id, sal_Bool bUserDraw /*= sal_True*/ ) : ListBox( pParent, Id ), mpList( NULL ), mbUserDraw( bUserDraw ) @@ -1377,7 +1377,7 @@ void BitmapLB::Fill( const XBitmapList* pList ) XBitmapEntry* pEntry; long nCount = pList->Count(); - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); if( mbUserDraw ) { @@ -1397,7 +1397,7 @@ void BitmapLB::Fill( const XBitmapList* pList ) } } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } void BitmapLB::UserDraw( const UserDrawEvent& rUDEvt ) @@ -1462,7 +1462,7 @@ void BitmapLB::Append( XBitmapEntry* pEntry, Bitmap* pBmp ) /************************************************************************/ -void BitmapLB::Modify( XBitmapEntry* pEntry, USHORT nPos, Bitmap* pBmp ) +void BitmapLB::Modify( XBitmapEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp ) { RemoveEntry( nPos ); @@ -1484,7 +1484,7 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr, { long nCount = pList->Count(); XBitmapEntry* pEntry; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; long i; for( i = 0; i < nCount && !bFound; i++ ) @@ -1495,11 +1495,11 @@ void BitmapLB::SelectEntryByList( const XBitmapList* pList, const String& rStr, if( rStr == aStr ) { - bFound = TRUE; + bFound = sal_True; } } if( bFound ) - SelectEntryPos( (USHORT) ( i - 1 ) ); + SelectEntryPos( (sal_uInt16) ( i - 1 ) ); } // FillAttrLB Constructor @@ -1546,7 +1546,7 @@ void FillAttrLB::Fill( const XBitmapList* pList ) { long nCount = pList->Count(); XBitmapEntry* pEntry; - ListBox::SetUpdateMode( FALSE ); + ListBox::SetUpdateMode( sal_False ); for( long i = 0; i < nCount; i++ ) { @@ -1557,7 +1557,7 @@ void FillAttrLB::Fill( const XBitmapList* pList ) ListBox::InsertEntry( pEntry->GetName(), aVD.GetBitmap( Point( 0, 2 ), Size( 32, 12 ) ) ); } - ListBox::SetUpdateMode( TRUE ); + ListBox::SetUpdateMode( sal_True ); } /************************************************************************/ @@ -1567,7 +1567,7 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr { long nCount = pList->Count(); XBitmapEntry* pEntry; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; long i; for( i = 0; i < nCount && !bFound; i++ ) @@ -1578,24 +1578,24 @@ void FillAttrLB::SelectEntryByList( const XBitmapList* pList, const String& rStr if( rStr == aStr ) { - bFound = TRUE; + bFound = sal_True; } } if( bFound ) - SelectEntryPos( (USHORT) ( i - 1 ) ); + SelectEntryPos( (sal_uInt16) ( i - 1 ) ); } // Fills the listbox (provisional) with strings void FillTypeLB::Fill() { - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); InsertEntry( String( SVX_RES( RID_SVXSTR_INVISIBLE ) ) ); InsertEntry( String( SVX_RES( RID_SVXSTR_COLOR ) ) ); InsertEntry( String( SVX_RES( RID_SVXSTR_GRADIENT ) ) ); InsertEntry( String( SVX_RES( RID_SVXSTR_HATCH ) ) ); InsertEntry( String( SVX_RES( RID_SVXSTR_BITMAP ) ) ); - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } // Fills the listbox (provisional) with strings @@ -1604,7 +1604,7 @@ void LineLB::Fill( const XDashList* pList ) { long nCount = pList->Count(); XDashEntry* pEntry; - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); for( long i = 0; i < nCount; i++ ) { @@ -1618,7 +1618,7 @@ void LineLB::Fill( const XDashList* pList ) else InsertEntry( pEntry->GetName() ); } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } void LineLB::FillStyles() @@ -1657,7 +1657,7 @@ void LineLB::Append( XDashEntry* pEntry, Bitmap* pBmp ) /************************************************************************/ -void LineLB::Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp ) +void LineLB::Modify( XDashEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp ) { RemoveEntry( nPos ); @@ -1670,11 +1670,11 @@ void LineLB::Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp ) /************************************************************************/ void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr, - const XDash& rDash, USHORT nDist ) + const XDash& rDash, sal_uInt16 nDist ) { long nCount = pList->Count(); XDashEntry* pEntry; - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; String aStr; XDash aDash; @@ -1687,20 +1687,20 @@ void LineLB::SelectEntryByList( const XDashList* pList, const String& rStr, aDash = pEntry->GetDash(); if( rStr == aStr && rDash == aDash ) - bFound = TRUE; + bFound = sal_True; } if( bFound ) - SelectEntryPos( (USHORT) ( i - 1 + nDist ) ); + SelectEntryPos( (sal_uInt16) ( i - 1 + nDist ) ); } // Fills the listbox (provisional) with strings -void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart ) +void LineEndLB::Fill( const XLineEndList* pList, sal_Bool bStart ) { long nCount = pList->Count(); XLineEndEntry* pEntry; VirtualDevice aVD; - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); for( long i = 0; i < nCount; i++ ) { @@ -1709,7 +1709,7 @@ void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart ) if( pBitmap ) { Size aBmpSize( pBitmap->GetSizePixel() ); - aVD.SetOutputSizePixel( aBmpSize, FALSE ); + aVD.SetOutputSizePixel( aBmpSize, sal_False ); aVD.DrawBitmap( Point(), *pBitmap ); InsertEntry( pEntry->GetName(), aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ), @@ -1720,20 +1720,20 @@ void LineEndLB::Fill( const XLineEndList* pList, BOOL bStart ) else InsertEntry( pEntry->GetName() ); } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); } /************************************************************************/ void LineEndLB::Append( XLineEndEntry* pEntry, Bitmap* pBmp, - BOOL bStart ) + sal_Bool bStart ) { if( pBmp ) { VirtualDevice aVD; Size aBmpSize( pBmp->GetSizePixel() ); - aVD.SetOutputSizePixel( aBmpSize, FALSE ); + aVD.SetOutputSizePixel( aBmpSize, sal_False ); aVD.DrawBitmap( Point(), *pBmp ); InsertEntry( pEntry->GetName(), aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ), @@ -1745,8 +1745,8 @@ void LineEndLB::Append( XLineEndEntry* pEntry, Bitmap* pBmp, /************************************************************************/ -void LineEndLB::Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp, - BOOL bStart ) +void LineEndLB::Modify( XLineEndEntry* pEntry, sal_uInt16 nPos, Bitmap* pBmp, + sal_Bool bStart ) { RemoveEntry( nPos ); @@ -1755,7 +1755,7 @@ void LineEndLB::Modify( XLineEndEntry* pEntry, USHORT nPos, Bitmap* pBmp, VirtualDevice aVD; Size aBmpSize( pBmp->GetSizePixel() ); - aVD.SetOutputSizePixel( aBmpSize, FALSE ); + aVD.SetOutputSizePixel( aBmpSize, sal_False ); aVD.DrawBitmap( Point(), *pBmp ); InsertEntry( pEntry->GetName(), aVD.GetBitmap( bStart ? Point() : Point( aBmpSize.Width() / 2, 0 ), @@ -1894,7 +1894,7 @@ SvxXLinePreview::SvxXLinePreview( Window* pParent, const ResId& rResId ) mbWithSymbol( sal_False ) { const Size aOutputSize(GetOutputSize()); - InitSettings( TRUE, TRUE ); + InitSettings( sal_True, sal_True ); const sal_Int32 nDistance(500L); const sal_Int32 nAvailableLength(aOutputSize.Width() - (4 * nDistance)); diff --git a/svx/source/dialog/dlgctrl.src b/svx/source/dialog/dlgctrl.src index e5bd607efd..636b6213d3 100644..100755 --- a/svx/source/dialog/dlgctrl.src +++ b/svx/source/dialog/dlgctrl.src @@ -31,4 +31,9 @@ Bitmap RID_SVXCTRL_RECTBTNS { File = "rectbtns.bmp" ; }; - +/*IAccessibility2 Implementation 2009-----*/ +String STR_SWITCH +{ + Text [ en-US ] = "Switch" ; +}; +/*-----IAccessibility2 Implementation 2009*/ diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index f80a4fed2d..b0a3cb0cb1 100644..100755 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svl/itemset.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/module.hxx> @@ -46,7 +46,7 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) { FieldUnit eUnit = FUNIT_INCH; const SfxPoolItem* pItem = NULL; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, FALSE, &pItem ) ) + if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC, sal_False, &pItem ) ) eUnit = (FieldUnit)( (const SfxUInt16Item*)pItem )->GetValue(); else { @@ -57,12 +57,12 @@ FieldUnit GetModuleFieldUnit( const SfxItemSet& rSet ) return eUnit; } -BOOL GetApplyCharUnit( const SfxItemSet& rSet ) +bool GetApplyCharUnit( const SfxItemSet& rSet ) { - BOOL bUseCharUnit = FALSE; + bool bUseCharUnit = false; const SfxPoolItem* pItem = NULL; - if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_APPLYCHARUNIT, FALSE, &pItem ) ) - bUseCharUnit = (BOOL)( (const SfxBoolItem*)pItem )->GetValue(); + if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_APPLYCHARUNIT, sal_False, &pItem ) ) + bUseCharUnit = ((const SfxBoolItem*)pItem )->GetValue(); else { // FIXME - this might be wrong, cf. the DEV300 changes in GetModuleFieldUnit() @@ -77,7 +77,7 @@ BOOL GetApplyCharUnit( const SfxItemSet& rSet ) { pItem = pModule->GetItem( SID_ATTR_APPLYCHARUNIT ); if ( pItem ) - bUseCharUnit = (BOOL)( (SfxBoolItem*)pItem )->GetValue(); + bUseCharUnit = ((SfxBoolItem*)pItem )->GetValue(); } else { diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 5c7e77cf9a..7f5e17ba80 100644..100755 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -894,7 +894,7 @@ void SaveProgressDialog::end() //=============================================== RecovDocListEntry::RecovDocListEntry( SvLBoxEntry* pEntry, - USHORT nFlags, + sal_uInt16 nFlags, const String& sText ) : SvLBoxString( pEntry, nFlags, sText ) { @@ -903,7 +903,7 @@ RecovDocListEntry::RecovDocListEntry( SvLBoxEntry* pEntry, //=============================================== void RecovDocListEntry::Paint(const Point& aPos , SvLBox& aDevice, - USHORT /*nFlags */, + sal_uInt16 /*nFlags */, SvLBoxEntry* pEntry ) { const Image* pImg = 0; @@ -1071,7 +1071,7 @@ RecoveryDialog::RecoveryDialog(Window* pParent, m_aFileListLB.SetBackground( rStyleSettings.GetDialogColor() ); - m_aNextBtn.Enable(TRUE); + m_aNextBtn.Enable(sal_True); m_aNextBtn.SetClickHdl( LINK( this, RecoveryDialog, NextButtonHdl ) ); m_aCancelBtn.SetClickHdl( LINK( this, RecoveryDialog, CancelButtonHdl ) ); @@ -1114,8 +1114,8 @@ short RecoveryDialog::execute() // Dialog was started first time ... // wait for user decision ("start" or "cancel" recovery) // This decision will be made inside the NextBtn handler. - m_aNextBtn.Enable(TRUE); - m_aCancelBtn.Enable(TRUE); + m_aNextBtn.Enable(sal_True); + m_aCancelBtn.Enable(sal_True); m_bWaitForUser = sal_True; while(m_bWaitForUser) Application::Yield(); @@ -1133,8 +1133,8 @@ short RecoveryDialog::execute() // do it asynchronous (to allow repaints) // and wait for this asynchronous operation. m_aDescrFT.SetText( m_aTitleRecoveryInProgress ); - m_aNextBtn.Enable(FALSE); - m_aCancelBtn.Enable(FALSE); + m_aNextBtn.Enable(sal_False); + m_aCancelBtn.Enable(sal_False); m_pCore->setProgressHandler(m_xProgress); m_pCore->setUpdateListener(this); m_pCore->doRecovery(); @@ -1156,15 +1156,15 @@ short RecoveryDialog::execute() { m_aDescrFT.SetText(m_aRecoveryOnlyFinishDescr); m_aNextBtn.SetText(m_aRecoveryOnlyFinish); - m_aNextBtn.Enable(TRUE); - m_aCancelBtn.Enable(FALSE); + m_aNextBtn.Enable(sal_True); + m_aCancelBtn.Enable(sal_False); } else { m_aDescrFT.SetText(m_aTitleRecoveryReport); m_aNextBtn.SetText(m_aNextStr); - m_aNextBtn.Enable(TRUE); - m_aCancelBtn.Enable(TRUE); + m_aNextBtn.Enable(sal_True); + m_aCancelBtn.Enable(sal_True); } m_bWaitForUser = sal_True; @@ -1341,8 +1341,8 @@ void RecoveryDialog::start() //=============================================== void RecoveryDialog::updateItems() { - ULONG c = m_aFileListLB.GetEntryCount(); - ULONG i = 0; + sal_uIntPtr c = m_aFileListLB.GetEntryCount(); + sal_uIntPtr i = 0; for ( i=0; i<c; ++i ) { SvLBoxEntry* pEntry = m_aFileListLB.GetEntry(i); @@ -1365,8 +1365,8 @@ void RecoveryDialog::updateItems() //=============================================== void RecoveryDialog::stepNext(TURLInfo* pItem) { - ULONG c = m_aFileListLB.GetEntryCount(); - ULONG i = 0; + sal_uIntPtr c = m_aFileListLB.GetEntryCount(); + sal_uIntPtr i = 0; for (i=0; i<c; ++i) { SvLBoxEntry* pEntry = m_aFileListLB.GetEntry(i); @@ -1516,7 +1516,7 @@ void BrokenRecoveryDialog::impl_refresh() m_bExecutionNeeded = sal_True; - USHORT nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage ); + sal_uInt16 nPos = m_aFileListLB.InsertEntry(rInfo.DisplayName, rInfo.StandardImage ); m_aFileListLB.SetEntryData( nPos, (void*)&rInfo ); } m_sSavePath = ::rtl::OUString(); @@ -1568,7 +1568,6 @@ void BrokenRecoveryDialog::impl_askForSavePath() { css::uno::Reference< css::ui::dialogs::XFolderPicker > xFolderPicker( m_pCore->getSMGR()->createInstance(SERVICENAME_FOLDERPICKER), css::uno::UNO_QUERY_THROW); -// svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER ); INetURLObject aURL(m_sSavePath, INET_PROT_FILE); xFolderPicker->setDisplayDirectory(aURL.GetMainURL(INetURLObject::NO_DECODE)); @@ -1681,13 +1680,13 @@ void BrokenRecoveryDialog::impl_askForSavePath() ExtTextEngine* pTextEngine = GetTextEngine(); DBG_ASSERT( pTextEngine, "no text engine" ); - ULONG i, nParaCount = pTextEngine->GetParagraphCount(); - USHORT nLineCount = 0; + sal_uIntPtr i, nParaCount = pTextEngine->GetParagraphCount(); + sal_uInt16 nLineCount = 0; for ( i = 0; i < nParaCount; ++i ) nLineCount = nLineCount + pTextEngine->GetLineCount(i); - USHORT nVisCols = 0, nVisLines = 0; + sal_uInt16 nVisCols = 0, nVisLines = 0; GetMaxVisColumnsAndLines( nVisCols, nVisLines ); GetVScrollBar()->Show( nLineCount > nVisLines ); @@ -1928,14 +1927,14 @@ void BrokenRecoveryDialog::impl_askForSavePath() default: #ifdef WNT case 0: - maSystemBtn.Check( TRUE ); + maSystemBtn.Check( sal_True ); break; #endif case 1: - maDirectBtn.Check( TRUE ); + maDirectBtn.Check( sal_True ); break; case 2: - maManualBtn.Check( TRUE ); + maManualBtn.Check( sal_True ); break; } @@ -1997,7 +1996,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() GetTextEngine()->SetFont( aFont ); // no blinking cursor and a little left margin - EnableCursor( FALSE ); + EnableCursor( sal_False ); SetLeftMargin( 4 ); } diff --git a/svx/source/dialog/docrecovery.hrc b/svx/source/dialog/docrecovery.hrc index 2e4d03981d..594b863084 100644..100755 --- a/svx/source/dialog/docrecovery.hrc +++ b/svx/source/dialog/docrecovery.hrc @@ -36,7 +36,7 @@ // TabDialog #define TABDLG_WIDTH 290 -#define TABDLG_HEIGHT 278 +#define TABDLG_HEIGHT 238 // TabPage CrashSave @@ -52,7 +52,7 @@ #define SAVE_WIDTH 290 -#define SAVE_HEIGHT 278 +#define SAVE_HEIGHT 238 #define SAVE_TITLEWINHEIGHT 36 #define SAVE_DESCRHEIGHT 48 #define SAVE_COL0 (RSC_SP_DLG_INNERBORDER_LEFT) diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src index 2da85bc8c5..1279d8b7fa 100644..100755 --- a/svx/source/dialog/docrecovery.src +++ b/svx/source/dialog/docrecovery.src @@ -79,6 +79,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_SAVE }; ListBox LB_SAVE_FILELIST { + HelpID = "svx:ListBox:RID_SVXPAGE_DOCRECOVERY_SAVE:LB_SAVE_FILELIST"; Pos = MAP_APPFONT( SAVE_COL0 , SAVE_ROW4 ); Size = MAP_APPFONT( SAVE_CONTROLWIDTH, SAVE_FILELISTHEIGHT ); Border = TRUE; @@ -193,6 +194,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER }; PushButton BTN_RECOV_NEXT { + HelpID = "svx:PushButton:RID_SVXPAGE_DOCRECOVERY_RECOVER:BTN_RECOV_NEXT"; Pos = MAP_APPFONT( RECOV_COL_C, RECOV_ROW9 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH*2, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "~Start Recovery >"; @@ -288,6 +290,7 @@ ModalDialog RID_SVX_MDLG_DOCRECOVERY_BROKEN }; ListBox LB_BROKEN_FILELIST { + HelpID = "svx:ListBox:RID_SVX_MDLG_DOCRECOVERY_BROKEN:LB_BROKEN_FILELIST"; Pos = MAP_APPFONT( BROKEN_COL0, BROKEN_ROW2 ); Size = MAP_APPFONT( BROKEN_CONTROLWIDTH, (BROKEN_ROW3-BROKEN_ROW2) ); Border = TRUE; @@ -301,12 +304,14 @@ ModalDialog RID_SVX_MDLG_DOCRECOVERY_BROKEN }; Edit ED_BROKEN_SAVEDIR { + HelpID = "svx:Edit:RID_SVX_MDLG_DOCRECOVERY_BROKEN:ED_BROKEN_SAVEDIR"; Pos = MAP_APPFONT( BROKEN_COL0, BROKEN_ROW5 + 1 ); // center to pushbutton Size = MAP_APPFONT( BROKEN_COL2 - BROKEN_COL0, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; }; PushButton BTN_BROKEN_SAVEDIR { + HelpID = "svx:PushButton:RID_SVX_MDLG_DOCRECOVERY_BROKEN:BTN_BROKEN_SAVEDIR"; Pos = MAP_APPFONT( BROKEN_COL3, BROKEN_ROW5 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Chan~ge..."; @@ -367,6 +372,7 @@ TabPage RID_SVXPAGE_ERR_REP_WELCOME }; PushButton BTN_RECOV_PREV { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_WELCOME:BTN_RECOV_PREV"; Pos = MAP_APPFONT( RECOV_COL_C, RECOV_ROW9 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "< ~Back"; @@ -425,6 +431,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; Edit ED_ERRSEND_DOCTYPE { + HelpID = "svx:Edit:RID_SVXPAGE_ERR_REP_SEND:ED_ERRSEND_DOCTYPE"; Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW5 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -437,6 +444,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; MultiLineEdit ML_ERRSEND_USING { + HelpID = "svx:MultiLineEdit:RID_SVXPAGE_ERR_REP_SEND:ML_ERRSEND_USING"; Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW8 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, (ERRSEND_ROW12-ERRSEND_ROW8-RSC_SP_CTRL_Y) ); VScroll = TRUE; @@ -445,18 +453,21 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; PushButton BTN_ERRSEND_SHOWREP { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_ERRSEND_SHOWREP"; Pos = MAP_APPFONT( ERRSEND_COL3, ERRSEND_ROW8 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "Show ~Report"; }; PushButton BTN_ERRSEND_OPT { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_ERRSEND_OPT"; Pos = MAP_APPFONT( ERRSEND_COL3, ERRSEND_ROW10 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "~Options..."; }; CheckBox CB_ERRSEND_CONTACT { + HelpID = "svx:CheckBox:RID_SVXPAGE_ERR_REP_SEND:CB_ERRSEND_CONTACT"; Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW12 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_CHECKBOX_HEIGHT ); Check = FALSE; @@ -470,6 +481,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; Edit ED_ERRSEND_EMAILADDR { + HelpID = "svx:Edit:RID_SVXPAGE_ERR_REP_SEND:ED_ERRSEND_EMAILADDR"; Pos = MAP_APPFONT( ERRSEND_COL1, ERRSEND_ROW14 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH3, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -481,6 +493,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; PushButton BTN_RECOV_PREV { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_RECOV_PREV"; Pos = MAP_APPFONT( ERRSEND_COL5, ERRSEND_ROW16 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "< ~Back"; @@ -518,6 +531,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS RadioButton BTN_ERROPT_SYSTEM { + HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_SYSTEM"; Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW1 ); Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT ); Text[ en-US ] = "Use ~system settings"; @@ -525,6 +539,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS RadioButton BTN_ERROPT_DIRECT { + HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_DIRECT"; Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW2 ); Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT ); Text[ en-US ] = "Use ~direct connection to the Internet"; @@ -532,6 +547,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS RadioButton BTN_ERROPT_MANUAL { + HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_MANUAL"; Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW3 ); Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT ); Text[ en-US ] = "Use ~manual settings"; @@ -546,6 +562,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS Edit ED_ERROPT_PROXYSERVER { + HelpID = "svx:Edit:RID_SVX_MDLG_ERR_REP_OPTIONS:ED_ERROPT_PROXYSERVER"; Pos = MAP_APPFONT( ERROPT_COLC, ERROPT_ROW5 ); Size = MAP_APPFONT( ERROPT_SERVER_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -560,6 +577,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS Edit ED_ERROPT_PROXYPORT { + HelpID = "svx:Edit:RID_SVX_MDLG_ERR_REP_OPTIONS:ED_ERROPT_PROXYPORT"; Pos = MAP_APPFONT( ERROPT_COLC + ERROPT_SERVER_WIDTH + RSC_SP_CTRL_GROUP_X, ERROPT_ROW5 ); Size = MAP_APPFONT( ERROPT_PORT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -606,6 +624,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_PREVIEW MultiLineEdit ML_ERRPREVIEW_CONTENT { + HelpID = "svx:MultiLineEdit:RID_SVX_MDLG_ERR_REP_PREVIEW:ML_ERRPREVIEW_CONTENT"; Pos = MAP_APPFONT( ERRPREVIEW_COLA, ERRPREVIEW_ROW0 ); Size = MAP_APPFONT( ERRPREVIEW_COLC - ERRPREVIEW_COLA, ERRPREVIEW_ROW1 - ERRPREVIEW_ROW0 ); VScroll = TRUE; diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx index 8aa54eaba6..a34cae1d30 100644..100755 --- a/svx/source/dialog/fntctrl.cxx +++ b/svx/source/dialog/fntctrl.cxx @@ -71,7 +71,7 @@ namespace // ----------------------------------------------------------------------- void initFont(Font& _rFont) { - _rFont.SetTransparent(TRUE); + _rFont.SetTransparent(sal_True); _rFont.SetAlign(ALIGN_BASELINE); } // ----------------------------------------------------------------------- @@ -97,7 +97,7 @@ namespace void setFont( const SvxFont& rNewFont, SvxFont& rImplFont ) { rImplFont = rNewFont; - rImplFont.SetTransparent( TRUE ); + rImplFont.SetTransparent( sal_True ); rImplFont.SetAlign( ALIGN_BASELINE ); } @@ -113,7 +113,7 @@ class FontPrevWin_Impl SvxFont aFont; Printer* pPrinter; - BOOL bDelPrinter; + sal_Bool bDelPrinter; Reference < XBreakIterator > xBreak; SvULongs aTextWidth; @@ -132,9 +132,9 @@ class FontPrevWin_Impl long n100PercentFontWidth; // initial -1 -> not set yet long n100PercentFontWidthCJK; long n100PercentFontWidthCTL; - UINT16 nFontWidthScale; + sal_uInt16 nFontWidthScale; - BOOL bSelection : 1, + sal_Bool bSelection : 1, bGetSelection : 1, bUseResText : 1, bTwoLines : 1, @@ -146,13 +146,13 @@ class FontPrevWin_Impl void _CheckScript(); public: inline FontPrevWin_Impl() : - pPrinter( NULL ), bDelPrinter( FALSE ), + pPrinter( NULL ), bDelPrinter( sal_False ), pColor( NULL ), pBackColor( 0 ), nAscent( 0 ), cStartBracket( 0 ), cEndBracket( 0 ), nFontWidthScale( 100 ), - bSelection( FALSE ), bGetSelection( FALSE ), bUseResText( FALSE ), - bTwoLines( FALSE ), - bIsCJKUI( FALSE ), bIsCTLUI( FALSE ), - bUseFontNameAsText( FALSE ), bTextInited( FALSE ) + bSelection( sal_False ), bGetSelection( sal_False ), bUseResText( sal_False ), + bTwoLines( sal_False ), + bIsCJKUI( sal_False ), bIsCTLUI( sal_False ), + bUseFontNameAsText( sal_False ), bTextInited( sal_False ) { Invalidate100PercentFontWidth(); } @@ -169,9 +169,9 @@ public: Size CalcTextSize( OutputDevice* pWin, OutputDevice* pPrt, SvxFont &rFont ); void DrawPrev( OutputDevice* pWin, Printer* pPrt, Point &rPt, SvxFont &rFont ); - BOOL SetFontWidthScale( UINT16 nScaleInPercent ); + sal_Bool SetFontWidthScale( sal_uInt16 nScaleInPercent ); inline void Invalidate100PercentFontWidth(); - inline BOOL Is100PercentFontWidthValid() const; + inline sal_Bool Is100PercentFontWidthValid() const; void ScaleFontWidth( const OutputDevice& rOutDev ); // scales rNonCJKFont and aCJKFont depending on nFontWidthScale and // sets the 100%-Font-Widths @@ -188,7 +188,7 @@ inline void FontPrevWin_Impl::Invalidate100PercentFontWidth() n100PercentFontWidth = n100PercentFontWidthCJK = n100PercentFontWidthCTL = -1; } -inline BOOL FontPrevWin_Impl::Is100PercentFontWidthValid() const +inline sal_Bool FontPrevWin_Impl::Is100PercentFontWidthValid() const { DBG_ASSERT( ( n100PercentFontWidth == -1 && n100PercentFontWidthCJK == -1 ) || ( n100PercentFontWidth != -1 && n100PercentFontWidthCJK != -1 ) || @@ -211,10 +211,10 @@ inline BOOL FontPrevWin_Impl::Is100PercentFontWidthValid() const void FontPrevWin_Impl::_CheckScript() { aScriptText = aText; - USHORT nCnt = aScriptChg.Count(); + size_t nCnt = aScriptChg.size(); if( nCnt ) { - aScriptChg.Remove( 0, nCnt ); + aScriptChg.clear(); aScriptType.Remove( 0, nCnt ); aTextWidth.Remove( 0, nCnt ); nCnt = 0; @@ -227,8 +227,8 @@ void FontPrevWin_Impl::_CheckScript() } if( xBreak.is() ) { - USHORT nScript = xBreak->getScriptType( aText, 0 ); - USHORT nChg = 0; + sal_uInt16 nScript = xBreak->getScriptType( aText, 0 ); + sal_uInt16 nChg = 0; if( com::sun::star::i18n::ScriptType::WEAK == nScript ) { nChg = (xub_StrLen)xBreak->endOfScript( aText, nChg, nScript ); @@ -249,25 +249,25 @@ void FontPrevWin_Impl::_CheckScript() if (nType == U_NON_SPACING_MARK || nType == U_ENCLOSING_MARK || nType == U_COMBINING_SPACING_MARK ) { - aScriptChg.Insert( nChg - 1, nCnt ); + aScriptChg.push_back( nChg - 1 ); } else { - aScriptChg.Insert( nChg, nCnt ); + aScriptChg.push_back( nChg ); } } else { - aScriptChg.Insert( nChg, nCnt ); + aScriptChg.push_back( nChg ); } aScriptType.Insert( nScript, nCnt ); - aTextWidth.Insert( ULONG(0), nCnt++ ); + aTextWidth.Insert( sal_uIntPtr(0), nCnt++ ); if( nChg < aText.Len() ) nScript = xBreak->getScriptType( aText, nChg ); else break; - } while( TRUE ); + } while( sal_True ); } } @@ -284,11 +284,11 @@ void FontPrevWin_Impl::_CheckScript() Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter, SvxFont &rFont ) { - USHORT nScript; - USHORT nIdx = 0; + sal_uInt16 nScript; + sal_uInt16 nIdx = 0; xub_StrLen nStart = 0; xub_StrLen nEnd; - USHORT nCnt = aScriptChg.Count(); + size_t nCnt = aScriptChg.size(); if( nCnt ) { nEnd = aScriptChg[ nIdx ]; @@ -309,7 +309,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter do { SvxFont& rFnt = (nScript==com::sun::star::i18n::ScriptType::ASIAN) ? aCJKFont : ((nScript==com::sun::star::i18n::ScriptType::COMPLEX) ? aCTLFont : rFont); - ULONG nWidth = rFnt.GetTxtSize( _pPrinter, aText, nStart, nEnd-nStart ). + sal_uIntPtr nWidth = rFnt.GetTxtSize( _pPrinter, aText, nStart, nEnd-nStart ). Width(); aTextWidth[ nIdx++ ] = nWidth; nTxtWidth += nWidth; @@ -334,7 +334,7 @@ Size FontPrevWin_Impl::CalcTextSize( OutputDevice* pWin, OutputDevice* _pPrinter else break; } - while( TRUE ); + while( sal_True ); nHeight -= nAscent; nCJKHeight -= nCJKAscent; nCTLHeight -= nCTLAscent; @@ -363,11 +363,11 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter, Point &rPt, SvxFont &rFont ) { Font aOldFont = _pPrinter->GetFont(); - USHORT nScript; - USHORT nIdx = 0; + sal_uInt16 nScript; + sal_uInt16 nIdx = 0; xub_StrLen nStart = 0; xub_StrLen nEnd; - USHORT nCnt = aScriptChg.Count(); + size_t nCnt = aScriptChg.size(); if( nCnt ) { nEnd = aScriptChg[ nIdx ]; @@ -395,21 +395,21 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter, else break; } - while( TRUE ); + while( sal_True ); _pPrinter->SetFont( aOldFont ); } // ----------------------------------------------------------------------- -BOOL FontPrevWin_Impl::SetFontWidthScale( UINT16 nScale ) +sal_Bool FontPrevWin_Impl::SetFontWidthScale( sal_uInt16 nScale ) { if( nFontWidthScale != nScale ) { nFontWidthScale = nScale; - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } @@ -431,7 +431,7 @@ void FontPrevWin_Impl::ScaleFontWidth( const OutputDevice& rOutDev ) // class SvxFontPrevWindow ----------------------------------------------- -void SvxFontPrevWindow::InitSettings( BOOL bForeground, BOOL bBackground ) +void SvxFontPrevWindow::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -470,13 +470,13 @@ SvxFontPrevWindow::SvxFontPrevWindow( Window* pParent, const ResId& rId ) : if ( !pImpl->pPrinter ) { pImpl->pPrinter = new Printer; - pImpl->bDelPrinter = TRUE; + pImpl->bDelPrinter = sal_True; } SetMapMode( MapMode( MAP_TWIP ) ); initFont(pImpl->aFont); initFont(pImpl->aCJKFont); initFont(pImpl->aCTLFont); - InitSettings( TRUE, TRUE ); + InitSettings( sal_True, sal_True ); SetBorderStyle( WINDOW_BORDER_MONO ); LanguageType eLanguage = Application::GetSettings().GetUILanguage(); @@ -527,9 +527,9 @@ SvxFont& SvxFontPrevWindow::GetCJKFont() void SvxFontPrevWindow::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) - InitSettings( TRUE, FALSE ); + InitSettings( sal_True, sal_False ); else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) - InitSettings( FALSE, TRUE ); + InitSettings( sal_False, sal_True ); Window::StateChanged( nType ); } @@ -539,7 +539,7 @@ void SvxFontPrevWindow::StateChanged( StateChangedType nType ) void SvxFontPrevWindow::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) - InitSettings( TRUE, TRUE ); + InitSettings( sal_True, sal_True ); else Window::DataChanged( rDCEvt ); } @@ -560,14 +560,14 @@ const SvxFont& SvxFontPrevWindow::GetFont() const void SvxFontPrevWindow::SetPreviewText( const ::rtl::OUString& rString ) { pImpl->aText = rString; - pImpl->bTextInited = TRUE; + pImpl->bTextInited = sal_True; } // ----------------------------------------------------------------------- void SvxFontPrevWindow::SetFontNameAsPreviewText() { - pImpl->bUseFontNameAsText = TRUE; + pImpl->bUseFontNameAsText = sal_True; } // ----------------------------------------------------------------------- @@ -639,7 +639,7 @@ void SvxFontPrevWindow::SetBackColor(const Color &rColor) // ----------------------------------------------------------------------- -void SvxFontPrevWindow::UseResourceText( BOOL bUse ) +void SvxFontPrevWindow::UseResourceText( sal_Bool bUse ) { pImpl->bUseResText = bUse; } @@ -662,7 +662,7 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) if ( pSh && !pImpl->bGetSelection && !pImpl->bUseFontNameAsText ) { pImpl->aText = pSh->GetSelectionText(); - pImpl->bGetSelection = TRUE; + pImpl->bGetSelection = sal_True; pImpl->bSelection = pImpl->aText.Len() != 0; } @@ -803,12 +803,12 @@ void SvxFontPrevWindow::Paint( const Rectangle& ) } } -BOOL SvxFontPrevWindow::IsTwoLines() const +sal_Bool SvxFontPrevWindow::IsTwoLines() const { return pImpl->bTwoLines; } -void SvxFontPrevWindow::SetTwoLines(BOOL bSet) +void SvxFontPrevWindow::SetTwoLines(sal_Bool bSet) { pImpl->bTwoLines = bSet;} @@ -821,7 +821,7 @@ void SvxFontPrevWindow::SetBrackets(sal_Unicode cStart, sal_Unicode cEnd) // ----------------------------------------------------------------------- -void SvxFontPrevWindow::SetFontWidthScale( UINT16 n ) +void SvxFontPrevWindow::SetFontWidthScale( sal_uInt16 n ) { if( pImpl->SetFontWidthScale( n ) ) Invalidate(); diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 98c815a95c..3077587bff 100644..100755 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fontlb.hxx" +#include "svx/fontlb.hxx" #include <vcl/svapp.hxx> // ============================================================================ @@ -100,7 +100,7 @@ SvxFontListBox::SvxFontListBox( Window* pParent, const ResId& rResId ) : maStdFont( GetFont() ), mbUseFont( false ) { - maStdFont.SetTransparent( TRUE ); + maStdFont.SetTransparent( sal_True ); maEntryFont = maStdFont; } @@ -125,10 +125,10 @@ void SvxFontListBox::SelectEntryPos( sal_uInt16 nPos, bool bSelect ) void SvxFontListBox::SetNoSelection() { - SelectAll( FALSE, TRUE ); + SelectAll( sal_False, sal_True ); } -ULONG SvxFontListBox::GetSelectEntryPos() const +sal_uLong SvxFontListBox::GetSelectEntryPos() const { SvLBoxEntry* pSvLBoxEntry = FirstSelected(); return pSvLBoxEntry ? GetModel()->GetAbsPos( pSvLBoxEntry ) : LIST_APPEND; diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 4533b25ec8..795cefc5e2 100644..100755 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -42,7 +42,7 @@ #include <svx/xtextit.hxx> #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/dialogs.hrc> #include "fontwork.hrc" @@ -57,7 +57,7 @@ SFX_IMPL_DOCKINGWINDOW( SvxFontWorkChildWindow, SID_FONTWORK ); SvxFontWorkControllerItem::SvxFontWorkControllerItem ( - USHORT _nId, + sal_uInt16 _nId, SvxFontWorkDialog& rDlg, SfxBindings& rBindings ) : @@ -70,7 +70,7 @@ SvxFontWorkControllerItem::SvxFontWorkControllerItem // StateChanged method for FontWork items -void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eState*/, +void SvxFontWorkControllerItem::StateChanged( sal_uInt16 /*nSID*/, SfxItemState /*eState*/, const SfxPoolItem* pItem ) { switch ( GetId() ) @@ -179,7 +179,7 @@ void SvxFontWorkControllerItem::StateChanged( USHORT /*nSID*/, SfxItemState /*eS SvxFontWorkChildWindow::SvxFontWorkChildWindow ( Window* _pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -274,10 +274,10 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx, // Set System metric const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit(); - SetFieldUnit( aMtrFldDistance, eDlgUnit, TRUE ); - SetFieldUnit( aMtrFldTextStart, eDlgUnit, TRUE ); - SetFieldUnit( aMtrFldShadowX, eDlgUnit, TRUE ); - SetFieldUnit( aMtrFldShadowY, eDlgUnit, TRUE ); + SetFieldUnit( aMtrFldDistance, eDlgUnit, sal_True ); + SetFieldUnit( aMtrFldTextStart, eDlgUnit, sal_True ); + SetFieldUnit( aMtrFldShadowX, eDlgUnit, sal_True ); + SetFieldUnit( aMtrFldShadowY, eDlgUnit, sal_True ); if( eDlgUnit == FUNIT_MM ) { aMtrFldDistance.SetSpinSize( 50 ); @@ -309,7 +309,7 @@ SvxFontWorkDialog::SvxFontWorkDialog( SfxBindings *pBindinx, SvxFontWorkDialog::~SvxFontWorkDialog() { - for (USHORT i = 0; i < CONTROLLER_COUNT; i++) + for (sal_uInt16 i = 0; i < CONTROLLER_COUNT; i++) DELETEZ(pCtrlItems[i]); } @@ -363,7 +363,7 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem) { if ( pItem ) { - USHORT nId = TBI_STYLE_OFF; + sal_uInt16 nId = TBI_STYLE_OFF; switch ( pItem->GetValue() ) { @@ -378,16 +378,16 @@ void SvxFontWorkDialog::SetStyle_Impl(const XFormTextStyleItem* pItem) // Make sure that there is allways exactly one checked toolbox item. if ( pItem->GetValue() == XFT_NONE ) { - aTbxStyle.CheckItem(TBI_STYLE_ROTATE, FALSE); - aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, FALSE); - aTbxStyle.CheckItem(TBI_STYLE_SLANTX, FALSE); - aTbxStyle.CheckItem(TBI_STYLE_SLANTY, FALSE); + aTbxStyle.CheckItem(TBI_STYLE_ROTATE, sal_False); + aTbxStyle.CheckItem(TBI_STYLE_UPRIGHT, sal_False); + aTbxStyle.CheckItem(TBI_STYLE_SLANTX, sal_False); + aTbxStyle.CheckItem(TBI_STYLE_SLANTY, sal_False); - aTbxStyle.CheckItem(TBI_STYLE_OFF, TRUE); + aTbxStyle.CheckItem(TBI_STYLE_OFF, sal_True); } else { - aTbxStyle.CheckItem(TBI_STYLE_OFF, FALSE); + aTbxStyle.CheckItem(TBI_STYLE_OFF, sal_False); aTbxStyle.CheckItem(nId); } @@ -403,7 +403,7 @@ void SvxFontWorkDialog::SetAdjust_Impl(const XFormTextAdjustItem* pItem) { if ( pItem ) { - USHORT nId; + sal_uInt16 nId; aTbxAdjust.Enable(); aMtrFldDistance.Enable(); @@ -476,7 +476,7 @@ void SvxFontWorkDialog::SetStdForm_Impl(const XFormTextStdFormItem* pItem) if ( pItem->GetValue() != XFTFORM_NONE ) aFormSet.SelectItem( - sal::static_int_cast< USHORT >(pItem->GetValue())); + sal::static_int_cast< sal_uInt16 >(pItem->GetValue())); } else aFormSet.Disable(); @@ -501,11 +501,11 @@ void SvxFontWorkDialog::SetOutline_Impl(const XFormTextOutlineItem* pItem) // Set shadow buttons void SvxFontWorkDialog::SetShadow_Impl(const XFormTextShadowItem* pItem, - BOOL bRestoreValues) + sal_Bool bRestoreValues) { if ( pItem ) { - USHORT nId; + sal_uInt16 nId; aTbxShadow.Enable(); @@ -622,8 +622,8 @@ void SvxFontWorkDialog::SetShadowXVal_Impl(const XFormTextShadowXValItem* pItem) if ( pItem && !aMtrFldShadowX.HasChildPathFocus() ) { // #i19251# - // INT32 nValue = pItem->GetValue(); - + // sal_Int32 nValue = pItem->GetValue(); + // #i19251# // The two involved fields/items are used double and contain/give different // values regarding to the access method. Thus, here we need to separate the access @@ -669,7 +669,7 @@ void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem) IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG ) { - USHORT nId = aTbxStyle.GetCurItemId(); + sal_uInt16 nId = aTbxStyle.GetCurItemId(); // Execute this block when a different toolbox item has been clicked or // when the off item has been clicked. The later is necessary to @@ -697,7 +697,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectStyleHdl_Impl, void *, EMPTYARG ) IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG ) { - USHORT nId = aTbxAdjust.GetCurItemId(); + sal_uInt16 nId = aTbxAdjust.GetCurItemId(); if ( nId == TBI_ADJUST_MIRROR ) { @@ -724,7 +724,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectAdjustHdl_Impl, void *, EMPTYARG ) IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG ) { - USHORT nId = aTbxShadow.GetCurItemId(); + sal_uInt16 nId = aTbxShadow.GetCurItemId(); if ( nId == TBI_SHOWFORM ) { @@ -757,7 +757,7 @@ IMPL_LINK( SvxFontWorkDialog, SelectShadowHdl_Impl, void *, EMPTYARG ) XFormTextShadowItem aItem(eShadow); GetBindings().GetDispatcher()->Execute( SID_FORMTEXT_SHADOW, SFX_CALLMODE_RECORD, &aItem, 0L ); - SetShadow_Impl(&aItem, TRUE); + SetShadow_Impl(&aItem, sal_True); } return 0; } @@ -777,16 +777,16 @@ IMPL_LINK( SvxFontWorkDialog, InputTimoutHdl_Impl, void *, EMPTYARG ) const FieldUnit eDlgUnit = rBindings.GetDispatcher()->GetModule()->GetFieldUnit(); if( eDlgUnit != aMtrFldDistance.GetUnit() ) { - SetFieldUnit( aMtrFldDistance, eDlgUnit, TRUE ); - SetFieldUnit( aMtrFldTextStart, eDlgUnit, TRUE ); + SetFieldUnit( aMtrFldDistance, eDlgUnit, sal_True ); + SetFieldUnit( aMtrFldTextStart, eDlgUnit, sal_True ); aMtrFldDistance.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); aMtrFldTextStart.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); } if( eDlgUnit != aMtrFldShadowX.GetUnit() && aTbxShadow.IsItemChecked( TBI_SHADOW_NORMAL ) ) { - SetFieldUnit( aMtrFldShadowX, eDlgUnit, TRUE ); - SetFieldUnit( aMtrFldShadowY, eDlgUnit, TRUE ); + SetFieldUnit( aMtrFldShadowX, eDlgUnit, sal_True ); + SetFieldUnit( aMtrFldShadowY, eDlgUnit, sal_True ); aMtrFldShadowX.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); aMtrFldShadowY.SetSpinSize( eDlgUnit == FUNIT_MM ? 50 : 10 ); } @@ -854,7 +854,7 @@ void SvxFontWorkDialog::SetColorTable(const XColorTable* pTable) } } -void SvxFontWorkDialog::SetActive(BOOL /*bActivate*/) +void SvxFontWorkDialog::SetActive(sal_Bool /*bActivate*/) { } @@ -872,7 +872,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, XFormTextAdjust eAdjust = XFT_AUTOSIZE; aAttr.Put(rOldObj.GetMergedItemSet()); - + const XFormTextStdFormItem& rOldForm = (const XFormTextStdFormItem&) aAttr.Get(XATTR_FORMTXTSTDFORM); @@ -953,8 +953,8 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, basegfx::B2DPolyPolygon aPolyPolygon; basegfx::B2DPolygon aLine; long nR = aRect.GetWidth() / 2; - basegfx::B2DPolygon aTopArc(XPolygon(aCenter, -nR, nR, 50, 1750, FALSE).getB2DPolygon()); - basegfx::B2DPolygon aBottomArc(XPolygon(aCenter, -nR, nR, 1850, 3550, FALSE).getB2DPolygon()); + basegfx::B2DPolygon aTopArc(XPolygon(aCenter, -nR, nR, 50, 1750, sal_False).getB2DPolygon()); + basegfx::B2DPolygon aBottomArc(XPolygon(aCenter, -nR, nR, 1850, 3550, sal_False).getB2DPolygon()); // Close Polygon aTopArc.setClosed(true); @@ -984,7 +984,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, if ( eForm == XFTFORM_BUTTON4 ) { - basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 950, 2650, FALSE).getB2DPolygon()); + basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 950, 2650, sal_False).getB2DPolygon()); aNewArc.setClosed(true); aPolyPolygon.append(aNewArc); eAdjust = XFT_CENTER; @@ -1007,7 +1007,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, if ( eForm == XFTFORM_BUTTON4 ) { - basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 2750, 850, FALSE).getB2DPolygon()); + basegfx::B2DPolygon aNewArc(XPolygon(aCenter, -nR, nR, 2750, 850, sal_False).getB2DPolygon()); aNewArc.setClosed(true); aPolyPolygon.append(aNewArc); } @@ -1041,7 +1041,7 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, rView.BegUndo( SVX_RESSTR( RID_SVXSTR_FONTWORK_UNDOCREATE ) ); OutlinerParaObject* pPara = rOldObj.GetOutlinerParaObject(); - BOOL bHide = TRUE; + sal_Bool bHide = sal_True; if ( pPara != NULL ) { @@ -1049,9 +1049,9 @@ void SvxFontWorkDialog::CreateStdFormObj(SdrView& rView, SdrPageView& rPV, pNewObj->SetOutlinerParaObject(pPara); } else - bHide = FALSE; + bHide = sal_False; - rView.ReplaceObjectAtView(&rOldObj, rPV, pNewObj, TRUE); + rView.ReplaceObjectAtView(&rOldObj, rPV, pNewObj, sal_True); pNewObj->SetLayer(rOldObj.GetLayer()); aAttr.Put(XFormTextHideFormItem(bHide)); aAttr.Put(XFormTextAdjustItem(eAdjust)); @@ -1090,12 +1090,12 @@ void SvxFontWorkDialog::ApplyImageList() { ResMgr* _pMgr = &DIALOG_MGR(); - USHORT nBitmapResId = RID_SVXBMP_FONTWORK_FORM1; - USHORT nTextResId = RID_SVXSTR_FONTWORK_FORM1; + sal_uInt16 nBitmapResId = RID_SVXBMP_FONTWORK_FORM1; + sal_uInt16 nTextResId = RID_SVXSTR_FONTWORK_FORM1; bool bInit = aFormSet.GetItemCount() == 0; - USHORT i; + sal_uInt16 i; for( i = 1; i < 13; i++, nTextResId++, nBitmapResId++ ) { if( bInit ) diff --git a/svx/source/dialog/fontwork.hrc b/svx/source/dialog/fontwork.hrc index 085c9f1324..085c9f1324 100644..100755 --- a/svx/source/dialog/fontwork.hrc +++ b/svx/source/dialog/fontwork.hrc diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src index 893674bf02..076f95a82e 100644..100755 --- a/svx/source/dialog/fontwork.src +++ b/svx/source/dialog/fontwork.src @@ -34,7 +34,7 @@ // RID_SVXDLG_FONTWORK --------------------------------------------------- DockingWindow RID_SVXDLG_FONTWORK { - HelpId = SID_FONTWORK ; + HelpId = CMD_SID_FONTWORK ; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; @@ -164,6 +164,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_DISTANCE { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 85 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -188,6 +189,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_TEXTSTART { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 100 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -261,6 +263,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_SHADOW_X { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 144 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -285,6 +288,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_SHADOW_Y { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 159 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -302,6 +306,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; ListBox CLB_SHADOW_COLOR { + HelpID = "svx:ListBox:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 174 ) ; Size = MAP_APPFONT ( 71 , 60 ) ; diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index 6074b40ba2..1f3887ae92 100644..100755 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -715,7 +715,7 @@ inline Point lclToMapUnit( long nSubXPos, long nSubYPos ) /** Returns a polygon constructed from a vector of points. */ inline Polygon lclCreatePolygon( const PointVec& rPoints ) { - return Polygon( static_cast< USHORT >( rPoints.size() ), &rPoints[ 0 ] ); + return Polygon( static_cast< sal_uInt16 >( rPoints.size() ), &rPoints[ 0 ] ); } /** Returns a polygon constructed from the four passed points. */ @@ -1133,9 +1133,9 @@ void Style::Set( const SvxBorderLine& rBorder, double fScale, sal_uInt16 nMaxWid { maColor = rBorder.GetColor(); - USHORT nPrim = rBorder.GetOutWidth(); - USHORT nDist = rBorder.GetDistance(); - USHORT nSecn = rBorder.GetInWidth(); + sal_uInt16 nPrim = rBorder.GetOutWidth(); + sal_uInt16 nDist = rBorder.GetDistance(); + sal_uInt16 nSecn = rBorder.GetInWidth(); if( !nSecn ) // no or single frame border { diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx index e778abca89..e778abca89 100644..100755 --- a/svx/source/dialog/framelinkarray.cxx +++ b/svx/source/dialog/framelinkarray.cxx diff --git a/svx/source/dialog/frmdirlbox.cxx b/svx/source/dialog/frmdirlbox.cxx index 03b1eec8a2..03b1eec8a2 100644..100755 --- a/svx/source/dialog/frmdirlbox.cxx +++ b/svx/source/dialog/frmdirlbox.cxx diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index cc26be12c9..bedb2cc61b 100644..100755 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -108,7 +108,7 @@ FrameSelFlags lclGetFlagFromType( FrameBorderType eBorder ) } /** Converts an SvxBorderLine line width (in twips) to a pixel line width. */ -inline sal_uInt16 lclGetPixel( USHORT nWidth ) +inline sal_uInt16 lclGetPixel( sal_uInt16 nWidth ) { // convert all core styles expect 0 to a visible UI style (at least 1 pixel), map 1pt to 1pixel return nWidth ? std::min< sal_uInt16 >( std::max< sal_uInt16 >( (nWidth + 5) / 20, 1 ), FRAMESEL_GEOM_WIDTH ) : 0; @@ -216,7 +216,7 @@ void FrameBorder::SetKeyboardNeighbors( meKeyBottom = eBottom; } -FrameBorderType FrameBorder::GetKeyboardNeighbor( USHORT nKeyCode ) const +FrameBorderType FrameBorder::GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const { FrameBorderType eBorder = FRAMEBORDER_NONE; switch( nKeyCode ) @@ -423,7 +423,7 @@ void FrameSelectorImpl::InitBorderGeometry() aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Bottom() - nDiagFocusOffsY ) ); aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Bottom() + mnFocusOffs ) ); aFocusVec.push_back( Point( aRect.Right() - nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs ) ); - maTLBR.AddFocusPolygon( Polygon( static_cast< USHORT >( aFocusVec.size() ), &aFocusVec[ 0 ] ) ); + maTLBR.AddFocusPolygon( Polygon( static_cast< sal_uInt16 >( aFocusVec.size() ), &aFocusVec[ 0 ] ) ); aFocusVec.clear(); aFocusVec.push_back( Point( aRect.Right() + mnFocusOffs, aRect.Top() + nDiagFocusOffsY ) ); @@ -432,7 +432,7 @@ void FrameSelectorImpl::InitBorderGeometry() aFocusVec.push_back( Point( aRect.Left() - mnFocusOffs, aRect.Bottom() - nDiagFocusOffsY ) ); aFocusVec.push_back( Point( aRect.Left() - mnFocusOffs, aRect.Bottom() + mnFocusOffs ) ); aFocusVec.push_back( Point( aRect.Left() + nDiagFocusOffsX, aRect.Bottom() + mnFocusOffs ) ); - maBLTR.AddFocusPolygon( Polygon( static_cast< USHORT >( aFocusVec.size() ), &aFocusVec[ 0 ] ) ); + maBLTR.AddFocusPolygon( Polygon( static_cast< sal_uInt16 >( aFocusVec.size() ), &aFocusVec[ 0 ] ) ); } } @@ -574,7 +574,7 @@ void FrameSelectorImpl::DrawArrows( const FrameBorder& rBorder ) long nTLPos = 0; long nBRPos = mnCtrlSize - mnArrowSize; Point aPos1, aPos2; - USHORT nImgId1 = 0, nImgId2 = 0; + sal_uInt16 nImgId1 = 0, nImgId2 = 0; switch( rBorder.GetType() ) { case FRAMEBORDER_LEFT: @@ -603,7 +603,7 @@ void FrameSelectorImpl::DrawArrows( const FrameBorder& rBorder ) } // Arrow or marker? Do not draw arrows into disabled control. - USHORT nSelectAdd = (mrFrameSel.IsEnabled() && rBorder.IsSelected()) ? 0 : 8; + sal_uInt16 nSelectAdd = (mrFrameSel.IsEnabled() && rBorder.IsSelected()) ? 0 : 8; maVirDev.DrawImage( aPos1, maILArrows.GetImage( nImgId1 + nSelectAdd ) ); maVirDev.DrawImage( aPos2, maILArrows.GetImage( nImgId2 + nSelectAdd ) ); } @@ -697,7 +697,7 @@ void FrameSelectorImpl::DrawAllTrackingRects() aPPoly.Insert( Polygon( Rectangle( maVirDevPos, maVirDev.GetOutputSizePixel() ) ) ); aPPoly.Optimize( POLY_OPTIMIZE_CLOSE ); - for( USHORT nIdx = 0, nCount = aPPoly.Count(); nIdx < nCount; ++nIdx ) + for( sal_uInt16 nIdx = 0, nCount = aPPoly.Count(); nIdx < nCount; ++nIdx ) mrFrameSel.InvertTracking( aPPoly.GetObject( nIdx ), SHOWTRACK_SMALL | SHOWTRACK_WINDOW ); } @@ -879,7 +879,7 @@ void FrameSelector::HideAllBorders() mxImpl->SetBorderState( **aIt, FRAMESTATE_HIDE ); } -bool FrameSelector::GetVisibleWidth( USHORT& rnPrim, USHORT& rnDist, USHORT& rnSecn, +bool FrameSelector::GetVisibleWidth( sal_uInt16& rnPrim, sal_uInt16& rnDist, sal_uInt16& rnSecn, SvxBorderStyle& rnStyle ) const { VisFrameBorderCIter aIt( mxImpl->maEnabBorders ); @@ -961,7 +961,7 @@ void FrameSelector::SelectAllVisibleBorders( bool bSelect ) mxImpl->SelectBorder( **aIt, bSelect ); } -void FrameSelector::SetStyleToSelection( USHORT nPrim, USHORT nDist, USHORT nSecn, +void FrameSelector::SetStyleToSelection( sal_uInt16 nPrim, sal_uInt16 nDist, sal_uInt16 nSecn, SvxBorderStyle nStyle ) { mxImpl->maCurrStyle.SetOutWidth( nPrim ); @@ -1133,7 +1133,7 @@ void FrameSelector::KeyInput( const KeyEvent& rKEvt ) KeyCode aKeyCode = rKEvt.GetKeyCode(); if( !aKeyCode.GetModifier() ) { - USHORT nCode = aKeyCode.GetCode(); + sal_uInt16 nCode = aKeyCode.GetCode(); switch( nCode ) { case KEY_SPACE: diff --git a/svx/source/dialog/frmsel.src b/svx/source/dialog/frmsel.src index 4f85f5eff9..4f85f5eff9 100644..100755 --- a/svx/source/dialog/frmsel.src +++ b/svx/source/dialog/frmsel.src diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 8f2a0cb735..2841dad023 100644..100755 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -40,12 +40,12 @@ #include <svx/graphctl.hxx> #include "GraphCtlAccessibleContext.hxx" -#include "xoutbmp.hxx" +#include "svx/xoutbmp.hxx" #include <svx/svxids.hrc> #include <svx/svdpage.hxx> // #i72889# -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" void GraphCtrlUserCall::Changed( const SdrObject& rObj, SdrUserCallType eType, const Rectangle& /*rOldBoundRect*/ ) { @@ -70,8 +70,8 @@ GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) : aMap100 ( MAP_100TH_MM ), eObjKind ( OBJ_NONE ), nPolyEdit ( 0 ), - bEditMode ( FALSE ), - bSdrMode ( FALSE ), + bEditMode ( sal_False ), + bSdrMode ( sal_False ), mpAccContext ( NULL ), pModel ( NULL ), pView ( NULL ) @@ -83,7 +83,7 @@ GraphCtrl::GraphCtrl( Window* pParent, const WinBits nWinBits ) : SetWinStyle( nWinBits ); - EnableRTL( FALSE ); + EnableRTL( sal_False ); } GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) : @@ -92,9 +92,9 @@ GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) : nWinStyle ( 0 ), eObjKind ( OBJ_NONE ), nPolyEdit ( 0 ), - bEditMode ( FALSE ), - bSdrMode ( FALSE ), - bAnim ( FALSE ), + bEditMode ( sal_False ), + bSdrMode ( sal_False ), + bAnim ( sal_False ), mpAccContext ( NULL ), pModel ( NULL ), pView ( NULL ) @@ -103,7 +103,7 @@ GraphCtrl::GraphCtrl( Window* pParent, const ResId& rResId ) : aUpdateTimer.SetTimeout( 500 ); aUpdateTimer.SetTimeoutHdl( LINK( this, GraphCtrl, UpdateHdl ) ); aUpdateTimer.Start(); - EnableRTL( FALSE ); + EnableRTL( sal_False ); } GraphCtrl::~GraphCtrl() @@ -165,11 +165,11 @@ void GraphCtrl::InitSdrModel() // Creating a View pView = new GraphCtrlView( pModel, this ); pView->SetWorkArea( Rectangle( Point(), aGraphSize ) ); - pView->EnableExtendedMouseEventDispatcher( TRUE ); + pView->EnableExtendedMouseEventDispatcher( sal_True ); pView->ShowSdrPage(pView->GetModel()->GetPage(0)); - pView->SetFrameDragSingles( TRUE ); + pView->SetFrameDragSingles( sal_True ); pView->SetMarkedPointsSmooth( SDRPATHSMOOTH_SYMMETRIC ); - pView->SetEditMode( TRUE ); + pView->SetEditMode( sal_True ); // #i72889# set neeeded flags pView->SetPagePaintingAllowed(false); @@ -181,7 +181,7 @@ void GraphCtrl::InitSdrModel() mpAccContext->setModelAndView (pModel, pView); } -void GraphCtrl::SetGraphic( const Graphic& rGraphic, BOOL bNewModel ) +void GraphCtrl::SetGraphic( const Graphic& rGraphic, sal_Bool bNewModel ) { // If possible we dither bitmaps for the display if ( !bAnim && ( rGraphic.GetType() == GRAPHIC_BITMAP ) ) @@ -310,7 +310,7 @@ void GraphCtrl::MarkListHasChanged() void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) { KeyCode aCode( rKEvt.GetKeyCode() ); - BOOL bProc = FALSE; + sal_Bool bProc = sal_False; switch ( aCode.GetCode() ) { @@ -320,7 +320,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) if ( bSdrMode ) { pView->DeleteMarked(); - bProc = TRUE; + bProc = sal_True; if( !pView->AreObjectsMarked() ) ((Dialog*)GetParent())->GrabFocusToFirstControl(); } @@ -353,7 +353,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) { ((Dialog*)GetParent())->GrabFocusToFirstControl(); } - bProc = TRUE; + bProc = sal_True; } } break; @@ -374,7 +374,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) pView->UnmarkAllObj(); pView->MarkNextObj (bForward); } - bProc = TRUE; + bProc = sal_True; } else if(aCode.IsMod1()) { @@ -397,7 +397,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) { // mark last object pView->UnmarkAllObj(); - pView->MarkNextObj(FALSE); + pView->MarkNextObj(sal_False); bProc = true; } @@ -409,7 +409,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) if ( aCode.IsMod1() ) { pView->UnmarkAllObj(); - pView->MarkNextObj(TRUE); + pView->MarkNextObj(sal_True); bProc = true; } @@ -525,13 +525,13 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) if(pView->IsDragObj()) { bool bWasNoSnap = rDragStat.IsNoSnap(); - BOOL bWasSnapEnabled = pView->IsSnapEnabled(); + sal_Bool bWasSnapEnabled = pView->IsSnapEnabled(); // switch snapping off if(!bWasNoSnap) - ((SdrDragStat&)rDragStat).SetNoSnap(TRUE); + ((SdrDragStat&)rDragStat).SetNoSnap(sal_True); if(bWasSnapEnabled) - pView->SetSnapEnabled(FALSE); + pView->SetSnapEnabled(sal_False); pView->MovAction(aEndPoint); pView->EndDragObj(); @@ -604,7 +604,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt ) } } - bProc = TRUE; + bProc = sal_True; } } } @@ -721,20 +721,20 @@ SdrObject* GraphCtrl::GetSelectedSdrObject() const return pSdrObj; } -void GraphCtrl::SetEditMode( const BOOL _bEditMode ) +void GraphCtrl::SetEditMode( const sal_Bool _bEditMode ) { if ( bSdrMode ) { bEditMode = _bEditMode; pView->SetEditMode( bEditMode ); eObjKind = OBJ_NONE; - pView->SetCurrentObj( sal::static_int_cast< UINT16 >( eObjKind ) ); + pView->SetCurrentObj( sal::static_int_cast< sal_uInt16 >( eObjKind ) ); } else - bEditMode = FALSE; + bEditMode = sal_False; } -void GraphCtrl::SetPolyEditMode( const USHORT _nPolyEdit ) +void GraphCtrl::SetPolyEditMode( const sal_uInt16 _nPolyEdit ) { if ( bSdrMode && ( _nPolyEdit != nPolyEdit ) ) { @@ -749,10 +749,10 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind ) { if ( bSdrMode ) { - bEditMode = FALSE; + bEditMode = sal_False; pView->SetEditMode( bEditMode ); eObjKind = _eObjKind; - pView->SetCurrentObj( sal::static_int_cast< UINT16 >( eObjKind ) ); + pView->SetCurrentObj( sal::static_int_cast< sal_uInt16 >( eObjKind ) ); } else eObjKind = OBJ_NONE; diff --git a/svx/source/dialog/grfflt.cxx b/svx/source/dialog/grfflt.cxx index 7e154d1a9f..12707992ec 100644..100755 --- a/svx/source/dialog/grfflt.cxx +++ b/svx/source/dialog/grfflt.cxx @@ -44,10 +44,10 @@ // - SvxGraphicFilter - // -------------------- -ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ) +sal_uIntPtr SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject ) { const Graphic& rGraphic = rFilterObject.GetGraphic(); - ULONG nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE; + sal_uIntPtr nRet = SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE; if( rGraphic.GetType() == GRAPHIC_BITMAP ) { @@ -61,7 +61,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r case( SID_GRFFILTER_INVERT ): { if( pShell ) - pShell->SetWaitCursor( TRUE ); + pShell->SetWaitCursor( sal_True ); if( rGraphic.IsAnimated() ) { @@ -79,14 +79,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r } if( pShell ) - pShell->SetWaitCursor( FALSE ); + pShell->SetWaitCursor( sal_False ); } break; case( SID_GRFFILTER_SMOOTH ): { if( pShell ) - pShell->SetWaitCursor( TRUE ); + pShell->SetWaitCursor( sal_True ); if( rGraphic.IsAnimated() ) { @@ -104,14 +104,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r } if( pShell ) - pShell->SetWaitCursor( FALSE ); + pShell->SetWaitCursor( sal_False ); } break; case( SID_GRFFILTER_SHARPEN ): { if( pShell ) - pShell->SetWaitCursor( TRUE ); + pShell->SetWaitCursor( sal_True ); if( rGraphic.IsAnimated() ) { @@ -129,14 +129,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r } if( pShell ) - pShell->SetWaitCursor( FALSE ); + pShell->SetWaitCursor( sal_False ); } break; case( SID_GRFFILTER_REMOVENOISE ): { if( pShell ) - pShell->SetWaitCursor( TRUE ); + pShell->SetWaitCursor( sal_True ); if( rGraphic.IsAnimated() ) { @@ -154,14 +154,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r } if( pShell ) - pShell->SetWaitCursor( FALSE ); + pShell->SetWaitCursor( sal_False ); } break; case( SID_GRFFILTER_SOBEL ): { if( pShell ) - pShell->SetWaitCursor( TRUE ); + pShell->SetWaitCursor( sal_True ); if( rGraphic.IsAnimated() ) { @@ -179,7 +179,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r } if( pShell ) - pShell->SetWaitCursor( FALSE ); + pShell->SetWaitCursor( sal_False ); } break; @@ -188,7 +188,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, FALSE, RID_SVX_GRFFILTER_DLG_MOSAIC); + AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterMosaic( pWindow, rGraphic, 4, 4, sal_False, RID_SVX_GRFFILTER_DLG_MOSAIC); DBG_ASSERT(aDlg, "Dialogdiet fail!"); if( aDlg->Execute() == RET_OK ) aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); @@ -228,7 +228,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r case( SID_GRFFILTER_POPART ): { if( pShell ) - pShell->SetWaitCursor( TRUE ); + pShell->SetWaitCursor( sal_True ); if( rGraphic.IsAnimated() ) { @@ -246,7 +246,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r } if( pShell ) - pShell->SetWaitCursor( FALSE ); + pShell->SetWaitCursor( sal_False ); } break; @@ -269,7 +269,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { - AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterSolarize( pWindow, rGraphic, 128, FALSE, RID_SVX_GRFFILTER_DLG_SOLARIZE ); + AbstractGraphicFilterDialog* aDlg = pFact->CreateGraphicFilterSolarize( pWindow, rGraphic, 128, sal_False, RID_SVX_GRFFILTER_DLG_SOLARIZE ); DBG_ASSERT(aDlg, "Dialogdiet fail!"); if( aDlg->Execute() == RET_OK ) aGraphic = aDlg->GetFilteredGraphic( rGraphic, 1.0, 1.0 ); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index ee074a36a6..2fcc00fa0b 100644..100755 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -49,9 +49,9 @@ #include <svx/hdft.hxx> #include <svx/pageitem.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> -#include "htmlmode.hxx" +#include "svx/htmlmode.hxx" #include <editeng/brshitem.hxx> #include <editeng/lrspitem.hxx> @@ -71,7 +71,7 @@ static const long MINBODY = 56; // 1mm in twips rounded static const long DEF_DIST_WRITER = 500; // 5mm (Writer) static const long DEF_DIST_CALC = 250; // 2.5mm (Calc) -static USHORT pRanges[] = +static sal_uInt16 pRanges[] = { SID_ATTR_BRUSH, SID_ATTR_BRUSH, SID_ATTR_BORDER_OUTER, SID_ATTR_BORDER_OUTER, @@ -92,7 +92,7 @@ static USHORT pRanges[] = // returns the Which values to the range -USHORT* SvxHeaderPage::GetRanges() +sal_uInt16* SvxHeaderPage::GetRanges() { return pRanges; } @@ -106,7 +106,7 @@ SfxTabPage* SvxHeaderPage::Create( Window* pParent, const SfxItemSet& rSet ) //------------------------------------------------------------------------ -USHORT* SvxFooterPage::GetRanges() +sal_uInt16* SvxFooterPage::GetRanges() { return pRanges; } @@ -138,10 +138,11 @@ SvxFooterPage::SvxFooterPage( Window* pParent, const SfxItemSet& rAttr ) : // ----------------------------------------------------------------------- -SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, USHORT nSetId ) : +SvxHFPage::SvxHFPage( Window* pParent, sal_uInt16 nResId, const SfxItemSet& rAttr, sal_uInt16 nSetId ) : SfxTabPage( pParent, SVX_RES( nResId ), rAttr ), + aFrm ( this, SVX_RES( FL_FRAME ) ), aTurnOnBox ( this, SVX_RES( CB_TURNON ) ), aCntSharedBox ( this, SVX_RES( CB_SHARED ) ), aLMLbl ( this, SVX_RES( FT_LMARGIN ) ), @@ -154,18 +155,17 @@ SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, U aHeightFT ( this, SVX_RES( FT_HEIGHT ) ), aHeightEdit ( this, SVX_RES( ED_HEIGHT ) ), aHeightDynBtn ( this, SVX_RES( CB_HEIGHT_DYN ) ), - aFrm ( this, SVX_RES( FL_FRAME ) ), aBspWin ( this, SVX_RES( WN_BSP ) ), aBackgroundBtn ( this, SVX_RES( BTN_EXTRAS ) ), nId ( nSetId ), pBBSet ( NULL ), - bDisableQueryBox ( FALSE ), - bEnableBackgroundSelector ( TRUE ) + bDisableQueryBox ( sal_False ), + bEnableBackgroundSelector ( sal_True ) { InitHandler(); - aBspWin.EnableRTL( FALSE ); + aBspWin.EnableRTL( sal_False ); // This Page needs ExchangeSupport SetExchangeSupport(); @@ -178,6 +178,20 @@ SvxHFPage::SvxHFPage( Window* pParent, USHORT nResId, const SfxItemSet& rAttr, U SetFieldUnit( aHeightEdit, eFUnit ); SetFieldUnit( aLMEdit, eFUnit ); SetFieldUnit( aRMEdit, eFUnit ); + + aTurnOnBox.SetAccessibleRelationMemberOf( &aFrm ); + aCntSharedBox.SetAccessibleRelationMemberOf( &aFrm ); + aLMLbl.SetAccessibleRelationMemberOf( &aFrm ); + aLMEdit.SetAccessibleRelationMemberOf( &aFrm ); + aRMLbl.SetAccessibleRelationMemberOf( &aFrm ); + aRMEdit.SetAccessibleRelationMemberOf( &aFrm ); + aDistFT.SetAccessibleRelationMemberOf( &aFrm ); + aDistEdit.SetAccessibleRelationMemberOf( &aFrm ); + aDynSpacingCB.SetAccessibleRelationMemberOf( &aFrm ); + aHeightFT.SetAccessibleRelationMemberOf( &aFrm ); + aHeightEdit.SetAccessibleRelationMemberOf( &aFrm ); + aHeightDynBtn.SetAccessibleRelationMemberOf( &aFrm ); + aBackgroundBtn.SetAccessibleRelationMemberOf(&aFrm); } // ----------------------------------------------------------------------- @@ -189,20 +203,20 @@ SvxHFPage::~SvxHFPage() // ----------------------------------------------------------------------- -BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet ) +sal_Bool SvxHFPage::FillItemSet( SfxItemSet& rSet ) { - const USHORT nWSize = GetWhich( SID_ATTR_PAGE_SIZE ); - const USHORT nWLRSpace = GetWhich( SID_ATTR_LRSPACE ); - const USHORT nWULSpace = GetWhich( SID_ATTR_ULSPACE ); - const USHORT nWOn = GetWhich( SID_ATTR_PAGE_ON ); - const USHORT nWDynamic = GetWhich( SID_ATTR_PAGE_DYNAMIC ); - const USHORT nWDynSpacing = GetWhich( SID_ATTR_HDFT_DYNAMIC_SPACING ); - const USHORT nWShared = GetWhich( SID_ATTR_PAGE_SHARED ); - const USHORT nWBrush = GetWhich( SID_ATTR_BRUSH ); - const USHORT nWBox = GetWhich( SID_ATTR_BORDER_OUTER ); - const USHORT nWBoxInfo = GetWhich( SID_ATTR_BORDER_INNER ); - const USHORT nWShadow = GetWhich( SID_ATTR_BORDER_SHADOW ); - const USHORT aWhichTab[] = { nWSize, nWSize, + const sal_uInt16 nWSize = GetWhich( SID_ATTR_PAGE_SIZE ); + const sal_uInt16 nWLRSpace = GetWhich( SID_ATTR_LRSPACE ); + const sal_uInt16 nWULSpace = GetWhich( SID_ATTR_ULSPACE ); + const sal_uInt16 nWOn = GetWhich( SID_ATTR_PAGE_ON ); + const sal_uInt16 nWDynamic = GetWhich( SID_ATTR_PAGE_DYNAMIC ); + const sal_uInt16 nWDynSpacing = GetWhich( SID_ATTR_HDFT_DYNAMIC_SPACING ); + const sal_uInt16 nWShared = GetWhich( SID_ATTR_PAGE_SHARED ); + const sal_uInt16 nWBrush = GetWhich( SID_ATTR_BRUSH ); + const sal_uInt16 nWBox = GetWhich( SID_ATTR_BORDER_OUTER ); + const sal_uInt16 nWBoxInfo = GetWhich( SID_ATTR_BORDER_INNER ); + const sal_uInt16 nWShadow = GetWhich( SID_ATTR_BORDER_SHADOW ); + const sal_uInt16 aWhichTab[] = { nWSize, nWSize, nWLRSpace, nWLRSpace, nWULSpace, nWULSpace, nWOn, nWOn, @@ -246,15 +260,15 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet ) // Margins SvxLRSpaceItem aLR( nWLRSpace ); - aLR.SetLeft( (USHORT)GetCoreValue( aLMEdit, eUnit ) ); - aLR.SetRight( (USHORT)GetCoreValue( aRMEdit, eUnit ) ); + aLR.SetLeft( (sal_uInt16)GetCoreValue( aLMEdit, eUnit ) ); + aLR.SetRight( (sal_uInt16)GetCoreValue( aRMEdit, eUnit ) ); aSet.Put( aLR ); SvxULSpaceItem aUL( nWULSpace ); if ( nId == SID_ATTR_PAGE_HEADERSET ) - aUL.SetLower( (USHORT)nDist ); + aUL.SetLower( (sal_uInt16)nDist ); else - aUL.SetUpper( (USHORT)nDist ); + aUL.SetUpper( (sal_uInt16)nDist ); aSet.Put( aUL ); // Background and border? @@ -266,7 +280,7 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet ) const SfxPoolItem* pItem; if ( SFX_ITEM_SET == - GetItemSet().GetItemState( GetWhich( nId ), FALSE, &pItem ) ) + GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) ) { _pSet = &( (SvxSetItem*)pItem )->GetItemSet(); @@ -285,7 +299,7 @@ BOOL SvxHFPage::FillItemSet( SfxItemSet& rSet ) SvxSetItem aSetItem( GetWhich( nId ), aSet ); rSet.Put( aSetItem ); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- @@ -301,7 +315,7 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) // Evaluate header-/footer- attributes const SvxSetItem* pSetItem = 0; - if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), FALSE, + if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich(nId), sal_False, (const SfxPoolItem**)&pSetItem ) ) { const SfxItemSet& rHeaderSet = pSetItem->GetItemSet(); @@ -365,9 +379,9 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) if ( !pSetItem ) { - aTurnOnBox.Check( FALSE ); - aHeightDynBtn.Check( TRUE ); - aCntSharedBox.Check( TRUE ); + aTurnOnBox.Check( sal_False ); + aHeightDynBtn.Check( sal_True ); + aCntSharedBox.Check( sal_True ); } TurnOnHdl(0); @@ -383,11 +397,11 @@ void SvxHFPage::Reset( const SfxItemSet& rSet ) const SfxPoolItem* pItem = 0; SfxObjectShell* pShell; - if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, FALSE, &pItem) || + if(SFX_ITEM_SET == rSet.GetItemState(SID_HTML_MODE, sal_False, &pItem) || ( 0 != (pShell = SfxObjectShell::Current()) && 0 != (pItem = pShell->GetItem(SID_HTML_MODE)))) { - USHORT nHtmlMode = 0; + sal_uInt16 nHtmlMode = 0; nHtmlMode = ((SfxUInt16Item*)pItem)->GetValue(); if(nHtmlMode && HTMLMODE_ON) { @@ -429,7 +443,7 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox ) aRMLbl.Enable(); aRMEdit.Enable(); - USHORT nUsage = aBspWin.GetUsage(); + sal_uInt16 nUsage = aBspWin.GetUsage(); if( nUsage == SVX_PAGE_RIGHT || nUsage == SVX_PAGE_LEFT ) aCntSharedBox.Disable(); @@ -439,16 +453,16 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox ) } else { - BOOL bDelete = TRUE; + sal_Bool bDelete = sal_True; - if ( !bDisableQueryBox && pBox && aTurnOnBox.GetSavedValue() == TRUE ) + if ( !bDisableQueryBox && pBox && aTurnOnBox.GetSavedValue() == sal_True ) bDelete = ( QueryBox( this, SVX_RES( RID_SVXQBX_DELETE_HEADFOOT ) ).Execute() == RET_YES ); if ( bDelete ) { aDistFT.Disable(); aDistEdit.Disable(); - aDynSpacingCB.Enable(FALSE); + aDynSpacingCB.Enable(sal_False); aHeightFT.Disable(); aHeightEdit.Disable(); aHeightDynBtn.Disable(); @@ -495,10 +509,10 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG ) if ( !pBBSet ) { // Use only the necessary items for border and background - USHORT nBrush = GetWhich( SID_ATTR_BRUSH ); - USHORT nOuter = GetWhich( SID_ATTR_BORDER_OUTER ); - USHORT nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False ); - USHORT nShadow = GetWhich( SID_ATTR_BORDER_SHADOW ); + sal_uInt16 nBrush = GetWhich( SID_ATTR_BRUSH ); + sal_uInt16 nOuter = GetWhich( SID_ATTR_BORDER_OUTER ); + sal_uInt16 nInner = GetWhich( SID_ATTR_BORDER_INNER, sal_False ); + sal_uInt16 nShadow = GetWhich( SID_ATTR_BORDER_SHADOW ); // Create an empty set pBBSet = new SfxItemSet( *GetItemSet().GetPool(), nBrush, nBrush, @@ -507,12 +521,12 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG ) const SfxPoolItem* pItem; if ( SFX_ITEM_SET == - GetItemSet().GetItemState( GetWhich( nId ), FALSE, &pItem ) ) + GetItemSet().GetItemState( GetWhich( nId ), sal_False, &pItem ) ) // if there is one that is already set, then use this pBBSet->Put( ( (SvxSetItem*)pItem)->GetItemSet() ); if ( SFX_ITEM_SET == - GetItemSet().GetItemState( nInner, FALSE, &pItem ) ) + GetItemSet().GetItemState( nInner, sal_False, &pItem ) ) // The set InfoItem is always required pBBSet->Put( *pItem ); } @@ -536,7 +550,7 @@ IMPL_LINK( SvxHFPage, BackgroundHdl, Button *, EMPTYARG ) //---------------------------------------------------------------- - USHORT nWhich = GetWhich( SID_ATTR_BRUSH ); + sal_uInt16 nWhich = GetWhich( SID_ATTR_BRUSH ); if ( pBBSet->GetItemState( nWhich ) == SFX_ITEM_SET ) { @@ -591,12 +605,12 @@ void SvxHFPage::UpdateExample() void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) { - USHORT nWhich = GetWhich( SID_ATTR_PAGE_HEADERSET ); + sal_uInt16 nWhich = GetWhich( SID_ATTR_PAGE_HEADERSET ); - if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET ) + if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET ) { const SvxSetItem& rSetItem = - (const SvxSetItem&)rSet.Get( nWhich, FALSE ); + (const SvxSetItem&)rSet.Get( nWhich, sal_False ); const SfxItemSet& rTmpSet = rSetItem.GetItemSet(); const SfxBoolItem& rOn = (const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) ); @@ -623,10 +637,10 @@ void SvxHFPage::ResetBackground_Impl( const SfxItemSet& rSet ) nWhich = GetWhich( SID_ATTR_PAGE_FOOTERSET ); - if ( rSet.GetItemState( nWhich, FALSE ) == SFX_ITEM_SET ) + if ( rSet.GetItemState( nWhich, sal_False ) == SFX_ITEM_SET ) { const SvxSetItem& rSetItem = - (const SvxSetItem&)rSet.Get( nWhich, FALSE ); + (const SvxSetItem&)rSet.Get( nWhich, sal_False ); const SfxItemSet& rTmpSet = rSetItem.GetItemSet(); const SfxBoolItem& rOn = (const SfxBoolItem&)rTmpSet.Get( GetWhich( SID_ATTR_PAGE_ON ) ); @@ -709,7 +723,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) aBspWin.SetBottom( 0 ); } - USHORT nUsage = SVX_PAGE_ALL; + sal_uInt16 nUsage = SVX_PAGE_ALL; pItem = GetItem( rSet, SID_ATTR_PAGE ); if ( pItem ) @@ -735,7 +749,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) const SvxSetItem* pSetItem = 0; if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_HEADERSET ), - FALSE, + sal_False, (const SfxPoolItem**)&pSetItem ) ) { const SfxItemSet& rHeaderSet = pSetItem->GetItemSet(); @@ -756,7 +770,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) aBspWin.SetHdDist( nDist ); aBspWin.SetHdLeft( rLR.GetLeft() ); aBspWin.SetHdRight( rLR.GetRight() ); - aBspWin.SetHeader( TRUE ); + aBspWin.SetHeader( sal_True ); } else pSetItem = 0; @@ -764,7 +778,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( !pSetItem ) { - aBspWin.SetHeader( FALSE ); + aBspWin.SetHeader( sal_False ); if ( SID_ATTR_PAGE_HEADERSET == nId ) aCntSharedBox.Disable(); @@ -772,7 +786,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) pSetItem = 0; if ( SFX_ITEM_SET == rSet.GetItemState( GetWhich( SID_ATTR_PAGE_FOOTERSET ), - FALSE, + sal_False, (const SfxPoolItem**)&pSetItem ) ) { const SfxItemSet& rFooterSet = pSetItem->GetItemSet(); @@ -793,7 +807,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) aBspWin.SetFtDist( nDist ); aBspWin.SetFtLeft( rLR.GetLeft() ); aBspWin.SetFtRight( rLR.GetRight() ); - aBspWin.SetFooter( TRUE ); + aBspWin.SetFooter( sal_True ); } else pSetItem = 0; @@ -801,7 +815,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( !pSetItem ) { - aBspWin.SetFooter( FALSE ); + aBspWin.SetFooter( sal_False ); if ( SID_ATTR_PAGE_FOOTERSET == nId ) aCntSharedBox.Disable(); @@ -811,7 +825,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( pItem && pItem->ISA(SfxBoolItem) ) { - aBspWin.SetTable( TRUE ); + aBspWin.SetTable( sal_True ); aBspWin.SetHorz( ( (SfxBoolItem*)pItem )->GetValue() ); } @@ -819,7 +833,7 @@ void SvxHFPage::ActivatePage( const SfxItemSet& rSet ) if ( pItem && pItem->ISA(SfxBoolItem) ) { - aBspWin.SetTable( TRUE ); + aBspWin.SetTable( sal_True ); aBspWin.SetVert( ( (SfxBoolItem*)pItem )->GetValue() ); } ResetBackground_Impl( rSet ); diff --git a/svx/source/dialog/hdft.hrc b/svx/source/dialog/hdft.hrc index fe221189fc..fe221189fc 100644..100755 --- a/svx/source/dialog/hdft.hrc +++ b/svx/source/dialog/hdft.hrc diff --git a/svx/source/dialog/hdft.src b/svx/source/dialog/hdft.src index adb89ce3bf..f2f2f7c6d0 100644..100755 --- a/svx/source/dialog/hdft.src +++ b/svx/source/dialog/hdft.src @@ -46,12 +46,14 @@ TabPage RID_SVXPAGE_HEADER Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox CB_TURNON { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_TURNON"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Hea~der on" ; }; CheckBox CB_SHARED { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_SHARED"; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Same ~content left/right" ; @@ -65,6 +67,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_LMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_LMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 46 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -87,6 +90,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_RMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_RMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 62 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -109,6 +113,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_DIST { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_DIST"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 80 ) ; @@ -124,6 +129,7 @@ TabPage RID_SVXPAGE_HEADER }; CheckBox CB_DYNSPACING { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_DYNSPACING"; Pos = MAP_APPFONT ( 12 , 96 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Hide = TRUE; @@ -137,6 +143,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_HEIGHT { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_HEIGHT"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 96 ) ; @@ -154,6 +161,7 @@ TabPage RID_SVXPAGE_HEADER }; CheckBox CB_HEIGHT_DYN { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN"; Pos = MAP_APPFONT ( 12 , 112 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "~AutoFit height" ; @@ -171,6 +179,7 @@ TabPage RID_SVXPAGE_HEADER }; PushButton BTN_EXTRAS { + HelpID = "svx:PushButton:RID_SVXPAGE_HEADER:BTN_EXTRAS"; Pos = MAP_APPFONT ( 12 , 130 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~More..." ; @@ -185,12 +194,14 @@ TabPage RID_SVXPAGE_FOOTER Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox CB_TURNON { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_TURNON"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "~Footer on" ; }; CheckBox CB_SHARED { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_SHARED"; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Same ~content left/right" ; @@ -204,6 +215,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_LMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_LMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 46 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -226,6 +238,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_RMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_RMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 62 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -247,6 +260,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_DIST { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_DIST"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 80 ) ; @@ -262,6 +276,7 @@ TabPage RID_SVXPAGE_FOOTER }; CheckBox CB_DYNSPACING { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_DYNSPACING"; Pos = MAP_APPFONT ( 12 , 96 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Hide = TRUE; @@ -276,6 +291,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_HEIGHT { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_HEIGHT"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 96 ) ; @@ -293,6 +309,7 @@ TabPage RID_SVXPAGE_FOOTER }; CheckBox CB_HEIGHT_DYN { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN"; Pos = MAP_APPFONT ( 12 , 112 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "~AutoFit height" ; @@ -311,6 +328,7 @@ TabPage RID_SVXPAGE_FOOTER }; PushButton BTN_EXTRAS { + HelpID = "svx:PushButton:RID_SVXPAGE_FOOTER:BTN_EXTRAS"; Pos = MAP_APPFONT ( 12 , 130 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~More..." ; diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index e21927f0b9..ee787d076e 100644..100755 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- #include <vcl/settings.hxx> #include <unotools/viewoptions.hxx> -#include "hyperdlg.hxx" +#include "svx/hyperdlg.hxx" #include <svx/svxdlg.hxx> #include <sfx2/app.hxx> #include <sfx2/sfxsids.hrc> @@ -58,7 +58,7 @@ struct MyStruct SfxWorkWindow* pWorkWin; }; -SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId, +SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ), @@ -71,7 +71,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId, mpDlg = pFact->CreateSvxHpLinkDlg( _pParent, pBindings, SID_HYPERLINK_DIALOG ); DBG_ASSERT(mpDlg, "Dialogdiet fail!"); pWindow = mpDlg->GetWindow(); - ((MyStruct*)pImp)->bVisible = FALSE; + ((MyStruct*)pImp)->bVisible = sal_False; Window* pTopWindow = 0; if ( pInfo->aSize.Width() != 0 && pInfo->aSize.Height() != 0 && @@ -92,7 +92,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* _pParent, USHORT nId, eChildAlignment = SFX_ALIGN_NOALIGNMENT; - SetHideNotDelete( TRUE ); + SetHideNotDelete( sal_True ); } SfxChildWinInfo SvxHlinkDlgWrapper::GetInfo() const diff --git a/svx/source/dialog/hyprdlg.hxx b/svx/source/dialog/hyprdlg.hxx new file mode 100755 index 0000000000..9f7afb0cab --- /dev/null +++ b/svx/source/dialog/hyprdlg.hxx @@ -0,0 +1,143 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVX_DLG_HYPERDLG_HXX +#define _SVX_DLG_HYPERDLG_HXX + +#include <vcl/combobox.hxx> +#include <vcl/toolbox.hxx> +#include <vcl/menu.hxx> +#include <svtools/stdctrl.hxx> +#include <sfx2/ctrlitem.hxx> +#include <svl/srchcfg.hxx> +#include <sfx2/tbxctrl.hxx> + +class SvxHyperlinkDlg; +class SfxViewFrame; + +/*-------------------------------------------------------------------- + Beschreibung: + --------------------------------------------------------------------*/ + +class HyperCombo : public ComboBox +{ + SvxHyperlinkDlg *pDlg; + long nMaxWidth; + long nMinWidth; + long nRatio; + + virtual long Notify( NotifyEvent& rNEvt ); + virtual long PreNotify( NotifyEvent& rNEvt ); + +public: + HyperCombo( SvxHyperlinkDlg* pDialog, const ResId& rResId ); + + inline void SetRatio( long nR ) { nRatio = nR; } + inline long GetRatio() { return nRatio; } + long CalcResizeWidth( long nW ); + inline long GetResizeWidth() { return (nMaxWidth - nMinWidth); } + void DoResize( long nW ); +}; + +class HyperFixedText : public FixedInfo +{ + SvxHyperlinkDlg *pDlg; + +public: + HyperFixedText( SvxHyperlinkDlg* pDialog, const ResId& rResId ); + +}; + +/*-------------------------------------------------------------------- + Beschreibung: Dialog zum Einfgen/Žndern eines Hyperlink + --------------------------------------------------------------------*/ + +class SvxHyperlinkDlg : public ToolBox, public SfxControllerItem +{ + friend class HyperCombo; + friend class HyperFixedText; + using ToolBox::StateChanged; + +private: + SfxStatusForwarder aForwarder; + SfxStatusForwarder aHyperlinkDlgForward; + HyperCombo aNameCB; + HyperFixedText aUrlFT; + HyperCombo aUrlCB; + + SvxSearchConfig aSearchConfig; + + String sAddress; + String sExplorer; + String sOldName; + String sSearchTitle; + PopupMenu aLinkPopup; + PopupMenu *pTargetMenu; + sal_Bool bNoDoc; + sal_Bool bSend; + sal_Bool bHasOldName; + long nMaxWidth; + long nMinWidth; + long nMaxHeight; + sal_Bool bHtmlMode; + + SfxImageManager* mpManager; + + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + // DockingWindow + virtual void Resize(); + virtual void Resizing(Size& rSize); + + // Drag&Drop + sal_Bool GetDragData(sal_uInt16 nItem, sal_uIntPtr nDDFormatId, String& rBuffer); + + DECL_LINK(TBClickHdl, ToolBox *); + DECL_LINK(TBSelectHdl, ToolBox *); + DECL_LINK(DropdownClick, ToolBox * ); + DECL_LINK(LinkPopupSelectHdl, Menu *); + DECL_LINK(SearchPopupSelectHdl, Menu *); + DECL_LINK(ComboSelectHdl, ComboBox *); + DECL_LINK(ComboModifyHdl, ComboBox *); + DECL_LINK(BookmarkFoundHdl, String *); + + void OpenDoc( const String& rURL, SfxViewFrame* pViewFrame ); + void EnableLink(); + void SendToApp(sal_uInt16 nType); + void AddToHistory(const String& rName, const String& rURL); + void TargetMenu(const String& rSelEntry, sal_Bool bExecute); + String GetSelTarget(); + + void SetImages(); +public: + SvxHyperlinkDlg(SfxBindings *pBindings, Window* pWindow); + ~SvxHyperlinkDlg(); +}; + + +#endif // _SVX_DLG_HYPERDLG_HXX + diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 86f80e405c..130da44ea3 100644..100755 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -63,7 +63,7 @@ #include <comphelper/processfactory.hxx> #define _IMAPDLG_PRIVATE -#include "imapdlg.hxx" +#include "svx/imapdlg.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> @@ -71,7 +71,7 @@ #include "imapdlg.hrc" #include "imapwnd.hxx" #include "imapimp.hxx" -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/svdtrans.hxx> #include <svx/svdopath.hxx> #include <vcl/svapp.hxx> @@ -111,13 +111,13 @@ inline String GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode cS // ControllerItem -SvxIMapDlgItem::SvxIMapDlgItem( USHORT _nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) : +SvxIMapDlgItem::SvxIMapDlgItem( sal_uInt16 _nId, SvxIMapDlg& rIMapDlg, SfxBindings& rBindings ) : SfxControllerItem ( _nId, rBindings ), rIMap ( rIMapDlg ) { } -void SvxIMapDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, +void SvxIMapDlgItem::StateChanged( sal_uInt16 nSID, SfxItemState /*eState*/, const SfxPoolItem* pItem ) { if ( ( nSID == SID_IMAP_EXEC ) && pItem ) @@ -131,7 +131,7 @@ void SvxIMapDlgItem::StateChanged( USHORT nSID, SfxItemState /*eState*/, } } -SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( Window* _pParent, USHORT nId, +SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) @@ -196,7 +196,7 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, aTbxIMapDlg1.SetOutStyle( aMiscOptions.GetToolboxStyle() ); aTbxIMapDlg1.SetSizePixel( aTbxIMapDlg1.CalcWindowSizePixel() ); aTbxIMapDlg1.SetSelectHdl( LINK( this, SvxIMapDlg, TbxClickHdl ) ); - aTbxIMapDlg1.CheckItem( TBI_SELECT, TRUE ); + aTbxIMapDlg1.CheckItem( TBI_SELECT, sal_True ); TbxClickHdl( &aTbxIMapDlg1 ); SetMinOutputSizePixel( aLastSize = GetOutputSizePixel() ); @@ -211,16 +211,16 @@ SvxIMapDlg::SvxIMapDlg( SfxBindings *_pBindings, SfxChildWindow *pCW, aEdtText.Disable(); maFtTarget.Disable(); maCbbTarget.Disable(); - pOwnData->bExecState = FALSE; + pOwnData->bExecState = sal_False; Resize(); pOwnData->aTimer.SetTimeout( 100 ); pOwnData->aTimer.SetTimeoutHdl( LINK( this, SvxIMapDlg, UpdateHdl ) ); - aTbxIMapDlg1.EnableItem( TBI_ACTIVE, FALSE ); - aTbxIMapDlg1.EnableItem( TBI_MACRO, FALSE ); - aTbxIMapDlg1.EnableItem( TBI_PROPERTY, FALSE ); + aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_False ); + aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_False ); + aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False ); } SvxIMapDlg::~SvxIMapDlg() @@ -255,9 +255,9 @@ void SvxIMapDlg::Resize() } } -BOOL SvxIMapDlg::Close() +sal_Bool SvxIMapDlg::Close() { - BOOL bRet = TRUE; + sal_Bool bRet = sal_True; if ( aTbxIMapDlg1.IsItemEnabled( TBI_APPLY ) ) { @@ -267,12 +267,12 @@ BOOL SvxIMapDlg::Close() if( nRet == RET_YES ) { - SfxBoolItem aBoolItem( SID_IMAP_EXEC, TRUE ); + SfxBoolItem aBoolItem( SID_IMAP_EXEC, sal_True ); GetBindings().GetDispatcher()->Execute( SID_IMAP_EXEC, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L ); } else if( nRet == RET_CANCEL ) - bRet = FALSE; + bRet = sal_False; } else if( pIMapWnd->IsChanged() ) { @@ -283,15 +283,15 @@ BOOL SvxIMapDlg::Close() if( nRet == RET_YES ) bRet = DoSave(); else if( nRet == RET_CANCEL ) - bRet = FALSE; + bRet = sal_False; } - return( bRet ? SfxModelessDialog::Close() : FALSE ); + return( bRet ? SfxModelessDialog::Close() : sal_False ); } // Enabled or disable all Controls -void SvxIMapDlg::SetExecState( BOOL bEnable ) +void SvxIMapDlg::SetExecState( sal_Bool bEnable ) { pOwnData->bExecState = bEnable; } @@ -370,14 +370,14 @@ void SvxIMapDlg::KeyInput( const KeyEvent& rKEvt ) IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) { - USHORT nNewItemId = pTbx->GetCurItemId(); + sal_uInt16 nNewItemId = pTbx->GetCurItemId(); switch( pTbx->GetCurItemId() ) { case( TBI_APPLY ): { URLLoseFocusHdl( NULL ); - SfxBoolItem aBoolItem( SID_IMAP_EXEC, TRUE ); + SfxBoolItem aBoolItem( SID_IMAP_EXEC, sal_True ); GetBindings().GetDispatcher()->Execute( SID_IMAP_EXEC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aBoolItem, 0L ); } @@ -393,8 +393,8 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_SELECT ): { - pTbx->CheckItem( nNewItemId, TRUE ); - pIMapWnd->SetEditMode( TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); + pIMapWnd->SetEditMode( sal_True ); if( pTbx->IsKeyEvent() ) { if((pTbx->GetKeyModifier() & KEY_MOD1) != 0) @@ -407,7 +407,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_RECT ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); pIMapWnd->SetObjKind( OBJ_RECT ); if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) ) { @@ -419,7 +419,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_CIRCLE ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); pIMapWnd->SetObjKind( OBJ_CIRC ); if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) ) { @@ -431,7 +431,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_POLY ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); pIMapWnd->SetObjKind( OBJ_POLY ); if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) ) { @@ -443,7 +443,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_FREEPOLY ): { - pTbx->CheckItem( nNewItemId, TRUE ); + pTbx->CheckItem( nNewItemId, sal_True ); pIMapWnd->SetObjKind( OBJ_FREEFILL ); if( pTbx->IsKeyEvent() && ((pTbx->GetKeyModifier() & KEY_MOD1) != 0) ) { @@ -456,7 +456,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx ) case( TBI_ACTIVE ): { URLLoseFocusHdl( NULL ); - BOOL bNewState = !pTbx->IsItemChecked( TBI_ACTIVE ); + sal_Bool bNewState = !pTbx->IsItemChecked( TBI_ACTIVE ); pTbx->CheckItem( TBI_ACTIVE, bNewState ); pIMapWnd->SetCurrentObjState( !bNewState ); } @@ -550,7 +550,7 @@ void SvxIMapDlg::DoOpen() } } -BOOL SvxIMapDlg::DoSave() +sal_Bool SvxIMapDlg::DoSave() { ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); @@ -560,7 +560,7 @@ BOOL SvxIMapDlg::DoSave() const String aNCSAFilter( DEFINE_CONST_UNICODE( IMAP_NCSA_FILTER ) ); SdrModel* pModel = pIMapWnd->GetSdrModel(); const sal_Bool bChanged = pModel->IsChanged(); - BOOL bRet = false; + sal_Bool bRet = false; aDlg.AddFilter( aCERNFilter, DEFINE_CONST_UNICODE( IMAP_CERN_TYPE ) ); aDlg.AddFilter( aNCSAFilter, DEFINE_CONST_UNICODE( IMAP_NCSA_TYPE ) ); @@ -573,7 +573,7 @@ BOOL SvxIMapDlg::DoSave() { const String aFilter( aDlg.GetCurrentFilter() ); String aExt; - ULONG nFormat; + sal_uIntPtr nFormat; if ( aFilter == aBinFilter ) { @@ -592,7 +592,7 @@ BOOL SvxIMapDlg::DoSave() } else { - return FALSE; + return sal_False; } INetURLObject aURL( aDlg.GetPath() ); @@ -616,7 +616,7 @@ BOOL SvxIMapDlg::DoSave() delete pOStm; pModel->SetChanged( bChanged ); - bRet = TRUE; + bRet = sal_True; } } } @@ -645,10 +645,10 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd ) if ( !rInfo.bOneMarked ) { - aTbxIMapDlg1.CheckItem( TBI_ACTIVE, FALSE ); - aTbxIMapDlg1.EnableItem( TBI_ACTIVE, FALSE ); - aTbxIMapDlg1.EnableItem( TBI_MACRO, FALSE ); - aTbxIMapDlg1.EnableItem( TBI_PROPERTY, FALSE ); + aTbxIMapDlg1.CheckItem( TBI_ACTIVE, sal_False ); + aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_False ); + aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_False ); + aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_False ); aStbStatus.SetItemText( 1, aStr ); aFtURL.Disable(); @@ -663,10 +663,10 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd ) } else { - aTbxIMapDlg1.EnableItem( TBI_ACTIVE, TRUE ); + aTbxIMapDlg1.EnableItem( TBI_ACTIVE, sal_True ); aTbxIMapDlg1.CheckItem( TBI_ACTIVE, !rInfo.bActivated ); - aTbxIMapDlg1.EnableItem( TBI_MACRO, TRUE ); - aTbxIMapDlg1.EnableItem( TBI_PROPERTY, TRUE ); + aTbxIMapDlg1.EnableItem( TBI_MACRO, sal_True ); + aTbxIMapDlg1.EnableItem( TBI_PROPERTY, sal_True ); aFtURL.Enable(); maURLBox.Enable(); @@ -786,8 +786,8 @@ IMPL_LINK( SvxIMapDlg, UpdateHdl, Timer*, EMPTYARG ) SetEditingObject( pOwnData->pUpdateEditingObject ); // After changes => default selection - aTbxIMapDlg1.CheckItem( TBI_SELECT, TRUE ); - pIMapWnd->SetEditMode( TRUE ); + aTbxIMapDlg1.CheckItem( TBI_SELECT, sal_True ); + pIMapWnd->SetEditMode( sal_True ); } // Delete the copied list again in the Update method @@ -805,8 +805,8 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd ) const SdrObject* pObj = pWnd->GetSelectedSdrObject(); const SdrModel* pModel = pWnd->GetSdrModel(); const SdrView* pView = pWnd->GetSdrView(); - const BOOL bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj ); - const BOOL bDrawEnabled = !( bPolyEdit && aTbxIMapDlg1.IsItemChecked( TBI_POLYEDIT ) ); + const sal_Bool bPolyEdit = ( pObj != NULL ) && pObj->ISA( SdrPathObj ); + const sal_Bool bDrawEnabled = !( bPolyEdit && aTbxIMapDlg1.IsItemChecked( TBI_POLYEDIT ) ); aTbxIMapDlg1.EnableItem( TBI_APPLY, pOwnData->bExecState && pWnd->IsChanged() ); @@ -828,7 +828,7 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd ) if ( bPolyEdit ) { - USHORT nId = 0; + sal_uInt16 nId = 0; switch( pWnd->GetPolyEditMode() ) { @@ -839,13 +839,13 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd ) break; } - aTbxIMapDlg1.CheckItem( nId, TRUE ); + aTbxIMapDlg1.CheckItem( nId, sal_True ); } else { - aTbxIMapDlg1.CheckItem( TBI_POLYEDIT, FALSE ); - aTbxIMapDlg1.CheckItem( TBI_POLYMOVE, TRUE ); - aTbxIMapDlg1.CheckItem( TBI_POLYINSERT, FALSE ); + aTbxIMapDlg1.CheckItem( TBI_POLYEDIT, sal_False ); + aTbxIMapDlg1.CheckItem( TBI_POLYMOVE, sal_True ); + aTbxIMapDlg1.CheckItem( TBI_POLYINSERT, sal_False ); pWnd->SetPolyEditMode( 0 ); } diff --git a/svx/source/dialog/imapdlg.hrc b/svx/source/dialog/imapdlg.hrc index 2628486198..2628486198 100644..100755 --- a/svx/source/dialog/imapdlg.hrc +++ b/svx/source/dialog/imapdlg.hrc diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src index f71ac40484..08468d77b3 100644..100755 --- a/svx/source/dialog/imapdlg.src +++ b/svx/source/dialog/imapdlg.src @@ -32,6 +32,7 @@ // RID_SVXDLG_IMAP ---------------------------------------------------- ModelessDialog RID_SVXDLG_IMAP { + HelpID = "svx:ModelessDialog:RID_SVXDLG_IMAP"; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -193,6 +194,7 @@ ModelessDialog RID_SVXDLG_IMAP }; ComboBox CBB_URL { + HelpID = "svx:ComboBox:RID_SVXDLG_IMAP:CBB_URL"; Pos = MAP_APPFONT ( 39 , 23 ) ; Size = MAP_APPFONT ( 225 , 69 ) ; TabStop = TRUE ; @@ -208,6 +210,7 @@ ModelessDialog RID_SVXDLG_IMAP }; Edit EDT_TEXT { + HelpID = "svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 39 , 41 ) ; @@ -226,6 +229,7 @@ ModelessDialog RID_SVXDLG_IMAP // nur temporaer ComboBox RID_SVXCTL_CBB_TARGET { + HelpID = "svx:ComboBox:RID_SVXDLG_IMAP:RID_SVXCTL_CBB_TARGET"; Border = TRUE ; Sort = TRUE ; Pos = MAP_APPFONT ( 213 , 41 ) ; diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx index 51ebf403f9..d6b273958c 100644..100755 --- a/svx/source/dialog/imapimp.hxx +++ b/svx/source/dialog/imapimp.hxx @@ -48,7 +48,7 @@ public: ImageMap aUpdateImageMap; TargetList aUpdateTargetList; void* pUpdateEditingObject; - BOOL bExecState; + sal_Bool bExecState; IMapOwnData( SvxIMapDlg* pIMapDlg ) : pIMap ( pIMapDlg ), pUpdateEditingObject( NULL ) {} }; diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 580c4311a8..68a6e3da08 100644..100755 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -38,7 +38,7 @@ #include <svtools/imappoly.hxx> #include <svl/urlbmk.hxx> -#include <xoutbmp.hxx> +#include <svx/xoutbmp.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include <svx/svxids.hrc> @@ -93,10 +93,10 @@ IMapWindow::~IMapWindow() void IMapWindow::SetImageMap( const ImageMap& rImageMap ) { - ReplaceImageMap( rImageMap, FALSE ); + ReplaceImageMap( rImageMap, sal_False ); } -void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGraphic*/ ) +void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, sal_Bool /*bScaleToGraphic*/ ) { SdrPage* pPage = 0; aIMap = rImageMap; @@ -120,9 +120,9 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGrap } // create new drawing objects - const USHORT nCount(rImageMap.GetIMapObjectCount()); + const sal_uInt16 nCount(rImageMap.GetIMapObjectCount()); - for ( USHORT i(nCount); i > 0; i-- ) + for ( sal_uInt16 i(nCount); i > 0; i-- ) { SdrObject* pNewObj = CreateObj( rImageMap.GetIMapObject( i - 1 ) ); @@ -133,11 +133,11 @@ void IMapWindow::ReplaceImageMap( const ImageMap& rImageMap, BOOL /*bScaleToGrap } } -BOOL IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ) +sal_Bool IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ) { const SdrObject* pSdrObj = GetSelectedSdrObject(); IMapObject* pIMapObj; - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( pSdrObj && ( ( pIMapObj = GetIMapObj( pSdrObj ) ) != NULL ) ) { @@ -145,9 +145,9 @@ BOOL IMapWindow::ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ) pIMapObj->SetAltText( rNewInfo.aMarkAltText ); pIMapObj->SetTarget( rNewInfo.aMarkTarget ); pModel->SetChanged( sal_True ); - UpdateInfo( FALSE ); + UpdateInfo( sal_False ); - bRet = TRUE; + bRet = sal_True; } return bRet; @@ -201,7 +201,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) case( IMAP_OBJ_RECTANGLE ): { IMapRectangleObject* pIMapRectObj = (IMapRectangleObject*) pIMapObj; - Rectangle aDrawRect( pIMapRectObj->GetRectangle( FALSE ) ); + Rectangle aDrawRect( pIMapRectObj->GetRectangle( sal_False ) ); // clipped on CanvasPane aDrawRect.Intersection( aClipRect ); @@ -214,8 +214,8 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) case( IMAP_OBJ_CIRCLE ): { IMapCircleObject* pIMapCircleObj = (IMapCircleObject*) pIMapObj; - const Point aCenter( pIMapCircleObj->GetCenter( FALSE ) ); - const long nRadius = pIMapCircleObj->GetRadius( FALSE ); + const Point aCenter( pIMapCircleObj->GetCenter( sal_False ) ); + const long nRadius = pIMapCircleObj->GetRadius( sal_False ); const Point aOffset( nRadius, nRadius ); Rectangle aCircle( aCenter - aOffset, aCenter + aOffset ); @@ -243,7 +243,7 @@ SdrObject* IMapWindow::CreateObj( const IMapObject* pIMapObj ) } else { - const Polygon& rPoly = pIMapPolyObj->GetPolygon( FALSE ); + const Polygon& rPoly = pIMapPolyObj->GetPolygon( sal_False ); Polygon aDrawPoly( rPoly ); // clipped on CanvasPane @@ -298,7 +298,7 @@ void IMapWindow::InitSdrModel() aSet.Put( XFillColorItem( String(), TRANSCOL ) ); aSet.Put( XFillTransparenceItem( 50 ) ); pView->SetAttributes( aSet ); - pView->SetFrameDragSingles( TRUE ); + pView->SetFrameDragSingles( sal_True ); } void IMapWindow::SdrObjCreated( const SdrObject& rObj ) @@ -309,7 +309,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj ) { SdrRectObj* pRectObj = (SdrRectObj*) &rObj; IMapRectangleObject* pObj = new IMapRectangleObject( pRectObj->GetLogicRect(), - String(), String(), String(), String(), String(), TRUE, FALSE ); + String(), String(), String(), String(), String(), sal_True, sal_False ); pRectObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) ); } @@ -318,11 +318,11 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj ) case( OBJ_CIRC ): { SdrCircObj* pCircObj = (SdrCircObj*) &rObj; - SdrPathObj* pPathObj = (SdrPathObj*) pCircObj->ConvertToPolyObj( FALSE, FALSE ); + SdrPathObj* pPathObj = (SdrPathObj*) pCircObj->ConvertToPolyObj( sal_False, sal_False ); Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L)); delete pPathObj; - IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), String(), String(), String(), String(), String(), TRUE, FALSE ); + IMapPolygonObject* pObj = new IMapPolygonObject( Polygon(aPoly), String(), String(), String(), String(), String(), sal_True, sal_False ); pObj->SetExtraEllipse( aPoly.GetBoundRect() ); pCircObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) ); } @@ -339,7 +339,7 @@ void IMapWindow::SdrObjCreated( const SdrObject& rObj ) if ( rXPolyPoly.count() ) { Polygon aPoly(rXPolyPoly.getB2DPolygon(0L)); - IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, String(), String(), String(), String(), String(), TRUE, FALSE ); + IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, String(), String(), String(), String(), String(), sal_True, sal_False ); pPathObj->InsertUserData( new IMapUserData( IMapObjectPtr(pObj) ) ); } } @@ -361,7 +361,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj ) String aDesc; String aTarget; IMapObjectPtr pIMapObj = pUserData->GetObject(); - BOOL bActive = TRUE; + sal_Bool bActive = sal_True; if ( pIMapObj.get() ) { @@ -377,17 +377,17 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj ) case( OBJ_RECT ): { pUserData->ReplaceObject( IMapObjectPtr(new IMapRectangleObject( ( (const SdrRectObj&) rObj ).GetLogicRect(), - aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE ) ) ); + aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False ) ) ); } break; case( OBJ_CIRC ): { const SdrCircObj& rCircObj = (const SdrCircObj&) rObj; - SdrPathObj* pPathObj = (SdrPathObj*) rCircObj.ConvertToPolyObj( FALSE, FALSE ); + SdrPathObj* pPathObj = (SdrPathObj*) rCircObj.ConvertToPolyObj( sal_False, sal_False ); Polygon aPoly(pPathObj->GetPathPoly().getB2DPolygon(0L)); - IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE ); + IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False ); pObj->SetExtraEllipse( aPoly.GetBoundRect() ); // was only created by us temporarily @@ -407,7 +407,7 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj ) if ( rXPolyPoly.count() ) { Polygon aPoly(rPathObj.GetPathPoly().getB2DPolygon(0L)); - IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, FALSE ); + IMapPolygonObject* pObj = new IMapPolygonObject( aPoly, aURL, aAltText, aDesc, aTarget, String(), bActive, sal_False ); pUserData->ReplaceObject( IMapObjectPtr(pObj) ); } } @@ -422,13 +422,13 @@ void IMapWindow::SdrObjChanged( const SdrObject& rObj ) void IMapWindow::MouseButtonUp(const MouseEvent& rMEvt) { GraphCtrl::MouseButtonUp( rMEvt ); - UpdateInfo( TRUE ); + UpdateInfo( sal_True ); } void IMapWindow::MarkListHasChanged() { GraphCtrl::MarkListHasChanged(); - UpdateInfo( FALSE ); + UpdateInfo( sal_False ); } SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const @@ -439,7 +439,7 @@ SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const if ( Rectangle( Point(), GetGraphicSize() ).IsInside( aPt ) ) { SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); - ULONG nCount; + sal_uIntPtr nCount; if ( pPage && ( ( nCount = pPage->GetObjCount() ) > 0 ) ) { @@ -479,11 +479,11 @@ SdrObject* IMapWindow::GetSdrObj( const IMapObject* pIMapObj ) const { SdrObject* pSdrObj = NULL; SdrPage* pPage = (SdrPage*) pModel->GetPage( 0 ); - ULONG nCount; + sal_uIntPtr nCount; if ( pPage && ( ( nCount = pPage->GetObjCount() ) > 0 ) ) { - for ( ULONG i = 0; i < nCount; i++ ) + for ( sal_uIntPtr i = 0; i < nCount; i++ ) { SdrObject* pTestObj = pPage->GetObj( i ); @@ -506,21 +506,21 @@ void IMapWindow::Command(const CommandEvent& rCEvt) { PopupMenu aMenu( SVX_RES( RID_SVXMN_IMAP ) ); const SdrMarkList& rMarkList = pView->GetMarkedObjectList(); - ULONG nMarked = rMarkList.GetMarkCount(); + sal_uIntPtr nMarked = rMarkList.GetMarkCount(); - aMenu.EnableItem( MN_URL, FALSE ); - aMenu.EnableItem( MN_ACTIVATE, FALSE ); - aMenu.EnableItem( MN_MACRO, FALSE ); + aMenu.EnableItem( MN_URL, sal_False ); + aMenu.EnableItem( MN_ACTIVATE, sal_False ); + aMenu.EnableItem( MN_MACRO, sal_False ); aMenu.EnableItem( MN_MARK_ALL, pModel->GetPage( 0 )->GetObjCount() != pView->GetMarkedObjectCount() ); if ( !nMarked ) { - aMenu.EnableItem( MN_POSITION, FALSE ); - aMenu.EnableItem( MN_FRAME_TO_TOP, FALSE ); - aMenu.EnableItem( MN_MOREFRONT, FALSE ); - aMenu.EnableItem( MN_MOREBACK, FALSE ); - aMenu.EnableItem( MN_FRAME_TO_BOTTOM, FALSE ); - aMenu.EnableItem( MN_DELETE1, FALSE ); + aMenu.EnableItem( MN_POSITION, sal_False ); + aMenu.EnableItem( MN_FRAME_TO_TOP, sal_False ); + aMenu.EnableItem( MN_MOREFRONT, sal_False ); + aMenu.EnableItem( MN_MOREBACK, sal_False ); + aMenu.EnableItem( MN_FRAME_TO_BOTTOM, sal_False ); + aMenu.EnableItem( MN_DELETE1, sal_False ); } else { @@ -528,18 +528,18 @@ void IMapWindow::Command(const CommandEvent& rCEvt) { SdrObject* pSdrObj = GetSelectedSdrObject(); - aMenu.EnableItem( MN_URL, TRUE ); - aMenu.EnableItem( MN_ACTIVATE, TRUE ); - aMenu.EnableItem( MN_MACRO, TRUE ); + aMenu.EnableItem( MN_URL, sal_True ); + aMenu.EnableItem( MN_ACTIVATE, sal_True ); + aMenu.EnableItem( MN_MACRO, sal_True ); aMenu.CheckItem( MN_ACTIVATE, GetIMapObj( pSdrObj )->IsActive() ); } - aMenu.EnableItem( MN_POSITION, TRUE ); - aMenu.EnableItem( MN_FRAME_TO_TOP, TRUE ); - aMenu.EnableItem( MN_MOREFRONT, TRUE ); - aMenu.EnableItem( MN_MOREBACK, TRUE ); - aMenu.EnableItem( MN_FRAME_TO_BOTTOM, TRUE ); - aMenu.EnableItem( MN_DELETE1, TRUE ); + aMenu.EnableItem( MN_POSITION, sal_True ); + aMenu.EnableItem( MN_FRAME_TO_TOP, sal_True ); + aMenu.EnableItem( MN_MOREFRONT, sal_True ); + aMenu.EnableItem( MN_MOREBACK, sal_True ); + aMenu.EnableItem( MN_FRAME_TO_BOTTOM, sal_True ); + aMenu.EnableItem( MN_DELETE1, sal_True ); } aMenu.SetSelectHdl( LINK( this, IMapWindow, MenuSelectHdl ) ); @@ -573,7 +573,7 @@ sal_Int8 IMapWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) pModel->SetChanged( sal_True ); pView->UnmarkAll(); pView->MarkObj( pSdrObj, pView->GetSdrPageView() ); - UpdateInfo( TRUE ); + UpdateInfo( sal_True ); nRet = rEvt.mnAction; } } @@ -612,7 +612,7 @@ void IMapWindow::RequestHelp( const HelpEvent& rHEvt ) } } -void IMapWindow::SetCurrentObjState( BOOL bActive ) +void IMapWindow::SetCurrentObjState( sal_Bool bActive ) { SdrObject* pObj = GetSelectedSdrObject(); @@ -635,11 +635,11 @@ void IMapWindow::SetCurrentObjState( BOOL bActive ) aSet.Put( XLineColorItem( String(), Color( COL_BLACK ) ) ); } - pView->SetAttributes( aSet, FALSE ); + pView->SetAttributes( aSet, sal_False ); } } -void IMapWindow::UpdateInfo( BOOL bNewObj ) +void IMapWindow::UpdateInfo( sal_Bool bNewObj ) { if ( aInfoLink.IsSet() ) { @@ -650,7 +650,7 @@ void IMapWindow::UpdateInfo( BOOL bNewObj ) if ( pIMapObj ) { - aInfo.bOneMarked = TRUE; + aInfo.bOneMarked = sal_True; aInfo.aMarkURL = pIMapObj->GetURL(); aInfo.aMarkAltText = pIMapObj->GetAltText(); aInfo.aMarkTarget = pIMapObj->GetTarget(); @@ -660,8 +660,8 @@ void IMapWindow::UpdateInfo( BOOL bNewObj ) else { aInfo.aMarkURL = aInfo.aMarkAltText = aInfo.aMarkTarget = String(); - aInfo.bOneMarked = FALSE; - aInfo.bActivated = FALSE; + aInfo.bOneMarked = sal_False; + aInfo.bActivated = sal_False; } aInfoLink.Call( this ); @@ -680,7 +680,7 @@ void IMapWindow::DoMacroAssign() aNamesItem.AddEvent( String::CreateFromAscii( "MouseOver" ), String(), SFX_EVENT_MOUSEOVER_OBJECT ); aNamesItem.AddEvent( String::CreateFromAscii( "MouseOut" ), String(), SFX_EVENT_MOUSEOUT_OBJECT ); aSet.Put( aNamesItem ); - + SvxMacroItem aMacroItem(SID_ATTR_MACROITEM); IMapObject* pIMapObj = GetIMapObj( pSdrObj ); aMacroItem.SetMacroTable( pIMapObj->GetMacroTable() ); @@ -694,7 +694,7 @@ void IMapWindow::DoMacroAssign() const SfxItemSet* pOutSet = pMacroDlg->GetOutputItemSet(); pIMapObj->SetMacroTable( ((const SvxMacroItem& )pOutSet->Get( SID_ATTR_MACROITEM )).GetMacroTable() ); pModel->SetChanged( sal_True ); - UpdateInfo( FALSE ); + UpdateInfo( sal_False ); } delete pMacroDlg; @@ -732,7 +732,7 @@ void IMapWindow::DoPropertyDialog() pIMapObj->SetTarget( aDlg->GetTarget() ); pIMapObj->SetName( aDlg->GetName() ); pModel->SetChanged( sal_True ); - UpdateInfo( TRUE ); + UpdateInfo( sal_True ); } delete aDlg; } @@ -743,7 +743,7 @@ IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu ) { if (pMenu) { - USHORT nId = pMenu->GetCurItemId(); + sal_uInt16 nId = pMenu->GetCurItemId(); switch(nId) { @@ -757,11 +757,11 @@ IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu ) case( MN_ACTIVATE ): { - const BOOL bNewState = !pMenu->IsItemChecked( MN_ACTIVATE ); + const sal_Bool bNewState = !pMenu->IsItemChecked( MN_ACTIVATE ); pMenu->CheckItem( MN_ACTIVATE, bNewState ); SetCurrentObjState( bNewState ); - UpdateInfo( FALSE ); + UpdateInfo( sal_False ); } case( MN_FRAME_TO_TOP ): @@ -860,7 +860,7 @@ void IMapWindow::SelectFirstObject() { GrabFocus(); pView->UnmarkAllObj(); - pView->MarkNextObj(TRUE); + pView->MarkNextObj(sal_True); } } @@ -869,7 +869,7 @@ void IMapWindow::StartPolyEdit() GrabFocus(); if( !pView->AreObjectsMarked() ) - pView->MarkNextObj(TRUE); + pView->MarkNextObj(sal_True); const SdrHdlList& rHdlList = pView->GetHdlList(); SdrHdl* pHdl = rHdlList.GetFocusHdl(); diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 534e504804..189398bdbf 100644..100755 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -46,9 +46,9 @@ struct NotifyInfo String aMarkURL; String aMarkAltText; String aMarkTarget; - BOOL bNewObj; - BOOL bOneMarked; - BOOL bActivated; + sal_Bool bNewObj; + sal_Bool bOneMarked; + sal_Bool bActivated; }; @@ -56,16 +56,16 @@ struct NotifyPosSize { Size aPictureSize; Point aMousePos; - BOOL bPictureSize; - BOOL bMousePos; + sal_Bool bPictureSize; + sal_Bool bMousePos; }; #define SVD_IMAP_USERDATA 0x0001 -const UINT32 IMapInventor = UINT32('I') * 0x00000001+ - UINT32('M') * 0x00000100+ - UINT32('A') * 0x00010000+ - UINT32('P') * 0x01000000; +const sal_uInt32 IMapInventor = sal_uInt32('I') * 0x00000001+ + sal_uInt32('M') * 0x00000100+ + sal_uInt32('A') * 0x00010000+ + sal_uInt32('P') * 0x01000000; typedef boost::shared_ptr< IMapObject > IMapObjectPtr; @@ -128,7 +128,7 @@ protected: virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); void CreateImageMap(); - void ReplaceImageMap( const ImageMap& rNewImageMap, BOOL bScaleToGraphic ); + void ReplaceImageMap( const ImageMap& rNewImageMap, sal_Bool bScaleToGraphic ); void ClearTargetList(); @@ -137,19 +137,19 @@ protected: SdrObject* GetSdrObj( const IMapObject* pIMapObj ) const; SdrObject* GetHitSdrObj( const Point& rPosPixel ) const; - void UpdateInfo( BOOL bNewObj ); + void UpdateInfo( sal_Bool bNewObj ); public: IMapWindow( Window* pParent, const ResId& rResId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rxDocumentFrame ); ~IMapWindow(); - BOOL ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ); + sal_Bool ReplaceActualIMapInfo( const NotifyInfo& rNewInfo ); void SetImageMap( const ImageMap& rImageMap ); const ImageMap& GetImageMap(); - void SetCurrentObjState( BOOL bActive ); + void SetCurrentObjState( sal_Bool bActive ); void DoMacroAssign(); void DoPropertyDialog(); diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index b8c1ecb0f3..55d0d39ef4 100644..100755 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -55,7 +55,7 @@ using namespace ::com::sun::star::uno; // ----------------------------------------------------------------------- -String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg ) +String GetDicInfoStr( const String& rName, const sal_uInt16 nLang, sal_Bool bNeg ) { INetURLObject aURLObj; aURLObj.SetSmartProtocol( INET_PROT_FILE ); @@ -85,14 +85,14 @@ String GetDicInfoStr( const String& rName, const USHORT nLang, BOOL bNeg ) // misc local helper functions //======================================================================== -static Sequence< INT16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq ) +static Sequence< sal_Int16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq ) { const Locale *pLocale = rSeq.getConstArray(); - INT32 nCount = rSeq.getLength(); + sal_Int32 nCount = rSeq.getLength(); - Sequence< INT16 > aLangs( nCount ); - INT16 *pLang = aLangs.getArray(); - for (INT32 i = 0; i < nCount; ++i) + Sequence< sal_Int16 > aLangs( nCount ); + sal_Int16 *pLang = aLangs.getArray(); + for (sal_Int32 i = 0; i < nCount; ++i) { pLang[i] = SvxLocaleToLanguage( pLocale[i] ); @@ -102,13 +102,13 @@ static Sequence< INT16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq ) } -static BOOL lcl_SeqHasLang( const Sequence< INT16 > & rLangSeq, INT16 nLang ) +static sal_Bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nLang ) { - INT32 i = -1; - INT32 nLen = rLangSeq.getLength(); + sal_Int32 i = -1; + sal_Int32 nLen = rLangSeq.getLength(); if (nLen) { - const INT16 *pLang = rLangSeq.getConstArray(); + const sal_Int16 *pLang = rLangSeq.getConstArray(); for (i = 0; i < nLen; ++i) { if (nLang == pLang[i]) @@ -122,20 +122,20 @@ static BOOL lcl_SeqHasLang( const Sequence< INT16 > & rLangSeq, INT16 nLang ) // class SvxLanguageBox //======================================================================== -USHORT TypeToPos_Impl( LanguageType eType, const ListBox& rLb ) +sal_uInt16 TypeToPos_Impl( LanguageType eType, const ListBox& rLb ) { - USHORT nPos = LISTBOX_ENTRY_NOTFOUND; - USHORT nCount = rLb.GetEntryCount(); + sal_uInt16 nPos = LISTBOX_ENTRY_NOTFOUND; + sal_uInt16 nCount = rLb.GetEntryCount(); - for ( USHORT i=0; nPos == LISTBOX_ENTRY_NOTFOUND && i<nCount; i++ ) - if ( eType == LanguageType((ULONG)rLb.GetEntryData(i)) ) + for ( sal_uInt16 i=0; nPos == LISTBOX_ENTRY_NOTFOUND && i<nCount; i++ ) + if ( eType == LanguageType((sal_uIntPtr)rLb.GetEntryData(i)) ) nPos = i; return nPos; } //----------------------------------------------------------------------- -SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck ) : +SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, sal_Bool bCheck ) : ListBox( pParent, nWinStyle ), m_pSpellUsedLang( NULL ), m_bWithCheckmark( bCheck ) @@ -143,7 +143,7 @@ SvxLanguageBox::SvxLanguageBox( Window* pParent, WinBits nWinStyle, BOOL bCheck Init(); } //------------------------------------------------------------------------ -SvxLanguageBox::SvxLanguageBox( Window* pParent, const ResId& rResId, BOOL bCheck ) : +SvxLanguageBox::SvxLanguageBox( Window* pParent, const ResId& rResId, sal_Bool bCheck ) : ListBox( pParent, rResId ), m_pSpellUsedLang( NULL ), m_bWithCheckmark( bCheck ) @@ -158,8 +158,8 @@ void SvxLanguageBox::Init() m_aCheckedImage = Image( SVX_RES( RID_SVXIMG_CHECKED ) ); m_aAllString = String( SVX_RESSTR( RID_SVXSTR_LANGUAGE_ALL ) ); m_nLangList = LANG_LIST_EMPTY; - m_bHasLangNone = FALSE; - m_bLangNoneIsLangAll = FALSE; + m_bHasLangNone = sal_False; + m_bLangNoneIsLangAll = sal_False; // display entries sorted SetStyle( GetStyle() | WB_SORT ); @@ -172,12 +172,12 @@ void SvxLanguageBox::Init() { LanguageType nLangType = aLangTable.GetTypeAtIndex( i ); - BOOL bInsert = TRUE; + sal_Bool bInsert = sal_True; if ((LANGUAGE_DONTKNOW == nLangType) || (LANGUAGE_SYSTEM == nLangType) || (LANGUAGE_USER1 <= nLangType && nLangType <= LANGUAGE_USER9)) { - bInsert = FALSE; + bInsert = sal_False; } if ( bInsert ) @@ -196,9 +196,9 @@ SvxLanguageBox::~SvxLanguageBox() //------------------------------------------------------------------------ -USHORT SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, USHORT nPos, bool bChecked ) +sal_uInt16 SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, sal_uInt16 nPos, bool bChecked ) { - USHORT nRet = 0; + sal_uInt16 nRet = 0; if( !bChecked ) nRet = InsertEntry( rEntry, m_aNotCheckedImage, nPos ); else @@ -208,8 +208,8 @@ USHORT SvxLanguageBox::ImplInsertImgEntry( const String& rEntry, USHORT nPos, bo //------------------------------------------------------------------------ -void SvxLanguageBox::SetLanguageList( INT16 nLangList, - BOOL bHasLangNone, BOOL bLangNoneIsLangAll, BOOL bCheckSpellAvail ) +void SvxLanguageBox::SetLanguageList( sal_Int16 nLangList, + sal_Bool bHasLangNone, sal_Bool bLangNoneIsLangAll, sal_Bool bCheckSpellAvail ) { Clear(); @@ -220,12 +220,12 @@ void SvxLanguageBox::SetLanguageList( INT16 nLangList, if ( LANG_LIST_EMPTY != nLangList ) { - Sequence< INT16 > aSpellAvailLang; - Sequence< INT16 > aHyphAvailLang; - Sequence< INT16 > aThesAvailLang; - Sequence< INT16 > aSpellUsedLang; - Sequence< INT16 > aHyphUsedLang; - Sequence< INT16 > aThesUsedLang; + Sequence< sal_Int16 > aSpellAvailLang; + Sequence< sal_Int16 > aHyphAvailLang; + Sequence< sal_Int16 > aThesAvailLang; + Sequence< sal_Int16 > aSpellUsedLang; + Sequence< sal_Int16 > aHyphUsedLang; + Sequence< sal_Int16 > aThesUsedLang; Reference< XAvailableLocales > xAvail( LinguMgr::GetLngSvcMgr(), UNO_QUERY ); if (xAvail.is()) { @@ -332,14 +332,14 @@ void SvxLanguageBox::SetLanguageList( INT16 nLangList, //------------------------------------------------------------------------ -USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, USHORT nPos ) +sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, sal_uInt16 nPos ) { return ImplInsertLanguage( nLangType, nPos, ::com::sun::star::i18n::ScriptType::WEAK ); } //------------------------------------------------------------------------ -USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT nPos, sal_Int16 nType ) +sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal_uInt16 nPos, sal_Int16 nType ) { LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType); // For obsolete and to be replaced languages check whether an entry of the @@ -347,7 +347,7 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT // string as would be returned by SvtLanguageTable::GetString(). if (nLang != nLangType) { - USHORT nAt = TypeToPos_Impl( nLang, *this ); + sal_uInt16 nAt = TypeToPos_Impl( nLang, *this ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) return nAt; } @@ -366,7 +366,7 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT aStrEntry = ApplyLreOrRleEmbedding( aStrEntry ); - USHORT nAt = 0; + sal_uInt16 nAt = 0; if ( m_bWithCheckmark ) { sal_Bool bFound = sal_False; @@ -375,31 +375,31 @@ USHORT SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, USHORT { Reference< XSpellChecker1 > xSpell( SvxGetSpellChecker(), UNO_QUERY ); if ( xSpell.is() ) - m_pSpellUsedLang = new Sequence< INT16 >( xSpell->getLanguages() ); + m_pSpellUsedLang = new Sequence< sal_Int16 >( xSpell->getLanguages() ); } bFound = m_pSpellUsedLang ? - lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : FALSE; + lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : sal_False; nAt = ImplInsertImgEntry( aStrEntry, nPos, bFound ); } else nAt = InsertEntry( aStrEntry, nPos ); - SetEntryData( nAt, (void*)(ULONG)nLangType ); + SetEntryData( nAt, (void*)(sal_uIntPtr)nLangType ); return nAt; } //------------------------------------------------------------------------ -USHORT SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, USHORT nPos ) +sal_uInt16 SvxLanguageBox::InsertDefaultLanguage( sal_Int16 nType, sal_uInt16 nPos ) { return ImplInsertLanguage( LANGUAGE_SYSTEM, nPos, nType ); } //------------------------------------------------------------------------ -USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, - BOOL bCheckEntry, USHORT nPos ) +sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType, + sal_Bool bCheckEntry, sal_uInt16 nPos ) { LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( nLangType); // For obsolete and to be replaced languages check whether an entry of the @@ -407,7 +407,7 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, // string as would be returned by SvtLanguageTable::GetString(). if (nLang != nLangType) { - USHORT nAt = TypeToPos_Impl( nLang, *this ); + sal_uInt16 nAt = TypeToPos_Impl( nLang, *this ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) return nAt; } @@ -416,8 +416,8 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, if (LANGUAGE_NONE == nLang && m_bHasLangNone && m_bLangNoneIsLangAll) aStrEntry = m_aAllString; - USHORT nAt = ImplInsertImgEntry( aStrEntry, nPos, bCheckEntry ); - SetEntryData( nAt, (void*)(ULONG)nLang ); + sal_uInt16 nAt = ImplInsertImgEntry( aStrEntry, nPos, bCheckEntry ); + SetEntryData( nAt, (void*)(sal_uIntPtr)nLang ); return nAt; } @@ -426,7 +426,7 @@ USHORT SvxLanguageBox::InsertLanguage( const LanguageType nLangType, void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType ) { - USHORT nAt = TypeToPos_Impl( eLangType, *this ); + sal_uInt16 nAt = TypeToPos_Impl( eLangType, *this ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) RemoveEntry( nAt ); @@ -436,23 +436,23 @@ void SvxLanguageBox::RemoveLanguage( const LanguageType eLangType ) LanguageType SvxLanguageBox::GetSelectLanguage() const { - USHORT nPos = GetSelectEntryPos(); + sal_uInt16 nPos = GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return LanguageType( (ULONG)GetEntryData(nPos) ); + return LanguageType( (sal_uIntPtr)GetEntryData(nPos) ); else return LanguageType( LANGUAGE_DONTKNOW ); } //------------------------------------------------------------------------ -void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, BOOL bSelect ) +void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, sal_Bool bSelect ) { // If the core uses a LangID of an imported MS document and wants to select // a language that is replaced, we need to select the replacement instead. LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType); - USHORT nAt = TypeToPos_Impl( nLang, *this ); + sal_uInt16 nAt = TypeToPos_Impl( nLang, *this ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) SelectEntryPos( nAt, bSelect ); @@ -460,17 +460,17 @@ void SvxLanguageBox::SelectLanguage( const LanguageType eLangType, BOOL bSelect //------------------------------------------------------------------------ -BOOL SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) const +sal_Bool SvxLanguageBox::IsLanguageSelected( const LanguageType eLangType ) const { // Same here, work on the replacement if applicable. LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage( eLangType); - USHORT nAt = TypeToPos_Impl( nLang, *this ); + sal_uInt16 nAt = TypeToPos_Impl( nLang, *this ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) return IsEntryPosSelected( nAt ); else - return FALSE; + return sal_False; } #if ENABLE_LAYOUT @@ -482,7 +482,7 @@ SvxLanguageBox::~SvxLanguageBox () { } -SvxLanguageBox::SvxLanguageBox( Context* pParent, const char* pFile, BOOL bCheck ) +SvxLanguageBox::SvxLanguageBox( Context* pParent, const char* pFile, sal_Bool bCheck ) : ListBox ( pParent, pFile, bCheck ) { } diff --git a/svx/source/dialog/langbox.src b/svx/source/dialog/langbox.src index b7cc9c40fc..b7cc9c40fc 100644..100755 --- a/svx/source/dialog/langbox.src +++ b/svx/source/dialog/langbox.src diff --git a/svx/source/dialog/language.src b/svx/source/dialog/language.src index 9cd239996e..9cd239996e 100644..100755 --- a/svx/source/dialog/language.src +++ b/svx/source/dialog/language.src diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx index d69ddda72b..d69ddda72b 100644..100755 --- a/svx/source/dialog/linkwarn.cxx +++ b/svx/source/dialog/linkwarn.cxx diff --git a/svx/source/dialog/linkwarn.src b/svx/source/dialog/linkwarn.src index 100b53cb6e..100b53cb6e 100644..100755 --- a/svx/source/dialog/linkwarn.src +++ b/svx/source/dialog/linkwarn.src diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk index 2f1d36c85c..2f1d36c85c 100644..100755 --- a/svx/source/dialog/makefile.mk +++ b/svx/source/dialog/makefile.mk diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index 47c08a9da9..5a1a24bcce 100644..100755 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -34,9 +34,9 @@ #include <svx/svdomeas.hxx> #include <svx/svdmodel.hxx> -#include "measctrl.hxx" +#include "svx/measctrl.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" SvxXMeasurePreview::SvxXMeasurePreview ( @@ -100,9 +100,9 @@ void SvxXMeasurePreview::SetAttributes( const SfxItemSet& rInAttrs ) void SvxXMeasurePreview::MouseButtonDown( const MouseEvent& rMEvt ) { - BOOL bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift(); - BOOL bZoomOut = rMEvt.IsRight() || rMEvt.IsShift(); - BOOL bCtrl = rMEvt.IsMod1(); + sal_Bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift(); + sal_Bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift(); + sal_Bool bCtrl = rMEvt.IsMod1(); if( bZoomIn || bZoomOut ) { diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 4c618013e9..ca583eb551 100644..100755 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -39,10 +39,10 @@ #include <svx/svxids.hrc> #include <svx/dialmgr.hxx> -#include "optgrid.hxx" +#include "svx/optgrid.hxx" #include <svx/dialogs.hrc> #include "optgrid.hrc" -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" // local functions void lcl_GetMinMax(MetricField& rField, long& nFirst, long& nLast, long& nMin, long& nMax) @@ -185,7 +185,7 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : aFtBezAngle ( this, SVX_RES( FT_BEZ_ANGLE ) ), aMtrFldBezAngle ( this, SVX_RES( MTR_FLD_BEZ_ANGLE ) ), - bAttrModified( FALSE ) + bAttrModified( sal_False ) { // This page requires exchange Support SetExchangeSupport(); @@ -198,11 +198,11 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : long nFirst, nLast, nMin, nMax; lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax); - SetFieldUnit( aMtrFldDrawX, eFUnit, TRUE ); + SetFieldUnit( aMtrFldDrawX, eFUnit, sal_True ); lcl_SetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax); lcl_GetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax); - SetFieldUnit( aMtrFldDrawY, eFUnit, TRUE ); + SetFieldUnit( aMtrFldDrawY, eFUnit, sal_True ); lcl_SetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax); @@ -219,6 +219,17 @@ SvxGridTabPage::SvxGridTabPage( Window* pParent, const SfxItemSet& rCoreSet) : LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) ); aNumFldDivisionY.SetModifyHdl( LINK( this, SvxGridTabPage, ChangeDivisionHdl_Impl ) ); + + ::rtl::OUString sFlResolution( aFlResolution.GetDisplayText() ); + ::rtl::OUString sFtDrawX(aFtDrawX.GetDisplayText()); + ::rtl::OUString sFtDrawY(aFtDrawY.GetDisplayText()); + aMtrFldDrawX.SetAccessibleName( sFtDrawX + sFlResolution ); + aMtrFldDrawY.SetAccessibleName( sFtDrawY + sFlResolution ); + ::rtl::OUString sFlDivision( aFlDivision.GetDisplayText() ); + ::rtl::OUString sFtDivisionX(aFtDivisionX.GetDisplayText()); + ::rtl::OUString sFtDivisionY(aFtDivisionY.GetDisplayText()); + aNumFldDivisionX.SetAccessibleName( sFtDivisionX + sFlDivision ); + aNumFldDivisionY.SetAccessibleName( sFtDivisionY + sFlDivision ); } //------------------------------------------------------------------------ @@ -230,7 +241,7 @@ SfxTabPage* SvxGridTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet //------------------------------------------------------------------------ -BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) +sal_Bool SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) { if ( bAttrModified ) { @@ -245,10 +256,10 @@ BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet ) long nX =GetCoreValue( aMtrFldDrawX, eUnit ); long nY = GetCoreValue( aMtrFldDrawY, eUnit ); - aGridItem.nFldDrawX = (UINT32) nX; - aGridItem.nFldDrawY = (UINT32) nY; - aGridItem.nFldDivisionX = static_cast<long>(aNumFldDivisionX.GetValue()); - aGridItem.nFldDivisionY = static_cast<long>(aNumFldDivisionY.GetValue()); + aGridItem.nFldDrawX = (sal_uInt32) nX; + aGridItem.nFldDrawY = (sal_uInt32) nY; + aGridItem.nFldDivisionX = static_cast<long>(aNumFldDivisionX.GetValue()-1); + aGridItem.nFldDivisionY = static_cast<long>(aNumFldDivisionY.GetValue()-1); rCoreSet.Put( aGridItem ); } @@ -261,7 +272,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet ) { const SfxPoolItem* pAttr = 0; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , FALSE, + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False, (const SfxPoolItem**)&pAttr )) { const SvxGridItem* pGridAttr = (SvxGridItem*)pAttr; @@ -274,12 +285,12 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet ) SetMetricValue( aMtrFldDrawX , pGridAttr->nFldDrawX, eUnit ); SetMetricValue( aMtrFldDrawY , pGridAttr->nFldDrawY, eUnit ); - aNumFldDivisionX.SetValue( pGridAttr->nFldDivisionX ); - aNumFldDivisionY.SetValue( pGridAttr->nFldDivisionY ); + aNumFldDivisionX.SetValue( pGridAttr->nFldDivisionX+1 ); + aNumFldDivisionY.SetValue( pGridAttr->nFldDivisionY+1 ); } ChangeGridsnapHdl_Impl( &aCbxUseGridsnap ); - bAttrModified = FALSE; + bAttrModified = sal_False; } // ----------------------------------------------------------------------- @@ -287,7 +298,7 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet ) void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) { const SfxPoolItem* pAttr = NULL; - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , FALSE, + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_GRID_OPTIONS , sal_False, (const SfxPoolItem**)&pAttr )) { const SvxGridItem* pGridAttr = (SvxGridItem*) pAttr; @@ -298,7 +309,7 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) // Metric Change if necessary (as TabPage is in the dialog, where the // metric can be set - if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , FALSE, + if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_METRIC , sal_False, (const SfxPoolItem**)&pAttr )) { const SfxUInt16Item* pItem = (SfxUInt16Item*) pAttr; @@ -312,14 +323,14 @@ void SvxGridTabPage::ActivatePage( const SfxItemSet& rSet ) long nVal = static_cast<long>(aMtrFldDrawX.Denormalize( aMtrFldDrawX.GetValue( FUNIT_TWIP ) )); lcl_GetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax); - SetFieldUnit( aMtrFldDrawX, eFUnit, TRUE ); + SetFieldUnit( aMtrFldDrawX, eFUnit, sal_True ); lcl_SetMinMax(aMtrFldDrawX, nFirst, nLast, nMin, nMax); aMtrFldDrawX.SetValue( aMtrFldDrawX.Normalize( nVal ), FUNIT_TWIP ); nVal = static_cast<long>(aMtrFldDrawY.Denormalize( aMtrFldDrawY.GetValue( FUNIT_TWIP ) )); lcl_GetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax); - SetFieldUnit( aMtrFldDrawY, eFUnit, TRUE ); + SetFieldUnit( aMtrFldDrawY, eFUnit, sal_True ); lcl_SetMinMax(aMtrFldDrawY, nFirst, nLast, nMin, nMax); aMtrFldDrawY.SetValue( aMtrFldDrawY.Normalize( nVal ), FUNIT_TWIP ); @@ -337,7 +348,7 @@ int SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) //------------------------------------------------------------------------ IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, MetricField *, pField ) { - bAttrModified = TRUE; + bAttrModified = sal_True; if( aCbxSynchronize.IsChecked() ) { if(pField == &aMtrFldDrawX) @@ -363,7 +374,7 @@ IMPL_LINK( SvxGridTabPage, ClickRotateHdl_Impl, void *, EMPTYARG ) IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField ) { - bAttrModified = TRUE; + bAttrModified = sal_True; if( aCbxSynchronize.IsChecked() ) { if(&aNumFldDivisionX == pField) @@ -377,7 +388,7 @@ IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, NumericField *, pField ) IMPL_LINK( SvxGridTabPage, ChangeGridsnapHdl_Impl, void *, EMPTYARG ) { - bAttrModified = TRUE; + bAttrModified = sal_True; return 0; } diff --git a/svx/source/dialog/optgrid.hrc b/svx/source/dialog/optgrid.hrc index f010dbb6a6..f010dbb6a6 100644..100755 --- a/svx/source/dialog/optgrid.hrc +++ b/svx/source/dialog/optgrid.hrc diff --git a/svx/source/dialog/optgrid.src b/svx/source/dialog/optgrid.src index e427ddfd08..c2bb8ef1c4 100644..100755 --- a/svx/source/dialog/optgrid.src +++ b/svx/source/dialog/optgrid.src @@ -45,6 +45,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_USE_GRIDSNAP { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_USE_GRIDSNAP"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 204 , 10 ) ; TabStop = TRUE ; @@ -52,6 +53,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_GRID_VISIBLE { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_GRID_VISIBLE"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 204 , 10 ) ; TabStop = TRUE ; @@ -77,6 +79,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_DRAW_X { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_X"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 54 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -94,6 +97,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_DRAW_Y { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 69 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -129,12 +133,14 @@ TabPage RID_SVXPAGE_GRID }; NumericField NUM_FLD_DIVISION_X { + HelpID = "svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_X"; Border = TRUE ; Pos = MAP_APPFONT ( 195 , 54 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; + Minimum = 1 ; Maximum = 99 ; Last = 99 ; StrictFormat = TRUE ; @@ -144,16 +150,18 @@ TabPage RID_SVXPAGE_GRID { Pos = MAP_APPFONT ( 223 , 56 ) ; Size = MAP_APPFONT ( 29 , 8 ) ; - Text [ en-US ] = "point(s)" ; + Text [ en-US ] = "space(s)" ; }; NumericField NUM_FLD_DIVISION_Y { + HelpID = "svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 195 , 69 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; TabStop = TRUE ; Repeat = TRUE ; Spin = TRUE ; + Minimum = 1 ; Maximum = 99 ; Last = 99 ; StrictFormat = TRUE ; @@ -167,6 +175,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SYNCHRONIZE { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE"; Pos = MAP_APPFONT ( 12 , 84 ) ; Size = MAP_APPFONT ( 127 , 10 ) ; TabStop = TRUE ; @@ -182,6 +191,7 @@ TabPage RID_SVXPAGE_GRID CheckBox CBX_SNAP_HELPLINES { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_HELPLINES"; Pos = MAP_APPFONT ( 12 , 111 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; Hide = TRUE; @@ -190,6 +200,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SNAP_BORDER { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER"; Hide = TRUE; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 125 ) ; @@ -198,6 +209,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SNAP_FRAME { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_FRAME"; Pos = MAP_APPFONT ( 12 , 139 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; Hide = TRUE; @@ -206,6 +218,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SNAP_POINTS { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_POINTS"; Pos = MAP_APPFONT ( 12 , 153 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; Hide = TRUE; @@ -221,6 +234,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_SNAP_AREA { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_SNAP_AREA"; Border = TRUE ; Pos = MAP_APPFONT ( 83 , 167 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -252,6 +266,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_ORTHO { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_ORTHO"; Pos = MAP_APPFONT ( 136 , 111 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Hide = TRUE; @@ -260,6 +275,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_BIGORTHO { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_BIGORTHO"; Pos = MAP_APPFONT ( 136 , 125 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Hide = TRUE; @@ -268,6 +284,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_ROTATE { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_ROTATE"; Pos = MAP_APPFONT ( 136 , 139 ) ; // 136, 111 Size = MAP_APPFONT ( 55 , 10 ) ; @@ -277,6 +294,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_ANGLE { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 194 , 137 ) ; // 190, 111 @@ -302,6 +320,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_BEZ_ANGLE { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_BEZ_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 194 , 154 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index 713ca089ba..a291fc94ff 100644..100755 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -28,13 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "orienthelper.hxx" +#include "svx/orienthelper.hxx" #include <vector> #include <utility> #include <vcl/button.hxx> -#include "dialcontrol.hxx" +#include "svx/dialcontrol.hxx" namespace svx { diff --git a/svx/source/dialog/pagectrl.cxx b/svx/source/dialog/pagectrl.cxx index 7e27de2bb9..bda7ec5a9f 100644..100755 --- a/svx/source/dialog/pagectrl.cxx +++ b/svx/source/dialog/pagectrl.cxx @@ -54,7 +54,7 @@ struct PageWindow_Impl PageWindow_Impl() : pBorder(0), - bBitmap(FALSE), + bBitmap(sal_False), bResetBackground(sal_False), bFrameDirection(sal_False), nFrameDirection(0) {} @@ -92,11 +92,11 @@ SvxPageWindow::SvxPageWindow( Window* pParent, const ResId& rId ) : nFtHeight ( 0 ), aFtColor ( COL_TRANSPARENT ), pFtBorder ( 0 ), - bFooter ( FALSE ), - bHeader ( FALSE ), - bTable ( FALSE ), - bHorz ( FALSE ), - bVert ( FALSE ), + bFooter ( sal_False ), + bHeader ( sal_False ), + bTable ( sal_False ), + bHorz ( sal_False ), + bVert ( sal_False ), eUsage ( SVX_PAGE_ALL ) { @@ -160,23 +160,23 @@ void SvxPageWindow::Paint( const Rectangle& ) aSz = PixelToLogic( GetSizePixel() ); nYPos = ( aSz.Height() - aSize.Height() ) / 2; long nXPos = ( aSz.Width() - aSize.Width() ) / 2; - DrawPage( Point( nXPos, nYPos ), TRUE, TRUE ); + DrawPage( Point( nXPos, nYPos ), sal_True, sal_True ); } else // Portrait - DrawPage( Point( ( aSz.Width() - aSize.Width() ) / 2, nYPos ), TRUE, TRUE ); + DrawPage( Point( ( aSz.Width() - aSize.Width() ) / 2, nYPos ), sal_True, sal_True ); } else { // Left and right page are different -> draw two pages if possible - DrawPage( Point( 0, nYPos ), FALSE, (BOOL)( eUsage & SVX_PAGE_LEFT ) ); - DrawPage( Point( aSize.Width() + aSize.Width() / 8, nYPos ), TRUE, - (BOOL)( eUsage & SVX_PAGE_RIGHT ) ); + DrawPage( Point( 0, nYPos ), sal_False, (sal_Bool)( eUsage & SVX_PAGE_LEFT ) ); + DrawPage( Point( aSize.Width() + aSize.Width() / 8, nYPos ), sal_True, + (sal_Bool)( eUsage & SVX_PAGE_RIGHT ) ); } } // ----------------------------------------------------------------------- -void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL bEnabled ) +void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const sal_Bool bEnabled ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const Color& rFieldColor = rStyleSettings.GetFieldColor(); @@ -311,12 +311,12 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL break; } sText.Append(cArrow); - for(USHORT i = 0; i < sText.Len(); i++) + for(sal_uInt16 i = 0; i < sText.Len(); i++) { String sDraw(sText.GetChar(i)); long nHDiff = 0; long nCharWidth = GetTextWidth(sDraw); - BOOL bHorizontal = 0 == aMove.Y(); + sal_Bool bHorizontal = 0 == aMove.Y(); if(!bHorizontal) { nHDiff = (nAWidth - nCharWidth)/2; @@ -348,14 +348,14 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const BOOL bSecond, const BOOL long _nTop = bVert ? aRect.Top() + ((nH - nTH) / 2) : aRect.Top(); Rectangle aCellRect( Point( _nLeft, _nTop ), Size( CELL_WIDTH, CELL_HEIGHT ) ); - for ( USHORT i = 0; i < 3; ++i ) + for ( sal_uInt16 i = 0; i < 3; ++i ) { aCellRect.Left() = _nLeft; aCellRect.Right() = _nLeft + CELL_WIDTH; if ( i > 0 ) aCellRect.Move( 0, CELL_HEIGHT ); - for ( USHORT j = 0; j < 3; ++j ) + for ( sal_uInt16 j = 0; j < 3; ++j ) { if ( j > 0 ) aCellRect.Move( CELL_WIDTH, 0 ); @@ -380,10 +380,10 @@ void SvxPageWindow::SetBitmap( Bitmap* pBmp ) if ( pBmp ) { pImpl->aBitmap = *pBmp; - pImpl->bBitmap = TRUE; + pImpl->bBitmap = sal_True; } else - pImpl->bBitmap = FALSE; + pImpl->bBitmap = sal_False; } // ----------------------------------------------------------------------- diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index 28d9aba686..85708dfa68 100644..100755 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -72,14 +72,14 @@ SvxParaPrevWindow::SvxParaPrevWindow( Window* pParent, const ResId& rId ) : void SvxParaPrevWindow::Paint( const Rectangle& ) { - DrawParagraph( TRUE ); + DrawParagraph( sal_True ); } // ----------------------------------------------------------------------- #define DEF_MARGIN 120 -void SvxParaPrevWindow::DrawParagraph( BOOL bAll ) +void SvxParaPrevWindow::DrawParagraph( sal_Bool bAll ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); const Color& rWinColor = rStyleSettings.GetWindowColor(); @@ -98,7 +98,7 @@ void SvxParaPrevWindow::DrawParagraph( BOOL bAll ) aPnt.X() = DEF_MARGIN / 2; SetFillColor( aGrayColor ); - for ( USHORT i = 0; i < 9; ++i ) + for ( sal_uInt16 i = 0; i < 9; ++i ) { if ( 3 == i ) { diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index eae5fbb231..24af01fb1f 100644..100755 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -35,7 +35,7 @@ #define _SVX_PASSWD_CXX -#include "passwd.hxx" +#include "svx/passwd.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include "passwd.hrc" @@ -44,7 +44,7 @@ IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG ) { - BOOL bOK = TRUE; + sal_Bool bOK = sal_True; short nRet = RET_OK; String aEmpty; @@ -54,7 +54,7 @@ IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG ) aNewPasswdED.SetText( aEmpty ); aRepeatPasswdED.SetText( aEmpty ); aNewPasswdED.GrabFocus(); - bOK = FALSE; + bOK = sal_False; } if ( bOK && aCheckPasswordHdl.IsSet() && !aCheckPasswordHdl.Call( this ) ) @@ -62,7 +62,7 @@ IMPL_LINK( SvxPasswordDialog, ButtonHdl, OKButton *, EMPTYARG ) ErrorBox( this, WB_OK, aOldPasswdErrStr ).Execute(); aOldPasswdED.SetText( aEmpty ); aOldPasswdED.GrabFocus(); - bOK = FALSE; + bOK = sal_False; } if ( bOK ) @@ -92,7 +92,7 @@ IMPL_LINK( SvxPasswordDialog, EditModifyHdl, Edit *, EMPTYARG ) // ----------------------------------------------------------------------- -SvxPasswordDialog::SvxPasswordDialog( Window* pParent, BOOL bAllowEmptyPasswords, BOOL bDisableOldPassword ) : +SvxPasswordDialog::SvxPasswordDialog( Window* pParent, sal_Bool bAllowEmptyPasswords, sal_Bool bDisableOldPassword ) : SfxModalDialog( pParent, SVX_RES( RID_SVXDLG_PASSWORD ) ), aOldFL ( this, SVX_RES( FL_OLD_PASSWD ) ), aOldPasswdFT ( this, SVX_RES( FT_OLD_PASSWD ) ), diff --git a/svx/source/dialog/passwd.hrc b/svx/source/dialog/passwd.hrc index f840be4c9a..f840be4c9a 100644..100755 --- a/svx/source/dialog/passwd.hrc +++ b/svx/source/dialog/passwd.hrc diff --git a/svx/source/dialog/passwd.src b/svx/source/dialog/passwd.src index 587150bc85..800c20c95d 100644..100755 --- a/svx/source/dialog/passwd.src +++ b/svx/source/dialog/passwd.src @@ -46,6 +46,7 @@ ModalDialog RID_SVXDLG_PASSWORD }; Edit ED_OLD_PASSWD { + HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( 71 , 14 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; @@ -65,6 +66,7 @@ ModalDialog RID_SVXDLG_PASSWORD }; Edit ED_NEW_PASSWD { + HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( 71 , 43 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; @@ -78,6 +80,7 @@ ModalDialog RID_SVXDLG_PASSWORD }; Edit ED_REPEAT_PASSWD { + HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( 71 , 59 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index fc0381bfd3..0600482a0f 100644..100755 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -36,7 +36,7 @@ #include <comphelper/processfactory.hxx> -#include "pfiledlg.hxx" +#include "svx/pfiledlg.hxx" #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> @@ -265,11 +265,6 @@ bool SvxPluginFileDlg::IsAvailable (sal_uInt16 nKind) return bFound; } -void SvxPluginFileDlg::SetDialogHelpId( const sal_Int32 _nHelpId ) -{ - maFileDlg.SetDialogHelpId( _nHelpId ); -} - void SvxPluginFileDlg::SetContext( sfx2::FileDialogHelper::Context _eNewContext ) { maFileDlg.SetContext( _eNewContext ); diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx index 290a21ef8a..9708f14852 100644..100755 --- a/svx/source/dialog/prtqry.cxx +++ b/svx/source/dialog/prtqry.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/dialogs.hrc> -#include <prtqry.hxx> +#include <svx/prtqry.hxx> #include <svx/dialmgr.hxx> #include <tools/shl.hxx> diff --git a/svx/source/dialog/prtqry.src b/svx/source/dialog/prtqry.src index 3f8c04cea9..3f8c04cea9 100644..100755 --- a/svx/source/dialog/prtqry.src +++ b/svx/source/dialog/prtqry.src diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 9c2c15306b..94a1e1b8e4 100644..100755 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -32,16 +32,16 @@ // include --------------------------------------------------------------- #include <tools/ref.hxx> -#include "relfld.hxx" +#include "svx/relfld.hxx" // ----------------------------------------------------------------------- SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nWinSize ) : MetricField( pParent, nWinSize ) { - bNegativeEnabled = FALSE; - bRelativeMode = FALSE; - bRelative = FALSE; + bNegativeEnabled = sal_False; + bRelativeMode = sal_False; + bRelative = sal_False; SetDecimalDigits( 2 ); SetMin( 0 ); @@ -53,9 +53,9 @@ SvxRelativeField::SvxRelativeField( Window* pParent, WinBits nWinSize ) : SvxRelativeField::SvxRelativeField( Window* pParent, const ResId& rResId ) : MetricField( pParent, rResId ) { - bNegativeEnabled = FALSE; - bRelativeMode = FALSE; - bRelative = FALSE; + bNegativeEnabled = sal_False; + bRelativeMode = sal_False; + bRelative = sal_False; SetDecimalDigits( 2 ); SetMin( 0 ); @@ -71,7 +71,7 @@ void SvxRelativeField::Modify() if ( bRelativeMode ) { String aStr = GetText(); - BOOL bNewMode = bRelative; + sal_Bool bNewMode = bRelative; if ( bRelative ) { @@ -82,7 +82,7 @@ void SvxRelativeField::Modify() if( ( ( *pStr < sal_Unicode( '0' ) ) || ( *pStr > sal_Unicode( '9' ) ) ) && ( *pStr != sal_Unicode( '%' ) ) ) { - bNewMode = FALSE; + bNewMode = sal_False; break; } pStr++; @@ -93,7 +93,7 @@ void SvxRelativeField::Modify() xub_StrLen nPos = aStr.Search( sal_Unicode( '%' ) ); if ( nPos != STRING_NOTFOUND ) - bNewMode = TRUE; + bNewMode = sal_True; } if ( bNewMode != bRelative ) @@ -105,10 +105,10 @@ void SvxRelativeField::Modify() // ----------------------------------------------------------------------- -void SvxRelativeField::EnableRelativeMode( USHORT nMin, - USHORT nMax, USHORT nStep ) +void SvxRelativeField::EnableRelativeMode( sal_uInt16 nMin, + sal_uInt16 nMax, sal_uInt16 nStep ) { - bRelativeMode = TRUE; + bRelativeMode = sal_True; nRelMin = nMin; nRelMax = nMax; nRelStep = nStep; @@ -117,14 +117,14 @@ void SvxRelativeField::EnableRelativeMode( USHORT nMin, // ----------------------------------------------------------------------- -void SvxRelativeField::SetRelative( BOOL bNewRelative ) +void SvxRelativeField::SetRelative( sal_Bool bNewRelative ) { Selection aSelection = GetSelection(); String aStr = GetText(); if ( bNewRelative ) { - bRelative = TRUE; + bRelative = sal_True; SetDecimalDigits( 0 ); SetMin( nRelMin ); SetMax( nRelMax ); @@ -133,7 +133,7 @@ void SvxRelativeField::SetRelative( BOOL bNewRelative ) } else { - bRelative = FALSE; + bRelative = sal_False; SetDecimalDigits( 2 ); SetMin( bNegativeEnabled ? -9999 : 0 ); SetMax( 9999 ); diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index 582761ba49..9254dc58a4 100644..100755 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -45,12 +45,12 @@ #include <editeng/tstpitem.hxx> #include "editeng/protitem.hxx" #include "rlrcitem.hxx" -#include "rulritem.hxx" +#include "svx/rulritem.hxx" #include <svl/eitem.hxx> // class SvxRulerItem ---------------------------------------------------- -SvxRulerItem::SvxRulerItem(USHORT _nId, SvxRuler &rRul, SfxBindings &rBindings) +SvxRulerItem::SvxRulerItem(sal_uInt16 _nId, SvxRuler &rRul, SfxBindings &rBindings) : SfxControllerItem(_nId, rBindings), rRuler(rRul) { @@ -58,7 +58,7 @@ SvxRulerItem::SvxRulerItem(USHORT _nId, SvxRuler &rRul, SfxBindings &rBindings) // ----------------------------------------------------------------------- -void SvxRulerItem::StateChanged( USHORT nSID, SfxItemState eState, +void SvxRulerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) { // SFX_ITEM_DONTCARE => pState == -1 => PTR_CAST buff diff --git a/svx/source/dialog/rlrcitem.hxx b/svx/source/dialog/rlrcitem.hxx index 7c643c4f73..153aed4965 100644..100755 --- a/svx/source/dialog/rlrcitem.hxx +++ b/svx/source/dialog/rlrcitem.hxx @@ -40,11 +40,11 @@ private: SvxRuler& rRuler; protected: - virtual void StateChanged( USHORT, + virtual void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState ); public: - SvxRulerItem( USHORT nId, SvxRuler&, SfxBindings& ); + SvxRulerItem( sal_uInt16 nId, SvxRuler&, SfxBindings& ); }; diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index ae8dc1f0f2..dc31f76352 100644..100755 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <rubydialog.hxx> +#include <svx/rubydialog.hxx> #include <tools/shl.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> @@ -75,7 +75,7 @@ static const sal_Char cDisplayName[] = "DisplayName"; static const sal_Char cRubyCharStyleName[] = "RubyCharStyleName"; static const sal_Char cRubies[] = "Rubies"; -SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, USHORT nId, +SvxRubyChildWindow::SvxRubyChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo) : SfxChildWindow(_pParent, nId) { @@ -232,7 +232,7 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW, aHelpPB(this, ResId(PB_HELP,*rResId.GetResMgr() )), nLastPos(0), nCurrentEdit(0), - bModified(FALSE), + bModified(sal_False), pBindings(pBind) { xImpl = pImpl = new SvxRubyData_Impl; @@ -259,7 +259,7 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW, Link aEditLk(LINK(this, SvxRubyDialog, EditModifyHdl_Impl)); Link aScrollLk(LINK(this, SvxRubyDialog, EditScrollHdl_Impl)); Link aJumpLk(LINK(this, SvxRubyDialog, EditJumpHdl_Impl)); - for(USHORT i = 0; i < 8; i++) + for(sal_uInt16 i = 0; i < 8; i++) { aEditArr[i]->SetModifyHdl(aEditLk); aEditArr[i]->SetJumpHdl(aJumpLk); @@ -268,6 +268,14 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW, } UpdateColors(); + + String leftLabelName = aLeftFT.GetText(), rightLabelName = aRightFT.GetText(); + aLeft2ED.SetAccessibleName(leftLabelName); + aLeft3ED.SetAccessibleName(leftLabelName); + aLeft4ED.SetAccessibleName(leftLabelName); + aRight2ED.SetAccessibleName(rightLabelName); + aRight3ED.SetAccessibleName(rightLabelName); + aRight4ED.SetAccessibleName(rightLabelName); } SvxRubyDialog::~SvxRubyDialog() @@ -279,7 +287,7 @@ SvxRubyDialog::~SvxRubyDialog() void SvxRubyDialog::ClearCharStyleList() { - for(USHORT i = 0; i < aCharStyleLB.GetEntryCount(); i++) + for(sal_uInt16 i = 0; i < aCharStyleLB.GetEntryCount(); i++) { void* pData = aCharStyleLB.GetEntryData(i); delete (OUString*)pData; @@ -287,12 +295,12 @@ void SvxRubyDialog::ClearCharStyleList() aCharStyleLB.Clear(); } -BOOL SvxRubyDialog::Close() +sal_Bool SvxRubyDialog::Close() { pBindings->GetDispatcher()->Execute( SID_RUBY_DIALOG, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD); - return TRUE; + return sal_True; } void SvxRubyDialog::Activate() @@ -355,7 +363,7 @@ void SvxRubyDialog::Activate() } if(sName.getLength()) { - USHORT nPos = aCharStyleLB.InsertEntry(sName); + sal_uInt16 nPos = aCharStyleLB.InsertEntry(sName); aCharStyleLB.SetEntryData( nPos, new OUString(sCoreName) ); } @@ -386,7 +394,7 @@ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight) { OUString sLeft, sRight; const Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues(); - BOOL bEnable = aRubyValues.getLength() > nPos; + sal_Bool bEnable = aRubyValues.getLength() > nPos; if(bEnable) { const Sequence<PropertyValue> aProps = aRubyValues.getConstArray()[nPos]; @@ -400,7 +408,7 @@ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit& rLeft, Edit& rRight) } } else if(!nPos) - bEnable = TRUE; + bEnable = sal_True; rLeft.Enable(bEnable); rRight.Enable(bEnable); rLeft.SetText(sLeft); @@ -420,7 +428,7 @@ void SvxRubyDialog::GetText() { Sequence<PropertyValues>& aRubyValues = pImpl->GetRubyValues(); DBG_ASSERT(aRubyValues.getLength() > (i / 2 + nTempLastPos), "wrong index" ); - SetModified(TRUE); + SetModified(sal_True); Sequence<PropertyValue> &rProps = aRubyValues.getArray()[i / 2 + nTempLastPos]; PropertyValue* pProps = rProps.getArray(); for(sal_Int32 nProp = 0; nProp < rProps.getLength(); nProp++) @@ -442,7 +450,7 @@ void SvxRubyDialog::Update() aScrollSB.SetRange( Range(0, nLen > 4 ? nLen - 4 : 0)); aScrollSB.SetThumbPos(0); SetLastPos(0); - SetModified(FALSE); + SetModified(sal_False); sal_Int16 nAdjust = -1; sal_Int16 nPosition = -1; @@ -500,7 +508,7 @@ void SvxRubyDialog::Update() sCharStyleName = C2U(cRubies); if(sCharStyleName.getLength()) { - for(USHORT i = 0; i < aCharStyleLB.GetEntryCount(); i++) + for(sal_uInt16 i = 0; i < aCharStyleLB.GetEntryCount(); i++) { const OUString* pCoreName = (const OUString*)aCharStyleLB.GetEntryData(i); if(pCoreName && sCharStyleName == *pCoreName) @@ -607,7 +615,7 @@ IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox) if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyAdjust))) pProps[nProp].Value <<= nAdjust; } - SetModified(TRUE); + SetModified(sal_True); } aPreviewWin.Invalidate(); return 0; @@ -628,7 +636,7 @@ IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox*, pBox) if(pProps[nProp].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(cRubyIsAbove))) pProps[nProp].Value.setValue(&bAbove, rType); } - SetModified(TRUE); + SetModified(sal_True); } aPreviewWin.Invalidate(); return 0; @@ -652,14 +660,14 @@ IMPL_LINK(SvxRubyDialog, CharStyleHdl_Impl, ListBox*, EMPTYARG ) pProps[nProp].Value <<= sStyleName; } } - SetModified(TRUE); + SetModified(sal_True); } return 0; } IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, Edit*, pEdit) { - for(USHORT i = 0; i < 8; i++) + for(sal_uInt16 i = 0; i < 8; i++) { if(pEdit == aEditArr[i]) { @@ -701,8 +709,8 @@ IMPL_LINK(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32*, pParam) IMPL_LINK(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32*, pParam) { - USHORT nIndex = USHRT_MAX; - for(USHORT i = 0; i < 8; i++) + sal_uInt16 nIndex = USHRT_MAX; + for(sal_uInt16 i = 0; i < 8; i++) { if(aEditArr[i]->HasFocus()) nIndex = i; @@ -812,7 +820,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ ) long nRubyWidth = GetTextWidth(sRubyText); SetFont(aSaveFont); - USHORT nAdjust = rParentDlg.aAdjustLB.GetSelectEntryPos(); + sal_uInt16 nAdjust = rParentDlg.aAdjustLB.GetSelectEntryPos(); //use center if no adjustment is available if(nAdjust > 4) nAdjust = 1; @@ -828,7 +836,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ ) long nYBase = aWinSize.Height() * 3 / 4 - nTextHeight / 2; //use above also if no selection is set - BOOL bAbove = rParentDlg.aPositionLB.GetSelectEntryPos() != 1; + sal_Bool bAbove = rParentDlg.aPositionLB.GetSelectEntryPos() != 1; if(!bAbove) { long nTmp = nYRuby; @@ -911,8 +919,8 @@ long RubyEdit::PreNotify( NotifyEvent& rNEvt ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); const KeyCode& rKeyCode = pKEvt->GetKeyCode(); - USHORT nMod = rKeyCode.GetModifier(); - USHORT nCode = rKeyCode.GetCode(); + sal_uInt16 nMod = rKeyCode.GetModifier(); + sal_uInt16 nCode = rKeyCode.GetCode(); if( nCode == KEY_TAB && (!nMod || KEY_SHIFT == nMod)) { sal_Int32 nParam = KEY_SHIFT == nMod ? -1 : 1; diff --git a/svx/source/dialog/rubydialog.hrc b/svx/source/dialog/rubydialog.hrc index 76839aeb85..76839aeb85 100644..100755 --- a/svx/source/dialog/rubydialog.hrc +++ b/svx/source/dialog/rubydialog.hrc diff --git a/svx/source/dialog/rubydialog.src b/svx/source/dialog/rubydialog.src index b1537c1fa7..e44b68046c 100644..100755 --- a/svx/source/dialog/rubydialog.src +++ b/svx/source/dialog/rubydialog.src @@ -42,6 +42,7 @@ ModelessDialog RID_SVXDLG_RUBY Closeable = TRUE ; CheckBox CB_AUTO_DETECT { + HelpID = "svx:CheckBox:RID_SVXDLG_RUBY:CB_AUTO_DETECT"; Pos = MAP_APPFONT ( 6, 6 ) ; Size = MAP_APPFONT ( 186 , 12 ) ; Text [ en-US ] = "Automatic detection"; @@ -60,6 +61,7 @@ ModelessDialog RID_SVXDLG_RUBY }; Edit ED_LEFT_1 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_1"; Pos = MAP_APPFONT ( 6 , 30 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Hide = False; @@ -67,42 +69,49 @@ ModelessDialog RID_SVXDLG_RUBY }; Edit ED_RIGHT_1 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_1"; Pos = MAP_APPFONT ( 109 , 30 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_LEFT_2 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_2"; Pos = MAP_APPFONT ( 6 , 42) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_RIGHT_2 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_2"; Pos = MAP_APPFONT ( 109 , 42 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_LEFT_3 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_3"; Pos = MAP_APPFONT ( 6 , 54 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_RIGHT_3 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_3"; Pos = MAP_APPFONT ( 109 , 54 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_LEFT_4 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_4"; Pos = MAP_APPFONT ( 6 , 66 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_RIGHT_4 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_4"; Pos = MAP_APPFONT ( 109 , 66 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; @@ -122,6 +131,7 @@ ModelessDialog RID_SVXDLG_RUBY }; ListBox LB_ADJUST { + HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_ADJUST"; Pos = MAP_APPFONT ( 6 , 93) ; Size = MAP_APPFONT ( 35 , 60 ) ; DropDown = TRUE; @@ -143,6 +153,7 @@ ModelessDialog RID_SVXDLG_RUBY }; ListBox LB_POSITION { + HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_POSITION"; Pos = MAP_APPFONT ( 43 , 93) ; Size = MAP_APPFONT ( 35 , 60 ) ; DropDown = TRUE; @@ -161,6 +172,7 @@ ModelessDialog RID_SVXDLG_RUBY }; ListBox LB_CHAR_STYLE { + HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_CHAR_STYLE"; Pos = MAP_APPFONT ( 80 , 93) ; Size = MAP_APPFONT ( 89 , 60 ) ; DropDown = TRUE; @@ -169,6 +181,7 @@ ModelessDialog RID_SVXDLG_RUBY }; PushButton PB_STYLIST { + HelpID = "svx:PushButton:RID_SVXDLG_RUBY:PB_STYLIST"; Pos = MAP_APPFONT ( 171 , 92 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Styles"; @@ -194,6 +207,7 @@ ModelessDialog RID_SVXDLG_RUBY }; PushButton PB_CLOSE { + HelpID = "svx:PushButton:RID_SVXDLG_RUBY:PB_CLOSE"; Pos = MAP_APPFONT ( 118, 175 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Close"; diff --git a/svx/source/dialog/ruler.hrc b/svx/source/dialog/ruler.hrc index 3381bc1a0b..3381bc1a0b 100644..100755 --- a/svx/source/dialog/ruler.hrc +++ b/svx/source/dialog/ruler.hrc diff --git a/svx/source/dialog/ruler.src b/svx/source/dialog/ruler.src index 13d3045f0f..13d3045f0f 100644..100755 --- a/svx/source/dialog/ruler.src +++ b/svx/source/dialog/ruler.src diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index c4a0b0cb60..18fca58e65 100644..100755 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -31,7 +31,7 @@ #include <tools/string.hxx> #include <svx/dialogs.hrc> -#include "rulritem.hxx" +#include "svx/rulritem.hxx" #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/frame/status/LeftRightMargin.hpp> #include <com/sun/star/frame/status/UpperLowerMargin.hpp> @@ -64,7 +64,7 @@ String SvxLongLRSpaceItem::GetValueText() const #define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : (((TWIP)*127L-36L)/72L)) #define MM100_TO_TWIP(MM100) ((MM100) >= 0 ? (((MM100)*72L+63L)/127L) : (((MM100)*72L-63L)/127L)) -bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -78,7 +78,7 @@ bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem aLeftRightMargin.Left = bConvert ? TWIP_TO_MM100( lLeft ) : lLeft; aLeftRightMargin.Right = bConvert ? TWIP_TO_MM100( lRight ) : lRight; rVal <<= aLeftRightMargin; - return TRUE; + return sal_True; } case MID_LEFT: nVal = lLeft; break; @@ -94,7 +94,7 @@ bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem } // ----------------------------------------------------------------------- -bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -151,7 +151,7 @@ SfxPoolItem* SvxLongLRSpaceItem::Clone(SfxItemPool *) const //------------------------------------------------------------------------ -SvxLongLRSpaceItem::SvxLongLRSpaceItem(long lL, long lR, USHORT nId) +SvxLongLRSpaceItem::SvxLongLRSpaceItem(long lL, long lR, sal_uInt16 nId) : SfxPoolItem(nId), lLeft(lL), lRight(lR) @@ -190,7 +190,7 @@ String SvxLongULSpaceItem::GetValueText() const return String(); } -bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -220,7 +220,7 @@ bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem } // ----------------------------------------------------------------------- -bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -276,7 +276,7 @@ SfxPoolItem* SvxLongULSpaceItem::Clone(SfxItemPool *) const //------------------------------------------------------------------------ -SvxLongULSpaceItem::SvxLongULSpaceItem(long lL, long lR, USHORT nId) +SvxLongULSpaceItem::SvxLongULSpaceItem(long lL, long lR, sal_uInt16 nId) : SfxPoolItem(nId), lLeft(lL), lRight(lR) @@ -308,7 +308,7 @@ int SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const lHeight == ((const SvxPagePosSizeItem &)rCmp).lHeight; } -bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; @@ -338,7 +338,7 @@ bool SvxPagePosSizeItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMem return true; } -bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; @@ -433,7 +433,7 @@ SvxPagePosSizeItem::SvxPagePosSizeItem() void SvxColumnItem::DeleteAndDestroyColumns() { - for( USHORT i = aColumns.Count(); i>0; ) + for( sal_uInt16 i = aColumns.Count(); i>0; ) { SvxColumnDescription *pTmp = (SvxColumnDescription *)aColumns[--i]; aColumns.Remove( i ); @@ -451,19 +451,19 @@ int SvxColumnItem::operator==(const SfxPoolItem& rCmp) const nRight != ((const SvxColumnItem&)rCmp).nRight || bTable != ((const SvxColumnItem&)rCmp).bTable || Count() != ((const SvxColumnItem&)rCmp).Count()) - return FALSE; + return sal_False; - const USHORT nCount = ((const SvxColumnItem&)rCmp).Count(); - for(USHORT i = 0; i < nCount;++i) { + const sal_uInt16 nCount = ((const SvxColumnItem&)rCmp).Count(); + for(sal_uInt16 i = 0; i < nCount;++i) { #if OSL_DEBUG_LEVEL > 1 SvxColumnDescription *p1, *p2; p1 = (SvxColumnDescription *)aColumns[i]; p2 = (SvxColumnDescription *)((const SvxColumnItem&)rCmp).aColumns[i]; #endif if( (*this)[i] != ((const SvxColumnItem&)rCmp)[i] ) - return FALSE; + return sal_False; } - return TRUE; + return sal_True; } //------------------------------------------------------------------------ @@ -495,30 +495,30 @@ SfxPoolItem* SvxColumnItem::Clone( SfxItemPool * ) const //------------------------------------------------------------------------ -SvxColumnItem::SvxColumnItem( USHORT nAct ) : +SvxColumnItem::SvxColumnItem( sal_uInt16 nAct ) : SfxPoolItem( SID_RULER_BORDERS ), nLeft ( 0 ), nRight ( 0 ), nActColumn ( nAct ), - bTable ( FALSE ), - bOrtho (TRUE ) + bTable ( sal_False ), + bOrtho (sal_True ) { } //------------------------------------------------------------------------ -SvxColumnItem::SvxColumnItem( USHORT nActCol, USHORT left, USHORT right ) : +SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, sal_uInt16 left, sal_uInt16 right ) : SfxPoolItem( SID_RULER_BORDERS ), nLeft ( left ), nRight ( right ), nActColumn ( nActCol ), - bTable ( TRUE ), - bOrtho ( TRUE ) + bTable ( sal_True ), + bOrtho ( sal_True ) { } @@ -528,7 +528,7 @@ SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) : SfxPoolItem( rCopy ), - aColumns ( (BYTE)rCopy.Count() ), + aColumns ( (sal_uInt8)rCopy.Count() ), nLeft ( rCopy.nLeft ), nRight ( rCopy.nRight ), nActColumn( rCopy.nActColumn ), @@ -536,9 +536,9 @@ SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) : bOrtho ( rCopy.bOrtho ) { - const USHORT nCount = rCopy.Count(); + const sal_uInt16 nCount = rCopy.Count(); - for ( USHORT i = 0; i < nCount; ++i ) + for ( sal_uInt16 i = 0; i < nCount; ++i ) Append( rCopy[i] ); } @@ -558,37 +558,37 @@ const SvxColumnItem &SvxColumnItem::operator=(const SvxColumnItem &rCopy) bTable = rCopy.bTable; nActColumn = rCopy.nActColumn; DeleteAndDestroyColumns(); - const USHORT nCount = rCopy.Count(); - for(USHORT i = 0; i < nCount;++i) + const sal_uInt16 nCount = rCopy.Count(); + for(sal_uInt16 i = 0; i < nCount;++i) Insert(rCopy[i], i); return *this; } //------------------------------------------------------------------------ -BOOL SvxColumnItem::CalcOrtho() const +sal_Bool SvxColumnItem::CalcOrtho() const { - const USHORT nCount = Count(); + const sal_uInt16 nCount = Count(); DBG_ASSERT(nCount >= 2, "no columns"); if(nCount < 2) - return FALSE; + return sal_False; long nColWidth = (*this)[0].GetWidth(); - for(USHORT i = 1; i < nCount; ++i) { + for(sal_uInt16 i = 1; i < nCount; ++i) { if( (*this)[i].GetWidth() != nColWidth) - return FALSE; + return sal_False; } //!! Wide divider - return TRUE; + return sal_True; } //------------------------------------------------------------------------ long SvxColumnItem::GetVisibleRight() const { - USHORT nIdx = 0; + sal_uInt16 nIdx = 0; - for ( USHORT i = 0; i < nActColumn; ++i ) + for ( sal_uInt16 i = 0; i < nActColumn; ++i ) { if ( (*this)[i].bVisible ) ++nIdx; @@ -596,7 +596,7 @@ long SvxColumnItem::GetVisibleRight() const return (*this)[nIdx].nEnd; } -bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -616,7 +616,7 @@ bool SvxColumnItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) return true; } -bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; sal_Int32 nVal = 0; @@ -628,9 +628,9 @@ bool SvxColumnItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMember } case MID_RIGHT: rVal >>= nRight; break; case MID_LEFT: rVal >>= nLeft; break; - case MID_ORTHO: rVal >>= nVal; bOrtho = (BOOL) nVal; break; - case MID_ACTUAL: rVal >>= nVal; nActColumn = (USHORT) nVal; break; - case MID_TABLE: rVal >>= nVal; bTable = (BOOL) nVal; break; + case MID_ORTHO: rVal >>= nVal; bOrtho = (sal_Bool) nVal; break; + case MID_ACTUAL: rVal >>= nVal; nActColumn = (sal_uInt16) nVal; break; + case MID_TABLE: rVal >>= nVal; bTable = (sal_Bool) nVal; break; default: OSL_FAIL("Wrong MemberId!"); return sal_False; } @@ -679,7 +679,7 @@ SfxPoolItem* SvxObjectItem::Clone(SfxItemPool *) const //------------------------------------------------------------------------ SvxObjectItem::SvxObjectItem( long nSX, long nEX, - long nSY, long nEY, BOOL limits ) : + long nSY, long nEY, sal_Bool limits ) : SfxPoolItem( SID_RULER_OBJECT ), @@ -707,7 +707,7 @@ SvxObjectItem::SvxObjectItem( const SvxObjectItem& rCopy ) : { } -bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -725,10 +725,10 @@ bool SvxObjectItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) return true; } -bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxObjectItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { nMemberId &= ~CONVERT_TWIPS; - BOOL bRet = false; + bool bRet = false; switch ( nMemberId ) { case MID_START_X : bRet = (rVal >>= nStartX); break; diff --git a/svx/source/dialog/sdstring.src b/svx/source/dialog/sdstring.src index 09d6efcb40..fd1cb5e0f0 100644..100755 --- a/svx/source/dialog/sdstring.src +++ b/svx/source/dialog/sdstring.src @@ -1252,3 +1252,26 @@ String RID_SVXSTR_LIBRE_YELLOW_ACCENT_DEF Text = "Yellow Accent" ; }; +String RID_SVXSTR_GALLERYPROPS_GALTHEME +{ + Text [ en-US ] = "Gallery Theme" ; +}; + +//IAccessibility2 Implementation 2009----- +String RID_SVXSTR_GALLERY_THEMEITEMS +{ + Text [ en-US ] = "Theme Items"; +}; +String RID_SVXSTR_GALLERY_THEMENAME +{ + Text [ en-US ] = "Theme Name"; +}; +String RID_SVXSTR_GALLERY_FILESFOUND +{ + Text [ en-US ] = "Files Found"; +}; +String RID_SVXSTR_GALLERY_PREVIEW +{ + Text [ en-US ] = "Preview"; +}; +//-----IAccessibility2 Implementation 2009 diff --git a/svx/source/dialog/sendreportgen.cxx b/svx/source/dialog/sendreportgen.cxx index 75c8d9eb9e..75c8d9eb9e 100644..100755 --- a/svx/source/dialog/sendreportgen.cxx +++ b/svx/source/dialog/sendreportgen.cxx diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx index 2362cc3bea..2362cc3bea 100644..100755 --- a/svx/source/dialog/sendreportunx.cxx +++ b/svx/source/dialog/sendreportunx.cxx diff --git a/svx/source/dialog/sendreportw32.cxx b/svx/source/dialog/sendreportw32.cxx index b50dc0c0ca..2a80b80cbd 100644..100755 --- a/svx/source/dialog/sendreportw32.cxx +++ b/svx/source/dialog/sendreportw32.cxx @@ -81,7 +81,7 @@ static LONG RegWriteValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, if ( ERROR_SUCCESS == lResult ) { - lResult = RegSetValueEx( hKey, lpValueName, NULL, dwType, (CONST BYTE *)lpData, cbData ); + lResult = RegSetValueEx( hKey, lpValueName, NULL, dwType, (CONST sal_uInt8 *)lpData, cbData ); RegCloseKey( hKey ); } @@ -125,14 +125,14 @@ namespace svx{ sizeof(szBuffer) ) ) maEMailAddrED.SetText( (sal_Unicode *)szBuffer ); - DWORD fAllowContact = FALSE; + DWORD fAllowContact = sal_False; RegReadValue( HKEY_CURRENT_USER, TEXT("SOFTWARE\\OpenOffice.org\\CrashReport"), TEXT("AllowContact"), &fAllowContact, sizeof(fAllowContact) ); - maContactCB.Check( (BOOL)fAllowContact ); + maContactCB.Check( (sal_Bool)fAllowContact ); DWORD uInternetConnection = 0; RegReadValue( @@ -237,7 +237,7 @@ namespace svx{ szBuffer, NULL, NULL, - FALSE, + sal_False, 0, NULL, NULL, &StartupInfo, &ProcessInfo ) ) diff --git a/svx/source/dialog/simptabl.cxx b/svx/source/dialog/simptabl.cxx index 30d2c4214e..f4ef702224 100644..100755 --- a/svx/source/dialog/simptabl.cxx +++ b/svx/source/dialog/simptabl.cxx @@ -53,11 +53,11 @@ SvxSimpTblContainer::SvxSimpTblContainer( Window* pParent, const ResId& rResId): long SvxSimpTblContainer::PreNotify( NotifyEvent& rNEvt ) { - long nResult = TRUE; + long nResult = sal_True; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { const KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode(); - USHORT nKey = aKeyCode.GetCode(); + sal_uInt16 nKey = aKeyCode.GetCode(); if ( nKey == KEY_TAB ) GetParent()->Notify( rNEvt ); else if ( m_pTable->IsFocusOnCellEnabled() && ( nKey == KEY_LEFT || nKey == KEY_RIGHT ) ) @@ -79,10 +79,10 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,WinBits nBits ): aPrivContainer(pParent,nBits|WB_DIALOGCONTROL), aHeaderBar(pParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP), nHeaderItemId(1), - bResizeFlag(FALSE), - bPaintFlag(TRUE) + bResizeFlag(sal_False), + bPaintFlag(sal_True) { - bSortDirection=TRUE; + bSortDirection=sal_True; nSortCol=0xFFFF; nOldPos=0; @@ -110,11 +110,11 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,const ResId& rResId): aPrivContainer(pParent,rResId), aHeaderBar(pParent,WB_BUTTONSTYLE | WB_BORDER | WB_TABSTOP), nHeaderItemId(1), - bResizeFlag(TRUE), - bPaintFlag(TRUE) + bResizeFlag(sal_True), + bPaintFlag(sal_True) { - bSortDirection=TRUE; + bSortDirection=sal_True; nOldPos=0; nSortCol=0xFFFF; @@ -151,7 +151,6 @@ SvxSimpleTable::SvxSimpleTable( Window* pParent,const ResId& rResId): InitHeaderBar( &aHeaderBar ); aHeaderBar.Show(); - SetWindowBits(WB_CLIPCHILDREN | WB_HSCROLL); SvHeaderTabListBox::Show(); } @@ -198,18 +197,18 @@ void SvxSimpleTable::SetTabs() { SvHeaderTabListBox::SetTabs(); - USHORT nPrivTabCount = TabCount(); + sal_uInt16 nPrivTabCount = TabCount(); if ( nPrivTabCount ) { if ( nPrivTabCount > aHeaderBar.GetItemCount() ) nPrivTabCount = aHeaderBar.GetItemCount(); - USHORT i, nNewSize = static_cast< USHORT >( GetTab(0) ), nPos = 0; + sal_uInt16 i, nNewSize = static_cast< sal_uInt16 >( GetTab(0) ), nPos = 0; for ( i = 1; i < nPrivTabCount; ++i ) { - nNewSize = static_cast< USHORT >( GetTab(i) ) - nPos; + nNewSize = static_cast< sal_uInt16 >( GetTab(i) ) - nPos; aHeaderBar.SetItemSize( i, nNewSize ); - nPos = (USHORT)GetTab(i); + nPos = (sal_uInt16)GetTab(i); } aHeaderBar.SetItemSize( i, HEADERBAR_FULLSIZE ); // because no tab for last entry @@ -225,8 +224,8 @@ void SvxSimpleTable::Paint( const Rectangle& rRect ) { SvHeaderTabListBox::Paint(rRect ); - USHORT nPrivTabCount = TabCount(); - USHORT nNewSize = ( nPrivTabCount > 0 ) ? (USHORT)GetTab(0) : 0; + sal_uInt16 nPrivTabCount = TabCount(); + sal_uInt16 nNewSize = ( nPrivTabCount > 0 ) ? (sal_uInt16)GetTab(0) : 0; long nOffset=-GetXOffset(); nOldPos=nOffset; @@ -239,17 +238,17 @@ void SvxSimpleTable::Paint( const Rectangle& rRect ) if(nPrivTabCount>aHeaderBar.GetItemCount()) nPrivTabCount=aHeaderBar.GetItemCount(); - USHORT nPos = 0; - for(USHORT i=1;i<nPrivTabCount;i++) + sal_uInt16 nPos = 0; + for(sal_uInt16 i=1;i<nPrivTabCount;i++) { - nNewSize = static_cast< USHORT >( GetTab(i) ) - nPos; + nNewSize = static_cast< sal_uInt16 >( GetTab(i) ) - nPos; aHeaderBar.SetItemSize( i, nNewSize ); - nPos= static_cast< USHORT >( GetTab(i) ); + nPos= static_cast< sal_uInt16 >( GetTab(i) ); } } - bPaintFlag=TRUE; + bPaintFlag=sal_True; } -void SvxSimpleTable::InsertHeaderEntry(const XubString& rText,USHORT nCol, +void SvxSimpleTable::InsertHeaderEntry(const XubString& rText,sal_uInt16 nCol, HeaderBarItemBits nBits) { xub_StrLen nEnd = rText.Search( sal_Unicode( '\t' ) ); @@ -290,7 +289,7 @@ void SvxSimpleTable::HideTable() aPrivContainer.Hide(); } -BOOL SvxSimpleTable::IsVisible() const +sal_Bool SvxSimpleTable::IsVisible() const { return aPrivContainer.IsVisible(); } @@ -305,7 +304,7 @@ void SvxSimpleTable::DisableTable() aPrivContainer.Disable(); } -BOOL SvxSimpleTable::IsEnabled() const +sal_Bool SvxSimpleTable::IsEnabled() const { return aPrivContainer.IsEnabled(); } @@ -359,12 +358,12 @@ void SvxSimpleTable::SetOutputSizePixel(const Size& rNewSize ) UpdateViewSize(); } -USHORT SvxSimpleTable::GetSelectedCol() +sal_uInt16 SvxSimpleTable::GetSelectedCol() { return (aHeaderBar.GetCurItemId()-1); } -void SvxSimpleTable::SortByCol(USHORT nCol,BOOL bDir) +void SvxSimpleTable::SortByCol(sal_uInt16 nCol,sal_Bool bDir) { bSortDirection=bDir; if(nSortCol!=0xFFFF) @@ -393,7 +392,7 @@ void SvxSimpleTable::SortByCol(USHORT nCol,BOOL bDir) void SvxSimpleTable::HBarClick() { - USHORT nId=aHeaderBar.GetCurItemId(); + sal_uInt16 nId=aHeaderBar.GetCurItemId(); if (aHeaderBar.GetItemBits(nId) & HIB_CLICKABLE) { @@ -441,23 +440,23 @@ void SvxSimpleTable::HBarDrag() void SvxSimpleTable::HBarEndDrag() { HideTracking(); - USHORT nPrivTabCount=TabCount(); + sal_uInt16 nPrivTabCount=TabCount(); if(nPrivTabCount) { if(nPrivTabCount>aHeaderBar.GetItemCount()) nPrivTabCount=aHeaderBar.GetItemCount(); - USHORT nPos=0; - USHORT nNewSize=0; - for(USHORT i=1;i<nPrivTabCount;i++) + sal_uInt16 nPos=0; + sal_uInt16 nNewSize=0; + for(sal_uInt16 i=1;i<nPrivTabCount;i++) { - nNewSize = static_cast< USHORT >( aHeaderBar.GetItemSize(i) ) + nPos; + nNewSize = static_cast< sal_uInt16 >( aHeaderBar.GetItemSize(i) ) + nPos; SetTab( i, nNewSize, MAP_PIXEL ); nPos = nNewSize; } } - bPaintFlag=FALSE; + bPaintFlag=sal_False; Invalidate(); Update(); } @@ -519,14 +518,14 @@ IMPL_LINK( SvxSimpleTable, HeaderBarDblClick, HeaderBar*, pCtr) return 0; } -SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvLBoxEntry* pEntry, USHORT nPos ) const +SvLBoxItem* SvxSimpleTable::GetEntryAtPos( SvLBoxEntry* pEntry, sal_uInt16 nPos ) const { DBG_ASSERT(pEntry,"GetEntryText:Invalid Entry"); SvLBoxItem* pItem = NULL; if( pEntry ) { - USHORT nCount = pEntry->ItemCount(); + sal_uInt16 nCount = pEntry->ItemCount(); nPos++; @@ -550,8 +549,8 @@ StringCompare SvxSimpleTable::ColCompare(SvLBoxEntry* pLeft,SvLBoxEntry* pRight) if(pLeftItem != NULL && pRightItem != NULL) { - USHORT nLeftKind=pLeftItem->IsA(); - USHORT nRightKind=pRightItem->IsA(); + sal_uInt16 nLeftKind=pLeftItem->IsA(); + sal_uInt16 nRightKind=pRightItem->IsA(); if(nRightKind == SV_ITEM_ID_LBOXSTRING && nLeftKind == SV_ITEM_ID_LBOXSTRING ) diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index a4cbc709bb..3782832d23 100644..100755 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -41,14 +41,14 @@ #include "srchctrl.hxx" -#include "srchdlg.hxx" +#include "svx/srchdlg.hxx" #include <svl/srchitem.hxx> // class SvxSearchFamilyControllerItem ----------------------------------- SvxSearchController::SvxSearchController ( - USHORT _nId, + sal_uInt16 _nId, SfxBindings& rBind, SvxSearchDialog& rDlg ) : @@ -60,7 +60,7 @@ SvxSearchController::SvxSearchController // ----------------------------------------------------------------------- -void SvxSearchController::StateChanged( USHORT nSID, SfxItemState eState, +void SvxSearchController::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if ( SFX_ITEM_AVAILABLE == eState ) @@ -75,7 +75,7 @@ void SvxSearchController::StateChanged( USHORT nSID, SfxItemState eState, else if ( SID_SEARCH_OPTIONS == nSID ) { DBG_ASSERT( pState->ISA(SfxUInt16Item), "wrong item type" ); - USHORT nFlags = (USHORT)( (SfxUInt16Item*)pState )->GetValue(); + sal_uInt16 nFlags = (sal_uInt16)( (SfxUInt16Item*)pState )->GetValue(); rSrchDlg.EnableControls_Impl( nFlags ); } else if ( SID_SEARCH_ITEM == nSID ) diff --git a/svx/source/dialog/srchctrl.hxx b/svx/source/dialog/srchctrl.hxx index 3547c3ea8b..419e04283b 100644..100755 --- a/svx/source/dialog/srchctrl.hxx +++ b/svx/source/dialog/srchctrl.hxx @@ -41,10 +41,10 @@ class SvxSearchController : public SfxControllerItem SvxSearchDialog& rSrchDlg; protected: - virtual void StateChanged( USHORT, SfxItemState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16, SfxItemState, const SfxPoolItem* pState ); public: - SvxSearchController( USHORT nId, SfxBindings& rBnd, SvxSearchDialog& rDlg ); + SvxSearchController( sal_uInt16 nId, SfxBindings& rBnd, SvxSearchDialog& rDlg ); }; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index ddf13d80d9..81a712fd34 100644..100755 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -57,7 +57,7 @@ #include <toolkit/unohlp.hxx> #define _SVX_SRCHDLG_CXX -#include "srchdlg.hxx" +#include "svx/srchdlg.hxx" #include <svx/dialogs.hrc> #include <svx/svxitems.hrc> @@ -70,7 +70,7 @@ #include <svx/pageitem.hxx> #include "srchctrl.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <editeng/brshitem.hxx> #include <tools/resary.hxx> #include <svx/svxdlg.hxx> @@ -105,7 +105,7 @@ using namespace comphelper; SV_IMPL_VARARR(SrchAttrItemList, SearchAttrItem); #define GetCheckBoxValue( rBox ) \ - rBox.IsEnabled() ? rBox.IsChecked() : FALSE + rBox.IsEnabled() ? rBox.IsChecked() : sal_False #if ENABLE_LAYOUT #undef SVX_RES @@ -117,11 +117,11 @@ struct SearchDlg_Impl FixedText aSearchFormats; FixedText aReplaceFormats; - BOOL bMultiLineEdit : 1, + sal_Bool bMultiLineEdit : 1, bSaveToModule : 1, bFocusOnSearch : 1, bDeltaCalculated : 1; - USHORT* pRanges; + sal_uInt16* pRanges; Timer aSelectionTimer; uno::Reference< frame::XDispatch > xCommand1Dispatch; @@ -136,10 +136,10 @@ struct SearchDlg_Impl #endif /* !ENABLE_LAYOUT */ aSearchFormats ( pParent, SVX_RES( FT_SEARCH_FORMATS ) ), aReplaceFormats ( pParent, SVX_RES( FT_REPLACE_FORMATS ) ), - bMultiLineEdit ( FALSE ), - bSaveToModule ( TRUE ), - bFocusOnSearch ( TRUE ), - bDeltaCalculated( FALSE ), + bMultiLineEdit ( sal_False ), + bSaveToModule ( sal_True ), + bFocusOnSearch ( sal_True ), + bDeltaCalculated( sal_False ), pRanges ( NULL ) { aCommand1URL.Complete = aCommand1URL.Main = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.search:SearchViaComponent1")); @@ -154,14 +154,14 @@ struct SearchDlg_Impl // ----------------------------------------------------------------------- -void ListToStrArr_Impl( USHORT nId, SvStringsDtor& rStrLst, ComboBox& rCBox ) +void ListToStrArr_Impl( sal_uInt16 nId, SvStringsDtor& rStrLst, ComboBox& rCBox ) { SfxStringListItem* pSrchItem = (SfxStringListItem*)SFX_APP()->GetItem( nId ); List* pLst = pSrchItem ? pSrchItem->GetList() : 0; if ( pLst ) - for ( USHORT i = 0; i < pLst->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pLst->Count(); ++i ) { String* pTmp = new String( *(String*)( pLst->GetObject(i) ) ); rStrLst.Insert( pTmp, rStrLst.Count() ); @@ -171,12 +171,12 @@ void ListToStrArr_Impl( USHORT nId, SvStringsDtor& rStrLst, ComboBox& rCBox ) // ----------------------------------------------------------------------- -void StrArrToList_Impl( USHORT nId, const SvStringsDtor& rStrLst ) +void StrArrToList_Impl( sal_uInt16 nId, const SvStringsDtor& rStrLst ) { DBG_ASSERT( rStrLst.Count(), "check in advance"); List aLst; - for ( USHORT i = 0; i < rStrLst.Count(); ++i ) + for ( sal_uInt16 i = 0; i < rStrLst.Count(); ++i ) aLst.Insert( rStrLst[ i ], LIST_APPEND ); SFX_APP()->PutItem( SfxStringListItem( nId, &aLst ) ); @@ -186,13 +186,13 @@ void StrArrToList_Impl( USHORT nId, const SvStringsDtor& rStrLst ) SearchAttrItemList::SearchAttrItemList( const SearchAttrItemList& rList ) : - SrchAttrItemList( (BYTE)rList.Count() ) + SrchAttrItemList( (sal_uInt8)rList.Count() ) { SrchAttrItemList::Insert( &rList, 0 ); SearchAttrItem* _pData = (SearchAttrItem*)GetData(); - for ( USHORT i = Count(); i; --i, ++_pData ) + for ( sal_uInt16 i = Count(); i; --i, ++_pData ) if ( !IsInvalidItem( _pData->pItem ) ) _pData->pItem = _pData->pItem->Clone(); } @@ -215,9 +215,9 @@ void SearchAttrItemList::Put( const SfxItemSet& rSet ) SfxItemIter aIter( rSet ); SearchAttrItem aItem; const SfxPoolItem* pItem = aIter.GetCurItem(); - USHORT nWhich; + sal_uInt16 nWhich; - while ( TRUE ) + while ( sal_True ) { // only test that it is available? if( IsInvalidItem( pItem ) ) @@ -247,7 +247,7 @@ SfxItemSet& SearchAttrItemList::Get( SfxItemSet& rSet ) SfxItemPool* pPool = rSet.GetPool(); SearchAttrItem* _pData = (SearchAttrItem*)GetData(); - for ( USHORT i = Count(); i; --i, ++_pData ) + for ( sal_uInt16 i = Count(); i; --i, ++_pData ) if ( IsInvalidItem( _pData->pItem ) ) rSet.InvalidateItem( pPool->GetWhich( _pData->nSlot ) ); else @@ -261,7 +261,7 @@ void SearchAttrItemList::Clear() { SearchAttrItem* _pData = (SearchAttrItem*)GetData(); - for ( USHORT i = Count(); i; --i, ++_pData ) + for ( sal_uInt16 i = Count(); i; --i, ++_pData ) if ( !IsInvalidItem( _pData->pItem ) ) delete _pData->pItem; SrchAttrItemList::Remove( 0, Count() ); @@ -270,13 +270,13 @@ void SearchAttrItemList::Clear() // ----------------------------------------------------------------------- // Deletes the pointer to the items -void SearchAttrItemList::Remove( USHORT nPos, USHORT nLen ) +void SearchAttrItemList::Remove( sal_uInt16 nPos, sal_uInt16 nLen ) { if ( nPos + nLen > Count() ) nLen = Count() - nPos; SearchAttrItem* _pData = (SearchAttrItem*)GetData() + nPos; - for ( USHORT n = nLen; n; --n, ++_pData ) + for ( sal_uInt16 n = nLen; n; --n, ++_pData ) if ( !IsInvalidItem( _pData->pItem ) ) delete _pData->pItem; @@ -339,13 +339,13 @@ void SearchAttrItemList::Remove( USHORT nPos, USHORT nLen ) aColumnsBtn ( this, SVX_RES( RB_CALC_COLUMNS ) ), \ aAllSheetsCB ( this, SVX_RES( CB_ALL_SHEETS ) ), \ rBindings ( rBind ), \ - bWriter ( FALSE ), \ - bSearch ( TRUE ), \ - bFormat ( FALSE ), \ + bWriter ( sal_False ), \ + bSearch ( sal_True ), \ + bFormat ( sal_False ), \ nOptions ( USHRT_MAX ), \ - bSet ( FALSE ), \ - bReadOnly ( FALSE ), \ - bConstruct ( TRUE ), \ + bSet ( sal_False ), \ + bReadOnly ( sal_False ), \ + bConstruct ( sal_True ), \ nModifyFlag ( 0 ), \ aCalcStr ( THIS_SVX_RES( STR_WORDCALC ) ), \ pImpl ( NULL ), \ @@ -425,7 +425,7 @@ void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset ) void SvxSearchDialog::Construct_Impl() { #if ENABLE_LAYOUT - SetHelpId (SID_SEARCH_DLG); + SetHelpId (".uno:SearchDialog"); #endif /* ENABLE_LAYOUT */ // temporary to avoid incompatibility @@ -484,7 +484,7 @@ void SvxSearchDialog::Construct_Impl() SvtCJKOptions aCJKOptions; if(!aCJKOptions.IsJapaneseFindEnabled()) { - aJapOptionsCB.Check( FALSE ); + aJapOptionsCB.Check( sal_False ); aJapOptionsCB.Hide(); aJapOptionsBtn.Hide(); } @@ -492,6 +492,14 @@ void SvxSearchDialog::Construct_Impl() { aJapMatchFullHalfWidthCB.Hide(); } + + aSimilarityBtn.SetAccessibleRelationLabeledBy(&aSimilarityBox); + aSimilarityBtn.SetAccessibleRelationMemberOf(&aOptionsFL); + aJapOptionsBtn.SetAccessibleRelationLabeledBy(&aJapOptionsCB); + aJapOptionsBtn.SetAccessibleRelationMemberOf(&aOptionsFL); + aRowsBtn.SetAccessibleRelationMemberOf(&aCalcSearchDirFT); + aColumnsBtn.SetAccessibleRelationMemberOf(&aCalcSearchDirFT); + //component extension - show component search buttons if the commands // vnd.sun.star::SearchViaComponent1 and 2 are supported const uno::Reference< frame::XFrame >xFrame = rBindings.GetActiveFrame(); @@ -610,7 +618,7 @@ void SvxSearchDialog::Construct_Impl() // ----------------------------------------------------------------------- -BOOL SvxSearchDialog::Close() +sal_Bool SvxSearchDialog::Close() { // remember strings speichern if ( aSearchStrings.Count() ) @@ -633,12 +641,12 @@ BOOL SvxSearchDialog::Close() rBindings.GetDispatcher()->Execute( FID_SEARCH_OFF, SFX_CALLMODE_SLOT, ppArgs ); rBindings.Execute( SID_SEARCH_DLG ); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- -INT32 SvxSearchDialog::GetTransliterationFlags() const +sal_Int32 SvxSearchDialog::GetTransliterationFlags() const { if (!aMatchCaseCB.IsChecked()) nTransliterationFlags |= TransliterationModules_IGNORE_CASE; @@ -658,10 +666,10 @@ void SvxSearchDialog::SetSaveToModule(bool b) // ----------------------------------------------------------------------- -void SvxSearchDialog::ApplyTransliterationFlags_Impl( INT32 nSettings ) +void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings ) { nTransliterationFlags = nSettings; - BOOL bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE); + sal_Bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE); aMatchCaseCB .Check(!bVal ); bVal = 0 != (nSettings & TransliterationModules_IGNORE_WIDTH); aJapMatchFullHalfWidthCB.Check( !bVal ); @@ -685,9 +693,9 @@ void SvxSearchDialog::Activate() void SvxSearchDialog::InitControls_Impl() { // CaseSensitives AutoComplete - aSearchLB.EnableAutocomplete( TRUE, TRUE ); + aSearchLB.EnableAutocomplete( sal_True, sal_True ); aSearchLB.Show(); - aReplaceLB.EnableAutocomplete( TRUE, TRUE ); + aReplaceLB.EnableAutocomplete( sal_True, sal_True ); aReplaceLB.Show(); aFormatBtn.Disable(); @@ -787,9 +795,9 @@ void SvxSearchDialog::CalculateDelta_Impl() if ( pImpl->bDeltaCalculated ) return; else - pImpl->bDeltaCalculated = TRUE; + pImpl->bDeltaCalculated = sal_True; - ULONG nDelta = 187, nOffset = 0; + sal_uIntPtr nDelta = 187, nOffset = 0; SvtCJKOptions aCJKOptions; pMoreBtn->AddWindow( &aOptionsFL ); @@ -955,7 +963,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) bWriter = ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_WRITER ); - pImpl->bMultiLineEdit = FALSE; + pImpl->bMultiLineEdit = sal_False; if ( !pImpl->bMultiLineEdit ) { @@ -1003,7 +1011,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) CalculateDelta_Impl(); - bool bDraw = FALSE; + bool bDraw = false; if ( pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC ) { Link aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl ); @@ -1061,7 +1069,7 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) aFormatBtn.Hide(); aNoFormatBtn.Hide(); aAttributeBtn.Hide(); - bDraw = TRUE; + bDraw = sal_True; } else { @@ -1093,23 +1101,23 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) // similarity search? if ( ( nModifyFlag & MODIFY_SIMILARITY ) == 0 ) aSimilarityBox.Check( pSearchItem->IsLevenshtein() ); - bSet = TRUE; + bSet = sal_True; FlagHdl_Impl( &aSimilarityBox ); FlagHdl_Impl( &aJapOptionsCB ); - bool bDisableSearch = FALSE; + bool bDisableSearch = false; SfxViewShell* pViewShell = SfxViewShell::Current(); if ( pViewShell ) { - BOOL bText = !bSearchPattern; + sal_Bool bText = !bSearchPattern; if ( pViewShell->HasSelection( bText ) ) EnableControl_Impl( &aSelectionBtn ); else { - aSelectionBtn.Check( FALSE ); + aSelectionBtn.Check( sal_False ); aSelectionBtn.Disable(); } } @@ -1247,9 +1255,9 @@ void SvxSearchDialog::Init_Impl( int bSearchPattern ) if ( aLayoutBtn.IsChecked() ) { - pImpl->bSaveToModule = FALSE; + pImpl->bSaveToModule = sal_False; TemplateHdl_Impl( &aLayoutBtn ); - pImpl->bSaveToModule = TRUE; + pImpl->bSaveToModule = sal_True; } } @@ -1264,8 +1272,8 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, if ( !pImpl->pRanges && pSSet ) { sal_sSize nCnt = 0; - const USHORT* pPtr = pSSet->GetRanges(); - const USHORT* pTmp = pPtr; + const sal_uInt16* pPtr = pSSet->GetRanges(); + const sal_uInt16* pTmp = pPtr; while( *pPtr ) { @@ -1273,8 +1281,8 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, pPtr += 2; } nCnt = pPtr - pTmp + 1; - pImpl->pRanges = new USHORT[nCnt]; - memcpy( pImpl->pRanges, pTmp, sizeof(USHORT) * nCnt ); + pImpl->pRanges = new sal_uInt16[nCnt]; + memcpy( pImpl->pRanges, pTmp, sizeof(sal_uInt16) * nCnt ); } // See to it that are the texts of the attributes are correct @@ -1290,12 +1298,12 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, pSearchList->Put( *pSSet ); if ( !pImpl->bMultiLineEdit ) - aSearchAttrText.SetText( BuildAttrText_Impl( aDesc, TRUE ) ); + aSearchAttrText.SetText( BuildAttrText_Impl( aDesc, sal_True ) ); else - pImpl->aSearchFormats.SetText( BuildAttrText_Impl( aDesc, TRUE ) ); + pImpl->aSearchFormats.SetText( BuildAttrText_Impl( aDesc, sal_True ) ); if ( aDesc.Len() ) - bFormat |= TRUE; + bFormat |= sal_True; } } @@ -1309,12 +1317,12 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, pReplaceList->Put( *pRSet ); if ( !pImpl->bMultiLineEdit ) - aReplaceAttrText.SetText( BuildAttrText_Impl( aDesc, FALSE ) ); + aReplaceAttrText.SetText( BuildAttrText_Impl( aDesc, sal_False ) ); else - pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( aDesc, FALSE ) ); + pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( aDesc, sal_False ) ); if ( aDesc.Len() ) - bFormat |= TRUE; + bFormat |= sal_True; } } } @@ -1326,23 +1334,23 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) if ( pCtrl && !bSet ) SetModifyFlag_Impl( pCtrl ); else - bSet = FALSE; + bSet = sal_False; if ( pCtrl == &aSimilarityBox ) { - BOOL bIsChecked = aSimilarityBox.IsChecked(); + sal_Bool bIsChecked = aSimilarityBox.IsChecked(); if ( bIsChecked ) { aSimilarityBtn.Enable(); - aRegExpBtn.Check( FALSE ); + aRegExpBtn.Check( sal_False ); aRegExpBtn.Disable(); EnableControl_Impl( &aWordBtn ); if ( aLayoutBtn.IsChecked() ) { EnableControl_Impl( &aMatchCaseCB ); - aLayoutBtn.Check( FALSE ); + aLayoutBtn.Check( sal_False ); } aRegExpBtn.Disable(); aLayoutBtn.Disable(); @@ -1380,11 +1388,11 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) { if ( aLayoutBtn.IsChecked() && !bFormat ) { - aWordBtn.Check( FALSE ); + aWordBtn.Check( sal_False ); aWordBtn.Disable(); - aRegExpBtn.Check( FALSE ); + aRegExpBtn.Check( sal_False ); aRegExpBtn.Disable(); - aMatchCaseCB.Check( FALSE ); + aMatchCaseCB.Check( sal_False ); aMatchCaseCB.Disable(); aNotesBtn.Disable(); @@ -1404,7 +1412,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) if ( aRegExpBtn.IsChecked() ) { - aWordBtn.Check( FALSE ); + aWordBtn.Check( sal_False ); aWordBtn.Disable(); aSimilarityBox.Disable(); aSimilarityBtn.Disable(); @@ -1416,7 +1424,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) } // Search-string in place? then enable Buttons - bSet = TRUE; + bSet = sal_True; ModifyHdl_Impl( &aSearchLB ); } } @@ -1427,14 +1435,14 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) aSearchAllBtn.Disable(); else { - bSet = TRUE; + bSet = sal_True; ModifyHdl_Impl( &aSearchLB ); } } if ( &aJapOptionsCB == pCtrl ) { - BOOL bEnableJapOpt = aJapOptionsCB.IsChecked(); + sal_Bool bEnableJapOpt = aJapOptionsCB.IsChecked(); aMatchCaseCB .Enable(!bEnableJapOpt ); aJapMatchFullHalfWidthCB.Enable(!bEnableJapOpt ); aJapOptionsBtn .Enable( bEnableJapOpt ); @@ -1467,22 +1475,22 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) pSearchItem->SetReplaceString( aReplaceLB.GetText() ); if ( pBtn == &aReplaceBtn ) - Remember_Impl( aReplaceLB.GetText(), FALSE ); + Remember_Impl( aReplaceLB.GetText(), sal_False ); else { - Remember_Impl( aSearchLB.GetText(), TRUE ); + Remember_Impl( aSearchLB.GetText(), sal_True ); if ( pBtn == &aReplaceAllBtn ) - Remember_Impl( aReplaceLB.GetText(), FALSE ); + Remember_Impl( aReplaceLB.GetText(), sal_False ); } } - pSearchItem->SetRegExp( FALSE ); - pSearchItem->SetLevenshtein( FALSE ); + pSearchItem->SetRegExp( sal_False ); + pSearchItem->SetLevenshtein( sal_False ); if (GetCheckBoxValue( aRegExpBtn )) - pSearchItem->SetRegExp( TRUE ); + pSearchItem->SetRegExp( sal_True ); else if (GetCheckBoxValue( aSimilarityBox )) - pSearchItem->SetLevenshtein( TRUE ); + pSearchItem->SetLevenshtein( sal_True ); pSearchItem->SetWordOnly( GetCheckBoxValue( aWordBtn ) ); pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) ); @@ -1491,7 +1499,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) pSearchItem->SetSelection( GetCheckBoxValue( aSelectionBtn ) ); pSearchItem->SetUseAsianOptions( GetCheckBoxValue( aJapOptionsCB ) ); - INT32 nFlags = GetTransliterationFlags(); + sal_Int32 nFlags = GetTransliterationFlags(); if( !pSearchItem->IsUseAsianOptions()) nFlags &= (TransliterationModules_IGNORE_CASE | TransliterationModules_IGNORE_WIDTH ); @@ -1535,11 +1543,11 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) String aStr( aSearchLB.GetText() ); if ( aStr.Len() ) - Remember_Impl( aStr, TRUE ); + Remember_Impl( aStr, sal_True ); aStr = aReplaceLB.GetText(); if ( aStr.Len() ) - Remember_Impl( aStr, FALSE ); + Remember_Impl( aStr, sal_False ); } SaveToModule_Impl(); Close(); @@ -1579,7 +1587,7 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) int nRet = aDlg->Execute(); if (RET_OK == nRet) //! true only if FillItemSet of SvxJSearchOptionsPage returns true { - INT32 nFlags = aDlg->GetTransliterationFlags(); + sal_Int32 nFlags = aDlg->GetTransliterationFlags(); pSearchItem->SetTransliterationFlags( nFlags ); ApplyTransliterationFlags_Impl( nFlags ); } @@ -1616,7 +1624,7 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, ComboBox *, pEd ) if ( !bSet ) SetModifyFlag_Impl( pEd ); else - bSet = FALSE; + bSet = sal_False; // Calc allows searching for empty cells. bool bAllowEmptySearch = (pSearchItem->GetAppFlag() == SVX_SEARCHAPP_CALC); @@ -1673,7 +1681,7 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG ) { if ( !pFamilyController ) { - USHORT nId = 0; + sal_uInt16 nId = 0; // Enable templates controller switch ( pSearchItem->GetFamily() ) @@ -1740,13 +1748,13 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG ) if ( !pImpl->bMultiLineEdit ) { - aSearchAttrText.SetText( BuildAttrText_Impl( sDesc, TRUE ) ); - aReplaceAttrText.SetText( BuildAttrText_Impl( sDesc, FALSE ) ); + aSearchAttrText.SetText( BuildAttrText_Impl( sDesc, sal_True ) ); + aReplaceAttrText.SetText( BuildAttrText_Impl( sDesc, sal_False ) ); } else { - pImpl->aSearchFormats.SetText( BuildAttrText_Impl( sDesc, TRUE ) ); - pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( sDesc, FALSE ) ); + pImpl->aSearchFormats.SetText( BuildAttrText_Impl( sDesc, sal_True ) ); + pImpl->aReplaceFormats.SetText( BuildAttrText_Impl( sDesc, sal_False ) ); } EnableControl_Impl( &aFormatBtn ); @@ -1755,16 +1763,16 @@ IMPL_LINK( SvxSearchDialog, TemplateHdl_Impl, Button *, EMPTYARG ) FocusHdl_Impl( bSearch ? &aSearchLB : &aReplaceLB ); } - bSet = TRUE; - pImpl->bSaveToModule = FALSE; + bSet = sal_True; + pImpl->bSaveToModule = sal_False; FlagHdl_Impl( &aLayoutBtn ); - pImpl->bSaveToModule = TRUE; + pImpl->bSaveToModule = sal_True; return 0; } // ----------------------------------------------------------------------- -void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch ) +void SvxSearchDialog::Remember_Impl( const String &rStr,sal_Bool _bSearch ) { if ( !rStr.Len() ) return; @@ -1773,7 +1781,7 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch ) ComboBox* pListBox = _bSearch ? &aSearchLB : &aReplaceLB; // ignore identical strings - for ( USHORT i = 0; i < pArr->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pArr->Count(); ++i ) { if ( COMPARE_EQUAL == (*pArr)[i]->CompareTo( rStr ) ) return; @@ -1785,7 +1793,7 @@ void SvxSearchDialog::Remember_Impl( const String &rStr,BOOL _bSearch ) if ( pArr->Count() >= REMEMBER_SIZE ) { pInsStr = (*pArr)[REMEMBER_SIZE - 1]; - pListBox->RemoveEntry( USHORT(REMEMBER_SIZE - 1) ); + pListBox->RemoveEntry( sal_uInt16(REMEMBER_SIZE - 1) ); pArr->Remove( REMEMBER_SIZE - 1 ); *pInsStr = rStr; } @@ -1805,8 +1813,8 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) aSearchTmplLB .Clear(); aReplaceTmplLB.Clear(); rPool.SetSearchMask( pSearchItem->GetFamily(), SFXSTYLEBIT_ALL ); - aSearchTmplLB.SetUpdateMode( FALSE ); - aReplaceTmplLB.SetUpdateMode( FALSE ); + aSearchTmplLB.SetUpdateMode( sal_False ); + aReplaceTmplLB.SetUpdateMode( sal_False ); SfxStyleSheetBase* pBase = rPool.First(); while ( pBase ) @@ -1816,8 +1824,8 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) aReplaceTmplLB.InsertEntry( pBase->GetName() ); pBase = rPool.Next(); } - aSearchTmplLB.SetUpdateMode( TRUE ); - aReplaceTmplLB.SetUpdateMode( TRUE ); + aSearchTmplLB.SetUpdateMode( sal_True ); + aReplaceTmplLB.SetUpdateMode( sal_True ); aSearchTmplLB.SelectEntryPos(0); if ( aOldSrch.Len() ) @@ -1838,7 +1846,7 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool ) // ----------------------------------------------------------------------- -void SvxSearchDialog::EnableControls_Impl( const USHORT nFlags ) +void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) { if ( nFlags == nOptions ) return; @@ -2073,9 +2081,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) if ( pCtrl == &aSearchLB || pCtrl == &pImpl->aSearchFormats ) { if ( pCtrl->HasChildPathFocus() ) - pImpl->bFocusOnSearch = TRUE; + pImpl->bFocusOnSearch = sal_True; pCtrl = &aSearchLB; - bSearch = TRUE; + bSearch = sal_True; if( nTxtLen ) EnableControl_Impl( &aNoFormatBtn ); @@ -2085,9 +2093,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) } else { - pImpl->bFocusOnSearch = FALSE; + pImpl->bFocusOnSearch = sal_False; pCtrl = &aReplaceLB; - bSearch = FALSE; + bSearch = sal_False; if ( ( !pImpl->bMultiLineEdit && aReplaceAttrText.GetText().Len() ) || ( pImpl->bMultiLineEdit && pImpl->aReplaceFormats.GetText().Len() ) ) @@ -2096,7 +2104,7 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) aNoFormatBtn.Disable(); aAttributeBtn.Disable(); } - bSet = TRUE; + bSet = sal_True; aSearchLB.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) ); @@ -2126,14 +2134,14 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG ) return 0; sal_sSize nCnt = 0; - const USHORT* pPtr = pImpl->pRanges; - const USHORT* pTmp = pPtr; + const sal_uInt16* pPtr = pImpl->pRanges; + const sal_uInt16* pTmp = pPtr; while( *pTmp ) pTmp++; nCnt = pTmp - pPtr + 7; - USHORT* pWhRanges = new USHORT[nCnt]; - USHORT nPos = 0; + sal_uInt16* pWhRanges = new sal_uInt16[nCnt]; + sal_uInt16 nPos = 0; while( *pPtr ) { @@ -2143,7 +2151,7 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG ) pWhRanges[nPos++] = SID_ATTR_PARA_MODEL; pWhRanges[nPos++] = SID_ATTR_PARA_MODEL; - USHORT nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH); + sal_uInt16 nBrushWhich = pSh->GetPool().GetWhich(SID_ATTR_BRUSH); pWhRanges[nPos++] = nBrushWhich; pWhRanges[nPos++] = nBrushWhich; pWhRanges[nPos++] = SID_PARA_BACKGRND_DESTINATION; @@ -2189,10 +2197,10 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG ) SearchAttrItem* pAItem; const SfxPoolItem* pItem; - for( USHORT n = 0; n < pList->Count(); ++n ) + for( sal_uInt16 n = 0; n < pList->Count(); ++n ) if( !IsInvalidItem( (pAItem = &pList->GetObject(n))->pItem ) && SFX_ITEM_SET == aOutSet.GetItemState( - pAItem->pItem->Which(), FALSE, &pItem ) ) + pAItem->pItem->Which(), sal_False, &pItem ) ) { delete pAItem->pItem; pAItem->pItem = pItem->Clone(); @@ -2215,8 +2223,8 @@ IMPL_LINK( SvxSearchDialog, FormatHdl_Impl, Button *, EMPTYARG ) IMPL_LINK( SvxSearchDialog, NoFormatHdl_Impl, Button *, EMPTYARG ) { aLayoutBtn.SetText( aStylesStr ); - bFormat = FALSE; - aLayoutBtn.Check( FALSE ); + bFormat = sal_False; + aLayoutBtn.Check( sal_False ); if ( bSearch ) { @@ -2234,9 +2242,9 @@ IMPL_LINK( SvxSearchDialog, NoFormatHdl_Impl, Button *, EMPTYARG ) pImpl->aReplaceFormats.SetText( String() ); pReplaceList->Clear(); } - pImpl->bSaveToModule = FALSE; + pImpl->bSaveToModule = sal_False; TemplateHdl_Impl( &aLayoutBtn ); - pImpl->bSaveToModule = TRUE; + pImpl->bSaveToModule = sal_True; aNoFormatBtn.Disable(); return 0; } @@ -2272,7 +2280,7 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer ) EnableControl_Impl( &aSelectionBtn ); else { - aSelectionBtn.Check( FALSE ); + aSelectionBtn.Check( sal_False ); aSelectionBtn.Disable(); } } @@ -2314,7 +2322,7 @@ void SvxSearchDialog::GetReplaceItems( SfxItemSet& rSet ) // ----------------------------------------------------------------------- String& SvxSearchDialog::BuildAttrText_Impl( String& rStr, - BOOL bSrchFlag ) const + sal_Bool bSrchFlag ) const { if ( rStr.Len() ) rStr.Erase(); @@ -2349,10 +2357,10 @@ String& SvxSearchDialog::BuildAttrText_Impl( String& rStr, case FUNIT_100TH_MM: eMapUnit = SFX_MAPUNIT_100TH_MM; break; default: ;//prevent warning } - + ResStringArray aAttrNames( SVX_RES( RID_ATTR_NAMES ) ); - for ( USHORT i = 0; i < pList->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pList->Count(); ++i ) { const SearchAttrItem& rItem = pList->GetObject(i); @@ -2390,7 +2398,7 @@ void SvxSearchDialog::PaintAttrText_Impl() BuildAttrText_Impl( aDesc, bSearch ); if ( !bFormat && aDesc.Len() ) - bFormat = TRUE; + bFormat = sal_True; if ( bSearch ) { @@ -2464,15 +2472,15 @@ void SvxSearchDialog::SaveToModule_Impl() { pSearchItem->SetSearchString ( aSearchLB.GetText() ); pSearchItem->SetReplaceString( aReplaceLB.GetText() ); - Remember_Impl( aSearchLB.GetText(), TRUE ); + Remember_Impl( aSearchLB.GetText(), sal_True ); } - pSearchItem->SetRegExp( FALSE ); - pSearchItem->SetLevenshtein( FALSE ); + pSearchItem->SetRegExp( sal_False ); + pSearchItem->SetLevenshtein( sal_False ); if (GetCheckBoxValue( aRegExpBtn )) - pSearchItem->SetRegExp( TRUE ); + pSearchItem->SetRegExp( sal_True ); else if (GetCheckBoxValue( aSimilarityBox )) - pSearchItem->SetLevenshtein( TRUE ); + pSearchItem->SetLevenshtein( sal_True ); pSearchItem->SetWordOnly( GetCheckBoxValue( aWordBtn ) ); pSearchItem->SetBackward( GetCheckBoxValue( aBackwardsBtn ) ); @@ -2481,7 +2489,7 @@ void SvxSearchDialog::SaveToModule_Impl() pSearchItem->SetSelection( GetCheckBoxValue( aSelectionBtn ) ); pSearchItem->SetUseAsianOptions( GetCheckBoxValue( aJapOptionsCB ) ); - INT32 nFlags = GetTransliterationFlags(); + sal_Int32 nFlags = GetTransliterationFlags(); if( !pSearchItem->IsUseAsianOptions()) nFlags &= (TransliterationModules_IGNORE_CASE | TransliterationModules_IGNORE_WIDTH ); @@ -2508,7 +2516,7 @@ SFX_IMPL_CHILDWINDOW(SvxSearchDialogWrapper, SID_SEARCH_DLG); // ----------------------------------------------------------------------- -SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, USHORT nId, +SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) @@ -2522,7 +2530,7 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper( Window* _pParent, USHORT nId, pBindings->Update( SID_SEARCH_SEARCHSET ); pBindings->Update( SID_SEARCH_REPLACESET ); eChildAlignment = SFX_ALIGN_NOALIGNMENT; - dialog->bConstruct = FALSE; + dialog->bConstruct = sal_False; } SvxSearchDialogWrapper::~SvxSearchDialogWrapper () diff --git a/svx/source/dialog/srchdlg.hrc b/svx/source/dialog/srchdlg.hrc index 90ce20f467..90ce20f467 100644..100755 --- a/svx/source/dialog/srchdlg.hrc +++ b/svx/source/dialog/srchdlg.hrc diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src index f00a6c8093..c3ddec8bfb 100644..100755 --- a/svx/source/dialog/srchdlg.src +++ b/svx/source/dialog/srchdlg.src @@ -29,6 +29,7 @@ #include <svx/dialogs.hrc> #include "srchdlg.hrc" +#include <sfx2/sfxcommands.h> #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ; @@ -51,7 +52,7 @@ String RID_SVXSTR_REPLACE ModelessDialog RID_SVXDLG_SEARCH { - HelpId = SID_SEARCH_DLG ; + HelpId = CMD_SID_SEARCH_DLG ; OutputSize = TRUE ; Hide = TRUE ; SvLook = TRUE ; @@ -66,6 +67,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ComboBox ED_SEARCH { + HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_SEARCH"; Pos = MAP_APPFONT ( 6 , 18 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; TabStop = TRUE ; @@ -73,6 +75,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ListBox LB_SEARCH { + HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_SEARCH"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 18 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; @@ -103,6 +106,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ComboBox ED_REPLACE { + HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_REPLACE"; Pos = MAP_APPFONT ( 6 , 65 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; TabStop = TRUE ; @@ -110,6 +114,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ListBox LB_REPLACE { + HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_REPLACE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 65 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; @@ -134,6 +139,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_SEARCH { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH"; Pos = MAP_APPFONT ( 144 , 9 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Find" ; @@ -142,6 +148,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_SEARCH_ALL { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL"; Pos = MAP_APPFONT ( 144 , 26 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Find ~All" ; @@ -154,6 +161,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_REPLACE { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE"; Pos = MAP_APPFONT ( 144 , 56 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Replace" ; @@ -161,6 +169,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_REPLACE_ALL { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE_ALL"; Pos = MAP_APPFONT ( 144 , 73 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Replace A~ll" ; @@ -174,6 +183,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_COMPONENT_1 { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_1"; Pos = MAP_APPFONT ( 144 , 103 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -181,6 +191,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_COMPONENT_2 { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_2"; Pos = MAP_APPFONT ( 144 , 120 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -188,6 +199,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_MATCH_CASE { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_MATCH_CASE"; Pos = MAP_APPFONT ( 12 , 101 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; TabStop = TRUE ; @@ -195,6 +207,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_WHOLE_WORDS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_WHOLE_WORDS"; Pos = MAP_APPFONT ( 12 , 114 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Whole wor~ds only" ; @@ -207,6 +220,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; MoreButton BTN_MORE { + HelpID = "svx:MoreButton:RID_SVXDLG_SEARCH:BTN_MORE"; Pos = MAP_APPFONT ( 6 , 135 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -235,6 +249,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_SELECTIONS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SELECTIONS"; Pos = MAP_APPFONT ( 12 , 163 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "C~urrent selection only" ; @@ -243,6 +258,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_BACKWARDS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_BACKWARDS"; Pos = MAP_APPFONT ( 12 , 176 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Bac~kwards" ; @@ -251,6 +267,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_REGEXP { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_REGEXP"; Pos = MAP_APPFONT ( 12 , 189 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Regular e~xpressions" ; @@ -259,6 +276,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_SIMILARITY { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SIMILARITY"; Pos = MAP_APPFONT ( 12 , 204 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; Text [ en-US ] = "S~imilarity search" ; @@ -267,6 +285,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton PB_SIMILARITY { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_SIMILARITY"; Pos = MAP_APPFONT ( 124 , 202 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~..." ; @@ -275,6 +294,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_LAYOUTS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_LAYOUTS"; Pos = MAP_APPFONT ( 12 , 219 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Search for St~yles" ; @@ -283,6 +303,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_NOTES { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES"; Pos = MAP_APPFONT ( 12 , 232 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; TabStop = TRUE ; @@ -290,6 +311,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_JAP_MATCH_FULL_HALF_WIDTH { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_MATCH_FULL_HALF_WIDTH"; Pos = MAP_APPFONT ( 12 , 247 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; TabStop = TRUE ; @@ -298,6 +320,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_JAP_SOUNDS_LIKE { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_SOUNDS_LIKE"; Pos = MAP_APPFONT ( 12 , 260 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; TabStop = TRUE ; @@ -306,6 +329,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton PB_JAP_OPTIONS { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_JAP_OPTIONS"; Pos = MAP_APPFONT ( 124 , 258 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "..." ; @@ -314,6 +338,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_ATTRIBUTE { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE"; Pos = MAP_APPFONT ( 144 , 163 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Attri~butes..." ; @@ -322,6 +347,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_FORMAT { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_FORMAT"; Pos = MAP_APPFONT ( 144 , 180 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "For~mat..." ; @@ -330,6 +356,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_NOFORMAT { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_NOFORMAT"; Pos = MAP_APPFONT ( 144 , 197 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~No Format" ; @@ -351,6 +378,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ListBox LB_CALC_SEARCHIN { + HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_CALC_SEARCHIN"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 283 ) ; Size = MAP_APPFONT ( 63 , 48 ) ; @@ -373,6 +401,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; RadioButton RB_CALC_ROWS { + HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_ROWS"; Pos = MAP_APPFONT ( 75 , 300 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; Text [ en-US ] = "Ro~ws" ; @@ -380,6 +409,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; RadioButton RB_CALC_COLUMNS { + HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_COLUMNS"; Pos = MAP_APPFONT ( 75 , 313 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; Text [ en-US ] = "Colu~mns" ; @@ -387,6 +417,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_ALL_SHEETS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_ALL_SHEETS"; Pos = MAP_APPFONT ( 12 , 326 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Search in all sheets" ; diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx index 16d0853b98..16d0853b98 100644..100755 --- a/svx/source/dialog/stddlg.cxx +++ b/svx/source/dialog/stddlg.cxx diff --git a/svx/source/dialog/strarray.cxx b/svx/source/dialog/strarray.cxx index 4ac0736121..4ac0736121 100644..100755 --- a/svx/source/dialog/strarray.cxx +++ b/svx/source/dialog/strarray.cxx diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index e5acd253e9..d437fc710a 100644..100755 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -38,7 +38,7 @@ #include <editeng/numitem.hxx> #include <svl/eitem.hxx> #include <vcl/svapp.hxx> -#include <gallery.hxx> +#include <svx/gallery.hxx> #include <svl/urihelper.hxx> #include <editeng/brshitem.hxx> #include <svl/intitem.hxx> @@ -46,14 +46,14 @@ #include <vcl/graph.hxx> #include <vcl/msgbox.hxx> #include <editeng/flstitem.hxx> -#include <dlgutil.hxx> +#include <svx/dlgutil.hxx> #ifndef _XTABLE_HXX //autogen #include <svx/xtable.hxx> #endif -#include <drawitem.hxx> -#include <numvset.hxx> -#include <htmlmode.hxx> +#include <svx/drawitem.hxx> +#include <svx/numvset.hxx> +#include <svx/htmlmode.hxx> #include <unotools/pathoptions.hxx> #include <svtools/ctrltool.hxx> #include <editeng/unolingu.hxx> @@ -115,7 +115,7 @@ static const sal_Unicode aBulletTypes[] = static Font& lcl_GetDefaultBulletFont() { - static BOOL bInit = 0; + static sal_Bool bInit = 0; static Font aDefBulletFont( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "StarSymbol" ) ), String(), Size( 0, 14 ) ); @@ -125,8 +125,8 @@ static Font& lcl_GetDefaultBulletFont() aDefBulletFont.SetFamily( FAMILY_DONTKNOW ); aDefBulletFont.SetPitch( PITCH_DONTKNOW ); aDefBulletFont.SetWeight( WEIGHT_DONTKNOW ); - aDefBulletFont.SetTransparent( TRUE ); - bInit = TRUE; + aDefBulletFont.SetTransparent( sal_True ); + bInit = sal_True; } return aDefBulletFont; } @@ -152,7 +152,7 @@ static void lcl_PaintLevel(OutputDevice* pVDev, sal_Int16 nNumberingType, } void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) { - static USHORT const aLinesArr[] = + static sal_uInt16 aLinesArr[] = { 15, 10, 20, 30, @@ -172,7 +172,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) OutputDevice* pDev = rUDEvt.GetDevice(); Rectangle aRect = rUDEvt.GetRect(); - USHORT nItemId = rUDEvt.GetItemId(); + sal_uInt16 nItemId = rUDEvt.GetItemId(); long nRectWidth = aRect.GetWidth(); long nRectHeight = aRect.GetHeight(); Size aRectSize(nRectWidth, aRect.GetHeight()); @@ -221,7 +221,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) { Point aStart(aBLPos.X() + nRectWidth *25 / 100,0); Point aEnd(aBLPos.X() + nRectWidth * 9 / 10,0); - for( USHORT i = 11; i < 100; i += 33) + for( sal_uInt16 i = 11; i < 100; i += 33) { aStart.Y() = aEnd.Y() = aBLPos.Y() + nRectHeight * i / 100; pVDev->DrawLine(aStart, aEnd); @@ -239,9 +239,9 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) NUM_PAGETYPE_BULLET == nPageType ) { Point aStart(aBLPos.X() + nRectWidth / 9,0); - for( USHORT i = 0; i < 3; i++ ) + for( sal_uInt16 i = 0; i < 3; i++ ) { - USHORT nY = 11 + i * 33; + sal_uInt16 nY = 11 + i * 33; aStart.Y() = aBLPos.Y() + nRectHeight * nY / 100; String sText; if(nPageType == NUM_PAGETYPE_BULLET) @@ -394,7 +394,7 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) #ifdef DBG_UTIL catch(Exception&) { - static sal_Bool bAssert = FALSE; + static sal_Bool bAssert = sal_False; if(!bAssert) { OSL_FAIL("exception in ::UserDraw"); @@ -416,13 +416,13 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) pDev->SetLineColor(aOldColor); } -SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nType ) : +SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, sal_uInt16 nType ) : ValueSet( pParent, rResId ), aLineColor ( COL_LIGHTGRAY ), nPageType ( nType ), - bHTMLMode ( FALSE ), + bHTMLMode ( sal_False ), pVDev ( NULL ) { SetColCount( 4 ); @@ -430,7 +430,7 @@ SvxNumValueSet::SvxNumValueSet( Window* pParent, const ResId& rResId, USHORT nTy SetStyle( GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER ); if(NUM_PAGETYPE_BULLET == nType) { - for ( USHORT i = 0; i < 8; i++ ) + for ( sal_uInt16 i = 0; i < 8; i++ ) { InsertItem( i + 1, i ); SetItemText( i + 1, SVX_RESSTR( RID_SVXSTR_BULLET_DESCRIPTIONS + i ) ); @@ -453,7 +453,7 @@ void SvxNumValueSet::SetNumberingSettings( aLocale = rLocale; if(aNum.getLength() > 8) SetStyle( GetStyle()|WB_VSCROLL); - for ( USHORT i = 0; i < aNum.getLength(); i++ ) + for ( sal_uInt16 i = 0; i < aNum.getLength(); i++ ) { InsertItem( i + 1, i ); if( i < 8 ) @@ -482,7 +482,7 @@ void SvxNumValueSet::SetOutlineNumberingSettings( SvxBmpNumValueSet::SvxBmpNumValueSet( Window* pParent, const ResId& rResId ) : SvxNumValueSet( pParent, rResId, NUM_PAGETYPE_BMP ), - bGrfNotFound( FALSE ) + bGrfNotFound( sal_False ) { GalleryExplorer::BeginLocking(GALLERY_THEME_BULLETS); @@ -504,7 +504,7 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) Rectangle aRect = rUDEvt.GetRect(); OutputDevice* pDev = rUDEvt.GetDevice(); - USHORT nItemId = rUDEvt.GetItemId(); + sal_uInt16 nItemId = rUDEvt.GetItemId(); Point aBLPos = aRect.TopLeft(); int nRectHeight = aRect.GetHeight(); @@ -514,14 +514,14 @@ void SvxBmpNumValueSet::UserDraw( const UserDrawEvent& rUDEvt ) if(!GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nItemId - 1, &aGraphic, NULL)) { - bGrfNotFound = TRUE; + bGrfNotFound = sal_True; } else { Point aPos(aBLPos.X() + 5, 0); - for( USHORT i = 0; i < 3; i++ ) + for( sal_uInt16 i = 0; i < 3; i++ ) { - USHORT nY = 11 + i * 33; + sal_uInt16 nY = 11 + i * 33; aPos.Y() = aBLPos.Y() + nRectHeight * nY / 100; aGraphic.Draw( pDev, aPos, aSize ); } @@ -533,7 +533,7 @@ IMPL_LINK(SvxBmpNumValueSet, FormatHdl_Impl, Timer*, EMPTYARG) // only when a graphics was not there, it needs to be formatted if(bGrfNotFound) { - bGrfNotFound = FALSE; + bGrfNotFound = sal_False; Format(); } Invalidate(); diff --git a/svx/source/dialog/svxbmpnumvalueset.src b/svx/source/dialog/svxbmpnumvalueset.src index ad43a5ee9e..ad43a5ee9e 100644..100755 --- a/svx/source/dialog/svxbmpnumvalueset.src +++ b/svx/source/dialog/svxbmpnumvalueset.src diff --git a/svx/source/dialog/svxdlg.cxx b/svx/source/dialog/svxdlg.cxx index da5caf40e5..da5caf40e5 100644..100755 --- a/svx/source/dialog/svxdlg.cxx +++ b/svx/source/dialog/svxdlg.cxx diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx index f2e248e338..670f0217eb 100644..100755 --- a/svx/source/dialog/svxgrahicitem.cxx +++ b/svx/source/dialog/svxgrahicitem.cxx @@ -28,9 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svxgrahicitem.hxx" +#include "svx/svxgrahicitem.hxx" TYPEINIT1(SvxGraphicItem,SfxPoolItem); -SvxGraphicItem::SvxGraphicItem( USHORT _nWhich, const Graphic& rGraphic ) +SvxGraphicItem::SvxGraphicItem( sal_uInt16 _nWhich, const Graphic& rGraphic ) : SfxPoolItem( _nWhich ), aGraphic( rGraphic ) { diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 513a5d73a7..ccf2de495a 100644..100755 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -49,15 +49,37 @@ #include <svx/dialmgr.hxx> #include <svx/ruler.hxx> #include "rlrcitem.hxx" -#include "rulritem.hxx" +#include "svx/rulritem.hxx" #include <editeng/tstpitem.hxx> #include <editeng/lrspitem.hxx> #include "editeng/protitem.hxx" #include <vcl/svapp.hxx> #ifndef RULER_TAB_RTL -#define RULER_TAB_RTL ((USHORT)0x0010) +#define RULER_TAB_RTL ((sal_uInt16)0x0010) #endif +#include <comphelper/uieventslogger.hxx> + +namespace +{ + void lcl_logRulerUse(const ::rtl::OUString& sURL) //#i99729# + { + using namespace ::com::sun::star; + util::URL aTargetURL; + aTargetURL.Complete = sURL; + aTargetURL.Main = sURL; + if(::comphelper::UiEventsLogger::isEnabled()) //#i88653# + { + ::rtl::OUString sAppName; + uno::Sequence<beans::PropertyValue> source; + ::comphelper::UiEventsLogger::appendDispatchOrigin(source, sAppName, ::rtl::OUString::createFromAscii("SfxRuler")); + ::comphelper::UiEventsLogger::logDispatch(aTargetURL, source); + } + } +} + + + // STATIC DATA ----------------------------------------------------------- #define CTRL_ITEM_COUNT 14 @@ -89,7 +111,7 @@ void Debug_Impl(Window *pWin, SvxColumnItem& rColItem) aTmp += String(ToMM(pWin, rColItem.GetLeft())); aTmp += " ColRight: "; aTmp += String(ToMM(pWin, rColItem.GetRight())); - for(USHORT i = 0; i < rColItem.Count(); ++i) { + for(sal_uInt16 i = 0; i < rColItem.Count(); ++i) { aTmp += " Start: "; aTmp += String(ToMM(pWin, rColItem[i].nStart)); aTmp += " End: "; @@ -123,7 +145,7 @@ void DebugTabStops_Impl(const SvxTabStopItem& rTabs) String aTmp("Tabs: "); // Delete Def Tabs - for(USHORT i = 0; i < rTabs.Count(); ++i) + for(sal_uInt16 i = 0; i < rTabs.Count(); ++i) { aTmp += String(rTabs[i].GetTabPos() / 56); aTmp += " : "; @@ -187,7 +209,7 @@ void RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const Stri } String sContent(String::CreateFromAscii(pDescription)); sContent += rText; - USHORT nPos = pDebugWindow->GetLBox().InsertEntry(sContent); + sal_uInt16 nPos = pDebugWindow->GetLBox().InsertEntry(sContent); pDebugWindow->GetLBox().SelectEntryPos(nPos); pDebugWindow->GrabFocus(); } @@ -205,9 +227,9 @@ void RulerDebugWindow::AddDebugText(const sal_Char* pDescription, const Stri #endif struct SvxRuler_Impl { - USHORT *pPercBuf; - USHORT *pBlockBuf; - USHORT nPercSize; + sal_uInt16 *pPercBuf; + sal_uInt16 *pBlockBuf; + sal_uInt16 nPercSize; long nTotalDist; long lOldWinPos; long lMaxLeftLogic; @@ -216,15 +238,15 @@ struct SvxRuler_Impl { long lLastRMargin; SvxProtectItem aProtectItem; SfxBoolItem* pTextRTLItem; - USHORT nControlerItems; - USHORT nIdx; - USHORT nColLeftPix, nColRightPix; // Pixel values for left / right edge + sal_uInt16 nControlerItems; + sal_uInt16 nIdx; + sal_uInt16 nColLeftPix, nColRightPix; // Pixel values for left / right edge // For columns; buffered to prevent // recalculation errors // May be has to be widen for future values - BOOL bIsTableRows : 1; // pColumnItem contains table rows instead of columns + sal_Bool bIsTableRows : 1; // pColumnItem contains table rows instead of columns //#i24363# tab stops relative to indent - BOOL bIsTabsRelativeToIndent : 1; // Tab stops relative to paragraph indent? + sal_Bool bIsTabsRelativeToIndent : 1; // Tab stops relative to paragraph indent? SvxRuler_Impl() : pPercBuf(0), pBlockBuf(0), nPercSize(0), nTotalDist(0), @@ -236,8 +258,8 @@ struct SvxRuler_Impl { nIdx(0), nColLeftPix(0), nColRightPix(0), - bIsTableRows(FALSE), - bIsTabsRelativeToIndent(TRUE) + bIsTableRows(sal_False), + bIsTabsRelativeToIndent(sal_True) { } ~SvxRuler_Impl() @@ -246,22 +268,22 @@ struct SvxRuler_Impl { delete[] pPercBuf; delete[] pBlockBuf; pPercBuf = 0; delete pTextRTLItem; } - void SetPercSize(USHORT nSize); + void SetPercSize(sal_uInt16 nSize); }; -void SvxRuler_Impl::SetPercSize(USHORT nSize) +void SvxRuler_Impl::SetPercSize(sal_uInt16 nSize) { if(nSize > nPercSize) { delete[] pPercBuf; delete[] pBlockBuf; - pPercBuf = new USHORT[nPercSize = nSize]; - pBlockBuf = new USHORT[nPercSize = nSize]; + pPercBuf = new sal_uInt16[nPercSize = nSize]; + pBlockBuf = new sal_uInt16[nPercSize = nSize]; } - size_t nSize2 = sizeof(USHORT) * nPercSize; + size_t nSize2 = sizeof(sal_uInt16) * nPercSize; memset(pPercBuf, 0, nSize2); memset(pBlockBuf, 0, nSize2); } @@ -297,7 +319,7 @@ SvxRuler::SvxRuler Window* pParent, // StarView Parent Window* pWin, // Output window: is used for conversion // logical units <-> pixels - USHORT flags, // Display flags, see ruler.hxx + sal_uInt16 flags, // Display flags, see ruler.hxx SfxBindings &rBindings, // associated Bindings WinBits nWinStyle // StarView WinBits ) @@ -314,7 +336,7 @@ SvxRuler::SvxRuler pObjectItem(0), pEditWin(pWin), pRuler_Imp(new SvxRuler_Impl), - bAppSetNullOffset(FALSE), // Is the 0-offset of the ruler set by the application? + bAppSetNullOffset(sal_False), // Is the 0-offset of the ruler set by the application? lLogicNullOffset(0), lAppNullOffset(LONG_MAX), lMinFrame(5), @@ -335,9 +357,9 @@ SvxRuler::SvxRuler nDragOffset(0), nMaxLeft(0), nMaxRight(0), - bValid(FALSE), - bListening(FALSE), - bActive(TRUE) + bValid(sal_False), + bListening(sal_False), + bActive(sal_True) /* [Description] @@ -349,18 +371,18 @@ SvxRuler::SvxRuler rBindings.EnterRegistrations(); // Create Supported Items - USHORT i = 0; + sal_uInt16 i = 0; // Page edges pCtrlItem[i++] = new SvxRulerItem(SID_RULER_LR_MIN_MAX, *this, rBindings); if((nWinStyle & WB_VSCROLL) == WB_VSCROLL) { - bHorz = FALSE; + bHorz = sal_False; pCtrlItem[i++] = new SvxRulerItem(SID_ATTR_LONG_ULSPACE, *this, rBindings); } else { - bHorz = TRUE; + bHorz = sal_True; pCtrlItem[i++] = new SvxRulerItem(SID_ATTR_LONG_LRSPACE, *this, rBindings); } @@ -369,7 +391,7 @@ SvxRuler::SvxRuler if((nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS) { - USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL; + sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL; pCtrlItem[i++] = new SvxRulerItem(nTabStopId, *this, rBindings); SetExtraType(RULER_EXTRA_TAB, nDefTabType); } @@ -390,7 +412,7 @@ SvxRuler::SvxRuler pIndents[INDENT_RIGHT_MARGIN].nStyle = RULER_INDENT_BOTTOM; pIndents[INDENT_LEFT_BORDER].nStyle = RULER_INDENT_BORDER; pIndents[INDENT_RIGHT_BORDER].nStyle = RULER_INDENT_BORDER; - for(USHORT nIn = 0; nIn < 7; nIn++) + for(sal_uInt16 nIn = 0; nIn < 7; nIn++) pIndents[nIn].nPos = 0; } @@ -408,7 +430,7 @@ SvxRuler::SvxRuler pObjectBorders = new RulerBorder[OBJECT_BORDER_COUNT]; size_t nSize = sizeof( RulerBorder ) * OBJECT_BORDER_COUNT; memset(pObjectBorders, 0, nSize); - for(USHORT nBorder = 0; nBorder < OBJECT_BORDER_COUNT; ++nBorder) + for(sal_uInt16 nBorder = 0; nBorder < OBJECT_BORDER_COUNT; ++nBorder) { pObjectBorders[nBorder].nPos = 0; pObjectBorders[nBorder].nWidth = 0; @@ -441,7 +463,7 @@ SvxRuler::~SvxRuler() pBindings->EnterRegistrations(); - for(USHORT i = 0; i < CTRL_ITEM_COUNT && pCtrlItem[i]; ++i) + for(sal_uInt16 i = 0; i < CTRL_ITEM_COUNT && pCtrlItem[i]; ++i) delete pCtrlItem[i]; delete[] pCtrlItem; @@ -554,7 +576,7 @@ long SvxRuler::PixelAdjust(long nVal, long nValOld) const } -inline USHORT SvxRuler::GetObjectBordersOff(USHORT nIdx) const +inline sal_uInt16 SvxRuler::GetObjectBordersOff(sal_uInt16 nIdx) const { return bHorz? nIdx: nIdx + 2; } @@ -569,7 +591,7 @@ void SvxRuler::UpdateFrame() */ { - const USHORT nMarginStyle = + const sal_uInt16 nMarginStyle = ( pRuler_Imp->aProtectItem.IsSizeProtected() || pRuler_Imp->aProtectItem.IsPosProtected() ) ? 0 : RULER_MARGIN_SIZEABLE; @@ -597,7 +619,7 @@ void SvxRuler::UpdateFrame() else lRight = pLRSpaceItem->GetRight(); - ULONG aWidth= + sal_uIntPtr aWidth= ConvertHPosPixel(pPagePosItem->GetWidth() - lRight - lLogicNullOffset + lAppNullOffset); SetMargin2( aWidth, nMarginStyle ); @@ -634,8 +656,8 @@ void SvxRuler::UpdateFrame() } if(pColumnItem) { - pRuler_Imp->nColLeftPix = (USHORT) ConvertSizePixel(pColumnItem->GetLeft()); - pRuler_Imp->nColRightPix = (USHORT) ConvertSizePixel(pColumnItem->GetRight()); + pRuler_Imp->nColLeftPix = (sal_uInt16) ConvertSizePixel(pColumnItem->GetLeft()); + pRuler_Imp->nColRightPix = (sal_uInt16) ConvertSizePixel(pColumnItem->GetRight()); } } @@ -661,9 +683,9 @@ void SvxRuler::StartListening_Impl() { if(!bListening) { - bValid = FALSE; + bValid = sal_False; StartListening(*pBindings); - bListening = TRUE; + bListening = sal_True; } } @@ -749,7 +771,7 @@ void SvxRuler::UpdateTextRTL(const SfxBoolItem* pItem) void SvxRuler::Update ( const SvxColumnItem *pItem, // new value - USHORT nSID //Slot Id to identify NULL items + sal_uInt16 nSID //Slot Id to identify NULL items ) /* [Description] @@ -777,7 +799,7 @@ void SvxRuler::Update //must not delete it { delete pColumnItem; pColumnItem = 0; - pRuler_Imp->bIsTableRows = FALSE; + pRuler_Imp->bIsTableRows = sal_False; } StartListening_Impl(); } @@ -799,8 +821,8 @@ void SvxRuler::UpdateColumns() nBorderCount = pColumnItem->Count(); pBorders = new RulerBorder[nBorderCount]; } - USHORT _nFlags = RULER_BORDER_VARIABLE; - BOOL bProtectColumns = + sal_uInt16 _nFlags = RULER_BORDER_VARIABLE; + sal_Bool bProtectColumns = pRuler_Imp->aProtectItem.IsSizeProtected() || pRuler_Imp->aProtectItem.IsPosProtected(); if( !bProtectColumns ) @@ -811,10 +833,10 @@ void SvxRuler::UpdateColumns() if ( !bProtectColumns ) _nFlags |= RULER_BORDER_SIZEABLE; - USHORT nBorders = pColumnItem->Count(); + sal_uInt16 nBorders = pColumnItem->Count(); if(!pRuler_Imp->bIsTableRows) --nBorders; - for(USHORT i = 0; i < nBorders; ++i) + for(sal_uInt16 i = 0; i < nBorders; ++i) { pBorders[i].nStyle = _nFlags; if(!(*pColumnItem)[i].bVisible) @@ -872,7 +894,7 @@ void SvxRuler::UpdateObject() pObjectBorders[3].nPos = ConvertPosPixel(pObjectItem->GetEndY() - nMargin + lAppNullOffset); - const USHORT nOff = GetObjectBordersOff(0); + const sal_uInt16 nOff = GetObjectBordersOff(0); SetBorders(2, pObjectBorders + nOff); } else @@ -902,7 +924,7 @@ void SvxRuler::UpdatePara() // Dependence on PagePosItem if(pParaItem && pPagePosItem && !pObjectItem) { - BOOL bRTLText = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); + sal_Bool bRTLText = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); // First-line indent is negative to the left paragraph margin long nLeftFrameMargin = GetLeftFrameMargin(); long nRightFrameMargin = GetRightFrameMargin(); @@ -1120,7 +1142,7 @@ long SvxRuler::GetDefTabDist() const } -USHORT ToSvTab_Impl(SvxTabAdjust eAdj) +sal_uInt16 ToSvTab_Impl(SvxTabAdjust eAdj) /* [Description] @@ -1140,7 +1162,7 @@ USHORT ToSvTab_Impl(SvxTabAdjust eAdj) } -SvxTabAdjust ToAttrTab_Impl(USHORT eAdj) +SvxTabAdjust ToAttrTab_Impl(sal_uInt16 eAdj) { switch(eAdj) { case RULER_TAB_LEFT: return SVX_TAB_ADJUST_LEFT ; @@ -1167,7 +1189,7 @@ void SvxRuler::UpdateTabs() { // buffer for DefaultTabStop // Distance last Tab <-> Right paragraph margin / DefaultTabDist - BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); + sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); long nLeftFrameMargin = GetLeftFrameMargin(); long nRightFrameMargin = GetRightFrameMargin(); @@ -1186,10 +1208,10 @@ void SvxRuler::UpdateTabs() long nDefTabDist = ConvertHPosPixel(lDefTabDist); if( !nDefTabDist ) nDefTabDist = 1; - const USHORT nDefTabBuf = lPosPixel > lRightIndent || + const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent || lLastTab > lRightIndent ? 0 - : (USHORT)( (lRightIndent - lPosPixel) / nDefTabDist ); + : (sal_uInt16)( (lRightIndent - lPosPixel) / nDefTabDist ); if(pTabStopItem->Count() + TAB_GAP + nDefTabBuf > nTabBufSize) { @@ -1200,7 +1222,7 @@ void SvxRuler::UpdateTabs() } nTabCount = 0; - USHORT j; + sal_uInt16 j; //#i24363# tab stops relative to indent const long lRightPixMargin = ConvertSizePixel(nRightFrameMargin - nParaItemTxtLeft ); const long lParaIndentPix = ConvertSizePixel(lParaIndent); @@ -1341,7 +1363,7 @@ void SvxRuler::SetNullOffsetLogic ) { lAppNullOffset = lLogicNullOffset - lVal; - bAppSetNullOffset = TRUE; + bAppSetNullOffset = sal_True; Ruler::SetNullOffset(ConvertSizePixel(lVal)); Update(); } @@ -1400,7 +1422,7 @@ inline void SvxRuler::SetFrameLeft(long l) */ { - BOOL bProtectColumns = + sal_Bool bProtectColumns = pRuler_Imp->aProtectItem.IsSizeProtected() || pRuler_Imp->aProtectItem.IsPosProtected(); if(bAppSetNullOffset) @@ -1501,9 +1523,9 @@ long SvxRuler::GetRightFrameMargin() const { if(pColumnItem) { - if(!IsActLastColumn( TRUE )) + if(!IsActLastColumn( sal_True )) { - long nRet = (*pColumnItem)[GetActRightColumn( TRUE )].nEnd; + long nRet = (*pColumnItem)[GetActRightColumn( sal_True )].nEnd; if(pColumnItem->IsTable() && pParaBorderItem) nRet -= pParaBorderItem->GetRight(); return nRet; @@ -1521,7 +1543,7 @@ long SvxRuler::GetRightFrameMargin() const l += pULSpaceItem->GetLower(); if(pParaBorderItem && - (!pColumnItem || pColumnItem->IsTable()||IsActLastColumn( TRUE ))) + (!pColumnItem || pColumnItem->IsTable()||IsActLastColumn( sal_True ))) l += pParaBorderItem->GetRight(); if(bHorz) @@ -1535,7 +1557,7 @@ long SvxRuler::GetRightFrameMargin() const SVXRULER_SUPPORT_NEGATIVE_MARGINS ) #define TAB_FLAG ( pColumnItem && pColumnItem->IsTable() ) -long SvxRuler::GetCorrectedDragPos( BOOL bLeft, BOOL bRight ) +long SvxRuler::GetCorrectedDragPos( sal_Bool bLeft, sal_Bool bRight ) /* [Description] @@ -1547,7 +1569,7 @@ long SvxRuler::GetCorrectedDragPos( BOOL bLeft, BOOL bRight ) const long lNullPix = Ruler::GetNullOffset(); long lDragPos = GetDragPos() + lNullPix; ADD_DEBUG_TEXT("lDragPos: ", String::CreateFromInt32(lDragPos)) - BOOL bHoriRows = bHorz && pRuler_Imp->bIsTableRows; + sal_Bool bHoriRows = bHorz && pRuler_Imp->bIsTableRows; if((bLeft || (bHoriRows)) && lDragPos < nMaxLeft) lDragPos = nMaxLeft; else if((bRight||bHoriRows) && lDragPos > nMaxRight) @@ -1559,7 +1581,7 @@ ADD_DEBUG_TEXT("lDragPos: ", String::CreateFromInt32(lDragPos)) void ModifyTabs_Impl ( - USHORT nCount, // Number of Tabs + sal_uInt16 nCount, // Number of Tabs RulerTab *pTabs, // Tab buffer long lDiff // difference to be added ) @@ -1570,7 +1592,7 @@ void ModifyTabs_Impl */ { if( pTabs ) - for(USHORT i = 0; i < nCount; ++i) pTabs[i].nPos += lDiff; + for(sal_uInt16 i = 0; i < nCount; ++i) pTabs[i].nPos += lDiff; } @@ -1582,7 +1604,7 @@ void SvxRuler::DragMargin1() Dragging the left edge of frame */ { - const long lDragPos = GetCorrectedDragPos( !TAB_FLAG || !NEG_FLAG, TRUE ); + const long lDragPos = GetCorrectedDragPos( !TAB_FLAG || !NEG_FLAG, sal_True ); DrawLine_Impl(lTabPos, ( TAB_FLAG && NEG_FLAG ) ? 3 : 7, bHorz); if(pColumnItem&& (nDragType & DRAG_OBJECT_SIZE_PROPORTIONAL)) @@ -1593,11 +1615,11 @@ void SvxRuler::AdjustMargin1(long lDiff) { const long nOld = bAppSetNullOffset? GetMargin1(): GetNullOffset(); const long lDragPos = lDiff; - BOOL bProtectColumns = + sal_Bool bProtectColumns = pRuler_Imp->aProtectItem.IsSizeProtected() || pRuler_Imp->aProtectItem.IsPosProtected(); - const USHORT nMarginStyle = + const sal_uInt16 nMarginStyle = bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE; if(!bAppSetNullOffset) @@ -1622,7 +1644,7 @@ void SvxRuler::AdjustMargin1(long lDiff) } if(pColumnItem) { - for(USHORT i = 0; i < pColumnItem->Count()-1; ++i) + for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i) pBorders[i].nPos -= _lDiff; SetBorders(pColumnItem->Count()-1, pBorders); if(pColumnItem->IsFirstAct()) @@ -1671,7 +1693,7 @@ void SvxRuler::AdjustMargin1(long lDiff) if(pColumnItem) { - for(USHORT i = 0; i < pColumnItem->Count()-1; ++i) + for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i) pBorders[i].nPos += _lDiff; SetBorders(pColumnItem->Count()-1, pBorders); if(pColumnItem->IsFirstAct()) @@ -1712,7 +1734,7 @@ void SvxRuler::DragMargin2() Dragging the right edge of frame */ { - const long lDragPos = GetCorrectedDragPos( TRUE, !TAB_FLAG || !NEG_FLAG); + const long lDragPos = GetCorrectedDragPos( sal_True, !TAB_FLAG || !NEG_FLAG); DrawLine_Impl(lTabPos, ( TAB_FLAG && NEG_FLAG ) ? 5 : 7, bHorz); long lDiff = lDragPos - GetMargin2(); @@ -1720,10 +1742,10 @@ void SvxRuler::DragMargin2() (nDragType & DRAG_OBJECT_SIZE_PROPORTIONAL)) DragBorders(); - BOOL bProtectColumns = + sal_Bool bProtectColumns = pRuler_Imp->aProtectItem.IsSizeProtected() || pRuler_Imp->aProtectItem.IsPosProtected(); - const USHORT nMarginStyle = + const sal_uInt16 nMarginStyle = bProtectColumns ? 0 : RULER_MARGIN_SIZEABLE; SetMargin2( lDragPos, nMarginStyle ); @@ -1744,7 +1766,7 @@ void SvxRuler::DragIndents() */ { const long lDragPos = NEG_FLAG ? GetDragPos() : GetCorrectedDragPos(); - const USHORT nIdx = GetDragAryPos()+INDENT_GAP; + const sal_uInt16 nIdx = GetDragAryPos()+INDENT_GAP; const long lDiff = pIndents[nIdx].nPos - lDragPos; if((nIdx == INDENT_FIRST_LINE || @@ -1760,7 +1782,7 @@ void SvxRuler::DragIndents() } -void SvxRuler::DrawLine_Impl(long &_lTabPos, int nNew, BOOL Hori) +void SvxRuler::DrawLine_Impl(long &_lTabPos, int nNew, sal_Bool Hori) /* [Description] @@ -1827,9 +1849,9 @@ void SvxRuler::DragTabs() */ { - long lDragPos = GetCorrectedDragPos(TRUE, FALSE); + long lDragPos = GetCorrectedDragPos(sal_True, sal_False); - USHORT nIdx = GetDragAryPos()+TAB_GAP; + sal_uInt16 nIdx = GetDragAryPos()+TAB_GAP; DrawLine_Impl(lTabPos, 7, bHorz); long nDiff = lDragPos - pTabs[nIdx].nPos; @@ -1837,7 +1859,7 @@ void SvxRuler::DragTabs() if(nDragType & DRAG_OBJECT_SIZE_LINEAR) { - for(USHORT i = nIdx; i < nTabCount; ++i) + for(sal_uInt16 i = nIdx; i < nTabCount; ++i) { pTabs[i].nPos += nDiff; // limit on maximum @@ -1851,7 +1873,7 @@ void SvxRuler::DragTabs() { pRuler_Imp->nTotalDist -= nDiff; pTabs[nIdx].nPos = lDragPos; - for(USHORT i = nIdx+1; i < nTabCount; ++i) + for(sal_uInt16 i = nIdx+1; i < nTabCount; ++i) { if(pTabs[i].nStyle & RULER_TAB_DEFAULT) // can be canceled at the DefaultTabs @@ -1877,7 +1899,7 @@ void SvxRuler::DragTabs() -void SvxRuler::SetActive(BOOL bOn) +void SvxRuler::SetActive(sal_Bool bOn) { if(bOn) { @@ -1889,10 +1911,10 @@ void SvxRuler::SetActive(BOOL bOn) { pBindings->EnterRegistrations(); if(bOn) - for(USHORT i=0;i<pRuler_Imp->nControlerItems;i++) + for(sal_uInt16 i=0;i<pRuler_Imp->nControlerItems;i++) pCtrlItem[i]->ReBind(); else - for(USHORT j=0;j<pRuler_Imp->nControlerItems;j++) + for(sal_uInt16 j=0;j<pRuler_Imp->nControlerItems;j++) pCtrlItem[j]->UnBind(); pBindings->LeaveRegistrations(); } @@ -1926,7 +1948,7 @@ void SvxRuler::UpdateParaContents_Impl pIndents[INDENT_LEFT_MARGIN].nPos += l; if ( pTabs ) { - for(USHORT i = 0; i < nTabCount+TAB_GAP;++i) + for(sal_uInt16 i = 0; i < nTabCount+TAB_GAP;++i) pTabs[i].nPos += l; SetTabs(nTabCount, pTabs+TAB_GAP); } @@ -1944,7 +1966,7 @@ void SvxRuler::DragBorders() Dragging of Borders (Tables and other columns) */ { - BOOL bLeftIndentsCorrected = FALSE, bRightIndentsCorrected = FALSE; + sal_Bool bLeftIndentsCorrected = sal_False, bRightIndentsCorrected = sal_False; int nIdx; if(GetDragType()==RULER_TYPE_BORDER) @@ -1955,7 +1977,7 @@ void SvxRuler::DragBorders() else nIdx=0; - USHORT nDragSize = GetDragSize(); + sal_uInt16 nDragSize = GetDragSize(); long lDiff = 0; // the drag position has to be corrected to be able to prevent borders from passing each other @@ -1984,13 +2006,13 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi if(i == GetActRightColumn()) { UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_RIGHT); - bRightIndentsCorrected = TRUE; + bRightIndentsCorrected = sal_True; } // LAR, EZE update the column else if(i == GetActLeftColumn()) { UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_LEFT); - bLeftIndentsCorrected = TRUE; + bLeftIndentsCorrected = sal_True; } } } @@ -2056,13 +2078,13 @@ ADD_DEBUG_TEXT("lLastLMargin: ", String::CreateFromInt32(pRuler_Imp->lLastLMargi if(i == GetActRightColumn()) { UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_RIGHT); - bRightIndentsCorrected = TRUE; + bRightIndentsCorrected = sal_True; } // LAR, EZE update the column else if(i == GetActLeftColumn()) { UpdateParaContents_Impl(pBorders[i].nPos - l, MOVE_LEFT); - bLeftIndentsCorrected = TRUE; + bLeftIndentsCorrected = sal_True; } } } @@ -2165,7 +2187,7 @@ void SvxRuler::DragObjectBorder() if(RULER_DRAGSIZE_MOVE == GetDragSize()) { const long lPos = GetCorrectedDragPos(); - const USHORT nIdx = GetDragAryPos(); + const sal_uInt16 nIdx = GetDragAryPos(); pObjectBorders[GetObjectBordersOff(nIdx)].nPos = lPos; SetBorders(2, pObjectBorders + GetObjectBordersOff(0)); DrawLine_Impl(lTabPos, 7, bHorz); @@ -2182,7 +2204,7 @@ void SvxRuler::ApplyMargins() */ { const SfxPoolItem *pItem = 0; - USHORT nId = SID_ATTR_LONG_LRSPACE; + sal_uInt16 nId = SID_ATTR_LONG_LRSPACE; if(bHorz) { const long lOldNull = lLogicNullOffset; @@ -2246,9 +2268,9 @@ void SvxRuler::ApplyIndents() */ { long nNewTxtLeft; - if(pColumnItem&&!IsActFirstColumn( TRUE )) + if(pColumnItem&&!IsActFirstColumn( sal_True )) { - long nLeftCol=GetActLeftColumn( TRUE ); + long nLeftCol=GetActLeftColumn( sal_True ); nNewTxtLeft = PixelHAdjust( ConvertHPosLogic( @@ -2263,7 +2285,7 @@ void SvxRuler::ApplyIndents() ConvertHPosLogic(pIndents[INDENT_LEFT_MARGIN].nPos), pParaItem->GetTxtLeft()); - BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); + sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); long nNewFirstLineOffset; if(bRTL) @@ -2302,11 +2324,11 @@ void SvxRuler::ApplyIndents() sal::static_int_cast< short >(nNewFirstLineOffset)); pParaItem->SetTxtLeft(nNewTxtLeft); - if(pColumnItem && ((!bRTL && !IsActLastColumn( TRUE ))|| (bRTL && !IsActFirstColumn()))) + if(pColumnItem && ((!bRTL && !IsActLastColumn( sal_True ))|| (bRTL && !IsActFirstColumn()))) { if(bRTL) { - long nActBorder = pBorders[GetActLeftColumn( TRUE )].nPos; + long nActBorder = pBorders[GetActLeftColumn( sal_True )].nPos; long nRightMargin = pIndents[INDENT_RIGHT_MARGIN].nPos; long nConvert = ConvertHPosLogic( nRightMargin - nActBorder ); pParaItem->SetRight( PixelHAdjust( nConvert - lAppNullOffset, pParaItem->GetRight() ) ); @@ -2316,7 +2338,7 @@ void SvxRuler::ApplyIndents() pParaItem->SetRight( PixelHAdjust( ConvertHPosLogic( - pBorders[GetActRightColumn( TRUE )].nPos - + pBorders[GetActRightColumn( sal_True )].nPos - pIndents[INDENT_RIGHT_MARGIN].nPos) - lAppNullOffset, pParaItem->GetRight())); @@ -2341,7 +2363,7 @@ void SvxRuler::ApplyIndents() lAppNullOffset, pParaItem->GetRight())); } } - USHORT nParaId = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL; + sal_uInt16 nParaId = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL; pBindings->GetDispatcher()->Execute( nParaId, SFX_CALLMODE_RECORD, pParaItem, 0L ); UpdateTabs(); } @@ -2354,8 +2376,8 @@ void SvxRuler::ApplyTabs() Apply tab settings, changed by dragging. */ { - BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); - const USHORT nCoreIdx = GetDragAryPos(); + sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); + const sal_uInt16 nCoreIdx = GetDragAryPos(); if(IsDragDelete()) { pTabStopItem->Remove(nCoreIdx); @@ -2365,7 +2387,7 @@ void SvxRuler::ApplyTabs() { SvxTabStopItem *pItem = new SvxTabStopItem(pTabStopItem->Which()); //remove default tab stops - for ( USHORT i = 0; i < pItem->Count(); ) + for ( sal_uInt16 i = 0; i < pItem->Count(); ) { if ( SVX_TAB_ADJUST_DEFAULT == (*pItem)[i].GetAdjustment() ) { @@ -2375,7 +2397,7 @@ void SvxRuler::ApplyTabs() ++i; } - USHORT j; + sal_uInt16 j; for(j = 0; j < nCoreIdx; ++j) { pItem->Insert((*pTabStopItem)[j]); @@ -2429,7 +2451,7 @@ void SvxRuler::ApplyTabs() pTabStopItem->Remove(nCoreIdx); pTabStopItem->Insert(aTabStop); } - USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL; + sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL; pBindings->GetDispatcher()->Execute( nTabStopId, SFX_CALLMODE_RECORD, pTabStopItem, 0L ); UpdateTabs(); } @@ -2457,7 +2479,7 @@ void SvxRuler::ApplyBorders() lAppNullOffset, pColumnItem->GetRight() ) ); } } - for(USHORT i = 0; i < pColumnItem->Count()-1; ++i) + for(sal_uInt16 i = 0; i < pColumnItem->Count()-1; ++i) { long& nEnd = (*pColumnItem)[i].nEnd; nEnd = PIXEL_H_ADJUST( @@ -2478,8 +2500,8 @@ void SvxRuler::ApplyBorders() Debug_Impl(pEditWin,*pColumnItem); #endif // DEBUGLIN SfxBoolItem aFlag(SID_RULER_ACT_LINE_ONLY, - nDragType & DRAG_OBJECT_ACTLINE_ONLY? TRUE: FALSE); - USHORT nColId = pRuler_Imp->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) : + nDragType & DRAG_OBJECT_ACTLINE_ONLY? sal_True : sal_False); + sal_uInt16 nColId = pRuler_Imp->bIsTableRows ? (bHorz ? SID_RULER_ROWS : SID_RULER_ROWS_VERTICAL) : (bHorz ? SID_RULER_BORDERS : SID_RULER_BORDERS_VERTICAL); pBindings->GetDispatcher()->Execute( nColId, SFX_CALLMODE_RECORD, pColumnItem, &aFlag, 0L ); } @@ -2534,8 +2556,8 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) long lPos; long lWidth=0; - USHORT nStart; - USHORT nIdx=GetDragAryPos(); + sal_uInt16 nStart; + sal_uInt16 nIdx=GetDragAryPos(); lWidth=0; long lActWidth=0; long lActBorderSum; @@ -2567,8 +2589,8 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) //because the height of the table changes while dragging if(pRuler_Imp->bIsTableRows && RULER_TYPE_BORDER == eType) { - USHORT nStartBorder; - USHORT nEndBorder; + sal_uInt16 nStartBorder; + sal_uInt16 nEndBorder; if(bHorz) { nStartBorder = nIdx + 1; @@ -2586,7 +2608,7 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) pRuler_Imp->nTotalDist = lWidth; lPos = lOrigLPos = pBorders[nIdx].nPos; - for(USHORT i = nStartBorder; i < nEndBorder; ++i) + for(sal_uInt16 i = nStartBorder; i < nEndBorder; ++i) { if(bHorz) { @@ -2595,16 +2617,16 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) } else lActWidth = pBorders[i].nPos; - pRuler_Imp->pPercBuf[i] = (USHORT)((lActWidth * 1000) + pRuler_Imp->pPercBuf[i] = (sal_uInt16)((lActWidth * 1000) / pRuler_Imp->nTotalDist); - pRuler_Imp->pBlockBuf[i] = (USHORT)lActBorderSum; + pRuler_Imp->pBlockBuf[i] = (sal_uInt16)lActBorderSum; lActBorderSum += pBorders[i].nWidth; } } else { lPos = lOrigLPos; - for(USHORT ii = nStart; ii < pColumnItem->Count() - 1; ++ii) + for(sal_uInt16 ii = nStart; ii < pColumnItem->Count() - 1; ++ii) { lWidth += pBorders[ii].nPos - lPos; lPos = pBorders[ii].nPos + pBorders[ii].nWidth; @@ -2614,13 +2636,13 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) pRuler_Imp->nTotalDist = lWidth; lPos = lOrigLPos; - for(USHORT i = nStart; i < pColumnItem->Count() - 1; ++i) + for(sal_uInt16 i = nStart; i < pColumnItem->Count() - 1; ++i) { lActWidth += pBorders[i].nPos - lPos; lPos = pBorders[i].nPos + pBorders[i].nWidth; - pRuler_Imp->pPercBuf[i] = (USHORT)((lActWidth * 1000) + pRuler_Imp->pPercBuf[i] = (sal_uInt16)((lActWidth * 1000) / pRuler_Imp->nTotalDist); - pRuler_Imp->pBlockBuf[i] = (USHORT)lActBorderSum; + pRuler_Imp->pBlockBuf[i] = (sal_uInt16)lActBorderSum; lActBorderSum += pBorders[i].nWidth; } } @@ -2628,14 +2650,14 @@ void SvxRuler::PrepareProportional_Impl(RulerType eType) break; case RULER_TYPE_TAB: { - const USHORT nIdx = GetDragAryPos()+TAB_GAP; + const sal_uInt16 nIdx = GetDragAryPos()+TAB_GAP; pRuler_Imp->nTotalDist -= pTabs[nIdx].nPos; pRuler_Imp->SetPercSize(nTabCount); - for(USHORT n=0;n<=nIdx;pRuler_Imp->pPercBuf[n++]=0) ; - for(USHORT i = nIdx+1; i < nTabCount; ++i) + for(sal_uInt16 n=0;n<=nIdx;pRuler_Imp->pPercBuf[n++]=0) ; + for(sal_uInt16 i = nIdx+1; i < nTabCount; ++i) { const long nDelta = pTabs[i].nPos - pTabs[nIdx].nPos; - pRuler_Imp->pPercBuf[i] = (USHORT)((nDelta * 1000) / pRuler_Imp->nTotalDist); + pRuler_Imp->pPercBuf[i] = (sal_uInt16)((nDelta * 1000) / pRuler_Imp->nTotalDist); } break; } @@ -2657,7 +2679,7 @@ void SvxRuler::EvalModifier() */ { - USHORT nModifier = GetDragModifier(); + sal_uInt16 nModifier = GetDragModifier(); if(pRuler_Imp->bIsTableRows) { //rows can only be moved in one way, additionally current column is possible @@ -2697,6 +2719,7 @@ void SvxRuler::Click() */ { + lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/Click")); Ruler::Click(); if( bActive ) { @@ -2712,11 +2735,11 @@ void SvxRuler::Click() pBindings->Update( SID_RULER_PROTECT ); pBindings->Update( SID_ATTR_PARA_LRSPACE_VERTICAL ); } - BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); + sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); if(pTabStopItem && (nFlags & SVXRULER_SUPPORT_TABS) == SVXRULER_SUPPORT_TABS) { - BOOL bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected(); + sal_Bool bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected(); if( bContentProtected ) return; const long lPos = GetClickPos(); if((bRTL && lPos < Min(GetFirstLineIndent(), GetLeftIndent()) && lPos > GetRightIndent()) || @@ -2745,11 +2768,11 @@ void SvxRuler::Click() } -BOOL SvxRuler::CalcLimits +sal_Bool SvxRuler::CalcLimits ( long &nMax1, // minimum value to be set long &nMax2, // minimum value to be set - BOOL + sal_Bool ) const /* [Description] @@ -2760,7 +2783,7 @@ BOOL SvxRuler::CalcLimits { nMax1 = LONG_MIN; nMax2 = LONG_MAX; - return FALSE; + return sal_False; } @@ -2773,7 +2796,7 @@ void SvxRuler::CalcMinMax() */ { - BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); + sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); const long lNullPix = ConvertPosPixel(lLogicNullOffset); pRuler_Imp->lMaxLeftLogic=pRuler_Imp->lMaxRightLogic=-1; switch(GetDragType()) @@ -2946,7 +2969,7 @@ void SvxRuler::CalcMinMax() } case RULER_TYPE_BORDER: { // Table, column (Modifier) - const USHORT nIdx = GetDragAryPos(); + const sal_uInt16 nIdx = GetDragAryPos(); switch(GetDragSize()) { case RULER_DRAGSIZE_1 : @@ -2987,13 +3010,13 @@ void SvxRuler::CalcMinMax() { //nIdx contains the position of the currently moved item //next visible separator on the left - USHORT nLeftCol=GetActLeftColumn(FALSE, nIdx); + sal_uInt16 nLeftCol=GetActLeftColumn(sal_False, nIdx); //next visible separator on the right - USHORT nRightCol=GetActRightColumn(FALSE, nIdx); + sal_uInt16 nRightCol=GetActRightColumn(sal_False, nIdx); //next separator on the left - regardless if visible or not - USHORT nActLeftCol=GetActLeftColumn(); + sal_uInt16 nActLeftCol=GetActLeftColumn(); //next separator on the right - regardless if visible or not - USHORT nActRightCol=GetActRightColumn(); + sal_uInt16 nActRightCol=GetActRightColumn(); if(pColumnItem->IsTable()) { if(nDragType & DRAG_OBJECT_ACTLINE_ONLY) @@ -3113,8 +3136,8 @@ void SvxRuler::CalcMinMax() else { nMaxRight = lNullPix + pBorders[nRightCol].nPos; - USHORT nNotHiddenRightCol = - GetActRightColumn(TRUE, nIdx); + sal_uInt16 nNotHiddenRightCol = + GetActRightColumn(sal_True, nIdx); if( nActLeftCol == nIdx ) { @@ -3148,7 +3171,7 @@ void SvxRuler::CalcMinMax() { if(pObjectItem->HasLimits()) { - if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? FALSE: TRUE)) + if(CalcLimits(nMaxLeft, nMaxRight, nIdx & 1? sal_False : sal_True)) { nMaxLeft = ConvertPosPixel(nMaxLeft); nMaxRight = ConvertPosPixel(nMaxRight); @@ -3196,7 +3219,7 @@ void SvxRuler::CalcMinMax() } case RULER_TYPE_INDENT: { - const USHORT nIdx = GetDragAryPos(); + const sal_uInt16 nIdx = GetDragAryPos(); switch(nIdx) { case INDENT_FIRST_LINE - INDENT_GAP: case INDENT_LEFT_MARGIN - INDENT_GAP: @@ -3251,8 +3274,8 @@ void SvxRuler::CalcMinMax() nMaxRight = lNullPix + Min(GetFirstLineIndent(), GetLeftIndent()) - lMinFrame; if(pColumnItem) { - USHORT nRightCol=GetActRightColumn( TRUE ); - if(!IsActLastColumn( TRUE )) + sal_uInt16 nRightCol=GetActRightColumn( sal_True ); + if(!IsActLastColumn( sal_True )) nMaxRight += pBorders[nRightCol].nPos; else nMaxRight += GetMargin2(); @@ -3268,8 +3291,8 @@ void SvxRuler::CalcMinMax() nMaxRight = lNullPix; if(pColumnItem) { - USHORT nRightCol=GetActRightColumn( TRUE ); - if(!IsActLastColumn( TRUE )) + sal_uInt16 nRightCol=GetActRightColumn( sal_True ); + if(!IsActLastColumn( sal_True )) nMaxRight += pBorders[nRightCol].nPos; else nMaxRight += GetMargin2(); @@ -3326,9 +3349,10 @@ long SvxRuler::StartDrag() */ { - BOOL bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected(); + lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/StartDrag")); + sal_Bool bContentProtected = pRuler_Imp->aProtectItem.IsCntntProtected(); if(!bValid) - return FALSE; + return sal_False; pRuler_Imp->lLastLMargin=GetMargin1(); pRuler_Imp->lLastRMargin=GetMargin2(); @@ -3348,7 +3372,7 @@ long SvxRuler::StartDrag() nDragType = DRAG_OBJECT; } else - bOk = FALSE; + bOk = sal_False; break; case RULER_TYPE_BORDER: // Table, column (Modifier) if(pColumnItem) @@ -3363,8 +3387,8 @@ long SvxRuler::StartDrag() break; case RULER_TYPE_INDENT: { // Paragraph indents (Modifier) if( bContentProtected ) - return FALSE; - USHORT nIndent = INDENT_LEFT_MARGIN; + return sal_False; + sal_uInt16 nIndent = INDENT_LEFT_MARGIN; if((nIndent) == GetDragAryPos() + INDENT_GAP) { // Left paragraph indent pIndents[0] = pIndents[INDENT_FIRST_LINE]; pIndents[0].nStyle |= RULER_STYLE_DONTKNOW; @@ -3377,7 +3401,7 @@ long SvxRuler::StartDrag() break; } case RULER_TYPE_TAB: // Tabs (Modifier) - if( bContentProtected ) return FALSE; + if( bContentProtected ) return sal_False; EvalModifier(); pTabs[0] = pTabs[GetDragAryPos()+1]; pTabs[0].nStyle |= RULER_STYLE_DONTKNOW; @@ -3442,7 +3466,8 @@ void SvxRuler::EndDrag() data to the application. */ { - const BOOL bUndo = IsDragCanceled(); + lcl_logRulerUse(::rtl::OUString::createFromAscii(".special://SfxRuler/EndDrag")); + const sal_Bool bUndo = IsDragCanceled(); const long lPos = GetDragPos(); DrawLine_Impl(lTabPos, 6, bHorz); lTabPos=-1; @@ -3493,7 +3518,7 @@ void SvxRuler::EndDrag() nDragType = NONE; Ruler::EndDrag(); if(bUndo) - for(USHORT i=0;i<pRuler_Imp->nControlerItems;i++) + for(sal_uInt16 i=0;i<pRuler_Imp->nControlerItems;i++) { pCtrlItem[i]->ClearCache(); pCtrlItem[i]->GetBindings().Invalidate(pCtrlItem[i]->GetId()); @@ -3536,8 +3561,8 @@ void SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint) ((SfxSimpleHint&) rHint ).GetId() == SFX_HINT_UPDATEDONE ) { Update(); EndListening(*pBindings); - bValid = TRUE; - bListening = FALSE; + bValid = sal_True; + bListening = sal_False; } } @@ -3570,7 +3595,7 @@ IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu ) aTabStop.GetAdjustment() = ToAttrTab_Impl(pMenu->GetCurItemId()-1); pTabStopItem->Remove(pRuler_Imp->nIdx); pTabStopItem->Insert(aTabStop); - USHORT nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL; + sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL; pBindings->GetDispatcher()->Execute( nTabStopId, SFX_CALLMODE_RECORD, pTabStopItem, 0L ); UpdateTabs(); pRuler_Imp->nIdx = 0; @@ -3590,7 +3615,7 @@ void SvxRuler::Command( const CommandEvent& rCEvt ) if ( COMMAND_CONTEXTMENU == rCEvt.GetCommand() ) { CancelDrag(); - BOOL bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); + sal_Bool bRTL = pRuler_Imp->pTextRTLItem && pRuler_Imp->pTextRTLItem->GetValue(); if ( pTabs && RULER_TYPE_TAB == GetType( rCEvt.GetMousePosPixel(), &pRuler_Imp->nIdx ) && @@ -3604,10 +3629,10 @@ void SvxRuler::Command( const CommandEvent& rCEvt ) aDev.SetBackground(Wallpaper(Color(COL_WHITE))); const Point aPt(aSz.Width() / 2, aSz.Height() / 2); - for ( USHORT i = RULER_TAB_LEFT; i < RULER_TAB_DEFAULT; ++i ) + for ( sal_uInt16 i = RULER_TAB_LEFT; i < RULER_TAB_DEFAULT; ++i ) { - USHORT nStyle = bRTL ? i|RULER_TAB_RTL : i; - nStyle |= (USHORT)(bHorz ? WB_HORZ : WB_VERT); + sal_uInt16 nStyle = bRTL ? i|RULER_TAB_RTL : i; + nStyle |= (sal_uInt16)(bHorz ? WB_HORZ : WB_VERT); DrawTab(&aDev, aPt, nStyle); aMenu.InsertItem(i+1, String(ResId(RID_SVXSTR_RULER_START+i, DIALOG_MGR())), @@ -3622,13 +3647,13 @@ void SvxRuler::Command( const CommandEvent& rCEvt ) PopupMenu aMenu(ResId(RID_SVXMN_RULER, DIALOG_MGR())); aMenu.SetSelectHdl(LINK(this, SvxRuler, MenuSelect)); FieldUnit eUnit = GetUnit(); - const USHORT nCount = aMenu.GetItemCount(); + const sal_uInt16 nCount = aMenu.GetItemCount(); - BOOL bReduceMetric = 0 != (nFlags &SVXRULER_SUPPORT_REDUCED_METRIC); - for ( USHORT i = nCount; i; --i ) + sal_Bool bReduceMetric = 0 != (nFlags &SVXRULER_SUPPORT_REDUCED_METRIC); + for ( sal_uInt16 i = nCount; i; --i ) { - const USHORT nId = aMenu.GetItemId(i - 1); - aMenu.CheckItem(nId, nId == (USHORT)eUnit); + const sal_uInt16 nId = aMenu.GetItemId(i - 1); + aMenu.CheckItem(nId, nId == (sal_uInt16)eUnit); if(bReduceMetric && (nId == FUNIT_M || nId == FUNIT_KM || @@ -3653,14 +3678,14 @@ void SvxRuler::Command( const CommandEvent& rCEvt ) } -USHORT SvxRuler::GetActRightColumn( - BOOL bForceDontConsiderHidden, USHORT nAct ) const +sal_uInt16 SvxRuler::GetActRightColumn( + sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct ) const { if( nAct == USHRT_MAX ) nAct = pColumnItem->GetActColumn(); else nAct++; //To be able to pass on the ActDrag - BOOL bConsiderHidden = !bForceDontConsiderHidden && + sal_Bool bConsiderHidden = !bForceDontConsiderHidden && !( nDragType & DRAG_OBJECT_ACTLINE_ONLY ); while( nAct < pColumnItem->Count() - 1 ) @@ -3675,15 +3700,15 @@ USHORT SvxRuler::GetActRightColumn( -USHORT SvxRuler::GetActLeftColumn( - BOOL bForceDontConsiderHidden, USHORT nAct ) const +sal_uInt16 SvxRuler::GetActLeftColumn( + sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct ) const { if(nAct==USHRT_MAX) nAct=pColumnItem->GetActColumn(); - USHORT nLOffs=1; + sal_uInt16 nLOffs=1; - BOOL bConsiderHidden = !bForceDontConsiderHidden && + sal_Bool bConsiderHidden = !bForceDontConsiderHidden && !( nDragType & DRAG_OBJECT_ACTLINE_ONLY ); while(nAct>=nLOffs) @@ -3697,19 +3722,19 @@ USHORT SvxRuler::GetActLeftColumn( } -BOOL SvxRuler::IsActLastColumn( - BOOL bForceDontConsiderHidden, USHORT nAct) const +sal_Bool SvxRuler::IsActLastColumn( + sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct) const { return GetActRightColumn(bForceDontConsiderHidden, nAct)==USHRT_MAX; } -BOOL SvxRuler::IsActFirstColumn( - BOOL bForceDontConsiderHidden, USHORT nAct) const +sal_Bool SvxRuler::IsActFirstColumn( + sal_Bool bForceDontConsiderHidden, sal_uInt16 nAct) const { return GetActLeftColumn(bForceDontConsiderHidden, nAct)==USHRT_MAX; } -long SvxRuler::CalcPropMaxRight(USHORT nCol) const +long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const { if(!(nDragType & DRAG_OBJECT_SIZE_LINEAR)) @@ -3722,7 +3747,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const long lMinSpace=USHRT_MAX; long lOldPos; long lColumns=0; - USHORT nStart; + sal_uInt16 nStart; if(!pColumnItem->IsTable()) { if(nCol==USHRT_MAX) @@ -3737,7 +3762,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const lFences=pBorders[nCol].nWidth; } - for(USHORT i = nStart; i < nBorderCount-1; ++i) + for(sal_uInt16 i = nStart; i < nBorderCount-1; ++i) { long lWidth=pBorders[i].nPos-lOldPos; lColumns+=lWidth; @@ -3753,7 +3778,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const } else { - USHORT nActCol; + sal_uInt16 nActCol; if(nCol==USHRT_MAX) //CalcMinMax for LeftMargin { lOldPos=GetMargin1(); @@ -3767,7 +3792,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const lFences=0; while(nActCol<nBorderCount||nActCol==USHRT_MAX) { - USHORT nRight; + sal_uInt16 nRight; if(nActCol==USHRT_MAX) { nRight=0; @@ -3775,7 +3800,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const nRight++; } else - nRight=GetActRightColumn(FALSE, nActCol); + nRight=GetActRightColumn(sal_False, nActCol); long lWidth; if(nRight!=USHRT_MAX) { @@ -3799,19 +3824,19 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const { if(pColumnItem->IsTable()) { - USHORT nVisCols=0; - for(USHORT i=GetActRightColumn(FALSE, nCol);i<nBorderCount;) + sal_uInt16 nVisCols=0; + for(sal_uInt16 i=GetActRightColumn(sal_False, nCol);i<nBorderCount;) { if((*pColumnItem)[i].bVisible) nVisCols++; - i=GetActRightColumn(FALSE, i); + i=GetActRightColumn(sal_False, i); } return GetMargin2()-GetMargin1()-(nVisCols+1)*lMinFrame; } else { long lWidth=0; - for(USHORT i=nCol;i<nBorderCount-1;i++) + for(sal_uInt16 i=nCol;i<nBorderCount-1;i++) { lWidth+=lMinFrame+pBorders[i].nWidth; } @@ -3821,7 +3846,7 @@ long SvxRuler::CalcPropMaxRight(USHORT nCol) const } // Tab stops relative to indent (#i24363#) -void SvxRuler::SetTabsRelativeToIndent( BOOL bRel ) +void SvxRuler::SetTabsRelativeToIndent( sal_Bool bRel ) { pRuler_Imp->bIsTabsRelativeToIndent = bRel; } diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index fcb0e0f790..bf98274790 100644..100755 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -34,7 +34,7 @@ #include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <svtools/colorcfg.hxx> -#include <swframeexample.hxx> +#include <svx/swframeexample.hxx> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> @@ -58,7 +58,7 @@ SvxSwFrameExample::SvxSwFrameExample( Window *pParent, const ResId& rResID ) : nVRel (RelOrientation::PRINT_AREA), nWrap (WrapTextMode_NONE), nAnchor (TextContentAnchorType_AT_PAGE), - bTrans (FALSE), + bTrans (sal_False), aRelPos (Point(0,0)) { InitColors_Impl(); @@ -74,7 +74,7 @@ void SvxSwFrameExample::InitColors_Impl( void ) const StyleSettings& rSettings = GetSettings().GetStyleSettings(); m_aBgCol = Color( rSettings.GetWindowColor() ); - BOOL bHC = rSettings.GetHighContrastMode(); + sal_Bool bHC = rSettings.GetHighContrastMode(); m_aFrameColor = Color( COL_LIGHTGREEN ); m_aAlignColor = Color( COL_LIGHTRED ); @@ -101,19 +101,19 @@ void SvxSwFrameExample::InitAllRects_Impl() { aPage.SetSize( GetOutputSizePixel() ); - ULONG nOutWPix = aPage.GetWidth(); - ULONG nOutHPix = aPage.GetHeight(); + sal_uIntPtr nOutWPix = aPage.GetWidth(); + sal_uIntPtr nOutHPix = aPage.GetHeight(); // PrintArea - ULONG nLBorder; - ULONG nRBorder; - ULONG nTBorder; - ULONG nBBorder; + sal_uIntPtr nLBorder; + sal_uIntPtr nRBorder; + sal_uIntPtr nTBorder; + sal_uIntPtr nBBorder; - ULONG nLTxtBorder; - ULONG nRTxtBorder; - ULONG nTTxtBorder; - ULONG nBTxtBorder; + sal_uIntPtr nLTxtBorder; + sal_uIntPtr nRTxtBorder; + sal_uIntPtr nTTxtBorder; + sal_uIntPtr nBTxtBorder; if (nAnchor != TextContentAnchorType_AS_CHARACTER) { @@ -150,7 +150,7 @@ void SvxSwFrameExample::InitAllRects_Impl() aTextLine.Move(0, nTTxtBorder); // Rectangle to edges including paragraph - USHORT nLines = (USHORT)((aPagePrtArea.GetHeight() / 2 - nTTxtBorder - nBTxtBorder) + sal_uInt16 nLines = (sal_uInt16)((aPagePrtArea.GetHeight() / 2 - nTTxtBorder - nBTxtBorder) / (aTextLine.GetHeight() + 2)); aPara = aPagePrtArea; aPara.SetSize(Size(aPara.GetWidth(), @@ -198,8 +198,8 @@ void SvxSwFrameExample::InitAllRects_Impl() // Size of the frame to be positioned if (nAnchor != TextContentAnchorType_AS_CHARACTER) { - ULONG nLFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nLBorder : nLTxtBorder; - ULONG nRFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nRBorder : nRTxtBorder; + sal_uIntPtr nLFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nLBorder : nLTxtBorder; + sal_uIntPtr nRFBorder = nAnchor == TextContentAnchorType_AT_PAGE ? nRBorder : nRTxtBorder; switch (nHRel) { @@ -222,7 +222,7 @@ void SvxSwFrameExample::InitAllRects_Impl() } else { - ULONG nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(C2S(DEMOTEXT)); + sal_uIntPtr nFreeWidth = aPagePrtArea.GetWidth() - GetTextWidth(C2S(DEMOTEXT)); aFrmSize = Size(nFreeWidth / 2, (aTextLine.GetHeight() + 2) * 3); aDrawObj.SetSize(Size(Max(5L, (long)nFreeWidth / 3L), Max(5L, aFrmSize.Height() * 3L))); @@ -456,9 +456,9 @@ Rectangle SvxSwFrameExample::DrawInnerFrame_Impl(const Rectangle &rRect, const C // Testabsatz zeichnen Rectangle aTxt(aTextLine); sal_Int32 nStep = aTxt.GetHeight() + 2; - USHORT nLines = (USHORT)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2)); + sal_uInt16 nLines = (sal_uInt16)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2)); - for (USHORT i = 0; i < nLines; i++) + for (sal_uInt16 i = 0; i < nLines; i++) { if (i == nLines - 1) aTxt.SetSize(Size(aTxt.GetWidth() / 2, aTxt.GetHeight())); @@ -605,7 +605,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) const long nTxtLineHeight = aTextLine.GetHeight(); Rectangle aTxt(aTextLine); sal_Int32 nStep; - USHORT nLines; + sal_uInt16 nLines; if (nAnchor == TextContentAnchorType_AT_FRAME) { @@ -615,13 +615,13 @@ void SvxSwFrameExample::Paint(const Rectangle&) aTxt.Bottom() = aTxt.Top() + aTextLine.GetHeight() - 1; nStep = aTxt.GetHeight() + 2; - nLines = (USHORT)(((aFrameAtFrame.GetHeight() - 2 * FLYINFLY_BORDER) * 2 / 3) + nLines = (sal_uInt16)(((aFrameAtFrame.GetHeight() - 2 * FLYINFLY_BORDER) * 2 / 3) / (aTxt.GetHeight() + 2)); } else { nStep = aTxt.GetHeight() + 2; - nLines = (USHORT)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2)); + nLines = (sal_uInt16)(aParaPrtArea.GetHeight() / (aTextLine.GetHeight() + 2)); } if (nAnchor != TextContentAnchorType_AS_CHARACTER) @@ -635,7 +635,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) ( nHRel == RelOrientation::CHAR || nVRel == RelOrientation::CHAR || nVRel == RelOrientation::TEXT_LINE ); - for (USHORT i = 0; i < nLines; ++i) + for (sal_uInt16 i = 0; i < nLines; ++i) { if (i == (nLines - 1)) aTxt.SetSize(Size(aTxt.GetWidth() / 2, aTxt.GetHeight())); @@ -670,7 +670,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) if (nAnchor != TextContentAnchorType_AT_FRAME && aTxt.Bottom() > aParaPrtArea.Bottom()) { // Text has been replaced by frame, so adjust parameters height - ULONG nDiff = aTxt.Bottom() - aParaPrtArea.Bottom(); + sal_uIntPtr nDiff = aTxt.Bottom() - aParaPrtArea.Bottom(); aParaPrtArea.Bottom() += nDiff; aPara.Bottom() += nDiff; @@ -692,7 +692,7 @@ void SvxSwFrameExample::Paint(const Rectangle&) DrawRect_Impl(aRect, m_aTransColor, m_aAlignColor); // Frame View - BOOL bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? TRUE : bTrans; + sal_Bool bDontFill = (nAnchor == TextContentAnchorType_AT_CHARACTER && aFrmRect.IsOver(aAutoCharFrame)) ? sal_True : bTrans; DrawRect_Impl( aFrmRect, bDontFill? m_aTransColor : m_aBgCol, m_aFrameColor ); } diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx index aa6b87a180..64ce2d13ca 100644..100755 --- a/svx/source/dialog/swframeposstrings.cxx +++ b/svx/source/dialog/swframeposstrings.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <swframeposstrings.hxx> +#include <svx/swframeposstrings.hxx> #include <tools/rc.hxx> #include <tools/debug.hxx> #include <svx/dialmgr.hxx> @@ -44,7 +44,7 @@ public: SvxSwFramePosString_Impl::SvxSwFramePosString_Impl() : Resource(SVX_RES(RID_SVXSW_FRAMEPOSITIONS)) { - for(USHORT i = 0; i < SvxSwFramePosString::STR_MAX; i++) + for(sal_uInt16 i = 0; i < SvxSwFramePosString::STR_MAX; i++) { //string ids have to start at 1 aStrings[i] = String(SVX_RES(i + 1)); diff --git a/svx/source/dialog/swframeposstrings.src b/svx/source/dialog/swframeposstrings.src index 60e616c894..fec49dc5d4 100644..100755 --- a/svx/source/dialog/swframeposstrings.src +++ b/svx/source/dialog/swframeposstrings.src @@ -26,7 +26,7 @@ ************************************************************************/ #include <svx/dialogs.hrc> -//the following defines have to match the (enum values + 1) in swframeposstrings.hxx! +//the following defines have to match the (enum values + 1) in svx/swframeposstrings.hxx! #define STR_LEFT 1 #define STR_RIGHT 2 #define STR_FROMLEFT 3 diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 581f5f8f08..9611d85c15 100644..100755 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -29,8 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "txencbox.hxx" -#include "txenctab.hxx" +#include "svx/txencbox.hxx" +#include "svx/txenctab.hxx" #include <svx/dialogs.hrc> #include "svx/dbcharsethelper.hxx" #include <vcl/svapp.hxx> @@ -58,12 +58,12 @@ SvxTextEncodingBox::~SvxTextEncodingBox() //------------------------------------------------------------------------ -USHORT SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const +sal_uInt16 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const { - USHORT nCount = GetEntryCount(); - for ( USHORT i=0; i<nCount; i++ ) + sal_uInt16 nCount = GetEntryCount(); + for ( sal_uInt16 i=0; i<nCount; i++ ) { - if ( nEnc == rtl_TextEncoding( (ULONG)GetEntryData(i) ) ) + if ( nEnc == rtl_TextEncoding( (sal_uIntPtr)GetEntryData(i) ) ) return i; } return LISTBOX_ENTRY_NOTFOUND; @@ -80,12 +80,12 @@ void SvxTextEncodingBox::FillFromTextEncodingTable( sal_uInt32 nCount = m_pEncTable->Count(); for ( sal_uInt32 j=0; j<nCount; j++ ) { - BOOL bInsert = TRUE; + sal_Bool bInsert = sal_True; rtl_TextEncoding nEnc = rtl_TextEncoding( m_pEncTable->GetValue( j ) ); if ( nExcludeInfoFlags ) { if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) ) - bInsert = FALSE; + bInsert = sal_False; else { if ( (aInfo.Flags & nExcludeInfoFlags) == 0 ) @@ -93,10 +93,10 @@ void SvxTextEncodingBox::FillFromTextEncodingTable( if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) && ((nEnc == RTL_TEXTENCODING_UCS2) || nEnc == RTL_TEXTENCODING_UCS4) ) - bInsert = FALSE; // InfoFlags don't work for Unicode :-( + bInsert = sal_False; // InfoFlags don't work for Unicode :-( } else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 ) - bInsert = FALSE; + bInsert = sal_False; } } if ( bInsert ) @@ -109,7 +109,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable( case RTL_TEXTENCODING_GB_2312 : case RTL_TEXTENCODING_GBK : case RTL_TEXTENCODING_MS_936 : - bInsert = FALSE; + bInsert = sal_False; break; } } @@ -130,14 +130,14 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap( svxform::ODataAccessCharsetHelper aCSH; ::std::vector< rtl_TextEncoding > aEncs; sal_Int32 nCount = aCSH.getSupportedTextEncodings( aEncs ); - for ( USHORT j=0; j<nCount; j++ ) + for ( sal_uInt16 j=0; j<nCount; j++ ) { - BOOL bInsert = TRUE; + sal_Bool bInsert = sal_True; rtl_TextEncoding nEnc = rtl_TextEncoding( aEncs[j] ); if ( nExcludeInfoFlags ) { if ( !rtl_getTextEncodingInfo( nEnc, &aInfo ) ) - bInsert = FALSE; + bInsert = sal_False; else { if ( (aInfo.Flags & nExcludeInfoFlags) == 0 ) @@ -145,10 +145,10 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap( if ( (nExcludeInfoFlags & RTL_TEXTENCODING_INFO_UNICODE) && ((nEnc == RTL_TEXTENCODING_UCS2) || nEnc == RTL_TEXTENCODING_UCS4) ) - bInsert = FALSE; // InfoFlags don't work for Unicode :-( + bInsert = sal_False; // InfoFlags don't work for Unicode :-( } else if ( (aInfo.Flags & nButIncludeInfoFlags) == 0 ) - bInsert = FALSE; + bInsert = sal_False; } } if ( bInsert ) @@ -161,7 +161,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap( case RTL_TEXTENCODING_GB_2312 : case RTL_TEXTENCODING_GBK : case RTL_TEXTENCODING_MS_936 : - bInsert = FALSE; + bInsert = sal_False; break; } } @@ -186,15 +186,15 @@ void SvxTextEncodingBox::FillWithMimeAndSelectBest() //------------------------------------------------------------------------ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, - const String& rEntry, USHORT nPos ) + const String& rEntry, sal_uInt16 nPos ) { - USHORT nAt = InsertEntry( rEntry, nPos ); - SetEntryData( nAt, (void*)(ULONG)nEnc ); + sal_uInt16 nAt = InsertEntry( rEntry, nPos ); + SetEntryData( nAt, (void*)(sal_uIntPtr)nEnc ); } //------------------------------------------------------------------------ -void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, USHORT nPos ) +void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, sal_uInt16 nPos ) { const String& rEntry = m_pEncTable->GetTextString( nEnc ); if ( rEntry.Len() ) @@ -213,7 +213,7 @@ void SvxTextEncodingBox::InsertTextEncoding( const rtl_TextEncoding nEnc, USHORT void SvxTextEncodingBox::RemoveTextEncoding( const rtl_TextEncoding nEnc ) { - USHORT nAt = EncodingToPos_Impl( nEnc ); + sal_uInt16 nAt = EncodingToPos_Impl( nEnc ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) RemoveEntry( nAt ); @@ -223,19 +223,19 @@ void SvxTextEncodingBox::RemoveTextEncoding( const rtl_TextEncoding nEnc ) rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const { - USHORT nPos = GetSelectEntryPos(); + sal_uInt16 nPos = GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) - return rtl_TextEncoding( (ULONG)GetEntryData(nPos) ); + return rtl_TextEncoding( (sal_uIntPtr)GetEntryData(nPos) ); else return RTL_TEXTENCODING_DONTKNOW; } //------------------------------------------------------------------------ -void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, BOOL bSelect ) +void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, sal_Bool bSelect ) { - USHORT nAt = EncodingToPos_Impl( nEnc ); + sal_uInt16 nAt = EncodingToPos_Impl( nEnc ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) SelectEntryPos( nAt, bSelect ); @@ -243,14 +243,14 @@ void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, BOOL b //------------------------------------------------------------------------ -BOOL SvxTextEncodingBox::IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const +sal_Bool SvxTextEncodingBox::IsTextEncodingSelected( const rtl_TextEncoding nEnc ) const { - USHORT nAt = EncodingToPos_Impl( nEnc ); + sal_uInt16 nAt = EncodingToPos_Impl( nEnc ); if ( nAt != LISTBOX_ENTRY_NOTFOUND ) return IsEntryPosSelected( nAt ); else - return FALSE; + return sal_False; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx index b06f31ec4a..d211cf0ba1 100644..100755 --- a/svx/source/dialog/txenctab.cxx +++ b/svx/source/dialog/txenctab.cxx @@ -31,7 +31,7 @@ #include <svx/dialogs.hrc> // -> RID_SVXSTR_TEXTENCODING_TABLE #include <svx/dialmgr.hxx> -#include "txenctab.hxx" +#include "svx/txenctab.hxx" #include <tools/shl.hxx> //------------------------------------------------------------------------ diff --git a/svx/source/dialog/txenctab.src b/svx/source/dialog/txenctab.src index 7cc40bbcd2..7cc40bbcd2 100644..100755 --- a/svx/source/dialog/txenctab.src +++ b/svx/source/dialog/txenctab.src diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx index 2d4256d162..a965fdf341 100644..100755 --- a/svx/source/dialog/wrapfield.cxx +++ b/svx/source/dialog/wrapfield.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "wrapfield.hxx" +#include "svx/wrapfield.hxx" namespace svx { diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx index 639a9c1f9e..4bfd481186 100644..100755 --- a/svx/source/engine3d/camera3d.cxx +++ b/svx/source/engine3d/camera3d.cxx @@ -38,7 +38,7 @@ Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLook fResetFocalLength(fFocalLen), fResetBankAngle(fBankAng), fBankAngle(fBankAng), - bAutoAdjustProjection(TRUE) + bAutoAdjustProjection(sal_True) { SetVPD(0); SetPosition(rPos); diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index 444d031ee7..fc45231b3c 100644..100755 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -29,10 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/cube3d.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <basegfx/point/b3dpoint.hxx> #include <basegfx/polygon/b3dpolygon.hxx> #include <svx/sdr/contact/viewcontactofe3dcube.hxx> @@ -88,7 +88,7 @@ void E3dCubeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) |* \************************************************************************/ -UINT16 E3dCubeObj::GetObjIdentifier() const +sal_uInt16 E3dCubeObj::GetObjIdentifier() const { return E3D_CUBEOBJ_ID; } @@ -99,7 +99,7 @@ UINT16 E3dCubeObj::GetObjIdentifier() const |* \************************************************************************/ -SdrObject *E3dCubeObj::DoConvertToPolyObj(BOOL /*bBezier*/) const +SdrObject *E3dCubeObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const { return NULL; } @@ -148,7 +148,7 @@ void E3dCubeObj::SetCubeSize(const basegfx::B3DVector& rNew) } } -void E3dCubeObj::SetPosIsCenter(BOOL bNew) +void E3dCubeObj::SetPosIsCenter(sal_Bool bNew) { if(bPosIsCenter != bNew) { @@ -157,7 +157,7 @@ void E3dCubeObj::SetPosIsCenter(BOOL bNew) } } -void E3dCubeObj::SetSideFlags(UINT16 nNew) +void E3dCubeObj::SetSideFlags(sal_uInt16 nNew) { if(nSideFlags != nNew) { diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx index ae5f9bc8be..9aabe84ac3 100644..100755 --- a/svx/source/engine3d/deflt3d.cxx +++ b/svx/source/engine3d/deflt3d.cxx @@ -50,14 +50,14 @@ E3dDefaultAttributes::E3dDefaultAttributes() void E3dDefaultAttributes::Reset() { // Compound-Objekt - bDefaultCreateNormals = TRUE; - bDefaultCreateTexture = TRUE; + bDefaultCreateNormals = sal_True; + bDefaultCreateTexture = sal_True; // Cube-Objekt aDefaultCubePos = basegfx::B3DPoint(-500.0, -500.0, -500.0); aDefaultCubeSize = basegfx::B3DVector(1000.0, 1000.0, 1000.0); nDefaultCubeSideFlags = CUBE_FULL; - bDefaultCubePosIsCenter = FALSE; + bDefaultCubePosIsCenter = sal_False; // Sphere-Objekt aDefaultSphereCenter = basegfx::B3DPoint(0.0, 0.0, 0.0); @@ -65,18 +65,18 @@ void E3dDefaultAttributes::Reset() // Lathe-Objekt nDefaultLatheEndAngle = 3600; - bDefaultLatheSmoothed = TRUE; - bDefaultLatheSmoothFrontBack = FALSE; - bDefaultLatheCharacterMode = FALSE; - bDefaultLatheCloseFront = TRUE; - bDefaultLatheCloseBack = TRUE; + bDefaultLatheSmoothed = sal_True; + bDefaultLatheSmoothFrontBack = sal_False; + bDefaultLatheCharacterMode = sal_False; + bDefaultLatheCloseFront = sal_True; + bDefaultLatheCloseBack = sal_True; // Extrude-Objekt - bDefaultExtrudeSmoothed = TRUE; - bDefaultExtrudeSmoothFrontBack = FALSE; - bDefaultExtrudeCharacterMode = FALSE; - bDefaultExtrudeCloseFront = TRUE; - bDefaultExtrudeCloseBack = TRUE; + bDefaultExtrudeSmoothed = sal_True; + bDefaultExtrudeSmoothFrontBack = sal_False; + bDefaultExtrudeCharacterMode = sal_False; + bDefaultExtrudeCloseFront = sal_True; + bDefaultExtrudeCloseBack = sal_True; } // eof diff --git a/svx/source/engine3d/dragmt3d.cxx b/svx/source/engine3d/dragmt3d.cxx index e55f7975d4..d358176f2a 100644..100755 --- a/svx/source/engine3d/dragmt3d.cxx +++ b/svx/source/engine3d/dragmt3d.cxx @@ -58,11 +58,11 @@ E3dDragMethod::E3dDragMethod ( SdrDragView &_rView, const SdrMarkList& rMark, E3dDragConstraint eConstr, - BOOL bFull) + sal_Bool bFull) : SdrDragMethod(_rView), meConstraint(eConstr), mbMoveFull(bFull), - mbMovedAtAll(FALSE) + mbMovedAtAll(sal_False) { // Fuer alle in der selektion befindlichen 3D-Objekte // eine Unit anlegen @@ -176,7 +176,7 @@ bool E3dDragMethod::BeginSdrDrag() Show(); } - return TRUE; + return sal_True; } /************************************************************************* @@ -219,7 +219,7 @@ bool E3dDragMethod::EndSdrDrag(bool /*bCopy*/) getSdrDragView().EndUndo(); } - return TRUE; + return sal_True; } /************************************************************************* @@ -322,7 +322,7 @@ TYPEINIT1(E3dDragRotate, E3dDragMethod); E3dDragRotate::E3dDragRotate(SdrDragView &_rView, const SdrMarkList& rMark, E3dDragConstraint eConstr, - BOOL bFull) + sal_Bool bFull) : E3dDragMethod(_rView, rMark, eConstr, bFull) { // Zentrum aller selektierten Objekte in Augkoordinaten holen @@ -422,7 +422,7 @@ void E3dDragRotate::MoveSdrDrag(const Point& rPnt) } long nSnap = 0; - if(!getSdrDragView().IsRotateAllowed(FALSE)) + if(!getSdrDragView().IsRotateAllowed(sal_False)) nSnap = 90; if(nSnap != 0) @@ -515,7 +515,7 @@ E3dDragMove::E3dDragMove(SdrDragView &_rView, const SdrMarkList& rMark, SdrHdlKind eDrgHdl, E3dDragConstraint eConstr, - BOOL bFull) + sal_Bool bFull) : E3dDragMethod(_rView, rMark, eConstr, bFull), meWhatDragHdl(eDrgHdl) { diff --git a/svx/source/engine3d/e3dsceneupdater.cxx b/svx/source/engine3d/e3dsceneupdater.cxx index f5b71fc859..f5b71fc859 100644..100755 --- a/svx/source/engine3d/e3dsceneupdater.cxx +++ b/svx/source/engine3d/e3dsceneupdater.cxx diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx index aaba36b066..4d59b700e5 100644..100755 --- a/svx/source/engine3d/e3dundo.cxx +++ b/svx/source/engine3d/e3dundo.cxx @@ -53,9 +53,9 @@ E3dUndoAction::~E3dUndoAction () |* Repeat gibt es nicht |* \************************************************************************/ -BOOL E3dUndoAction::CanRepeat(SfxRepeatTarget&) const +sal_Bool E3dUndoAction::CanRepeat(SfxRepeatTarget&) const { - return FALSE; + return sal_False; } /************************************************************************/ @@ -117,7 +117,7 @@ E3dAttributesUndoAction::E3dAttributesUndoAction( SdrModel &rModel, E3dObject* pInObject, const SfxItemSet& rNewSet, const SfxItemSet& rOldSet, - BOOL bUseSubObj) + sal_Bool bUseSubObj) : SdrUndoAction( rModel ), pObject ( pInObject ), pView ( p3dView ), @@ -165,9 +165,9 @@ void E3dAttributesUndoAction::Redo() |* Mehrfaches Undo nicht moeglich |* \************************************************************************/ -BOOL E3dAttributesUndoAction::CanRepeat(SfxRepeatTarget& /*rView*/) const +sal_Bool E3dAttributesUndoAction::CanRepeat(SfxRepeatTarget& /*rView*/) const { - return FALSE; + return sal_False; } /************************************************************************* diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index 112606f89a..d0cabc2fee 100644..100755 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -29,10 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/extrud3d.hxx> #include <svx/scene3d.hxx> @@ -117,7 +117,7 @@ void E3dExtrudeObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) |* \************************************************************************/ -UINT16 E3dExtrudeObj::GetObjIdentifier() const +sal_uInt16 E3dExtrudeObj::GetObjIdentifier() const { return E3D_EXTRUDEOBJ_ID; } @@ -191,9 +191,9 @@ void E3dExtrudeObj::TakeObjNamePlural(XubString& rName) const |* \************************************************************************/ -BOOL E3dExtrudeObj::IsBreakObjPossible() +sal_Bool E3dExtrudeObj::IsBreakObjPossible() { - return TRUE; + return sal_True; } SdrAttrObj* E3dExtrudeObj::GetBreakObj() diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index d9efa6243b..589f03542f 100644..100755 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -38,7 +38,7 @@ #include <tools/shl.hxx> #include <svx/xflclit.hxx> #include <svx/svdmodel.hxx> -#include <globl3d.hxx> +#include <svx/globl3d.hxx> #include <svx/view3d.hxx> #include <svx/obj3d.hxx> #include <svx/sphere3d.hxx> @@ -49,9 +49,9 @@ #include <svx/polysc3d.hxx> #include <editeng/eeitem.hxx> #include <svl/style.hxx> -#include <dlgutil.hxx> +#include <svx/dlgutil.hxx> -#include <dlgutil.hxx> +#include <svx/dlgutil.hxx> #include <svx/dialmgr.hxx> #include <svx/viewpt3d.hxx> // ProjectionType @@ -61,7 +61,7 @@ #include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> -#include <gallery.hxx> +#include <svx/gallery.hxx> #define GALLERY_THEME "3D" #include <svl/whiter.hxx> @@ -86,7 +86,7 @@ namespace { SfxDispatcher* LocalGetDispatcher (const SfxBindings* pBindings) { SfxDispatcher* pDispatcher = NULL; - + if (SfxViewFrame::Current() != NULL) pDispatcher = SfxViewFrame::Current()->GetDispatcher(); else if (pBindings != NULL) @@ -111,6 +111,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnMaterial ( this, SVX_RES( BTN_MATERIAL ) ), aBtnUpdate ( this, SVX_RES( BTN_UPDATE ) ), aBtnAssign ( this, SVX_RES( BTN_ASSIGN ) ), + aFLGeometrie ( this, SVX_RES( FL_GEOMETRIE ) ), // Geometrie aFtPercentDiagonal ( this, SVX_RES( FT_PERCENT_DIAGONAL ) ), @@ -121,36 +122,36 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aMtrEndAngle ( this, SVX_RES( MTR_END_ANGLE ) ), aFtDepth ( this, SVX_RES( FT_DEPTH ) ), aMtrDepth ( this, SVX_RES( MTR_DEPTH ) ), - aFLGeometrie ( this, SVX_RES( FL_GEOMETRIE ) ), + aFLSegments ( this, SVX_RES( FL_SEGMENTS ) ), aFtHorizontal ( this, SVX_RES( FT_HORIZONTAL ) ), aNumHorizontal ( this, SVX_RES( NUM_HORIZONTAL ) ), aFtVertical ( this, SVX_RES( FT_VERTICAL ) ), aNumVertical ( this, SVX_RES( NUM_VERTICAL ) ), - aFLSegments ( this, SVX_RES( FL_SEGMENTS ) ), + aFLNormals ( this, SVX_RES( FL_NORMALS ) ), aBtnNormalsObj ( this, SVX_RES( BTN_NORMALS_OBJ ) ), aBtnNormalsFlat ( this, SVX_RES( BTN_NORMALS_FLAT ) ), aBtnNormalsSphere ( this, SVX_RES( BTN_NORMALS_SPHERE ) ), aBtnNormalsInvert ( this, SVX_RES( BTN_NORMALS_INVERT ) ), aBtnTwoSidedLighting( this, SVX_RES( BTN_TWO_SIDED_LIGHTING ) ), - aFLNormals ( this, SVX_RES( FL_NORMALS ) ), aBtnDoubleSided ( this, SVX_RES( BTN_DOUBLE_SIDED ) ), // Darstellung + aFLRepresentation ( this, SVX_RES( FL_REPRESENTATION ) ), aFtShademode ( this, SVX_RES( FT_SHADEMODE ) ), aLbShademode ( this, SVX_RES( LB_SHADEMODE ) ), + aFLShadow ( this, SVX_RES( FL_SHADOW ) ), aBtnShadow3d ( this, SVX_RES( BTN_SHADOW_3D ) ), aFtSlant ( this, SVX_RES( FT_SLANT ) ), aMtrSlant ( this, SVX_RES( MTR_SLANT ) ), - aFLShadow ( this, SVX_RES( FL_SHADOW ) ), - aFtDistance ( this, SVX_RES( FT_DISTANCE ) ), - aMtrDistance ( this, SVX_RES( MTR_DISTANCE ) ), - aFtFocalLeng ( this, SVX_RES( FT_FOCAL_LENGTH ) ), - aMtrFocalLength ( this, SVX_RES( MTR_FOCAL_LENGTH ) ), - aFLCamera ( this, SVX_RES( FL_CAMERA ) ), - aFLRepresentation ( this, SVX_RES( FL_REPRESENTATION ) ), + aFtDistance ( this, SVX_RES( FT_DISTANCE ) ), + aMtrDistance ( this, SVX_RES( MTR_DISTANCE ) ), + aFtFocalLeng ( this, SVX_RES( FT_FOCAL_LENGTH ) ), + aMtrFocalLength ( this, SVX_RES( MTR_FOCAL_LENGTH ) ), + aFLCamera ( this, SVX_RES( FL_CAMERA ) ), + aFLLight ( this, SVX_RES( FL_LIGHT ) ), // Beleuchtung aBtnLight1 ( this, SVX_RES( BTN_LIGHT_1 ) ), @@ -161,6 +162,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnLight6 ( this, SVX_RES( BTN_LIGHT_6 ) ), aBtnLight7 ( this, SVX_RES( BTN_LIGHT_7 ) ), aBtnLight8 ( this, SVX_RES( BTN_LIGHT_8 ) ), + aFTLightsource ( this, SVX_RES( FT_LIGHTSOURCE ) ), aLbLight1 ( this, SVX_RES( LB_LIGHT_1 ) ), aLbLight2 ( this, SVX_RES( LB_LIGHT_2 ) ), aLbLight3 ( this, SVX_RES( LB_LIGHT_3 ) ), @@ -171,16 +173,14 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aLbLight8 ( this, SVX_RES( LB_LIGHT_8 ) ), aBtnLightColor ( this, SVX_RES( BTN_LIGHT_COLOR ) ), - aFTLightsource ( this, SVX_RES( FT_LIGHTSOURCE ) ), // #99694# Keyboard shortcuts activate the next control, so the // order needed to be changed here aFTAmbientlight ( this, SVX_RES( FT_AMBIENTLIGHT ) ), // Text label aLbAmbientlight ( this, SVX_RES( LB_AMBIENTLIGHT ) ), // ListBox aBtnAmbientColor ( this, SVX_RES( BTN_AMBIENT_COLOR ) ), // color button - - aFLLight ( this, SVX_RES( FL_LIGHT ) ), - + aFLTexture ( this, SVX_RES( FL_TEXTURE ) ), + // Textures aFtTexKind ( this, SVX_RES( FT_TEX_KIND ) ), aBtnTexLuminance ( this, SVX_RES( BTN_TEX_LUMINANCE ) ), @@ -199,7 +199,7 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aBtnTexCircleY ( this, SVX_RES( BTN_TEX_CIRCLE_Y ) ), aFtTexFilter ( this, SVX_RES( FT_TEX_FILTER ) ), aBtnTexFilter ( this, SVX_RES( BTN_TEX_FILTER ) ), - aFLTexture ( this, SVX_RES( FL_TEXTURE ) ), + aFLMaterial ( this, SVX_RES( FL_MATERIAL ) ), // Material aFtMatFavorites ( this, SVX_RES( FT_MAT_FAVORITES ) ), @@ -210,25 +210,24 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, aFtMatEmission ( this, SVX_RES( FT_MAT_EMISSION ) ), aLbMatEmission ( this, SVX_RES( LB_MAT_EMISSION ) ), aBtnEmissionColor ( this, SVX_RES( BTN_EMISSION_COLOR ) ), + aFLMatSpecular ( this, SVX_RES( FL_MAT_SPECULAR ) ), aFtMatSpecular ( this, SVX_RES( FT_MAT_SPECULAR ) ), aLbMatSpecular ( this, SVX_RES( LB_MAT_SPECULAR ) ), aBtnSpecularColor ( this, SVX_RES( BTN_SPECULAR_COLOR ) ), aFtMatSpecularIntensity( this, SVX_RES( FT_MAT_SPECULAR_INTENSITY ) ), aMtrMatSpecularIntensity( this, SVX_RES( MTR_MAT_SPECULAR_INTENSITY ) ), - aFLMatSpecular ( this, SVX_RES( FL_MAT_SPECULAR ) ), - aFLMaterial ( this, SVX_RES( FL_MATERIAL ) ), + aCtlPreview ( this, SVX_RES( CTL_PREVIEW ) ), + aCtlLightPreview ( this, SVX_RES( CTL_LIGHT_PREVIEW ) ), // Unterer Bereich aBtnConvertTo3D ( this, SVX_RES( BTN_CHANGE_TO_3D ) ), aBtnLatheObject ( this, SVX_RES( BTN_LATHE_OBJ ) ), aBtnPerspective ( this, SVX_RES( BTN_PERSPECTIVE ) ), - aCtlPreview ( this, SVX_RES( CTL_PREVIEW ) ), - aCtlLightPreview ( this, SVX_RES( CTL_LIGHT_PREVIEW ) ), aImgLightOn ( SVX_RES( RID_SVXIMAGE_LIGHT_ON ) ), aImgLightOff ( SVX_RES( RID_SVXIMAGE_LIGHT_OFF ) ), - bUpdate ( FALSE ), + bUpdate ( sal_False ), eViewType ( VIEWTYPE_GEO ), pModel ( NULL ), @@ -244,8 +243,13 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, pConvertTo3DLatheItem(0L), mpImpl ( new Svx3DWinImpl() ), mpRemember2DAttributes(NULL), - bOnly3DChanged ( FALSE ) + bOnly3DChanged ( sal_False ) { + String accname(SVX_RES(STR_COLOR_LIGHT_PRE)); + aCtlLightPreview.SetAccessibleName(accname); + aCtlPreview.SetAccessibleName(accname); + aLbAmbientlight.SetAccessibleName(aFTAmbientlight.GetDisplayText()); + mpImpl->pPool = NULL; FreeResource(); @@ -356,12 +360,92 @@ Svx3DWin::Svx3DWin( SfxBindings* pInBindings, SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); if (pDispatcher != NULL) { - SfxBoolItem aItem( SID_3D_INIT, TRUE ); + SfxBoolItem aItem( SID_3D_INIT, sal_True ); pDispatcher->Execute( SID_3D_INIT, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); } Reset(); + + aBtnNormalsObj.SetAccessibleRelationMemberOf( &aFLNormals ); + aBtnNormalsFlat.SetAccessibleRelationMemberOf( &aFLNormals ); + aBtnNormalsSphere.SetAccessibleRelationMemberOf( &aFLNormals ); + aBtnNormalsInvert.SetAccessibleRelationMemberOf( &aFLNormals ); + aBtnTwoSidedLighting.SetAccessibleRelationMemberOf( &aFLNormals ); + aBtnDoubleSided.SetAccessibleRelationMemberOf( &aFLNormals ); + + aBtnLight1.SetAccessibleRelationMemberOf( &aFLLight ); + aBtnLight2.SetAccessibleRelationMemberOf( &aFLLight ); + aBtnLight3.SetAccessibleRelationMemberOf( &aFLLight ); + aBtnLight4.SetAccessibleRelationMemberOf( &aFLLight ); + aBtnLight5.SetAccessibleRelationMemberOf( &aFLLight ); + aBtnLight6.SetAccessibleRelationMemberOf( &aFLLight ); + aBtnLight7.SetAccessibleRelationMemberOf( &aFLLight ); + aBtnLight8.SetAccessibleRelationMemberOf( &aFLLight ); + + aBtnLight1.SetAccessibleRelationLabeledBy( &aFTLightsource ); + aBtnLight2.SetAccessibleRelationLabeledBy( &aFTLightsource ); + aBtnLight3.SetAccessibleRelationLabeledBy( &aFTLightsource ); + aBtnLight4.SetAccessibleRelationLabeledBy( &aFTLightsource ); + aBtnLight5.SetAccessibleRelationLabeledBy( &aFTLightsource ); + aBtnLight6.SetAccessibleRelationLabeledBy( &aFTLightsource ); + aBtnLight7.SetAccessibleRelationLabeledBy( &aFTLightsource ); + aBtnLight8.SetAccessibleRelationLabeledBy( &aFTLightsource ); + aBtnLightColor.SetAccessibleRelationMemberOf( &aFLLight ); + aBtnLightColor.SetAccessibleRelationLabeledBy( &aFTLightsource ); + aBtnAmbientColor.SetAccessibleRelationMemberOf( &aFLLight ); + aBtnAmbientColor.SetAccessibleRelationLabeledBy( &aFTAmbientlight ); + + aBtnSpecularColor.SetAccessibleRelationLabeledBy( &aFtMatSpecular ); + aBtnMatColor.SetAccessibleRelationLabeledBy( &aFtMatColor ); + aBtnEmissionColor.SetAccessibleRelationLabeledBy( &aFtMatEmission ); + aBtnTexLuminance.SetAccessibleRelationLabeledBy( &aFtTexKind ); + aBtnTexColor.SetAccessibleRelationLabeledBy( &aFtTexKind ); + aBtnTexReplace.SetAccessibleRelationLabeledBy( &aFtTexMode ); + aBtnTexModulate.SetAccessibleRelationLabeledBy( &aFtTexMode ); + aBtnTexBlend.SetAccessibleRelationLabeledBy( &aFtTexMode ); + aBtnTexObjectX.SetAccessibleRelationLabeledBy( &aFtTexProjectionX ); + aBtnTexParallelX.SetAccessibleRelationLabeledBy( &aFtTexProjectionX ); + aBtnTexCircleX.SetAccessibleRelationLabeledBy( &aFtTexProjectionX ); + aBtnTexObjectY.SetAccessibleRelationLabeledBy( &aFtTexProjectionY ); + aBtnTexParallelY.SetAccessibleRelationLabeledBy( &aFtTexProjectionY ); + aBtnTexCircleY.SetAccessibleRelationLabeledBy( &aFtTexProjectionY ); + aBtnTexFilter.SetAccessibleRelationLabeledBy( &aFtTexFilter ); + aCtlLightPreview.SetAccessibleRelationLabeledBy( &aCtlLightPreview ); + aBtnNormalsObj.SetAccessibleRelationMemberOf(&aFLNormals); + aBtnNormalsFlat.SetAccessibleRelationMemberOf(&aFLNormals); + aBtnNormalsSphere.SetAccessibleRelationMemberOf(&aFLNormals); + aBtnNormalsInvert.SetAccessibleRelationMemberOf(&aFLNormals); + aBtnTwoSidedLighting.SetAccessibleRelationMemberOf(&aFLNormals); + + aBtnShadow3d.SetAccessibleRelationMemberOf(&aFLShadow); + + aBtnLight1.SetAccessibleRelationMemberOf(&aFLLight); + aBtnLight2.SetAccessibleRelationMemberOf(&aFLLight); + aBtnLight3.SetAccessibleRelationMemberOf(&aFLLight); + aBtnLight4.SetAccessibleRelationMemberOf(&aFLLight); + aBtnLight5.SetAccessibleRelationMemberOf(&aFLLight); + aBtnLight6.SetAccessibleRelationMemberOf(&aFLLight); + aBtnLight7.SetAccessibleRelationMemberOf(&aFLLight); + aBtnLight8.SetAccessibleRelationMemberOf(&aFLLight); + + aBtnTexLuminance.SetAccessibleRelationMemberOf(&aFLTexture); + aBtnTexColor.SetAccessibleRelationMemberOf(&aFLTexture); + aBtnTexReplace.SetAccessibleRelationMemberOf(&aFLTexture); + aBtnTexModulate.SetAccessibleRelationMemberOf(&aFLTexture); + aBtnTexBlend.SetAccessibleRelationMemberOf(&aFLTexture); + aBtnTexObjectX.SetAccessibleRelationMemberOf(&aFLTexture); + aBtnTexParallelX.SetAccessibleRelationMemberOf(&aFLTexture); + aBtnTexCircleX.SetAccessibleRelationMemberOf(&aFLTexture); + aBtnTexObjectY.SetAccessibleRelationMemberOf(&aFLTexture); + aBtnTexParallelY.SetAccessibleRelationMemberOf(&aFLTexture); + aBtnTexCircleY.SetAccessibleRelationMemberOf(&aFLTexture); + aBtnTexFilter.SetAccessibleRelationMemberOf(&aFLTexture); + + aBtnMatColor.SetAccessibleRelationMemberOf(&aFLMaterial); + aBtnEmissionColor.SetAccessibleRelationMemberOf(&aFLMaterial); + + aBtnSpecularColor.SetAccessibleRelationMemberOf(&aFLMatSpecular); } // ----------------------------------------------------------------------- @@ -432,11 +516,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) while(nWhich) { - SfxItemState eState = rAttrs.GetItemState(nWhich, FALSE); + SfxItemState eState = rAttrs.GetItemState(nWhich, sal_False); if(SFX_ITEM_DONTCARE == eState) mpRemember2DAttributes->InvalidateItem(nWhich); else if(SFX_ITEM_SET == eState) - mpRemember2DAttributes->Put(rAttrs.Get(nWhich, FALSE)); + mpRemember2DAttributes->Put(rAttrs.Get(nWhich, sal_False)); nWhich = aIter.NextWhich(); } @@ -455,16 +539,16 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // Segmentanzahl aenderbar ? und andere Stati - SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, FALSE, &pItem ); + SfxItemState eState = rAttrs.GetItemState( SID_ATTR_3D_INTERN, sal_False, &pItem ); if( SFX_ITEM_SET == eState ) { - UINT32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue(); - //BOOL bLathe = (BOOL) ( nState & 1 ); - BOOL bExtrude = (BOOL) ( nState & 2 ); - BOOL bSphere = (BOOL) ( nState & 4 ); - BOOL bCube = (BOOL) ( nState & 8 ); + sal_uInt32 nState = ( ( const SfxUInt32Item* )pItem )->GetValue(); + //sal_Bool bLathe = (sal_Bool) ( nState & 1 ); + sal_Bool bExtrude = (sal_Bool) ( nState & 2 ); + sal_Bool bSphere = (sal_Bool) ( nState & 4 ); + sal_Bool bCube = (sal_Bool) ( nState & 8 ); - BOOL bChart = (BOOL) ( nState & 32 ); // Chart + sal_Bool bChart = (sal_Bool) ( nState & 32 ); // Chart if( !bChart ) { @@ -502,41 +586,41 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) else { // Geometrie - aFtHorizontal.Enable( FALSE ); - aNumHorizontal.Enable( FALSE ); + aFtHorizontal.Enable( sal_False ); + aNumHorizontal.Enable( sal_False ); aNumHorizontal.SetEmptyFieldValue(); - aFtVertical.Enable( FALSE ); - aNumVertical.Enable( FALSE ); + aFtVertical.Enable( sal_False ); + aNumVertical.Enable( sal_False ); aNumVertical.SetEmptyFieldValue(); - aFLSegments.Enable( FALSE ); - aFtEndAngle.Enable( FALSE ); - aMtrEndAngle.Enable( FALSE ); + aFLSegments.Enable( sal_False ); + aFtEndAngle.Enable( sal_False ); + aMtrEndAngle.Enable( sal_False ); aMtrEndAngle.SetEmptyFieldValue(); - aFtDepth.Enable( FALSE ); - aMtrDepth.Enable( FALSE ); + aFtDepth.Enable( sal_False ); + aMtrDepth.Enable( sal_False ); aMtrDepth.SetEmptyFieldValue(); // Darstellung - aBtnShadow3d.Enable( FALSE ); - aFtSlant.Enable( FALSE ); - aMtrSlant.Enable( FALSE ); - aFLShadow.Enable( FALSE ); + aBtnShadow3d.Enable( sal_False ); + aFtSlant.Enable( sal_False ); + aMtrSlant.Enable( sal_False ); + aFLShadow.Enable( sal_False ); - aFtDistance.Enable( FALSE ); - aMtrDistance.Enable( FALSE ); + aFtDistance.Enable( sal_False ); + aMtrDistance.Enable( sal_False ); aMtrDistance.SetEmptyFieldValue(); - aFtFocalLeng.Enable( FALSE ); - aMtrFocalLength.Enable( FALSE ); + aFtFocalLeng.Enable( sal_False ); + aMtrFocalLength.Enable( sal_False ); aMtrFocalLength.SetEmptyFieldValue(); - aFLCamera.Enable( FALSE ); + aFLCamera.Enable( sal_False ); // Unterer Bereich - aBtnConvertTo3D.Enable( FALSE ); - aBtnLatheObject.Enable( FALSE ); + aBtnConvertTo3D.Enable( sal_False ); + aBtnLatheObject.Enable( sal_False ); } } // Bitmapfuellung ? -> Status - BOOL bBitmap(FALSE); + sal_Bool bBitmap(sal_False); eState = rAttrs.GetItemState(XATTR_FILLSTYLE); if(eState != SFX_ITEM_DONTCARE) { @@ -576,8 +660,8 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) { aNumHorizontal.SetValue( nValue ); // evtl. am Ende... - // aCtlLightPreview.GetSvx3DLightControl().SetHorizontalSegments( (UINT16)nValue ); - bUpdate = TRUE; + // aCtlLightPreview.GetSvx3DLightControl().SetHorizontalSegments( (sal_uInt16)nValue ); + bUpdate = sal_True; } else if( aNumHorizontal.IsEmptyFieldValue() ) aNumHorizontal.SetValue( nValue ); @@ -587,7 +671,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !aNumHorizontal.IsEmptyFieldValue() ) { aNumHorizontal.SetEmptyFieldValue(); - bUpdate = TRUE; + bUpdate = sal_True; } } } @@ -598,13 +682,13 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_VERT_SEGS); if( eState != SFX_ITEM_DONTCARE ) { - UINT32 nValue = ((const Svx3DVerticalSegmentsItem&)rAttrs.Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); - if( nValue != (UINT32) aNumVertical.GetValue() ) + sal_uInt32 nValue = ((const Svx3DVerticalSegmentsItem&)rAttrs.Get(SDRATTR_3DOBJ_VERT_SEGS)).GetValue(); + if( nValue != (sal_uInt32) aNumVertical.GetValue() ) { aNumVertical.SetValue( nValue ); // evtl. am Ende... - //aCtlLightPreview.GetSvx3DLightControl().SetVerticalSegments( (UINT16)nValue ); - bUpdate = TRUE; + //aCtlLightPreview.GetSvx3DLightControl().SetVerticalSegments( (sal_uInt16)nValue ); + bUpdate = sal_True; } else if( aNumVertical.IsEmptyFieldValue() ) aNumVertical.SetValue( nValue ); @@ -614,7 +698,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !aNumVertical.IsEmptyFieldValue() ) { aNumVertical.SetEmptyFieldValue(); - bUpdate = TRUE; + bUpdate = sal_True; } } } @@ -625,15 +709,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DEPTH); if( eState != SFX_ITEM_DONTCARE ) { - UINT32 nValue = ((const Svx3DDepthItem&)rAttrs.Get(SDRATTR_3DOBJ_DEPTH)).GetValue(); - UINT32 nValue2 = GetCoreValue( aMtrDepth, ePoolUnit ); + sal_uInt32 nValue = ((const Svx3DDepthItem&)rAttrs.Get(SDRATTR_3DOBJ_DEPTH)).GetValue(); + sal_uInt32 nValue2 = GetCoreValue( aMtrDepth, ePoolUnit ); if( nValue != nValue2 ) { if( eFUnit != aMtrDepth.GetUnit() ) SetFieldUnit( aMtrDepth, eFUnit ); SetMetricValue( aMtrDepth, nValue, ePoolUnit ); - bUpdate = TRUE; + bUpdate = sal_True; } else if( aMtrDepth.IsEmptyFieldValue() ) aMtrDepth.SetValue( aMtrDepth.GetValue() ); @@ -643,7 +727,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !aMtrDepth.IsEmptyFieldValue() ) { aMtrDepth.SetEmptyFieldValue(); - bUpdate = TRUE; + bUpdate = sal_True; } } } @@ -652,11 +736,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_DOUBLE_SIDED); if( eState != SFX_ITEM_DONTCARE ) { - BOOL bValue = ((const Svx3DDoubleSidedItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue(); + sal_Bool bValue = ((const Svx3DDoubleSidedItem&)rAttrs.Get(SDRATTR_3DOBJ_DOUBLE_SIDED)).GetValue(); if( bValue != aBtnDoubleSided.IsChecked() ) { aBtnDoubleSided.Check( bValue ); - bUpdate = TRUE; + bUpdate = sal_True; } else if( aBtnDoubleSided.GetState() == STATE_DONTKNOW ) aBtnDoubleSided.Check( bValue ); @@ -666,7 +750,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnDoubleSided.GetState() != STATE_DONTKNOW ) { aBtnDoubleSided.SetState( STATE_DONTKNOW ); - bUpdate = TRUE; + bUpdate = sal_True; } } @@ -676,11 +760,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_PERCENT_DIAGONAL); if( eState != SFX_ITEM_DONTCARE ) { - UINT16 nValue = ((const Svx3DPercentDiagonalItem&)rAttrs.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue(); + sal_uInt16 nValue = ((const Svx3DPercentDiagonalItem&)rAttrs.Get(SDRATTR_3DOBJ_PERCENT_DIAGONAL)).GetValue(); if( nValue != aMtrPercentDiagonal.GetValue() ) { aMtrPercentDiagonal.SetValue( nValue ); - bUpdate = TRUE; + bUpdate = sal_True; } else if( aMtrPercentDiagonal.IsEmptyFieldValue() ) aMtrPercentDiagonal.SetValue( nValue ); @@ -690,7 +774,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !aMtrPercentDiagonal.IsEmptyFieldValue() ) { aMtrPercentDiagonal.SetEmptyFieldValue(); - bUpdate = TRUE; + bUpdate = sal_True; } } } @@ -701,11 +785,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_BACKSCALE); if( eState != SFX_ITEM_DONTCARE ) { - UINT16 nValue = ((const Svx3DBackscaleItem&)rAttrs.Get(SDRATTR_3DOBJ_BACKSCALE)).GetValue(); + sal_uInt16 nValue = ((const Svx3DBackscaleItem&)rAttrs.Get(SDRATTR_3DOBJ_BACKSCALE)).GetValue(); if( nValue != aMtrBackscale.GetValue() ) { aMtrBackscale.SetValue( nValue ); - bUpdate = TRUE; + bUpdate = sal_True; } else if( aMtrBackscale.IsEmptyFieldValue() ) aMtrBackscale.SetValue( nValue ); @@ -715,7 +799,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !aMtrBackscale.IsEmptyFieldValue() ) { aMtrBackscale.SetEmptyFieldValue(); - bUpdate = TRUE; + bUpdate = sal_True; } } } @@ -726,11 +810,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_END_ANGLE); if( eState != SFX_ITEM_DONTCARE ) { - INT32 nValue = ((const Svx3DEndAngleItem&)rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue(); + sal_Int32 nValue = ((const Svx3DEndAngleItem&)rAttrs.Get(SDRATTR_3DOBJ_END_ANGLE)).GetValue(); if( nValue != aMtrEndAngle.GetValue() ) { aMtrEndAngle.SetValue( nValue ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -738,7 +822,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !aMtrEndAngle.IsEmptyFieldValue() ) { aMtrEndAngle.SetEmptyFieldValue(); - bUpdate = TRUE; + bUpdate = sal_True; } } } @@ -747,7 +831,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_KIND); if( eState != SFX_ITEM_DONTCARE ) { - UINT16 nValue = ((const Svx3DNormalsKindItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue(); + sal_uInt16 nValue = ((const Svx3DNormalsKindItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_KIND)).GetValue(); if( ( !aBtnNormalsObj.IsChecked() && nValue == 0 ) || ( !aBtnNormalsFlat.IsChecked() && nValue == 1 ) || @@ -756,7 +840,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aBtnNormalsObj.Check( nValue == 0 ); aBtnNormalsFlat.Check( nValue == 1 ); aBtnNormalsSphere.Check( nValue == 2 ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -765,10 +849,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aBtnNormalsFlat.IsChecked() || aBtnNormalsSphere.IsChecked() ) { - aBtnNormalsObj.Check( FALSE ); - aBtnNormalsFlat.Check( FALSE ); - aBtnNormalsSphere.Check( FALSE ); - bUpdate = TRUE; + aBtnNormalsObj.Check( sal_False ); + aBtnNormalsFlat.Check( sal_False ); + aBtnNormalsSphere.Check( sal_False ); + bUpdate = sal_True; } } @@ -776,11 +860,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_NORMALS_INVERT); if( eState != SFX_ITEM_DONTCARE ) { - BOOL bValue = ((const Svx3DNormalsInvertItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue(); + sal_Bool bValue = ((const Svx3DNormalsInvertItem&)rAttrs.Get(SDRATTR_3DOBJ_NORMALS_INVERT)).GetValue(); if( bValue != aBtnNormalsInvert.IsChecked() ) { aBtnNormalsInvert.Check( bValue ); - bUpdate = TRUE; + bUpdate = sal_True; } else if( aBtnNormalsInvert.GetState() == STATE_DONTKNOW ) aBtnNormalsInvert.Check( bValue ); @@ -790,7 +874,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnNormalsInvert.GetState() != STATE_DONTKNOW ) { aBtnNormalsInvert.SetState( STATE_DONTKNOW ); - bUpdate = TRUE; + bUpdate = sal_True; } } @@ -798,11 +882,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING); if( eState != SFX_ITEM_DONTCARE ) { - BOOL bValue = ((const Svx3DTwoSidedLightingItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue(); + sal_Bool bValue = ((const Svx3DTwoSidedLightingItem&)rAttrs.Get(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING)).GetValue(); if( bValue != aBtnTwoSidedLighting.IsChecked() ) { aBtnTwoSidedLighting.Check( bValue ); - bUpdate = TRUE; + bUpdate = sal_True; } else if( aBtnTwoSidedLighting.GetState() == STATE_DONTKNOW ) aBtnTwoSidedLighting.Check( bValue ); @@ -812,7 +896,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnTwoSidedLighting.GetState() != STATE_DONTKNOW ) { aBtnTwoSidedLighting.SetState( STATE_DONTKNOW ); - bUpdate = TRUE; + bUpdate = sal_True; } } @@ -821,11 +905,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADE_MODE); if( eState != SFX_ITEM_DONTCARE ) { - UINT16 nValue = ((const Svx3DShadeModeItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue(); + sal_uInt16 nValue = ((const Svx3DShadeModeItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADE_MODE)).GetValue(); if( nValue != aLbShademode.GetSelectEntryPos() ) { aLbShademode.SelectEntryPos( nValue ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -833,7 +917,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aLbShademode.GetSelectEntryCount() != 0 ) { aLbShademode.SetNoSelection(); - bUpdate = TRUE; + bUpdate = sal_True; } } @@ -841,13 +925,13 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_SHADOW_3D); if( eState != SFX_ITEM_DONTCARE ) { - BOOL bValue = ((const Svx3DShadow3DItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue(); + sal_Bool bValue = ((const Svx3DShadow3DItem&)rAttrs.Get(SDRATTR_3DOBJ_SHADOW_3D)).GetValue(); if( bValue != aBtnShadow3d.IsChecked() ) { aBtnShadow3d.Check( bValue ); aFtSlant.Enable( bValue ); aMtrSlant.Enable( bValue ); - bUpdate = TRUE; + bUpdate = sal_True; } else if( aBtnShadow3d.GetState() == STATE_DONTKNOW ) aBtnShadow3d.Check( bValue ); @@ -857,7 +941,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnShadow3d.GetState() != STATE_DONTKNOW ) { aBtnShadow3d.SetState( STATE_DONTKNOW ); - bUpdate = TRUE; + bUpdate = sal_True; } } @@ -865,11 +949,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_SHADOW_SLANT); if( eState != SFX_ITEM_DONTCARE ) { - UINT16 nValue = ((const Svx3DShadowSlantItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue(); + sal_uInt16 nValue = ((const Svx3DShadowSlantItem&)rAttrs.Get(SDRATTR_3DSCENE_SHADOW_SLANT)).GetValue(); if( nValue != aMtrSlant.GetValue() ) { aMtrSlant.SetValue( nValue ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -877,7 +961,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !aMtrSlant.IsEmptyFieldValue() ) { aMtrSlant.SetEmptyFieldValue(); - bUpdate = TRUE; + bUpdate = sal_True; } } @@ -885,15 +969,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_DISTANCE); if( eState != SFX_ITEM_DONTCARE ) { - UINT32 nValue = ((const Svx3DDistanceItem&)rAttrs.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue(); - UINT32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit ); + sal_uInt32 nValue = ((const Svx3DDistanceItem&)rAttrs.Get(SDRATTR_3DSCENE_DISTANCE)).GetValue(); + sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit ); if( nValue != nValue2 ) { if( eFUnit != aMtrDistance.GetUnit() ) SetFieldUnit( aMtrDistance, eFUnit ); SetMetricValue( aMtrDistance, nValue, ePoolUnit ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -901,7 +985,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !aMtrDepth.IsEmptyFieldValue() ) { aMtrDepth.SetEmptyFieldValue(); - bUpdate = TRUE; + bUpdate = sal_True; } } @@ -909,15 +993,15 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_FOCAL_LENGTH); if( eState != SFX_ITEM_DONTCARE ) { - UINT32 nValue = ((const Svx3DFocalLengthItem&)rAttrs.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); - UINT32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit ); + sal_uInt32 nValue = ((const Svx3DFocalLengthItem&)rAttrs.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); + sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit ); if( nValue != nValue2 ) { if( eFUnit != aMtrFocalLength.GetUnit() ) SetFieldUnit( aMtrFocalLength, eFUnit ); SetMetricValue( aMtrFocalLength, nValue, ePoolUnit ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -925,7 +1009,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !aMtrFocalLength.IsEmptyFieldValue() ) { aMtrFocalLength.SetEmptyFieldValue(); - bUpdate = TRUE; + bUpdate = sal_True; } } @@ -941,7 +1025,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -949,7 +1033,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aLbLight1.GetSelectEntryCount() != 0 ) { aLbLight1.SetNoSelection(); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 1 (an/aus) @@ -961,7 +1045,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ( !bOn && GetUILightState( aBtnLight1 )) ) { SetUILightState( aBtnLight1, bOn ); - bUpdate = TRUE; + bUpdate = sal_True; } if( aBtnLight1.GetState() == STATE_DONTKNOW ) aBtnLight1.Check( aBtnLight1.IsChecked() ); @@ -971,14 +1055,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnLight1.GetState() != STATE_DONTKNOW ) { aBtnLight1.SetState( STATE_DONTKNOW ); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 1 (Richtung) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_1); if( eState != SFX_ITEM_DONTCARE ) { - bUpdate = TRUE; + bUpdate = sal_True; } // Licht 2 (Farbe) @@ -990,7 +1074,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -998,7 +1082,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aLbLight2.GetSelectEntryCount() != 0 ) { aLbLight2.SetNoSelection(); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 2 (an/aus) @@ -1010,7 +1094,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ( !bOn && GetUILightState( aBtnLight2 )) ) { SetUILightState( aBtnLight2, bOn ); - bUpdate = TRUE; + bUpdate = sal_True; } if( aBtnLight2.GetState() == STATE_DONTKNOW ) aBtnLight2.Check( aBtnLight2.IsChecked() ); @@ -1020,14 +1104,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnLight2.GetState() != STATE_DONTKNOW ) { aBtnLight2.SetState( STATE_DONTKNOW ); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 2 (Richtung) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_2); if( eState != SFX_ITEM_DONTCARE ) { - bUpdate = TRUE; + bUpdate = sal_True; } // Licht 3 (Farbe) @@ -1039,7 +1123,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1047,7 +1131,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aLbLight3.GetSelectEntryCount() != 0 ) { aLbLight3.SetNoSelection(); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 3 (an/aus) @@ -1059,7 +1143,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ( !bOn && GetUILightState( aBtnLight3)) ) { SetUILightState( aBtnLight3, bOn ); - bUpdate = TRUE; + bUpdate = sal_True; } if( aBtnLight3.GetState() == STATE_DONTKNOW ) aBtnLight3.Check( aBtnLight3.IsChecked() ); @@ -1069,14 +1153,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnLight3.GetState() != STATE_DONTKNOW ) { aBtnLight3.SetState( STATE_DONTKNOW ); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 3 (Richtung) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_3); if( eState != SFX_ITEM_DONTCARE ) { - bUpdate = TRUE; + bUpdate = sal_True; } // Licht 4 (Farbe) @@ -1088,7 +1172,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1096,7 +1180,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aLbLight4.GetSelectEntryCount() != 0 ) { aLbLight4.SetNoSelection(); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 4 (an/aus) @@ -1108,7 +1192,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ( !bOn && GetUILightState( aBtnLight4 )) ) { SetUILightState( aBtnLight4, bOn ); - bUpdate = TRUE; + bUpdate = sal_True; } if( aBtnLight4.GetState() == STATE_DONTKNOW ) aBtnLight4.Check( aBtnLight4.IsChecked() ); @@ -1118,14 +1202,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnLight4.GetState() != STATE_DONTKNOW ) { aBtnLight4.SetState( STATE_DONTKNOW ); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 4 (Richtung) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_4); if( eState != SFX_ITEM_DONTCARE ) { - bUpdate = TRUE; + bUpdate = sal_True; } // Licht 5 (Farbe) @@ -1137,7 +1221,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1145,7 +1229,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aLbLight5.GetSelectEntryCount() != 0 ) { aLbLight5.SetNoSelection(); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 5 (an/aus) @@ -1157,7 +1241,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ( !bOn && GetUILightState( aBtnLight5 )) ) { SetUILightState( aBtnLight5, bOn ); - bUpdate = TRUE; + bUpdate = sal_True; } if( aBtnLight5.GetState() == STATE_DONTKNOW ) aBtnLight5.Check( aBtnLight5.IsChecked() ); @@ -1167,14 +1251,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnLight5.GetState() != STATE_DONTKNOW ) { aBtnLight5.SetState( STATE_DONTKNOW ); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 5 (Richtung) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_5); if( eState != SFX_ITEM_DONTCARE ) { - bUpdate = TRUE; + bUpdate = sal_True; } // Licht 6 (Farbe) @@ -1186,7 +1270,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1194,7 +1278,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aLbLight6.GetSelectEntryCount() != 0 ) { aLbLight6.SetNoSelection(); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 6 (an/aus) @@ -1206,7 +1290,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ( !bOn && GetUILightState( aBtnLight6 )) ) { SetUILightState( aBtnLight6, bOn ); - bUpdate = TRUE; + bUpdate = sal_True; } if( aBtnLight6.GetState() == STATE_DONTKNOW ) aBtnLight6.Check( aBtnLight6.IsChecked() ); @@ -1216,14 +1300,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnLight6.GetState() != STATE_DONTKNOW ) { aBtnLight6.SetState( STATE_DONTKNOW ); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 6 (Richtung) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_6); if( eState != SFX_ITEM_DONTCARE ) { - bUpdate = TRUE; + bUpdate = sal_True; } // Licht 7 (Farbe) @@ -1235,7 +1319,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1243,7 +1327,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aLbLight7.GetSelectEntryCount() != 0 ) { aLbLight7.SetNoSelection(); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 7 (an/aus) @@ -1255,7 +1339,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ( !bOn && GetUILightState( aBtnLight7 )) ) { SetUILightState( aBtnLight7 , bOn ); - bUpdate = TRUE; + bUpdate = sal_True; } if( aBtnLight7.GetState() == STATE_DONTKNOW ) aBtnLight7.Check( aBtnLight7.IsChecked() ); @@ -1265,14 +1349,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnLight7.GetState() != STATE_DONTKNOW ) { aBtnLight7.SetState( STATE_DONTKNOW ); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 7 (Richtung) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_7); if( eState != SFX_ITEM_DONTCARE ) { - bUpdate = TRUE; + bUpdate = sal_True; } // Licht 8 (Farbe) @@ -1284,7 +1368,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1292,7 +1376,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aLbLight8.GetSelectEntryCount() != 0 ) { aLbLight8.SetNoSelection(); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 8 (an/aus) @@ -1304,7 +1388,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ( !bOn && GetUILightState( aBtnLight8 )) ) { SetUILightState( aBtnLight8, bOn ); - bUpdate = TRUE; + bUpdate = sal_True; } if( aBtnLight8.GetState() == STATE_DONTKNOW ) aBtnLight8.Check( aBtnLight8.IsChecked() ); @@ -1314,14 +1398,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnLight8.GetState() != STATE_DONTKNOW ) { aBtnLight8.SetState( STATE_DONTKNOW ); - bUpdate = TRUE; + bUpdate = sal_True; } } // Licht 8 (Richtung) eState = rAttrs.GetItemState(SDRATTR_3DSCENE_LIGHTDIRECTION_8); if( eState != SFX_ITEM_DONTCARE ) { - bUpdate = TRUE; + bUpdate = sal_True; } // Umgebungslicht @@ -1333,7 +1417,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1341,7 +1425,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aLbAmbientlight.GetSelectEntryCount() != 0 ) { aLbAmbientlight.SetNoSelection(); - bUpdate = TRUE; + bUpdate = sal_True; } } @@ -1353,14 +1437,14 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_KIND); if( eState != SFX_ITEM_DONTCARE ) { - UINT16 nValue = ((const Svx3DTextureKindItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue(); + sal_uInt16 nValue = ((const Svx3DTextureKindItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_KIND)).GetValue(); if( ( !aBtnTexLuminance.IsChecked() && nValue == 1 ) || ( !aBtnTexColor.IsChecked() && nValue == 3 ) ) { aBtnTexLuminance.Check( nValue == 1 ); aBtnTexColor.Check( nValue == 3 ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1368,9 +1452,9 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnTexLuminance.IsChecked() || aBtnTexColor.IsChecked() ) { - aBtnTexLuminance.Check( FALSE ); - aBtnTexColor.Check( FALSE ); - bUpdate = TRUE; + aBtnTexLuminance.Check( sal_False ); + aBtnTexColor.Check( sal_False ); + bUpdate = sal_True; } } @@ -1378,7 +1462,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_MODE); if( eState != SFX_ITEM_DONTCARE ) { - UINT16 nValue = ((const Svx3DTextureModeItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue(); + sal_uInt16 nValue = ((const Svx3DTextureModeItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_MODE)).GetValue(); if( ( !aBtnTexReplace.IsChecked() && nValue == 1 ) || ( !aBtnTexModulate.IsChecked() && nValue == 2 ) ) @@ -1386,7 +1470,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aBtnTexReplace.Check( nValue == 1 ); aBtnTexModulate.Check( nValue == 2 ); //aBtnTexBlend.Check( nValue == 2 ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1394,10 +1478,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnTexReplace.IsChecked() || aBtnTexModulate.IsChecked() ) { - aBtnTexReplace.Check( FALSE ); - aBtnTexModulate.Check( FALSE ); - //aBtnTexBlend.Check( FALSE ); - bUpdate = TRUE; + aBtnTexReplace.Check( sal_False ); + aBtnTexModulate.Check( sal_False ); + //aBtnTexBlend.Check( sal_False ); + bUpdate = sal_True; } } @@ -1405,7 +1489,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_X); if( eState != SFX_ITEM_DONTCARE ) { - UINT16 nValue = ((const Svx3DTextureProjectionXItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue(); + sal_uInt16 nValue = ((const Svx3DTextureProjectionXItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_X)).GetValue(); if( ( !aBtnTexObjectX.IsChecked() && nValue == 0 ) || ( !aBtnTexParallelX.IsChecked() && nValue == 1 ) || @@ -1414,7 +1498,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aBtnTexObjectX.Check( nValue == 0 ); aBtnTexParallelX.Check( nValue == 1 ); aBtnTexCircleX.Check( nValue == 2 ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1423,10 +1507,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aBtnTexParallelX.IsChecked() || aBtnTexCircleX.IsChecked() ) { - aBtnTexObjectX.Check( FALSE ); - aBtnTexParallelX.Check( FALSE ); - aBtnTexCircleX.Check( FALSE ); - bUpdate = TRUE; + aBtnTexObjectX.Check( sal_False ); + aBtnTexParallelX.Check( sal_False ); + aBtnTexCircleX.Check( sal_False ); + bUpdate = sal_True; } } @@ -1434,7 +1518,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_PROJ_Y); if( eState != SFX_ITEM_DONTCARE ) { - UINT16 nValue = ((const Svx3DTextureProjectionYItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue(); + sal_uInt16 nValue = ((const Svx3DTextureProjectionYItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_PROJ_Y)).GetValue(); if( ( !aBtnTexObjectY.IsChecked() && nValue == 0 ) || ( !aBtnTexParallelY.IsChecked() && nValue == 1 ) || @@ -1443,7 +1527,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aBtnTexObjectY.Check( nValue == 0 ); aBtnTexParallelY.Check( nValue == 1 ); aBtnTexCircleY.Check( nValue == 2 ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1452,10 +1536,10 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) aBtnTexParallelY.IsChecked() || aBtnTexCircleY.IsChecked() ) { - aBtnTexObjectY.Check( FALSE ); - aBtnTexParallelY.Check( FALSE ); - aBtnTexCircleY.Check( FALSE ); - bUpdate = TRUE; + aBtnTexObjectY.Check( sal_False ); + aBtnTexParallelY.Check( sal_False ); + aBtnTexCircleY.Check( sal_False ); + bUpdate = sal_True; } } @@ -1463,11 +1547,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_TEXTURE_FILTER); if( eState != SFX_ITEM_DONTCARE ) { - BOOL bValue = ((const Svx3DTextureFilterItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue(); + sal_Bool bValue = ((const Svx3DTextureFilterItem&)rAttrs.Get(SDRATTR_3DOBJ_TEXTURE_FILTER)).GetValue(); if( bValue != aBtnTexFilter.IsChecked() ) { aBtnTexFilter.Check( bValue ); - bUpdate = TRUE; + bUpdate = sal_True; } if( aBtnTexFilter.GetState() == STATE_DONTKNOW ) aBtnTexFilter.Check( bValue ); @@ -1477,7 +1561,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnTexFilter.GetState() != STATE_DONTKNOW ) { aBtnTexFilter.SetState( STATE_DONTKNOW ); - bUpdate = TRUE; + bUpdate = sal_True; } } } @@ -1495,7 +1579,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1503,7 +1587,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aLbMatColor.GetSelectEntryCount() != 0 ) { aLbMatColor.SetNoSelection(); - bUpdate = TRUE; + bUpdate = sal_True; } } @@ -1516,7 +1600,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1524,7 +1608,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aLbMatEmission.GetSelectEntryCount() != 0 ) { aLbMatEmission.SetNoSelection(); - bUpdate = TRUE; + bUpdate = sal_True; } } @@ -1537,7 +1621,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aColor != pLb->GetSelectEntryColor() ) { LBSelectColor( pLb, aColor ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1545,7 +1629,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aLbMatSpecular.GetSelectEntryCount() != 0 ) { aLbMatSpecular.SetNoSelection(); - bUpdate = TRUE; + bUpdate = sal_True; } } @@ -1553,11 +1637,11 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) eState = rAttrs.GetItemState(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY); if( eState != SFX_ITEM_DONTCARE ) { - UINT16 nValue = ((const Svx3DMaterialSpecularIntensityItem&)rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue(); + sal_uInt16 nValue = ((const Svx3DMaterialSpecularIntensityItem&)rAttrs.Get(SDRATTR_3DOBJ_MAT_SPECULAR_INTENSITY)).GetValue(); if( nValue != aMtrMatSpecularIntensity.GetValue() ) { aMtrMatSpecularIntensity.SetValue( nValue ); - bUpdate = TRUE; + bUpdate = sal_True; } } else @@ -1565,7 +1649,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() ) { aMtrMatSpecularIntensity.SetEmptyFieldValue(); - bUpdate = TRUE; + bUpdate = sal_True; } } @@ -1580,7 +1664,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) ( aBtnPerspective.IsChecked() && ePT == PR_PARALLEL ) ) { aBtnPerspective.Check( ePT == PR_PERSPECTIVE ); - bUpdate = TRUE; + bUpdate = sal_True; } if( aBtnPerspective.GetState() == STATE_DONTKNOW ) aBtnPerspective.Check( ePT == PR_PERSPECTIVE ); @@ -1590,7 +1674,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) if( aBtnPerspective.GetState() != STATE_DONTKNOW ) { aBtnPerspective.SetState( STATE_DONTKNOW ); - bUpdate = TRUE; + bUpdate = sal_True; } } @@ -1600,7 +1684,7 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // diese und entscheide - bUpdate = TRUE; + bUpdate = sal_True; } if( bUpdate || bOnly3DChanged ) @@ -1610,12 +1694,12 @@ void Svx3DWin::Update( SfxItemSet& rAttrs ) // set LineStyle hard to XLINE_NONE when it's not set so that // the default (XLINE_SOLID) is not used for 3d preview - if(SFX_ITEM_SET != aSet.GetItemState(XATTR_LINESTYLE, FALSE)) + if(SFX_ITEM_SET != aSet.GetItemState(XATTR_LINESTYLE, sal_False)) aSet.Put(XLineStyleItem(XLINE_NONE)); // set FillColor hard to WHITE when it's SFX_ITEM_DONTCARE so that // the default (Blue7) is not used for 3d preview - if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, FALSE)) + if(SFX_ITEM_DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, sal_False)) aSet.Put(XFillColorItem(String(), Color(COL_WHITE))); aCtlPreview.Set3DAttributes(aSet); @@ -1663,11 +1747,11 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) while(nWhich) { - SfxItemState eState = mpRemember2DAttributes->GetItemState(nWhich, FALSE); + SfxItemState eState = mpRemember2DAttributes->GetItemState(nWhich, sal_False); if(SFX_ITEM_DONTCARE == eState) rAttrs.InvalidateItem(nWhich); else if(SFX_ITEM_SET == eState) - rAttrs.Put(mpRemember2DAttributes->Get(nWhich, FALSE)); + rAttrs.Put(mpRemember2DAttributes->Get(nWhich, sal_False)); nWhich = aIter.NextWhich(); } @@ -1677,7 +1761,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Perspektive if( aBtnPerspective.GetState() != STATE_DONTKNOW ) { - UINT16 nValue; + sal_uInt16 nValue; if( aBtnPerspective.IsChecked() ) nValue = PR_PERSPECTIVE; else @@ -1711,7 +1795,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Anzahl Segmente (vertikal) if( !aNumVertical.IsEmptyFieldValue() ) { - UINT32 nValue = static_cast<UINT32>(aNumVertical.GetValue()); + sal_uInt32 nValue = static_cast<sal_uInt32>(aNumVertical.GetValue()); rAttrs.Put(Svx3DVerticalSegmentsItem(nValue)); } else @@ -1720,7 +1804,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Tiefe if( !aMtrDepth.IsEmptyFieldValue() ) { - UINT32 nValue = GetCoreValue( aMtrDepth, ePoolUnit ); + sal_uInt32 nValue = GetCoreValue( aMtrDepth, ePoolUnit ); rAttrs.Put(Svx3DDepthItem(nValue)); } else @@ -1730,7 +1814,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) TriState eState = aBtnDoubleSided.GetState(); if( eState != STATE_DONTKNOW ) { - BOOL bValue = STATE_CHECK == eState; + sal_Bool bValue = STATE_CHECK == eState; rAttrs.Put(Svx3DDoubleSidedItem(bValue)); } else @@ -1739,7 +1823,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Kantenrundung if( !aMtrPercentDiagonal.IsEmptyFieldValue() ) { - UINT16 nValue = (UINT16) aMtrPercentDiagonal.GetValue(); + sal_uInt16 nValue = (sal_uInt16) aMtrPercentDiagonal.GetValue(); rAttrs.Put(Svx3DPercentDiagonalItem(nValue)); } else @@ -1748,7 +1832,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Tiefenskalierung if( !aMtrBackscale.IsEmptyFieldValue() ) { - UINT16 nValue = (UINT16)aMtrBackscale.GetValue(); + sal_uInt16 nValue = (sal_uInt16)aMtrBackscale.GetValue(); rAttrs.Put(Svx3DBackscaleItem(nValue)); } else @@ -1757,14 +1841,14 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Endwinkel if( !aMtrEndAngle.IsEmptyFieldValue() ) { - UINT16 nValue = (UINT16)aMtrEndAngle.GetValue(); + sal_uInt16 nValue = (sal_uInt16)aMtrEndAngle.GetValue(); rAttrs.Put(Svx3DEndAngleItem(nValue)); } else rAttrs.InvalidateItem(SDRATTR_3DOBJ_END_ANGLE); // Normalentyp - UINT16 nValue = 99; + sal_uInt16 nValue = 99; if( aBtnNormalsObj.IsChecked() ) nValue = 0; else if( aBtnNormalsFlat.IsChecked() ) @@ -1781,7 +1865,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) eState = aBtnNormalsInvert.GetState(); if( eState != STATE_DONTKNOW ) { - BOOL bValue = STATE_CHECK == eState; + sal_Bool bValue = STATE_CHECK == eState; rAttrs.Put(Svx3DNormalsInvertItem(bValue)); } else @@ -1791,7 +1875,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) eState = aBtnTwoSidedLighting.GetState(); if( eState != STATE_DONTKNOW ) { - BOOL bValue = STATE_CHECK == eState; + sal_Bool bValue = STATE_CHECK == eState; rAttrs.Put(Svx3DTwoSidedLightingItem(bValue)); } else @@ -1811,7 +1895,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) eState = aBtnShadow3d.GetState(); if( eState != STATE_DONTKNOW ) { - BOOL bValue = STATE_CHECK == eState; + sal_Bool bValue = STATE_CHECK == eState; rAttrs.Put(Svx3DShadow3DItem(bValue)); rAttrs.Put(SdrShadowItem(bValue)); } @@ -1824,7 +1908,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Neigung (Schatten) if( !aMtrSlant.IsEmptyFieldValue() ) { - UINT16 nValue2 = (UINT16) aMtrSlant.GetValue(); + sal_uInt16 nValue2 = (sal_uInt16) aMtrSlant.GetValue(); rAttrs.Put(Svx3DShadowSlantItem(nValue2)); } else @@ -1833,7 +1917,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Distanz if( !aMtrDistance.IsEmptyFieldValue() ) { - UINT32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit ); + sal_uInt32 nValue2 = GetCoreValue( aMtrDistance, ePoolUnit ); rAttrs.Put(Svx3DDistanceItem(nValue2)); } else @@ -1842,7 +1926,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Brennweite if( !aMtrFocalLength.IsEmptyFieldValue() ) { - UINT32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit ); + sal_uInt32 nValue2 = GetCoreValue( aMtrFocalLength, ePoolUnit ); rAttrs.Put(Svx3DFocalLengthItem(nValue2)); } else @@ -1866,7 +1950,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) eState = aBtnLight1.GetState(); if( eState != STATE_DONTKNOW ) { - BOOL bValue = GetUILightState( aBtnLight1 ); + sal_Bool bValue = GetUILightState( aBtnLight1 ); rAttrs.Put(Svx3DLightOnOff1Item(bValue)); // Licht 1 (Richtung) @@ -1891,7 +1975,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) eState = aBtnLight2.GetState(); if( eState != STATE_DONTKNOW ) { - BOOL bValue = GetUILightState( aBtnLight2 ); + sal_Bool bValue = GetUILightState( aBtnLight2 ); rAttrs.Put(Svx3DLightOnOff2Item(bValue)); // Licht 2 (Richtung) @@ -1915,7 +1999,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) eState = aBtnLight3.GetState(); if( eState != STATE_DONTKNOW ) { - BOOL bValue = GetUILightState( aBtnLight3 ); + sal_Bool bValue = GetUILightState( aBtnLight3 ); rAttrs.Put(Svx3DLightOnOff3Item(bValue)); // Licht 3 (Richtung) @@ -1939,7 +2023,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) eState = aBtnLight4.GetState(); if( eState != STATE_DONTKNOW ) { - BOOL bValue = GetUILightState( aBtnLight4 ); + sal_Bool bValue = GetUILightState( aBtnLight4 ); rAttrs.Put(Svx3DLightOnOff4Item(bValue)); // Licht 4 (Richtung) @@ -1963,7 +2047,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) eState = aBtnLight5.GetState(); if( eState != STATE_DONTKNOW ) { - BOOL bValue = GetUILightState( aBtnLight5 ); + sal_Bool bValue = GetUILightState( aBtnLight5 ); rAttrs.Put(Svx3DLightOnOff5Item(bValue)); // Licht 5 (Richtung) @@ -1987,7 +2071,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) eState = aBtnLight6.GetState(); if( eState != STATE_DONTKNOW ) { - BOOL bValue = GetUILightState( aBtnLight6 ); + sal_Bool bValue = GetUILightState( aBtnLight6 ); rAttrs.Put(Svx3DLightOnOff6Item(bValue)); // Licht 6 (Richtung) @@ -2011,7 +2095,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) eState = aBtnLight7.GetState(); if( eState != STATE_DONTKNOW ) { - BOOL bValue = GetUILightState( aBtnLight7 ); + sal_Bool bValue = GetUILightState( aBtnLight7 ); rAttrs.Put(Svx3DLightOnOff7Item(bValue)); // Licht 7 (Richtung) @@ -2035,7 +2119,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) eState = aBtnLight8.GetState(); if( eState != STATE_DONTKNOW ) { - BOOL bValue = GetUILightState( aBtnLight8 ); + sal_Bool bValue = GetUILightState( aBtnLight8 ); rAttrs.Put(Svx3DLightOnOff8Item(bValue)); // Licht 8 (Richtung) @@ -2117,7 +2201,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) eState = aBtnTexFilter.GetState(); if( eState != STATE_DONTKNOW ) { - BOOL bValue = STATE_CHECK == eState; + sal_Bool bValue = STATE_CHECK == eState; rAttrs.Put(Svx3DTextureFilterItem(bValue)); } else @@ -2157,7 +2241,7 @@ void Svx3DWin::GetAttr( SfxItemSet& rAttrs ) // Glanzpunkt Intensitaet if( !aMtrMatSpecularIntensity.IsEmptyFieldValue() ) { - UINT16 nValue2 = (UINT16) aMtrMatSpecularIntensity.GetValue(); + sal_uInt16 nValue2 = (sal_uInt16) aMtrMatSpecularIntensity.GetValue(); rAttrs.Put(Svx3DMaterialSpecularIntensityItem(nValue2)); } else @@ -2268,7 +2352,7 @@ IMPL_LINK( Svx3DWin, ClickUpdateHdl, void *, EMPTYARG ) SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); if (pDispatcher != NULL) { - SfxBoolItem aItem( SID_3D_STATE, TRUE ); + SfxBoolItem aItem( SID_3D_STATE, sal_True ); pDispatcher->Execute( SID_3D_STATE, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); } @@ -2287,7 +2371,7 @@ IMPL_LINK( Svx3DWin, ClickAssignHdl, void *, EMPTYARG ) SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); if (pDispatcher != NULL) { - SfxBoolItem aItem( SID_3D_ASSIGN, TRUE ); + SfxBoolItem aItem( SID_3D_ASSIGN, sal_True ); pDispatcher->Execute( SID_3D_ASSIGN, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); } @@ -2303,7 +2387,7 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) if( pBtn ) { // Da das permanente Updaten der Preview zu teuer waere - BOOL bUpdatePreview = aBtnLight.IsChecked(); + sal_Bool bUpdatePreview = aBtnLight.IsChecked(); aBtnGeo.Check( &aBtnGeo == pBtn ); aBtnRepresentation.Check( &aBtnRepresentation == pBtn ); @@ -2567,11 +2651,11 @@ IMPL_LINK( Svx3DWin, ClickViewTypeHdl, void *, pBtn ) // ----------------------------------------------------------------------- IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) { - BOOL bUpdatePreview = FALSE; + sal_Bool bUpdatePreview = sal_False; if( pBtn ) { - USHORT nSId = 0; + sal_uInt16 nSId = 0; if( pBtn == &aBtnConvertTo3D ) { @@ -2589,7 +2673,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) aBtnNormalsObj.Check( pBtn == &aBtnNormalsObj ); aBtnNormalsFlat.Check( pBtn == &aBtnNormalsFlat ); aBtnNormalsSphere.Check( pBtn == &aBtnNormalsSphere ); - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } else if( pBtn == &aBtnLight1 || pBtn == &aBtnLight2 || @@ -2614,51 +2698,51 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) if( pBtn != &aBtnLight1 && aBtnLight1.IsChecked() ) { - aBtnLight1.Check( FALSE ); + aBtnLight1.Check( sal_False ); aLbLight1.Hide(); } if( pBtn != &aBtnLight2 && aBtnLight2.IsChecked() ) { - aBtnLight2.Check( FALSE ); + aBtnLight2.Check( sal_False ); aLbLight2.Hide(); } if( pBtn != &aBtnLight3 && aBtnLight3.IsChecked() ) { - aBtnLight3.Check( FALSE ); + aBtnLight3.Check( sal_False ); aLbLight3.Hide(); } if( pBtn != &aBtnLight4 && aBtnLight4.IsChecked() ) { - aBtnLight4.Check( FALSE ); + aBtnLight4.Check( sal_False ); aLbLight4.Hide(); } if( pBtn != &aBtnLight5 && aBtnLight5.IsChecked() ) { - aBtnLight5.Check( FALSE ); + aBtnLight5.Check( sal_False ); aLbLight5.Hide(); } if( pBtn != &aBtnLight6 && aBtnLight6.IsChecked() ) { - aBtnLight6.Check( FALSE ); + aBtnLight6.Check( sal_False ); aLbLight6.Hide(); } if( pBtn != &aBtnLight7 && aBtnLight7.IsChecked() ) { - aBtnLight7.Check( FALSE ); + aBtnLight7.Check( sal_False ); aLbLight7.Hide(); } if( pBtn != &aBtnLight8 && aBtnLight8.IsChecked() ) { - aBtnLight8.Check( FALSE ); + aBtnLight8.Check( sal_False ); aLbLight8.Hide(); } } - BOOL bEnable = GetUILightState( *(ImageButton*)pBtn ); + sal_Bool bEnable = GetUILightState( *(ImageButton*)pBtn ); aBtnLightColor.Enable( bEnable ); pLb->Enable( bEnable ); ClickLightHdl( pBtn ); - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } // Textures else if( pBtn == &aBtnTexLuminance || @@ -2666,7 +2750,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) { aBtnTexLuminance.Check( pBtn == &aBtnTexLuminance ); aBtnTexColor.Check( pBtn == &aBtnTexColor ); - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } else if( pBtn == &aBtnTexReplace || pBtn == &aBtnTexModulate )// || @@ -2675,7 +2759,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) aBtnTexReplace.Check( pBtn == &aBtnTexReplace ); aBtnTexModulate.Check( pBtn == &aBtnTexModulate ); //aBtnTexBlend.Check( pBtn == &aBtnTexBlend ); - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } else if( pBtn == &aBtnTexParallelX || pBtn == &aBtnTexCircleX || @@ -2684,7 +2768,7 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) aBtnTexParallelX.Check( pBtn == &aBtnTexParallelX ); aBtnTexCircleX.Check( pBtn == &aBtnTexCircleX ); aBtnTexObjectX.Check( pBtn == &aBtnTexObjectX ); - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } else if( pBtn == &aBtnTexParallelY || pBtn == &aBtnTexCircleY || @@ -2693,20 +2777,20 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) aBtnTexParallelY.Check( pBtn == &aBtnTexParallelY ); aBtnTexCircleY.Check( pBtn == &aBtnTexCircleY ); aBtnTexObjectY.Check( pBtn == &aBtnTexObjectY ); - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } else if( pBtn == &aBtnShadow3d ) { pBtn->Check( !pBtn->IsChecked() ); aFtSlant.Enable( pBtn->IsChecked() ); aMtrSlant.Enable( pBtn->IsChecked() ); - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } // Sonstige (keine Gruppen) else if( pBtn != NULL ) { pBtn->Check( !pBtn->IsChecked() ); - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } if( nSId > 0 ) @@ -2714,12 +2798,12 @@ IMPL_LINK( Svx3DWin, ClickHdl, PushButton *, pBtn ) SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); if (pDispatcher != NULL) { - SfxBoolItem aItem( nSId, TRUE ); + SfxBoolItem aItem( nSId, sal_True ); pDispatcher->Execute( nSId, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); } } - else if( bUpdatePreview == TRUE ) + else if( bUpdatePreview == sal_True ) UpdatePreview(); } return( 0L ); @@ -2761,7 +2845,7 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) if( p ) { Color aColor; - BOOL bUpdatePreview = FALSE; + sal_Bool bUpdatePreview = sal_False; // Material if( p == &aLbMatFavorites ) @@ -2769,9 +2853,9 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) Color aColObj( COL_WHITE ); Color aColEmis( COL_BLACK ); Color aColSpec( COL_WHITE ); - USHORT nSpecIntens = 20; + sal_uInt16 nSpecIntens = 20; - USHORT nPos = aLbMatFavorites.GetSelectEntryPos(); + sal_uInt16 nPos = aLbMatFavorites.GetSelectEntryPos(); switch( nPos ) { case 1: // Metall @@ -2824,19 +2908,19 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) LBSelectColor( &aLbMatSpecular, aColSpec ); aMtrMatSpecularIntensity.SetValue( nSpecIntens ); - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } else if( p == &aLbMatColor || p == &aLbMatEmission || p == &aLbMatSpecular ) { aLbMatFavorites.SelectEntryPos( 0 ); - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } // Beleuchtung else if( p == &aLbAmbientlight ) { - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } else if( p == &aLbLight1 || p == &aLbLight2 || @@ -2847,12 +2931,12 @@ IMPL_LINK( Svx3DWin, SelectHdl, void *, p ) p == &aLbLight7 || p == &aLbLight8 ) { - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } else if( p == &aLbShademode ) - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; - if( bUpdatePreview == TRUE ) + if( bUpdatePreview == sal_True ) UpdatePreview(); } return( 0L ); @@ -2863,27 +2947,27 @@ IMPL_LINK( Svx3DWin, ModifyHdl, void*, pField ) { if( pField ) { - BOOL bUpdatePreview = FALSE; + sal_Bool bUpdatePreview = sal_False; // Material if( pField == &aMtrMatSpecularIntensity ) { - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } else if( pField == &aNumHorizontal ) { - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } else if( pField == &aNumVertical ) { - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } else if( pField == &aMtrSlant ) { - bUpdatePreview = TRUE; + bUpdatePreview = sal_True; } - if( bUpdatePreview == TRUE ) + if( bUpdatePreview == sal_True ) UpdatePreview(); } return( 0L ); @@ -2896,7 +2980,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn ) if( pBtn ) { - USHORT nLightSource = GetLightSource( pBtn ); + sal_uInt16 nLightSource = GetLightSource( pBtn ); ColorLB* pLb = GetLbByButton( pBtn ); Color aColor( pLb->GetSelectEntryColor() ); SfxItemSet aLightItemSet(aCtlLightPreview.GetSvx3DLightControl().Get3DAttributes()); @@ -2926,7 +3010,7 @@ IMPL_LINK( Svx3DWin, ClickLightHdl, PushButton*, pBtn ) // ----------------------------------------------------------------------- IMPL_LINK( Svx3DWin, DoubleClickHdl, void*, EMPTYARG ) { - //USHORT nItemId = aCtlFavorites.GetSelectItemId(); + //sal_uInt16 nItemId = aCtlFavorites.GetSelectItemId(); //SfxItemSet* pSet = (SfxItemSet*) pFavorSetList->GetObject( nItemId - 1 ); //Update( *pSet ); @@ -2972,45 +3056,45 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG ) // Zustand: Keine Lampe selektiert if( aBtnLight1.IsChecked() ) { - aBtnLight1.Check( FALSE ); - aLbLight1.Enable( FALSE ); + aBtnLight1.Check( sal_False ); + aLbLight1.Enable( sal_False ); } else if( aBtnLight2.IsChecked() ) { - aBtnLight2.Check( FALSE ); - aLbLight2.Enable( FALSE ); + aBtnLight2.Check( sal_False ); + aLbLight2.Enable( sal_False ); } else if( aBtnLight3.IsChecked() ) { - aBtnLight3.Check( FALSE ); - aLbLight3.Enable( FALSE ); + aBtnLight3.Check( sal_False ); + aLbLight3.Enable( sal_False ); } else if( aBtnLight4.IsChecked() ) { - aBtnLight4.Check( FALSE ); - aLbLight4.Enable( FALSE ); + aBtnLight4.Check( sal_False ); + aLbLight4.Enable( sal_False ); } else if( aBtnLight5.IsChecked() ) { - aBtnLight5.Check( FALSE ); - aLbLight5.Enable( FALSE ); + aBtnLight5.Check( sal_False ); + aLbLight5.Enable( sal_False ); } else if( aBtnLight6.IsChecked() ) { - aBtnLight6.Check( FALSE ); - aLbLight6.Enable( FALSE ); + aBtnLight6.Check( sal_False ); + aLbLight6.Enable( sal_False ); } else if( aBtnLight7.IsChecked() ) { - aBtnLight7.Check( FALSE ); - aLbLight7.Enable( FALSE ); + aBtnLight7.Check( sal_False ); + aLbLight7.Enable( sal_False ); } else if( aBtnLight8.IsChecked() ) { - aBtnLight8.Check( FALSE ); - aLbLight8.Enable( FALSE ); + aBtnLight8.Check( sal_False ); + aLbLight8.Enable( sal_False ); } - aBtnLightColor.Enable( FALSE ); + aBtnLightColor.Enable( sal_False ); } return( 0L ); @@ -3018,11 +3102,11 @@ IMPL_LINK( Svx3DWin, ChangeSelectionCallbackHdl, void*, EMPTYARG ) // ----------------------------------------------------------------------- // Methode um sicherzustellen, dass die LB auch mit einer Farbe gesetzt ist -// Liefert TRUE zurueck, falls Farbe hinzugefuegt wurde +// Liefert sal_True zurueck, falls Farbe hinzugefuegt wurde // ----------------------------------------------------------------------- -BOOL Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor ) +sal_Bool Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; pLb->SetNoSelection(); pLb->SelectEntry( rColor ); @@ -3030,17 +3114,17 @@ BOOL Svx3DWin::LBSelectColor( ColorLB* pLb, const Color& rColor ) { String aStr(SVX_RES(RID_SVXFLOAT3D_FIX_R)); - aStr += String::CreateFromInt32((INT32)rColor.GetRed()); + aStr += String::CreateFromInt32((sal_Int32)rColor.GetRed()); aStr += sal_Unicode(' '); aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_G)); - aStr += String::CreateFromInt32((INT32)rColor.GetGreen()); + aStr += String::CreateFromInt32((sal_Int32)rColor.GetGreen()); aStr += sal_Unicode(' '); aStr += String(SVX_RES(RID_SVXFLOAT3D_FIX_B)); - aStr += String::CreateFromInt32((INT32)rColor.GetBlue()); + aStr += String::CreateFromInt32((sal_Int32)rColor.GetBlue()); - USHORT nPos = pLb->InsertEntry( rColor, aStr ); + sal_uInt16 nPos = pLb->InsertEntry( rColor, aStr ); pLb->SelectEntryPos( nPos ); - bRet = TRUE; + bRet = sal_True; } return( bRet ); } @@ -3057,12 +3141,12 @@ void Svx3DWin::UpdatePreview() SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); if (pDispatcher != NULL) { - SfxBoolItem aItem( SID_3D_STATE, TRUE ); + SfxBoolItem aItem( SID_3D_STATE, sal_True ); pDispatcher->Execute( SID_3D_STATE, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); } // Flag zuruecksetzen - bOnly3DChanged = FALSE; + bOnly3DChanged = sal_False; } // ItemSet besorgen @@ -3117,9 +3201,9 @@ void Svx3DWin::InitColorLB( const SdrModel* pDoc ) } // ----------------------------------------------------------------------- -USHORT Svx3DWin::GetLightSource( const PushButton* pBtn ) +sal_uInt16 Svx3DWin::GetLightSource( const PushButton* pBtn ) { - USHORT nLight = 8; + sal_uInt16 nLight = 8; if( pBtn == NULL ) { @@ -3214,7 +3298,7 @@ ColorLB* Svx3DWin::GetLbByButton( const PushButton* pBtn ) |* \************************************************************************/ Svx3DChildWindow::Svx3DChildWindow( Window* _pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) @@ -3232,7 +3316,7 @@ Svx3DChildWindow::Svx3DChildWindow( Window* _pParent, |* ControllerItem fuer 3DStatus |* \************************************************************************/ -Svx3DCtrlItem::Svx3DCtrlItem( USHORT _nId, +Svx3DCtrlItem::Svx3DCtrlItem( sal_uInt16 _nId, Svx3DWin* pWin, SfxBindings* _pBindings) : SfxControllerItem( _nId, *_pBindings ), @@ -3241,7 +3325,7 @@ Svx3DCtrlItem::Svx3DCtrlItem( USHORT _nId, } // ----------------------------------------------------------------------- -void Svx3DCtrlItem::StateChanged( USHORT /*nSId*/, +void Svx3DCtrlItem::StateChanged( sal_uInt16 /*nSId*/, SfxItemState /*eState*/, const SfxPoolItem* /*pItem*/ ) { } @@ -3252,22 +3336,22 @@ void Svx3DCtrlItem::StateChanged( USHORT /*nSId*/, |* \************************************************************************/ -SvxConvertTo3DItem::SvxConvertTo3DItem(UINT16 _nId, SfxBindings* _pBindings) +SvxConvertTo3DItem::SvxConvertTo3DItem(sal_uInt16 _nId, SfxBindings* _pBindings) : SfxControllerItem(_nId, *_pBindings), - bState(FALSE) + bState(sal_False) { } -void SvxConvertTo3DItem::StateChanged(UINT16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/) +void SvxConvertTo3DItem::StateChanged(sal_uInt16 /*_nId*/, SfxItemState eState, const SfxPoolItem* /*pState*/) { - BOOL bNewState = (eState != SFX_ITEM_DISABLED); + sal_Bool bNewState = (eState != SFX_ITEM_DISABLED); if(bNewState != bState) { bState = bNewState; SfxDispatcher* pDispatcher = LocalGetDispatcher(&GetBindings()); if (pDispatcher != NULL) { - SfxBoolItem aItem( SID_3D_STATE, TRUE ); + SfxBoolItem aItem( SID_3D_STATE, sal_True ); pDispatcher->Execute( SID_3D_STATE, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD, &aItem, 0L); } diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index fe559a493d..c272a374a3 100644..100755 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -27,6 +27,8 @@ #include <svx/dialogs.hrc> #include "float3d.hrc" +#include <svx/svxcommands.h> + #define WIDTH 158 #define HEIGHT 209 #define BORDER 3 @@ -64,7 +66,7 @@ DockingWindow RID_SVXFLOAT_3D { - HelpID = SID_3D_WIN ; + HelpID = CMD_SID_3D_WIN ; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -81,6 +83,7 @@ DockingWindow RID_SVXFLOAT_3D ImageButton BTN_GEO { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_GEO"; Pos = MAP_APPFONT ( 4 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -93,6 +96,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_REPRESENTATION { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_REPRESENTATION"; Pos = MAP_APPFONT ( 22 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -105,6 +109,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT"; Pos = MAP_APPFONT ( 40 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -117,6 +122,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEXTURE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEXTURE"; Pos = MAP_APPFONT ( 58 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; ButtonImage = Image @@ -129,6 +135,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_MATERIAL { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MATERIAL"; Pos = MAP_APPFONT ( 76 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -142,6 +149,7 @@ DockingWindow RID_SVXFLOAT_3D ImageButton BTN_UPDATE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_UPDATE"; Pos = MAP_APPFONT ( WIDTH - BORDER - BUTTON_WIDTH * 2 , BORDER ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -154,6 +162,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_ASSIGN { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_ASSIGN"; Pos = MAP_APPFONT ( WIDTH - BORDER - BUTTON_WIDTH , BORDER ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -167,6 +176,7 @@ DockingWindow RID_SVXFLOAT_3D // Unterer Teil ImageButton BTN_CHANGE_TO_3D { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_CHANGE_TO_3D"; Pos = MAP_APPFONT ( 9 , 200 - BUTTON_HEIGHT ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -180,6 +190,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LATHE_OBJ { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LATHE_OBJ"; Pos = MAP_APPFONT ( 9 + BUTTON_WIDTH + 1 , 200 - BUTTON_HEIGHT ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -193,6 +204,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_PERSPECTIVE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_PERSPECTIVE"; Pos = MAP_APPFONT ( 9 + ( BUTTON_WIDTH + 1 ) * 2 , 200 - BUTTON_HEIGHT ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -232,6 +244,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_PERCENT_DIAGONAL { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_PERCENT_DIAGONAL"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 , FIRST_FT_START_Y - 2 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -252,6 +265,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_BACKSCALE { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_BACKSCALE"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1, FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ; @@ -273,6 +287,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_END_ANGLE { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_END_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1, FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ; @@ -295,6 +310,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_DEPTH { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_DEPTH"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1, FIRST_FT_START_Y + 3*FT_OFFSET_NEXT - 2 ) ; @@ -326,6 +342,7 @@ DockingWindow RID_SVXFLOAT_3D }; NumericField NUM_HORIZONTAL { + HelpID = "svx:NumericField:RID_SVXFLOAT_3D:NUM_HORIZONTAL"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + 42, SEGMENTS_START_Y+13-2 ) ; Size = MAP_APPFONT ( 22 , 12 ) ; @@ -345,6 +362,7 @@ DockingWindow RID_SVXFLOAT_3D }; NumericField NUM_VERTICAL { + HelpID = "svx:NumericField:RID_SVXFLOAT_3D:NUM_VERTICAL"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + 114+2 , SEGMENTS_START_Y+13-2 ) ; Size = MAP_APPFONT ( 22 , 12 ) ; @@ -365,6 +383,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_NORMALS_OBJ { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_OBJ"; Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -377,6 +396,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_NORMALS_FLAT { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_FLAT"; Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) , NORMALS_BT_START_Y ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -389,6 +409,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_NORMALS_SPHERE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_SPHERE"; Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) * 2 , NORMALS_BT_START_Y ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -401,6 +422,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_NORMALS_INVERT { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_INVERT"; Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y + IMG_BUTTON_NEXT ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -413,6 +435,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TWO_SIDED_LIGHTING { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TWO_SIDED_LIGHTING"; Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) * 2 , NORMALS_BT_START_Y + IMG_BUTTON_NEXT ) ; Size = IMG_BUTTON_SIZE; @@ -426,6 +449,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_DOUBLE_SIDED { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_DOUBLE_SIDED"; Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y + 2*IMG_BUTTON_NEXT ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -446,6 +470,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_SHADEMODE { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_SHADEMODE"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , 30 ) ; Size = MAP_APPFONT ( 83 , 100 ) ; @@ -466,6 +491,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_SHADOW_3D { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_SHADOW_3D"; Pos = MAP_APPFONT ( FT_INDENT , SHADOW_START_Y + 11 ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -486,6 +512,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_SLANT { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_SLANT"; Border = TRUE ; Pos = MAP_APPFONT ( 99 , SHADOW_START_Y + 11 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -513,6 +540,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_DISTANCE { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_DISTANCE"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 , CAMERA_START_Y + 11 - 2 ) ; @@ -537,6 +565,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_FOCAL_LENGTH { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_FOCAL_LENGTH"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 , CAMERA_START_Y + 11 + FT_OFFSET_NEXT - 2 ) ; @@ -568,6 +597,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_1 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_1"; Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -580,6 +610,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_2 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_2"; Pos = MAP_APPFONT ( FT_INDENT + 13 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -592,6 +623,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_3 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_3"; Pos = MAP_APPFONT ( FT_INDENT + 2*13 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -604,6 +636,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_4 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_4"; Pos = MAP_APPFONT ( FT_INDENT + 3*13 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -616,6 +649,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_5 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_5"; Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 26 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -628,6 +662,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_6 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_6"; Pos = MAP_APPFONT ( FT_INDENT + 13, FIRST_FT_START_Y + 26 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -640,6 +675,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_7 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_7"; Pos = MAP_APPFONT ( FT_INDENT + 2*13, FIRST_FT_START_Y + 26 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -652,6 +688,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_8 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_8"; Pos = MAP_APPFONT ( FT_INDENT +3*13 , FIRST_FT_START_Y + 26 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -664,6 +701,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_1 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_1"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -672,6 +710,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_2 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_2"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -680,6 +719,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_3 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_3"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -688,6 +728,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_4 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_4"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -696,6 +737,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_5 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_5"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -704,6 +746,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_6 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_6"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -712,6 +755,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_7 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_7"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -720,6 +764,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_8 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_8"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -728,6 +773,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_COLOR"; Pos = MAP_APPFONT ( 137 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -746,6 +792,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_AMBIENTLIGHT { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , FIRST_FT_START_Y + 53 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -754,6 +801,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_AMBIENT_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_AMBIENT_COLOR"; Pos = MAP_APPFONT ( 137 , FIRST_FT_START_Y + 53 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -780,6 +828,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_LUMINANCE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_LUMINANCE"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -793,6 +842,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_COLOR"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, FIRST_FT_START_Y - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -812,6 +862,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_REPLACE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_REPLACE"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -825,6 +876,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_MODULATE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_MODULATE"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -838,6 +890,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_BLEND { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_BLEND"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH, FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -857,6 +910,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_OBJECT_X { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_X"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -870,6 +924,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_PARALLEL_X { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_X"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -883,6 +938,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_CIRCLE_X { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_X"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH, FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -902,6 +958,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_OBJECT_Y { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_Y"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -915,6 +972,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_PARALLEL_Y { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_Y"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -928,6 +986,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_CIRCLE_Y { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_Y"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH, FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -947,6 +1006,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_FILTER { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_FILTER"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y + 4*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -974,6 +1034,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_MAT_FAVORITES { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_FAVORITES"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y - 2 ) ; @@ -998,6 +1059,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_MAT_COLOR { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ; @@ -1007,6 +1069,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_MAT_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_COLOR"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 72 , FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ; Size = MAP_APPFONT ( 12, 14 ) ; @@ -1026,6 +1089,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_MAT_EMISSION { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_EMISSION"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ; @@ -1035,6 +1099,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_EMISSION_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_EMISSION_COLOR"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 72 , FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ; Size = MAP_APPFONT ( 12, 14 ) ; @@ -1061,6 +1126,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_MAT_SPECULAR { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_SPECULAR"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, SPECULAR_START_Y + 13 - 2 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -1069,6 +1135,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_SPECULAR_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_SPECULAR_COLOR"; Pos = MAP_APPFONT ( 137 , SPECULAR_START_Y + 13 - 2 ) ; Size = MAP_APPFONT ( 12, 14 ) ; ButtonImage = Image @@ -1087,6 +1154,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_MAT_SPECULAR_INTENSITY { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_MAT_SPECULAR_INTENSITY"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , SPECULAR_START_Y + 13 + FT_OFFSET_NEXT ) ; @@ -1102,6 +1170,8 @@ DockingWindow RID_SVXFLOAT_3D Last = 100 ; SpinSize = 1 ; }; + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_FAVORITES"; + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_EDITOR"; FixedLine FL_MATERIAL { Pos = TOP_FIXED_LINE_POS; @@ -1163,3 +1233,8 @@ String RID_SVXFLOAT3D_FIX_B { Text [ en-US ] = "B:"; }; +String STR_COLOR_LIGHT_PRE +{ + Text [ en-US ] = "Color Light Preview"; +}; + diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index a7177f1cc0..c7f461ded8 100644..100755 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -33,7 +33,7 @@ #include <basegfx/point/b2dpoint.hxx> #include <svx/svdpage.hxx> #include <svx/scene3d.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <drawinglayer/processor3d/cutfindprocessor3d.hxx> #include <svx/sdr/contact/viewcontactofe3d.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> diff --git a/svx/source/engine3d/helperminimaldepth3d.cxx b/svx/source/engine3d/helperminimaldepth3d.cxx index bbe70996a5..bbe70996a5 100644..100755 --- a/svx/source/engine3d/helperminimaldepth3d.cxx +++ b/svx/source/engine3d/helperminimaldepth3d.cxx diff --git a/svx/source/engine3d/helperminimaldepth3d.hxx b/svx/source/engine3d/helperminimaldepth3d.hxx index 9a7fd359c8..9a7fd359c8 100644..100755 --- a/svx/source/engine3d/helperminimaldepth3d.hxx +++ b/svx/source/engine3d/helperminimaldepth3d.hxx diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index 681520a145..e4f6afb1aa 100644..100755 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -29,11 +29,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <tools/poly.hxx> #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/lathe3d.hxx> #include <svx/xpoly.hxx> #include <svx/svxids.hrc> @@ -131,7 +131,7 @@ void E3dLatheObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) |* \************************************************************************/ -UINT16 E3dLatheObj::GetObjIdentifier() const +sal_uInt16 E3dLatheObj::GetObjIdentifier() const { return E3D_LATHEOBJ_ID; } @@ -159,7 +159,7 @@ void E3dLatheObj::operator=(const SdrObject& rObj) |* \************************************************************************/ -SdrObject *E3dLatheObj::DoConvertToPolyObj(BOOL /*bBezier*/) const +SdrObject *E3dLatheObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const { return NULL; } @@ -249,9 +249,9 @@ void E3dLatheObj::TakeObjNamePlural(XubString& rName) const |* \************************************************************************/ -BOOL E3dLatheObj::IsBreakObjPossible() +sal_Bool E3dLatheObj::IsBreakObjPossible() { - return TRUE; + return sal_True; } SdrAttrObj* E3dLatheObj::GetBreakObj() diff --git a/svx/source/engine3d/makefile.mk b/svx/source/engine3d/makefile.mk deleted file mode 100644 index 71916df4a8..0000000000 --- a/svx/source/engine3d/makefile.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=engine3d -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/e3dsceneupdater.obj \ - $(SLO)$/helperminimaldepth3d.obj \ - $(SLO)$/helperhittest3d.obj \ - $(SLO)$/obj3d.obj \ - $(SLO)$/scene3d.obj \ - $(SLO)$/polysc3d.obj \ - $(SLO)$/cube3d.obj \ - $(SLO)$/sphere3d.obj \ - $(SLO)$/extrud3d.obj \ - $(SLO)$/lathe3d.obj \ - $(SLO)$/polygn3d.obj \ - $(SLO)$/svx3ditems.obj \ - $(SLO)$/deflt3d.obj \ - $(SLO)$/e3dundo.obj \ - $(SLO)$/viewpt3d2.obj \ - $(SLO)$/camera3d.obj \ - $(SLO)$/objfac3d.obj \ - $(SLO)$/dragmt3d.obj \ - $(SLO)$/view3d.obj \ - $(SLO)$/view3d1.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/float3d.obj - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -SRS1NAME=engine3d -SRC1FILES=\ - string3d.src \ - float3d.src - -.INCLUDE : target.mk diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 5516022c17..7f4570db82 100644..100755 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -29,14 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/svdview.hxx> #include <svx/svdattr.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> -#include "svditer.hxx" -#include "globl3d.hxx" +#include "svx/svditer.hxx" +#include "svx/globl3d.hxx" #include <svx/camera3d.hxx> #include <svx/scene3d.hxx> #include <svx/polysc3d.hxx> @@ -118,7 +118,7 @@ E3dObjList::~E3dObjList() { } -void E3dObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason) +void E3dObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason) { // Owner holen DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Einfuegen 3DObject in Parent != 3DObject"); @@ -137,7 +137,7 @@ void E3dObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRea } } -void E3dObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason) +void E3dObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason) { OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "Insert 3DObject in non-3D Parent"); //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj()); @@ -152,7 +152,7 @@ void E3dObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason } } -SdrObject* E3dObjList::NbcRemoveObject(ULONG nObjNum) +SdrObject* E3dObjList::NbcRemoveObject(sal_uIntPtr nObjNum) { DBG_ASSERT(GetOwnerObj()->ISA(E3dObject), "AW: Entfernen 3DObject aus Parent != 3DObject"); //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj()); @@ -169,7 +169,7 @@ SdrObject* E3dObjList::NbcRemoveObject(ULONG nObjNum) return pRetval; } -SdrObject* E3dObjList::RemoveObject(ULONG nObjNum) +SdrObject* E3dObjList::RemoveObject(sal_uIntPtr nObjNum) { OSL_ENSURE(GetOwnerObj()->ISA(E3dObject), "3DObject is removed from non-3D Parent"); //E3DModifySceneSnapRectUpdater aUpdater(GetOwnerObj()); @@ -257,9 +257,9 @@ void E3dObject::SetSelected(bool bNew) |* \************************************************************************/ -BOOL E3dObject::IsBreakObjPossible() +sal_Bool E3dObject::IsBreakObjPossible() { - return FALSE; + return sal_False; } SdrAttrObj* E3dObject::GetBreakObj() @@ -295,7 +295,7 @@ void E3dObject::SetRectsDirty(sal_Bool bNotMyself) |* \************************************************************************/ -UINT32 E3dObject::GetObjInventor() const +sal_uInt32 E3dObject::GetObjInventor() const { return E3dInventor; } @@ -306,7 +306,7 @@ UINT32 E3dObject::GetObjInventor() const |* \************************************************************************/ -UINT16 E3dObject::GetObjIdentifier() const +sal_uInt16 E3dObject::GetObjIdentifier() const { return E3D_OBJECT_ID; } @@ -319,19 +319,19 @@ UINT16 E3dObject::GetObjIdentifier() const void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bResizeFreeAllowed = TRUE; - rInfo.bResizePropAllowed = TRUE; - rInfo.bRotateFreeAllowed = TRUE; - rInfo.bRotate90Allowed = TRUE; - rInfo.bMirrorFreeAllowed = FALSE; - rInfo.bMirror45Allowed = FALSE; - rInfo.bMirror90Allowed = FALSE; - rInfo.bShearAllowed = FALSE; - rInfo.bEdgeRadiusAllowed = FALSE; - rInfo.bCanConvToPath = FALSE; + rInfo.bResizeFreeAllowed = sal_True; + rInfo.bResizePropAllowed = sal_True; + rInfo.bRotateFreeAllowed = sal_True; + rInfo.bRotate90Allowed = sal_True; + rInfo.bMirrorFreeAllowed = sal_False; + rInfo.bMirror45Allowed = sal_False; + rInfo.bMirror90Allowed = sal_False; + rInfo.bShearAllowed = sal_False; + rInfo.bEdgeRadiusAllowed = sal_False; + rInfo.bCanConvToPath = sal_False; // no transparence for 3d objects - rInfo.bTransparenceAllowed = FALSE; + rInfo.bTransparenceAllowed = sal_False; // gradient depends on fillstyle // BM *** check if SetItem is NULL *** @@ -345,10 +345,10 @@ void E3dObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const // also bei Durchdringugnen auch gegeneinander geschnitten werden // muessten. Auch die Texturkoorinaten waeren ein ungeloestes // Problem. - rInfo.bCanConvToPoly = FALSE; - rInfo.bCanConvToContour = FALSE; - rInfo.bCanConvToPathLineToArea = FALSE; - rInfo.bCanConvToPolyLineToArea = FALSE; + rInfo.bCanConvToPoly = sal_False; + rInfo.bCanConvToContour = sal_False; + rInfo.bCanConvToPathLineToArea = sal_False; + rInfo.bCanConvToPolyLineToArea = sal_False; } /************************************************************************* @@ -952,7 +952,7 @@ void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs) // Also derzeit sind die Klebepunkte relativ zum aOutRect der Szene definiert. Vor dem Drehen // werden die Klebepunkte relativ zur Seite definiert. Sie nehmen an der Drehung der Szene noch nicht Teil // dafuer gibt es den - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); // SendRepaintBroadcast(); double fWinkelInRad = nWink/100 * F_PI180; @@ -964,7 +964,7 @@ void E3dObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs) SetRectsDirty(); // Veranlasst eine Neuberechnung aller BoundRects NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotiert die Klebepunkte (die haben noch Koordinaten relativ // zum Urpsung des Blattes - SetGlueReallyAbsolute(FALSE); // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert) + SetGlueReallyAbsolute(sal_False); // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert) } /*************************************************************************/ @@ -1128,7 +1128,7 @@ void E3dCompoundObject::AddToHdlList(SdrHdlList& rHdlList) const |* \************************************************************************/ -UINT16 E3dCompoundObject::GetObjIdentifier() const +sal_uInt16 E3dCompoundObject::GetObjIdentifier() const { return E3D_COMPOUNDOBJ_ID; } @@ -1208,7 +1208,7 @@ void E3dCompoundObject::operator=(const SdrObject& rObj) |* \************************************************************************/ -void E3dCompoundObject::SetCreateNormals(BOOL bNew) +void E3dCompoundObject::SetCreateNormals(sal_Bool bNew) { if(bCreateNormals != bNew) { @@ -1217,7 +1217,7 @@ void E3dCompoundObject::SetCreateNormals(BOOL bNew) } } -void E3dCompoundObject::SetCreateTexture(BOOL bNew) +void E3dCompoundObject::SetCreateTexture(sal_Bool bNew) { if(bCreateTexture != bNew) { diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx index 0244032b1f..cf7cb6cb4d 100644..100755 --- a/svx/source/engine3d/objfac3d.cxx +++ b/svx/source/engine3d/objfac3d.cxx @@ -29,14 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/polysc3d.hxx> #include <svx/cube3d.hxx> #include <svx/sphere3d.hxx> #include <svx/extrud3d.hxx> #include <svx/lathe3d.hxx> #include <svx/polygn3d.hxx> -#include "objfac3d.hxx" +#include "svx/objfac3d.hxx" #include <svx/svdobj.hxx> /************************************************************************* @@ -45,14 +45,14 @@ |* \************************************************************************/ -static BOOL bInit = FALSE; +static sal_Bool bInit = sal_False; E3dObjFactory::E3dObjFactory() { if ( !bInit ) { SdrObjFactory::InsertMakeObjectHdl(LINK(this, E3dObjFactory, MakeObject)); - bInit = TRUE; + bInit = sal_True; } } diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index 4dd347c544..fd19f55e95 100644..100755 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/polygn3d.hxx> #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <basegfx/point/b3dpoint.hxx> #include <svx/sdr/contact/viewcontactofe3dpolygon.hxx> #include <basegfx/polygon/b3dpolygon.hxx> @@ -55,7 +55,7 @@ sdr::contact::ViewContact* E3dPolygonObj::CreateObjectSpecificViewContact() E3dPolygonObj::E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, - BOOL bLinOnly) + sal_Bool bLinOnly) : E3dCompoundObject(rDefault), bLineOnly(bLinOnly) { @@ -79,7 +79,7 @@ E3dPolygonObj::E3dPolygonObj( E3dDefaultAttributes& rDefault, const basegfx::B3DPolyPolygon& rPolyPoly3D, const basegfx::B3DPolyPolygon& rPolyNormals3D, - BOOL bLinOnly) + sal_Bool bLinOnly) : E3dCompoundObject(rDefault), bLineOnly(bLinOnly) { @@ -102,7 +102,7 @@ E3dPolygonObj::E3dPolygonObj( const basegfx::B3DPolyPolygon& rPolyPoly3D, const basegfx::B3DPolyPolygon& rPolyNormals3D, const basegfx::B2DPolyPolygon& rPolyTexture2D, - BOOL bLinOnly) + sal_Bool bLinOnly) : E3dCompoundObject(rDefault), bLineOnly(bLinOnly) { @@ -189,7 +189,7 @@ void E3dPolygonObj::CreateDefaultTexture() // Entscheiden, welche Koordinaten als Source fuer das // Mapping benutzt werden sollen - UINT16 nSourceMode = 0; + sal_uInt16 nSourceMode = 0; // Groessten Freiheitsgrad ermitteln if(!(aNormal.getX() > aNormal.getY() && aNormal.getX() > aNormal.getZ())) @@ -266,7 +266,7 @@ E3dPolygonObj::~E3dPolygonObj() |* \************************************************************************/ -UINT16 E3dPolygonObj::GetObjIdentifier() const +sal_uInt16 E3dPolygonObj::GetObjIdentifier() const { return E3D_POLYGONOBJ_ID; } @@ -319,7 +319,7 @@ void E3dPolygonObj::SetPolyTexture2D(const basegfx::B2DPolyPolygon& rNewPolyText |* \************************************************************************/ -SdrObject *E3dPolygonObj::DoConvertToPolyObj(BOOL /*bBezier*/) const +SdrObject *E3dPolygonObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const { return NULL; } @@ -350,7 +350,7 @@ void E3dPolygonObj::operator=(const SdrObject& rObj) |* \************************************************************************/ -void E3dPolygonObj::SetLineOnly(BOOL bNew) +void E3dPolygonObj::SetLineOnly(sal_Bool bNew) { if(bNew != bLineOnly) { diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx index 86e251a9c3..0855f085eb 100644..100755 --- a/svx/source/engine3d/polysc3d.cxx +++ b/svx/source/engine3d/polysc3d.cxx @@ -31,14 +31,14 @@ #include <svx/xfillit.hxx> #include <svx/svdopath.hxx> #include <svx/svdogrp.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdetc.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> #include <svx/svdpage.hxx> #include <svx/svdpool.hxx> #include <svl/style.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/polysc3d.hxx> #include <svx/xlnclit.hxx> #include <svl/metitem.hxx> @@ -67,7 +67,7 @@ E3dPolyScene::E3dPolyScene(E3dDefaultAttributes& rDefault) |* \************************************************************************/ -UINT16 E3dPolyScene::GetObjIdentifier() const +sal_uInt16 E3dPolyScene::GetObjIdentifier() const { return E3D_POLYSCENE_ID; } diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 0988535b16..646b33e627 100644..100755 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -29,14 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" -#include "svditer.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" +#include "svx/svditer.hxx" #if defined( UNX ) || defined( ICC ) #include <stdlib.h> #endif -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/svdpage.hxx> #include <svl/style.hxx> #include <svx/scene3d.hxx> @@ -242,7 +242,7 @@ void E3dScene::SetDefaultAttributes(E3dDefaultAttributes& /*rDefault*/) #endif // Fuer WIN95/NT die FP-Exceptions abschalten -#if defined(WNT) || defined(WIN) +#if defined(WNT) #define SC_FPEXCEPTIONS_ON() _control87( _MCW_EM, 0 ) #define SC_FPEXCEPTIONS_OFF() _control87( _MCW_EM, _MCW_EM ) SC_FPEXCEPTIONS_OFF(); @@ -331,7 +331,7 @@ sal_uInt32 E3dScene::RemapOrdNum(sal_uInt32 nNewOrdNum) const |* \************************************************************************/ -UINT16 E3dScene::GetObjIdentifier() const +sal_uInt16 E3dScene::GetObjIdentifier() const { return E3D_SCENE_ID; } @@ -753,7 +753,7 @@ void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs) // Also derzeit sind die Klebepunkte relativ zum aOutRect der Szene definiert. Vor dem Drehen // werden die Klebepunkte relativ zur Seite definiert. Sie nehmen an der Drehung der Szene noch nicht Teil // dafuer gibt es den - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); // So dass war die Szene, ab jetzt kommen die Objekte in der Szene // 3D-Objekte gibt es nur ein einziges das kann zwar mehrere Flaechen haben aber die Flaechen @@ -772,7 +772,7 @@ void E3dScene::NbcRotate(const Point& rRef, long nWink, double sn, double cs) SetRectsDirty(); // Veranlasst eine Neuberechnung aller BoundRects NbcRotateGluePoints(rRef,nWink,sn,cs); // Rotiert die Klebepunkte (die haben noch Koordinaten relativ // zum Urpsung des Blattes - SetGlueReallyAbsolute(FALSE); // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert) + SetGlueReallyAbsolute(sal_False); // ab jetzt sind sie wieder relativ zum BoundRect (also dem aOutRect definiert) SetRectsDirty(); } @@ -807,7 +807,7 @@ void E3dScene::RecalcSnapRect() |* \************************************************************************/ -BOOL E3dScene::IsBreakObjPossible() +sal_Bool E3dScene::IsBreakObjPossible() { // Szene ist aufzubrechen, wenn alle Mitglieder aufzubrechen sind SdrObjListIter a3DIterator(maSubList, IM_DEEPWITHGROUPS); @@ -817,10 +817,10 @@ BOOL E3dScene::IsBreakObjPossible() E3dObject* pObj = (E3dObject*) a3DIterator.Next(); DBG_ASSERT(pObj->ISA(E3dObject), "AW: In Szenen sind nur 3D-Objekte erlaubt!"); if(!pObj->IsBreakObjPossible()) - return FALSE; + return sal_False; } - return TRUE; + return sal_True; } basegfx::B3DVector E3dScene::GetShadowPlaneDirection() const @@ -833,7 +833,7 @@ basegfx::B3DVector E3dScene::GetShadowPlaneDirection() const void E3dScene::SetShadowPlaneDirection(const basegfx::B3DVector& rVec) { - UINT16 nSceneShadowSlant = (UINT16)((atan2(rVec.getY(), rVec.getZ()) / F_PI180) + 0.5); + sal_uInt16 nSceneShadowSlant = (sal_uInt16)((atan2(rVec.getY(), rVec.getZ()) / F_PI180) + 0.5); GetProperties().SetObjectItemDirect(Svx3DShadowSlantItem(nSceneShadowSlant)); } @@ -849,7 +849,7 @@ bool E3dScene::BegCreate(SdrDragStat& rStat) aRect1.Justify(); rStat.SetActionRect(aRect1); NbcSetSnapRect(aRect1); - return TRUE; + return sal_True; } bool E3dScene::MovCreate(SdrDragStat& rStat) @@ -860,8 +860,8 @@ bool E3dScene::MovCreate(SdrDragStat& rStat) rStat.SetActionRect(aRect1); NbcSetSnapRect(aRect1); SetBoundRectDirty(); - bSnapRectDirty=TRUE; - return TRUE; + bSnapRectDirty=sal_True; + return sal_True; } bool E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) @@ -876,7 +876,7 @@ bool E3dScene::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) bool E3dScene::BckCreate(SdrDragStat& /*rStat*/) { - return FALSE; + return sal_False; } void E3dScene::BrkCreate(SdrDragStat& /*rStat*/) diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index 7ee6a34618..3d7b0a6b09 100644..100755 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -29,11 +29,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/sphere3d.hxx> #include <svx/svxids.hrc> @@ -118,7 +118,7 @@ void E3dSphereObj::SetDefaultAttributes(E3dDefaultAttributes& rDefault) |* \************************************************************************/ -UINT16 E3dSphereObj::GetObjIdentifier() const +sal_uInt16 E3dSphereObj::GetObjIdentifier() const { return E3D_SPHEREOBJ_ID; } @@ -129,7 +129,7 @@ UINT16 E3dSphereObj::GetObjIdentifier() const |* \************************************************************************/ -SdrObject *E3dSphereObj::DoConvertToPolyObj(BOOL /*bBezier*/) const +SdrObject *E3dSphereObj::DoConvertToPolyObj(sal_Bool /*bBezier*/) const { return NULL; } diff --git a/svx/source/engine3d/string3d.src b/svx/source/engine3d/string3d.src index ec3f208719..ec3f208719 100644..100755 --- a/svx/source/engine3d/string3d.src +++ b/svx/source/engine3d/string3d.src diff --git a/svx/source/engine3d/svx3ditems.cxx b/svx/source/engine3d/svx3ditems.cxx index fba7365d12..ed6860409e 100644..100755 --- a/svx/source/engine3d/svx3ditems.cxx +++ b/svx/source/engine3d/svx3ditems.cxx @@ -67,7 +67,7 @@ Svx3DEndAngleItem::Svx3DEndAngleItem(sal_uInt32 nVal) : SfxUInt32Item(SDRATTR_3DOBJ_END_ANGLE, nVal) {} -Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(BOOL bVal) +Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_DOUBLE_SIDED, bVal) {} @@ -75,7 +75,7 @@ Svx3DDoubleSidedItem::Svx3DDoubleSidedItem(BOOL bVal) // #i28528# // Added extra Item (Bool) for chart2 to be able to show reduced line geometry -Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(BOOL bVal) +Svx3DReducedLineGeometryItem::Svx3DReducedLineGeometryItem(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_REDUCED_LINE_GEOMETRY, bVal) {} @@ -103,7 +103,7 @@ Svx3DNormalsKindItem::Svx3DNormalsKindItem(sal_uInt16 nVal) : SfxUInt16Item(SDRATTR_3DOBJ_NORMALS_KIND, nVal) {} -Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(BOOL bVal) +Svx3DNormalsInvertItem::Svx3DNormalsInvertItem(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_NORMALS_INVERT, bVal) {} @@ -115,7 +115,7 @@ Svx3DTextureProjectionYItem::Svx3DTextureProjectionYItem(sal_uInt16 nVal) : SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_PROJ_Y, nVal) {} -Svx3DShadow3DItem::Svx3DShadow3DItem(BOOL bVal) +Svx3DShadow3DItem::Svx3DShadow3DItem(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_SHADOW_3D, bVal) {} @@ -143,7 +143,7 @@ Svx3DTextureModeItem::Svx3DTextureModeItem(sal_uInt16 nVal) : SfxUInt16Item(SDRATTR_3DOBJ_TEXTURE_MODE, nVal) {} -Svx3DTextureFilterItem::Svx3DTextureFilterItem(BOOL bVal) +Svx3DTextureFilterItem::Svx3DTextureFilterItem(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_TEXTURE_FILTER, bVal) {} @@ -159,7 +159,7 @@ Svx3DFocalLengthItem::Svx3DFocalLengthItem(sal_uInt32 nVal) : SfxUInt32Item(SDRATTR_3DSCENE_FOCAL_LENGTH, nVal) {} -Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(BOOL bVal) +Svx3DTwoSidedLightingItem::Svx3DTwoSidedLightingItem(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DSCENE_TWO_SIDED_LIGHTING, bVal) {} @@ -199,35 +199,35 @@ Svx3DAmbientcolorItem::Svx3DAmbientcolorItem(const Color& rCol) : SvxColorItem(rCol, SDRATTR_3DSCENE_AMBIENTCOLOR) {} -Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(BOOL bVal) +Svx3DLightOnOff1Item::Svx3DLightOnOff1Item(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_1, bVal) {} -Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(BOOL bVal) +Svx3DLightOnOff2Item::Svx3DLightOnOff2Item(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_2, bVal) {} -Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(BOOL bVal) +Svx3DLightOnOff3Item::Svx3DLightOnOff3Item(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_3, bVal) {} -Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(BOOL bVal) +Svx3DLightOnOff4Item::Svx3DLightOnOff4Item(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_4, bVal) {} -Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(BOOL bVal) +Svx3DLightOnOff5Item::Svx3DLightOnOff5Item(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_5, bVal) {} -Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(BOOL bVal) +Svx3DLightOnOff6Item::Svx3DLightOnOff6Item(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_6, bVal) {} -Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(BOOL bVal) +Svx3DLightOnOff7Item::Svx3DLightOnOff7Item(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_7, bVal) {} -Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(BOOL bVal) +Svx3DLightOnOff8Item::Svx3DLightOnOff8Item(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DSCENE_LIGHTON_8, bVal) {} @@ -274,7 +274,7 @@ Svx3DShadeModeItem::Svx3DShadeModeItem(sal_uInt16 nVal) ////////////////////////////////////////////////////////////////////////////// // #107245# -Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(BOOL bVal) +Svx3DSmoothNormalsItem::Svx3DSmoothNormalsItem(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_NORMALS, bVal) {} @@ -299,7 +299,7 @@ SfxPoolItem* Svx3DSmoothNormalsItem::Create(SvStream& rIn, sal_uInt16 nItemVersi ////////////////////////////////////////////////////////////////////////////// // #107245# -Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(BOOL bVal) +Svx3DSmoothLidsItem::Svx3DSmoothLidsItem(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_SMOOTH_LIDS, bVal) {} @@ -324,7 +324,7 @@ SfxPoolItem* Svx3DSmoothLidsItem::Create(SvStream& rIn, sal_uInt16 nItemVersion) ////////////////////////////////////////////////////////////////////////////// // #107245# -Svx3DCharacterModeItem::Svx3DCharacterModeItem(BOOL bVal) +Svx3DCharacterModeItem::Svx3DCharacterModeItem(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_CHARACTER_MODE, bVal) {} @@ -349,7 +349,7 @@ SfxPoolItem* Svx3DCharacterModeItem::Create(SvStream& rIn, sal_uInt16 nItemVersi ////////////////////////////////////////////////////////////////////////////// // #107245# -Svx3DCloseFrontItem::Svx3DCloseFrontItem(BOOL bVal) +Svx3DCloseFrontItem::Svx3DCloseFrontItem(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_CLOSE_FRONT, bVal) {} @@ -374,7 +374,7 @@ SfxPoolItem* Svx3DCloseFrontItem::Create(SvStream& rIn, sal_uInt16 nItemVersion) ////////////////////////////////////////////////////////////////////////////// // #107245# -Svx3DCloseBackItem::Svx3DCloseBackItem(BOOL bVal) +Svx3DCloseBackItem::Svx3DCloseBackItem(sal_Bool bVal) : SfxBoolItem(SDRATTR_3DOBJ_CLOSE_BACK, bVal) {} @@ -399,13 +399,13 @@ SfxPoolItem* Svx3DCloseBackItem::Create(SvStream& rIn, sal_uInt16 nItemVersion) ////////////////////////////////////////////////////////////////////////////// // Svx3DNormalsKindItem: use drawing::NormalsKind -bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool Svx3DNormalsKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::NormalsKind)GetValue(); return true; } -bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool Svx3DNormalsKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::NormalsKind eVar; if(!(rVal >>= eVar)) @@ -420,13 +420,13 @@ SfxPoolItem* Svx3DNormalsKindItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DTextureProjectionXItem: use drawing::TextureProjectionMode -bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool Svx3DTextureProjectionXItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextureProjectionMode)GetValue(); return true; } -bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool Svx3DTextureProjectionXItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextureProjectionMode eVar; if(!(rVal >>= eVar)) @@ -441,13 +441,13 @@ SfxPoolItem* Svx3DTextureProjectionXItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DTextureProjectionYItem: use drawing::TextureProjectionMode -bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool Svx3DTextureProjectionYItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextureProjectionMode)GetValue(); return true; } -bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool Svx3DTextureProjectionYItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextureProjectionMode eVar; if(!(rVal >>= eVar)) @@ -462,13 +462,13 @@ SfxPoolItem* Svx3DTextureProjectionYItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DTextureKindItem: use drawing::TextureKind -bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool Svx3DTextureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextureKind)GetValue(); return true; } -bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool Svx3DTextureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextureKind eVar; if(!(rVal >>= eVar)) @@ -483,13 +483,13 @@ SfxPoolItem* Svx3DTextureKindItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DTextureModeItem: use drawing:TextureMode -bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool Svx3DTextureModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextureMode)GetValue(); return true; } -bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool Svx3DTextureModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextureMode eVar; if(!(rVal >>= eVar)) @@ -504,13 +504,13 @@ SfxPoolItem* Svx3DTextureModeItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DPerspectiveItem: use drawing::ProjectionMode -bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool Svx3DPerspectiveItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::ProjectionMode)GetValue(); return true; } -bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool Svx3DPerspectiveItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::ProjectionMode eVar; if(!(rVal >>= eVar)) @@ -525,13 +525,13 @@ SfxPoolItem* Svx3DPerspectiveItem::Clone(SfxItemPool* /*pPool*/) const } // Svx3DShadeModeItem: use drawing::ShadeMode -bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool Svx3DShadeModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::ShadeMode)GetValue(); return true; } -bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool Svx3DShadeModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::ShadeMode eVar; if(!(rVal >>= eVar)) diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 185d5ed098..54557abd05 100644..100755 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -33,7 +33,7 @@ #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> #include <tools/shl.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpool.hxx> #include <svx/svdorect.hxx> #include <svx/svdmodel.hxx> @@ -44,7 +44,7 @@ #include <svx/svdview.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/obj3d.hxx> #include <svx/lathe3d.hxx> #include <svx/sphere3d.hxx> @@ -65,7 +65,7 @@ #include <svx/xlnwtit.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> #include <svx/sdrpagewindow.hxx> @@ -255,7 +255,7 @@ E3dView::E3dView(SdrModel* pModel, OutputDevice* pOut) : void E3dView::DrawMarkedObj(OutputDevice& rOut) const { // Existieren 3D-Objekte, deren Szenen nicht selektiert sind? - BOOL bSpecialHandling = FALSE; + sal_Bool bSpecialHandling = sal_False; E3dScene *pScene = NULL; long nCnt = GetMarkedObjectCount(); @@ -267,14 +267,14 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const // zugehoerige Szene pScene = ((E3dCompoundObject*)pObj)->GetScene(); if(pScene && !IsObjMarked(pScene)) - bSpecialHandling = TRUE; + bSpecialHandling = sal_True; } // Alle SelectionFlags zuruecksetzen if(pObj && pObj->ISA(E3dObject)) { pScene = ((E3dObject*)pObj)->GetScene(); if(pScene) - pScene->SetSelected(FALSE); + pScene->SetSelected(sal_False); } } @@ -291,7 +291,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const // zugehoerige Szene pScene = ((E3dCompoundObject*)pObj)->GetScene(); if(pScene) - pScene->SetSelected(FALSE); + pScene->SetSelected(sal_False); } } @@ -302,7 +302,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const { // Objekt markieren E3dObject* p3DObj = (E3dObject*)pObj; - p3DObj->SetSelected(TRUE); + p3DObj->SetSelected(sal_True); pScene = p3DObj->GetScene(); } } @@ -312,9 +312,9 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const // code from parent SortMarkedObjects(); - pScene->SetDrawOnlySelected(TRUE); + pScene->SetDrawOnlySelected(sal_True); pScene->SingleObjectPainter(rOut); // #110094#-17 - pScene->SetDrawOnlySelected(FALSE); + pScene->SetDrawOnlySelected(sal_False); } // SelectionFlag zuruecksetzen @@ -326,7 +326,7 @@ void E3dView::DrawMarkedObj(OutputDevice& rOut) const // zugehoerige Szene pScene = ((E3dCompoundObject*)pObj)->GetScene(); if(pScene) - pScene->SetSelected(FALSE); + pScene->SetSelected(sal_False); } } } @@ -421,7 +421,7 @@ SdrModel* E3dView::GetMarkedObjModel() const if(pScene && !IsObjMarked(pScene) && GetSdrPageView()) { - ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), FALSE, TRUE); + ((E3dView*)this)->MarkObj(pScene, GetSdrPageView(), sal_False, sal_True); } } } @@ -470,9 +470,9 @@ SdrModel* E3dView::GetMarkedObjModel() const |* \************************************************************************/ -BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, UINT32 nOptions) +sal_Bool E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { - BOOL bRetval = FALSE; + sal_Bool bRetval = sal_False; // Liste holen Point aPos(rPos); @@ -480,7 +480,7 @@ BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, U ImpGetPasteObjList(aPos, pDstList); if(!pDstList) - return FALSE; + return sal_False; // Owner der Liste holen SdrObject* pOwner = pDstList->GetOwnerObj(); @@ -523,9 +523,9 @@ BOOL E3dView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, U } // #83403# Service routine used from local Clone() and from SdrCreateView::EndCreateObj(...) -BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point /*aOffset*/) +sal_Bool E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDstScene, Point /*aOffset*/) { - BOOL bRetval(FALSE); + sal_Bool bRetval(sal_False); if(pSrcScene && pDstScene) { @@ -620,7 +620,7 @@ BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs pNewCompoundObj->NbcSetLayer(pCompoundObj->GetLayer()); pNewCompoundObj->NbcSetStyleSheet(pCompoundObj->GetStyleSheet(), sal_True); pDstScene->Insert3DObj(pNewCompoundObj); - bRetval = TRUE; + bRetval = sal_True; // Undo anlegen if( GetModel()->IsUndoEnabled() ) @@ -639,11 +639,11 @@ BOOL E3dView::ImpCloneAll3DObjectsToDestScene(E3dScene* pSrcScene, E3dScene* pDs |* \************************************************************************/ -BOOL E3dView::IsConvertTo3DObjPossible() const +sal_Bool E3dView::IsConvertTo3DObjPossible() const { - BOOL bAny3D(FALSE); - BOOL bGroupSelected(FALSE); - BOOL bRetval(TRUE); + sal_Bool bAny3D(sal_False); + sal_Bool bGroupSelected(sal_False); + sal_Bool bRetval(sal_True); for(sal_uInt32 a=0;!bAny3D && a<GetMarkedObjectCount();a++) { @@ -656,20 +656,20 @@ BOOL E3dView::IsConvertTo3DObjPossible() const bRetval = !bAny3D && ( - IsConvertToPolyObjPossible(FALSE) - || IsConvertToPathObjPossible(FALSE) + IsConvertToPolyObjPossible(sal_False) + || IsConvertToPathObjPossible(sal_False) || IsImportMtfPossible()); return bRetval; } -void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D, - BOOL& rGroupSelected) const +void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, sal_Bool& rAny3D, + sal_Bool& rGroupSelected) const { if(pObj) { if(pObj->ISA(E3dObject)) { - rAny3D = TRUE; + rAny3D = sal_True; } else { @@ -681,7 +681,7 @@ void E3dView::ImpIsConvertTo3DPossible(SdrObject* pObj, BOOL& rAny3D, SdrObject* pNewObj = aIter.Next(); ImpIsConvertTo3DPossible(pNewObj, rAny3D, rGroupSelected); } - rGroupSelected = TRUE; + rGroupSelected = sal_True; } } } @@ -741,7 +741,7 @@ void E3dView::ImpChangeSomeAttributesFor3DConversion2(SdrObject* pObj) } } -void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat) +void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat) { // Einzelnes PathObject, dieses umwanden SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj); @@ -750,9 +750,9 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO { E3dDefaultAttributes aDefault = Get3DDefaultAttributes(); if(bExtrude) - aDefault.SetDefaultExtrudeCharacterMode(TRUE); + aDefault.SetDefaultExtrudeCharacterMode(sal_True); else - aDefault.SetDefaultLatheCharacterMode(TRUE); + aDefault.SetDefaultLatheCharacterMode(sal_True); // ItemSet des Ursprungsobjektes holen SfxItemSet aSet(pObj->GetMergedItemSet()); @@ -768,10 +768,10 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO // Das SdrPathObj ist nicht gefuellt, lasse die // vordere und hintere Flaeche weg. Ausserdem ist // eine beidseitige Darstellung notwendig. - aDefault.SetDefaultExtrudeCloseFront(FALSE); - aDefault.SetDefaultExtrudeCloseBack(FALSE); + aDefault.SetDefaultExtrudeCloseFront(sal_False); + aDefault.SetDefaultExtrudeCloseBack(sal_False); - aSet.Put(Svx3DDoubleSidedItem(TRUE)); + aSet.Put(Svx3DDoubleSidedItem(sal_True)); // Fuellattribut setzen aSet.Put(XFillStyleItem(XFILL_SOLID)); @@ -810,7 +810,7 @@ void E3dView::ImpCreateSingle3DObjectFlat(E3dScene* pScene, SdrObject* pObj, BOO } } -void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat) +void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, sal_Bool bExtrude, double fDepth, basegfx::B2DHomMatrix& rLatheMat) { if(pObj) { @@ -828,7 +828,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude ImpChangeSomeAttributesFor3DConversion(pObj); // convert completely to path objects - SdrObject* pNewObj1 = pObj->ConvertToPolyObj(FALSE, FALSE); + SdrObject* pNewObj1 = pObj->ConvertToPolyObj(sal_False, sal_False); if(pNewObj1) { @@ -846,7 +846,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude ImpChangeSomeAttributesFor3DConversion2(pNewObj1); // convert completely to path objects - SdrObject* pNewObj2 = pObj->ConvertToContourObj(pNewObj1, TRUE); + SdrObject* pNewObj2 = pObj->ConvertToContourObj(pNewObj1, sal_True); if(pNewObj2) { @@ -881,7 +881,7 @@ void E3dView::ImpCreate3DObject(E3dScene* pScene, SdrObject* pObj, BOOL bExtrude |* \************************************************************************/ -void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2) +void E3dView::ConvertMarkedObjTo3D(sal_Bool bExtrude, basegfx::B2DPoint aPnt1, basegfx::B2DPoint aPnt2) { if(AreObjectsMarked()) { @@ -948,7 +948,7 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg // SnapRect Ausdehnung mittels Spiegelung an der Rotationsachse // erweitern - for(UINT32 a=0;a<GetMarkedObjectCount();a++) + for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++) { SdrMark* pMark = GetSdrMarkByIndex(a); SdrObject* pObj = pMark->GetMarkedSdrObj(); @@ -988,7 +988,7 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg // Ueber die Selektion gehen und in 3D wandeln, komplett mit // Umwandeln in SdrPathObject, auch Schriften - for(UINT32 a=0;a<GetMarkedObjectCount();a++) + for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++) { SdrMark* pMark = GetSdrMarkByIndex(a); SdrObject* pObj = pMark->GetMarkedSdrObj(); @@ -1018,8 +1018,8 @@ void E3dView::ConvertMarkedObjTo3D(BOOL bExtrude, basegfx::B2DPoint aPnt1, baseg // und alle alten Objekte weghauen SdrObject* pRepObj = GetMarkedObjectByIndex(0); SdrPageView* pPV = GetSdrPageViewOfMarkedByIndex(0); - MarkObj(pRepObj, pPV, TRUE); - ReplaceObjectAtView(pRepObj, *pPV, pScene, FALSE); + MarkObj(pRepObj, pPV, sal_True); + ReplaceObjectAtView(pRepObj, *pPV, pScene, sal_False); DeleteMarked(); MarkObj(pScene, pPV); @@ -1106,7 +1106,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth) SdrObjListIter aIter(*pSubList, IM_FLAT); E3dDepthLayer* pBaseLayer = NULL; E3dDepthLayer* pLayer = NULL; - INT32 nNumLayers = 0; + sal_Int32 nNumLayers = 0; while(aIter.IsMore()) { @@ -1153,12 +1153,12 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth) if(aCompareColor == aLocalColor) { - bOverlap = FALSE; + bOverlap = sal_False; } } else if(eLocalFillStyle == XFILL_NONE) { - bOverlap = FALSE; + bOverlap = sal_False; } } } @@ -1243,7 +1243,7 @@ void E3dView::DoDepthArrange(E3dScene* pScene, double fDepth) |* \************************************************************************/ -BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, +sal_Bool E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth) { @@ -1254,25 +1254,25 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, } else { - BOOL bOwnActionNecessary; + sal_Bool bOwnActionNecessary; if (pHdl == NULL) { - bOwnActionNecessary = TRUE; + bOwnActionNecessary = sal_True; } else if (pHdl->IsVertexHdl() || pHdl->IsCornerHdl()) { - bOwnActionNecessary = TRUE; + bOwnActionNecessary = sal_True; } else { - bOwnActionNecessary = FALSE; + bOwnActionNecessary = sal_False; } if(bOwnActionNecessary && GetMarkedObjectCount() >= 1) { E3dDragConstraint eConstraint = E3DDRAG_CONSTR_XYZ; - BOOL bThereAreRootScenes = FALSE; - BOOL bThereAre3DObjects = FALSE; + sal_Bool bThereAreRootScenes = sal_False; + sal_Bool bThereAre3DObjects = sal_False; long nCnt = GetMarkedObjectCount(); for(long nObjs = 0;nObjs < nCnt;nObjs++) { @@ -1280,9 +1280,9 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, if(pObj) { if(pObj->ISA(E3dScene) && ((E3dScene*)pObj)->GetScene() == pObj) - bThereAreRootScenes = TRUE; + bThereAreRootScenes = sal_True; if(pObj->ISA(E3dObject)) - bThereAre3DObjects = TRUE; + bThereAre3DObjects = sal_True; } } if( bThereAre3DObjects ) @@ -1358,7 +1358,7 @@ BOOL E3dView::BegDragObj(const Point& rPnt, OutputDevice* pOut, |* \************************************************************************/ -BOOL E3dView::HasMarkedScene() +sal_Bool E3dView::HasMarkedScene() { return (GetMarkedScene() != NULL); } @@ -1371,9 +1371,9 @@ BOOL E3dView::HasMarkedScene() E3dScene* E3dView::GetMarkedScene() { - ULONG nCnt = GetMarkedObjectCount(); + sal_uIntPtr nCnt = GetMarkedObjectCount(); - for ( ULONG i = 0; i < nCnt; i++ ) + for ( sal_uIntPtr i = 0; i < nCnt; i++ ) if ( GetMarkedObjectByIndex(i)->ISA(E3dScene) ) return (E3dScene*) GetMarkedObjectByIndex(i); @@ -1419,7 +1419,7 @@ void E3dView::InitScene(E3dScene* pScene, double fW, double fH, double fCamZ) { Camera3D aCam(pScene->GetCamera()); - aCam.SetAutoAdjustProjection(FALSE); + aCam.SetAutoAdjustProjection(sal_False); aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH); basegfx::B3DPoint aLookAt; @@ -1583,14 +1583,14 @@ void E3dView::MovAction(const Point& rPnt) /************************************************************************* |* |* Schluss. Objekt und evtl. Unterobjekte ueber ImpCreate3DLathe erstellen -|* [FG] Mit dem Parameterwert TRUE (SDefault: FALSE) wird einfach ein +|* [FG] Mit dem Parameterwert sal_True (SDefault: sal_False) wird einfach ein |* Rotationskoerper erzeugt, ohne den Benutzer die Lage der |* Achse fetlegen zu lassen. Es reicht dieser Aufruf, falls |* ein Objekt selektiert ist. (keine Initialisierung noetig) |* \************************************************************************/ -void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes) +void E3dView::End3DCreation(sal_Bool bUseDefaultValuesForMirrorAxes) { ResetCreationActive(); @@ -1607,7 +1607,7 @@ void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes) basegfx::B2DPoint aPnt1(aRect.Left(), -aRect.Top()); basegfx::B2DPoint aPnt2(aRect.Left(), -aRect.Bottom()); - ConvertMarkedObjTo3D(FALSE, aPnt1, aPnt2); + ConvertMarkedObjTo3D(sal_False, aPnt1, aPnt2); } else { @@ -1620,7 +1620,7 @@ void E3dView::End3DCreation(BOOL bUseDefaultValuesForMirrorAxes) basegfx::B2DPoint aPnt1(aMirrorRef1.X(), -aMirrorRef1.Y()); basegfx::B2DPoint aPnt2(aMirrorRef2.X(), -aMirrorRef2.Y()); - ConvertMarkedObjTo3D(FALSE, aPnt1, aPnt2); + ConvertMarkedObjTo3D(sal_False, aPnt1, aPnt2); } } } @@ -1672,7 +1672,7 @@ void E3dView::InitView () nVDefaultSegments = 12; aDefaultLightColor = RGB_Color(COL_WHITE); aDefaultAmbientColor = RGB_Color(COL_BLACK); - bDoubleSided = FALSE; + bDoubleSided = sal_False; mpMirrorOverlay = 0L; } @@ -1682,13 +1682,13 @@ void E3dView::InitView () |* \************************************************************************/ -BOOL E3dView::IsBreak3DObjPossible() const +sal_Bool E3dView::IsBreak3DObjPossible() const { - ULONG nCount = GetMarkedObjectCount(); + sal_uIntPtr nCount = GetMarkedObjectCount(); if (nCount > 0) { - ULONG i = 0; + sal_uIntPtr i = 0; while (i < nCount) { @@ -1697,11 +1697,11 @@ BOOL E3dView::IsBreak3DObjPossible() const if (pObj && pObj->ISA(E3dObject)) { if(!(((E3dObject*)pObj)->IsBreakObjPossible())) - return FALSE; + return sal_False; } else { - return FALSE; + return sal_False; } i++; @@ -1709,10 +1709,10 @@ BOOL E3dView::IsBreak3DObjPossible() const } else { - return FALSE; + return sal_False; } - return TRUE; + return sal_True; } /************************************************************************* @@ -1726,10 +1726,10 @@ void E3dView::Break3DObj() if(IsBreak3DObjPossible()) { // ALLE selektierten Objekte werden gewandelt - UINT32 nCount = GetMarkedObjectCount(); + sal_uInt32 nCount = GetMarkedObjectCount(); BegUndo(String(SVX_RESSTR(RID_SVX_3D_UNDO_BREAK_LATHE))); - for(UINT32 a=0;a<nCount;a++) + for(sal_uInt32 a=0;a<nCount;a++) { E3dObject* pObj = (E3dObject*)GetMarkedObjectByIndex(a); BreakSingle3DObj(pObj); @@ -1772,11 +1772,11 @@ void E3dView::BreakSingle3DObj(E3dObject* pObj) void E3dView::MergeScenes () { - ULONG nCount = GetMarkedObjectCount(); + sal_uIntPtr nCount = GetMarkedObjectCount(); if (nCount > 0) { - ULONG nObj = 0; + sal_uIntPtr nObj = 0; SdrObject *pObj = GetMarkedObjectByIndex(nObj); E3dScene *pScene = new E3dPolyScene(Get3DDefaultAttributes()); basegfx::B3DRange aBoundVol; @@ -1895,29 +1895,29 @@ void E3dView::CheckPossibilities() // Weitere Flags bewerten if(bGroupPossible || bUnGroupPossible || bGrpEnterPossible) { - INT32 nMarkCnt = GetMarkedObjectCount(); - BOOL bCoumpound = FALSE; - BOOL b3DObject = FALSE; - for(INT32 nObjs = 0L; (nObjs < nMarkCnt) && !bCoumpound; nObjs++) + sal_Int32 nMarkCnt = GetMarkedObjectCount(); + sal_Bool bCoumpound = sal_False; + sal_Bool b3DObject = sal_False; + for(sal_Int32 nObjs = 0L; (nObjs < nMarkCnt) && !bCoumpound; nObjs++) { SdrObject *pObj = GetMarkedObjectByIndex(nObjs); if(pObj && pObj->ISA(E3dCompoundObject)) - bCoumpound = TRUE; + bCoumpound = sal_True; if(pObj && pObj->ISA(E3dObject)) - b3DObject = TRUE; + b3DObject = sal_True; } // Bisher: Es sind ZWEI oder mehr beliebiger Objekte selektiert. // Nachsehen, ob CompoundObjects beteiligt sind. Falls ja, // das Gruppieren verbieten. if(bGroupPossible && bCoumpound) - bGroupPossible = FALSE; + bGroupPossible = sal_False; if(bUnGroupPossible && b3DObject) - bUnGroupPossible = FALSE; + bUnGroupPossible = sal_False; if(bGrpEnterPossible && bCoumpound) - bGrpEnterPossible = FALSE; + bGrpEnterPossible = sal_False; } } diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 8e34e7e997..99a36e453e 100644..100755 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <tools/shl.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpool.hxx> #include <svx/svdmodel.hxx> #include <svx/svxids.hrc> @@ -38,7 +38,7 @@ #include <svx/fmview.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/obj3d.hxx> #include <svx/polysc3d.hxx> #include <svx/e3ditem.hxx> @@ -59,7 +59,7 @@ |* \************************************************************************/ -void E3dView::ConvertMarkedToPolyObj(BOOL bLineToArea) +void E3dView::ConvertMarkedToPolyObj(sal_Bool bLineToArea) { SdrObject* pNewObj = NULL; @@ -69,7 +69,7 @@ void E3dView::ConvertMarkedToPolyObj(BOOL bLineToArea) if (pObj && pObj->ISA(E3dPolyScene)) { - BOOL bBezier = FALSE; + sal_Bool bBezier = sal_False; pNewObj = ((E3dPolyScene*) pObj)->ConvertToPolyObj(bBezier, bLineToArea); if (pNewObj) @@ -119,7 +119,7 @@ void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask) } } -SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, BOOL /*bOnly3DAttr*/) const +SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/) const { // ItemSet mit entspr. Bereich anlegen SfxItemSet aSet( @@ -138,7 +138,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, BOOL /*bOnly3DAttr*/) co else { // get attributes from all selected objects - MergeAttrFromMarked(aSet, FALSE); + MergeAttrFromMarked(aSet, sal_False); // calc flags for SID_ATTR_3D_INTERN const SdrMarkList& rMarkList = GetMarkedObjectList(); @@ -180,7 +180,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, BOOL /*bOnly3DAttr*/) co |* \************************************************************************/ -void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, BOOL bReplaceAll) +void E3dView::Set3DAttributes( const SfxItemSet& rAttr, E3dScene* pInScene, sal_Bool bReplaceAll) { sal_uInt32 nSelectedItems(0L); diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx index cb3b42b9f5..557e253b8d 100644..100755 --- a/svx/source/engine3d/viewpt3d2.cxx +++ b/svx/source/engine3d/viewpt3d2.cxx @@ -186,7 +186,7 @@ void Viewport3D::MakeTransform(void) aViewTf *= aTemp; } - bTfValid = TRUE; + bTfValid = sal_True; } } @@ -314,7 +314,7 @@ basegfx::B3DPoint Viewport3D::MapToDevice(const basegfx::B3DPoint& rVec) const void Viewport3D::SetVRP(const basegfx::B3DPoint& rNewVRP) { aVRP = rNewVRP; - bTfValid = FALSE; + bTfValid = sal_False; } /************************************************************************* @@ -327,7 +327,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN) { aVPN = rNewVPN; aVPN.normalize(); - bTfValid = FALSE; + bTfValid = sal_False; } /************************************************************************* @@ -339,7 +339,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN) void Viewport3D::SetVUV(const basegfx::B3DVector& rNewVUV) { aVUV = rNewVUV; - bTfValid = FALSE; + bTfValid = sal_False; } /************************************************************************* @@ -353,7 +353,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP) aPRP = rNewPRP; aPRP.setX(0.0); aPRP.setY(0.0); - bTfValid = FALSE; + bTfValid = sal_False; } /************************************************************************* @@ -365,7 +365,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP) void Viewport3D::SetVPD(double fNewVPD) { fVPD = fNewVPD; - bTfValid = FALSE; + bTfValid = sal_False; } /************************************************************************* @@ -377,7 +377,7 @@ void Viewport3D::SetVPD(double fNewVPD) void Viewport3D::SetNearClipDist(double fNewNCD) { fNearClipDist = fNewNCD; - bTfValid = FALSE; + bTfValid = sal_False; } /************************************************************************* @@ -389,7 +389,7 @@ void Viewport3D::SetNearClipDist(double fNewNCD) void Viewport3D::SetFarClipDist(double fNewFCD) { fFarClipDist = fNewFCD; - bTfValid = FALSE; + bTfValid = sal_False; } // eof diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index 57e812cd3e..4f6805fdf9 100644..100755 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -388,7 +388,7 @@ namespace svx { Any aContent = makeAny( m_aDescriptor.createPropertyValueSequence() ); _pContainer->CopyAny( - sal::static_int_cast< USHORT >( getDescriptorFormatId() ), + sal::static_int_cast< sal_uInt16 >( getDescriptorFormatId() ), aContent ); } } @@ -494,7 +494,7 @@ namespace svx // ----------------------------------------------------------------------------- sal_Bool ODataAccessObjectTransferable::GetData( const DataFlavor& rFlavor ) { - ULONG nFormat = SotExchange::GetFormat(rFlavor); + sal_uIntPtr nFormat = SotExchange::GetFormat(rFlavor); switch (nFormat) { case SOT_FORMATSTR_ID_DBACCESS_TABLE: diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 8f50991d31..8f50991d31 100644..100755 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index d3b8ce0e68..476e790515 100644..100755 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -29,12 +29,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "dbexch.hrc" -#include "fmgridif.hxx" +#include "svx/dbexch.hrc" +#include "svx/fmgridif.hxx" #include "fmitems.hxx" #include "fmprop.hrc" #include "svx/fmtools.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmurl.hxx" #include "formcontrolfactory.hxx" @@ -987,7 +987,7 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe if ( eInspectorAction != eNone ) { FmInterfaceItem aIFaceItem( SID_FM_SHOW_PROPERTY_BROWSER, xColumnToInspect ); - SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? FALSE : TRUE ); + SfxBoolItem aShowItem( SID_FM_SHOW_PROPERTIES, eInspectorAction == eCloseInspector ? sal_False : sal_True ); pCurrentFrame->GetBindings().GetDispatcher()->Execute( SID_FM_SHOW_PROPERTY_BROWSER, SFX_CALLMODE_ASYNCHRON, &aIFaceItem, &aShowItem, 0L ); @@ -1060,7 +1060,7 @@ void FmGridControl::Command(const CommandEvent& _rEvt) if ( 1 == GetSelectColumnCount() || IsDesignMode() ) { sal_uInt16 nSelId = GetColumnId( - sal::static_int_cast< USHORT >( FirstSelectedColumn() ) ); + sal::static_int_cast< sal_uInt16 >( FirstSelectedColumn() ) ); ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, sal_False ) ); Point aRelativePos( pMyHeader->ScreenToOutputPixel( OutputToScreenPixel( aColRect.TopCenter() ) ) ); @@ -1272,7 +1272,7 @@ void FmGridControl::DeleteSelectedRows() // now delete the row Sequence <sal_Int32> aDeletedRows; - SetUpdateMode( FALSE ); + SetUpdateMode( sal_False ); try { aDeletedRows = xDeleteThem->deleteRows(aBookmarks); @@ -1280,7 +1280,7 @@ void FmGridControl::DeleteSelectedRows() catch(SQLException&) { } - SetUpdateMode( TRUE ); + SetUpdateMode( sal_True ); // how many rows are deleted? sal_Int32 nDeletedRows = 0; @@ -1693,7 +1693,7 @@ void FmGridControl::InitColumnByField( Reference< XPropertySet > xField; _rxColumnModel->getPropertyValue( FM_PROP_BOUNDFIELD ) >>= xField; - + if ( !xField.is() && /*sFieldName.getLength() && */_rxFieldsByNames->hasByName( sFieldName ) ) // #i93452# do not check for name length _rxFieldsByNames->getByName( sFieldName ) >>= xField; @@ -2013,7 +2013,7 @@ namespace GetModelColumnPos( sal::static_int_cast< sal_uInt16 >(_nPosition)), FM_PROP_DESCRIPTION); - + break; default: sRetText = DbGridControl::GetAccessibleObjectDescription(_eObjType,_nPosition); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 51705d673a..3080d773b4 100644..100755 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fmgridif.hxx" +#include "svx/fmgridif.hxx" #include "fmprop.hrc" #include "fmservs.hxx" #include "svx/fmtools.hxx" @@ -39,6 +39,7 @@ #include "sdbdatacolumn.hxx" #include "svx/fmgridcl.hxx" #include "svx/svxids.hrc" +#include <tools/urlobj.hxx> /** === begin UNO includes === **/ #include <com/sun/star/awt/PosSize.hpp> @@ -366,7 +367,8 @@ Reference< XInterface > SAL_CALL FmXGridControl_NewInstance_Impl(const Reference DBG_NAME(FmXGridControl ) //------------------------------------------------------------------------------ FmXGridControl::FmXGridControl(const Reference< XMultiServiceFactory >& _rxFactory) - :m_aModifyListeners(*this, GetMutex()) + :UnoControl( _rxFactory) + ,m_aModifyListeners(*this, GetMutex()) ,m_aUpdateListeners(*this, GetMutex()) ,m_aContainerListeners(*this, GetMutex()) ,m_aSelectionListeners(*this, GetMutex()) @@ -1973,14 +1975,12 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V } else if ( 0 == PropertyName.compareTo( FM_PROP_HELPURL ) ) { - String sHelpURL(::comphelper::getString(Value)); - String sPattern; - sPattern.AssignAscii("HID:"); - if (sHelpURL.Equals(sPattern, 0, sPattern.Len())) - { - String sID = sHelpURL.Copy(sPattern.Len()); - pGrid->SetHelpId(sID.ToInt32()); - } + ::rtl::OUString sHelpURL; + OSL_VERIFY( Value >>= sHelpURL ); + INetURLObject aHID( sHelpURL ); + if ( aHID.GetProtocol() == INET_PROT_HID ) + sHelpURL = aHID.GetURLPath(); + pGrid->SetHelpId( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); } else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) ) { @@ -2076,25 +2076,28 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V } else if ( 0 == PropertyName.compareTo( FM_PROP_HASNAVIGATION ) ) { - if (Value.getValueType() == ::getBooleanCppuType()) - pGrid->EnableNavigationBar(*(sal_Bool*)Value.getValue()); + sal_Bool bValue( sal_True ); + OSL_VERIFY( Value >>= bValue ); + pGrid->EnableNavigationBar( bValue ); } else if ( 0 == PropertyName.compareTo( FM_PROP_RECORDMARKER ) ) { - if (Value.getValueType() == ::getBooleanCppuType()) - pGrid->EnableHandle(*(sal_Bool*)Value.getValue()); + sal_Bool bValue( sal_True ); + OSL_VERIFY( Value >>= bValue ); + pGrid->EnableHandle( bValue ); } else if ( 0 == PropertyName.compareTo( FM_PROP_ENABLED ) ) { - if (Value.getValueType() == ::getBooleanCppuType()) - { - // Im DesignModus nur das Datenfenster disablen - // Sonst kann das Control nicht mehr konfiguriert werden - if (isDesignMode()) - pGrid->GetDataWindow().Enable(*(sal_Bool*)Value.getValue()); - else - pGrid->Enable(*(sal_Bool*)Value.getValue()); - } + sal_Bool bValue( sal_True ); + OSL_VERIFY( Value >>= bValue ); + pGrid->EnableHandle( bValue ); + + // Im DesignModus nur das Datenfenster disablen + // Sonst kann das Control nicht mehr konfiguriert werden + if (isDesignMode()) + pGrid->GetDataWindow().Enable( bValue ); + else + pGrid->Enable( bValue ); } else VCLXWindow::setProperty( PropertyName, Value ); @@ -2109,7 +2112,7 @@ Reference< XAccessibleContext > FmXGridPeer::CreateAccessibleContext() Window* pGrid = GetWindow(); if ( pGrid ) { - Reference< XAccessible > xAcc( pGrid->GetAccessible( TRUE ) ); + Reference< XAccessible > xAcc( pGrid->GetAccessible( sal_True ) ); if ( xAcc.is() ) xContext = xAcc->getAccessibleContext(); // TODO: this has a slight conceptual problem: diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 76925fbe89..4a4ea09fd5 100644..100755 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -31,7 +31,7 @@ #include <sal/macros.h> #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "svx/fmtools.hxx" #include "gridcell.hxx" #include "gridcols.hxx" @@ -899,7 +899,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor { sal_Int16 nWheelBehavior = MouseWheelBehavior::SCROLL_FOCUS_ONLY; OSL_VERIFY( xModel->getPropertyValue( FM_PROP_MOUSE_WHEEL_BEHAVIOR ) >>= nWheelBehavior ); - USHORT nVclSetting = MOUSE_WHEEL_FOCUS_ONLY; + sal_uInt16 nVclSetting = MOUSE_WHEEL_FOCUS_ONLY; switch ( nWheelBehavior ) { case MouseWheelBehavior::SCROLL_DISABLED: nVclSetting = MOUSE_WHEEL_DISABLE; break; @@ -914,7 +914,7 @@ void DbCellControl::Init( Window& rParent, const Reference< XRowSet >& _rxCursor MouseSettings aMouseSettings = aSettings.GetMouseSettings(); aMouseSettings.SetWheelBehavior( nVclSetting ); aSettings.SetMouseSettings( aMouseSettings ); - m_pWindow->SetSettings( aSettings, TRUE ); + m_pWindow->SetSettings( aSettings, sal_True ); } } catch( const Exception& ) @@ -987,7 +987,7 @@ void DbCellControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect ) m_pPainter->SetTextFillColor( _rDev.GetTextColor() ); Font aFont( _rDev.GetFont() ); - aFont.SetTransparent( TRUE ); + aFont.SetTransparent( sal_True ); m_pPainter->SetFont( aFont ); m_pPainter->SetPosSizePixel( _rRect.TopLeft(), _rRect.GetSize() ); @@ -1194,7 +1194,7 @@ String DbTextField::GetFormatText(const Reference< XColumn >& _rxField, const Re if ( _rxField.is() ) try { - aString = getValue( _rxField, xFormatter, m_rColumn.GetParent().getNullDate(), m_rColumn.GetKey(), m_nKeyType); + aString = getFormattedValue( _rxField, xFormatter, m_rColumn.GetParent().getNullDate(), m_rColumn.GetKey(), m_nKeyType); } catch( const Exception& ) { @@ -1535,7 +1535,7 @@ String DbFormattedField::GetFormatText(const Reference< ::com::sun::star::sdb::X // ein double-Feld bindet und als Text formatiert, liefert m_rColumn.IsNumeric() sal_True. Das heisst // also einfach, dass ich den Inhalt der Variant mittels getDouble abfragen kann, und dann kann // ich den Rest (die Formatierung) dem FormattedField ueberlassen. - double dValue = getValue(_rxField, m_rColumn.GetParent().getNullDate(), m_nKeyType); + double dValue = getValue( _rxField, m_rColumn.GetParent().getNullDate() ); if (_rxField->wasNull()) return aText; ((FormattedField*)m_pPainter)->SetValue(dValue); @@ -1579,7 +1579,7 @@ void DbFormattedField::UpdateFromField(const Reference< ::com::sun::star::sdb::X // ein double-Feld bindet und als Text formatiert, liefert m_rColumn.IsNumeric() sal_True. Das heisst // also einfach, dass ich den Inhalt der Variant mittels getDouble abfragen kann, und dann kann // ich den Rest (die Formatierung) dem FormattedField ueberlassen. - double dValue = getValue(_rxField, m_rColumn.GetParent().getNullDate(), m_nKeyType); + double dValue = getValue( _rxField, m_rColumn.GetParent().getNullDate() ); if (_rxField->wasNull()) m_pWindow->SetText(String()); else @@ -1654,11 +1654,14 @@ DbCheckBox::DbCheckBox( DbGridColumn& _rColumn ) namespace { - void setCheckBoxStyle( Window* _pWindow, USHORT nStyle ) + void setCheckBoxStyle( Window* _pWindow, bool bMono ) { AllSettings aSettings = _pWindow->GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); - aStyleSettings.SetCheckBoxStyle( nStyle ); + if( bMono ) + aStyleSettings.SetOptions( aStyleSettings.GetOptions() | STYLE_OPTION_MONO ); + else + aStyleSettings.SetOptions( aStyleSettings.GetOptions() & (~STYLE_OPTION_MONO) ); aSettings.SetStyleSettings( aStyleSettings ); _pWindow->SetSettings( aSettings ); } @@ -1684,8 +1687,8 @@ void DbCheckBox::Init( Window& rParent, const Reference< XRowSet >& xCursor ) sal_Int16 nStyle = awt::VisualEffect::LOOK3D; OSL_VERIFY( xModel->getPropertyValue( FM_PROP_VISUALEFFECT ) >>= nStyle ); - setCheckBoxStyle( m_pWindow, nStyle == awt::VisualEffect::FLAT ? STYLE_CHECKBOX_MONO : STYLE_CHECKBOX_WIN ); - setCheckBoxStyle( m_pPainter, nStyle == awt::VisualEffect::FLAT ? STYLE_CHECKBOX_MONO : STYLE_CHECKBOX_WIN ); + setCheckBoxStyle( m_pWindow, nStyle == awt::VisualEffect::FLAT ); + setCheckBoxStyle( m_pPainter, nStyle == awt::VisualEffect::FLAT ); sal_Bool bTristate = sal_True; OSL_VERIFY( xModel->getPropertyValue( FM_PROP_TRISTATE ) >>= bTristate ); @@ -2272,13 +2275,13 @@ void DbDateField::implAdjustGenericFieldSetting( const Reference< XPropertySet > static_cast< DateField* >( m_pWindow )->SetMin( nMin ); static_cast< DateField* >( m_pWindow )->SetMax( nMax ); static_cast< DateField* >( m_pWindow )->SetStrictFormat( bStrict ); - static_cast< DateField* >( m_pWindow )->EnableEmptyFieldValue( TRUE ); + static_cast< DateField* >( m_pWindow )->EnableEmptyFieldValue( sal_True ); static_cast< DateField* >( m_pPainter )->SetExtDateFormat( (ExtDateFieldFormat)nFormat ); static_cast< DateField* >( m_pPainter )->SetMin( nMin ); static_cast< DateField* >( m_pPainter )->SetMax( nMax ); static_cast< DateField* >( m_pPainter )->SetStrictFormat( bStrict ); - static_cast< DateField* >( m_pPainter )->EnableEmptyFieldValue( TRUE ); + static_cast< DateField* >( m_pPainter )->EnableEmptyFieldValue( sal_True ); } } @@ -2382,13 +2385,13 @@ void DbTimeField::implAdjustGenericFieldSetting( const Reference< XPropertySet > static_cast< TimeField* >( m_pWindow )->SetMin( nMin ); static_cast< TimeField* >( m_pWindow )->SetMax( nMax ); static_cast< TimeField* >( m_pWindow )->SetStrictFormat( bStrict ); - static_cast< TimeField* >( m_pWindow )->EnableEmptyFieldValue( TRUE ); + static_cast< TimeField* >( m_pWindow )->EnableEmptyFieldValue( sal_True ); static_cast< TimeField* >( m_pPainter )->SetExtFormat( (ExtTimeFieldFormat)nFormat ); static_cast< TimeField* >( m_pPainter )->SetMin( nMin ); static_cast< TimeField* >( m_pPainter )->SetMax( nMax ); static_cast< TimeField* >( m_pPainter )->SetStrictFormat( bStrict ); - static_cast< TimeField* >( m_pPainter )->EnableEmptyFieldValue( TRUE ); + static_cast< TimeField* >( m_pPainter )->EnableEmptyFieldValue( sal_True ); } } @@ -2554,7 +2557,7 @@ String DbComboBox::GetFormatText(const Reference< ::com::sun::star::sdb::XColumn if (_rxField.is()) try { - aString = getValue( _rxField, xFormatter, m_rColumn.GetParent().getNullDate(), m_rColumn.GetKey(), m_nKeyType ); + aString = getFormattedValue( _rxField, xFormatter, m_rColumn.GetParent().getNullDate(), m_rColumn.GetKey(), m_nKeyType ); } catch( const Exception& ) { @@ -2953,13 +2956,13 @@ sal_Bool DbFilterField::commitControl() case ::com::sun::star::form::FormComponentType::CHECKBOX: return sal_True; case ::com::sun::star::form::FormComponentType::LISTBOX: + aText.Erase(); if (static_cast<ListBox*>(m_pWindow)->GetSelectEntryCount()) { sal_Int16 nPos = (sal_Int16)static_cast<ListBox*>(m_pWindow)->GetSelectEntryPos(); - aText = (const sal_Unicode*)m_aValueList.getConstArray()[nPos]; + if ( ( nPos >= 0 ) && ( nPos < m_aValueList.getLength() ) ) + aText = (const sal_Unicode*)m_aValueList.getConstArray()[nPos]; } - else - aText.Erase(); if (m_aText != aText) { @@ -3092,7 +3095,7 @@ void DbFilterField::Update() Reference< ::com::sun::star::container::XNameAccess > xFieldNames = xSupCol->getColumns(); if (!xFieldNames->hasByName(aName)) return; - + Reference< ::com::sun::star::container::XNameAccess > xTablesNames = xSupTab->getTables(); Reference< ::com::sun::star::beans::XPropertySet > xComposerFieldAsSet(xFieldNames->getByName(aName),UNO_QUERY); @@ -3164,7 +3167,7 @@ void DbFilterField::Update() while (!xListCursor->isAfterLast() && i++ < SHRT_MAX) // max anzahl eintraege { - aStr = getValue(xDataField, xFormatter, aNullDate, nFormatKey, nKeyType); + aStr = getFormattedValue(xDataField, xFormatter, aNullDate, nFormatKey, nKeyType); aStringList.push_back(aStr); xListCursor->next(); } @@ -3496,7 +3499,7 @@ void FmXGridCell::onFocusLost( const awt::FocusEvent& _rEvent ) } //------------------------------------------------------------------------------ -void FmXGridCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) { @@ -3905,7 +3908,7 @@ void FmXEditCell::onFocusLost( const awt::FocusEvent& _rEvent ) } //------------------------------------------------------------------------------ -void FmXEditCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) { @@ -4063,7 +4066,7 @@ Window* FmXCheckBoxCell::getEventWindow() const } //------------------------------------------------------------------ -void FmXCheckBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) { @@ -4400,7 +4403,7 @@ void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeExcept } //------------------------------------------------------------------ -void FmXListBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) { if ( ( &_rWindow == m_pBox ) && ( _nEventId == VCLEVENT_LISTBOX_SELECT ) @@ -4614,7 +4617,7 @@ void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Run } //------------------------------------------------------------------------------ -void FmXComboBoxCell::onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ) +void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) diff --git a/svx/source/fmcomp/gridcols.cxx b/svx/source/fmcomp/gridcols.cxx index aa6c9132ed..aa6c9132ed 100644..100755 --- a/svx/source/fmcomp/gridcols.cxx +++ b/svx/source/fmcomp/gridcols.cxx diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 9f2dd95e8d..a6d4458991 100644..100755 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -58,7 +58,7 @@ #include <vcl/sound.hxx> #include <vcl/menu.hxx> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/svxids.hrc> #include <tools/shl.hxx> @@ -777,7 +777,7 @@ void DbGridControl::NavigationBar::StateChanged( StateChangedType nType ) { case STATE_CHANGE_MIRRORING: { - BOOL bIsRTLEnabled = IsRTLEnabled(); + sal_Bool bIsRTLEnabled = IsRTLEnabled(); for ( size_t i=0; i < SAL_N_ELEMENTS( pWindows ); ++i ) pWindows[i]->EnableRTL( bIsRTLEnabled ); } @@ -938,7 +938,7 @@ DbGridControl::DbGridControl( ,m_nDeleteEvent(0) ,m_nOptions(OPT_READONLY) ,m_nOptionMask(OPT_INSERT | OPT_UPDATE | OPT_DELETE) - ,m_nLastColId((USHORT)-1) + ,m_nLastColId((sal_uInt16)-1) ,m_nLastRowId(-1) ,m_bDesignMode(sal_False) ,m_bRecordCountFinal(sal_False) @@ -1599,7 +1599,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt Reference< XRowsChangeBroadcaster> xChangeBroad(xSet,UNO_QUERY); if ( xChangeBroad.is( ) ) xChangeBroad->addRowsChangeListener(m_xRowSetListener); - + // insert the currently known rows // and one row if we are able to insert rows @@ -2334,7 +2334,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull) if (nNewPos < 0) // keine Position gefunden return; - m_bInAdjustDataSource = TRUE; + m_bInAdjustDataSource = sal_True; if (nNewPos != m_nCurrentPos) { if (m_bSynchDisplay) @@ -2352,7 +2352,7 @@ void DbGridControl::AdjustDataSource(sal_Bool bFull) SetCurrent(nNewPos); RowModified(nNewPos); } - m_bInAdjustDataSource = FALSE; + m_bInAdjustDataSource = sal_False; // Wird der DatenCursor von aussen bewegt, wird die selektion aufgehoben SetNoSelection(); @@ -2745,7 +2745,7 @@ void DbGridControl::SetFilterMode(sal_Bool bMode) } } // ----------------------------------------------------------------------------- -String DbGridControl::GetCellText(long _nRow, USHORT _nColId) const +String DbGridControl::GetCellText(long _nRow, sal_uInt16 _nColId) const { size_t Location = GetModelColumnPos( _nColId ); DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; @@ -3649,7 +3649,7 @@ sal_uInt16 DbGridControl::GetModelColumnPos( sal_uInt16 nId ) const } //------------------------------------------------------------------------------ -void DbGridControl::implAdjustInSolarThread(BOOL _bRows) +void DbGridControl::implAdjustInSolarThread(sal_Bool _bRows) { TRACE_RANGE("DbGridControl::implAdjustInSolarThread"); ::osl::MutexGuard aGuard(m_aAdjustSafety); @@ -3882,7 +3882,7 @@ Reference<XAccessible > DbGridControl::CreateAccessibleControl( sal_Int32 _nInde // ----------------------------------------------------------------------------- Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) { - USHORT nColumnId = GetColumnId( _nColumnPos ); + sal_uInt16 nColumnId = GetColumnId( _nColumnPos ); size_t Location = GetModelColumnPos(nColumnId); DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; if ( pColumn ) @@ -3904,7 +3904,7 @@ Reference< XAccessible > DbGridControl::CreateAccessibleCell( sal_Int32 _nRow, s eValue = STATE_DONTKNOW; break; } - return DbGridControl_Base::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eValue,TRUE ); + return DbGridControl_Base::CreateAccessibleCheckBoxCell( _nRow, _nColumnPos,eValue,sal_True ); } } return DbGridControl_Base::CreateAccessibleCell( _nRow, _nColumnPos ); diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src index f6e4c16404..611df77f0b 100644..100755 --- a/svx/source/fmcomp/gridctrl.src +++ b/svx/source/fmcomp/gridctrl.src @@ -25,10 +25,12 @@ * ************************************************************************/ -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/svxids.hrc> #include "globlmn.hrc" #include "fmhelp.hrc" +#include <svx/svxcommands.h> + Menu RID_SVXMNU_ROWS { ItemList = @@ -36,19 +38,19 @@ Menu RID_SVXMNU_ROWS MenuItem { Identifier = SID_FM_DELETEROWS ; - HelpID = SID_FM_DELETEROWS ; + HelpId = HID_FM_DELETEROWS ; Text [ en-US ] = "Delete Rows" ; }; MenuItem { Identifier = SID_FM_RECORD_SAVE ; - HelpID = SID_FM_RECORD_SAVE ; + HelpId = CMD_SID_FM_RECORD_SAVE ; Text [ en-US ] = "Save Record" ; }; MenuItem { Identifier = SID_FM_RECORD_UNDO ; - HelpID = SID_FM_RECORD_UNDO ; + HelpId = CMD_SID_FM_RECORD_UNDO ; Text [ en-US ] = "Undo: Data entry" ; }; }; @@ -60,7 +62,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_INSERTCOL ; - HelpID = SID_FM_INSERTCOL ; + HelpId = HID_FM_INSERTCOL ; Text [ en-US ] = "Insert ~Column" ; SubMenu = Menu { @@ -69,61 +71,61 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_EDIT ; - HelpID = SID_FM_EDIT ; + HelpId = CMD_SID_FM_EDIT ; Text [ en-US ] = "Text Box" ; }; MenuItem { Identifier = SID_FM_CHECKBOX ; - HelpID = SID_FM_CHECKBOX ; + HelpId = CMD_SID_FM_CHECKBOX ; Text [ en-US ] = "Check Box" ; }; MenuItem { Identifier = SID_FM_COMBOBOX ; - HelpID = SID_FM_COMBOBOX ; + HelpId = CMD_SID_FM_COMBOBOX ; Text [ en-US ] = "Combo Box" ; }; MenuItem { Identifier = SID_FM_LISTBOX ; - HelpID = SID_FM_LISTBOX ; + HelpId = CMD_SID_FM_LISTBOX ; Text [ en-US ] = "List Box" ; }; MenuItem { Identifier = SID_FM_DATEFIELD ; - HelpID = SID_FM_DATEFIELD ; + HelpId = CMD_SID_FM_DATEFIELD ; Text [ en-US ] = "Date Field" ; }; MenuItem { Identifier = SID_FM_TIMEFIELD ; - HelpID = SID_FM_TIMEFIELD ; + HelpId = CMD_SID_FM_TIMEFIELD ; Text [ en-US ] = "Time Field" ; }; MenuItem { Identifier = SID_FM_NUMERICFIELD ; - HelpID = SID_FM_NUMERICFIELD ; + HelpId = CMD_SID_FM_NUMERICFIELD ; Text [ en-US ] = "Numeric Field" ; }; MenuItem { Identifier = SID_FM_CURRENCYFIELD ; - HelpID = SID_FM_CURRENCYFIELD ; + HelpId = CMD_SID_FM_CURRENCYFIELD ; Text [ en-US ] = "Currency Field" ; }; MenuItem { Identifier = SID_FM_PATTERNFIELD ; - HelpID = SID_FM_PATTERNFIELD ; + HelpId = CMD_SID_FM_PATTERNFIELD ; Text [ en-US ] = "Pattern Field" ; }; MenuItem { Identifier = SID_FM_FORMATTEDFIELD ; - HelpID = SID_FM_FORMATTEDFIELD ; + HelpId = CMD_SID_FM_FORMATTEDFIELD ; Text [ en-US ] = "Formatted Field" ; }; MenuItem @@ -140,25 +142,25 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_CHANGECOL ; - HelpID = SID_FM_CHANGECOL ; + HelpId = HID_FM_CHANGECOL ; Text [ en-US ] = "~Replace with" ; }; MenuItem { Identifier = SID_FM_DELETECOL ; - HelpID = SID_FM_DELETECOL ; + HelpId = HID_FM_DELETECOL ; Text [ en-US ] = "Delete Column" ; }; MenuItem { Identifier = SID_FM_HIDECOL ; - HelpID = SID_FM_HIDECOL ; + HelpId = HID_FM_HIDECOL ; Text [ en-US ] = "~Hide Column"; }; MenuItem { Identifier = SID_FM_SHOWCOLS ; - HelpID = SID_FM_SHOWCOLS ; + HelpId = HID_FM_SHOWCOLS ; SubMenu = Menu { ItemList = @@ -166,7 +168,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_SHOWCOLS_MORE ; - HelpID = SID_FM_SHOWCOLS_MORE ; + HelpId = HID_FM_SHOWCOLS_MORE ; Text [ en-US ] = "~More..."; }; MenuItem @@ -176,7 +178,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_SHOWALLCOLS ; - HelpID = SID_FM_SHOWALLCOLS ; + HelpId = HID_FM_SHOWALLCOLS ; Text [ en-US ] = "~All"; }; }; @@ -186,7 +188,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_SHOW_PROPERTY_BROWSER ; - HelpID = SID_FM_SHOW_PROPERTY_BROWSER ; + HelpId = CMD_SID_FM_SHOW_PROPERTY_BROWSER ; Text [ en-US ] = "Column..." ; }; }; diff --git a/svx/source/fmcomp/trace.cxx b/svx/source/fmcomp/trace.cxx index 7ad2fd93ba..548650ce1b 100644..100755 --- a/svx/source/fmcomp/trace.cxx +++ b/svx/source/fmcomp/trace.cxx @@ -37,7 +37,7 @@ //------------------------------------------------------------------------------ ::osl::Mutex Tracer::s_aMapSafety; -::std::map< ::oslThreadIdentifier, INT32, ::std::less< oslThreadIdentifier > > +::std::map< ::oslThreadIdentifier, sal_Int32, ::std::less< oslThreadIdentifier > > Tracer::s_aThreadIndents; //------------------------------------------------------------------------------ @@ -45,13 +45,13 @@ Tracer::Tracer(const char* _pBlockDescription) :m_sBlockDescription(_pBlockDescription) { ::osl::MutexGuard aGuard(s_aMapSafety); - INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]++; + sal_uInt32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]++; ByteString sIndent; while (nIndent--) sIndent += '\t'; - ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) ); + ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) ); sThread += '\t'; ByteString sMessage(sThread); @@ -65,13 +65,13 @@ Tracer::Tracer(const char* _pBlockDescription) Tracer::~Tracer() { ::osl::MutexGuard aGuard(s_aMapSafety); - INT32 nIndent = --s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]; + sal_Int32 nIndent = --s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]; ByteString sIndent; while (nIndent--) sIndent += '\t'; - ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) ); + ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) ); sThread += '\t'; ByteString sMessage(sThread); @@ -85,13 +85,13 @@ Tracer::~Tracer() void Tracer::TraceString(const char* _pMessage) { ::osl::MutexGuard aGuard(s_aMapSafety); - INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]; + sal_Int32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]; ByteString sIndent; while (nIndent--) sIndent += '\t'; - ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) ); + ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) ); sThread += '\t'; ByteString sMessage(sThread); @@ -106,13 +106,13 @@ void Tracer::TraceString(const char* _pMessage) void Tracer::TraceString1StringParam(const char* _pMessage, const char* _pParam) { ::osl::MutexGuard aGuard(s_aMapSafety); - INT32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]; + sal_Int32 nIndent = s_aThreadIndents[ ::osl::Thread::getCurrentIdentifier() ]; ByteString sIndent; while (nIndent--) sIndent += '\t'; - ByteString sThread( ByteString::CreateFromInt32( (INT32)::osl::Thread::getCurrentIdentifier() ) ); + ByteString sThread( ByteString::CreateFromInt32( (sal_Int32)::osl::Thread::getCurrentIdentifier() ) ); sThread += '\t'; ByteString sMessage(sThread); diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index c1d1bc43aa..a04aedb430 100644..100755 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "xmlexchg.hxx" +#include "svx/xmlexchg.hxx" #include <sot/formats.hxx> #include <sot/exchange.hxx> #include <tools/debug.hxx> diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 8e74a34e82..b04a0b7340 100644..100755 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -30,9 +30,9 @@ #include "precompiled_svx.hxx" #include <sal/macros.h> -#include "ParseContext.hxx" +#include "svx/ParseContext.hxx" #include "stringlistresource.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/dialmgr.hxx> diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx index dd1fca16bc..dd1fca16bc 100644..100755 --- a/svx/source/form/dataaccessdescriptor.cxx +++ b/svx/source/form/dataaccessdescriptor.cxx diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index ce6842e9b8..19fc170b93 100644..100755 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -32,7 +32,7 @@ #include "svx/databaselocationinput.hxx" #include "svx/dialmgr.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" /** === begin UNO includes === **/ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> diff --git a/svx/source/form/datalistener.cxx b/svx/source/form/datalistener.cxx index 7488ea83c8..7488ea83c8 100644..100755 --- a/svx/source/form/datalistener.cxx +++ b/svx/source/form/datalistener.cxx diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 58cdb74092..e2e0b175d3 100644..100755 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -34,12 +34,12 @@ #include "fmservs.hxx" #include "datanavi.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmhelp.hrc" #include <svx/svxids.hrc> #include <tools/rcid.h> #include <tools/diagnose_ex.h> -#include "xmlexchg.hxx" +#include "svx/xmlexchg.hxx" #include <svx/dialmgr.hxx> #include <svx/fmshell.hxx> #include <svtools/miscopt.hxx> @@ -267,7 +267,7 @@ namespace svxform return pMenu; } - void DataTreeListBox::ExcecuteContextMenuAction( USHORT _nSelectedPopupEntry ) + void DataTreeListBox::ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry ) { m_pXFormsPage->DoMenuAction( _nSelectedPopupEntry ); } @@ -283,7 +283,7 @@ namespace svxform void DataTreeListBox::DeleteAndClear() { - ULONG i, nCount = GetEntryCount(); + sal_uIntPtr i, nCount = GetEntryCount(); for ( i = 0; i < nCount; ++i ) { SvLBoxEntry* pEntry = GetEntry(i); @@ -352,7 +352,7 @@ namespace svxform WinBits nBits = WB_BORDER | WB_TABSTOP | WB_HIDESELECTION | WB_NOINITIALSELECTION; if ( DGTInstance == m_eGroup || DGTSubmission == m_eGroup ) nBits |= WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT; - m_aItemList.SetWindowBits( m_aItemList.GetStyle() | nBits ); + m_aItemList.SetStyle( m_aItemList.GetStyle() | nBits ); m_aItemList.Show(); ItemSelectHdl( &m_aItemList ); } @@ -411,7 +411,7 @@ namespace svxform { ItemNode* pNode = new ItemNode( xChild ); SvLBoxEntry* pEntry = m_aItemList.InsertEntry( - sName, aExpImg, aCollImg, _pParent, FALSE, LIST_APPEND, pNode ); + sName, aExpImg, aCollImg, _pParent, sal_False, LIST_APPEND, pNode ); if ( xChild->hasAttributes() ) { Reference< css::xml::dom::XNamedNodeMap > xMap = xChild->getAttributes(); @@ -427,7 +427,7 @@ namespace svxform m_xUIHelper->getNodeDisplayName( xAttr, bShowDetails ); m_aItemList.InsertEntry( sAttrName, aExpImg, aCollImg, - pEntry, FALSE, LIST_APPEND, pNode ); + pEntry, sal_False, LIST_APPEND, pNode ); } } } @@ -443,7 +443,7 @@ namespace svxform } } //------------------------------------------------------------------------ - bool XFormsPage::DoToolBoxAction( USHORT _nToolBoxID ) { + bool XFormsPage::DoToolBoxAction( sal_uInt16 _nToolBoxID ) { bool bHandled = false; bool bIsDocModified = false; @@ -470,7 +470,7 @@ namespace svxform xSubmissions->insert( makeAny( xNewSubmission ) ); Reference< XPropertySet > xNewPropSet( xNewSubmission, UNO_QUERY ); SvLBoxEntry* pEntry = AddEntry( xNewPropSet ); - m_aItemList.Select( pEntry, TRUE ); + m_aItemList.Select( pEntry, sal_True ); bIsDocModified = true; } catch ( Exception& ) @@ -486,7 +486,7 @@ namespace svxform ItemNode* pNode = NULL; Reference< css::xml::dom::XNode > xParentNode; Reference< XPropertySet > xNewBinding; - USHORT nResId = 0; + sal_uInt16 nResId = 0; bool bIsElement = true; if ( DGTInstance == m_eGroup ) { @@ -597,7 +597,7 @@ namespace svxform { SvLBoxEntry* pNewEntry = AddEntry( pNode, bIsElement ); m_aItemList.MakeVisible( pNewEntry ); - m_aItemList.Select( pNewEntry, TRUE ); + m_aItemList.Select( pNewEntry, sal_True ); bIsDocModified = true; } else @@ -623,7 +623,7 @@ namespace svxform if ( RET_OK == nReturn ) { SvLBoxEntry* pNewEntry = AddEntry( xNewBinding ); - m_aItemList.Select( pNewEntry, TRUE ); + m_aItemList.Select( pNewEntry, sal_True ); bIsDocModified = true; } else @@ -664,7 +664,7 @@ namespace svxform AddDataItemDialog aDlg( this, pNode, m_xUIHelper ); DataItemType eType = DITElement; - USHORT nResId = RID_STR_DATANAV_EDIT_ELEMENT; + sal_uInt16 nResId = RID_STR_DATANAV_EDIT_ELEMENT; if ( pNode && pNode->m_xNode.is() ) { try @@ -776,7 +776,7 @@ namespace svxform { SvLBoxEntry* pParent = m_aItemList.FirstSelected(); const ImageList& rImageList = m_pNaviWin->GetItemImageList(); - USHORT nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE; + sal_uInt16 nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE; Image aImage = rImageList.GetImage( nImageID ); ::rtl::OUString sName; try @@ -789,7 +789,7 @@ namespace svxform DBG_UNHANDLED_EXCEPTION(); } return m_aItemList.InsertEntry( - sName, aImage, aImage, pParent, FALSE, LIST_APPEND, _pNewNode ); + sName, aImage, aImage, pParent, sal_False, LIST_APPEND, _pNewNode ); } //------------------------------------------------------------------------ class lcl_ResourceString @@ -993,7 +993,7 @@ namespace svxform { // ID _rEntry->getPropertyValue( PN_SUBMISSION_ID ) >>= sTemp; - pEntry = m_aItemList.InsertEntry( sTemp, aImage, aImage, NULL, FALSE, LIST_APPEND, pNode ); + pEntry = m_aItemList.InsertEntry( sTemp, aImage, aImage, NULL, sal_False, LIST_APPEND, pNode ); // Action _rEntry->getPropertyValue( PN_SUBMISSION_ACTION ) >>= sTemp; String sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_ACTION ); @@ -1037,7 +1037,7 @@ namespace svxform _rEntry->getPropertyValue( PN_BINDING_EXPR ) >>= sTemp; sName += String( sTemp ); pEntry = m_aItemList.InsertEntry( - sName, aImage, aImage, NULL, FALSE, LIST_APPEND, pNode ); + sName, aImage, aImage, NULL, sal_False, LIST_APPEND, pNode ); } catch ( Exception& ) { @@ -1074,7 +1074,7 @@ namespace svxform _rEntry->getPropertyValue( PN_SUBMISSION_BIND ) >>= sTemp; String sEntry = SVX_RESSTR( RID_STR_DATANAV_SUBM_BIND ); sEntry += String( sTemp ); - ULONG nPos = 0; + sal_uIntPtr nPos = 0; SvLBoxEntry* pChild = m_aItemList.GetEntry( pEntry, nPos++ ); m_aItemList.SetEntryText( pChild, sEntry ); _rEntry->getPropertyValue( PN_SUBMISSION_REF ) >>= sTemp; @@ -1125,7 +1125,7 @@ namespace svxform DBG_ASSERT( pNode->m_xNode.is(), "XFormsPage::RemoveEntry(): no XNode" ); css::xml::dom::NodeType eChildType = pNode->m_xNode->getNodeType(); bool bIsElement = ( eChildType == css::xml::dom::NodeType_ELEMENT_NODE ); - USHORT nResId = bIsElement ? RID_QRY_REMOVE_ELEMENT : RID_QRY_REMOVE_ATTRIBUTE; + sal_uInt16 nResId = bIsElement ? RID_QRY_REMOVE_ELEMENT : RID_QRY_REMOVE_ATTRIBUTE; String sVar = bIsElement ? ELEMENTNAME : ATTRIBUTENAME; QueryBox aQBox( this, SVX_RES( nResId ) ); String sMessText = aQBox.GetMessText(); @@ -1157,7 +1157,7 @@ namespace svxform { DBG_ASSERT( pNode->m_xPropSet.is(), "XFormsPage::RemoveEntry(): no propset" ); bool bSubmission = ( DGTSubmission == m_eGroup ); - USHORT nResId = bSubmission ? RID_QRY_REMOVE_SUBMISSION : RID_QRY_REMOVE_BINDING; + sal_uInt16 nResId = bSubmission ? RID_QRY_REMOVE_SUBMISSION : RID_QRY_REMOVE_BINDING; rtl::OUString sProperty = bSubmission ? PN_SUBMISSION_ID : PN_BINDING_ID; String sSearch = bSubmission ? SUBMISSIONNAME : BINDINGNAME; rtl::OUString sName; @@ -1204,7 +1204,7 @@ namespace svxform if ( rNEvt.GetType() == EVENT_KEYINPUT ) { - USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode(); + sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode(); switch ( nCode ) { @@ -1228,7 +1228,7 @@ namespace svxform m_aItemList.SetPosSizePixel( Point( 2, 2 + aTbxSize.Height() ), aSize ); } //------------------------------------------------------------------------ - String XFormsPage::SetModel( const Reference< css::xforms::XModel >& _xModel, USHORT _nPagePos ) + String XFormsPage::SetModel( const Reference< css::xforms::XModel >& _xModel, sal_uInt16 _nPagePos ) { DBG_ASSERT( _xModel.is(), "XFormsPage::SetModel(): invalid model" ); @@ -1254,7 +1254,7 @@ namespace svxform Reference < XEnumeration > xNum = xNumAccess->createEnumeration(); if ( xNum.is() && xNum->hasMoreElements() ) { - USHORT nIter = 0; + sal_uInt16 nIter = 0; while ( xNum->hasMoreElements() ) { if ( nIter == _nPagePos ) @@ -1351,7 +1351,7 @@ namespace svxform ItemNode* pNode = new ItemNode( xPropSet ); m_aItemList.InsertEntry( - sEntry, aImage1, aImage2, NULL, FALSE, LIST_APPEND, pNode ); + sEntry, aImage1, aImage2, NULL, sal_False, LIST_APPEND, pNode ); } } } @@ -1428,7 +1428,7 @@ namespace svxform } //------------------------------------------------------------------------ - bool XFormsPage::DoMenuAction( USHORT _nMenuID ) + bool XFormsPage::DoMenuAction( sal_uInt16 _nMenuID ) { return DoToolBoxAction( _nMenuID ); } @@ -1436,14 +1436,14 @@ namespace svxform //------------------------------------------------------------------------ void XFormsPage::EnableMenuItems( Menu* _pMenu ) { - BOOL bEnableAdd = FALSE; - BOOL bEnableEdit = FALSE; - BOOL bEnableRemove = FALSE; + sal_Bool bEnableAdd = sal_False; + sal_Bool bEnableEdit = sal_False; + sal_Bool bEnableRemove = sal_False; SvLBoxEntry* pEntry = m_aItemList.FirstSelected(); if ( pEntry ) { - bEnableAdd = TRUE; + bEnableAdd = sal_True; bool bSubmitChild = false; if ( DGTSubmission == m_eGroup && m_aItemList.GetParent( pEntry ) ) { @@ -1453,10 +1453,10 @@ namespace svxform ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() ); if ( pNode && ( pNode->m_xNode.is() || pNode->m_xPropSet.is() ) ) { - bEnableEdit = TRUE; + bEnableEdit = sal_True; bEnableRemove = ( bSubmitChild != true ); if ( DGTInstance == m_eGroup && !m_aItemList.GetParent( pEntry ) ) - bEnableRemove = FALSE; + bEnableRemove = sal_False; if ( pNode->m_xNode.is() ) { try @@ -1465,7 +1465,7 @@ namespace svxform if ( eChildType != css::xml::dom::NodeType_ELEMENT_NODE && eChildType != css::xml::dom::NodeType_DOCUMENT_NODE ) { - bEnableAdd = FALSE; + bEnableAdd = sal_False; } } catch ( Exception& ) @@ -1476,7 +1476,7 @@ namespace svxform } } else if ( m_eGroup != DGTInstance ) - bEnableAdd = TRUE; + bEnableAdd = sal_True; m_aToolBox.EnableItem( TBI_ITEM_ADD, bEnableAdd ); m_aToolBox.EnableItem( TBI_ITEM_ADD_ELEMENT, bEnableAdd ); @@ -1494,8 +1494,8 @@ namespace svxform } if ( DGTInstance == m_eGroup ) { - USHORT nResId1 = RID_STR_DATANAV_EDIT_ELEMENT; - USHORT nResId2 = RID_STR_DATANAV_REMOVE_ELEMENT; + sal_uInt16 nResId1 = RID_STR_DATANAV_EDIT_ELEMENT; + sal_uInt16 nResId2 = RID_STR_DATANAV_REMOVE_ELEMENT; if ( pEntry ) { ItemNode* pNode = static_cast< ItemNode* >( pEntry->GetUserData() ); @@ -1592,7 +1592,7 @@ namespace svxform pMenu->SetItemBits( MID_SHOW_DETAILS, MIB_CHECKABLE ); pMenu->CheckItem( MID_SHOW_DETAILS, m_bShowDetails ); - m_aTabCtrl.SetCurPageId( static_cast< USHORT >( nPageId ) ); + m_aTabCtrl.SetCurPageId( static_cast< sal_uInt16 >( nPageId ) ); ActivatePageHdl( &m_aTabCtrl ); // get our frame @@ -1636,7 +1636,7 @@ namespace svxform // ----------------------------------------------------------------------- IMPL_LINK( DataNavigatorWindow, ModelSelectHdl, ListBox *, pBox ) { - USHORT nPos = m_aModelsBox.GetSelectEntryPos(); + sal_uInt16 nPos = m_aModelsBox.GetSelectEntryPos(); // pBox == NULL, if you want to force a new fill. if ( nPos != m_nLastSelectedPos || !pBox ) { @@ -1653,7 +1653,7 @@ namespace svxform { bool bIsDocModified = false; Reference< css::xforms::XFormsUIHelper1 > xUIHelper; - USHORT nSelectedPos = m_aModelsBox.GetSelectEntryPos(); + sal_uInt16 nSelectedPos = m_aModelsBox.GetSelectEntryPos(); ::rtl::OUString sSelectedModel( m_aModelsBox.GetEntry( nSelectedPos ) ); Reference< css::xforms::XModel > xModel; try @@ -1709,7 +1709,7 @@ namespace svxform ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) ), makeAny( sal_Bool( !bDocumentData ) ) ); - USHORT nNewPos = m_aModelsBox.InsertEntry( sNewName ); + sal_uInt16 nNewPos = m_aModelsBox.InsertEntry( sNewName ); m_aModelsBox.SelectEntryPos( nNewPos ); ModelSelectHdl( &m_aModelsBox ); bIsDocModified = true; @@ -1826,7 +1826,7 @@ namespace svxform AddInstanceDialog aDlg( this, false ); if ( aDlg.Execute() == RET_OK ) { - USHORT nInst = GetNewPageId(); + sal_uInt16 nInst = GetNewPageId(); ::rtl::OUString sName = aDlg.GetName(); ::rtl::OUString sURL = aDlg.GetURL(); bool bLinkOnce = aDlg.IsLinkInstance(); @@ -1852,7 +1852,7 @@ namespace svxform } case MID_INSTANCES_EDIT : { - USHORT nId = 0; + sal_uInt16 nId = 0; XFormsPage* pPage = GetCurrentPage( nId ); if ( pPage ) { @@ -1889,7 +1889,7 @@ namespace svxform } case MID_INSTANCES_REMOVE : { - USHORT nId = 0; + sal_uInt16 nId = 0; XFormsPage* pPage = GetCurrentPage( nId ); if ( pPage ) { @@ -1989,7 +1989,7 @@ namespace svxform // ----------------------------------------------------------------------- IMPL_LINK( DataNavigatorWindow, ActivatePageHdl, TabControl *, EMPTYARG ) { - USHORT nId = 0; + sal_uInt16 nId = 0; XFormsPage* pPage = GetCurrentPage( nId ); if ( pPage ) { @@ -2007,7 +2007,7 @@ namespace svxform return 0; } // ----------------------------------------------------------------------- - XFormsPage* DataNavigatorWindow::GetCurrentPage( USHORT& rCurId ) + XFormsPage* DataNavigatorWindow::GetCurrentPage( sal_uInt16& rCurId ) { rCurId = m_aTabCtrl.GetCurPageId(); XFormsPage* pPage = NULL; @@ -2040,7 +2040,7 @@ namespace svxform if ( rCurId > TID_INSTANCE ) { - USHORT nPos = m_aTabCtrl.GetPagePos( rCurId ); + sal_uInt16 nPos = m_aTabCtrl.GetPagePos( rCurId ); if ( HasFirstInstancePage() && nPos > 0 ) nPos--; if ( m_aPageList.size() > nPos ) @@ -2121,8 +2121,8 @@ namespace svxform Reference< css::xforms::XModel > xFormsModel; if ( aAny >>= xFormsModel ) { - USHORT nPagePos = TAB_PAGE_NOTFOUND; - USHORT nId = 0; + sal_uInt16 nPagePos = TAB_PAGE_NOTFOUND; + sal_uInt16 nId = 0; XFormsPage* pPage = GetCurrentPage( nId ); DBG_ASSERT( pPage, "DataNavigatorWindow::SetPageModel(): no page" ); if ( nId >= TID_INSTANCE ) @@ -2235,7 +2235,7 @@ namespace svxform } } - USHORT nPageId = GetNewPageId(); + sal_uInt16 nPageId = GetNewPageId(); if ( sInstName.getLength() == 0 ) { DBG_ERRORFILE( "DataNavigatorWindow::CreateInstancePage(): instance without name" ); @@ -2253,9 +2253,9 @@ namespace svxform } //------------------------------------------------------------------------ - USHORT DataNavigatorWindow::GetNewPageId() const + sal_uInt16 DataNavigatorWindow::GetNewPageId() const { - USHORT i, nMax = 0, nCount = m_aTabCtrl.GetPageCount(); + sal_uInt16 i, nMax = 0, nCount = m_aTabCtrl.GetPageCount(); for ( i = 0; i < nCount; ++i ) { if ( nMax < m_aTabCtrl.GetPageId(i) ) @@ -2591,7 +2591,7 @@ namespace svxform sPropName = PN_READONLY_EXPR; else if ( &m_aCalculateCB == pBox ) sPropName = PN_CALCULATE_EXPR; - bool bIsChecked = ( pBox->IsChecked() != FALSE ); + bool bIsChecked = ( pBox->IsChecked() != sal_False ); m_xTempBinding->getPropertyValue( sPropName ) >>= sTemp; if ( bIsChecked && sTemp.getLength() == 0 ) sTemp = TRUE_VALUE; @@ -2883,19 +2883,19 @@ namespace svxform { if ( ( m_xTempBinding->getPropertyValue( PN_REQUIRED_EXPR ) >>= sTemp ) && sTemp.getLength() > 0 ) - m_aRequiredCB.Check( TRUE ); + m_aRequiredCB.Check( sal_True ); if ( ( m_xTempBinding->getPropertyValue( PN_RELEVANT_EXPR ) >>= sTemp ) && sTemp.getLength() > 0 ) - m_aRelevantCB.Check( TRUE ); + m_aRelevantCB.Check( sal_True ); if ( ( m_xTempBinding->getPropertyValue( PN_CONSTRAINT_EXPR ) >>= sTemp ) && sTemp.getLength() > 0 ) - m_aConstraintCB.Check( TRUE ); + m_aConstraintCB.Check( sal_True ); if ( ( m_xTempBinding->getPropertyValue( PN_READONLY_EXPR ) >>= sTemp ) && sTemp.getLength() > 0 ) - m_aReadonlyCB.Check( TRUE ); + m_aReadonlyCB.Check( sal_True ); if ( ( m_xTempBinding->getPropertyValue( PN_CALCULATE_EXPR ) >>= sTemp ) && sTemp.getLength() > 0 ) - m_aCalculateCB.Check( TRUE ); + m_aCalculateCB.Check( sal_True ); } catch ( Exception& ) { @@ -2965,7 +2965,7 @@ namespace svxform rtl::OUString sTemp; if ( m_xTempBinding->getPropertyValue( PN_BINDING_TYPE ) >>= sTemp ) { - USHORT nPos = m_aDataTypeLB.GetEntryPos( String( sTemp ) ); + sal_uInt16 nPos = m_aDataTypeLB.GetEntryPos( String( sTemp ) ); if ( LISTBOX_ENTRY_NOTFOUND == nPos ) nPos = m_aDataTypeLB.InsertEntry( sTemp ); m_aDataTypeLB.SelectEntryPos( nPos ); @@ -3200,7 +3200,7 @@ namespace svxform //------------------------------------------------------------------------ IMPL_LINK( NamespaceItemDialog, SelectHdl, SvxSimpleTable *, EMPTYARG ) { - BOOL bEnable = ( m_aNamespacesList.FirstSelected() != NULL ); + sal_Bool bEnable = ( m_aNamespacesList.FirstSelected() != NULL ); m_aEditNamespaceBtn.Enable( bEnable ); m_aDeleteNamespaceBtn.Enable( bEnable ); @@ -3589,7 +3589,7 @@ namespace svxform m_xSubmission->getPropertyValue( PN_SUBMISSION_METHOD ) >>= sTemp; sTemp = lcl_MethodString::get().toUI( sTemp ); - USHORT nPos = m_aMethodLB.GetEntryPos( String( sTemp ) ); + sal_uInt16 nPos = m_aMethodLB.GetEntryPos( String( sTemp ) ); if ( LISTBOX_ENTRY_NOTFOUND == nPos ) nPos = m_aMethodLB.InsertEntry( sTemp ); m_aMethodLB.SelectEntryPos( nPos ); diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src index 904d2fefb9..1040d3af19 100644..100755 --- a/svx/source/form/datanavi.src +++ b/svx/source/form/datanavi.src @@ -27,13 +27,14 @@ #include "datanavi.hrc" #include "globlmn.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmhelp.hrc" #define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; TabPage RID_SVX_XFORMS_TABPAGES { + HelpID = "svx:TabPage:RID_SVX_XFORMS_TABPAGES"; Hide = TRUE ; DialogControl = TRUE; Size = MAP_APPFONT ( 63 , 100 ) ; @@ -336,6 +337,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; Edit ED_NAME { + HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_NAME"; Pos = MAP_APPFONT ( 78 , 14 ) ; Size = MAP_APPFONT ( 96 , 12 ) ; Border = TRUE ; @@ -349,12 +351,14 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; Edit ED_DEFAULT { + HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_DEFAULT"; Pos = MAP_APPFONT ( 78 , 29 ) ; Size = MAP_APPFONT ( 96 , 12 ) ; Border = TRUE ; }; PushButton PB_DEFAULT { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_DEFAULT"; Pos = MAP_APPFONT ( 160 , 29 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; @@ -376,6 +380,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; ListBox LB_DATATYPE { + HelpID = "svx:ListBox:RID_SVXDLG_ADD_DATAITEM:LB_DATATYPE"; Pos = MAP_APPFONT ( 78 , 55 ) ; Size = MAP_APPFONT ( 96 , 45 ) ; Border = TRUE ; @@ -383,6 +388,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_REQUIRED { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_REQUIRED"; Pos = MAP_APPFONT ( 6 , 72 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -390,6 +396,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_REQUIRED { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_REQUIRED"; Pos = MAP_APPFONT ( 78 , 70 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -397,6 +404,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_RELEVANT { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_RELEVANT"; Pos = MAP_APPFONT ( 6 , 89 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -404,6 +412,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_RELEVANT { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_RELEVANT"; Pos = MAP_APPFONT ( 78 , 87 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -411,6 +420,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_CONSTRAINT { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CONSTRAINT"; Pos = MAP_APPFONT ( 6 , 106 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -418,6 +428,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_CONSTRAINT { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CONSTRAINT"; Pos = MAP_APPFONT ( 78 , 104 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -425,6 +436,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_READONLY { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_READONLY"; Pos = MAP_APPFONT ( 6 , 123 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -432,6 +444,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_READONLY { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_READONLY"; Pos = MAP_APPFONT ( 78 , 121 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -439,6 +452,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_CALCULATE { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CALCULATE"; Pos = MAP_APPFONT ( 6 , 140 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -446,6 +460,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_CALCULATE { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CALCULATE"; Pos = MAP_APPFONT ( 78 , 138 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -562,6 +577,7 @@ ModalDialog RID_SVXDLG_ADD_CONDITION }; MultiLineEdit ED_CONDITION { + HelpID = "svx:MultiLineEdit:RID_SVXDLG_ADD_CONDITION:ED_CONDITION"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 198 , 34 ) ; @@ -587,6 +603,7 @@ ModalDialog RID_SVXDLG_ADD_CONDITION }; PushButton PB_EDIT_NAMESPACES { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_CONDITION:PB_EDIT_NAMESPACES"; Pos = MAP_APPFONT ( 132 , 102 ) ; Size = MAP_APPFONT ( 72 , 14 ) ; TabStop = TRUE ; @@ -643,6 +660,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM }; PushButton PB_ADD_NAMESPACE { + HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_ADD_NAMESPACE"; Pos = MAP_APPFONT ( 184 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -650,6 +668,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM }; PushButton PB_EDIT_NAMESPACE { + HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_EDIT_NAMESPACE"; Pos = MAP_APPFONT ( 184 , 31 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -657,6 +676,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM }; PushButton PB_DELETE_NAMESPACE { + HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_DELETE_NAMESPACE"; Pos = MAP_APPFONT ( 184 , 48 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -713,6 +733,7 @@ ModalDialog RID_SVXDLG_MANAGE_NAMESPACE }; Edit ED_PREFIX { + HelpID = "svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_PREFIX"; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; Border = TRUE; @@ -726,6 +747,7 @@ ModalDialog RID_SVXDLG_MANAGE_NAMESPACE }; Edit ED_URL { + HelpID = "svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_URL"; Pos = MAP_APPFONT ( 54 , 14 ) ; Size = MAP_APPFONT ( 150 , 12 ) ; Border = TRUE; @@ -783,6 +805,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; Edit ED_SUBMIT_NAME { + HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_NAME"; Pos = MAP_APPFONT ( 78 , 14 ) ; Size = MAP_APPFONT ( 96 , 12 ) ; Border = TRUE ; @@ -796,6 +819,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; Edit ED_SUBMIT_ACTION { + HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_ACTION"; Pos = MAP_APPFONT ( 78 , 29 ) ; Size = MAP_APPFONT ( 96 , 12 ) ; Border = TRUE ; @@ -809,6 +833,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; ListBox LB_SUBMIT_METHOD { + HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_METHOD"; Pos = MAP_APPFONT ( 78 , 44 ) ; Size = MAP_APPFONT ( 96 , 51 ) ; Border = TRUE ; @@ -823,12 +848,14 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; Edit ED_SUBMIT_REF { + HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_REF"; Pos = MAP_APPFONT ( 78 , 60 ) ; Size = MAP_APPFONT ( 79, 12 ) ; Border = TRUE ; }; PushButton PB_SUBMIT_REF { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_SUBMISSION:PB_SUBMIT_REF"; Pos = MAP_APPFONT ( 159 , 59 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; @@ -843,6 +870,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; ListBox LB_SUBMIT_BIND { + HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_BIND"; Pos = MAP_APPFONT ( 78 , 75 ) ; Size = MAP_APPFONT ( 96 , 51 ) ; Border = TRUE ; @@ -857,6 +885,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; ListBox LB_SUBMIT_REPLACE { + HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_REPLACE"; Pos = MAP_APPFONT ( 78 , 90 ) ; Size = MAP_APPFONT ( 96 , 51 ) ; Border = TRUE ; @@ -937,12 +966,14 @@ ModalDialog RID_SVXDLG_ADD_MODEL }; Edit ED_INST_NAME { + HelpID = "svx:Edit:RID_SVXDLG_ADD_MODEL:ED_INST_NAME"; Pos = MAP_APPFONT ( 60 , 14 ) ; Size = MAP_APPFONT ( 114 , 12 ) ; Border = TRUE ; }; CheckBox CB_MODIFIES_DOCUMENT { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_MODEL:CB_MODIFIES_DOCUMENT"; Pos = MAP_APPFONT( 6, 32 ); Size = MAP_APPFONT( 168, 16 ); Top = TRUE; @@ -1003,6 +1034,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE }; Edit ED_INST_NAME { + HelpID = "svx:Edit:RID_SVXDLG_ADD_INSTANCE:ED_INST_NAME"; Pos = MAP_APPFONT ( 60 , 14 ) ; Size = MAP_APPFONT ( 144 , 12 ) ; Border = TRUE ; @@ -1016,6 +1048,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE }; ComboBox ED_INST_URL { + HelpID = "svx:ComboBox:RID_SVXDLG_ADD_INSTANCE:ED_INST_URL"; Pos = MAP_APPFONT ( 60 , 29 ) ; Size = MAP_APPFONT ( 127 , 48 ) ; DropDown = TRUE ; @@ -1023,6 +1056,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE }; PushButton PB_FILEPICKER { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_INSTANCE:PB_FILEPICKER"; Pos = MAP_APPFONT ( 190 , 28 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; @@ -1030,6 +1064,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE }; CheckBox CB_INST_LINKINST { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_INSTANCE:CB_INST_LINKINST"; Pos = MAP_APPFONT ( 6 , 44 ) ; Size = MAP_APPFONT ( 198 , 10 ) ; TabStop = TRUE ; diff --git a/svx/source/form/dbcharsethelper.cxx b/svx/source/form/dbcharsethelper.cxx index 3e9b4ff8a5..3e9b4ff8a5 100644..100755 --- a/svx/source/form/dbcharsethelper.cxx +++ b/svx/source/form/dbcharsethelper.cxx diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx index f97f0b230b..5693b175f9 100644..100755 --- a/svx/source/form/dbtoolsclient.cxx +++ b/svx/source/form/dbtoolsclient.cxx @@ -62,7 +62,7 @@ namespace svxform //-------------------------------------------------------------------- ODbtoolsClient::ODbtoolsClient() { - m_bCreateAlready = FALSE; + m_bCreateAlready = sal_False; } //-------------------------------------------------------------------- diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx index 95a08c1589..95a08c1589 100644..100755 --- a/svx/source/form/delayedevent.cxx +++ b/svx/source/form/delayedevent.cxx diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 1a26bc42b1..36f569aa1d 100644..100755 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -35,7 +35,7 @@ #include "fmhelp.hrc" #include "fmitems.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" /** === begin UNO includes === **/ #include <com/sun/star/awt/XControlModel.hpp> @@ -1216,7 +1216,7 @@ void FmFilterNavigator::UpdateContent(const Reference< XIndexAccess > & xControl if (pEntry) { if (!IsExpanded(pEntry)) - Expand(pEntry); + Expand(pEntry); Select(pEntry, sal_True); } } @@ -1250,7 +1250,7 @@ sal_Bool FmFilterNavigator::EditedEntry( SvLBoxEntry* pEntry, const XubString& r if (aText.Len() == 0) { // deleting the entry asynchron - ULONG nEvent; + sal_uLong nEvent; PostUserEvent(nEvent, LINK(this, FmFilterNavigator, OnRemove), pEntry); } else @@ -1454,7 +1454,7 @@ sal_Int8 FmFilterNavigator::ExecuteDrop( const ExecuteDropEvent& rEvt ) SetCurEntry(pEntry); insertFilterItem(m_aControlExchange->getDraggedEntries(),pTargetItems,DND_ACTION_COPY == rEvt.mnAction); - + return sal_True; } @@ -1899,7 +1899,7 @@ void FmFilterNavigator::DeleteSelection() } // Remove the selection - SelectAll(FALSE); + SelectAll(sal_False); for (::std::vector<SvLBoxEntry*>::reverse_iterator i = aEntryList.rbegin(); // link problems with operator == diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src index 36c12a001e..dc4e64388b 100644..100755 --- a/svx/source/form/filtnav.src +++ b/svx/source/form/filtnav.src @@ -26,7 +26,9 @@ ************************************************************************/ #include <svx/svxids.hrc> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" +#include "fmhelp.hrc" + Menu RID_FM_FILTER_MENU { ItemList = @@ -34,54 +36,27 @@ Menu RID_FM_FILTER_MENU MenuItem { Identifier = SID_FM_DELETE ; - HelpID = SID_FM_DELETE ; + HelpId = HID_FM_DELETE; Text [ en-US ] = "~Delete" ; }; MenuItem { Identifier = SID_FM_FILTER_EDIT ; - HelpID = SID_FM_FILTER_EDIT ; + HelpId = HID_FM_FILTER_EDIT; Text [ en-US ] = "~Edit" ; }; MenuItem { Identifier = SID_FM_FILTER_IS_NULL ; - HelpID = SID_FM_FILTER_IS_NULL ; + HelpId = HID_FM_FILTER_IS_NULL; Text [ en-US ] = "~Is Null" ; }; MenuItem { Identifier = SID_FM_FILTER_IS_NOT_NULL ; - HelpID = SID_FM_FILTER_IS_NOT_NULL ; + HelpId = HID_FM_FILTER_IS_NOT_NULL; Text [ en-US ] = "I~s not Null" ; }; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 7538158a16..16b860402d 100644..100755 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -34,7 +34,7 @@ #include "fmhelp.hrc" #include "fmprop.hrc" #include "fmPropBrw.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "fmpgeimp.hxx" diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx index fbbd9eb15c..fbbd9eb15c 100644..100755 --- a/svx/source/form/fmcontrolbordermanager.cxx +++ b/svx/source/form/fmcontrolbordermanager.cxx diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 3a34a5684e..3a34a5684e 100644..100755 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx index 70aaa82878..70aaa82878 100644..100755 --- a/svx/source/form/fmdmod.cxx +++ b/svx/source/form/fmdmod.cxx diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx index dfea91e47a..dfea91e47a 100644..100755 --- a/svx/source/form/fmdocumentclassification.cxx +++ b/svx/source/form/fmdocumentclassification.cxx diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx index 899d292381..899d292381 100644..100755 --- a/svx/source/form/fmdpage.cxx +++ b/svx/source/form/fmdpage.cxx diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 013cd2d3eb..eb882db2dc 100644..100755 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -33,7 +33,7 @@ #include <sot/storage.hxx> #include <svl/itempool.hxx> -#include <dbexch.hrc> +#include <svx/dbexch.hrc> #include <sot/formats.hxx> #include <svtools/svtreebx.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index 6505bc9628..15f2d6d710 100644..100755 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmexpl.hrc" #include "fmexpl.hxx" @@ -45,7 +45,7 @@ #include "fmprop.hrc" #include <svx/dialmgr.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdouno.hxx> #include <fmundo.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src index fb7ea13d99..f4d56d3240 100644..100755 --- a/svx/source/form/fmexpl.src +++ b/svx/source/form/fmexpl.src @@ -26,9 +26,12 @@ ************************************************************************/ #include <svx/svxids.hrc> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmexpl.hrc" #include "globlmn.hrc" +#include <svx/svxcommands.h> +#include "fmhelp.hrc" + Menu RID_FMEXPLORER_POPUPMENU { ItemList = @@ -36,7 +39,7 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_NEW ; - HelpID = SID_FM_NEW ; + HelpId = HID_FM_NEW ; Text [ en-US ] = "~New" ; SubMenu = Menu { @@ -45,13 +48,13 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_NEW_FORM ; - HelpID = SID_FM_NEW_FORM ; + HelpId = HID_FM_NEW_FORM ; Text [ en-US ] = "Form" ; }; MenuItem { Identifier = SID_FM_NEW_HIDDEN ; - HelpID = SID_FM_NEW_HIDDEN ; + HelpId = HID_FM_NEW_HIDDEN ; Text [ en-US ] = "Hidden Control" ; }; }; @@ -60,7 +63,7 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_CHANGECONTROLTYPE ; - HelpID = SID_FM_CHANGECONTROLTYPE ; + HelpId = CMD_SID_FM_CHANGECONTROLTYPE ; Text [ en-US ] = "Replace with"; }; MenuItem { ITEM_EDIT_CUT }; @@ -69,37 +72,37 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_DELETE ; - HelpID = SID_FM_DELETE ; + HelpId = HID_FM_DELETE ; Text [ en-US ] = "~Delete" ; }; MenuItem { Identifier = SID_FM_TAB_DIALOG ; - HelpID = SID_FM_TAB_DIALOG ; + HelpId = CMD_SID_FM_TAB_DIALOG ; Text [ en-US ] = "Tab Order..." ; }; MenuItem { Identifier = SID_FM_RENAME_OBJECT ; - HelpID = SID_FM_RENAME_OBJECT ; + HelpId = HID_FM_RENAME_OBJECT ; Text [ en-US ] = "~Rename" ; }; MenuItem { Identifier = SID_FM_SHOW_PROPERTY_BROWSER ; - HelpID = SID_FM_SHOW_PROPERTY_BROWSER ; + HelpId = CMD_SID_FM_SHOW_PROPERTY_BROWSER ; Text [ en-US ] = "Propert~ies" ; }; MenuItem { Identifier = SID_FM_OPEN_READONLY ; - HelpID = SID_FM_OPEN_READONLY ; + HelpId = CMD_SID_FM_OPEN_READONLY ; Text [ en-US ] = "Open in Design Mode" ; }; MenuItem { Identifier = SID_FM_AUTOCONTROLFOCUS ; - HelpID = SID_FM_AUTOCONTROLFOCUS ; + HelpId = CMD_SID_FM_AUTOCONTROLFOCUS ; Text [ en-US ] = "Automatic Control Focus"; }; }; @@ -112,140 +115,140 @@ Menu RID_FMSHELL_CONVERSIONMENU MenuItem { Identifier = SID_FM_CONVERTTO_EDIT ; - HelpID = SID_FM_CONVERTTO_EDIT ; + HelpId = CMD_SID_FM_CONVERTTO_EDIT ; Command = ".uno:ConvertToEdit" ; Text [ en-US ] = "~Text Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_BUTTON ; - HelpID = SID_FM_CONVERTTO_BUTTON ; + HelpId = CMD_SID_FM_CONVERTTO_BUTTON ; Command = ".uno:ConvertToButton" ; Text [ en-US ] = "~Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_FIXEDTEXT ; - HelpID = SID_FM_CONVERTTO_FIXEDTEXT ; + HelpId = CMD_SID_FM_CONVERTTO_FIXEDTEXT ; Command = ".uno:ConvertToFixed" ; Text [ en-US ] = "La~bel field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_GROUPBOX ; - HelpID = SID_FM_CONVERTTO_GROUPBOX ; + HelpId = CMD_SID_FM_CONVERTTO_GROUPBOX ; Command = ".uno:ConvertToGroup" ; Text [ en-US ] = "G~roup Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_LISTBOX ; - HelpID = SID_FM_CONVERTTO_LISTBOX ; + HelpId = CMD_SID_FM_CONVERTTO_LISTBOX ; Command = ".uno:ConvertToList" ; Text [ en-US ] = "L~ist Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_CHECKBOX ; - HelpID = SID_FM_CONVERTTO_CHECKBOX ; + HelpId = CMD_SID_FM_CONVERTTO_CHECKBOX ; Command = ".uno:ConvertToCheckBox" ; Text [ en-US ] = "~Check Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_RADIOBUTTON ; - HelpID = SID_FM_CONVERTTO_RADIOBUTTON ; + HelpId = CMD_SID_FM_CONVERTTO_RADIOBUTTON ; Command = ".uno:ConvertToRadio" ; Text [ en-US ] = "~Radio Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_COMBOBOX ; - HelpID = SID_FM_CONVERTTO_COMBOBOX ; + HelpId = CMD_SID_FM_CONVERTTO_COMBOBOX ; Command = ".uno:ConvertToCombo" ; Text [ en-US ] = "Combo Bo~x"; }; MenuItem { Identifier = SID_FM_CONVERTTO_IMAGEBUTTON ; - HelpID = SID_FM_CONVERTTO_IMAGEBUTTON ; + HelpId = CMD_SID_FM_CONVERTTO_IMAGEBUTTON ; Command = ".uno:ConvertToImageBtn" ; Text [ en-US ] = "I~mage Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_FILECONTROL ; - HelpID = SID_FM_CONVERTTO_FILECONTROL ; + HelpId = CMD_SID_FM_CONVERTTO_FILECONTROL ; Command = ".uno:ConvertToFileControl" ; Text [ en-US ] = "~File Selection"; }; MenuItem { Identifier = SID_FM_CONVERTTO_DATE ; - HelpID = SID_FM_CONVERTTO_DATE ; + HelpId = CMD_SID_FM_CONVERTTO_DATE ; Command = ".uno:ConvertToDate" ; Text [ en-US ] = "~Date Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_TIME ; - HelpID = SID_FM_CONVERTTO_TIME ; + HelpId = CMD_SID_FM_CONVERTTO_TIME ; Command = ".uno:ConvertToTime" ; Text [ en-US ] = "Tim~e Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_NUMERIC ; - HelpID = SID_FM_CONVERTTO_NUMERIC ; + HelpId = CMD_SID_FM_CONVERTTO_NUMERIC ; Command = ".uno:ConvertToNumeric" ; Text [ en-US ] = "~Numerical Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_CURRENCY ; - HelpID = SID_FM_CONVERTTO_CURRENCY ; + HelpId = CMD_SID_FM_CONVERTTO_CURRENCY ; Command = ".uno:ConvertToCurrency" ; Text [ en-US ] = "C~urrency Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_PATTERN ; - HelpID = SID_FM_CONVERTTO_PATTERN ; + HelpId = CMD_SID_FM_CONVERTTO_PATTERN ; Command = ".uno:ConvertToPattern" ; Text [ en-US ] = "~Pattern Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_IMAGECONTROL ; - HelpID = SID_FM_CONVERTTO_IMAGECONTROL ; + HelpId = CMD_SID_FM_CONVERTTO_IMAGECONTROL ; Command = ".uno:ConvertToImageControl" ; Text [ en-US ] = "Ima~ge Control"; }; MenuItem { Identifier = SID_FM_CONVERTTO_FORMATTED ; - HelpID = SID_FM_CONVERTTO_FORMATTED ; + HelpId = CMD_SID_FM_CONVERTTO_FORMATTED ; Command = ".uno:ConvertToFormatted" ; Text [ en-US ] = "Fo~rmatted Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_SCROLLBAR ; - HelpID = SID_FM_CONVERTTO_SCROLLBAR ; + HelpId = CMD_SID_FM_CONVERTTO_SCROLLBAR ; Command = ".uno:ConvertToScrollBar" ; Text [ en-US ] = "Scroll bar"; }; MenuItem { Identifier = SID_FM_CONVERTTO_SPINBUTTON; - HelpID = SID_FM_CONVERTTO_SPINBUTTON; + HelpId = CMD_SID_FM_CONVERTTO_SPINBUTTON; Command = ".uno:ConvertToSpinButton" ; Text [ en-US ] = "Spin Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_NAVIGATIONBAR; - HelpID = SID_FM_CONVERTTO_NAVIGATIONBAR; + HelpId = CMD_SID_FM_CONVERTTO_NAVIGATIONBAR; Command = ".uno:ConvertToNavigationBar" ; Text [ en-US ] = "Navigation Bar" ; }; @@ -297,6 +300,7 @@ ImageList RID_SVXIMGLIST_FMEXPL ModalDialog RID_SVXDLG_SETFORM { + HelpID = "svx:ModalDialog:RID_SVXDLG_SETFORM"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 200 ) ; @@ -335,6 +339,7 @@ ModalDialog RID_SVXDLG_SETFORM }; DockingWindow RID_SVX_FMEXPLORER { + HelpID = "svx:DockingWindow:RID_SVX_FMEXPLORER"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 200 ) ; diff --git a/svx/source/form/fmitems.cxx b/svx/source/form/fmitems.cxx index 30b2aa01c2..30b2aa01c2 100644..100755 --- a/svx/source/form/fmitems.cxx +++ b/svx/source/form/fmitems.cxx diff --git a/svx/source/form/fmmodel.cxx b/svx/source/form/fmmodel.cxx index d13accf46d..eb86d2928a 100644..100755 --- a/svx/source/form/fmmodel.cxx +++ b/svx/source/form/fmmodel.cxx @@ -184,7 +184,7 @@ void FmFormModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos) |* MovePage |* \************************************************************************/ -void FmFormModel::MovePage( USHORT nPgNum, USHORT nNewPos ) +void FmFormModel::MovePage( sal_uInt16 nPgNum, sal_uInt16 nNewPos ) { m_pImpl->bMovingPage = sal_True; // see InsertPage for this diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index e888bd2fce..de51c8b8e8 100644..100755 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -32,7 +32,7 @@ #include "fmprop.hrc" #include "fmvwimp.hxx" #include "fmpgeimp.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "svx/fmview.hxx" #include "svx/fmglob.hxx" #include "svx/fmpage.hxx" diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index badd945017..2a1d3394a5 100644..100755 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -33,7 +33,7 @@ #include "svx/fmtools.hxx" #include "fmservs.hxx" -#include "fmobjfac.hxx" +#include "svx/fmobjfac.hxx" #include <svx/fmglob.hxx> @@ -46,7 +46,7 @@ #include "tbxform.hxx" #include <tools/resid.hxx> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <tools/shl.hxx> #include <svx/dialmgr.hxx> #include "fmservs.hxx" @@ -62,7 +62,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::svxform; -static BOOL bInit = FALSE; +static sal_Bool bInit = sal_False; /************************************************************************* |* @@ -98,7 +98,7 @@ FmFormObjFactory::FmFormObjFactory() FmFormShell::RegisterInterface(0); ImplSmartRegisterUnoServices(); - bInit = TRUE; + bInit = sal_True; } } diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 882fc430e3..ab15da6df8 100644..100755 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -40,14 +40,14 @@ #include "fmobj.hxx" -#include "fmresids.hrc" +#include <svx/fmresids.hrc> #include <tools/shl.hxx> #include <svx/dialmgr.hxx> #include "fmpgeimp.hxx" #include <sfx2/objsh.hxx> -#include "svditer.hxx" +#include <svx/svditer.hxx> #include <svx/svdview.hxx> #include <tools/urlobj.hxx> #include <vcl/help.hxx> @@ -141,7 +141,7 @@ SdrPage* FmFormPage::Clone() const } //------------------------------------------------------------------ -void FmFormPage::InsertObject(SdrObject* pObj, ULONG nPos, +void FmFormPage::InsertObject(SdrObject* pObj, sal_uLong nPos, const SdrInsertReason* pReason) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::InsertObject" ); @@ -231,7 +231,7 @@ sal_Bool FmFormPage::RequestHelp( Window* pWindow, SdrView* pView, } //------------------------------------------------------------------ -SdrObject* FmFormPage::RemoveObject(ULONG nObjNum) +SdrObject* FmFormPage::RemoveObject(sal_uLong nObjNum) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPage::RemoveObject" ); SdrObject* pObj = SdrPage::RemoveObject(nObjNum); diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index da10512862..c8935b1271 100644..100755 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svxerr.hxx" +#include "svx/svxerr.hxx" #include "fmpgeimp.hxx" #include "fmundo.hxx" #include "svx/fmtools.hxx" @@ -37,8 +37,8 @@ #include "fmservs.hxx" #include "fmobj.hxx" #include "formcontrolfactory.hxx" -#include "svditer.hxx" -#include "fmresids.hrc" +#include "svx/svditer.hxx" +#include "svx/fmresids.hrc" #include "svx/dbtoolsclient.hxx" #include "treevisitor.hxx" diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index e39a17813b..3bc83a42fc 100644..100755 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "fmscriptingenv.hxx" -#include <svx/fmmodel.hxx> +#include "svx/fmmodel.hxx" /** === begin UNO includes === **/ #include <com/sun/star/lang/IllegalArgumentException.hpp> @@ -40,6 +40,7 @@ #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/awt/XControl.hpp> /** === end UNO includes === **/ + #include <tools/diagnose_ex.h> #include <cppuhelper/implbase1.hxx> #include <comphelper/implementationreference.hxx> @@ -48,6 +49,8 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <sfx2/objsh.hxx> +#include <sfx2/app.hxx> +#include <basic/basmgr.hxx> #include <boost/shared_ptr.hpp> @@ -432,60 +435,6 @@ namespace svxform } m_rObjectShell.CallXScript( m_sScriptCode, _rArguments, _rSynchronousResult, aOutArgsIndex, aOutArgs, true, aCaller.hasValue() ? &aCaller : 0 ); } - - //................................................................ - //. QualifiedBasicScript - //................................................................ - class QualifiedBasicScript : public IScript - { - SfxObjectShell& m_rObjectShell; - const ::rtl::OUString m_sMacroLocation; - const ::rtl::OUString m_sScriptCode; - - public: - QualifiedBasicScript( SfxObjectShell& _rObjectShell, const ::rtl::OUString& _rLocation, const ::rtl::OUString& _rScriptCode ) - :m_rObjectShell( _rObjectShell ) - ,m_sMacroLocation( _rLocation ) - ,m_sScriptCode( _rScriptCode ) - { - } - - // IScript - virtual void invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult ); - }; - - //................................................................ - void QualifiedBasicScript::invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult ) - { - m_rObjectShell.CallStarBasicScript( m_sScriptCode, m_sMacroLocation, - &_rArguments, &_rSynchronousResult ); - } - - //................................................................ - //. UnqualifiedBasicScript - //................................................................ - class UnqualifiedBasicScript : public IScript - { - SfxObjectShell& m_rObjectShell; - const ::rtl::OUString m_sScriptCode; - - public: - UnqualifiedBasicScript( SfxObjectShell& _rObjectShell, const ::rtl::OUString& _rScriptCode ) - :m_rObjectShell( _rObjectShell ) - ,m_sScriptCode( _rScriptCode ) - { - } - - // IScript - virtual void invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult ); - }; - - //................................................................ - void UnqualifiedBasicScript::invoke( const Sequence< Any >& _rArguments, Any& _rSynchronousResult ) - { - m_rObjectShell.CallScript( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StarBasic" ) ), m_sScriptCode, - &_rArguments, &_rSynchronousResult ); - } } //-------------------------------------------------------------------- @@ -497,6 +446,7 @@ namespace svxform if ( m_bDisposed ) return; + // SfxObjectShellRef is good here since the model controls the lifetime of the object SfxObjectShellRef xObjectShell = m_rFormModel.GetObjectShell(); if( !xObjectShell.Is() ) return; @@ -529,14 +479,24 @@ namespace svxform sScriptCode = sScriptCode.copy( nPrefixLen + 1 ); } - if ( sMacroLocation.getLength() ) - { // we have a StarBasic macro with fully-qualified macro location - pScript.reset( new QualifiedBasicScript( *xObjectShell, sMacroLocation, sScriptCode ) ); - } - else - { // we have a StarBasic macro without qualified location - let the object shell gues .... - pScript.reset( new UnqualifiedBasicScript( *xObjectShell, sScriptCode ) ); + if ( !sMacroLocation.getLength() ) + { + // legacy format: use the app-wide Basic, if it has a respective method, otherwise fall back to the doc's Basic + if ( SFX_APP()->GetBasicManager()->HasMacro( sScriptCode ) ) + sMacroLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application" ) ); + else + sMacroLocation = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "document" ) ); } + + ::rtl::OUStringBuffer aScriptURI; + aScriptURI.appendAscii( "vnd.sun.star.script:" ); + aScriptURI.append( sScriptCode ); + aScriptURI.appendAscii( "?language=Basic" ); + aScriptURI.appendAscii( "&location=" ); + aScriptURI.append( sMacroLocation ); + + const ::rtl::OUString sScriptURI( aScriptURI.makeStringAndClear() ); + pScript.reset( new NewStyleUNOScript( *xObjectShell, sScriptURI ) ); } OSL_ENSURE( pScript.get(), "FormScriptingEnvironment::doFireScriptEvent: no script to execute!" ); diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx index 8e578f5ec0..8e578f5ec0 100644..100755 --- a/svx/source/form/fmservs.cxx +++ b/svx/source/form/fmservs.cxx diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index df13da233e..5bfc8fcd2e 100644..100755 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -61,12 +61,12 @@ #include <sfx2/objsh.hxx> #include <svx/svdobj.hxx> #include <svx/fmpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "fmobj.hxx" #include <svx/svxids.hrc> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmexch.hxx" #include <svx/fmglob.hxx> #include <svl/eitem.hxx> @@ -258,7 +258,7 @@ void FmFormShell::NotifyMarkListChanged(FmFormView* pWhichView) } //------------------------------------------------------------------------ -sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing) +sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool /*bForBrowsing*/) { if ( GetImpl()->didPrepareClose() ) // we already did a PrepareClose for the current modifications of the current form @@ -289,10 +289,6 @@ sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing) if ( bModified && bUI ) { QueryBox aQry(NULL, SVX_RES(RID_QRY_SAVEMODIFIED)); - if (bForBrowsing) - aQry.AddButton(SVX_RES(RID_STR_NEW_TASK), RET_NEWTASK, - BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_FOCUSBUTTON); - switch (aQry.Execute()) { case RET_NO: @@ -841,7 +837,7 @@ void FmFormShell::Execute(SfxRequest &rReq) rReq.Done(); // initially open the filter navigator, the whole form based filter is pretty useless without it - SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, TRUE ); + SfxBoolItem aIdentifierItem( SID_FM_FILTER_NAVIGATOR, sal_True ); GetViewShell()->GetViewFrame()->GetDispatcher()->Execute( SID_FM_FILTER_NAVIGATOR, SFX_CALLMODE_ASYNCHRON, &aIdentifierItem, NULL ); } break; @@ -1405,7 +1401,7 @@ namespace ::std::auto_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const { ::std::auto_ptr< ::svx::ISdrObjectFilter > pFilter; - + if ( !i_rView.IsDesignMode() ) pFilter.reset( new FocusableControlsFilter( i_rView, i_rDevice ) ); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index e94ae65d88..4598023b34 100644..100755 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -35,7 +35,7 @@ #include "fmpgeimp.hxx" #include "svx/fmtools.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "fmtextcontrolshell.hxx" @@ -44,7 +44,7 @@ #include "fmvwimp.hxx" #include "formtoolbars.hxx" #include "gridcols.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "svx/dialmgr.hxx" #include "svx/dialogs.hrc" #include "svx/fmglob.hxx" @@ -541,7 +541,6 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun //------------------------------------------------------------------------------ sal_Bool FmXBoundFormFieldIterator::ShouldStepInto(const Reference< XInterface>& _rContainer) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXBoundFormFieldIterator::ShouldStepInto" ); if (_rContainer == m_xStartingPoint) // would be quite stupid to step over the root .... return sal_True; @@ -552,7 +551,6 @@ sal_Bool FmXBoundFormFieldIterator::ShouldStepInto(const Reference< XInterface>& //------------------------------------------------------------------------------ sal_Bool FmXBoundFormFieldIterator::ShouldHandleElement(const Reference< XInterface>& _rElement) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXBoundFormFieldIterator::ShouldHandleElement" ); if (!_rElement.is()) // NULL element return sal_False; @@ -678,7 +676,6 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame ) ,m_bPreparedClose( sal_False ) ,m_bFirstActivation( sal_True ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::FmXFormShell" ); DBG_CTOR(FmXFormShell,NULL); m_aMarkTimer.SetTimeout(100); m_aMarkTimer.SetTimeoutHdl(LINK(this,FmXFormShell,OnTimeOut)); @@ -710,7 +707,6 @@ FmXFormShell::~FmXFormShell() //------------------------------------------------------------------ Reference< XModel > FmXFormShell::getContextDocument() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getContextDocument" ); Reference< XModel > xModel; // determine the type of document we live in @@ -732,14 +728,12 @@ Reference< XModel > FmXFormShell::getContextDocument() const //------------------------------------------------------------------ bool FmXFormShell::isEnhancedForm() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::isEnhancedForm" ); return getDocumentType() == eEnhancedForm; } //------------------------------------------------------------------ bool FmXFormShell::impl_checkDisposed() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_checkDisposed" ); if ( !m_pShell ) { OSL_FAIL( "FmXFormShell::impl_checkDisposed: already disposed!" ); @@ -751,7 +745,6 @@ bool FmXFormShell::impl_checkDisposed() const //------------------------------------------------------------------ ::svxform::DocumentType FmXFormShell::getDocumentType() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getDocumentType" ); if ( m_eDocumentType != eUnknownDocumentType ) return m_eDocumentType; @@ -772,7 +765,6 @@ bool FmXFormShell::impl_checkDisposed() const //------------------------------------------------------------------ bool FmXFormShell::IsReadonlyDoc() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsReadonlyDoc" ); if ( impl_checkDisposed() ) return true; @@ -785,19 +777,16 @@ bool FmXFormShell::IsReadonlyDoc() const //------------------------------------------------------------------ Any SAL_CALL FmXFormShell::queryInterface( const Type& type) throw ( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::queryInterface" ); return FmXFormShell_BASE::queryInterface(type); } //------------------------------------------------------------------------------ Sequence< Type > SAL_CALL FmXFormShell::getTypes( ) throw(RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getTypes" ); return FmXFormShell_BASE::getTypes(); } //------------------------------------------------------------------------------ Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getImplementationId" ); static ::cppu::OImplementationId* pId = 0; if (! pId) { @@ -814,7 +803,6 @@ Sequence< sal_Int8 > SAL_CALL FmXFormShell::getImplementationId() throw(RuntimeE //------------------------------------------------------------------------------ void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::disposing" ); impl_checkDisposed(); if (m_xActiveController == e.Source) @@ -854,7 +842,6 @@ void SAL_CALL FmXFormShell::disposing(const EventObject& e) throw( RuntimeExcept //------------------------------------------------------------------------------ void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::propertyChange" ); if ( impl_checkDisposed() ) return; @@ -891,7 +878,6 @@ void SAL_CALL FmXFormShell::propertyChange(const PropertyChangeEvent& evt) throw //------------------------------------------------------------------------------ void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatures ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::invalidateFeatures" ); if ( impl_checkDisposed() ) return; @@ -921,7 +907,6 @@ void FmXFormShell::invalidateFeatures( const ::std::vector< sal_Int32 >& _rFeatu //------------------------------------------------------------------------------ void SAL_CALL FmXFormShell::formActivated(const EventObject& rEvent) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::formActivated" ); if ( impl_checkDisposed() ) return; @@ -933,7 +918,6 @@ void SAL_CALL FmXFormShell::formActivated(const EventObject& rEvent) throw( Runt //------------------------------------------------------------------------------ void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::formDeactivated" ); if ( impl_checkDisposed() ) return; @@ -944,7 +928,6 @@ void SAL_CALL FmXFormShell::formDeactivated(const EventObject& rEvent) throw( Ru //------------------------------------------------------------------------------ void FmXFormShell::disposing() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::disposing" ); impl_checkDisposed(); FmXFormShell_BASE::disposing(); @@ -1021,7 +1004,6 @@ void FmXFormShell::disposing() //------------------------------------------------------------------------------ void FmXFormShell::UpdateSlot( sal_Int16 _nId ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::UpdateSlot" ); if ( impl_checkDisposed() ) return; @@ -1043,14 +1025,13 @@ void FmXFormShell::UpdateSlot( sal_Int16 _nId ) //------------------------------------------------------------------------------ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::InvalidateSlot" ); if ( impl_checkDisposed() ) return; ::osl::MutexGuard aGuard(m_aInvalidationSafety); if (m_nLockSlotInvalidation) { - BYTE nFlags = ( bWithId ? 0x01 : 0 ); + sal_uInt8 nFlags = ( bWithId ? 0x01 : 0 ); m_arrInvalidSlots.push_back( InvalidSlotInfo(nId, nFlags) ); } else @@ -1063,7 +1044,6 @@ void FmXFormShell::InvalidateSlot( sal_Int16 nId, sal_Bool bWithId ) //------------------------------------------------------------------------------ void FmXFormShell::LockSlotInvalidation(sal_Bool bLock) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::LockSlotInvalidation" ); if ( impl_checkDisposed() ) return; @@ -1103,7 +1083,6 @@ IMPL_LINK(FmXFormShell, OnInvalidateSlots, void*, EMPTYARG) //------------------------------------------------------------------------------ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ForceUpdateSelection" ); if ( impl_checkDisposed() ) return; @@ -1125,7 +1104,6 @@ void FmXFormShell::ForceUpdateSelection(sal_Bool bAllowInvalidation) //------------------------------------------------------------------------------ PopupMenu* FmXFormShell::GetConversionMenu() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetConversionMenu" ); PopupMenu* pNewMenu = new PopupMenu(SVX_RES( RID_FMSHELL_CONVERSIONMENU )); @@ -1142,7 +1120,6 @@ PopupMenu* FmXFormShell::GetConversionMenu() //------------------------------------------------------------------------------ bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::isControlConversionSlot" ); for ( size_t i = 0; i < SAL_N_ELEMENTS( nConvertSlots ); ++i ) if (nConvertSlots[i] == nSlotId) return true; @@ -1152,7 +1129,6 @@ bool FmXFormShell::isControlConversionSlot( sal_uInt16 nSlotId ) //------------------------------------------------------------------------------ bool FmXFormShell::executeControlConversionSlot( sal_uInt16 _nSlotId ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::executeControlConversionSlot" ); OSL_PRECOND( canConvertCurrentSelectionToControl( _nSlotId ), "FmXFormShell::executeControlConversionSlot: illegal call!" ); InterfaceBag::const_iterator aSelectedElement = m_aCurrentSelection.begin(); if ( aSelectedElement == m_aCurrentSelection.end() ) @@ -1164,7 +1140,6 @@ bool FmXFormShell::executeControlConversionSlot( sal_uInt16 _nSlotId ) //------------------------------------------------------------------------------ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent >& _rxObject, sal_uInt16 _nSlotId ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::executeControlConversionSlot" ); if ( impl_checkDisposed() ) return false; @@ -1371,7 +1346,6 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent //------------------------------------------------------------------------------ bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlot ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::canConvertCurrentSelectionToControl" ); if ( m_aCurrentSelection.empty() ) return false; @@ -1410,7 +1384,6 @@ bool FmXFormShell::canConvertCurrentSelectionToControl( sal_Int16 nConversionSlo //------------------------------------------------------------------------------ void FmXFormShell::checkControlConversionSlotsForCurrentSelection( Menu& rMenu ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::checkControlConversionSlotsForCurrentSelection" ); for (sal_Int16 i=0; i<rMenu.GetItemCount(); ++i) // der Context ist schon von einem Typ, der dem Eitnrag entspricht -> disable rMenu.EnableItem( rMenu.GetItemId(i), canConvertCurrentSelectionToControl( rMenu.GetItemId( i ) ) ); @@ -1419,7 +1392,6 @@ void FmXFormShell::checkControlConversionSlotsForCurrentSelection( Menu& rMenu ) //------------------------------------------------------------------------------ void FmXFormShell::LoopGrids(sal_Int16 nWhat) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::LoopGrids" ); if ( impl_checkDisposed() ) return; @@ -1489,7 +1461,6 @@ void FmXFormShell::LoopGrids(sal_Int16 nWhat) //------------------------------------------------------------------------------ Reference< XControlContainer > FmXFormShell::getControlContainerForView() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getControlContainerForView" ); if ( impl_checkDisposed() ) return NULL; @@ -1507,7 +1478,6 @@ Reference< XControlContainer > FmXFormShell::getControlContainerForView() //------------------------------------------------------------------------------ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel >& _rxForForm ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteTabOrderDialog" ); if ( impl_checkDisposed() ) return; @@ -1556,7 +1526,6 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel > //------------------------------------------------------------------------------ void FmXFormShell::ExecuteSearch() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteSearch" ); if ( impl_checkDisposed() ) return; @@ -1703,7 +1672,6 @@ void FmXFormShell::ExecuteSearch() //------------------------------------------------------------------------------ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetY2KState" ); if ( impl_checkDisposed() ) return sal_False; @@ -1743,7 +1711,6 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n) //------------------------------------------------------------------------------ void FmXFormShell::SetY2KState(sal_uInt16 n) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetY2KState" ); if ( impl_checkDisposed() ) return; @@ -1818,7 +1785,6 @@ void FmXFormShell::SetY2KState(sal_uInt16 n) //------------------------------------------------------------------------------ void FmXFormShell::CloseExternalFormViewer() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::CloseExternalFormViewer" ); if ( impl_checkDisposed() ) return; @@ -1840,7 +1806,6 @@ void FmXFormShell::CloseExternalFormViewer() //------------------------------------------------------------------------------ Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet>& _xForm) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getInternalForm" ); if ( impl_checkDisposed() ) return NULL; @@ -1856,7 +1821,6 @@ Reference< XResultSet> FmXFormShell::getInternalForm(const Reference< XResultSet //------------------------------------------------------------------------------ Reference< XForm> FmXFormShell::getInternalForm(const Reference< XForm>& _xForm) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getInternalForm" ); if ( impl_checkDisposed() ) return NULL; @@ -1885,7 +1849,6 @@ namespace //------------------------------------------------------------------------------ bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pCompleteState ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsFormSlotEnabled" ); const ::svx::ControllerFeatures& rController = lcl_isNavigationRelevant( _nSlot ) ? getNavControllerFeatures() @@ -1901,7 +1864,6 @@ bool FmXFormShell::IsFormSlotEnabled( sal_Int32 _nSlot, FeatureState* _pComplete //------------------------------------------------------------------------------ void FmXFormShell::ExecuteFormSlot( sal_Int32 _nSlot ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteFormSlot" ); const ::svx::ControllerFeatures& rController = lcl_isNavigationRelevant( _nSlot ) ? getNavControllerFeatures() @@ -1937,7 +1899,6 @@ void FmXFormShell::ExecuteFormSlot( sal_Int32 _nSlot ) //------------------------------------------------------------------------------ void FmXFormShell::impl_switchActiveControllerListening( const bool _bListen ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_switchActiveControllerListening" ); Reference< XComponent> xComp( m_xActiveController, UNO_QUERY ); if ( !xComp.is() ) return; @@ -1951,7 +1912,6 @@ void FmXFormShell::impl_switchActiveControllerListening( const bool _bListen ) //------------------------------------------------------------------------------ void FmXFormShell::setActiveController( const Reference< runtime::XFormController >& xController, sal_Bool _bNoSaveOldContent ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::setActiveController" ); if ( impl_checkDisposed() ) return; @@ -2060,14 +2020,12 @@ void FmXFormShell::setActiveController( const Reference< runtime::XFormControlle //------------------------------------------------------------------------------ void FmXFormShell::getCurrentSelection( InterfaceBag& /* [out] */ _rSelection ) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::getCurrentSelection" ); _rSelection = m_aCurrentSelection; } //------------------------------------------------------------------------------ bool FmXFormShell::setCurrentSelectionFromMark( const SdrMarkList& _rMarkList ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::setCurrentSelectionFromMark" ); m_aLastKnownMarkedControls.clear(); if ( ( _rMarkList.GetMarkCount() > 0 ) && isControlList( _rMarkList ) ) @@ -2079,14 +2037,12 @@ bool FmXFormShell::setCurrentSelectionFromMark( const SdrMarkList& _rMarkList ) //------------------------------------------------------------------------------ bool FmXFormShell::selectLastMarkedControls() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::selectLastMarkedControls" ); return setCurrentSelection( m_aLastKnownMarkedControls ); } //------------------------------------------------------------------------------ bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::setCurrentSelection" ); if ( impl_checkDisposed() ) return false; @@ -2168,14 +2124,12 @@ bool FmXFormShell::setCurrentSelection( const InterfaceBag& _rSelection ) //------------------------------------------------------------------------------ bool FmXFormShell::isSolelySelected( const Reference< XInterface >& _rxObject ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::isSolelySelected" ); return ( m_aCurrentSelection.size() == 1 ) && ( *m_aCurrentSelection.begin() == _rxObject ); } //------------------------------------------------------------------------------ void FmXFormShell::forgetCurrentForm() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::forgetCurrentForm" ); if ( !m_xCurrentForm.is() ) return; @@ -2190,7 +2144,6 @@ void FmXFormShell::forgetCurrentForm() //------------------------------------------------------------------------------ void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurForm ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_updateCurrentForm" ); if ( impl_checkDisposed() ) return; @@ -2209,7 +2162,6 @@ void FmXFormShell::impl_updateCurrentForm( const Reference< XForm >& _rxNewCurFo //------------------------------------------------------------------------------ void FmXFormShell::startListening() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::startListening" ); if ( impl_checkDisposed() ) return; @@ -2289,7 +2241,6 @@ void FmXFormShell::startListening() //------------------------------------------------------------------------------ void FmXFormShell::stopListening() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::stopListening" ); if ( impl_checkDisposed() ) return; @@ -2313,7 +2264,6 @@ void FmXFormShell::stopListening() //------------------------------------------------------------------------------ void FmXFormShell::ShowSelectionProperties( sal_Bool bShow ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ShowSelectionProperties" ); if ( impl_checkDisposed() ) return; @@ -2644,7 +2594,6 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn //------------------------------------------------------------------------------ void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::elementInserted" ); if ( impl_checkDisposed() ) return; @@ -2658,7 +2607,6 @@ void FmXFormShell::elementInserted(const ContainerEvent& evt) throw(::com::sun:: //------------------------------------------------------------------------------ void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::elementReplaced" ); if ( impl_checkDisposed() ) return; @@ -2672,7 +2620,6 @@ void FmXFormShell::elementReplaced(const ContainerEvent& evt) throw(::com::sun:: //------------------------------------------------------------------------------ void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::elementRemoved" ); if ( impl_checkDisposed() ) return; @@ -2685,7 +2632,6 @@ void FmXFormShell::elementRemoved(const ContainerEvent& evt) throw(::com::sun::s //------------------------------------------------------------------------------ void FmXFormShell::UpdateForms( sal_Bool _bInvalidate ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::UpdateForms" ); if ( impl_checkDisposed() ) return; @@ -2711,7 +2657,6 @@ void FmXFormShell::UpdateForms( sal_Bool _bInvalidate ) //------------------------------------------------------------------------------ void FmXFormShell::AddElement(const Reference< XInterface>& _xElement) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::AddElement" ); if ( impl_checkDisposed() ) return; impl_AddElement_nothrow(_xElement); @@ -2744,7 +2689,6 @@ void FmXFormShell::impl_AddElement_nothrow(const Reference< XInterface>& Element //------------------------------------------------------------------------------ void FmXFormShell::RemoveElement(const Reference< XInterface>& Element) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::RemoveElement" ); if ( impl_checkDisposed() ) return; impl_RemoveElement_nothrow(Element); @@ -2781,7 +2725,6 @@ void FmXFormShell::impl_RemoveElement_nothrow(const Reference< XInterface>& Elem //------------------------------------------------------------------------------ void FmXFormShell::selectionChanged(const EventObject& rEvent) throw(::com::sun::star::uno::RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::selectionChanged" ); if ( impl_checkDisposed() ) return; @@ -2823,7 +2766,6 @@ IMPL_LINK(FmXFormShell, OnTimeOut, void*, /*EMPTYTAG*/) //------------------------------------------------------------------------ void FmXFormShell::SetSelectionDelayed() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetSelectionDelayed" ); if ( impl_checkDisposed() ) return; @@ -2834,7 +2776,6 @@ void FmXFormShell::SetSelectionDelayed() //------------------------------------------------------------------------ void FmXFormShell::SetSelection(const SdrMarkList& rMarkList) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetSelection" ); if ( impl_checkDisposed() ) return; @@ -2845,7 +2786,6 @@ void FmXFormShell::SetSelection(const SdrMarkList& rMarkList) //------------------------------------------------------------------------ void FmXFormShell::DetermineSelection(const SdrMarkList& rMarkList) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::DetermineSelection" ); if ( setCurrentSelectionFromMark( rMarkList ) && IsPropBrwOpen() ) ShowSelectionProperties( sal_True ); } @@ -2853,7 +2793,6 @@ void FmXFormShell::DetermineSelection(const SdrMarkList& rMarkList) //------------------------------------------------------------------------------ sal_Bool FmXFormShell::IsPropBrwOpen() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsPropBrwOpen" ); if ( impl_checkDisposed() ) return sal_False; @@ -2890,7 +2829,6 @@ public: //------------------------------------------------------------------------------ void FmXFormShell::SetDesignMode(sal_Bool bDesign) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetDesignMode" ); if ( impl_checkDisposed() ) return; @@ -3023,7 +2961,6 @@ Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlMod void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInterface>& _rxStartingPoint, const ::rtl::OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< String >& _out_rNames ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_collectFormSearchContexts_nothrow" ); try { Reference< XIndexAccess> xContainer( _rxStartingPoint, UNO_QUERY ); @@ -3078,7 +3015,6 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInt //------------------------------------------------------------------------------ void FmXFormShell::startFiltering() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::startFiltering" ); if ( impl_checkDisposed() ) return; @@ -3095,12 +3031,14 @@ void FmXFormShell::startFiltering() else xContainer = getActiveController()->getContainer(); - FmWinRecList::iterator i = pXView->findWindow(xContainer); - if (i != pXView->getWindowList().end()) + PFormViewPageWindowAdapter pAdapter = pXView->findWindow( xContainer ); + if ( pAdapter.is() ) { - const ::std::vector< Reference< runtime::XFormController> >& rControllerList = (*i)->GetList(); - for (::std::vector< Reference< runtime::XFormController> >::const_iterator j = rControllerList.begin(); - j != rControllerList.end(); ++j) + const ::std::vector< Reference< runtime::XFormController> >& rControllerList = pAdapter->GetList(); + for ( ::std::vector< Reference< runtime::XFormController> >::const_iterator j = rControllerList.begin(); + j != rControllerList.end(); + ++j + ) { Reference< XModeSelector> xModeSelector(*j, UNO_QUERY); if (xModeSelector.is()) @@ -3153,7 +3091,6 @@ void saveFilter(const Reference< runtime::XFormController >& _rxController) //------------------------------------------------------------------------------ void FmXFormShell::stopFiltering(sal_Bool bSave) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::stopFiltering" ); if ( impl_checkDisposed() ) return; @@ -3171,10 +3108,10 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) else xContainer = getActiveController()->getContainer(); - FmWinRecList::iterator i = pXView->findWindow(xContainer); - if (i != pXView->getWindowList().end()) + PFormViewPageWindowAdapter pAdapter = pXView->findWindow(xContainer); + if ( pAdapter.is() ) { - const ::std::vector< Reference< runtime::XFormController > >& rControllerList = (*i)->GetList(); + const ::std::vector< Reference< runtime::XFormController > >& rControllerList = pAdapter->GetList(); ::std::vector < ::rtl::OUString > aOriginalFilters; ::std::vector < sal_Bool > aOriginalApplyFlags; @@ -3215,7 +3152,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave) } if (bSave) // execute the filter { - const ::std::vector< Reference< runtime::XFormController > > & rControllers = (*i)->GetList(); + const ::std::vector< Reference< runtime::XFormController > > & rControllers = pAdapter->GetList(); for (::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllers.begin(); j != rControllers.end(); ++j) { @@ -3292,7 +3229,6 @@ void clearFilter(const Reference< runtime::XFormController >& _rxController) //------------------------------------------------------------------------------ void FmXFormShell::clearFilter() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::clearFilter" ); if ( impl_checkDisposed() ) return; @@ -3308,12 +3244,14 @@ void FmXFormShell::clearFilter() else xContainer = getActiveController()->getContainer(); - FmWinRecList::iterator i = pXView->findWindow(xContainer); - if (i != pXView->getWindowList().end()) + PFormViewPageWindowAdapter pAdapter = pXView->findWindow(xContainer); + if ( pAdapter.is() ) { - const ::std::vector< Reference< runtime::XFormController > > & rControllerList = (*i)->GetList(); - for (::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllerList.begin(); - j != rControllerList.end(); ++j) + const ::std::vector< Reference< runtime::XFormController > > & rControllerList = pAdapter->GetList(); + for ( ::std::vector< Reference< runtime::XFormController > > ::const_iterator j = rControllerList.begin(); + j != rControllerList.end(); + ++j + ) { ::clearFilter(*j); } @@ -3323,7 +3261,6 @@ void FmXFormShell::clearFilter() //------------------------------------------------------------------------------ void FmXFormShell::CreateExternalView() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::CreateExternalView" ); if ( impl_checkDisposed() ) return; @@ -3738,7 +3675,6 @@ void FmXFormShell::CreateExternalView() //------------------------------------------------------------------------ void FmXFormShell::implAdjustConfigCache() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::implAdjustConfigCache" ); // get (cache) the wizard usage flag Sequence< ::rtl::OUString > aNames(1); aNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FormControlPilotsEnabled")); @@ -3750,7 +3686,6 @@ void FmXFormShell::implAdjustConfigCache() //------------------------------------------------------------------------ void FmXFormShell::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::Notify" ); if ( impl_checkDisposed() ) return; @@ -3771,7 +3706,6 @@ void FmXFormShell::Commit() //------------------------------------------------------------------------ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetWizardUsing" ); m_bUseWizards = _bUseThem; Sequence< ::rtl::OUString > aNames(1); @@ -3784,7 +3718,6 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem) //------------------------------------------------------------------------ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, sal_Bool _bDeactivateController /* = sal_True */ ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::viewDeactivated" ); if ( _rCurrentView.GetImpl() && !_rCurrentView.IsDesignMode() ) { @@ -3855,7 +3788,6 @@ IMPL_LINK( FmXFormShell, OnFormsCreated, FmFormPage*, /*_pPage*/ ) //------------------------------------------------------------------------ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncAction /* = sal_False */ ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::viewActivated" ); FmFormPage* pPage = _rCurrentView.GetCurPage(); @@ -3904,7 +3836,6 @@ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, sal_Bool _bSyncActi //------------------------------------------------------------------------------ void FmXFormShell::impl_defaultCurrentForm_nothrow() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::impl_defaultCurrentForm_nothrow" ); if ( impl_checkDisposed() ) return; @@ -3935,7 +3866,6 @@ void FmXFormShell::impl_defaultCurrentForm_nothrow() //------------------------------------------------------------------------------ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::smartControlReset" ); if (!_rxModels.is()) { OSL_FAIL("FmXFormShell::smartControlReset: invalid container!"); @@ -4043,7 +3973,6 @@ namespace //------------------------------------------------------------------------ void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour /* FORMS_LOAD | FORMS_SYNC */ ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::loadForms" ); DBG_ASSERT( ( _nBehaviour & ( FORMS_ASYNC | FORMS_UNLOAD ) ) != ( FORMS_ASYNC | FORMS_UNLOAD ), "FmXFormShell::loadForms: async loading not supported - this will heavily fail!" ); @@ -4121,41 +4050,35 @@ void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour / //------------------------------------------------------------------------ void FmXFormShell::ExecuteTextAttribute( SfxRequest& _rReq ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ExecuteTextAttribute" ); m_pTextShell->ExecuteTextAttribute( _rReq ); } //------------------------------------------------------------------------ void FmXFormShell::GetTextAttributeState( SfxItemSet& _rSet ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::GetTextAttributeState" ); m_pTextShell->GetTextAttributeState( _rSet ); } //------------------------------------------------------------------------ bool FmXFormShell::IsActiveControl( bool _bCountRichTextOnly ) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::IsActiveControl" ); return m_pTextShell->IsActiveControl( _bCountRichTextOnly ); } //------------------------------------------------------------------------ void FmXFormShell::ForgetActiveControl() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::ForgetActiveControl" ); m_pTextShell->ForgetActiveControl(); } //------------------------------------------------------------------------ void FmXFormShell::SetControlActivationHandler( const Link& _rHdl ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::SetControlActivationHandler" ); m_pTextShell->SetControlActivationHandler( _rHdl ); } //------------------------------------------------------------------------ void FmXFormShell::handleShowPropertiesRequest() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::handleShowPropertiesRequest" ); if ( onlyControlsAreMarked() ) ShowSelectionProperties( sal_True ); } @@ -4163,7 +4086,6 @@ void FmXFormShell::handleShowPropertiesRequest() //------------------------------------------------------------------------ void FmXFormShell::handleMouseButtonDown( const SdrViewEvent& _rViewEvent ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormShell::handleMouseButtonDown" ); // catch simple double clicks if ( ( _rViewEvent.nMouseClicks == 2 ) && ( _rViewEvent.nMouseCode == MOUSE_LEFT ) ) { @@ -4275,7 +4197,6 @@ ControlConversionMenuController::ControlConversionMenuController( sal_uInt16 _nI //------------------------------------------------------------------------------ ControlConversionMenuController::~ControlConversionMenuController() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "ControlConversionMenuController::~ControlConversionMenuController" ); m_pMainMenu->SetPopupMenu(SID_FM_CHANGECONTROLTYPE, NULL); delete m_pConversionMenu; } @@ -4296,10 +4217,10 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState // We can't simply re-insert the item because we have a clear order for all the our items. // So first we have to determine the position of the item to insert. PopupMenu* pSource = FmXFormShell::GetConversionMenu(); - USHORT nSourcePos = pSource->GetItemPos(nSID); + sal_uInt16 nSourcePos = pSource->GetItemPos(nSID); DBG_ASSERT(nSourcePos != MENU_ITEM_NOTFOUND, "ControlConversionMenuController::StateChanged : FmXFormShell supplied an invalid menu !"); - USHORT nPrevInSource = nSourcePos; - USHORT nPrevInConversion = MENU_ITEM_NOTFOUND; + sal_uInt16 nPrevInSource = nSourcePos; + sal_uInt16 nPrevInConversion = MENU_ITEM_NOTFOUND; while (nPrevInSource>0) { sal_Int16 nPrevId = pSource->GetItemId(--nPrevInSource); @@ -4311,7 +4232,7 @@ void ControlConversionMenuController::StateChanged(sal_uInt16 nSID, SfxItemState } if (MENU_ITEM_NOTFOUND == nPrevInConversion) // none of the items which precede the nSID-slot in the source menu are present in our conversion menu - nPrevInConversion = sal::static_int_cast< USHORT >(-1); // put the item at the first position + nPrevInConversion = sal::static_int_cast< sal_uInt16 >(-1); // put the item at the first position m_pConversionMenu->InsertItem(nSID, pSource->GetItemText(nSID), pSource->GetItemBits(nSID), ++nPrevInConversion); m_pConversionMenu->SetItemImage(nSID, pSource->GetItemImage(nSID)); m_pConversionMenu->SetHelpId(nSID, pSource->GetHelpId(nSID)); diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index 6b105fdfec..144f23d130 100644..100755 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fmsrccfg.hxx" +#include "svx/fmsrccfg.hxx" #include <svl/filerec.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <comphelper/processfactory.hxx> diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index bf532e37b3..6dfc2beadc 100644..100755 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -29,9 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "svx/fmtools.hxx" -#include "fmsrccfg.hxx" +#include "svx/fmsrccfg.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <tools/wldcrd.hxx> @@ -58,7 +58,7 @@ #include "fmprop.hrc" #include "fmservs.hxx" -#include "fmsrcimp.hxx" +#include "svx/fmsrcimp.hxx" #include <svx/fmsearch.hxx> #include <comphelper/numbers.hxx> @@ -77,11 +77,6 @@ using namespace ::com::sun::star::i18n; using namespace ::com::sun::star::beans; using namespace ::svxform; -// *************************************************************************************************** - -// *************************************************************************************************** - -SV_IMPL_OBJARR(SvInt32Array, sal_Int32); //======================================================================== // = FmSearchThread @@ -844,7 +839,7 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields) // analyze the fields // additionally, create the mapping: because the list of used columns can be shorter than the list // of columns of the cursor, we need a mapping: "used column numer n" -> "cursor column m" - m_arrFieldMapping.Remove(0, m_arrFieldMapping.Count()); + m_arrFieldMapping.clear(); // important: The case of the columns does not need to be exact - for instance: // - a user created a form which works on a table, for which the driver returns a column name "COLUMN" @@ -907,8 +902,8 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields) } // set the field selection back to the first pFieldNames = seqFieldNames.getArray();; - DBG_ASSERT(nFoundIndex != -1, "FmSearchEngine::Init : Es wurden ungueltige Feldnamen angegeben !"); - m_arrFieldMapping.Insert(nFoundIndex, m_arrFieldMapping.Count()); + DBG_ASSERT(nFoundIndex != -1, "FmSearchEngine::Init : Invalid field name were given !"); + m_arrFieldMapping.push_back(nFoundIndex); } } catch(Exception&) @@ -1269,18 +1264,21 @@ void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce) return; // (da ich keinen Wechsel des Iterators von aussen zulasse, heisst selber ::com::sun::star::sdbcx::Index auch immer selbe Spalte, also habe ich nix zu tun) - DBG_ASSERT((nFieldIndex >= -1) && (nFieldIndex<m_arrFieldMapping.Count()), "FmSearchEngine::RebuildUsedFields : nFieldIndex ist ungueltig !"); + DBG_ASSERT((nFieldIndex == -1) || + ((nFieldIndex >= 0) && + (static_cast<size_t>(nFieldIndex) < m_arrFieldMapping.size())), + "FmSearchEngine::RebuildUsedFields : nFieldIndex is invalid!"); // alle Felder, die ich durchsuchen muss, einsammeln m_arrUsedFields.clear(); if (nFieldIndex == -1) { Reference< ::com::sun::star::container::XIndexAccess > xFields; - for (sal_uInt16 i=0; i<m_arrFieldMapping.Count(); ++i) + for (size_t i=0; i<m_arrFieldMapping.size(); ++i) { Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::RebuildUsedFields : invalid cursor (no columns supplier) !"); xFields = Reference< ::com::sun::star::container::XIndexAccess > (xSupplyCols->getColumns(), UNO_QUERY); - BuildAndInsertFieldInfo(xFields, m_arrFieldMapping.GetObject(i)); + BuildAndInsertFieldInfo(xFields, m_arrFieldMapping[i]); } } else @@ -1289,7 +1287,7 @@ void FmSearchEngine::RebuildUsedFields(sal_Int32 nFieldIndex, sal_Bool bForce) Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY); DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::RebuildUsedFields : invalid cursor (no columns supplier) !"); xFields = Reference< ::com::sun::star::container::XIndexAccess > (xSupplyCols->getColumns(), UNO_QUERY); - BuildAndInsertFieldInfo(xFields, m_arrFieldMapping.GetObject((sal_uInt16)nFieldIndex)); + BuildAndInsertFieldInfo(xFields, m_arrFieldMapping[static_cast< size_t >(nFieldIndex)]); } m_nCurrentFieldIndex = nFieldIndex; diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src index 9456ecba4d..bb0be71840 100644..100755 --- a/svx/source/form/fmstring.src +++ b/svx/source/form/fmstring.src @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "fmresids.hrc" +#include "svx/fmresids.hrc" /* Strings fuer Uebersetzung */ String RID_ERR_CONTEXT_ADDFORM { diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index c725eb4554..1848d6a05f 100644..100755 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -34,7 +34,7 @@ #include <editeng/eeitem.hxx> -#include "flagsdef.hxx" +#include "svx/flagsdef.hxx" #include <svl/intitem.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -66,7 +66,7 @@ namespace svx } //-------------------------------------------------------------------- - void TextControlCharAttribDialog::PageCreated( USHORT _nId, SfxTabPage& _rPage ) + void TextControlCharAttribDialog::PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); diff --git a/svx/source/form/fmtextcontrolfeature.cxx b/svx/source/form/fmtextcontrolfeature.cxx index 1bf8ea49ef..1bf8ea49ef 100644..100755 --- a/svx/source/form/fmtextcontrolfeature.cxx +++ b/svx/source/form/fmtextcontrolfeature.cxx diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index b2ee482dfa..0a46606638 100644..100755 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmtextcontroldialogs.hxx" #include "fmtextcontrolfeature.hxx" #include "fmtextcontrolshell.hxx" @@ -95,7 +95,7 @@ namespace svx using namespace ::com::sun::star::container; //==================================================================== - typedef USHORT WhichId; + typedef sal_uInt16 WhichId; //==================================================================== static SfxSlotId pTextControlSlots[] = diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 8664d8c4c5..8664d8c4c5 100644..100755 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 76d7910692..67985e8dd5 100644..100755 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -33,10 +33,10 @@ #include "fmundo.hxx" #include "fmpgeimp.hxx" #include "svx/dbtoolsclient.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "fmobj.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "svx/fmglob.hxx" #include "svx/dialmgr.hxx" #include "svx/fmmodel.hxx" @@ -132,6 +132,8 @@ private: { Reference< XMultiComponentFactory > xMFac( xCtx->getServiceManager(), UNO_QUERY ); + + // SfxObjectShellRef is good here since the model controls the lifetime of the shell SfxObjectShellRef xObjSh = pModel->GetObjectShell(); Reference< XMultiServiceFactory > xDocFac; if ( xObjSh.Is() ) @@ -152,6 +154,7 @@ private: { try { + // SfxObjectShellRef is good here since the model controls the lifetime of the shell SfxObjectShellRef xObjSh = pModel->GetObjectShell(); if ( xObjSh.Is() && m_vbaListener.is() ) { @@ -179,8 +182,8 @@ private: //------------------------------------------------------------------------------ struct PropertyInfo { - BOOL bIsTransientOrReadOnly : 1; // the property is transient or read-only, thus we need no undo action for it - BOOL bIsValueProperty : 1; // the property is the special value property, thus it may be handled + sal_Bool bIsTransientOrReadOnly : 1; // the property is transient or read-only, thus we need no undo action for it + sal_Bool bIsValueProperty : 1; // the property is the special value property, thus it may be handled // as if it's transient or persistent }; @@ -189,11 +192,11 @@ struct PropertySetInfo DECLARE_STL_USTRINGACCESS_MAP(PropertyInfo, AllProperties); AllProperties aProps; // all properties of this set which we know so far - BOOL bHasEmptyControlSource; // sal_True -> the set has a DataField property, and the current value is an empty string + sal_Bool bHasEmptyControlSource; // sal_True -> the set has a DataField property, and the current value is an empty string // sal_False -> the set has _no_ such property or it's value isn't empty }; -BOOL operator < (const Reference< XPropertySet >& lhs, +sal_Bool operator < (const Reference< XPropertySet >& lhs, const Reference< XPropertySet >& rhs) { return lhs.get() < rhs.get(); @@ -670,7 +673,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt) PropertyInfo aNewEntry; // the attributes - INT32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName(evt.PropertyName).Attributes; + sal_Int32 nAttributes = xSet->getPropertySetInfo()->getPropertyByName(evt.PropertyName).Attributes; aNewEntry.bIsTransientOrReadOnly = ((nAttributes & PropertyAttribute::READONLY) != 0) || ((nAttributes & PropertyAttribute::TRANSIENT) != 0); // check if it is the special "DataFieldProperty" diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 97893db621..6e585aa0b9 100644..100755 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -47,11 +47,10 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> #include <basic/sbuno.hxx> -#include <sfx2/macrconf.hxx> #include <basic/sbx.hxx> #include "fmitems.hxx" #include "fmobj.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpagv.hxx> #include <svx/svdogrp.hxx> #include <svx/fmview.hxx> @@ -77,7 +76,7 @@ #include <vcl/stdtext.hxx> #include <svx/fmglob.hxx> #include <svx/sdrpagewindow.hxx> -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -138,9 +137,7 @@ void FmFormView::Init() const SfxPoolItem *pItem=0; if ( pObjShell->GetMedium()->GetItemSet()->GetItemState( SID_COMPONENTDATA, sal_False, &pItem ) == SFX_ITEM_SET ) { - Sequence< PropertyValue > aSeq; - ( ((SfxUnoAnyItem*)pItem)->GetValue() ) >>= aSeq; - ::comphelper::NamedValueCollection aComponentData( aSeq ); + ::comphelper::NamedValueCollection aComponentData( ((SfxUnoAnyItem*)pItem)->GetValue() ); bInitDesignMode = aComponentData.getOrDefault( "ApplyFormDesignMode", bInitDesignMode ); } } @@ -188,7 +185,7 @@ void FmFormView::MarkListHasChanged() pImpl->m_xWindow->removeFocusListener(pImpl); pImpl->m_xWindow = NULL; } - SetMoveOutside(FALSE); + SetMoveOutside(sal_False); //OLMRefreshAllIAOManagers(); } @@ -505,9 +502,9 @@ void FmFormView::EndCompleteRedraw( SdrPaintWindow& rPaintWindow, bool bPaintFor } // ----------------------------------------------------------------------------- -BOOL FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin) +sal_Bool FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin) { - BOOL bDone = FALSE; + sal_Bool bDone = sal_False; const KeyCode& rKeyCode = rKEvt.GetKeyCode(); if ( IsDesignMode() && rKeyCode.GetCode() == KEY_RETURN @@ -530,10 +527,10 @@ BOOL FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin) pImpl->m_xWindow = xWindow; // add as listener to get notified when ESC will be pressed inside the grid pImpl->m_xWindow->addFocusListener(pImpl); - SetMoveOutside(TRUE); + SetMoveOutside(sal_True); //OLMRefreshAllIAOManagers(); xWindow->setFocus(); - bDone = TRUE; + bDone = sal_True; } } } @@ -566,9 +563,9 @@ sal_Bool FmFormView::checkUnMarkAll(const Reference< XInterface >& _xSource) } // ----------------------------------------------------------------------------- -BOOL FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ) +sal_Bool FmFormView::MouseButtonDown( const MouseEvent& _rMEvt, Window* _pWin ) { - BOOL bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin ); + sal_Bool bReturn = E3dView::MouseButtonDown( _rMEvt, _pWin ); if ( pFormShell && pFormShell->GetImpl() ) { @@ -605,7 +602,7 @@ FmFormObj* FmFormView::getMarkedGrid() const // ----------------------------------------------------------------------------- void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, - sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, UINT32 _nInventor, UINT16 _nLabelObjectID, + sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl ) { FmXFormView::createControlLabelPair( diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index e295452c10..f9b4ec94e9 100644..100755 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -33,15 +33,15 @@ #include "fmobj.hxx" #include "fmpgeimp.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "svx/fmtools.hxx" #include "fmundo.hxx" #include "fmvwimp.hxx" #include "formcontrolfactory.hxx" -#include "sdrpaintwindow.hxx" -#include "svditer.hxx" +#include "svx/sdrpaintwindow.hxx" +#include "svx/svditer.hxx" #include "svx/dataaccessdescriptor.hxx" #include "svx/dialmgr.hxx" #include "svx/fmglob.hxx" @@ -52,7 +52,7 @@ #include "svx/sdrpagewindow.hxx" #include "svx/svdogrp.hxx" #include "svx/svdpagv.hxx" -#include "xmlexchg.hxx" +#include "svx/xmlexchg.hxx" /** === begin UNO includes === **/ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> @@ -174,20 +174,19 @@ public: }; //======================================================================== -DBG_NAME(FmXPageViewWinRec) +DBG_NAME(FormViewPageWindowAdapter) //------------------------------------------------------------------------ -FmXPageViewWinRec::FmXPageViewWinRec( const ::comphelper::ComponentContext& _rContext, const SdrPageWindow& _rWindow, FmXFormView* _pViewImpl ) +FormViewPageWindowAdapter::FormViewPageWindowAdapter( const ::comphelper::ComponentContext& _rContext, const SdrPageWindow& _rWindow, FmXFormView* _pViewImpl ) : m_xControlContainer( _rWindow.GetControlContainer() ), m_aContext( _rContext ), m_pViewImpl( _pViewImpl ), m_pWindow( dynamic_cast< Window* >( &_rWindow.GetPaintWindow().GetOutputDevice() ) ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::FmXPageViewWinRec" ); - DBG_CTOR(FmXPageViewWinRec,NULL); + DBG_CTOR(FormViewPageWindowAdapter,NULL); // create an XFormController for every form FmFormPage* pFormPage = dynamic_cast< FmFormPage* >( _rWindow.GetPageView().GetPage() ); - DBG_ASSERT( pFormPage, "FmXPageViewWinRec::FmXPageViewWinRec: no FmFormPage found!" ); + DBG_ASSERT( pFormPage, "FormViewPageWindowAdapter::FormViewPageWindowAdapter: no FmFormPage found!" ); if ( pFormPage ) { try @@ -208,15 +207,14 @@ FmXPageViewWinRec::FmXPageViewWinRec( const ::comphelper::ComponentContext& _rCo } } // ----------------------------------------------------------------------------- -FmXPageViewWinRec::~FmXPageViewWinRec() +FormViewPageWindowAdapter::~FormViewPageWindowAdapter() { - DBG_DTOR(FmXPageViewWinRec,NULL); + DBG_DTOR(FormViewPageWindowAdapter,NULL); } //------------------------------------------------------------------ -void FmXPageViewWinRec::dispose() +void FormViewPageWindowAdapter::dispose() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::dispose" ); for ( ::std::vector< Reference< XFormController > >::const_iterator i = m_aControllerList.begin(); i != m_aControllerList.end(); ++i @@ -250,39 +248,34 @@ void FmXPageViewWinRec::dispose() //------------------------------------------------------------------------------ -sal_Bool SAL_CALL FmXPageViewWinRec::hasElements(void) throw( RuntimeException ) +sal_Bool SAL_CALL FormViewPageWindowAdapter::hasElements(void) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::hasElements" ); return getCount() != 0; } //------------------------------------------------------------------------------ -Type SAL_CALL FmXPageViewWinRec::getElementType(void) throw( RuntimeException ) +Type SAL_CALL FormViewPageWindowAdapter::getElementType(void) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getElementType" ); return ::getCppuType((const Reference< XFormController>*)0); } // XEnumerationAccess //------------------------------------------------------------------------------ -Reference< XEnumeration > SAL_CALL FmXPageViewWinRec::createEnumeration(void) throw( RuntimeException ) +Reference< XEnumeration > SAL_CALL FormViewPageWindowAdapter::createEnumeration(void) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::createEnumeration" ); return new ::comphelper::OEnumerationByIndex(this); } // XIndexAccess //------------------------------------------------------------------------------ -sal_Int32 SAL_CALL FmXPageViewWinRec::getCount(void) throw( RuntimeException ) +sal_Int32 SAL_CALL FormViewPageWindowAdapter::getCount(void) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getCount" ); return m_aControllerList.size(); } //------------------------------------------------------------------------------ -Any SAL_CALL FmXPageViewWinRec::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) +Any SAL_CALL FormViewPageWindowAdapter::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getByIndex" ); if (nIndex < 0 || nIndex >= getCount()) throw IndexOutOfBoundsException(); @@ -293,7 +286,7 @@ Any SAL_CALL FmXPageViewWinRec::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBo } //------------------------------------------------------------------------ -void SAL_CALL FmXPageViewWinRec::makeVisible( const Reference< XControl >& _Control ) throw (RuntimeException) +void SAL_CALL FormViewPageWindowAdapter::makeVisible( const Reference< XControl >& _Control ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -332,9 +325,8 @@ Reference< XFormController > getControllerSearchChilds( const Reference< XIndex // Search the according controller //------------------------------------------------------------------------ -Reference< XFormController > FmXPageViewWinRec::getController( const Reference< XForm > & xForm ) const +Reference< XFormController > FormViewPageWindowAdapter::getController( const Reference< XForm > & xForm ) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::getController" ); Reference< XTabControllerModel > xModel(xForm, UNO_QUERY); for (::std::vector< Reference< XFormController > >::const_iterator i = m_aControllerList.begin(); i != m_aControllerList.end(); i++) @@ -351,9 +343,9 @@ Reference< XFormController > FmXPageViewWinRec::getController( const Reference< } //------------------------------------------------------------------------ -void FmXPageViewWinRec::setController(const Reference< XForm > & xForm, const Reference< XFormController >& _rxParentController ) +void FormViewPageWindowAdapter::setController(const Reference< XForm > & xForm, const Reference< XFormController >& _rxParentController ) { - DBG_ASSERT( xForm.is(), "FmXPageViewWinRec::setController: there should be a form!" ); + DBG_ASSERT( xForm.is(), "FormViewPageWindowAdapter::setController: there should be a form!" ); Reference< XIndexAccess > xFormCps(xForm, UNO_QUERY); if (!xFormCps.is()) return; @@ -411,10 +403,9 @@ void FmXPageViewWinRec::setController(const Reference< XForm > & xForm, const Re } //------------------------------------------------------------------------ -void FmXPageViewWinRec::updateTabOrder( const Reference< XForm >& _rxForm ) +void FormViewPageWindowAdapter::updateTabOrder( const Reference< XForm >& _rxForm ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXPageViewWinRec::updateTabOrder" ); - OSL_PRECOND( _rxForm.is(), "FmXPageViewWinRec::updateTabOrder: illegal argument!" ); + OSL_PRECOND( _rxForm.is(), "FormViewPageWindowAdapter::updateTabOrder: illegal argument!" ); if ( !_rxForm.is() ) return; @@ -458,13 +449,11 @@ FmXFormView::FmXFormView(const ::comphelper::ComponentContext& _rContext, FmForm ,m_bFirstActivation( true ) ,m_isTabOrderUpdateSuspended( false ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::FmXFormView" ); } //------------------------------------------------------------------------ void FmXFormView::cancelEvents() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::cancelEvents" ); if ( m_nActivationEvent ) { Application::RemoveUserEvent( m_nActivationEvent ); @@ -493,7 +482,6 @@ void FmXFormView::cancelEvents() //------------------------------------------------------------------------ void FmXFormView::notifyViewDying( ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::notifyViewDying" ); DBG_ASSERT( m_pView, "FmXFormView::notifyViewDying: my view already died!" ); m_pView = NULL; cancelEvents(); @@ -502,7 +490,17 @@ void FmXFormView::notifyViewDying( ) //------------------------------------------------------------------------ FmXFormView::~FmXFormView() { - DBG_ASSERT(m_aWinList.size() == 0, "FmXFormView::~FmXFormView: Window list not empty!"); + DBG_ASSERT( m_aPageWindowAdapters.empty(), "FmXFormView::~FmXFormView: Window list not empty!" ); + if ( !m_aPageWindowAdapters.empty() ) + { + for ( PageWindowAdapterList::const_iterator loop = m_aPageWindowAdapters.begin(); + loop != m_aPageWindowAdapters.end(); + ++loop + ) + { + (*loop)->dispose(); + } + } cancelEvents(); @@ -514,7 +512,6 @@ FmXFormView::~FmXFormView() //------------------------------------------------------------------------------ void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::disposing" ); if ( m_xWindow.is() && Source.Source == m_xWindow ) removeGridWindowListening(); } @@ -523,7 +520,6 @@ void SAL_CALL FmXFormView::disposing(const EventObject& Source) throw( RuntimeEx //------------------------------------------------------------------------------ void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::formActivated" ); if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() ) m_pView->GetFormShell()->GetImpl()->formActivated( rEvent ); } @@ -531,7 +527,6 @@ void SAL_CALL FmXFormView::formActivated(const EventObject& rEvent) throw( Runti //------------------------------------------------------------------------------ void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::formDeactivated" ); if ( m_pView && m_pView->GetFormShell() && m_pView->GetFormShell()->GetImpl() ) m_pView->GetFormShell()->GetImpl()->formDeactivated( rEvent ); } @@ -540,7 +535,6 @@ void SAL_CALL FmXFormView::formDeactivated(const EventObject& rEvent) throw( Run //------------------------------------------------------------------------------ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::elementInserted" ); try { Reference< XControlContainer > xControlContainer( evt.Source, UNO_QUERY_THROW ); @@ -555,11 +549,9 @@ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( Run } else { - FmWinRecList::iterator pos = findWindow( xControlContainer ); - if ( pos != m_aWinList.end() ) - { - (*pos)->updateTabOrder( xForm ); - } + PFormViewPageWindowAdapter pAdapter = findWindow( xControlContainer ); + if ( pAdapter.is() ) + pAdapter->updateTabOrder( xForm ); } } catch( const Exception& ) @@ -571,92 +563,80 @@ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( Run //------------------------------------------------------------------------------ void SAL_CALL FmXFormView::elementReplaced(const ContainerEvent& evt) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::elementReplaced" ); elementInserted(evt); } //------------------------------------------------------------------------------ void SAL_CALL FmXFormView::elementRemoved(const ContainerEvent& /*evt*/) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::elementRemoved" ); } //------------------------------------------------------------------------------ -FmWinRecList::const_iterator FmXFormView::findWindow( const Reference< XControlContainer >& _rxCC ) const +PFormViewPageWindowAdapter FmXFormView::findWindow( const Reference< XControlContainer >& _rxCC ) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::findWindow" ); - for (FmWinRecList::const_iterator i = m_aWinList.begin(); - i != m_aWinList.end(); ++i) - { - if ( _rxCC == (*i)->getControlContainer() ) - return i; - } - return m_aWinList.end(); -} - -//------------------------------------------------------------------------------ -FmWinRecList::iterator FmXFormView::findWindow( const Reference< XControlContainer >& _rxCC ) -{ - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::findWindow" ); - for (FmWinRecList::iterator i = m_aWinList.begin(); - i != m_aWinList.end(); ++i) + for ( PageWindowAdapterList::const_iterator i = m_aPageWindowAdapters.begin(); + i != m_aPageWindowAdapters.end(); + ++i + ) { if ( _rxCC == (*i)->getControlContainer() ) - return i; + return *i; } - return m_aWinList.end(); + return NULL; } //------------------------------------------------------------------------------ void FmXFormView::addWindow(const SdrPageWindow& rWindow) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::addWindow" ); FmFormPage* pFormPage = PTR_CAST( FmFormPage, rWindow.GetPageView().GetPage() ); if ( !pFormPage ) return; Reference< XControlContainer > xCC = rWindow.GetControlContainer(); - if ( xCC.is() && findWindow( xCC ) == m_aWinList.end()) + if ( xCC.is() + && ( !findWindow( xCC ).is() ) + ) { - FmXPageViewWinRec *pFmRec = new FmXPageViewWinRec( m_aContext, rWindow, this ); - pFmRec->acquire(); - - m_aWinList.push_back(pFmRec); + PFormViewPageWindowAdapter pAdapter = new FormViewPageWindowAdapter( m_aContext, rWindow, this ); + m_aPageWindowAdapters.push_back( pAdapter ); // Am ControlContainer horchen um Aenderungen mitzbekommen Reference< XContainer > xContainer( xCC, UNO_QUERY ); - if (xContainer.is()) - xContainer->addContainerListener(this); + if ( xContainer.is() ) + xContainer->addContainerListener( this ); } } //------------------------------------------------------------------------------ void FmXFormView::removeWindow( const Reference< XControlContainer >& _rxCC ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::removeWindow" ); // Wird gerufen, wenn // - in den Design-Modus geschaltet wird // - ein Window geloescht wird, waehrend man im Design-Modus ist // - der Control-Container fuer ein Window entfernt wird, waehrend // der aktive Modus eingeschaltet ist. - FmWinRecList::iterator i = findWindow( _rxCC ); - if (i != m_aWinList.end()) + + for ( PageWindowAdapterList::iterator i = m_aPageWindowAdapters.begin(); + i != m_aPageWindowAdapters.end(); + ++i + ) { - // Am ControlContainer horchen um Aenderungen mitzbekommen + if ( _rxCC != (*i)->getControlContainer() ) + continue; + Reference< XContainer > xContainer( _rxCC, UNO_QUERY ); - if (xContainer.is()) - xContainer->removeContainerListener(this); + if ( xContainer.is() ) + xContainer->removeContainerListener( this ); (*i)->dispose(); - (*i)->release(); - m_aWinList.erase(i); + m_aPageWindowAdapters.erase( i ); + break; } } //------------------------------------------------------------------------------ void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::displayAsyncErrorMessage" ); DBG_ASSERT( 0 == m_nErrorMessageEvent, "FmXFormView::displayAsyncErrorMessage: not too fast, please!" ); // This should not happen - usually, the PostUserEvent is faster than any possible user // interaction which could trigger a new error. If it happens, we need a queue for the events. @@ -675,7 +655,6 @@ IMPL_LINK(FmXFormView, OnDelayedErrorMessage, void*, /*EMPTYTAG*/) //------------------------------------------------------------------------------ void FmXFormView::onFirstViewActivation( const FmFormModel* _pDocModel ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::onFirstViewActivation" ); if ( _pDocModel && _pDocModel->GetAutoControlFocus() ) m_nAutoFocusEvent = Application::PostUserEvent( LINK( this, FmXFormView, OnAutoFocus ) ); } @@ -683,7 +662,6 @@ void FmXFormView::onFirstViewActivation( const FmFormModel* _pDocModel ) //------------------------------------------------------------------------------ void FmXFormView::suspendTabOrderUpdate() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::suspendTabOrderUpdate" ); OSL_ENSURE( !m_isTabOrderUpdateSuspended, "FmXFormView::suspendTabOrderUpdate: nesting not allowed!" ); m_isTabOrderUpdateSuspended = true; } @@ -691,7 +669,6 @@ void FmXFormView::suspendTabOrderUpdate() //------------------------------------------------------------------------------ void FmXFormView::resumeTabOrderUpdate() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::resumeTabOrderUpdate" ); OSL_ENSURE( m_isTabOrderUpdateSuspended, "FmXFormView::resumeTabOrderUpdate: not suspended!" ); m_isTabOrderUpdateSuspended = false; @@ -701,8 +678,8 @@ void FmXFormView::resumeTabOrderUpdate() ++container ) { - FmWinRecList::iterator pos = findWindow( container->first ); - if ( pos == m_aWinList.end() ) + PFormViewPageWindowAdapter pAdapter = findWindow( container->first ); + if ( !pAdapter.is() ) continue; for ( SetOfForms::const_iterator form = container->second.begin(); @@ -710,7 +687,7 @@ void FmXFormView::resumeTabOrderUpdate() ++form ) { - (*pos)->updateTabOrder( *form ); + pAdapter->updateTabOrder( *form ); } } m_aNeedTabOrderUpdate.clear(); @@ -731,41 +708,42 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/) if (m_pView->GetFormShell() && m_pView->GetActualOutDev() && m_pView->GetActualOutDev()->GetOutDevType() == OUTDEV_WINDOW) { Window* pWindow = const_cast<Window*>(static_cast<const Window*>(m_pView->GetActualOutDev())); - FmXPageViewWinRec* pFmRec = m_aWinList.size() ? m_aWinList[0] : NULL; - for (FmWinRecList::const_iterator i = m_aWinList.begin(); - i != m_aWinList.end(); ++i) + PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0]; + for ( PageWindowAdapterList::const_iterator i = m_aPageWindowAdapters.begin(); + i != m_aPageWindowAdapters.end(); + ++i + ) { - if (pWindow == (*i)->getWindow()) - pFmRec =*i; + if ( pWindow == (*i)->getWindow() ) + pAdapter =*i; } - if (pFmRec) + if ( pAdapter.get() ) { - for (::std::vector< Reference< XFormController > >::const_iterator i = pFmRec->GetList().begin(); - i != pFmRec->GetList().end(); i++) + for ( ::std::vector< Reference< XFormController > >::const_iterator i = pAdapter->GetList().begin(); + i != pAdapter->GetList().end(); + ++i + ) { const Reference< XFormController > & xController = *i; - if (xController.is()) + if ( !xController.is() ) + continue; + + // only database forms are to be activated + Reference< XRowSet > xForm(xController->getModel(), UNO_QUERY); + if ( !xForm.is() || !OStaticDataAccessTools().getRowSetConnection( xForm ).is() ) + continue; + + Reference< XPropertySet > xFormSet( xForm, UNO_QUERY ); + ENSURE_OR_CONTINUE( xFormSet.is(), "FmXFormView::OnActivate: a form which does not have properties?" ); + + const ::rtl::OUString aSource = ::comphelper::getString( xFormSet->getPropertyValue( FM_PROP_COMMAND ) ); + if ( aSource.getLength() ) { - // Nur bei Datenbankformularen erfolgt eine aktivierung - Reference< XRowSet > xForm(xController->getModel(), UNO_QUERY); - if (xForm.is() && OStaticDataAccessTools().getRowSetConnection(xForm).is()) - { - Reference< XPropertySet > xFormSet(xForm, UNO_QUERY); - if (xFormSet.is()) - { - // wenn es eine Datenquelle gibt, dann als aktive ::com::sun::star::form setzen - ::rtl::OUString aSource = ::comphelper::getString(xFormSet->getPropertyValue(FM_PROP_COMMAND)); - if (aSource.getLength()) - { - // benachrichtigung der Shell - FmXFormShell* pShImpl = m_pView->GetFormShell()->GetImpl(); - if (pShImpl) - pShImpl->setActiveController(xController); - break; - } - } - } + FmXFormShell* pShImpl = m_pView->GetFormShell()->GetImpl(); + if ( pShImpl ) + pShImpl->setActiveController( xController ); + break; } } } @@ -776,7 +754,6 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/) //------------------------------------------------------------------------------ void FmXFormView::Activate(sal_Bool bSync) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::Activate" ); if (m_nActivationEvent) { Application::RemoveUserEvent(m_nActivationEvent); @@ -792,9 +769,8 @@ void FmXFormView::Activate(sal_Bool bSync) } //------------------------------------------------------------------------------ -void FmXFormView::Deactivate(BOOL bDeactivateController) +void FmXFormView::Deactivate(sal_Bool bDeactivateController) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::Deactivate" ); if (m_nActivationEvent) { Application::RemoveUserEvent(m_nActivationEvent); @@ -809,13 +785,11 @@ void FmXFormView::Deactivate(BOOL bDeactivateController) //------------------------------------------------------------------------------ FmFormShell* FmXFormView::GetFormShell() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::GetFormShell" ); return m_pView ? m_pView->GetFormShell() : NULL; } // ----------------------------------------------------------------------------- void FmXFormView::AutoFocus( sal_Bool _bSync ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::AutoFocus" ); if (m_nAutoFocusEvent) Application::RemoveUserEvent(m_nAutoFocusEvent); @@ -928,18 +902,20 @@ namespace // ----------------------------------------------------------------------------- Reference< XFormController > FmXFormView::getFormController( const Reference< XForm >& _rxForm, const OutputDevice& _rDevice ) const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::getFormController" ); Reference< XFormController > xController; - for ( FmWinRecList::const_iterator rec = m_aWinList.begin(); rec != m_aWinList.end(); ++rec ) + for ( PageWindowAdapterList::const_iterator pos = m_aPageWindowAdapters.begin(); + pos != m_aPageWindowAdapters.end(); + ++pos + ) { - const FmXPageViewWinRec* pViewWinRec( *rec ); - OSL_ENSURE( pViewWinRec, "FmXFormView::getFormController: invalid PageViewWinRec!" ); - if ( !pViewWinRec || ( pViewWinRec->getWindow() != &_rDevice ) ) + const PFormViewPageWindowAdapter pAdapter( *pos ); + ENSURE_OR_CONTINUE( pAdapter.get(), "FmXFormView::getFormController: invalid page window adapter!" ); + if ( pAdapter->getWindow() != &_rDevice ) // wrong device continue; - xController = pViewWinRec->getController( _rxForm ); + xController = pAdapter->getController( _rxForm ); if ( xController.is() ) break; } @@ -961,12 +937,10 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/) FmFormPage* pPage = m_pView ? PTR_CAST( FmFormPage, m_pView->GetSdrPageView()->GetPage() ) : NULL; Reference< XIndexAccess > xForms( pPage ? Reference< XIndexAccess >( pPage->GetForms(), UNO_QUERY ) : Reference< XIndexAccess >() ); - const FmXPageViewWinRec* pViewWinRec = m_aWinList.size() ? m_aWinList[0] : NULL; - const Window* pWindow = pViewWinRec ? pViewWinRec->getWindow() : NULL; + const PFormViewPageWindowAdapter pAdapter = m_aPageWindowAdapters.empty() ? NULL : m_aPageWindowAdapters[0]; + const Window* pWindow = pAdapter.get() ? pAdapter->getWindow() : NULL; - OSL_ENSURE( xForms.is() && pWindow, "FmXFormView::OnAutoFocus: could not collect all essentials!" ); - if ( !xForms.is() || !pWindow ) - return 0L; + ENSURE_OR_RETURN( xForms.is() && pWindow, "FmXFormView::OnAutoFocus: could not collect all essentials!", 0L ); try { @@ -974,7 +948,7 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/) if ( !xForms->getCount() ) break; Reference< XForm > xForm( xForms->getByIndex( 0 ), UNO_QUERY_THROW ); - Reference< XTabController > xTabController( pViewWinRec->getController( xForm ), UNO_QUERY_THROW ); + Reference< XTabController > xTabController( pAdapter->getController( xForm ), UNO_QUERY_THROW ); // go for the first control of the controller Sequence< Reference< XControl > > aControls( xTabController->getControls() ); @@ -1025,7 +999,6 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/) // ----------------------------------------------------------------------------- void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::onCreatedFormObject" ); FmFormShell* pShell = m_pView ? m_pView->GetFormShell() : NULL; FmXFormShell* pShellImpl = pShell ? pShell->GetImpl() : NULL; OSL_ENSURE( pShellImpl, "FmXFormView::onCreatedFormObject: no form shell!" ); @@ -1156,7 +1129,6 @@ namespace // ----------------------------------------------------------------------------- SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::implCreateFieldControl" ); // not if we're in design mode if ( !m_pView->IsDesignMode() ) return NULL; @@ -1388,7 +1360,6 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript // ----------------------------------------------------------------------------- SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::implCreateXFormsControl" ); // not if we're in design mode if ( !m_pView->IsDesignMode() ) return NULL; @@ -1524,7 +1495,6 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO const Reference< XDataSource >& _rxDataSource, const ::rtl::OUString& _rDataSourceName, const ::rtl::OUString& _rCommand, const sal_Int32 _nCommandType ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::createControlLabelPair" ); if ( !createControlLabelPair( m_aContext, _rOutDev, _nXOffsetMM, _nYOffsetMM, _rxField, _rxNumberFormats, _nControlObjectID, _rFieldPostfix, FmFormInventor, OBJ_FM_FIXEDTEXT, NULL, NULL, NULL, _rpLabel, _rpControl ) @@ -1549,10 +1519,9 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& _rContext, OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, - const ::rtl::OUString& _rFieldPostfix, UINT32 _nInventor, UINT16 _nLabelObjectID, + const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::createControlLabelPair" ); sal_Int32 nDataType = 0; ::rtl::OUString sFieldName; Any aFieldName; @@ -1718,13 +1687,12 @@ void FmXFormView::ObjectRemoveListener::Notify( SfxBroadcaster& /*rBC*/, const S //------------------------------------------------------------------------------ void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::ObjectRemovedInAliveMode" ); // wenn das entfernte Objekt in meiner MarkList, die ich mir beim Umschalten in den Alive-Mode gemerkt habe, steht, // muss ich es jetzt da rausnehmen, da ich sonst beim Zurueckschalten versuche, die Markierung wieder zu setzen // (interesanterweise geht das nur bei gruppierten Objekten schief (beim Zugriff auf deren ObjList GPF), nicht bei einzelnen) - ULONG nCount = m_aMark.GetMarkCount(); - for (ULONG i = 0; i < nCount; ++i) + sal_uIntPtr nCount = m_aMark.GetMarkCount(); + for (sal_uIntPtr i = 0; i < nCount; ++i) { SdrMark* pMark = m_aMark.GetMark(i); SdrObject* pCurrent = pMark->GetMarkedSdrObj(); @@ -1741,7 +1709,6 @@ void FmXFormView::ObjectRemovedInAliveMode( const SdrObject* pObject ) //------------------------------------------------------------------------------ void FmXFormView::stopMarkListWatching() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::stopMarkListWatching" ); if ( m_pWatchStoredList ) { m_pWatchStoredList->EndListeningAll(); @@ -1753,7 +1720,6 @@ void FmXFormView::stopMarkListWatching() //------------------------------------------------------------------------------ void FmXFormView::startMarkListWatching() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::startMarkListWatching" ); if ( !m_pWatchStoredList ) { m_pWatchStoredList = new ObjectRemoveListener( this ); @@ -1770,14 +1736,13 @@ void FmXFormView::startMarkListWatching() //------------------------------------------------------------------------------ void FmXFormView::saveMarkList( sal_Bool _bSmartUnmark ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::saveMarkList" ); if ( m_pView ) { m_aMark = m_pView->GetMarkedObjectList(); if ( _bSmartUnmark ) { - ULONG nCount = m_aMark.GetMarkCount( ); - for ( ULONG i = 0; i < nCount; ++i ) + sal_uIntPtr nCount = m_aMark.GetMarkCount( ); + for ( sal_uIntPtr i = 0; i < nCount; ++i ) { SdrMark* pMark = m_aMark.GetMark(i); SdrObject* pObj = pMark->GetMarkedSdrObj(); @@ -1829,7 +1794,6 @@ static sal_Bool lcl_hasObject( SdrObjListIter& rIter, SdrObject* pObj ) //------------------------------------------------------------------------------ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::restoreMarkList" ); if ( !m_pView ) return; @@ -1844,15 +1808,15 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) sal_Bool bMisMatch = sal_False; // loop through all current marks - ULONG nCurrentCount = rCurrentList.GetMarkCount(); - for ( ULONG i=0; i<nCurrentCount&& !bMisMatch; ++i ) + sal_uIntPtr nCurrentCount = rCurrentList.GetMarkCount(); + for ( sal_uIntPtr i=0; i<nCurrentCount&& !bMisMatch; ++i ) { const SdrObject* pCurrentMarked = rCurrentList.GetMark( i )->GetMarkedSdrObj(); // loop through all saved marks, check for equality sal_Bool bFound = sal_False; - ULONG nSavedCount = m_aMark.GetMarkCount(); - for ( ULONG j=0; j<nSavedCount && !bFound; ++j ) + sal_uIntPtr nSavedCount = m_aMark.GetMarkCount(); + for ( sal_uIntPtr j=0; j<nSavedCount && !bFound; ++j ) { if ( m_aMark.GetMark( j )->GetMarkedSdrObj() == pCurrentMarked ) bFound = sal_True; @@ -1877,8 +1841,8 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) sal_Bool bFound = sal_True; // gibt es noch alle Objecte - ULONG nCount = m_aMark.GetMarkCount(); - for (ULONG i = 0; i < nCount && bFound; i++) + sal_uIntPtr nCount = m_aMark.GetMarkCount(); + for (sal_uIntPtr i = 0; i < nCount && bFound; i++) { SdrMark* pMark = m_aMark.GetMark(i); SdrObject* pObj = pMark->GetMarkedSdrObj(); @@ -1899,7 +1863,7 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) // Das LastObject auswerten if (nCount) // Objecte jetzt Markieren { - for (ULONG i = 0; i < nCount; i++) + for (sal_uIntPtr i = 0; i < nCount; i++) { SdrMark* pMark = m_aMark.GetMark(i); SdrObject* pObj = pMark->GetMarkedSdrObj(); @@ -1917,33 +1881,30 @@ void FmXFormView::restoreMarkList( SdrMarkList& _rRestoredMarkList ) // ----------------------------------------------------------------------------- void SAL_CALL FmXFormView::focusGained( const FocusEvent& /*e*/ ) throw (RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::focusGained" ); if ( m_xWindow.is() && m_pView ) { - m_pView->SetMoveOutside( TRUE, FmFormView::ImplAccess() ); + m_pView->SetMoveOutside( sal_True, FmFormView::ImplAccess() ); } } // ----------------------------------------------------------------------------- void SAL_CALL FmXFormView::focusLost( const FocusEvent& /*e*/ ) throw (RuntimeException) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::focusLost" ); // when switch the focus outside the office the mark didn't change // so we can not remove us as focus listener if ( m_xWindow.is() && m_pView ) { - m_pView->SetMoveOutside( FALSE, FmFormView::ImplAccess() ); + m_pView->SetMoveOutside( sal_False, FmFormView::ImplAccess() ); } } // ----------------------------------------------------------------------------- void FmXFormView::removeGridWindowListening() { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::removeGridWindowListening" ); if ( m_xWindow.is() ) { m_xWindow->removeFocusListener(this); if ( m_pView ) { - m_pView->SetMoveOutside( FALSE, FmFormView::ImplAccess() ); + m_pView->SetMoveOutside( sal_False, FmFormView::ImplAccess() ); } m_xWindow = NULL; } @@ -1952,7 +1913,6 @@ void FmXFormView::removeGridWindowListening() // ----------------------------------------------------------------------------- DocumentType FmXFormView::impl_getDocumentType() const { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmXFormView::impl_getDocumentType" ); if ( GetFormShell() && GetFormShell()->GetImpl() ) return GetFormShell()->GetImpl()->getDocumentType(); return eUnknownDocumentType; diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index b2070230fd..bc3080d5cd 100644..100755 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -32,7 +32,7 @@ #include "formcontrolfactory.hxx" #include "fmcontrollayout.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "svx/dialmgr.hxx" #include "svx/svdouno.hxx" diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 54bb40af71..a78ba001b1 100644..100755 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -37,7 +37,7 @@ #include "formcontrolling.hxx" #include "fmprop.hrc" #include "svx/dialmgr.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "svx/fmtools.hxx" #include "fmurl.hxx" @@ -63,6 +63,7 @@ #include <com/sun/star/sdb/RowChangeAction.hpp> #include <com/sun/star/sdb/XInteractionSupplyParameters.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> +#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/form/runtime/FormOperations.hpp> #include <com/sun/star/form/runtime/FormFeature.hpp> @@ -81,6 +82,7 @@ #include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <comphelper/uno3.hxx> +#include <comphelper/flagguard.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <toolkit/controls/unocontrol.hxx> @@ -210,6 +212,7 @@ namespace svxform namespace FocusChangeReason = ::com::sun::star::awt::FocusChangeReason; namespace RowChangeAction = ::com::sun::star::sdb::RowChangeAction; namespace FormFeature = ::com::sun::star::form::runtime::FormFeature; + namespace DataType = ::com::sun::star::sdbc::DataType; //============================================================================== // ColumnInfo @@ -478,7 +481,10 @@ class FmXAutoControl: public UnoControl friend Reference< XInterface > SAL_CALL FmXAutoControl_NewInstance_Impl(); public: - FmXAutoControl(){} + FmXAutoControl( const ::comphelper::ComponentContext& i_context ) + :UnoControl( i_context.getLegacyServiceFactory() ) + { + } virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Edit"));} virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw( RuntimeException ); @@ -585,6 +591,7 @@ FormController::FormController(const Reference< XMultiServiceFactory > & _rxORB ,m_bAttachEvents(sal_True) ,m_bDetachEvents(sal_True) ,m_bAttemptedHandlerCreation( false ) + ,m_bSuspendFilterTextListening( false ) { DBG_CTOR( FormController, NULL ); @@ -784,6 +791,9 @@ namespace // ----------------------------------------------------------------------------- void FormController::impl_setTextOnAllFilter_throw() { + m_bSuspendFilterTextListening = true; + ::comphelper::FlagGuard aResetFlag( m_bSuspendFilterTextListening ); + // reset the text for all controls ::std::for_each( m_aFilterComponents.begin(), m_aFilterComponents.end(), ResetComponentText() ); @@ -857,32 +867,38 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons if ( rRow.empty() ) continue; - if ( aFilter.getLength() ) - aFilter.appendAscii( " OR " ); - - aFilter.appendAscii( "( " ); + ::rtl::OUStringBuffer aRowFilter; for ( FmFilterRow::const_iterator condition = rRow.begin(); condition != rRow.end(); ++condition ) { // get the field of the controls map Reference< XControl > xControl( condition->first, UNO_QUERY_THROW ); Reference< XPropertySet > xModelProps( xControl->getModel(), UNO_QUERY_THROW ); Reference< XPropertySet > xField( xModelProps->getPropertyValue( FM_PROP_BOUNDFIELD ), UNO_QUERY_THROW ); - if ( condition != rRow.begin() ) - aFilter.appendAscii( " AND " ); ::rtl::OUString sFilterValue( condition->second ); ::rtl::OUString sErrorMsg, sCriteria; - ::rtl::Reference< ISQLParseNode > xParseNode = predicateTree( sErrorMsg, sFilterValue, xFormatter, xField ); + const ::rtl::Reference< ISQLParseNode > xParseNode = + predicateTree( sErrorMsg, sFilterValue, xFormatter, xField ); OSL_ENSURE( xParseNode.is(), "FormController::getFastPropertyValue: could not parse the field value predicate!" ); if ( xParseNode.is() ) { // don't use a parse context here, we need it unlocalized xParseNode->parseNodeToStr( sCriteria, xConnection, NULL ); - aFilter.append( sCriteria ); + if ( condition != rRow.begin() ) + aRowFilter.appendAscii( " AND " ); + aRowFilter.append( sCriteria ); } } - aFilter.appendAscii( " )" ); + if ( aRowFilter.getLength() > 0 ) + { + if ( aFilter.getLength() ) + aFilter.appendAscii( " OR " ); + + aFilter.appendAscii( "( " ); + aFilter.append( aRowFilter.makeStringAndClear() ); + aFilter.appendAscii( " )" ); + } } } catch( const Exception& ) @@ -1440,7 +1456,7 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields) && ::comphelper::getBOOL( xField->getPropertyValue( FM_PROP_AUTOINCREMENT ) ) ) { - replaceControl( xControl, new FmXAutoControl ); + replaceControl( xControl, new FmXAutoControl( m_aContext ) ); } } } @@ -1496,50 +1512,54 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeExce // SYNCHRONIZED --> ::osl::ClearableMutexGuard aGuard( m_aMutex ); OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); - if (m_bFiltering) + if ( !m_bFiltering ) { - Reference< XTextComponent > xText(e.Source,UNO_QUERY); - ::rtl::OUString aText = xText->getText(); - - if ( m_aFilterRows.empty() ) - appendEmptyDisjunctiveTerm(); + impl_onModify(); + return; + } - // Suchen der aktuellen Row - if ( ( (size_t)m_nCurrentFilterPosition >= m_aFilterRows.size() ) || ( m_nCurrentFilterPosition < 0 ) ) - { - OSL_FAIL( "FormController::textChanged: m_nCurrentFilterPosition is wrong!" ); - return; - } + if ( m_bSuspendFilterTextListening ) + return; - FmFilterRow& rRow = m_aFilterRows[ m_nCurrentFilterPosition ]; + Reference< XTextComponent > xText(e.Source,UNO_QUERY); + ::rtl::OUString aText = xText->getText(); - // do we have a new filter - if (aText.getLength()) - rRow[xText] = aText; - else - { - // do we have the control in the row - FmFilterRow::iterator iter = rRow.find(xText); - // erase the entry out of the row - if (iter != rRow.end()) - rRow.erase(iter); - } + if ( m_aFilterRows.empty() ) + appendEmptyDisjunctiveTerm(); - // multiplex the event to our FilterControllerListeners - FilterEvent aEvent; - aEvent.Source = *this; - aEvent.FilterComponent = ::std::find( m_aFilterComponents.begin(), m_aFilterComponents.end(), xText ) - m_aFilterComponents.begin(); - aEvent.DisjunctiveTerm = getActiveTerm(); - aEvent.PredicateExpression = aText; + // Suchen der aktuellen Row + if ( ( (size_t)m_nCurrentFilterPosition >= m_aFilterRows.size() ) || ( m_nCurrentFilterPosition < 0 ) ) + { + OSL_ENSURE( false, "FormController::textChanged: m_nCurrentFilterPosition is wrong!" ); + return; + } - aGuard.clear(); - // <-- SYNCHRONIZED + FmFilterRow& rRow = m_aFilterRows[ m_nCurrentFilterPosition ]; - // notify the changed filter expression - m_aFilterListeners.notifyEach( &XFilterControllerListener::predicateExpressionChanged, aEvent ); - } + // do we have a new filter + if (aText.getLength()) + rRow[xText] = aText; else - impl_onModify(); + { + // do we have the control in the row + FmFilterRow::iterator iter = rRow.find(xText); + // erase the entry out of the row + if (iter != rRow.end()) + rRow.erase(iter); + } + + // multiplex the event to our FilterControllerListeners + FilterEvent aEvent; + aEvent.Source = *this; + aEvent.FilterComponent = ::std::find( m_aFilterComponents.begin(), m_aFilterComponents.end(), xText ) - m_aFilterComponents.begin(); + aEvent.DisjunctiveTerm = getActiveTerm(); + aEvent.PredicateExpression = aText; + + aGuard.clear(); + // <-- SYNCHRONIZED + + // notify the changed filter expression + m_aFilterListeners.notifyEach( &XFilterControllerListener::predicateExpressionChanged, aEvent ); } // XItemListener diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index 3cb853b3e6..3cb853b3e6 100644..100755 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx index 7841d7edc5..7841d7edc5 100644..100755 --- a/svx/source/form/formdispatchinterceptor.cxx +++ b/svx/source/form/formdispatchinterceptor.cxx diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx index b64ffad561..b64ffad561 100644..100755 --- a/svx/source/form/formfeaturedispatcher.cxx +++ b/svx/source/form/formfeaturedispatcher.cxx diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src index f92b762b84..5b9312a674 100644..100755 --- a/svx/source/form/formshell.src +++ b/svx/source/form/formshell.src @@ -25,12 +25,13 @@ * ************************************************************************/ -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <sfx2/sfxsids.hrc> #include "globlmn.hrc" #include "helpid.hrc" +#include "fmhelp.hrc" Menu RID_FM_TEXTATTRIBUTE_MENU { @@ -47,7 +48,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_STYLE; - HelpID = MENU_FM_TEXTATTRIBITES_STYLE; + HelpID = HID_MENU_FM_TEXTATTRIBUTES_STYLE; Text [ en-US ] = "St~yle"; SubMenu = Menu { @@ -96,7 +97,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_ALIGNMENT; - HelpID = MENU_FM_TEXTATTRIBITES_ALIGNMENT; + HelpID = HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT; Text [ en-US ] = "~Alignment"; RadioCheck = TRUE; SubMenu = Menu @@ -129,7 +130,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_SPACING; - HelpID = MENU_FM_TEXTATTRIBITES_SPACING; + HelpID = HID_MENU_FM_TEXTATTRIBUTES_SPACING; Text [ en-US ] = "~Line Spacing"; _MenuItemFlags = MIB_RADIOCHECK; SubMenu = Menu diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx index a0835a864a..6ca8fa78aa 100644..100755 --- a/svx/source/form/formtoolbars.cxx +++ b/svx/source/form/formtoolbars.cxx @@ -59,7 +59,7 @@ namespace svxform } //-------------------------------------------------------------------- - void FormToolboxes::toggleToolbox( USHORT _nSlotId ) const + void FormToolboxes::toggleToolbox( sal_uInt16 _nSlotId ) const { try { @@ -87,14 +87,14 @@ namespace svxform } //-------------------------------------------------------------------- - bool FormToolboxes::isToolboxVisible( USHORT _nSlotId ) const + bool FormToolboxes::isToolboxVisible( sal_uInt16 _nSlotId ) const { return m_xLayouter.is() && m_xLayouter->isElementVisible( getToolboxResourceName( _nSlotId ) ); } //-------------------------------------------------------------------- - ::rtl::OUString FormToolboxes::getToolboxResourceName( USHORT _nSlotId ) const + ::rtl::OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const { OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) || ( _nSlotId == SID_FM_CONFIG ), "FormToolboxes::getToolboxResourceName: unsupported slot!" ); diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx index 64c3805365..64c3805365 100644..100755 --- a/svx/source/form/legacyformcontroller.cxx +++ b/svx/source/form/legacyformcontroller.cxx diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk index 44bcd53d23..1088283c61 100644..100755 --- a/svx/source/form/makefile.mk +++ b/svx/source/form/makefile.mk @@ -40,13 +40,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- -.IF "$(ENABLE_VBA)"=="YES" - CDEFS+=-DENABLE_VBA -.ENDIF - -.IF "$(ENABLE_VBA)"=="YES" - CDEFS+=-DENABLE_VBA -.ENDIF +CDEFS+=-DENABLE_VBA SRS1NAME=form SRC1FILES= \ diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index fd93c6bb95..2780e7763c 100644..100755 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -33,12 +33,12 @@ #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <svx/svdpagv.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "fmhelp.hrc" #include "fmexpl.hrc" #include "fmexpl.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmshimp.hxx" #include "fmservs.hxx" #include "fmundo.hxx" @@ -58,7 +58,7 @@ #include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> @@ -698,7 +698,7 @@ namespace svxform } //------------------------------------------------------------------------ - SvLBoxEntry* NavigatorTree::Insert( FmEntryData* pEntryData, ULONG nRelPos ) + SvLBoxEntry* NavigatorTree::Insert( FmEntryData* pEntryData, sal_uIntPtr nRelPos ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::Insert" ); ////////////////////////////////////////////////////////////////////// @@ -760,7 +760,7 @@ namespace svxform // beim eigentlichen Entfernen kann die Selection geaendert werden, da ich aber das SelectionHandling abgeschaltet // habe, muss ich mich hinterher darum kuemmern - ULONG nExpectedSelectionCount = GetSelectionCount(); + sal_uIntPtr nExpectedSelectionCount = GetSelectionCount(); if( pEntry ) GetModel()->Remove( pEntry ); @@ -1738,7 +1738,7 @@ namespace svxform // erstmal die PropertySet-Interfaces der Forms einsammeln for ( sal_Int32 i = 0; i < m_nFormsSelected; ++i ) { - FmFormData* pFormData = (FmFormData*)m_arrCurrentSelection.GetObject((USHORT)i)->GetUserData(); + FmFormData* pFormData = (FmFormData*)m_arrCurrentSelection.GetObject((sal_uInt16)i)->GetUserData(); aSelection.insert( pFormData->GetPropertySet().get() ); } } @@ -1748,7 +1748,7 @@ namespace svxform { // ein MultiSet fuer die Properties der hidden controls for ( sal_Int32 i = 0; i < m_nHiddenControls; ++i ) { - FmEntryData* pEntryData = (FmEntryData*)m_arrCurrentSelection.GetObject((USHORT)i)->GetUserData(); + FmEntryData* pEntryData = (FmEntryData*)m_arrCurrentSelection.GetObject((sal_uInt16)i)->GetUserData(); aSelection.insert( pEntryData->GetPropertySet().get() ); } } @@ -1780,7 +1780,7 @@ namespace svxform RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::DeleteSelection" ); // die Root darf ich natuerlich nicht mitloeschen sal_Bool bRootSelected = IsSelected(m_pRootEntry); - ULONG nSelectedEntries = GetSelectionCount(); + sal_uIntPtr nSelectedEntries = GetSelectionCount(); if (bRootSelected && (nSelectedEntries > 1)) // die Root plus andere Elemente ? Select(m_pRootEntry, sal_False); // ja -> die Root raus @@ -1821,7 +1821,7 @@ namespace svxform // then go on to the strucure. This means I have to delete the forms *after* the normal controls, so // that during UNDO, they're restored in the proper order. pFormShell->GetImpl()->EnableTrackProperties(sal_False); - USHORT i; + sal_uInt16 i; for (i = m_arrCurrentSelection.Count(); i>0; --i) { FmEntryData* pCurrent = (FmEntryData*)(m_arrCurrentSelection.GetObject(i - 1)->GetUserData()); @@ -2081,7 +2081,7 @@ namespace svxform for (sal_uInt32 i=0; i<m_arrCurrentSelection.Count(); ++i) { - SvLBoxEntry* pSelectionLoop = m_arrCurrentSelection.GetObject((USHORT)i); + SvLBoxEntry* pSelectionLoop = m_arrCurrentSelection.GetObject((sal_uInt16)i); // Bei Formselektion alle Controls dieser Form markieren if (IsFormEntry(pSelectionLoop) && (pSelectionLoop != m_pRootEntry)) MarkViewObj((FmFormData*)pSelectionLoop->GetUserData(), sal_True, sal_False); @@ -2275,7 +2275,7 @@ namespace svxform continue; bPaint = true; - + } // while ( aIter.IsMore() ) if ( bPaint ) { diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index a3c1ab0fb9..e7ad4200ab 100644..100755 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -33,7 +33,7 @@ #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <svx/fmglob.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdogrp.hxx> #include <svx/svdpagv.hxx> @@ -43,7 +43,7 @@ #include "fmhelp.hrc" #include "fmexpl.hrc" #include "fmexpl.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmshimp.hxx" #include "fmobj.hxx" #include <sfx2/objsh.hxx> @@ -290,7 +290,7 @@ namespace svxform } //------------------------------------------------------------------------ - void NavigatorTreeModel::Insert(FmEntryData* pEntry, ULONG nRelPos, sal_Bool bAlterModel) + void NavigatorTreeModel::Insert(FmEntryData* pEntry, sal_uLong nRelPos, sal_Bool bAlterModel) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Insert" ); if (IsListening(*m_pFormModel)) @@ -865,7 +865,7 @@ namespace svxform FmNavRequestSelectHint rshRequestSelection; sal_Bool bIsMixedSelection = sal_False; - for (ULONG i=0; (i<mlMarked.GetMarkCount()) && !bIsMixedSelection; i++) + for (sal_uLong i=0; (i<mlMarked.GetMarkCount()) && !bIsMixedSelection; i++) { SdrObject* pobjCurrent = mlMarked.GetMark(i)->GetMarkedSdrObj(); bIsMixedSelection |= !InsertFormComponent(rshRequestSelection, pobjCurrent); @@ -992,7 +992,7 @@ namespace svxform && (pEntryData!=pChildData) ) { - + SQLContext aError; aError.Message = String(SVX_RES(RID_ERR_CONTEXT_ADDFORM)); diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx index 084bad82c2..084bad82c2 100644..100755 --- a/svx/source/form/sdbdatacolumn.cxx +++ b/svx/source/form/sdbdatacolumn.cxx diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index ba8ebe4aac..f50e67d9ca 100644..100755 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "sqlparserclient.hxx" -#include "ParseContext.hxx" +#include "svx/ParseContext.hxx" //........................................................................ namespace svxform diff --git a/svx/source/form/stringlistresource.cxx b/svx/source/form/stringlistresource.cxx index 9e06f0851f..aaa4037513 100644..100755 --- a/svx/source/form/stringlistresource.cxx +++ b/svx/source/form/stringlistresource.cxx @@ -51,7 +51,7 @@ namespace svx StringListResource::StringListResource( const ResId& _rResId ) :Resource( _rResId ) { - USHORT nLocalID = 1; + sal_uInt16 nLocalID = 1; ResId aLocalID( nLocalID, *_rResId.GetResMgr() ); while ( IsAvailableRes( aLocalID.SetRT( RSC_STRING ) ) ) { diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index e3632cd731..a75fa9d2da 100644..100755 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -55,7 +55,7 @@ #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/dialmgr.hxx> #include <tools/shl.hxx> #include <svx/svdpagv.hxx> @@ -119,9 +119,9 @@ void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::X if ( xColumn->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) ) xColumn->getPropertyValue(FM_PROP_LABEL) >>= sLabel; if ( sLabel.getLength() ) - _rListBox.InsertEntry( sLabel,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); + _rListBox.InsertEntry( sLabel,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); else - _rListBox.InsertEntry( *pEntries,NULL,FALSE,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); + _rListBox.InsertEntry( *pEntries,NULL,sal_False,LIST_APPEND,new ColumnInfo(*pEntries,sLabel) ); } } //================================================================== @@ -158,7 +158,7 @@ sal_Int8 FmFieldWinListBox::ExecuteDrop( const ExecuteDropEvent& /*rEvt*/ ) } //------------------------------------------------------------------------------ -BOOL FmFieldWinListBox::DoubleClickHdl() +sal_Bool FmFieldWinListBox::DoubleClickHdl() { if ( pTabWin->createSelectionControls() ) return sal_True; diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index c2cd8dadb8..910554c6ca 100644..100755 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -44,10 +44,10 @@ #include <vcl/sound.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include "tbxctl.hxx" -#include "tbxdraw.hxx" +#include "svx/tbxctl.hxx" +#include "svx/tbxdraw.hxx" #include "tbxform.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmitems.hxx" #include "fmhelp.hrc" #include <sfx2/viewfrm.hxx> @@ -76,7 +76,7 @@ SvxFmAbsRecWin::SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pControlle SetSizePixel( Size(70,19) ); SetDecimalDigits(0); - SetStrictFormat(TRUE); + SetStrictFormat(sal_True); } // ----------------------------------------------------------------------- @@ -96,7 +96,7 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce ) return; } - SfxInt32Item aPositionParam( FN_PARAM_1, static_cast<INT32>(nRecord) ); + SfxInt32Item aPositionParam( FN_PARAM_1, static_cast<sal_Int32>(nRecord) ); Any a; Sequence< PropertyValue > aArgs( 1 ); @@ -132,7 +132,7 @@ void SvxFmAbsRecWin::KeyInput( const KeyEvent& rKeyEvent ) struct MapSlotToCmd { - USHORT nSlotId; + sal_uInt16 nSlotId; const char* pCommand; }; @@ -165,7 +165,7 @@ static MapSlotToCmd SlotToCommands[] = SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlConfig, SfxUInt16Item ); //----------------------------------------------------------------------- -SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) +SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) ,nLastSlot( 0 ) { @@ -173,11 +173,11 @@ SvxFmTbxCtlConfig::SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx } //----------------------------------------------------------------------- -void SvxFmTbxCtlConfig::StateChanged(USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if (nSID == SID_FM_CONFIG) { - UINT16 nSlot = 0; + sal_uInt16 nSlot = 0; if (eState >= SFX_ITEM_AVAILABLE) nSlot = ((SfxUInt16Item*)pState)->GetValue(); @@ -236,13 +236,13 @@ SfxPopupWindow* SvxFmTbxCtlConfig::CreatePopupWindow() } //----------------------------------------------------------------------- -void SvxFmTbxCtlConfig::Select( USHORT /*nModifier*/ ) +void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ ) { ////////////////////////////////////////////////////////////////////// // Click auf den Button SID_FM_CONFIG in der ObjectBar if ( nLastSlot ) { - USHORT n = 0; + sal_uInt16 n = 0; while( SlotToCommands[n].nSlotId > 0 ) { if ( SlotToCommands[n].nSlotId == nLastSlot ) @@ -267,7 +267,7 @@ void SvxFmTbxCtlConfig::Select( USHORT /*nModifier*/ ) SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlAbsRec, SfxInt32Item ); DBG_NAME(SvxFmTbxCtlAbsRec); //----------------------------------------------------------------------- -SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) +SvxFmTbxCtlAbsRec::SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) { DBG_CTOR(SvxFmTbxCtlAbsRec,NULL); @@ -280,9 +280,9 @@ SvxFmTbxCtlAbsRec::~SvxFmTbxCtlAbsRec() } //----------------------------------------------------------------------- -void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +void SvxFmTbxCtlAbsRec::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - USHORT nId = GetId(); + sal_uInt16 nId = GetId(); ToolBox* pToolBox = &GetToolBox(); SvxFmAbsRecWin* pWin = (SvxFmAbsRecWin*)( pToolBox->GetItemWindow(nId) ); @@ -295,7 +295,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const Sf pWin->SetValue( pItem ? pItem->GetValue() : -1 ); } - BOOL bEnable = SFX_ITEM_DISABLED != eState && pState; + sal_Bool bEnable = SFX_ITEM_DISABLED != eState && pState; if (!bEnable) pWin->SetText(String()); @@ -321,7 +321,7 @@ Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent ) SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecText, SfxBoolItem ); DBG_NAME(SvxFmTbxCtlRecText); //----------------------------------------------------------------------- -SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) +SvxFmTbxCtlRecText::SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) { DBG_CTOR(SvxFmTbxCtlRecText,NULL); @@ -355,7 +355,7 @@ Window* SvxFmTbxCtlRecText::CreateItemWindow( Window* pParent ) SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecFromText, SfxBoolItem ); DBG_NAME(SvxFmTbxCtlRecFromText); //----------------------------------------------------------------------- -SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) +SvxFmTbxCtlRecFromText::SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) { DBG_CTOR(SvxFmTbxCtlRecFromText,NULL); @@ -388,7 +388,7 @@ DBG_NAME(SvxFmTbxCtlRecTotal); SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxCtlRecTotal, SfxStringItem ); //----------------------------------------------------------------------- -SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) +SvxFmTbxCtlRecTotal::SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) ,pFixedText( NULL ) { @@ -410,12 +410,12 @@ Window* SvxFmTbxCtlRecTotal::CreateItemWindow( Window* pParent ) aSize.Width() += 12; pFixedText->SetSizePixel( aSize ); pFixedText->SetBackground(); - pFixedText->SetPaintTransparent(TRUE); + pFixedText->SetPaintTransparent(sal_True); return pFixedText; } //----------------------------------------------------------------------- -void SvxFmTbxCtlRecTotal::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { ////////////////////////////////////////////////////////////////////// // Setzen des FixedTextes @@ -441,7 +441,7 @@ void SvxFmTbxCtlRecTotal::StateChanged( USHORT nSID, SfxItemState eState, const SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxNextRec, SfxBoolItem ); //----------------------------------------------------------------------- -SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) +SvxFmTbxNextRec::SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) { rTbx.SetItemBits(nId, rTbx.GetItemBits(nId) | TIB_REPEAT); @@ -450,7 +450,7 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) MouseSettings aMouseSettings = aSettings.GetMouseSettings(); aMouseSettings.SetButtonRepeat(aMouseSettings.GetButtonRepeat() / 4); aSettings.SetMouseSettings(aMouseSettings); - rTbx.SetSettings(aSettings, TRUE); + rTbx.SetSettings(aSettings, sal_True); } //======================================================================== @@ -459,7 +459,7 @@ SvxFmTbxNextRec::SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) SFX_IMPL_TOOLBOX_CONTROL( SvxFmTbxPrevRec, SfxBoolItem ); //----------------------------------------------------------------------- -SvxFmTbxPrevRec::SvxFmTbxPrevRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) +SvxFmTbxPrevRec::SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) { rTbx.SetItemBits(nId, rTbx.GetItemBits(nId) | TIB_REPEAT); diff --git a/svx/source/form/typeconversionclient.cxx b/svx/source/form/typeconversionclient.cxx index b20b75a7dd..b20b75a7dd 100644..100755 --- a/svx/source/form/typeconversionclient.cxx +++ b/svx/source/form/typeconversionclient.cxx diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index dfb5a1b79f..ee6002ac34 100644..100755 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -38,7 +38,7 @@ #include <editeng/cntritem.hxx> #include <editeng/shdditem.hxx> #include <editeng/postitem.hxx> -#include "clipfmtitem.hxx" +#include "svx/clipfmtitem.hxx" #include <editeng/fhgtitem.hxx> #include "editeng/fontitem.hxx" #include <editeng/charreliefitem.hxx> diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx index 1911c06f81..1911c06f81 100644..100755 --- a/svx/source/form/xfm_addcondition.cxx +++ b/svx/source/form/xfm_addcondition.cxx diff --git a/svx/source/gallery2/codec.cxx b/svx/source/gallery2/codec.cxx index c9067aa789..127d75348d 100644..100755 --- a/svx/source/gallery2/codec.cxx +++ b/svx/source/gallery2/codec.cxx @@ -50,23 +50,23 @@ GalleryCodec::~GalleryCodec() // ----------------------------------------------------------------------------- -BOOL GalleryCodec::IsCoded( SvStream& rStm, UINT32& rVersion ) +sal_Bool GalleryCodec::IsCoded( SvStream& rStm, sal_uInt32& rVersion ) { - const ULONG nPos = rStm.Tell(); - BOOL bRet; - BYTE cByte1, cByte2, cByte3, cByte4, cByte5, cByte6; + const sal_uIntPtr nPos = rStm.Tell(); + sal_Bool bRet; + sal_uInt8 cByte1, cByte2, cByte3, cByte4, cByte5, cByte6; rStm >> cByte1 >> cByte2 >> cByte3 >> cByte4 >> cByte5 >> cByte6; if ( cByte1 == 'S' && cByte2 == 'V' && cByte3 == 'R' && cByte4 == 'L' && cByte5 == 'E' && ( cByte6 == '1' || cByte6 == '2' ) ) { rVersion = ( ( cByte6 == '1' ) ? 1 : 2 ); - bRet = TRUE; + bRet = sal_True; } else { rVersion = 0; - bRet = FALSE; + bRet = sal_False; } rStm.Seek( nPos ); @@ -78,10 +78,10 @@ BOOL GalleryCodec::IsCoded( SvStream& rStm, UINT32& rVersion ) void GalleryCodec::Write( SvStream& rStmToWrite ) { - UINT32 nPos, nCompSize; + sal_uInt32 nPos, nCompSize; rStmToWrite.Seek( STREAM_SEEK_TO_END ); - const UINT32 nSize = rStmToWrite.Tell(); + const sal_uInt32 nSize = rStmToWrite.Tell(); rStmToWrite.Seek( 0UL ); rStm << 'S' << 'V' << 'R' << 'L' << 'E' << '2'; @@ -105,11 +105,11 @@ void GalleryCodec::Write( SvStream& rStmToWrite ) void GalleryCodec::Read( SvStream& rStmToRead ) { - UINT32 nVersion = 0; + sal_uInt32 nVersion = 0; if( IsCoded( rStm, nVersion ) ) { - UINT32 nCompressedSize, nUnCompressedSize; + sal_uInt32 nCompressedSize, nUnCompressedSize; rStm.SeekRel( 6 ); rStm >> nUnCompressedSize >> nCompressedSize; @@ -117,13 +117,13 @@ void GalleryCodec::Read( SvStream& rStmToRead ) // decompress if( 1 == nVersion ) { - BYTE* pCompressedBuffer = new BYTE[ nCompressedSize ]; rStm.Read( pCompressedBuffer, nCompressedSize ); - BYTE* pInBuf = pCompressedBuffer; - BYTE* pOutBuf = new BYTE[ nUnCompressedSize ]; - BYTE* pTmpBuf = pOutBuf; - BYTE* pLast = pOutBuf + nUnCompressedSize - 1; - ULONG nIndex = 0UL, nCountByte, nRunByte; - BOOL bEndDecoding = FALSE; + sal_uInt8* pCompressedBuffer = new sal_uInt8[ nCompressedSize ]; rStm.Read( pCompressedBuffer, nCompressedSize ); + sal_uInt8* pInBuf = pCompressedBuffer; + sal_uInt8* pOutBuf = new sal_uInt8[ nUnCompressedSize ]; + sal_uInt8* pTmpBuf = pOutBuf; + sal_uInt8* pLast = pOutBuf + nUnCompressedSize - 1; + sal_uIntPtr nIndex = 0UL, nCountByte, nRunByte; + sal_Bool bEndDecoding = sal_False; do { @@ -145,11 +145,11 @@ void GalleryCodec::Read( SvStream& rStmToRead ) pInBuf++; } else if ( nRunByte == 1 ) // Ende des Bildes - bEndDecoding = TRUE; + bEndDecoding = sal_True; } else { - const BYTE cVal = *pInBuf++; + const sal_uInt8 cVal = *pInBuf++; memset( &pTmpBuf[ nIndex ], cVal, nCountByte ); nIndex += nCountByte; diff --git a/svx/source/gallery2/codec.hxx b/svx/source/gallery2/codec.hxx index d5985dcbd2..d76a41e639 100644..100755 --- a/svx/source/gallery2/codec.hxx +++ b/svx/source/gallery2/codec.hxx @@ -48,7 +48,7 @@ public: void Write( SvStream& rStmToWrite ); void Read( SvStream& rStmToRead ); - static BOOL IsCoded( SvStream& rStm, UINT32& rVersion ); + static sal_Bool IsCoded( SvStream& rStm, sal_uInt32& rVersion ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx index 4797e4ecbb..2374aec009 100644..100755 --- a/svx/source/gallery2/galbrws.cxx +++ b/svx/source/gallery2/galbrws.cxx @@ -39,7 +39,7 @@ #include "svx/gallery1.hxx" #include "galbrws1.hxx" #include "galbrws2.hxx" -#include "galbrws.hxx" +#include "svx/galbrws.hxx" // ------------------- // - GallerySplitter - @@ -82,7 +82,7 @@ void GallerySplitter::DataChanged( const DataChangedEvent& rDCEvt ) // - SvxGalleryChildWindow - // ------------------------- -GalleryChildWindow::GalleryChildWindow( Window* _pParent, USHORT nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : +GalleryChildWindow::GalleryChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) { pWindow = new GalleryBrowser( pBindings, this, _pParent, GAL_RESID( RID_SVXDLG_GALLERYBROWSER ) ); @@ -117,11 +117,11 @@ GalleryBrowser::GalleryBrowser( SfxBindings* _pBindings, SfxChildWindow* pCW, SetMinOutputSizePixel( maLastSize = GetOutputSizePixel() ); mpBrowser1->SelectTheme( 0 ); - mpBrowser1->Show( TRUE ); - mpBrowser2->Show( TRUE ); + mpBrowser1->Show( sal_True ); + mpBrowser2->Show( sal_True ); mpSplitter->SetSplitHdl( LINK( this, GalleryBrowser, SplitHdl ) ); - mpSplitter->Show( TRUE ); + mpSplitter->Show( sal_True ); InitSettings(); } @@ -183,17 +183,17 @@ void GalleryBrowser::Resize() // ----------------------------------------------------------------------------- -BOOL GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* ) +sal_Bool GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* ) { - const USHORT nCode = rKEvt.GetKeyCode().GetCode(); - BOOL bRet = ( !rKEvt.GetKeyCode().IsMod1() && + const sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); + sal_Bool bRet = ( !rKEvt.GetKeyCode().IsMod1() && ( ( KEY_TAB == nCode ) || ( KEY_F6 == nCode && rKEvt.GetKeyCode().IsMod2() ) ) ); if( bRet ) { if( !rKEvt.GetKeyCode().IsShift() ) { - if( mpBrowser1->mpThemes->HasChildPathFocus( TRUE ) ) + if( mpBrowser1->mpThemes->HasChildPathFocus( sal_True ) ) mpBrowser2->GetViewWindow()->GrabFocus(); else if( mpBrowser2->GetViewWindow()->HasFocus() ) mpBrowser2->maViewBox.GrabFocus(); @@ -204,7 +204,7 @@ BOOL GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* ) } else { - if( mpBrowser1->mpThemes->HasChildPathFocus( TRUE ) ) + if( mpBrowser1->mpThemes->HasChildPathFocus( sal_True ) ) mpBrowser1->maNewTheme.GrabFocus(); else if( mpBrowser1->maNewTheme.HasFocus() ) mpBrowser2->maViewBox.GrabFocus(); @@ -220,7 +220,7 @@ BOOL GalleryBrowser::KeyInput( const KeyEvent& rKEvt, Window* ) // ----------------------------------------------------------------------------- -BOOL GalleryBrowser::Close() +sal_Bool GalleryBrowser::Close() { return SfxDockingWindow::Close(); } @@ -263,14 +263,14 @@ Graphic GalleryBrowser::GetGraphic() const // ----------------------------------------------------------------------------- -BOOL GalleryBrowser::GetVCDrawModel( FmFormModel& rModel ) const +sal_Bool GalleryBrowser::GetVCDrawModel( FmFormModel& rModel ) const { return mpBrowser2->GetVCDrawModel( rModel ); } // ----------------------------------------------------------------------------- -BOOL GalleryBrowser::IsLinkage() const +sal_Bool GalleryBrowser::IsLinkage() const { return mpBrowser2->IsLinkage(); } diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 1b29274dd0..2d909e7fc8 100644..100755 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -36,12 +36,14 @@ #include <sfx2/app.hxx> #include "helpid.hrc" #include "svx/gallery1.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/galmisc.hxx" #include "galbrws1.hxx" #include <com/sun/star/util/DateTime.hpp> #include "gallery.hrc" #include <algorithm> +#include <svx/dialogs.hrc> +#include <svx/dialmgr.hxx> #include <svx/svxdlg.hxx> @@ -162,13 +164,14 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, mpThemes->SetHelpId( HID_GALLERY_THEMELIST ); mpThemes->SetSelectHdl( LINK( this, GalleryBrowser1, SelectThemeHdl ) ); + mpThemes->SetAccessibleName(String(SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ) ); - for( ULONG i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ ) + for( sal_uIntPtr i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ ) ImplInsertThemeEntry( mpGallery->GetThemeInfo( i ) ); ImplAdjustControls(); - maNewTheme.Show( TRUE ); - mpThemes->Show( TRUE ); + maNewTheme.Show( sal_True ); + mpThemes->Show( sal_True ); } // ----------------------------------------------------------------------------- @@ -184,11 +187,11 @@ GalleryBrowser1::~GalleryBrowser1() // ----------------------------------------------------------------------------- -ULONG GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ) +sal_uIntPtr GalleryBrowser1::ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ) { - static const BOOL bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL ); + static const sal_Bool bShowHiddenThemes = ( getenv( "GALLERY_SHOW_HIDDEN_THEMES" ) != NULL ); - ULONG nRet = LISTBOX_ENTRY_NOTFOUND; + sal_uIntPtr nRet = LISTBOX_ENTRY_NOTFOUND; if( pEntry && ( !pEntry->IsHidden() || bShowHiddenThemes ) ) { @@ -255,30 +258,30 @@ void GalleryBrowser1::ImplFillExchangeData( const GalleryTheme* pThm, ExchangeDa // ----------------------------------------------------------------------------- -::std::vector< USHORT > GalleryBrowser1::ImplGetExecuteVector() +::std::vector< sal_uInt16 > GalleryBrowser1::ImplGetExecuteVector() { - ::std::vector< USHORT > aExecVector; + ::std::vector< sal_uInt16 > aExecVector; GalleryTheme* pTheme = mpGallery->AcquireTheme( GetSelectedTheme(), *this ); if( pTheme ) { - BOOL bUpdateAllowed, bRenameAllowed, bRemoveAllowed; - static const BOOL bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != NULL ); + sal_Bool bUpdateAllowed, bRenameAllowed, bRemoveAllowed; + static const sal_Bool bIdDialog = ( getenv( "GALLERY_ENABLE_ID_DIALOG" ) != NULL ); if( pTheme->IsReadOnly() ) - bUpdateAllowed = bRenameAllowed = bRemoveAllowed = FALSE; + bUpdateAllowed = bRenameAllowed = bRemoveAllowed = sal_False; else if( pTheme->IsImported() ) { - bUpdateAllowed = FALSE; - bRenameAllowed = bRemoveAllowed = TRUE; + bUpdateAllowed = sal_False; + bRenameAllowed = bRemoveAllowed = sal_True; } else if( pTheme->IsDefault() ) { - bUpdateAllowed = bRenameAllowed = TRUE; - bRemoveAllowed = FALSE; + bUpdateAllowed = bRenameAllowed = sal_True; + bRemoveAllowed = sal_False; } else - bUpdateAllowed = bRenameAllowed = bRemoveAllowed = TRUE; + bUpdateAllowed = bRenameAllowed = bRemoveAllowed = sal_True; if( bUpdateAllowed && pTheme->GetObjectCount() ) aExecVector.push_back( MN_ACTUALIZE ); @@ -341,7 +344,7 @@ void GalleryBrowser1::ImplEndGalleryThemeProperties( VclAbstractDialog2* pDialog { const String aOldName( aName ); String aTitle( mpExchangeData->aEditedTitle ); - USHORT nCount = 0; + sal_uInt16 nCount = 0; while( mpGallery->HasTheme( aTitle ) && ( nCount++ < 16000 ) ) { @@ -400,7 +403,7 @@ IMPL_LINK( GalleryBrowser1, DestroyThemePropertiesDlgHdl, VclAbstractDialog2*, p // ----------------------------------------------------------------------------- -void GalleryBrowser1::ImplExecute( USHORT nId ) +void GalleryBrowser1::ImplExecute( sal_uInt16 nId ) { switch( nId ) { @@ -446,7 +449,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId ) if( aNewName.Len() && ( aNewName != aOldName ) ) { String aName( aNewName ); - USHORT nCount = 0; + sal_uInt16 nCount = 0; while( mpGallery->HasTheme( aName ) && ( nCount++ < 16000 ) ) { @@ -477,7 +480,7 @@ void GalleryBrowser1::ImplExecute( USHORT nId ) DBG_ASSERT(aDlg, "Dialogdiet fail!"); if( aDlg->Execute() == RET_OK ) - pTheme->SetId( aDlg->GetId(), TRUE ); + pTheme->SetId( aDlg->GetId(), sal_True ); delete aDlg; } } @@ -525,8 +528,8 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint ) case( GALLERY_HINT_THEME_RENAMED ): { - const USHORT nCurSelectPos = mpThemes->GetSelectEntryPos(); - const USHORT nRenameEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() ); + const sal_uInt16 nCurSelectPos = mpThemes->GetSelectEntryPos(); + const sal_uInt16 nRenameEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() ); mpThemes->RemoveEntry( rGalleryHint.GetThemeName() ); ImplInsertThemeEntry( mpGallery->GetThemeInfo( rGalleryHint.GetStringData() ) ); @@ -547,8 +550,8 @@ void GalleryBrowser1::Notify( SfxBroadcaster&, const SfxHint& rHint ) case( GALLERY_HINT_CLOSE_THEME ): { - const USHORT nCurSelectPos = mpThemes->GetSelectEntryPos(); - const USHORT nCloseEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() ); + const sal_uInt16 nCurSelectPos = mpThemes->GetSelectEntryPos(); + const sal_uInt16 nCloseEntryPos = mpThemes->GetEntryPos( rGalleryHint.GetThemeName() ); if( nCurSelectPos == nCloseEntryPos ) { @@ -578,15 +581,15 @@ void GalleryBrowser1::ShowContextMenu() // ----------------------------------------------------------------------------- -BOOL GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) +sal_Bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) { - BOOL bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow ); + sal_Bool bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow ); if( !bRet ) { - ::std::vector< USHORT > aExecVector( ImplGetExecuteVector() ); - USHORT nExecuteId = 0; - BOOL bMod1 = rKEvt.GetKeyCode().IsMod1(); + ::std::vector< sal_uInt16 > aExecVector( ImplGetExecuteVector() ); + sal_uInt16 nExecuteId = 0; + sal_Bool bMod1 = rKEvt.GetKeyCode().IsMod1(); switch( rKEvt.GetKeyCode().GetCode() ) { @@ -637,7 +640,7 @@ BOOL GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) if( nExecuteId && ( ::std::find( aExecVector.begin(), aExecVector.end(), nExecuteId ) != aExecVector.end() ) ) { ImplExecute( nExecuteId ); - bRet = TRUE; + bRet = sal_True; } } @@ -648,7 +651,7 @@ BOOL GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) IMPL_LINK( GalleryBrowser1, ShowContextMenuHdl, void*, EMPTYARG ) { - ::std::vector< USHORT > aExecVector( ImplGetExecuteVector() ); + ::std::vector< sal_uInt16 > aExecVector( ImplGetExecuteVector() ); if( aExecVector.size() ) { @@ -696,7 +699,7 @@ IMPL_LINK( GalleryBrowser1, ClickNewThemeHdl, void*, EMPTYARG ) { String aNewTheme( GAL_RESID( RID_SVXSTR_GALLERY_NEWTHEME ) ); String aName( aNewTheme ); - ULONG nCount = 0; + sal_uIntPtr nCount = 0; while( mpGallery->HasTheme( aName ) && ( nCount++ < 16000 ) ) { diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index fba8a8323d..cf46cfc5fa 100644..100755 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -31,7 +31,7 @@ #include <vcl/menu.hxx> #include <svl/lstner.hxx> #include <vector> -#include "galbrws.hxx" +#include "svx/galbrws.hxx" // ----------------- // - GalleryButton - @@ -100,10 +100,10 @@ private: Image aImgImported; void ImplAdjustControls(); - ULONG ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ); + sal_uIntPtr ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ); void ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData ); - ::std::vector< USHORT > ImplGetExecuteVector(); - void ImplExecute( USHORT nId ); + ::std::vector< sal_uInt16 > ImplGetExecuteVector(); + void ImplExecute( sal_uInt16 nId ); void ImplGalleryThemeProperties( const String & rThemeName, bool bCreateNew ); void ImplEndGalleryThemeProperties( VclAbstractDialog2* pDialog, bool bCreateNew ); @@ -128,11 +128,11 @@ public: ~GalleryBrowser1(); void SelectTheme( const String& rThemeName ) { mpThemes->SelectEntry( rThemeName ); SelectThemeHdl( NULL ); } - void SelectTheme( ULONG nThemePos ) { mpThemes->SelectEntryPos( (USHORT) nThemePos ); SelectThemeHdl( NULL ); } + void SelectTheme( sal_uIntPtr nThemePos ) { mpThemes->SelectEntryPos( (sal_uInt16) nThemePos ); SelectThemeHdl( NULL ); } String GetSelectedTheme() { return mpThemes->GetEntryCount() ? mpThemes->GetEntry( mpThemes->GetSelectEntryPos() ) : String(); } void ShowContextMenu(); - BOOL KeyInput( const KeyEvent& rKEvt, Window* pWindow ); + sal_Bool KeyInput( const KeyEvent& rKEvt, Window* pWindow ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 9cabafd188..ef95bbd96d 100644..100755 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -45,17 +45,19 @@ #include "svtools/filter.hxx" #include <editeng/brshitem.hxx> #include "helpid.hrc" -#include "gallery.hxx" +#include "svx/gallery.hxx" #include "galobj.hxx" #include "svx/gallery1.hxx" -#include "galtheme.hxx" -#include "galctrl.hxx" +#include "svx/galtheme.hxx" +#include "svx/galctrl.hxx" #include "svx/galmisc.hxx" #include "galbrws2.hxx" #include "gallery.hrc" #include <vcl/svapp.hxx> #include <svx/fmmodel.hxx> +#include <svx/dialmgr.hxx> #include <svx/svxdlg.hxx> +#include <svx/dialogs.hrc> // ----------- // - Defines - @@ -79,20 +81,20 @@ GalleryBrowserMode GalleryBrowser2::meInitMode = GALLERYBROWSERMODE_ICON; class GalleryBackgroundPopup : public PopupMenu, public SfxControllerItem { const GalleryTheme* mpTheme; - ULONG mnObjectPos; + sal_uIntPtr mnObjectPos; virtual void Select(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - GalleryBackgroundPopup( const GalleryTheme* pTheme, ULONG nObjectPos ); + GalleryBackgroundPopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos ); ~GalleryBackgroundPopup(); }; // ------------------------------------------------------------------------ -GalleryBackgroundPopup::GalleryBackgroundPopup( const GalleryTheme* pTheme, ULONG nObjectPos ) : +GalleryBackgroundPopup::GalleryBackgroundPopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos ) : SfxControllerItem ( SID_GALLERY_BG_BRUSH, SfxViewFrame::Current()->GetBindings() ), mpTheme ( pTheme ), mnObjectPos ( nObjectPos ) @@ -109,7 +111,7 @@ GalleryBackgroundPopup::~GalleryBackgroundPopup() // ------------------------------------------------------------------------ -void GalleryBackgroundPopup::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pItem ) +void GalleryBackgroundPopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pItem ) { if ( ( nSID == SID_GALLERY_BG_BRUSH ) && pItem && ( eState != SFX_ITEM_DISABLED ) ) { @@ -123,8 +125,8 @@ void GalleryBackgroundPopup::StateChanged( USHORT nSID, SfxItemState eState, con List* pList = pStrLstItem->GetList(); if( pList ) - for ( ULONG i = 0, nCount = pList->Count(); i < nCount; i++ ) - InsertItem( (USHORT) i + 1, *(String*) pList->GetObject( i ) ); + for ( sal_uIntPtr i = 0, nCount = pList->Count(); i < nCount; i++ ) + InsertItem( (sal_uInt16) i + 1, *(String*) pList->GetObject( i ) ); } else if( ( pStrItem = PTR_CAST( SfxStringItem, pItem ) ) != NULL ) InsertItem( 1, pStrItem->GetValue() ); @@ -159,20 +161,20 @@ class GalleryThemePopup : public PopupMenu, public SfxControllerItem { GalleryBackgroundPopup maBackgroundPopup; const GalleryTheme* mpTheme; - ULONG mnObjectPos; - BOOL mbPreview; + sal_uIntPtr mnObjectPos; + sal_Bool mbPreview; - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); public: - GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectPos, BOOL bPreview ); + GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, sal_Bool bPreview ); ~GalleryThemePopup(); }; // ------------------------------------------------------------------------ -GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectPos, BOOL bPreview ) : +GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, sal_Bool bPreview ) : PopupMenu ( GAL_RESID( RID_SVXMN_GALLERY2 ) ), SfxControllerItem ( SID_GALLERY_ENABLE_ADDCOPY, SfxViewFrame::Current()->GetBindings() ), maBackgroundPopup ( pTheme, nObjectPos ), @@ -186,40 +188,40 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP INetURLObject aURL; const_cast< GalleryTheme* >( mpTheme )->GetURL( mnObjectPos, aURL ); - const BOOL bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID ); + const sal_Bool bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID ); pAddMenu->EnableItem( MN_ADD, bValidURL && SGA_OBJ_SOUND != eObjKind ); pAddMenu->EnableItem( MN_ADD_LINK, bValidURL && SGA_OBJ_SVDRAW != eObjKind ); EnableItem( MN_ADDMENU, pAddMenu->IsItemEnabled( MN_ADD ) || pAddMenu->IsItemEnabled( MN_ADD_LINK ) ); EnableItem( MN_PREVIEW, bValidURL ); - + CheckItem( MN_PREVIEW, mbPreview ); if( mpTheme->IsReadOnly() || !mpTheme->GetObjectCount() ) { - EnableItem( MN_DELETE, FALSE ); - EnableItem( MN_TITLE, FALSE ); + EnableItem( MN_DELETE, sal_False ); + EnableItem( MN_TITLE, sal_False ); if( mpTheme->IsReadOnly() ) - EnableItem( MN_PASTECLIPBOARD, FALSE ); - + EnableItem( MN_PASTECLIPBOARD, sal_False ); + if( !mpTheme->GetObjectCount() ) - EnableItem( MN_COPYCLIPBOARD, FALSE ); + EnableItem( MN_COPYCLIPBOARD, sal_False ); } else { EnableItem( MN_DELETE, !bPreview ); - EnableItem( MN_TITLE, TRUE ); - EnableItem( MN_COPYCLIPBOARD, TRUE ); - EnableItem( MN_PASTECLIPBOARD, TRUE ); + EnableItem( MN_TITLE, sal_True ); + EnableItem( MN_COPYCLIPBOARD, sal_True ); + EnableItem( MN_PASTECLIPBOARD, sal_True ); } #ifdef GALLERY_USE_CLIPBOARD if( IsItemEnabled( MN_PASTECLIPBOARD ) ) { TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( this ) ); - BOOL bEnable = FALSE; + sal_Bool bEnable = sal_False; if( aDataHelper.GetFormatCount() ) { @@ -230,23 +232,23 @@ GalleryThemePopup::GalleryThemePopup( const GalleryTheme* pTheme, ULONG nObjectP aDataHelper.HasFormat( FORMAT_GDIMETAFILE ) || aDataHelper.HasFormat( FORMAT_BITMAP ) ) { - bEnable = TRUE; + bEnable = sal_True; } } if( !bEnable ) - EnableItem( MN_PASTECLIPBOARD, FALSE ); + EnableItem( MN_PASTECLIPBOARD, sal_False ); } #else - EnableItem( MN_COPYCLIPBOARD, FALSE ); - EnableItem( MN_PASTECLIPBOARD, FALSE ); + EnableItem( MN_COPYCLIPBOARD, sal_False ); + EnableItem( MN_PASTECLIPBOARD, sal_False ); #endif if( !maBackgroundPopup.GetItemCount() || ( eObjKind == SGA_OBJ_SVDRAW ) || ( eObjKind == SGA_OBJ_SOUND ) ) - pAddMenu->EnableItem( MN_BACKGROUND, FALSE ); + pAddMenu->EnableItem( MN_BACKGROUND, sal_False ); else { - pAddMenu->EnableItem( MN_BACKGROUND, TRUE ); + pAddMenu->EnableItem( MN_BACKGROUND, sal_True ); pAddMenu->SetPopupMenu( MN_BACKGROUND, &maBackgroundPopup ); } @@ -262,15 +264,15 @@ GalleryThemePopup::~GalleryThemePopup() // ------------------------------------------------------------------------ -void GalleryThemePopup::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pItem ) +void GalleryThemePopup::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pItem ) { if( ( nSID == SID_GALLERY_ENABLE_ADDCOPY ) && pItem && ( eState != SFX_ITEM_DISABLED ) ) { SfxBoolItem* pBoolItem = PTR_CAST( SfxBoolItem, pItem ); const SgaObjKind eObjKind = mpTheme->GetObjectKind( mnObjectPos ); - + DBG_ASSERT( pBoolItem || pBoolItem == 0, "SfxBoolItem erwartet!"); - + GetPopupMenu( MN_ADDMENU )->EnableItem( MN_ADD, pBoolItem->GetValue() && ( eObjKind != SGA_OBJ_SOUND ) ); } } @@ -315,14 +317,14 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId, mnCurActionPos ( 0xffffffff ), meMode ( GALLERYBROWSERMODE_NONE ), meLastMode ( GALLERYBROWSERMODE_NONE ), - mbCurActionIsLinkage( FALSE ) + mbCurActionIsLinkage( sal_False ) { Image aDummyImage; const Link aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) ); Font aInfoFont( maInfoBar.GetControlFont() ); maMiscOptions.AddListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) ); - + maViewBox.InsertItem( TBX_ID_ICON, aDummyImage ); maViewBox.SetItemBits( TBX_ID_ICON, TIB_RADIOCHECK | TIB_AUTOCHECK ); maViewBox.SetHelpId( TBX_ID_ICON, HID_GALLERY_ICONVIEW ); @@ -338,6 +340,9 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId, maViewBox.SetSelectHdl( LINK( this, GalleryBrowser2, SelectTbxHdl ) ); maViewBox.Show(); + mpIconView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) )); + mpListView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) )); + maInfoBar.Show(); maSeparator.Show(); @@ -347,6 +352,12 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId, InitSettings(); SetMode( ( GALLERYBROWSERMODE_PREVIEW != GalleryBrowser2::meInitMode ) ? GalleryBrowser2::meInitMode : GALLERYBROWSERMODE_ICON ); + + if(maInfoBar.GetText().Len() == 0) + mpIconView->SetAccessibleRelationLabeledBy(mpIconView); + else + mpIconView->SetAccessibleRelationLabeledBy(&maInfoBar); + mpIconView->SetAccessibleRelationMemberOf(mpIconView); } // ----------------------------------------------------------------------------- @@ -354,7 +365,7 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId, GalleryBrowser2::~GalleryBrowser2() { maMiscOptions.RemoveListenerLink( LINK( this, GalleryBrowser2, MiscHdl ) ); - + delete mpPreview; delete mpListView; delete mpIconView; @@ -372,7 +383,7 @@ void GalleryBrowser2::InitSettings() aInfoFont.SetWeight( WEIGHT_BOLD ); aInfoFont.SetColor( GALLERY_FG_COLOR ); maInfoBar.SetControlFont( aInfoFont ); - + maInfoBar.SetBackground( Wallpaper( GALLERY_DLG_COLOR ) ); maInfoBar.SetControlBackground( GALLERY_DLG_COLOR ); @@ -407,10 +418,10 @@ void GalleryBrowser2::Resize() const long nInfoBarX = aBoxSize.Width() + ( nOffset * 3 ) + nSepWidth; const Point aPt( 0, aBoxSize.Height() + 3 ); const Size aSz( aOutSize.Width(), aOutSize.Height() - aPt.Y() ); - + maSeparator.SetPosSizePixel( Point( aBoxSize.Width() + nOffset, 0 ), Size( nSepWidth, aBoxSize.Height() ) ); maInfoBar.SetPosSizePixel( Point( nInfoBarX, 0 ), Size( aOutSize.Width() - nInfoBarX, aBoxSize.Height() ) ); - + mpIconView->SetPosSizePixel( aPt, aSz ); mpListView->SetPosSizePixel( aPt, aSz ); mpPreview->SetPosSizePixel( aPt, aSz ); @@ -439,7 +450,7 @@ void GalleryBrowser2::Notify( SfxBroadcaster&, const SfxHint& rHint ) if( GALLERYBROWSERMODE_PREVIEW == GetMode() ) SetMode( meLastMode ); - ImplUpdateViews( (USHORT) rGalleryHint.GetData1() + 1 ); + ImplUpdateViews( (sal_uInt16) rGalleryHint.GetData1() + 1 ); } break; @@ -484,8 +495,8 @@ sal_Int8 GalleryBrowser2::ExecuteDrop( DropTargetHelper&, const ExecuteDropEvent if( mpCurTheme ) { Point aSelPos; - const ULONG nItemId = ImplGetSelectedItemId( &rEvt.maPosPixel, aSelPos ); - const ULONG nInsertPos = ( nItemId ? ( nItemId - 1 ) : LIST_APPEND ); + const sal_uIntPtr nItemId = ImplGetSelectedItemId( &rEvt.maPosPixel, aSelPos ); + const sal_uIntPtr nInsertPos = ( nItemId ? ( nItemId - 1 ) : LIST_APPEND ); if( mpCurTheme->IsDragging() ) mpCurTheme->ChangeObjectPos( mpCurTheme->GetDragPos(), nInsertPos ); @@ -503,7 +514,7 @@ void GalleryBrowser2::StartDrag( Window*, const Point* pDragPoint ) if( mpCurTheme ) { Point aSelPos; - const ULONG nItemId = ImplGetSelectedItemId( pDragPoint, aSelPos ); + const sal_uIntPtr nItemId = ImplGetSelectedItemId( pDragPoint, aSelPos ); if( nItemId ) mpCurTheme->StartDrag( this, nItemId - 1 ); @@ -523,7 +534,7 @@ void GalleryBrowser2::TogglePreview( Window*, const Point* ) void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint ) { Point aSelPos; - const ULONG nItemId = ImplGetSelectedItemId( pContextPoint, aSelPos ); + const sal_uIntPtr nItemId = ImplGetSelectedItemId( pContextPoint, aSelPos ); if( mpCurTheme && nItemId && ( nItemId <= mpCurTheme->GetObjectCount() ) ) { @@ -544,31 +555,31 @@ void GalleryBrowser2::ShowContextMenu( Window*, const Point* pContextPoint ) // ----------------------------------------------------------------------------- -BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) +sal_Bool GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) { Point aSelPos; - const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos ); - BOOL bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow ); + const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos ); + sal_Bool bRet = static_cast< GalleryBrowser* >( GetParent() )->KeyInput( rKEvt, pWindow ); if( !bRet && !maViewBox.HasFocus() && nItemId && mpCurTheme ) { - USHORT nExecuteId = 0; + sal_uInt16 nExecuteId = 0; const SgaObjKind eObjKind = mpCurTheme->GetObjectKind( nItemId - 1 ); INetURLObject aURL; const_cast< GalleryTheme* >( mpCurTheme )->GetURL( nItemId - 1, aURL ); - - const BOOL bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID ); - BOOL bPreview = bValidURL; - BOOL bAdd = bValidURL; - BOOL bAddLink = ( bValidURL && SGA_OBJ_SVDRAW != eObjKind ); - BOOL bDelete = FALSE; - BOOL bTitle = FALSE; + + const sal_Bool bValidURL = ( aURL.GetProtocol() != INET_PROT_NOT_VALID ); + sal_Bool bPreview = bValidURL; + sal_Bool bAdd = bValidURL; + sal_Bool bAddLink = ( bValidURL && SGA_OBJ_SVDRAW != eObjKind ); + sal_Bool bDelete = sal_False; + sal_Bool bTitle = sal_False; if( !mpCurTheme->IsReadOnly() && mpCurTheme->GetObjectCount() ) { bDelete = ( GALLERYBROWSERMODE_PREVIEW != GetMode() ); - bTitle = TRUE; + bTitle = sal_True; } switch( rKEvt.GetKeyCode().GetCode() ) @@ -580,7 +591,7 @@ BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) if( bPreview ) { TogglePreview( pWindow ); - bRet = TRUE; + bRet = sal_True; } } break; @@ -594,7 +605,7 @@ BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) nExecuteId = MN_ADD; } break; - + case( KEY_DELETE ): case( KEY_D ): { @@ -617,7 +628,7 @@ BOOL GalleryBrowser2::KeyInput( const KeyEvent& rKEvt, Window* pWindow ) if( nExecuteId ) { ImplExecute( nExecuteId ); - bRet = TRUE; + bRet = sal_True; } } @@ -631,16 +642,20 @@ void GalleryBrowser2::SelectTheme( const String& rThemeName ) delete mpIconView, mpIconView = NULL; delete mpListView, mpListView = NULL; delete mpPreview, mpPreview = NULL; - + if( mpCurTheme ) mpGallery->ReleaseTheme( mpCurTheme, *this ); mpCurTheme = mpGallery->AcquireTheme( rThemeName, *this ); - + mpIconView = new GalleryIconView( this, mpCurTheme ); mpListView = new GalleryListView( this, mpCurTheme ); mpPreview = new GalleryPreview( this, mpCurTheme ); + mpIconView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) )); + mpListView->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_THEMEITEMS ) )); + mpPreview->SetAccessibleName(String( SVX_RES( RID_SVXSTR_GALLERY_PREVIEW ) )); + const Link aSelectHdl( LINK( this, GalleryBrowser2, SelectObjectHdl ) ); mpIconView->SetSelectHdl( aSelectHdl ); @@ -652,9 +667,15 @@ void GalleryBrowser2::SelectTheme( const String& rThemeName ) Resize(); ImplUpdateViews( 1 ); - maViewBox.EnableItem( TBX_ID_ICON, TRUE ); - maViewBox.EnableItem( TBX_ID_LIST, TRUE ); - maViewBox.CheckItem( ( GALLERYBROWSERMODE_ICON == GetMode() ) ? TBX_ID_ICON : TBX_ID_LIST, TRUE ); + maViewBox.EnableItem( TBX_ID_ICON, sal_True ); + maViewBox.EnableItem( TBX_ID_LIST, sal_True ); + maViewBox.CheckItem( ( GALLERYBROWSERMODE_ICON == GetMode() ) ? TBX_ID_ICON : TBX_ID_LIST, sal_True ); + + if(maInfoBar.GetText().Len() == 0) + mpIconView->SetAccessibleRelationLabeledBy(mpIconView); + else + mpIconView->SetAccessibleRelationLabeledBy(&maInfoBar); + mpIconView->SetAccessibleRelationMemberOf(mpIconView); } // ----------------------------------------------------------------------------- @@ -677,11 +698,11 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) mpIconView->Show(); - maViewBox.EnableItem( TBX_ID_ICON, TRUE ); - maViewBox.EnableItem( TBX_ID_LIST, TRUE ); + maViewBox.EnableItem( TBX_ID_ICON, sal_True ); + maViewBox.EnableItem( TBX_ID_LIST, sal_True ); - maViewBox.CheckItem( TBX_ID_ICON, TRUE ); - maViewBox.CheckItem( TBX_ID_LIST, FALSE ); + maViewBox.CheckItem( TBX_ID_ICON, sal_True ); + maViewBox.CheckItem( TBX_ID_LIST, sal_False ); } break; @@ -695,11 +716,11 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) mpListView->Show(); - maViewBox.EnableItem( TBX_ID_ICON, TRUE ); - maViewBox.EnableItem( TBX_ID_LIST, TRUE ); + maViewBox.EnableItem( TBX_ID_ICON, sal_True ); + maViewBox.EnableItem( TBX_ID_LIST, sal_True ); - maViewBox.CheckItem( TBX_ID_ICON, FALSE ); - maViewBox.CheckItem( TBX_ID_LIST, TRUE ); + maViewBox.CheckItem( TBX_ID_ICON, sal_False ); + maViewBox.CheckItem( TBX_ID_LIST, sal_True ); } break; @@ -707,26 +728,26 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) { Graphic aGraphic; Point aSelPos; - const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos ); + const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos ); if( nItemId ) { - const ULONG nPos = nItemId - 1; + const sal_uIntPtr nPos = nItemId - 1; mpIconView->Hide(); mpListView->Hide(); if( mpCurTheme ) mpCurTheme->GetGraphic( nPos, aGraphic ); - + mpPreview->SetGraphic( aGraphic ); mpPreview->Show(); if( mpCurTheme && mpCurTheme->GetObjectKind( nPos ) == SGA_OBJ_SOUND ) mpPreview->PreviewMedia( mpCurTheme->GetObjectURL( nPos ) ); - maViewBox.EnableItem( TBX_ID_ICON, FALSE ); - maViewBox.EnableItem( TBX_ID_LIST, FALSE ); + maViewBox.EnableItem( TBX_ID_ICON, sal_False ); + maViewBox.EnableItem( TBX_ID_LIST, sal_False ); } } break; @@ -765,11 +786,11 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel ) if( mpCurTheme ) { Point aSelPos; - const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos ); + const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos ); if( nItemId ) { - ULONG nNewItemId = nItemId; + sal_uIntPtr nNewItemId = nItemId; switch( eTravel ) { @@ -794,7 +815,7 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel ) if( GALLERYBROWSERMODE_PREVIEW == GetMode() ) { Graphic aGraphic; - const ULONG nPos = nNewItemId - 1; + const sal_uIntPtr nPos = nNewItemId - 1; mpCurTheme->GetGraphic( nPos, aGraphic ); mpPreview->SetGraphic( aGraphic ); @@ -811,7 +832,7 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel ) // ----------------------------------------------------------------------------- -void GalleryBrowser2::ImplUpdateViews( USHORT nSelectionId ) +void GalleryBrowser2::ImplUpdateViews( sal_uInt16 nSelectionId ) { mpIconView->Hide(); mpListView->Hide(); @@ -822,10 +843,10 @@ void GalleryBrowser2::ImplUpdateViews( USHORT nSelectionId ) if( mpCurTheme ) { - for( ULONG i = 0, nCount = mpCurTheme->GetObjectCount(); i < nCount; ) + for( sal_uIntPtr i = 0, nCount = mpCurTheme->GetObjectCount(); i < nCount; ) { mpListView->RowInserted( i++ ); - mpIconView->InsertItem( (USHORT) i ); + mpIconView->InsertItem( (sal_uInt16) i ); } ImplSelectItemId( ( ( nSelectionId > mpCurTheme->GetObjectCount() ) ? mpCurTheme->GetObjectCount() : nSelectionId ) ); @@ -853,11 +874,11 @@ void GalleryBrowser2::ImplUpdateInfoBar() if( mpCurTheme ) { Point aSelPos; - const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos ); + const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos ); if( nItemId ) { - const ULONG nPos = nItemId - 1; + const sal_uIntPtr nPos = nItemId - 1; aInfoText = mpCurTheme->GetName(); @@ -879,15 +900,15 @@ void GalleryBrowser2::ImplUpdateInfoBar() // ----------------------------------------------------------------------------- -ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelPos ) +sal_uIntPtr GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelPos ) { const Size aOutputSizePixel( GetOutputSizePixel() ); - ULONG nRet = 0; - + sal_uIntPtr nRet = 0; + if( GALLERYBROWSERMODE_PREVIEW == GetMode() ) { nRet = ( ( GALLERYBROWSERMODE_ICON == meLastMode ) ? mpIconView->GetSelectItemId() : ( mpListView->FirstSelectedRow() + 1 ) ); - + if( pSelPos ) rSelPos = GetPointerPosPixel(); else @@ -903,7 +924,7 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP else { nRet = mpIconView->GetSelectItemId(); - rSelPos = mpIconView->GetItemRect( (USHORT) nRet ).Center(); + rSelPos = mpIconView->GetItemRect( (sal_uInt16) nRet ).Center(); } } else @@ -916,13 +937,13 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP else { nRet = mpListView->FirstSelectedRow() + 1; - rSelPos = mpListView->GetFieldRectPixel( (USHORT) nRet, 1 ).Center(); + rSelPos = mpListView->GetFieldRectPixel( (sal_uInt16) nRet, 1 ).Center(); } } rSelPos.X() = Max( Min( rSelPos.X(), aOutputSizePixel.Width() - 1L ), 0L ); rSelPos.Y() = Max( Min( rSelPos.Y(), aOutputSizePixel.Height() - 1L ), 0L ); - + if( nRet && ( !mpCurTheme || ( nRet > mpCurTheme->GetObjectCount() ) ) ) { nRet = 0; @@ -933,22 +954,22 @@ ULONG GalleryBrowser2::ImplGetSelectedItemId( const Point* pSelPos, Point& rSelP // ----------------------------------------------------------------------------- -void GalleryBrowser2::ImplSelectItemId( ULONG nItemId ) +void GalleryBrowser2::ImplSelectItemId( sal_uIntPtr nItemId ) { if( nItemId ) { - mpIconView->SelectItem( (USHORT) nItemId ); + mpIconView->SelectItem( (sal_uInt16) nItemId ); mpListView->SelectRow( nItemId - 1 ); } } // ----------------------------------------------------------------------------- -void GalleryBrowser2::ImplExecute( USHORT nId ) +void GalleryBrowser2::ImplExecute( sal_uInt16 nId ) { Point aSelPos; - const ULONG nItemId = ImplGetSelectedItemId( NULL, aSelPos ); + const sal_uIntPtr nItemId = ImplGetSelectedItemId( NULL, aSelPos ); if( mpCurTheme && nItemId ) { @@ -962,7 +983,7 @@ void GalleryBrowser2::ImplExecute( USHORT nId ) sal_uInt32 nFormat = 0; mbCurActionIsLinkage = ( MN_ADD_LINK == nId ); - + switch( mpCurTheme->GetObjectKind( mnCurActionPos ) ) { case( SGA_OBJ_BMP ): @@ -1074,7 +1095,7 @@ void GalleryBrowser2::ImplExecute( USHORT nId ) // ----------------------------------------------------------------------------- -String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, ULONG nItemTextFlags ) +String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject& rObj, sal_uIntPtr nItemTextFlags ) { INetURLObject aURL; String aRet; @@ -1123,7 +1144,7 @@ String GalleryBrowser2::GetItemText( const GalleryTheme& rTheme, const SgaObject if( aPath.Len() && ( nItemTextFlags & GALLERY_ITEM_TITLE ) ) aRet += ')'; } - + return aRet; } @@ -1154,7 +1175,7 @@ String GalleryBrowser2::GetFilterName() const GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); INetURLObject aURL; mpCurTheme->GetURL( mnCurActionPos, aURL ); sal_uInt16 nFilter = pFilter->GetImportFormatNumberForShortName( aURL.GetExtension() ); - + if( GRFILTER_FORMAT_DONTKNOW != nFilter ) aFilterName = pFilter->GetImportFormatName( nFilter ); } @@ -1177,9 +1198,9 @@ Graphic GalleryBrowser2::GetGraphic() const // ----------------------------------------------------------------------------- -BOOL GalleryBrowser2::GetVCDrawModel( FmFormModel& rModel ) const +sal_Bool GalleryBrowser2::GetVCDrawModel( FmFormModel& rModel ) const { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( mpCurTheme && mnCurActionPos != 0xffffffff ) bRet = mpCurTheme->GetModel( mnCurActionPos, rModel ); @@ -1189,7 +1210,7 @@ BOOL GalleryBrowser2::GetVCDrawModel( FmFormModel& rModel ) const // ----------------------------------------------------------------------------- -BOOL GalleryBrowser2::IsLinkage() const +sal_Bool GalleryBrowser2::IsLinkage() const { return mbCurActionIsLinkage; } @@ -1220,7 +1241,7 @@ IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox ) SetMode( GALLERYBROWSERMODE_ICON ); else if( pBox->GetCurItemId() == TBX_ID_LIST ) SetMode( GALLERYBROWSERMODE_LIST ); - + return 0L; } diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index d249ba8736..d492897145 100644..100755 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -35,9 +35,9 @@ #include <avmedia/mediaplayer.hxx> #include "helpid.hrc" #include "galbrws2.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/galmisc.hxx" -#include "galctrl.hxx" +#include "svx/galctrl.hxx" #include "editeng/AccessibleStringWrap.hxx" #include <editeng/svxfont.hxx> #include "galobj.hxx" @@ -127,11 +127,11 @@ void GalleryPreview::DataChanged( const DataChangedEvent& rDCEvt ) // ------------------------------------------------------------------------ -BOOL GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const +sal_Bool GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangle& rResultRect ) const { const Size aWinSize( GetOutputSizePixel() ); Size aNewSize( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( aNewSize.Width() && aNewSize.Height() ) { @@ -154,7 +154,7 @@ BOOL GalleryPreview::ImplGetGraphicCenterRect( const Graphic& rGraphic, Rectangl ( aWinSize.Height() - aNewSize.Height() ) >> 1 ); rResultRect = Rectangle( aNewPos, aNewSize ); - bRet = TRUE; + bRet = sal_True; } return bRet; @@ -308,7 +308,7 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme DragSourceHelper( this ), mpTheme ( pTheme ) { - EnableFullItemMode( FALSE ); + EnableFullItemMode( sal_False ); SetHelpId( HID_GALLERY_WINDOW ); InitSettings(); @@ -347,7 +347,7 @@ void GalleryIconView::DataChanged( const DataChangedEvent& rDCEvt ) void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt ) { - const USHORT nId = rUDEvt.GetItemId(); + const sal_uInt16 nId = rUDEvt.GetItemId(); if( nId && mpTheme ) { @@ -458,7 +458,7 @@ sal_Int8 GalleryIconView::ExecuteDrop( const ExecuteDropEvent& rEvt ) void GalleryIconView::StartDrag( sal_Int8, const Point& ) { - const CommandEvent aEvt( GetPointerPosPixel(), COMMAND_STARTDRAG, TRUE ); + const CommandEvent aEvt( GetPointerPosPixel(), COMMAND_STARTDRAG, sal_True ); Region aRegion; // call this to initiate dragging for ValueSet @@ -474,7 +474,7 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme BrowseBox( pParent, WB_TABSTOP | WB_3DLOOK | WB_BORDER ), mpTheme( pTheme ), mnCurRow( 0 ), - mbInit( FALSE ) + mbInit( sal_False ) { SetHelpId( HID_GALLERY_WINDOW ); @@ -513,15 +513,15 @@ void GalleryListView::DataChanged( const DataChangedEvent& rDCEvt ) // ------------------------------------------------------------------------ -BOOL GalleryListView::SeekRow( long nRow ) +sal_Bool GalleryListView::SeekRow( long nRow ) { mnCurRow = nRow; - return TRUE; + return sal_True; } // ----------------------------------------------------------------------------- -String GalleryListView::GetCellText(long _nRow, USHORT nColumnId) const +String GalleryListView::GetCellText(long _nRow, sal_uInt16 nColumnId) const { String sRet; if( mpTheme && ( _nRow < static_cast< long >( mpTheme->GetObjectCount() ) ) ) @@ -549,7 +549,7 @@ Rectangle GalleryListView::GetFieldCharacterBounds(sal_Int32 _nRow,sal_Int32 _nC if ( SeekRow(_nRow) ) { SvxFont aFont( GetFont() ); - AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<USHORT>( GetColumnId( sal::static_int_cast<USHORT>(_nColumnPos) ) ) ) ); + AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<sal_uInt16>( GetColumnId( sal::static_int_cast<sal_uInt16>(_nColumnPos) ) ) ) ); // get the bounds inside the string aStringWrap.GetCharacterBounds(nIndex, aRect); @@ -568,7 +568,7 @@ sal_Int32 GalleryListView::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColu if ( SeekRow(_nRow) ) { SvxFont aFont( GetFont() ); - AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<USHORT>(GetColumnId(sal::static_int_cast<USHORT>(_nColumnPos)))) ); + AccessibleStringWrap aStringWrap( *this, aFont, GetCellText(_nRow, sal::static_int_cast<sal_uInt16>(GetColumnId(sal::static_int_cast<sal_uInt16>(_nColumnPos)))) ); nRet = aStringWrap.GetIndexAtPoint(_rPoint); } return nRet; @@ -576,7 +576,7 @@ sal_Int32 GalleryListView::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColu // ------------------------------------------------------------------------ -void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const +void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const { rDev.Push( PUSH_CLIPREGION ); rDev.IntersectClipRegion( rRect ); diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index 0770c711a7..22f52b100a 100644..100755 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -32,9 +32,9 @@ #include <unotools/pathoptions.hxx> #include <sfx2/viewfrm.hxx> #include "svx/gallery1.hxx" -#include "galtheme.hxx" -#include "galbrws.hxx" -#include "gallery.hxx" +#include "svx/galtheme.hxx" +#include "svx/galbrws.hxx" +#include "svx/gallery.hxx" #include "galobj.hxx" // ----------- @@ -95,14 +95,14 @@ Graphic GalleryExplorer::GetGraphic() const // ------------------------------------------------------------------------ -BOOL GalleryExplorer::GetVCDrawModel( FmFormModel& rModel ) const +sal_Bool GalleryExplorer::GetVCDrawModel( FmFormModel& rModel ) const { return GALLERYBROWSER()->GetVCDrawModel( rModel ); } // ------------------------------------------------------------------------ -BOOL GalleryExplorer::IsLinkage() const +sal_Bool GalleryExplorer::IsLinkage() const { return GALLERYBROWSER()->IsLinkage(); } @@ -115,7 +115,7 @@ bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList ) if( pGal ) { - for( ULONG i = 0, nCount = pGal->GetThemeCount(); i < nCount; i++ ) + for( sal_uIntPtr i = 0, nCount = pGal->GetThemeCount(); i < nCount; i++ ) { const GalleryThemeEntry* pEntry = pGal->GetThemeInfo( i ); @@ -129,7 +129,7 @@ bool GalleryExplorer::FillThemeList( std::vector<String>& rThemeList ) // ------------------------------------------------------------------------ -BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList ) +sal_Bool GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList ) { Gallery* pGal = ImplGetGallery(); @@ -140,7 +140,7 @@ BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList ) if( pTheme ) { - for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ ) + for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ ) rObjList.Insert( new String( pTheme->GetObjectURL( i ).GetMainURL( INetURLObject::NO_DECODE ) ), LIST_APPEND ); pGal->ReleaseTheme( pTheme, aListener ); @@ -152,10 +152,10 @@ BOOL GalleryExplorer::FillObjList( const String& rThemeName, List& rObjList ) // ------------------------------------------------------------------------ -BOOL GalleryExplorer::FillObjList( ULONG nThemeId, List& rObjList ) +sal_Bool GalleryExplorer::FillObjList( sal_uIntPtr nThemeId, List& rObjList ) { Gallery* pGal = ImplGetGallery(); - return( pGal ? FillObjList( pGal->GetThemeName( nThemeId ), rObjList ) : FALSE ); + return( pGal ? FillObjList( pGal->GetThemeName( nThemeId ), rObjList ) : sal_False ); } // ------------------------------------------------------------------------ @@ -170,7 +170,7 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect if( pTheme ) { - for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ ) + for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ ) { SgaObject* pObj = pTheme->AcquireObject( i ); if ( pObj ) @@ -188,24 +188,24 @@ sal_Bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vect // ------------------------------------------------------------------------ -BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL ) +sal_Bool GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL ) { return InsertURL( rThemeName, rURL, SGA_FORMAT_ALL ); } // ------------------------------------------------------------------------ -BOOL GalleryExplorer::InsertURL( ULONG nThemeId, const String& rURL ) +sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const String& rURL ) { return InsertURL( nThemeId, rURL, SGA_FORMAT_ALL ); } // ------------------------------------------------------------------------ -BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, const ULONG ) +sal_Bool GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, const sal_uIntPtr ) { Gallery* pGal = ImplGetGallery(); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pGal ) { @@ -226,18 +226,18 @@ BOOL GalleryExplorer::InsertURL( const String& rThemeName, const String& rURL, c // ------------------------------------------------------------------------ -BOOL GalleryExplorer::InsertURL( ULONG nThemeId, const String& rURL, const ULONG nSgaFormat ) +sal_Bool GalleryExplorer::InsertURL( sal_uIntPtr nThemeId, const String& rURL, const sal_uIntPtr nSgaFormat ) { Gallery* pGal = ImplGetGallery(); - return( pGal ? InsertURL( pGal->GetThemeName( nThemeId ), rURL, nSgaFormat ) : FALSE ); + return( pGal ? InsertURL( pGal->GetThemeName( nThemeId ), rURL, nSgaFormat ) : sal_False ); } // ------------------------------------------------------------------------ -ULONG GalleryExplorer::GetObjCount( const String& rThemeName ) +sal_uIntPtr GalleryExplorer::GetObjCount( const String& rThemeName ) { Gallery* pGal = ImplGetGallery(); - ULONG nRet = 0; + sal_uIntPtr nRet = 0; if( pGal ) { @@ -256,20 +256,20 @@ ULONG GalleryExplorer::GetObjCount( const String& rThemeName ) // ------------------------------------------------------------------------ -ULONG GalleryExplorer::GetObjCount( ULONG nThemeId ) +sal_uIntPtr GalleryExplorer::GetObjCount( sal_uIntPtr nThemeId ) { Gallery* pGal = ImplGetGallery(); - return( pGal ? GetObjCount( pGal->GetThemeName( nThemeId ) ) : FALSE ); + return( pGal ? GetObjCount( pGal->GetThemeName( nThemeId ) ) : sal_False ); } // ------------------------------------------------------------------------ -BOOL GalleryExplorer::GetGraphicObj( const String& rThemeName, ULONG nPos, +sal_Bool GalleryExplorer::GetGraphicObj( const String& rThemeName, sal_uIntPtr nPos, Graphic* pGraphic, Bitmap* pThumb, - BOOL bProgress ) + sal_Bool bProgress ) { Gallery* pGal = ImplGetGallery(); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pGal ) { @@ -293,20 +293,20 @@ BOOL GalleryExplorer::GetGraphicObj( const String& rThemeName, ULONG nPos, // ------------------------------------------------------------------------ -BOOL GalleryExplorer::GetGraphicObj( ULONG nThemeId, ULONG nPos, +sal_Bool GalleryExplorer::GetGraphicObj( sal_uIntPtr nThemeId, sal_uIntPtr nPos, Graphic* pGraphic, Bitmap* pThumb, - BOOL bProgress ) + sal_Bool bProgress ) { Gallery* pGal = ImplGetGallery(); - return( pGal ? GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, pThumb, bProgress ) : FALSE ); + return( pGal ? GetGraphicObj( pGal->GetThemeName( nThemeId ), nPos, pGraphic, pThumb, bProgress ) : sal_False ); } // ------------------------------------------------------------------------ -BOOL GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic ) +sal_Bool GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic& rGraphic ) { Gallery* pGal = ImplGetGallery(); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pGal ) { @@ -325,18 +325,18 @@ BOOL GalleryExplorer::InsertGraphicObj( const String& rThemeName, const Graphic& // ------------------------------------------------------------------------ -BOOL GalleryExplorer::InsertGraphicObj( ULONG nThemeId, const Graphic& rGraphic ) +sal_Bool GalleryExplorer::InsertGraphicObj( sal_uIntPtr nThemeId, const Graphic& rGraphic ) { Gallery* pGal = ImplGetGallery(); - return( pGal ? InsertGraphicObj( pGal->GetThemeName( nThemeId ), rGraphic ) : FALSE ); + return( pGal ? InsertGraphicObj( pGal->GetThemeName( nThemeId ), rGraphic ) : sal_False ); } // ------------------------------------------------------------------------ -ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName ) +sal_uIntPtr GalleryExplorer::GetSdrObjCount( const String& rThemeName ) { Gallery* pGal = ImplGetGallery(); - ULONG nRet = 0; + sal_uIntPtr nRet = 0; if( pGal ) { @@ -345,7 +345,7 @@ ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName ) if( pTheme ) { - for( ULONG i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ ) + for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(); i < nCount; i++ ) if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) ) nRet++; @@ -358,19 +358,19 @@ ULONG GalleryExplorer::GetSdrObjCount( const String& rThemeName ) // ------------------------------------------------------------------------ -ULONG GalleryExplorer::GetSdrObjCount( ULONG nThemeId ) +sal_uIntPtr GalleryExplorer::GetSdrObjCount( sal_uIntPtr nThemeId ) { Gallery* pGal = ImplGetGallery(); - return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : FALSE ); + return( pGal ? GetSdrObjCount( pGal->GetThemeName( nThemeId ) ) : sal_False ); } // ------------------------------------------------------------------------ -BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos, +sal_Bool GalleryExplorer::GetSdrObj( const String& rThemeName, sal_uIntPtr nSdrModelPos, SdrModel* pModel, Bitmap* pThumb ) { Gallery* pGal = ImplGetGallery(); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pGal ) { @@ -379,14 +379,14 @@ BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos, if( pTheme ) { - for( ULONG i = 0, nCount = pTheme->GetObjectCount(), nActPos = 0; ( i < nCount ) && !bRet; i++ ) + for( sal_uIntPtr i = 0, nCount = pTheme->GetObjectCount(), nActPos = 0; ( i < nCount ) && !bRet; i++ ) { if( SGA_OBJ_SVDRAW == pTheme->GetObjectKind( i ) ) { if( nActPos++ == nSdrModelPos ) { if( pModel ) - bRet = bRet || pTheme->GetModel( i, *pModel, FALSE ); + bRet = bRet || pTheme->GetModel( i, *pModel, sal_False ); if( pThumb ) bRet = bRet || pTheme->GetThumb( i, *pThumb ); @@ -403,19 +403,19 @@ BOOL GalleryExplorer::GetSdrObj( const String& rThemeName, ULONG nSdrModelPos, // ------------------------------------------------------------------------ -BOOL GalleryExplorer::GetSdrObj( ULONG nThemeId, ULONG nSdrModelPos, +sal_Bool GalleryExplorer::GetSdrObj( sal_uIntPtr nThemeId, sal_uIntPtr nSdrModelPos, SdrModel* pModel, Bitmap* pThumb ) { Gallery* pGal = ImplGetGallery(); - return( pGal ? GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos, pModel, pThumb ) : FALSE ); + return( pGal ? GetSdrObj( pGal->GetThemeName( nThemeId ), nSdrModelPos, pModel, pThumb ) : sal_False ); } // ------------------------------------------------------------------------ -BOOL GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rModel ) +sal_Bool GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rModel ) { Gallery* pGal = ImplGetGallery(); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pGal ) { @@ -434,18 +434,18 @@ BOOL GalleryExplorer::InsertSdrObj( const String& rThemeName, FmFormModel& rMode // ------------------------------------------------------------------------ -BOOL GalleryExplorer::InsertSdrObj( ULONG nThemeId, FmFormModel& rModel ) +sal_Bool GalleryExplorer::InsertSdrObj( sal_uIntPtr nThemeId, FmFormModel& rModel ) { Gallery* pGal = ImplGetGallery(); - return( pGal ? InsertSdrObj( pGal->GetThemeName( nThemeId ), rModel ) : FALSE ); + return( pGal ? InsertSdrObj( pGal->GetThemeName( nThemeId ), rModel ) : sal_False ); } // ----------------------------------------------------------------------------- -BOOL GalleryExplorer::BeginLocking( const String& rThemeName ) +sal_Bool GalleryExplorer::BeginLocking( const String& rThemeName ) { Gallery* pGal = ImplGetGallery(); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pGal ) { @@ -454,7 +454,7 @@ BOOL GalleryExplorer::BeginLocking( const String& rThemeName ) if( pTheme ) { pTheme->LockTheme(); - bRet = TRUE; + bRet = sal_True; } } @@ -463,18 +463,18 @@ BOOL GalleryExplorer::BeginLocking( const String& rThemeName ) // ----------------------------------------------------------------------------- -BOOL GalleryExplorer::BeginLocking( ULONG nThemeId ) +sal_Bool GalleryExplorer::BeginLocking( sal_uIntPtr nThemeId ) { Gallery* pGal = ImplGetGallery(); - return( pGal ? BeginLocking( pGal->GetThemeName( nThemeId ) ) : FALSE ); + return( pGal ? BeginLocking( pGal->GetThemeName( nThemeId ) ) : sal_False ); } // ----------------------------------------------------------------------------- -BOOL GalleryExplorer::EndLocking( const String& rThemeName ) +sal_Bool GalleryExplorer::EndLocking( const String& rThemeName ) { Gallery* pGal = ImplGetGallery(); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pGal ) { @@ -483,7 +483,7 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName ) if( pTheme ) { - const BOOL bReleaseLockedTheme = pTheme->UnlockTheme(); + const sal_Bool bReleaseLockedTheme = pTheme->UnlockTheme(); // release acquired theme pGal->ReleaseTheme( pTheme, aListener ); @@ -492,7 +492,7 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName ) { // release locked theme pGal->ReleaseTheme( pTheme, aLockListener ); - bRet = TRUE; + bRet = sal_True; } } } @@ -502,15 +502,15 @@ BOOL GalleryExplorer::EndLocking( const String& rThemeName ) // ----------------------------------------------------------------------------- -BOOL GalleryExplorer::EndLocking( ULONG nThemeId ) +sal_Bool GalleryExplorer::EndLocking( sal_uIntPtr nThemeId ) { Gallery* pGal = ImplGetGallery(); - return( pGal ? EndLocking( pGal->GetThemeName( nThemeId ) ) : FALSE ); + return( pGal ? EndLocking( pGal->GetThemeName( nThemeId ) ) : sal_False ); } // ----------------------------------------------------------------------------- -BOOL GalleryExplorer::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel ) +sal_Bool GalleryExplorer::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel ) { return SgaObjectSvDraw::DrawCentered( pOut, rModel ); } diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src index 6ac9839b0f..b801b1d3fa 100644..100755 --- a/svx/source/gallery2/gallery.src +++ b/svx/source/gallery2/gallery.src @@ -35,7 +35,7 @@ DockingWindow RID_SVXDLG_GALLERYBROWSER { - HelpId = SID_GALLERY; + HelpId = "SVX_HID_GALLERY_BROWSER" ; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -396,85 +396,3 @@ Menu RID_SVXMN_GALLERY2 }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index b5065f1a61..4ea9a6d723 100644..100755 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -36,10 +36,10 @@ #include <unotools/ucbstreamhelper.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/docfile.hxx> -#include "gallery.hxx" +#include "svx/gallery.hxx" #include "gallery.hrc" #include "svx/galmisc.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/gallery1.hxx" #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> @@ -58,8 +58,8 @@ using namespace ::com::sun::star; // --------------------- GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName, - UINT32 _nFileNumber, BOOL _bReadOnly, BOOL _bImported, - BOOL _bNewFile, UINT32 _nId, BOOL _bThemeNameFromResource ) : + sal_uInt32 _nFileNumber, sal_Bool _bReadOnly, sal_Bool _bImported, + sal_Bool _bNewFile, sal_uInt32 _nId, sal_Bool _bThemeNameFromResource ) : nFileNumber ( _nFileNumber ), nId ( _nId ), bReadOnly ( _bReadOnly || _bImported ), @@ -82,7 +82,7 @@ GalleryThemeEntry::GalleryThemeEntry( const INetURLObject& rBaseURL, const Strin SetModified( _bNewFile ); if( nId && bThemeNameFromResource ) - aName = String( GAL_RESID( RID_GALLERYSTR_THEME_START + (USHORT) nId ) ); + aName = String( GAL_RESID( RID_GALLERYSTR_THEME_START + (sal_uInt16) nId ) ); if( !aName.Len() ) aName = rName; @@ -118,17 +118,17 @@ void GalleryThemeEntry::SetName( const String& rNewName ) if( aName != rNewName ) { aName = rNewName; - SetModified( TRUE ); - bThemeNameFromResource = FALSE; + SetModified( sal_True ); + bThemeNameFromResource = sal_False; } } // ----------------------------------------------------------------------------- -void GalleryThemeEntry::SetId( UINT32 nNewId, BOOL bResetThemeName ) +void GalleryThemeEntry::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) { nId = nNewId; - SetModified( TRUE ); + SetModified( sal_True ); bThemeNameFromResource = ( nId && bResetThemeName ); } @@ -192,7 +192,7 @@ public: Gallery::Gallery( const String& rMultiPath ) : nReadTextEncoding ( gsl_getSystemTextEncoding() ) , nLastFileNumber ( 0 ) -, bMultiPath ( FALSE ) +, bMultiPath ( sal_False ) { ImplLoad( rMultiPath ); } @@ -234,7 +234,7 @@ Gallery* Gallery::GetGalleryInstance() void Gallery::ImplLoad( const String& rMultiPath ) { - const USHORT nTokenCount = rMultiPath.GetTokenCount( ';' ); + const sal_uInt16 nTokenCount = rMultiPath.GetTokenCount( ';' ); sal_Bool bIsReadOnlyDir; bMultiPath = ( nTokenCount > 0 ); @@ -249,7 +249,7 @@ void Gallery::ImplLoad( const String& rMultiPath ) { aRelURL = INetURLObject( rMultiPath.GetToken( 0, ';' ) ); - for( USHORT i = 0UL; i < nTokenCount; i++ ) + for( sal_uInt16 i = 0UL; i < nTokenCount; i++ ) { aCurURL = INetURLObject(rMultiPath.GetToken( i, ';' )); @@ -425,7 +425,7 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbDirIsR if( pEntry ) { - const ULONG nFileNumber = (ULONG) String(aThmURL.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32(); + const sal_uIntPtr nFileNumber = (sal_uIntPtr) String(aThmURL.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32(); aThemeList.push_back( pEntry ); @@ -476,11 +476,11 @@ void Gallery::ImplLoadImports() GalleryThemeEntry* pThemeEntry; GalleryImportThemeEntry* pImportEntry; INetURLObject aFile; - UINT32 nInventor; - UINT32 nCount; - UINT16 nId; - UINT16 i; - UINT16 nTempCharSet; + sal_uInt32 nInventor; + sal_uInt32 nCount; + sal_uInt16 nId; + sal_uInt16 i; + sal_uInt16 nTempCharSet; for ( size_t j = 0, n = aImportList.size(); j < n; ++j ) delete aImportList[ j ]; @@ -502,7 +502,7 @@ void Gallery::ImplLoadImports() pThemeEntry = new GalleryThemeEntry( aFile, pImportEntry->aUIName, String(aFile.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32(), - TRUE, TRUE, FALSE, 0, FALSE ); + sal_True, sal_True, sal_False, 0, sal_False ); aThemeList.push_back( pThemeEntry ); } @@ -523,10 +523,10 @@ void Gallery::ImplWriteImportList() if( pOStm ) { - const UINT32 nInventor = (UINT32) COMPAT_FORMAT( 'S', 'G', 'A', '3' ); - const UINT16 nId = 0x0004; + const sal_uInt32 nInventor = (sal_uInt32) COMPAT_FORMAT( 'S', 'G', 'A', '3' ); + const sal_uInt16 nId = 0x0004; - *pOStm << nInventor << nId << (UINT32) aImportList.size() << (UINT16) gsl_getSystemTextEncoding(); + *pOStm << nInventor << nId << (sal_uInt32) aImportList.size() << (sal_uInt16) gsl_getSystemTextEncoding(); for ( size_t i = 0, n = aImportList.size(); i < n; ++i ) *pOStm << *aImportList[ i ]; @@ -564,7 +564,7 @@ GalleryImportThemeEntry* Gallery::ImplGetImportThemeEntry( const String& rImport // ------------------------------------------------------------------------ -String Gallery::GetThemeName( ULONG nThemeId ) const +String Gallery::GetThemeName( sal_uIntPtr nThemeId ) const { GalleryThemeEntry* pFound = NULL; @@ -604,28 +604,28 @@ String Gallery::GetThemeName( ULONG nThemeId ) const // ------------------------------------------------------------------------ -BOOL Gallery::HasTheme( const String& rThemeName ) +sal_Bool Gallery::HasTheme( const String& rThemeName ) { return( ImplGetThemeEntry( rThemeName ) != NULL ); } // ------------------------------------------------------------------------ -BOOL Gallery::CreateTheme( const String& rThemeName, UINT32 nNumFrom ) +sal_Bool Gallery::CreateTheme( const String& rThemeName, sal_uInt32 nNumFrom ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( !HasTheme( rThemeName ) && ( GetUserURL().GetProtocol() != INET_PROT_NOT_VALID ) ) { nLastFileNumber = nNumFrom > nLastFileNumber ? nNumFrom : nLastFileNumber + 1; GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( GetUserURL(), rThemeName, nLastFileNumber, - FALSE, FALSE, TRUE, 0, FALSE ); + sal_False, sal_False, sal_True, 0, sal_False ); aThemeList.push_back( pNewEntry ); delete( new GalleryTheme( this, pNewEntry ) ); Broadcast( GalleryHint( GALLERY_HINT_THEME_CREATED, rThemeName ) ); - bRet = TRUE; + bRet = sal_True; } return bRet; @@ -633,10 +633,10 @@ BOOL Gallery::CreateTheme( const String& rThemeName, UINT32 nNumFrom ) // ------------------------------------------------------------------------ -BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImportName ) +sal_Bool Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImportName ) { INetURLObject aURL( rURL ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -646,8 +646,8 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor if( pIStm ) { - ULONG nStmErr; - UINT16 nId; + sal_uIntPtr nStmErr; + sal_uInt16 nId; *pIStm >> nId; @@ -659,7 +659,7 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor String aThemeName; *pIStm >> aTmpStr; aThemeName = String( aTmpStr, RTL_TEXTENCODING_UTF8 ); GalleryThemeEntry* pThemeEntry = new GalleryThemeEntry( aURL, rImportName, String(aURL.GetBase()).Erase( 0, 2 ).Erase( 6 ).ToInt32(), - TRUE, TRUE, TRUE, 0, FALSE ); + sal_True, sal_True, sal_True, 0, sal_False ); GalleryTheme* pImportTheme = new GalleryTheme( this, pThemeEntry ); pIStm->Seek( STREAM_SEEK_TO_BEGIN ); @@ -675,7 +675,7 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor { String aName( rImportName ); String aNewName( aName ); - ULONG nCount = 0; + sal_uIntPtr nCount = 0; aName += ' '; @@ -695,7 +695,7 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor pImportEntry->aImportName = rImportName; aImportList.push_back( pImportEntry ); ImplWriteImportList(); - bRet = TRUE; + bRet = sal_True; } delete pImportTheme; @@ -710,10 +710,10 @@ BOOL Gallery::CreateImportTheme( const INetURLObject& rURL, const String& rImpor // ------------------------------------------------------------------------ -BOOL Gallery::RenameTheme( const String& rOldName, const String& rNewName ) +sal_Bool Gallery::RenameTheme( const String& rOldName, const String& rNewName ) { GalleryThemeEntry* pThemeEntry = ImplGetThemeEntry( rOldName ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; // Ueberpruefen, ob neuer Themenname schon vorhanden ist if( pThemeEntry && !HasTheme( rNewName ) && ( !pThemeEntry->IsReadOnly() || pThemeEntry->IsImported() ) ) @@ -743,7 +743,7 @@ BOOL Gallery::RenameTheme( const String& rOldName, const String& rNewName ) Broadcast( GalleryHint( GALLERY_HINT_THEME_RENAMED, aOldName, pThm->GetName() ) ); ReleaseTheme( pThm, aListener ); - bRet = TRUE; + bRet = sal_True; } } @@ -752,10 +752,10 @@ BOOL Gallery::RenameTheme( const String& rOldName, const String& rNewName ) // ------------------------------------------------------------------------ -BOOL Gallery::RemoveTheme( const String& rThemeName ) +sal_Bool Gallery::RemoveTheme( const String& rThemeName ) { GalleryThemeEntry* pThemeEntry = ImplGetThemeEntry( rThemeName ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pThemeEntry && ( !pThemeEntry->IsReadOnly() || pThemeEntry->IsImported() ) ) { @@ -808,7 +808,7 @@ BOOL Gallery::RemoveTheme( const String& rThemeName ) Broadcast( GalleryHint( GALLERY_HINT_THEME_REMOVED, rThemeName ) ); - bRet = TRUE; + bRet = sal_True; } return bRet; @@ -925,7 +925,7 @@ void Gallery::ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener ) } } -BOOL GalleryThemeEntry::IsDefault() const +sal_Bool GalleryThemeEntry::IsDefault() const { return( ( nId > 0 ) && ( nId != ( RID_GALLERYSTR_THEME_MYTHEME - RID_GALLERYSTR_THEME_START ) ) ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/gallery2/gallerydrawmodel.hxx b/svx/source/gallery2/gallerydrawmodel.hxx index 0c6bd7d6e6..0c6bd7d6e6 100644..100755 --- a/svx/source/gallery2/gallerydrawmodel.hxx +++ b/svx/source/gallery2/gallerydrawmodel.hxx diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 3f9bc90b46..80eb92b0b2 100644..100755 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -52,7 +52,7 @@ #include "codec.hxx" #include "gallery.hrc" #include "svx/gallery1.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/galmisc.hxx" #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> @@ -113,11 +113,11 @@ IMPL_LINK( SgaUserDataFactory, MakeUserData, SdrObjFactory*, pObjFactory ) // - GalleryGraphicImport - // ------------------------ -USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, - String& rFilterName, BOOL bShowProgress ) +sal_uInt16 GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, + String& rFilterName, sal_Bool bShowProgress ) { - USHORT nRet = SGA_IMPORT_NONE; - SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, TRUE ); + sal_uInt16 nRet = SGA_IMPORT_NONE; + SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, sal_True ); String aFilterName; aMedium.DownLoad(); @@ -128,7 +128,7 @@ USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, { GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); GalleryProgress* pProgress = bShowProgress ? new GalleryProgress( pGraphicFilter ) : NULL; - USHORT nFormat; + sal_uInt16 nFormat; if( !pGraphicFilter->ImportGraphic( rGraphic, rURL.GetMainURL( INetURLObject::NO_DECODE ), *pIStm, GRFILTER_FORMAT_DONTKNOW, &nFormat ) ) { @@ -146,10 +146,10 @@ USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, // - GallerySvDrawImport - // ----------------------- -BOOL GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel ) +sal_Bool GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel ) { - UINT32 nVersion; - BOOL bRet = FALSE; + sal_uInt32 nVersion; + sal_Bool bRet = sal_False; if( GalleryCodec::IsCoded( rIStm, nVersion ) ) { @@ -194,9 +194,9 @@ BOOL GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel ) // - CreateIMapGraphic - // --------------------- -BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap ) +sal_Bool CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( rModel.GetPageCount() ) { @@ -205,10 +205,10 @@ BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& if ( pPage->GetObjCount() == 1 && pObj->ISA( SdrGrafObj ) ) { - const USHORT nCount = pObj->GetUserDataCount(); + const sal_uInt16 nCount = pObj->GetUserDataCount(); // gibt es in den User-Daten eine IMap-Information? - for ( USHORT i = 0; i < nCount; i++ ) + for ( sal_uInt16 i = 0; i < nCount; i++ ) { const SdrObjUserData* pUserData = pObj->GetUserData( i ); @@ -216,7 +216,7 @@ BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& { rGraphic = ( (SdrGrafObj*) pObj )->GetGraphic(); rImageMap = ( (SgaIMapInfo*) pUserData )->GetImageMap(); - bRet = TRUE; + bRet = sal_True; break; } } @@ -230,7 +230,7 @@ BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& // - GetReducedString - // -------------------- -String GetReducedString( const INetURLObject& rURL, ULONG nMaxLen ) +String GetReducedString( const INetURLObject& rURL, sal_uIntPtr nMaxLen ) { String aReduced( rURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ); @@ -244,7 +244,7 @@ String GetReducedString( const INetURLObject& rURL, ULONG nMaxLen ) if( aPath.Len() > nMaxLen ) { - aReduced = aPath.Copy( 0, (USHORT)( nMaxLen - aName.Len() - 4 ) ); + aReduced = aPath.Copy( 0, (sal_uInt16)( nMaxLen - aName.Len() - 4 ) ); aReduced += String( RTL_CONSTASCII_USTRINGPARAM( "..." ) ); aReduced += aDelimiter; aReduced += aName; @@ -273,9 +273,9 @@ String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL ) // ----------------------------------------------------------------------------- -BOOL FileExists( const INetURLObject& rURL ) +sal_Bool FileExists( const INetURLObject& rURL ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( rURL.GetProtocol() != INET_PROT_NOT_VALID ) { @@ -303,9 +303,9 @@ BOOL FileExists( const INetURLObject& rURL ) // ----------------------------------------------------------------------------- -BOOL CreateDir( const INetURLObject& rURL ) +sal_Bool CreateDir( const INetURLObject& rURL ) { - BOOL bRet = FileExists( rURL ); + sal_Bool bRet = FileExists( rURL ); if( !bRet ) { @@ -340,9 +340,9 @@ BOOL CreateDir( const INetURLObject& rURL ) // ----------------------------------------------------------------------------- -BOOL CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ) +sal_Bool CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; try { @@ -351,7 +351,7 @@ BOOL CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ) aDestPath.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("transfer")), uno::makeAny( ucb::TransferInfo( sal_False, rSrcURL.GetMainURL( INetURLObject::NO_DECODE ), rDstURL.GetName(), ucb::NameClash::OVERWRITE ) ) ); - bRet = TRUE; + bRet = sal_True; } catch( const ucb::ContentCreationException& ) { @@ -368,9 +368,9 @@ BOOL CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ) // ----------------------------------------------------------------------------- -BOOL KillFile( const INetURLObject& rURL ) +sal_Bool KillFile( const INetURLObject& rURL ) { - BOOL bRet = FileExists( rURL ); + sal_Bool bRet = FileExists( rURL ); if( bRet ) { @@ -381,15 +381,15 @@ BOOL KillFile( const INetURLObject& rURL ) } catch( const ucb::ContentCreationException& ) { - bRet = FALSE; + bRet = sal_False; } catch( const uno::RuntimeException& ) { - bRet = FALSE; + bRet = sal_False; } catch( const uno::Exception& ) { - bRet = FALSE; + bRet = sal_False; } } @@ -446,17 +446,17 @@ GalleryProgress::~GalleryProgress() // ------------------------------------------------------------------------ -void GalleryProgress::Update( ULONG nVal, ULONG nMaxVal ) +void GalleryProgress::Update( sal_uIntPtr nVal, sal_uIntPtr nMaxVal ) { if( mxProgressBar.is() && nMaxVal ) - mxProgressBar->setValue( Min( (ULONG)( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE ), (ULONG) GALLERY_PROGRESS_RANGE ) ); + mxProgressBar->setValue( Min( (sal_uIntPtr)( (double) nVal / nMaxVal * GALLERY_PROGRESS_RANGE ), (sal_uIntPtr) GALLERY_PROGRESS_RANGE ) ); } // ----------------------- // - GalleryTransferable - // ----------------------- -GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, ULONG nObjectPos, bool bLazy ) : +GalleryTransferable::GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy ) : mpTheme( pTheme ), meObjectKind( mpTheme->GetObjectKind( nObjectPos ) ), mnObjectPos( nObjectPos ), @@ -626,7 +626,7 @@ sal_Bool GalleryTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pU void GalleryTransferable::DragFinished( sal_Int8 nDropAction ) { - mpTheme->SetDragging( FALSE ); + mpTheme->SetDragging( sal_False ); mpTheme->SetDragPos( 0 ); if ( nDropAction ) { diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 6a727c3662..33ee75925d 100644..100755 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -60,16 +60,16 @@ using namespace ::com::sun::star; // ------------- SgaObject::SgaObject() : - bIsValid ( FALSE ), - bIsThumbBmp ( TRUE ) + bIsValid ( sal_False ), + bIsThumbBmp ( sal_True ) { } // ------------------------------------------------------------------------ -BOOL SgaObject::CreateThumb( const Graphic& rGraphic ) +sal_Bool SgaObject::CreateThumb( const Graphic& rGraphic ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( rGraphic.GetType() == GRAPHIC_BITMAP ) { @@ -105,7 +105,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic ) if( ( aBmpSize.Width() <= S_THUMB ) && ( aBmpSize.Height() <= S_THUMB ) ) { aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS ); - bRet = TRUE; + bRet = sal_True; } else { @@ -117,7 +117,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic ) (double) aNewSize.Height() / aBmpSize.Height(), BMP_SCALE_INTERPOLATE ) ) { aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS ); - bRet = TRUE; + bRet = sal_True; } } } @@ -138,7 +138,7 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic ) if( !aThumbBmp.IsEmpty() ) { aThumbBmp.Convert( BMP_CONVERSION_8BIT_COLORS ); - bRet = TRUE; + bRet = sal_True; } } @@ -149,15 +149,15 @@ BOOL SgaObject::CreateThumb( const Graphic& rGraphic ) void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const { - static const UINT32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' ); + static const sal_uInt32 nInventor = COMPAT_FORMAT( 'S', 'G', 'A', '3' ); - rOut << nInventor << (UINT16) 0x0004 << GetVersion() << (UINT16) GetObjKind(); + rOut << nInventor << (sal_uInt16) 0x0004 << GetVersion() << (sal_uInt16) GetObjKind(); rOut << bIsThumbBmp; if( bIsThumbBmp ) { - const USHORT nOldCompressMode = rOut.GetCompressMode(); - const ULONG nOldVersion = rOut.GetVersion(); + const sal_uInt16 nOldCompressMode = rOut.GetCompressMode(); + const sal_uIntPtr nOldVersion = rOut.GetVersion(); rOut.SetCompressMode( COMPRESSMODE_ZBITMAP ); rOut.SetVersion( SOFFICE_FILEFORMAT_50 ); @@ -177,11 +177,11 @@ void SgaObject::WriteData( SvStream& rOut, const String& rDestDir ) const // ------------------------------------------------------------------------ -void SgaObject::ReadData(SvStream& rIn, UINT16& rReadVersion ) +void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion ) { ByteString aTmpStr; - UINT32 nTmp32; - UINT16 nTmp16; + sal_uInt32 nTmp32; + sal_uInt16 nTmp16; rIn >> nTmp32 >> nTmp16 >> rReadVersion >> nTmp16 >> bIsThumbBmp; @@ -246,7 +246,7 @@ SvStream& operator<<( SvStream& rOut, const SgaObject& rObj ) SvStream& operator>>( SvStream& rIn, SgaObject& rObj ) { - UINT16 nReadVersion; + sal_uInt16 nReadVersion; rObj.ReadData( rIn, nReadVersion ); rObj.bIsValid = ( rIn.GetError() == ERRCODE_NONE ); @@ -304,7 +304,7 @@ void SgaObjectBmp::WriteData( SvStream& rOut, const String& rDestDir ) const // ------------------------------------------------------------------------ -void SgaObjectBmp::ReadData( SvStream& rIn, UINT16& rReadVersion ) +void SgaObjectBmp::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) { ByteString aTmpStr; @@ -336,10 +336,10 @@ SgaObjectSound::SgaObjectSound( const INetURLObject& rURL ) : { aURL = rURL; aThumbBmp = Bitmap( Size( 1, 1 ), 1 ); - bIsValid = TRUE; + bIsValid = sal_True; } else - bIsValid = FALSE; + bIsValid = sal_False; } // ------------------------------------------------------------------------ @@ -352,7 +352,7 @@ SgaObjectSound::~SgaObjectSound() Bitmap SgaObjectSound::GetThumbBmp() const { - USHORT nId; + sal_uInt16 nId; switch( eSoundType ) { @@ -381,19 +381,19 @@ Bitmap SgaObjectSound::GetThumbBmp() const void SgaObjectSound::WriteData( SvStream& rOut, const String& rDestDir ) const { SgaObject::WriteData( rOut, rDestDir ); - rOut << (UINT16) eSoundType << ByteString( aTitle, RTL_TEXTENCODING_UTF8 ); + rOut << (sal_uInt16) eSoundType << ByteString( aTitle, RTL_TEXTENCODING_UTF8 ); } // ------------------------------------------------------------------------ -void SgaObjectSound::ReadData( SvStream& rIn, UINT16& rReadVersion ) +void SgaObjectSound::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) { SgaObject::ReadData( rIn, rReadVersion ); if( rReadVersion >= 5 ) { ByteString aTmpStr; - UINT16 nTmp16; + sal_uInt16 nTmp16; rIn >> nTmp16; eSoundType = (GalSoundType) nTmp16; @@ -505,11 +505,11 @@ SgaObjectSvDraw::SgaObjectSvDraw( SvStream& rIStm, const INetURLObject& rURL ) // ------------------------------------------------------------------------ -BOOL SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel ) +sal_Bool SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel ) { Graphic aGraphic; ImageMap aImageMap; - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if ( CreateIMapGraphic( rModel, aGraphic, aImageMap ) ) bRet = SgaObject::CreateThumb( aGraphic ); @@ -538,10 +538,10 @@ BOOL SgaObjectSvDraw::CreateThumb( const FmFormModel& rModel ) // ------------------------------------------------------------------------ -BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel ) +sal_Bool SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rModel ) { const FmFormPage* pPage = static_cast< const FmFormPage* >( rModel.GetPage( 0 ) ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pOut && pPage ) { @@ -567,11 +567,11 @@ BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rMode aOrigin.Y() += ( ( aDrawSize.Height() - aObjRect.GetHeight() ) >> 1 ) - aObjRect.Top(); aMap.SetOrigin( aOrigin ); - aView.SetPageVisible( FALSE ); - aView.SetBordVisible( FALSE ); - aView.SetGridVisible( FALSE ); - aView.SetHlplVisible( FALSE ); - aView.SetGlueVisible( FALSE ); + aView.SetPageVisible( sal_False ); + aView.SetBordVisible( sal_False ); + aView.SetGridVisible( sal_False ); + aView.SetHlplVisible( sal_False ); + aView.SetGlueVisible( sal_False ); pOut->Push(); pOut->SetMapMode( aMap ); @@ -579,7 +579,7 @@ BOOL SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& rMode aView.CompleteRedraw( pOut, Rectangle( pOut->PixelToLogic( Point() ), pOut->GetOutputSize() ) ); pOut->Pop(); - bRet = TRUE; + bRet = sal_True; } } @@ -596,7 +596,7 @@ void SgaObjectSvDraw::WriteData( SvStream& rOut, const String& rDestDir ) const // ------------------------------------------------------------------------ -void SgaObjectSvDraw::ReadData( SvStream& rIn, UINT16& rReadVersion ) +void SgaObjectSvDraw::ReadData( SvStream& rIn, sal_uInt16& rReadVersion ) { SgaObject::ReadData( rIn, rReadVersion ); diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index daa5f2490d..a56bd12c00 100644..100755 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -53,7 +53,7 @@ #include <svx/fmmodel.hxx> #include <svx/fmview.hxx> #include "svx/galmisc.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -80,7 +80,7 @@ GalleryTheme::GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry ) mnThemeLockCount ( 0 ), mnBroadcasterLockCount( 0 ), nDragPos ( 0 ), - bDragging ( FALSE ) + bDragging ( sal_False ) { ImplCreateSvDrawStorage(); @@ -97,9 +97,9 @@ GalleryTheme::~GalleryTheme() for ( size_t i = 0, n = aObjectList.size(); i < n; ++i ) { GalleryObject* pEntry = aObjectList[ i ]; - Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); delete pEntry; - Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); } aObjectList.clear(); } @@ -110,10 +110,10 @@ void GalleryTheme::ImplCreateSvDrawStorage() { if( !pThm->IsImported() ) { - aSvDrawStorageRef = new SvStorage( FALSE, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE ); + aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), pThm->IsReadOnly() ? STREAM_READ : STREAM_STD_READWRITE ); // #i50423# ReadOnly may not been set though the file can't be written (because of security reasons) if ( ( aSvDrawStorageRef->GetError() != ERRCODE_NONE ) && !pThm->IsReadOnly() ) - aSvDrawStorageRef = new SvStorage( FALSE, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); + aSvDrawStorageRef = new SvStorage( sal_False, GetSdvURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); } else aSvDrawStorageRef.Clear(); @@ -121,10 +121,10 @@ void GalleryTheme::ImplCreateSvDrawStorage() // ------------------------------------------------------------------------ -BOOL GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry ) +sal_Bool GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, GalleryObject* pExistentEntry ) { SvStream* pOStm = ::utl::UcbStreamHelper::CreateStream( GetSdgURL().GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pOStm ) { @@ -154,7 +154,7 @@ BOOL GalleryTheme::ImplWriteSgaObject( const SgaObject& rObj, size_t nPos, Galle pEntry->aURL = rObj.GetURL(); pEntry->nOffset = nOffset; pEntry->eObjKind = rObj.GetObjKind(); - bRet = TRUE; + bRet = sal_True; } delete pOStm; @@ -251,7 +251,7 @@ void GalleryTheme::ImplWrite() delete pOStm; } - ImplSetModified( FALSE ); + ImplSetModified( sal_False ); } } } @@ -292,14 +292,14 @@ INetURLObject GalleryTheme::ImplGetURL( const GalleryObject* pObject ) const // ------------------------------------------------------------------------ -INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFormat ) +INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, sal_uIntPtr nFormat ) { INetURLObject aDir( GetParent()->GetUserURL() ); INetURLObject aInfoFileURL( GetParent()->GetUserURL() ); INetURLObject aNewURL; sal_uInt32 nNextNumber = 1999; sal_Char const* pExt = NULL; - BOOL bExists; + sal_Bool bExists; aDir.Append( String( RTL_CONSTASCII_USTRINGPARAM( "dragdrop" ) ) ); CreateDir( aDir ); @@ -348,12 +348,12 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFor String aFileName( RTL_CONSTASCII_USTRINGPARAM( "gallery/svdraw/dd" ) ); aNewURL = INetURLObject( aFileName += String::CreateFromInt32( ++nNextNumber % 99999999 ), INET_PROT_PRIV_SOFFICE ); - bExists = FALSE; + bExists = sal_False; for ( size_t i = 0, n = aObjectList.size(); i < n; ++i ) if ( aObjectList[ i ]->aURL == aNewURL ) { - bExists = TRUE; + bExists = sal_True; break; } } @@ -386,7 +386,7 @@ INetURLObject GalleryTheme::ImplCreateUniqueURL( SgaObjKind eObjKind, ULONG nFor // ------------------------------------------------------------------------ -void GalleryTheme::ImplBroadcast( ULONG nUpdatePos ) +void GalleryTheme::ImplBroadcast( sal_uIntPtr nUpdatePos ) { if( !IsBroadcasterLocked() ) { @@ -399,24 +399,24 @@ void GalleryTheme::ImplBroadcast( ULONG nUpdatePos ) // ------------------------------------------------------------------------ -BOOL GalleryTheme::UnlockTheme() +sal_Bool GalleryTheme::UnlockTheme() { DBG_ASSERT( mnThemeLockCount, "Theme is not locked" ); - - BOOL bRet = FALSE; - + + sal_Bool bRet = sal_False; + if( mnThemeLockCount ) { --mnThemeLockCount; - bRet = TRUE; + bRet = sal_True; } - + return bRet; } // ------------------------------------------------------------------------ -void GalleryTheme::UnlockBroadcaster( ULONG nUpdatePos ) +void GalleryTheme::UnlockBroadcaster( sal_uIntPtr nUpdatePos ) { DBG_ASSERT( mnBroadcasterLockCount, "Broadcaster is not locked" ); @@ -426,9 +426,9 @@ void GalleryTheme::UnlockBroadcaster( ULONG nUpdatePos ) // ------------------------------------------------------------------------ -BOOL GalleryTheme::InsertObject( const SgaObject& rObj, ULONG nInsertPos ) +bool GalleryTheme::InsertObject( const SgaObject& rObj, sal_uIntPtr nInsertPos ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( rObj.IsValid() ) { @@ -467,7 +467,7 @@ BOOL GalleryTheme::InsertObject( const SgaObject& rObj, ULONG nInsertPos ) else ImplWriteSgaObject( rObj, nInsertPos, NULL ); - ImplSetModified( bRet = TRUE ); + ImplSetModified( bRet = sal_True ); ImplBroadcast( pFoundEntry ? iFoundPos : nInsertPos ); } @@ -490,7 +490,7 @@ void GalleryTheme::ReleaseObject( SgaObject* pObject ) // ------------------------------------------------------------------------ -BOOL GalleryTheme::RemoveObject( size_t nPos ) +bool GalleryTheme::RemoveObject( size_t nPos ) { GalleryObject* pEntry = NULL; if ( nPos < aObjectList.size() ) @@ -509,11 +509,11 @@ BOOL GalleryTheme::RemoveObject( size_t nPos ) if( SGA_OBJ_SVDRAW == pEntry->eObjKind ) aSvDrawStorageRef->Remove( pEntry->aURL.GetMainURL( INetURLObject::NO_DECODE ) ); - Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); delete pEntry; - Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); - ImplSetModified( TRUE ); + ImplSetModified( sal_True ); ImplBroadcast( nPos ); } @@ -522,9 +522,9 @@ BOOL GalleryTheme::RemoveObject( size_t nPos ) // ------------------------------------------------------------------------ -BOOL GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos ) +bool GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( nOldPos != nNewPos && nOldPos < aObjectList.size() @@ -542,7 +542,7 @@ BOOL GalleryTheme::ChangeObjectPos( size_t nOldPos, size_t nNewPos ) ::std::advance( it, nOldPos ); aObjectList.erase( it ); - ImplSetModified( bRet = TRUE ); + ImplSetModified( bRet = sal_True ); ImplBroadcast( ( nNewPos < nOldPos ) ? nNewPos : ( nNewPos - 1 ) ); } @@ -561,11 +561,11 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg const size_t nCount = aObjectList.size(); LockBroadcaster(); - bAbortActualize = FALSE; + bAbortActualize = sal_False; // LoeschFlag zuruecksetzen for (size_t i = 0; i < nCount; i++) - aObjectList[ i ]->bDummy = FALSE; + aObjectList[ i ]->bDummy = sal_False; for(size_t i = 0; ( i < nCount ) && !bAbortActualize; i++) { @@ -588,7 +588,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg { SgaObjectSound aObjSound( aURL ); if( !InsertObject( aObjSound ) ) - pEntry->bDummy = TRUE; + pEntry->bDummy = sal_True; } else { @@ -606,12 +606,12 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg pNewObj = (SgaObject*) new SgaObjectBmp( aGraphic, aURL, aFormat ); if( !InsertObject( *pNewObj ) ) - pEntry->bDummy = TRUE; + pEntry->bDummy = sal_True; delete pNewObj; } else - pEntry->bDummy = TRUE; // Loesch-Flag setzen + pEntry->bDummy = sal_True; // Loesch-Flag setzen } } else @@ -628,7 +628,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg SgaObjectSvDraw aNewObj( *pIStm, pEntry->aURL ); if( !InsertObject( aNewObj ) ) - pEntry->bDummy = TRUE; + pEntry->bDummy = sal_True; pIStm->SetBufferSize( 0L ); } @@ -642,12 +642,12 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg pEntry = aObjectList[ i ]; if( pEntry->bDummy ) { - Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pEntry ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pEntry ) ) ); GalleryObjectList::iterator it = aObjectList.begin(); ::std::advance( it, i ); aObjectList.erase( it ); delete pEntry; - Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pEntry ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uLong >( pEntry ) ) ); } else ++i; } @@ -704,10 +704,10 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg CopyFile( aTmpURL, aInURL ); KillFile( aTmpURL ); - ULONG nStorErr = 0; + sal_uIntPtr nStorErr = 0; { - SvStorageRef aTempStorageRef( new SvStorage( FALSE, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) ); + SvStorageRef aTempStorageRef( new SvStorage( sal_False, aTmpURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_STD_READWRITE ) ); aSvDrawStorageRef->CopyTo( aTempStorageRef ); nStorErr = aSvDrawStorageRef->GetError(); } @@ -720,7 +720,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg } KillFile( aTmpURL ); - ImplSetModified( TRUE ); + ImplSetModified( sal_True ); ImplWrite(); UnlockBroadcaster(); } @@ -728,7 +728,7 @@ void GalleryTheme::Actualize( const Link& rActualizeLink, GalleryProgress* pProg // ------------------------------------------------------------------------ -GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BOOL bReadOnly ) +GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, sal_Bool bReadOnly ) { DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); @@ -742,7 +742,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO { String aThemeName; sal_uInt16 nVersion; - BOOL bThemeNameFromResource = FALSE; + sal_Bool bThemeNameFromResource = sal_False; *pIStm >> nVersion; @@ -795,7 +795,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO aPathURL.removeFinalSlash(); pRet = new GalleryThemeEntry( aPathURL, aThemeName, String(rURL.GetBase()).Copy( 2, 6 ).ToInt32(), - bReadOnly, FALSE, FALSE, nThemeId, + bReadOnly, sal_False, sal_False, nThemeId, bThemeNameFromResource ); } @@ -808,16 +808,16 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, BO // ----------------------------------------------------------------------------- -BOOL GalleryTheme::GetThumb( ULONG nPos, Bitmap& rBmp, BOOL ) +sal_Bool GalleryTheme::GetThumb( sal_uIntPtr nPos, Bitmap& rBmp, sal_Bool ) { SgaObject* pObj = AcquireObject( nPos ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pObj ) { rBmp = pObj->GetThumbBmp(); ReleaseObject( pObj ); - bRet = TRUE; + bRet = sal_True; } return bRet; @@ -825,10 +825,10 @@ BOOL GalleryTheme::GetThumb( ULONG nPos, Bitmap& rBmp, BOOL ) // ----------------------------------------------------------------------------- -BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress ) +sal_Bool GalleryTheme::GetGraphic( sal_uIntPtr nPos, Graphic& rGraphic, sal_Bool bProgress ) { const GalleryObject* pObject = ImplGetGalleryObject( nPos ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pObject ) { @@ -856,7 +856,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress ) ImageMap aIMap; if( CreateIMapGraphic( *aModel.GetModel(), rGraphic, aIMap ) ) - bRet = TRUE; + bRet = sal_True; else { VirtualDevice aVDev; @@ -867,7 +867,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress ) aView.ShowSdrPage(aView.GetModel()->GetPage(0)); aView.MarkAll(); rGraphic = aView.GetAllMarkedGraphic(); - bRet = TRUE; + bRet = sal_True; } } } @@ -884,7 +884,7 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress ) aBmp.Replace( COL_LIGHTMAGENTA, COL_WHITE ); rGraphic = aBmp; ReleaseObject( pObj ); - bRet = TRUE; + bRet = sal_True; } } break; @@ -899,13 +899,13 @@ BOOL GalleryTheme::GetGraphic( ULONG nPos, Graphic& rGraphic, BOOL bProgress ) // ----------------------------------------------------------------------------- -BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos ) +sal_Bool GalleryTheme::InsertGraphic( const Graphic& rGraphic, sal_uIntPtr nInsertPos ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( rGraphic.GetType() != GRAPHIC_NONE ) { - ULONG nExportFormat = CVT_UNKNOWN; + sal_uIntPtr nExportFormat = CVT_UNKNOWN; const GfxLink aGfxLink( ( (Graphic&) rGraphic ).GetLink() ); if( aGfxLink.GetDataSize() ) @@ -977,10 +977,10 @@ BOOL GalleryTheme::InsertGraphic( const Graphic& rGraphic, ULONG nInsertPos ) // ----------------------------------------------------------------------------- -BOOL GalleryTheme::GetModel( ULONG nPos, SdrModel& rModel, BOOL ) +sal_Bool GalleryTheme::GetModel( sal_uIntPtr nPos, SdrModel& rModel, sal_Bool ) { const GalleryObject* pObject = ImplGetGalleryObject( nPos ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pObject && ( SGA_OBJ_SVDRAW == pObject->eObjKind ) ) { @@ -1006,11 +1006,11 @@ BOOL GalleryTheme::GetModel( ULONG nPos, SdrModel& rModel, BOOL ) // ----------------------------------------------------------------------------- -BOOL GalleryTheme::InsertModel( const FmFormModel& rModel, ULONG nInsertPos ) +sal_Bool GalleryTheme::InsertModel( const FmFormModel& rModel, sal_uIntPtr nInsertPos ) { INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) ); SvStorageRef xStor( GetSvDrawStorage() ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( xStor.Is() ) { @@ -1023,7 +1023,7 @@ BOOL GalleryTheme::InsertModel( const FmFormModel& rModel, ULONG nInsertPos ) FmFormModel* pFormModel = (FmFormModel*) &rModel; pFormModel->BurnInStyleSheetAttributes(); - + { uno::Reference< io::XOutputStream > xDocOut( new utl::OOutputStreamWrapper( aMemStm ) ); @@ -1053,10 +1053,10 @@ BOOL GalleryTheme::InsertModel( const FmFormModel& rModel, ULONG nInsertPos ) // ----------------------------------------------------------------------------- -BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStream, BOOL ) +sal_Bool GalleryTheme::GetModelStream( sal_uIntPtr nPos, SotStorageStreamRef& rxModelStream, sal_Bool ) { const GalleryObject* pObject = ImplGetGalleryObject( nPos ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pObject && ( SGA_OBJ_SVDRAW == pObject->eObjKind ) ) { @@ -1070,7 +1070,7 @@ BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStrea if( xIStm.Is() && !xIStm->GetError() ) { - UINT32 nVersion = 0; + sal_uInt32 nVersion = 0; xIStm->SetBufferSize( 16348 ); @@ -1106,11 +1106,11 @@ BOOL GalleryTheme::GetModelStream( ULONG nPos, SotStorageStreamRef& rxModelStrea // ----------------------------------------------------------------------------- -BOOL GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, ULONG nInsertPos ) +sal_Bool GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, sal_uIntPtr nInsertPos ) { INetURLObject aURL( ImplCreateUniqueURL( SGA_OBJ_SVDRAW ) ); SvStorageRef xStor( GetSvDrawStorage() ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( xStor.Is() ) { @@ -1142,15 +1142,15 @@ BOOL GalleryTheme::InsertModelStream( const SotStorageStreamRef& rxModelStream, // ----------------------------------------------------------------------------- -BOOL GalleryTheme::GetURL( ULONG nPos, INetURLObject& rURL, BOOL ) +sal_Bool GalleryTheme::GetURL( sal_uIntPtr nPos, INetURLObject& rURL, sal_Bool ) { const GalleryObject* pObject = ImplGetGalleryObject( nPos ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( pObject ) { rURL = INetURLObject( ImplGetURL( pObject ) ); - bRet = TRUE; + bRet = sal_True; } return bRet; @@ -1158,13 +1158,13 @@ BOOL GalleryTheme::GetURL( ULONG nPos, INetURLObject& rURL, BOOL ) // ----------------------------------------------------------------------------- -BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos ) +sal_Bool GalleryTheme::InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos ) { Graphic aGraphic; String aFormat; SgaObject* pNewObj = NULL; - const USHORT nImportRet = GalleryGraphicImport( rURL, aGraphic, aFormat ); - BOOL bRet = FALSE; + const sal_uInt16 nImportRet = GalleryGraphicImport( rURL, aGraphic, aFormat ); + sal_Bool bRet = sal_False; if( nImportRet != SGA_IMPORT_NONE ) { @@ -1179,7 +1179,7 @@ BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos ) pNewObj = (SgaObject*) new SgaObjectSound( rURL ); if( pNewObj && InsertObject( *pNewObj, nInsertPos ) ) - bRet = TRUE; + bRet = sal_True; delete pNewObj; @@ -1188,11 +1188,11 @@ BOOL GalleryTheme::InsertURL( const INetURLObject& rURL, ULONG nInsertPos ) // ----------------------------------------------------------------------------- -BOOL GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG nInsertPos ) +sal_Bool GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, sal_uIntPtr nInsertPos ) { INetURLObject aURL; ::std::vector< INetURLObject > aURLVector; - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; try { @@ -1244,9 +1244,9 @@ BOOL GalleryTheme::InsertFileOrDirURL( const INetURLObject& rFileOrDirURL, ULONG // ----------------------------------------------------------------------------- -BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTransferable >& rxTransferable, ULONG nInsertPos ) +sal_Bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTransferable >& rxTransferable, sal_uIntPtr nInsertPos ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( rxTransferable.is() ) { @@ -1297,7 +1297,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran else { Graphic aGraphic; - ULONG nFormat = 0; + sal_uIntPtr nFormat = 0; if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVXB ) ) nFormat = SOT_FORMATSTR_ID_SVXB; @@ -1312,7 +1312,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran if( pGraphic ) { - bRet = FALSE; + bRet = sal_False; if( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVIM ) ) { @@ -1350,7 +1350,7 @@ BOOL GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran // ----------------------------------------------------------------------------- -void GalleryTheme::CopyToClipboard( Window* pWindow, ULONG nPos ) +void GalleryTheme::CopyToClipboard( Window* pWindow, sal_uIntPtr nPos ) { GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, false ); pTransferable->CopyToClipboard( pWindow ); @@ -1358,7 +1358,7 @@ void GalleryTheme::CopyToClipboard( Window* pWindow, ULONG nPos ) // ----------------------------------------------------------------------------- -void GalleryTheme::StartDrag( Window* pWindow, ULONG nPos ) +void GalleryTheme::StartDrag( Window* pWindow, sal_uIntPtr nPos ) { GalleryTransferable* pTransferable = new GalleryTransferable( this, nPos, true ); pTransferable->StartDrag( pWindow, DND_ACTION_COPY | DND_ACTION_LINK ); @@ -1372,7 +1372,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const const INetURLObject aRelURL2( GetParent()->GetUserURL() ); INetURLObject aNewURL, aTempURL; sal_uInt32 nCount = GetObjectCount(); - BOOL bRel; + sal_Bool bRel; rOStm << (sal_uInt16) 0x0004; rOStm << ByteString( GetRealName(), RTL_TEXTENCODING_UTF8 ); @@ -1386,7 +1386,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const if( SGA_OBJ_SVDRAW == pObj->eObjKind ) { aPath = GetSvDrawStreamNameFromURL( pObj->aURL ); - bRel = FALSE; + bRel = sal_False; } else { @@ -1418,7 +1418,7 @@ SvStream& GalleryTheme::WriteData( SvStream& rOStm ) const } // neuerdings wird ein 512-Byte-Reservepuffer gechrieben; - // um diesen zu erkennen werden zwei ULONG-Ids geschrieben + // um diesen zu erkennen werden zwei sal_uIntPtr-Ids geschrieben rOStm << COMPAT_FORMAT( 'G', 'A', 'L', 'R' ) << COMPAT_FORMAT( 'E', 'S', 'R', 'V' ); const long nReservePos = rOStm.Tell(); @@ -1457,7 +1457,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) if( nVersion >= 0x0004 ) { - UINT16 nTmp16; + sal_uInt16 nTmp16; rIStm >> nTmp16; nTextEncoding = (rtl_TextEncoding) nTmp16; } @@ -1472,14 +1472,14 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) INetURLObject aRelURL1( GetParent()->GetRelativeURL() ); INetURLObject aRelURL2( GetParent()->GetUserURL() ); sal_uInt32 nId1, nId2; - BOOL bRel; + sal_Bool bRel; for( size_t i = 0, n = aObjectList.size(); i < n; ++i ) { pObj = aObjectList[ i ]; - Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< ULONG >( pObj ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_CLOSE_OBJECT, GetName(), reinterpret_cast< sal_uIntPtr >( pObj ) ) ); delete pObj; - Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< ULONG >( pObj ) ) ); + Broadcast( GalleryHint( GALLERY_HINT_OBJECT_REMOVED, GetName(), reinterpret_cast< sal_uIntPtr >( pObj ) ) ); } aObjectList.clear(); @@ -1559,7 +1559,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) { VersionCompat* pCompat = new VersionCompat( rIStm, STREAM_READ ); sal_uInt32 nTemp32; - BOOL bThemeNameFromResource = FALSE; + sal_Bool bThemeNameFromResource = sal_False; rIStm >> nTemp32; @@ -1575,7 +1575,7 @@ SvStream& GalleryTheme::ReadData( SvStream& rIStm ) else rIStm.SetError( SVSTREAM_READ_ERROR ); - ImplSetModified( FALSE ); + ImplSetModified( sal_False ); return rIStm; } @@ -1594,25 +1594,25 @@ SvStream& operator>>( SvStream& rIn, GalleryTheme& rTheme ) return rTheme.ReadData( rIn ); } -void GalleryTheme::ImplSetModified( BOOL bModified ) +void GalleryTheme::ImplSetModified( sal_Bool bModified ) { pThm->SetModified( bModified ); } const String& GalleryTheme::GetRealName() const { return pThm->GetThemeName(); } const INetURLObject& GalleryTheme::GetThmURL() const { return pThm->GetThmURL(); } const INetURLObject& GalleryTheme::GetSdgURL() const { return pThm->GetSdgURL(); } const INetURLObject& GalleryTheme::GetSdvURL() const { return pThm->GetSdvURL(); } -UINT32 GalleryTheme::GetId() const { return pThm->GetId(); } -void GalleryTheme::SetId( UINT32 nNewId, BOOL bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); } -BOOL GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); } -BOOL GalleryTheme::IsImported() const { return pThm->IsImported(); } -BOOL GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); } -BOOL GalleryTheme::IsDefault() const { return pThm->IsDefault(); } -BOOL GalleryTheme::IsModified() const { return pThm->IsModified(); } +sal_uInt32 GalleryTheme::GetId() const { return pThm->GetId(); } +void GalleryTheme::SetId( sal_uInt32 nNewId, sal_Bool bResetThemeName ) { pThm->SetId( nNewId, bResetThemeName ); } +sal_Bool GalleryTheme::IsThemeNameFromResource() const { return pThm->IsNameFromResource(); } +sal_Bool GalleryTheme::IsImported() const { return pThm->IsImported(); } +sal_Bool GalleryTheme::IsReadOnly() const { return pThm->IsReadOnly(); } +sal_Bool GalleryTheme::IsDefault() const { return pThm->IsDefault(); } +sal_Bool GalleryTheme::IsModified() const { return pThm->IsModified(); } const String& GalleryTheme::GetName() const { return IsImported() ? aImportName : pThm->GetThemeName(); } void GalleryTheme::InsertAllThemes( ListBox& rListBox ) { - for( USHORT i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ ) + for( sal_uInt16 i = RID_GALLERYSTR_THEME_FIRST; i <= RID_GALLERYSTR_THEME_LAST; i++ ) rListBox.InsertEntry( String( GAL_RESID( i ) ) ); } diff --git a/svx/source/gallery2/galtheme.src b/svx/source/gallery2/galtheme.src index 99de47ab4c..99de47ab4c 100644..100755 --- a/svx/source/gallery2/galtheme.src +++ b/svx/source/gallery2/galtheme.src diff --git a/svx/source/gallery2/makefile.mk b/svx/source/gallery2/makefile.mk index 7f1a3bb7a7..7f1a3bb7a7 100644..100755 --- a/svx/source/gallery2/makefile.mk +++ b/svx/source/gallery2/makefile.mk diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index a41ef4f287..a41ef4f287 100644..100755 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx diff --git a/svx/source/gengal/gengal.sh b/svx/source/gengal/gengal.sh deleted file mode 100644 index 2fccd222fc..0000000000 --- a/svx/source/gengal/gengal.sh +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# enable file locking -SAL_ENABLE_FILE_LOCKING=1 -export SAL_ENABLE_FILE_LOCKING - -# resolve installation directory -sd_cwd="`pwd`" -if [ -h "$0" ] ; then - sd_basename=`basename "$0"` - sd_script=`ls -l "$0" | sed "s/.*${sd_basename} -> //g"` - cd "`dirname "$0"`" - cd "`dirname "$sd_script"`" -else - cd "`dirname "$0"`" -fi - -sd_prog="`pwd`" - -cd .. -sd_binary=`basename "$0"`".bin" -sd_inst="`pwd`" - -# change back directory -cd "$sd_cwd" - -# check if all required patches are installed -if [ -x "$sd_prog/sopatchlevel.sh" ]; then - "$sd_prog/sopatchlevel.sh" - if [ $? -eq 1 ]; then - exit 0 - fi -fi - -# set search path for shared libraries -sd_platform=`uname -s` -case $sd_platform in - AIX) - LIBPATH=${sd_prog}${LIBPATH+:${LIBPATH}} - export LIBPATH - ;; - - Darwin) - DYLD_LIBRARY_PATH=${sd_prog}${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}} - export DYLD_LIBRARY_PATH - ;; - - HP-UX) - SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH:+:${SHLIB_PATH}} - export SHLIB_PATH - ;; - - *) - LD_LIBRARY_PATH=${sd_prog}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}} - export LD_LIBRARY_PATH - ;; -esac - -# misc. environment variables -unset XENVIRONMENT - -# set path so that other apps can be started just by name -PATH="$sd_prog":$PATH -export PATH - -OOO_INSTALL_PREFIX=${OOO_INSTALL_PREFIX-$sd_prog/../..} -if ! test -e $OOO_INSTALL_PREFIX/basis-link; then - # Hack for vanilla OOo binaries' split install layout - OOO_INSTALL_PREFIX=$OOO_INSTALL_PREFIX/../openoffice.org3 -fi - -export OOO_INSTALL_PREFIX - -# execute binary -exec "$sd_prog/$sd_binary" "$@" diff --git a/svx/source/gengal/gengalrc.in b/svx/source/gengal/gengalrc.in deleted file mode 100644 index 00ae5eb3cd..0000000000 --- a/svx/source/gengal/gengalrc.in +++ /dev/null @@ -1,12 +0,0 @@ -OOO_INSTALL_PREFIX_URL=file://${OOO_INSTALL_PREFIX} -OOO_BASIS_URL=${OOO_INSTALL_PREFIX_URL}/basis-link -OOO_BASIS_BIN_URL=${OOO_BASIS_URL}/program -OOO_URE_URL=${OOO_BASIS_URL}/ure-link -# -#CFG_INIFILE=${OOO_BASIS_BIN_URL}/configmgrrc -#BaseInstallation=${OOO_BASIS_URL} -BRAND_BASE_DIR=${OOO_INSTALL_PREFIX_URL} -OOO_BASE_DIR=${OOO_BASIS_URL} -# -UNO_TYPES=${OOO_URE_URL}/share/misc/types.rdb ${OOO_BASIS_BIN_URL}/offapi.rdb -UNO_SERVICES=${OOO_URE_URL}/share/misc/services.rdb ${OOO_BASIS_BIN_URL}/services.rdb diff --git a/svx/source/gengal/makefile.mk b/svx/source/gengal/makefile.mk index f3e119a8a7..f3e119a8a7 100644..100755 --- a/svx/source/gengal/makefile.mk +++ b/svx/source/gengal/makefile.mk diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index 437a261f8f..437a261f8f 100644..100755 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx diff --git a/svx/source/inc/DGColorNameLookUp.hxx b/svx/source/inc/DGColorNameLookUp.hxx index ffc75f4cf1..ffc75f4cf1 100644..100755 --- a/svx/source/inc/DGColorNameLookUp.hxx +++ b/svx/source/inc/DGColorNameLookUp.hxx diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx index 4512b3b0db..83e67a65db 100644..100755 --- a/svx/source/inc/GraphCtlAccessibleContext.hxx +++ b/svx/source/inc/GraphCtlAccessibleContext.hxx @@ -181,7 +181,7 @@ public: //===== IAccessibleViewforwarder ======================================== - virtual BOOL IsValid (void) const; + virtual sal_Bool IsValid (void) const; virtual Rectangle GetVisibleArea() const; virtual Point LogicToPixel (const Point& rPoint) const; virtual Size LogicToPixel (const Size& rSize) const; diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index 2c3b3fd786..9d5b981a37 100644..100755 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -84,7 +84,7 @@ namespace svx virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getBackground( ) throw (::com::sun::star::uno::RuntimeException); - + // call the fireEvent method from the table when it exists. void SAL_CALL fireEvent( const sal_Int16 _nEventId, @@ -107,14 +107,14 @@ namespace svx struct SvxShowCharSetItem { SvxShowCharSet& mrParent; - USHORT mnId; + sal_uInt16 mnId; XubString maText; Rectangle maRect; SvxShowCharSetItemAcc* m_pItem; SvxShowCharSetAcc* m_pParent; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > m_xAcc; - SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,USHORT _nPos ); + SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,sal_uInt16 _nPos ); ~SvxShowCharSetItem(); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible(); @@ -238,7 +238,7 @@ namespace svx DECLARE_XTYPEPROVIDER( ) SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent ); - + void ParentDestroyed(); // XAccessibleComponent diff --git a/svx/source/inc/clonelist.hxx b/svx/source/inc/clonelist.hxx index 3ed9156625..3ed9156625 100644..100755 --- a/svx/source/inc/clonelist.hxx +++ b/svx/source/inc/clonelist.hxx diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx index b41427489d..b41427489d 100644..100755 --- a/svx/source/inc/datalistener.hxx +++ b/svx/source/inc/datalistener.hxx diff --git a/svx/source/inc/datanavi.hrc b/svx/source/inc/datanavi.hrc index b4bdc3b6e7..b4bdc3b6e7 100644..100755 --- a/svx/source/inc/datanavi.hrc +++ b/svx/source/inc/datanavi.hrc diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 033b11ecbf..c84c93cabe 100644..100755 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -130,7 +130,7 @@ namespace svxform ~DataTreeListBox(); virtual PopupMenu* CreateContextMenu( void ); - virtual void ExcecuteContextMenuAction( USHORT _nSelectedPopupEntry ); + virtual void ExcecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry ); virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ); virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); @@ -166,7 +166,7 @@ namespace svxform void AddChildren( SvLBoxEntry* _pParent, const ImageList& _rImgLst, const XNode_ref& _xNode ); - bool DoToolBoxAction( USHORT _nToolBoxID ); + bool DoToolBoxAction( sal_uInt16 _nToolBoxID ); SvLBoxEntry* AddEntry( ItemNode* _pNewNode, bool _bIsElement ); SvLBoxEntry* AddEntry( const XPropertySet_ref& _rPropSet ); void EditEntry( const XPropertySet_ref& _rPropSet ); @@ -182,12 +182,12 @@ namespace svxform virtual void Resize(); inline bool HasModel() const { return m_bHasModel; } - String SetModel( const XModel_ref& _xModel, USHORT _nPagePos ); + String SetModel( const XModel_ref& _xModel, sal_uInt16 _nPagePos ); void ClearModel(); String LoadInstance( const PropertyValue_seq& _xPropSeq, const ImageList& _rImgLst ); - bool DoMenuAction( USHORT _nMenuID ); + bool DoMenuAction( sal_uInt16 _nMenuID ); void EnableMenuItems( Menu* _pMenu ); inline SvLBoxEntry* GetSelectedItem() const { return m_aItemList.FirstSelected(); } @@ -227,7 +227,7 @@ namespace svxform long m_nMinWidth; long m_nMinHeight; long m_nBorderHeight; - USHORT m_nLastSelectedPos; + sal_uInt16 m_nLastSelectedPos; bool m_bShowDetails; bool m_bIsNotifyDisabled; Size m_a2Size; @@ -249,14 +249,14 @@ namespace svxform DECL_LINK( ActivatePageHdl, TabControl* ); DECL_LINK( UpdateHdl, Timer* ); - XFormsPage* GetCurrentPage( USHORT& rCurId ); + XFormsPage* GetCurrentPage( sal_uInt16& rCurId ); void LoadModels(); void SetPageModel(); void ClearAllPageModels( bool bClearPages ); void InitPages(); void CreateInstancePage( const PropertyValue_seq& _xPropSeq ); bool HasFirstInstancePage() const; - USHORT GetNewPageId() const; + sal_uInt16 GetNewPageId() const; protected: virtual void Resize(); @@ -572,7 +572,7 @@ namespace svxform inline void SetName( const String& _rName ) { m_aNameED.SetText( _rName );} inline String GetURL() const { return m_aURLED.GetText(); } inline void SetURL( const String& _rURL ) { m_aURLED.SetText( _rURL );} - inline bool IsLinkInstance() const { return ( m_aLinkInstanceCB.IsChecked() != FALSE ); } + inline bool IsLinkInstance() const { return ( m_aLinkInstanceCB.IsChecked() != sal_False ); } inline void SetLinkInstance( bool _bLink ) { m_aLinkInstanceCB.Check( _bLink != false ); } }; diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx index 8f85a52087..001a9e3f6d 100644..100755 --- a/svx/source/inc/delayedevent.hxx +++ b/svx/source/inc/delayedevent.hxx @@ -70,7 +70,7 @@ namespace svxform private: Link m_aHandler; - ULONG m_nEventId; + sal_uLong m_nEventId; private: DECL_LINK( OnCall, void* ); diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index 66c70cbb4e..0dd4d52608 100644..100755 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -585,14 +585,14 @@ class RecovDocListEntry : public SvLBoxString //--------------------------------------- /** @short TODO */ RecovDocListEntry( SvLBoxEntry* pEntry, - USHORT nFlags, + sal_uInt16 nFlags, const String& sText ); //--------------------------------------- /** @short TODO */ virtual void Paint(const Point& aPos , SvLBox& aDevice, - USHORT nFlags , + sal_uInt16 nFlags , SvLBoxEntry* pEntry ); }; diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index d93caef074..d93caef074 100644..100755 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index b4765a799a..b4765a799a 100644..100755 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx index 3eddf6ce3f..3eddf6ce3f 100644..100755 --- a/svx/source/inc/fmcontrolbordermanager.hxx +++ b/svx/source/inc/fmcontrolbordermanager.hxx diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx index 16000cfd33..16000cfd33 100644..100755 --- a/svx/source/inc/fmcontrollayout.hxx +++ b/svx/source/inc/fmcontrollayout.hxx diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx index f6f528b687..f6f528b687 100644..100755 --- a/svx/source/inc/fmdocumentclassification.hxx +++ b/svx/source/inc/fmdocumentclassification.hxx diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index b44293a59b..b44293a59b 100644..100755 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx diff --git a/svx/source/inc/fmexpl.hrc b/svx/source/inc/fmexpl.hrc index ce4d88ee51..ce4d88ee51 100644..100755 --- a/svx/source/inc/fmexpl.hrc +++ b/svx/source/inc/fmexpl.hrc diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index cc8a5f3db4..c0ae2d1b79 100644..100755 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -397,7 +397,7 @@ namespace svxform void ClearBranch( FmFormData* pParentData ); void UpdateContent( FmFormShell* pNewShell ); - void Insert( FmEntryData* pEntryData, ULONG nRelPos = LIST_APPEND, + void Insert( FmEntryData* pEntryData, sal_uLong nRelPos = LIST_APPEND, sal_Bool bAlterModel = sal_False ); void Remove( FmEntryData* pEntryData, sal_Bool bAlterModel = sal_False ); @@ -446,7 +446,7 @@ namespace svxform SvLBoxEntry* m_pRootEntry; SvLBoxEntry* m_pEditEntry; - ULONG nEditEvent; + sal_uLong nEditEvent; SELDATA_ITEMS m_sdiState; Point m_aTimerTriggered; // die Position, an der der DropTimer angeschaltet wurde @@ -456,7 +456,7 @@ namespace svxform sal_uInt16 m_nFormsSelected; sal_uInt16 m_nControlsSelected; sal_uInt16 m_nHiddenControls; // (die Zahl geht in m_nControlsSelected mit ein) - + unsigned short m_aTimerCounter; sal_Bool m_bDragDataDirty : 1; // dito @@ -471,7 +471,7 @@ namespace svxform sal_Bool IsDeleteAllowed(); FmControlData* NewControl( const ::rtl::OUString& rServiceName, SvLBoxEntry* pParentEntry, sal_Bool bEditName = sal_True ); void NewForm( SvLBoxEntry* pParentEntry ); - SvLBoxEntry* Insert( FmEntryData* pEntryData, ULONG nRelPos=LIST_APPEND ); + SvLBoxEntry* Insert( FmEntryData* pEntryData, sal_uLong nRelPos=LIST_APPEND ); void Remove( FmEntryData* pEntryData ); diff --git a/svx/source/inc/fmgroup.hxx b/svx/source/inc/fmgroup.hxx new file mode 100755 index 0000000000..f811b9ed9a --- /dev/null +++ b/svx/source/inc/fmgroup.hxx @@ -0,0 +1,120 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVX_FMGROUP_HXX +#define _SVX_FMGROUP_HXX + +#ifndef _SVX_FMCPONT_HXX +#include "fmcpont.hxx" +#endif + +#ifndef __DBFORM_HXX +#include <dbform.hxx> +#endif + +DECLARE_LIST( FmCtrlModelList, XInterface* ); + +struct FmXGroupModel_Impl; + +//================================================================== +// FmXGroupModel +//================================================================== +class FmXGroupModel : public XBoundControl, + public XLoadListener, + public XPropertyChangeListener, + public XGroup, + public FmXControlModel +{ + FmFormControlMap aControlMap; + + friend Reflection* FmXGroupModel_getReflection(); + FmXGroupModel_Impl* pGroupModelData; // Properties + +public: + FmXGroupModel(); + virtual ~FmXGroupModel(); + + // UNO Anbindung + SMART_UNO_DECLARATION( FmXGroupModel, FmXControlModel ); + virtual XInterface* queryInterface(UsrUik); + virtual XIdlClassRef getIdlClass(); + + // XGroup + virtual sal_Int32 getFormControlCount(); + virtual XFormControlRef getFormControlByName( const XubString& sName ) const; + virtual XFormControlRef getFormControlByIndex( sal_Int32 Index ) const; + virtual void appendFormControl( const XFormControlRef& FormControl ); + virtual XFormControlRef removeFormControl( const XFormControlRef& FormControl ); + + // XFormControl + virtual void setParent( const XFormRef& Parent ); + + // XEventListener + virtual void disposing( const EventObject& Source ); + + // XPropertiesChangeListener + virtual void propertyChange( const PropertyChangeEvent& evt ); + + // XLoadListener + virtual void loaded( const EventObject& rEvent ); + virtual void unloaded( const EventObject& rEvent ); + + // XBoundControl + virtual void addBoundControlListener( const XBoundControlListenerRef& l ); + virtual void removeBoundControlListener( const XBoundControlListenerRef& l ); + + // XPersistObject + virtual XubString getServiceName( void ) const; + virtual void write( const XObjectOutputStreamRef& OutStream ); + virtual void read( const XObjectInputStreamRef& InStream ); + + // PropertySetInterface + virtual FmXPropertySetInfo* createPropertySetInfo() const; + virtual sal_Bool setPropertyValue( sal_uInt16 nId, const XubString& aPropertyName, + const UsrAny& aValue, + PropertyChangeEventSequence* pSeq, + sal_Int32 nIndex ); + virtual UsrAny getPropertyValue( sal_uInt16 nId, const XubString& aPropertyName ) const; + virtual void addPropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener ); + virtual void removePropertyChangeListener( const XubString& aPropertyName, const XPropertyChangeListenerRef& aListener ); +}; + +//================================================================== +// FmXGroupModelInfo +// Properties: +//================================================================== +class FmXGroupModelInfo : public FmXControlModelInfo +{ + friend class FmXGroupModel; + +protected: + FmXGroupModelInfo( const FmXGroupModel* pCp ); + virtual void fillProperties( sal_uInt32& nIndex, PropertySequence& aSeq ) const; +}; + + +#endif // _SVX_FMGROUP_HXX + diff --git a/svx/source/inc/fmhlpids.hrc b/svx/source/inc/fmhlpids.hrc index 70e7b51004..70e7b51004 100644..100755 --- a/svx/source/inc/fmhlpids.hrc +++ b/svx/source/inc/fmhlpids.hrc diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx index 350a39a043..350a39a043 100644..100755 --- a/svx/source/inc/fmitems.hxx +++ b/svx/source/inc/fmitems.hxx diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx index 3febbb2c1f..54f7f32cb7 100644..100755 --- a/svx/source/inc/fmobj.hxx +++ b/svx/source/inc/fmobj.hxx @@ -46,7 +46,7 @@ class FmFormObj: public SdrUnoObj // m_pEnvironmentHistory was created FmFormView* m_pControlCreationView; - ULONG m_nControlCreationEvent; + sal_uLong m_nControlCreationEvent; // Informationen fuer die Controlumgebung // werden nur vorgehalten, wenn ein Object sich nicht in einer Objectliste befindet diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 489aeff47e..489aeff47e 100644..100755 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx diff --git a/svx/source/inc/fmprop.hrc b/svx/source/inc/fmprop.hrc index d9f49b2fcc..d9f49b2fcc 100644..100755 --- a/svx/source/inc/fmprop.hrc +++ b/svx/source/inc/fmprop.hrc diff --git a/svx/source/inc/fmscriptingenv.hxx b/svx/source/inc/fmscriptingenv.hxx index 52f5e3cc97..52f5e3cc97 100644..100755 --- a/svx/source/inc/fmscriptingenv.hxx +++ b/svx/source/inc/fmscriptingenv.hxx diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx index 3dd289aeac..3dd289aeac 100644..100755 --- a/svx/source/inc/fmservs.hxx +++ b/svx/source/inc/fmservs.hxx diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 08bced577b..70785c55ca 100644..100755 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -61,7 +61,7 @@ #include <svl/svstdarr.hxx> #include <sfx2/mnuitem.hxx> #include "svx/fmtools.hxx" -#include "fmsrccfg.hxx" +#include "svx/fmsrccfg.hxx" #include <osl/mutex.hxx> #include <tools/debug.hxx> #include <cppuhelper/component.hxx> @@ -118,11 +118,11 @@ class FmFormPage; struct SAL_DLLPRIVATE FmLoadAction { FmFormPage* pPage; - ULONG nEventId; + sal_uLong nEventId; sal_uInt16 nFlags; FmLoadAction( ) : pPage( NULL ), nEventId( 0 ), nFlags( 0 ) { } - FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, ULONG _nEventId ) + FmLoadAction( FmFormPage* _pPage, sal_uInt16 _nFlags, sal_uLong _nEventId ) :pPage( _pPage ), nEventId( _nEventId ), nFlags( _nFlags ) { } @@ -178,9 +178,9 @@ class SAL_DLLPRIVATE FmXFormShell :public FmXFormShell_BASE FmFormArray m_aSearchForms; struct InvalidSlotInfo { - USHORT id; - BYTE flags; - inline InvalidSlotInfo(USHORT slotId, BYTE flgs) : id(slotId), flags(flgs) {}; + sal_uInt16 id; + sal_uInt8 flags; + inline InvalidSlotInfo(sal_uInt16 slotId, sal_uInt8 flgs) : id(slotId), flags(flgs) {}; }; std::vector<InvalidSlotInfo> m_arrInvalidSlots; // we explicitly switch off the propbrw before leaving the design mode @@ -199,8 +199,8 @@ class SAL_DLLPRIVATE FmXFormShell :public FmXFormShell_BASE std::vector<long> m_arrRelativeGridColumn; ::osl::Mutex m_aMutex; - ULONG m_nInvalidationEvent; - ULONG m_nActivationEvent; + sal_uLong m_nInvalidationEvent; + sal_uLong m_nActivationEvent; ::std::queue< FmLoadAction > m_aLoadingPages; diff --git a/svx/source/inc/fmslotinvalidator.hxx b/svx/source/inc/fmslotinvalidator.hxx index 8c6a3e2682..d6be1ec5aa 100644..100755 --- a/svx/source/inc/fmslotinvalidator.hxx +++ b/svx/source/inc/fmslotinvalidator.hxx @@ -36,7 +36,7 @@ namespace svx { //........................................................................ - typedef USHORT SfxSlotId; + typedef sal_uInt16 SfxSlotId; //==================================================================== //= ISlotInvalidator diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx index 56ffb7526b..050f5091c6 100644..100755 --- a/svx/source/inc/fmtextcontroldialogs.hxx +++ b/svx/source/inc/fmtextcontroldialogs.hxx @@ -51,7 +51,7 @@ namespace svx ~TextControlCharAttribDialog(); protected: - virtual void PageCreated( USHORT _nId, SfxTabPage& _rPage ); + virtual void PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage ); }; //==================================================================== diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx index 932c40f83a..932c40f83a 100644..100755 --- a/svx/source/inc/fmtextcontrolfeature.hxx +++ b/svx/source/inc/fmtextcontrolfeature.hxx diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index c65a8f4baf..c65a8f4baf 100644..100755 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index 6967fe4424..6967fe4424 100644..100755 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx index 2b8a686f1e..2b8a686f1e 100644..100755 --- a/svx/source/inc/fmurl.hxx +++ b/svx/source/inc/fmurl.hxx diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index 33f82ceb6b..ec50dc4d3d 100644..100755 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -52,6 +52,7 @@ #include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> #include <comphelper/componentcontext.hxx> +#include <rtl/ref.hxx> //class SdrPageViewWinRec; class SdrPageWindow; @@ -80,13 +81,13 @@ namespace svx { } //================================================================== -// FmXPageViewWinRec +// FormViewPageWindowAdapter //================================================================== typedef ::cppu::WeakImplHelper2 < ::com::sun::star::container::XIndexAccess , ::com::sun::star::form::runtime::XFormControllerContext - > FmXPageViewWinRec_Base; + > FormViewPageWindowAdapter_Base; -class FmXPageViewWinRec : public FmXPageViewWinRec_Base +class FormViewPageWindowAdapter : public FormViewPageWindowAdapter_Base { friend class FmXFormView; @@ -97,10 +98,10 @@ class FmXPageViewWinRec : public FmXPageViewWinRec_Base Window* m_pWindow; protected: - ~FmXPageViewWinRec(); + ~FormViewPageWindowAdapter(); public: - FmXPageViewWinRec( const ::comphelper::ComponentContext& _rContext, + FormViewPageWindowAdapter( const ::comphelper::ComponentContext& _rContext, const SdrPageWindow&, FmXFormView* pView); //const SdrPageViewWinRec*, FmXFormView* pView); @@ -131,7 +132,8 @@ protected: Window* getWindow() const {return m_pWindow;} }; -typedef ::std::vector<FmXPageViewWinRec*> FmWinRecList; +typedef ::rtl::Reference< FormViewPageWindowAdapter > PFormViewPageWindowAdapter; +typedef ::std::vector< PFormViewPageWindowAdapter > PageWindowAdapterList; typedef ::std::set < ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > , ::comphelper::OInterfaceCompare< ::com::sun::star::form::XForm > > SetOfForms; @@ -151,7 +153,7 @@ class FmXFormView : public ::cppu::WeakImplHelper3< friend class FmFormView; friend class FmFormShell; friend class FmXFormShell; - friend class FmXPageViewWinRec; + friend class FormViewPageWindowAdapter; class ObjectRemoveListener; friend class ObjectRemoveListener; @@ -169,7 +171,8 @@ class FmXFormView : public ::cppu::WeakImplHelper3< ::com::sun::star::sdb::SQLErrorEvent m_aAsyncError; // error event which is to be displayed asyn. See m_nErrorMessageEvent. - FmWinRecList m_aWinList; // to be filled in alive mode only + PageWindowAdapterList + m_aPageWindowAdapters; // to be filled in alive mode only MapControlContainerToSetOfForms m_aNeedTabOrderUpdate; @@ -216,8 +219,7 @@ public: virtual void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw (::com::sun::star::uno::RuntimeException); FmFormView* getView() const {return m_pView;} - FmWinRecList::const_iterator findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC ) const; - const FmWinRecList& getWindowList() const {return m_aWinList;} + PFormViewPageWindowAdapter findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC ) const; ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm, const OutputDevice& _rDevice ) const; @@ -247,12 +249,11 @@ public: ); private: - FmWinRecList::iterator findWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC ); //void addWindow(const SdrPageViewWinRec*); void addWindow(const SdrPageWindow&); void removeWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxCC ); void Activate(sal_Bool bSync = sal_False); - void Deactivate(BOOL bDeactivateController = TRUE); + void Deactivate(sal_Bool bDeactivateController = sal_True); SdrObject* implCreateFieldControl( const ::svx::ODataAccessDescriptor& _rColumnDescriptor ); SdrObject* implCreateXFormsControl( const ::svx::OXFormsDescriptor &_rDesc ); @@ -266,8 +267,8 @@ private: const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, - UINT32 _nInventor, - UINT16 _nLabelObjectID, + sal_uInt32 _nInventor, + sal_uInt16 _nLabelObjectID, SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx index 2b3a5796c3..2b3a5796c3 100644..100755 --- a/svx/source/inc/formcontrolfactory.hxx +++ b/svx/source/inc/formcontrolfactory.hxx diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 8d364a9890..8a4a7f518d 100644..100755 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -215,7 +215,8 @@ namespace svxform sal_Bool m_bFiltering : 1; sal_Bool m_bAttachEvents : 1; sal_Bool m_bDetachEvents : 1; - sal_Bool m_bAttemptedHandlerCreation : 1; + bool m_bAttemptedHandlerCreation : 1; + bool m_bSuspendFilterTextListening; // no bit field, passed around as reference // as we want to intercept dispatches of _all_ controls we're responsible for, and an object implementing // the ::com::sun::star::frame::XDispatchProviderInterceptor interface can intercept only _one_ objects dispatches, we need a helper class diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx index f334e30169..f334e30169 100644..100755 --- a/svx/source/inc/formcontrolling.hxx +++ b/svx/source/inc/formcontrolling.hxx diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx index 4fbaf657b7..4fbaf657b7 100644..100755 --- a/svx/source/inc/formdispatchinterceptor.hxx +++ b/svx/source/inc/formdispatchinterceptor.hxx diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx index a042924fdf..a042924fdf 100644..100755 --- a/svx/source/inc/formfeaturedispatcher.hxx +++ b/svx/source/inc/formfeaturedispatcher.hxx diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx index 29900e4d1d..6da116f179 100644..100755 --- a/svx/source/inc/formtoolbars.hxx +++ b/svx/source/inc/formtoolbars.hxx @@ -64,19 +64,19 @@ namespace svxform on the type of our document */ SVX_DLLPUBLIC ::rtl::OUString - getToolboxResourceName( USHORT _nSlotId ) const; + getToolboxResourceName( sal_uInt16 _nSlotId ) const; /** toggles the toolbox associated with the given slot */ - SVX_DLLPUBLIC void toggleToolbox( USHORT _nSlotId ) const; + SVX_DLLPUBLIC void toggleToolbox( sal_uInt16 _nSlotId ) const; /** determines whether the toolbox associated with the given slot is currently visible */ - SVX_DLLPUBLIC bool isToolboxVisible( USHORT _nSlotId ) const; + SVX_DLLPUBLIC bool isToolboxVisible( sal_uInt16 _nSlotId ) const; /** ensures that a given toolbox is visible */ - inline void showToolbox( USHORT _SlotId ) const + inline void showToolbox( sal_uInt16 _SlotId ) const { if ( !isToolboxVisible( _SlotId ) ) toggleToolbox( _SlotId ); diff --git a/svx/source/inc/frmsel.hrc b/svx/source/inc/frmsel.hrc index fb6597c6f5..fb6597c6f5 100644..100755 --- a/svx/source/inc/frmsel.hrc +++ b/svx/source/inc/frmsel.hrc diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx index 0f602eabec..e40ad84820 100644..100755 --- a/svx/source/inc/frmselimpl.hxx +++ b/svx/source/inc/frmselimpl.hxx @@ -76,7 +76,7 @@ public: void SetKeyboardNeighbors( FrameBorderType eLeft, FrameBorderType eRight, FrameBorderType eTop, FrameBorderType eBottom ); - FrameBorderType GetKeyboardNeighbor( USHORT nKeyCode ) const; + FrameBorderType GetKeyboardNeighbor( sal_uInt16 nKeyCode ) const; private: const FrameBorderType meType; /// Frame border type (position in control). diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 1f7fad2cc4..78416ce660 100644..100755 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -832,7 +832,7 @@ public: protected: virtual Window* getEventWindow() const; - virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ); + virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ); // default implementations call our focus listeners, don't forget to call them if you override this virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ); @@ -948,7 +948,7 @@ public: virtual void SAL_CALL removeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XChangeListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); protected: - virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ); + virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ); virtual void onFocusGained( const ::com::sun::star::awt::FocusEvent& _rEvent ); virtual void onFocusLost( const ::com::sun::star::awt::FocusEvent& _rEvent ); @@ -1000,7 +1000,7 @@ public: protected: virtual Window* getEventWindow() const; - virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ); + virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ); }; //================================================================== @@ -1052,7 +1052,7 @@ public: virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) throw(::com::sun::star::uno::RuntimeException); protected: - virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ); + virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ); DECL_LINK( OnDoubleClick, void* ); }; @@ -1097,7 +1097,7 @@ public: virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 _Lines ) throw (::com::sun::star::uno::RuntimeException); protected: - virtual void onWindowEvent( const ULONG _nEventId, const Window& _rWindow, const void* _pEventData ); + virtual void onWindowEvent( const sal_uLong _nEventId, const Window& _rWindow, const void* _pEventData ); }; //================================================================== diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx index 4eafd5d0b4..4eafd5d0b4 100644..100755 --- a/svx/source/inc/gridcols.hxx +++ b/svx/source/inc/gridcols.hxx diff --git a/svx/source/inc/linectrl.hrc b/svx/source/inc/linectrl.hrc index ecbffcb00f..ecbffcb00f 100644..100755 --- a/svx/source/inc/linectrl.hrc +++ b/svx/source/inc/linectrl.hrc diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx index 64a9afa28a..64a9afa28a 100644..100755 --- a/svx/source/inc/recoveryui.hxx +++ b/svx/source/inc/recoveryui.hxx diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx index 1f12fc3e42..1f12fc3e42 100644..100755 --- a/svx/source/inc/sdbdatacolumn.hxx +++ b/svx/source/inc/sdbdatacolumn.hxx diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx index 946f11d6aa..41027e998d 100644..100755 --- a/svx/source/inc/sqlparserclient.hxx +++ b/svx/source/inc/sqlparserclient.hxx @@ -30,7 +30,7 @@ #define SVX_SQLPARSERCLIENT_HXX #include "svx/dbtoolsclient.hxx" -#include "ParseContext.hxx" +#include "svx/ParseContext.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> //........................................................................ diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx index 74bc17ab9f..2b4cb89ddf 100644..100755 --- a/svx/source/inc/stringlistresource.hxx +++ b/svx/source/inc/stringlistresource.hxx @@ -66,7 +66,7 @@ namespace svx @return String The string. */ - String getString( USHORT _nResId ) + String getString( sal_uInt16 _nResId ) { return String( ResId( _nResId, *m_pResMgr ) ); } diff --git a/svx/source/inc/svdoimp.hxx b/svx/source/inc/svdoimp.hxx index e28219fd81..66c1caf573 100644..100755 --- a/svx/source/inc/svdoimp.hxx +++ b/svx/source/inc/svdoimp.hxx @@ -90,9 +90,9 @@ void ImpCalcBmpFillSizes( Size& rStartOffset, const Size& rBmpSize, const Size& rBmpPerCent, const Size& rBmpOffPerCent, - BOOL bBmpLogSize, - BOOL bBmpTile, - BOOL bBmpStretch, + sal_Bool bBmpLogSize, + sal_Bool bBmpTile, + sal_Bool bBmpStretch, RECT_POINT eBmpRectPoint ); diff --git a/svx/source/inc/svdoutlinercache.hxx b/svx/source/inc/svdoutlinercache.hxx index bfa824b902..bfa824b902 100644..100755 --- a/svx/source/inc/svdoutlinercache.hxx +++ b/svx/source/inc/svdoutlinercache.hxx diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 835967b081..835967b081 100644..100755 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx index e086854d14..1b42253c6d 100644..100755 --- a/svx/source/inc/tabwin.hxx +++ b/svx/source/inc/tabwin.hxx @@ -61,7 +61,7 @@ protected: virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); // SvLBox - virtual BOOL DoubleClickHdl(); + virtual sal_Bool DoubleClickHdl(); using SvLBox::ExecuteDrop; }; diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx index 1935fcb366..9e786352e3 100644..100755 --- a/svx/source/inc/tbxform.hxx +++ b/svx/source/inc/tbxform.hxx @@ -58,7 +58,7 @@ private: DECL_LINK( TbxSelectHdl, ToolBox* ); public: - SvxFmConfigWin( USHORT nId, ResId aRIdWin, ResId aRIdTbx ); + SvxFmConfigWin( sal_uInt16 nId, ResId aRIdWin, ResId aRIdTbx ); ~SvxFmConfigWin(); void Update(); @@ -70,7 +70,7 @@ public: class SvxFmTbxCtlConfig : public SfxToolBoxControl { private: - UINT16 nLastSlot; + sal_uInt16 nLastSlot; protected: using SfxToolBoxControl::Select; @@ -78,11 +78,11 @@ protected: public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxCtlConfig( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFmTbxCtlConfig() {} - virtual void Select( USHORT nModifier ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void Select( sal_uInt16 nModifier ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindowType GetPopupWindowType() const; virtual SfxPopupWindow* CreatePopupWindow(); @@ -95,12 +95,12 @@ class SvxFmTbxCtlAbsRec : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxCtlAbsRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFmTbxCtlAbsRec(); virtual Window* CreateItemWindow( Window* pParent ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -110,7 +110,7 @@ class SvxFmTbxCtlRecText : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxCtlRecText( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFmTbxCtlRecText(); virtual Window* CreateItemWindow( Window* pParent ); @@ -122,7 +122,7 @@ class SvxFmTbxCtlRecFromText : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxCtlRecFromText( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFmTbxCtlRecFromText(); virtual Window* CreateItemWindow( Window* pParent ); @@ -136,11 +136,11 @@ class SvxFmTbxCtlRecTotal : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxCtlRecTotal( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); ~SvxFmTbxCtlRecTotal(); virtual Window* CreateItemWindow( Window* pParent ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); }; @@ -149,7 +149,7 @@ class SvxFmTbxNextRec : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxNextRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFmTbxNextRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; //======================================================================== @@ -157,7 +157,7 @@ class SvxFmTbxPrevRec : public SfxToolBoxControl { public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFmTbxPrevRec( USHORT nSlotId, USHORT nId, ToolBox& rTbx ); + SvxFmTbxPrevRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); }; diff --git a/svx/source/inc/trace.hxx b/svx/source/inc/trace.hxx index 52991b4247..52991b4247 100644..100755 --- a/svx/source/inc/trace.hxx +++ b/svx/source/inc/trace.hxx diff --git a/svx/source/inc/treevisitor.hxx b/svx/source/inc/treevisitor.hxx index 11b10d505a..11b10d505a 100644..100755 --- a/svx/source/inc/treevisitor.hxx +++ b/svx/source/inc/treevisitor.hxx diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx index 625ceaac7a..bb9cadcebe 100644..100755 --- a/svx/source/inc/typeconversionclient.hxx +++ b/svx/source/inc/typeconversionclient.hxx @@ -61,17 +61,16 @@ namespace svxform // -------------------------------------------------------- inline double getValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn>& _rxVariant, - const ::com::sun::star::util::Date& _rNullDate, - sal_Int16 _nKeyType) const + const ::com::sun::star::util::Date& _rNullDate ) const { double nReturn(0); if ( ensureLoaded() ) - nReturn = m_xTypeConversion->getValue(_rxVariant, _rNullDate, _nKeyType); + nReturn = m_xTypeConversion->getValue( _rxVariant, _rNullDate ); return nReturn; } // -------------------------------------------------------- - inline ::rtl::OUString getValue( + inline ::rtl::OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XColumn >& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& _rxFormatter, const ::com::sun::star::util::Date& _rNullDate, @@ -80,7 +79,7 @@ namespace svxform { ::rtl::OUString sReturn; if ( ensureLoaded() ) - sReturn = m_xTypeConversion->getValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType); + sReturn = m_xTypeConversion->getFormattedValue(_rxColumn, _rxFormatter, _rNullDate, _nKey, _nKeyType); return sReturn; } }; diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx index d4764f06c6..d4764f06c6 100644..100755 --- a/svx/source/inc/unogalthemeprovider.hxx +++ b/svx/source/inc/unogalthemeprovider.hxx diff --git a/svx/source/inc/unopolyhelper.hxx b/svx/source/inc/unopolyhelper.hxx index c682f34f00..c682f34f00 100644..100755 --- a/svx/source/inc/unopolyhelper.hxx +++ b/svx/source/inc/unopolyhelper.hxx diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx index 36ec1896e8..36ec1896e8 100644..100755 --- a/svx/source/inc/xfm_addcondition.hxx +++ b/svx/source/inc/xfm_addcondition.hxx diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx index ac190aaaba..ac190aaaba 100644..100755 --- a/svx/source/inc/xmlxtexp.hxx +++ b/svx/source/inc/xmlxtexp.hxx diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx index c10985fabc..c10985fabc 100644..100755 --- a/svx/source/inc/xmlxtimp.hxx +++ b/svx/source/inc/xmlxtimp.hxx diff --git a/svx/source/intro/intro_tmpl.hrc b/svx/source/intro/about_ooo.hrc index d789935427..399b2a49c4 100644..100755 --- a/svx/source/intro/intro_tmpl.hrc +++ b/svx/source/intro/about_ooo.hrc @@ -25,10 +25,6 @@ * ************************************************************************/ -#include <svx/svxids.hrc> - -#define RID_IMGLIST_TREEOPT (RID_OFA_START + 174) - #define OOO_CONTRIBUTOR_LIST \ ItemList = \ { \ @@ -1085,242 +1081,3 @@ ItemList = \ < "Mattia Zuliani" ; > ; \ }; - -#define DEVELOPER_LIST \ -ItemList = \ -{ \ - < "" ; > ; \ - < "GENERAL MANAGEMENT" ; 8 ; > ; \ - < "" ; > ; \ - < "Michael Bemmer" ; > ; \ - < "" ; > ; \ - < "FUNCTIONAL STAFF" ; 8 ; > ; \ - < "" ; > ; \ - < "Sabine Huetsch" ; > ; \ - < "" ; > ; \ - < "OpenOffice.org COORDINATION" ; 8 ; > ; \ - < "" ; > ; \ - < "Stefan Taxhet" ; > ; \ - < "" ; > ; \ - < "TECHNICAL ARCHITECT" ; 8 ; > ; \ - < "" ; > ; \ - < "Matthias Huetsch" ; > ; \ - < "Kay Ramme" ; > ; \ - < "" ; > ; \ - < "PROGRAM MANAGEMENT" ; 8 ; > ; \ - < "" ; > ; \ - < "Joost Andrae" ; > ; \ - < "Martin Damboldt" ; > ; \ - < "Martin Hollmichel" ; > ; \ - < "Andre Kuemmel" ; > ; \ - < "Marcus Lange" ; > ; \ - < "Uwe Luebbers" ; > ; \ - < "" ; > ; \ - < "" ; > ; \ - < "%PRODUCTNAME DEVELOPMENT" ; 8 ; > ; \ - < "" ; > ; \ - < "Dieter Loeschky" ; > ; \ - < "" ; > ; \ - < "TECHNICAL ARCHITECT" ; 8 ; > ; \ - < "" ; > ; \ - < "Michael Brauer" ; > ; \ - < "Malte Timmermann" ; > ; \ - < "" ; > ; \ - < "ODF" ; 8 ; > ; \ - < "" ; > ; \ - < "Svante Schubert" ; > ; \ - < "" ; > ; \ - < "DESIGN" ; 8 ; > ; \ - < "" ; > ; \ - < "Stella Schulze" ; > ; \ - < "" ; > ; \ - < "Migration" ; 8 ; > ; \ - < "" ; > ; \ - < "Michael Bohn" ; > ; \ - < "" ; > ; \ - < "%PRODUCTNAME WRITER & FRAMEWORK" ; 8 ; > ; \ - < "" ; > ; \ - < "Mathias Bauer" ; > ; \ - < "" ; > ; \ - < "Henning Brinkmann" ; > ; \ - < "Steffen Grund" ; > ; \ - < "Hans-Peter Burow" ; > ; \ - < "Carsten Driesner" ; > ; \ - < "Thomas Lange" ; > ; \ - < "Andreas Martens" ; > ; \ - < "Frank Meies" ; > ; \ - < "Bjoern Michaelsen" ; > ; \ - < "Andreas Schluens" ; > ; \ - < "Oliver Specht" ; > ; \ - < "Oliver-Rainer Wittmann" ; > ; \ - < "Michael Stahl" ; > ; \ - < "Mikhail Voitenko" ; > ; \ - < "" ; > ; \ - < "%PRODUCTNAME IMPRESS, GRAPHICS & BASE" ; 8 ; > ; \ - < "" ; > ; \ - < "Kai Ahrens" ; > ; \ - < "" ; > ; \ - < "Volker Ahrendt" ; > ; \ - < "Herbert Duerr" ; > ; \ - < "Andre Fischer" ; > ; \ - < "Ilko Hoepping" ; > ; \ - < "Sven Jacobi" ; > ; \ - < "Ocke Janssen" ; > ; \ - < "Artem Khvat" ; > ; \ - < "Lars Langhans" ; > ; \ - < "Armin Le Grand" ; > ; \ - < "Christian Lippka" ; > ; \ - < "Philipp Lohmann" ; > ; \ - < "Frank Schoenheit" ; > ; \ - < "" ; > ; \ - < "%PRODUCTNAME PROGRAMMABILITY & DEPLOYMENT" ; 8 ; > ; \ - < "" ; > ; \ - < "Kai Sommerfeld" ; > ; \ - < "" ; > ; \ - < "Stephan Bergmann" ; > ; \ - < "Andreas Bregas" ; > ; \ - < "Steffen Grund" ; > ; \ - < "Mihaela Kedikova" ; > ; \ - < "Tobias Krause" ; > ; \ - < "Joachim Lingner" ; > ; \ - < "Christoph Neumann" ; > ; \ - < "Hennes Rohling" ; > ; \ - < "Juergen Schmidt" ; > ; \ - < "Ingo Schmidt-Rosbiegal" ; > ; \ - < "Dirk Voelzke" ; > ; \ - < "" ; > ; \ - < "" ; > ; \ - < "%PRODUCTNAME CALC" ; 8 ; > ; \ - < "" ; > ; \ - < "Stephan Schaefer" ; > ; \ - < "" ; > ; \ - < "Thomas Benisch" ; > ; \ - < "Daniel Boelzle" ; > ; \ - < "Berend Cornelius" ; > ; \ - < "Ingrid Halama" ; > ; \ - < "Bjoern Milcke" ; > ; \ - < "Niklas Nebel" ; > ; \ - < "Eike Rathke" ; > ; \ - < "Daniel Rentz" ; > ; \ - < "" ; > ; \ - < "" ; > ; \ - < "USER EXPERIENCE" ; 8 ; > ; \ - < "" ; > ; \ - < "Andreas Bartel" ; > ; \ - < "Bettina Haberer" ; > ; \ - < "Christian Jansen" ; > ; \ - < "Frank Loehmann" ; > ; \ - < "Elizabeth Matthis" ; > ; \ - < "" ; > ; \ - < "" ; > ; \ - < "QUALITY ASSURANCE & COORDINATION" ; 8 ; > ; \ - < "" ; > ; \ - < "Nils Fuhrmann" ; > ; \ - < "" ; > ; \ - < "" ; > ; \ - < "RELEASE ENGINEERING " ; 8 ; > ; \ - < "" ; > ; \ - < "Ruediger Timm" ; > ; \ - < "" ; > ; \ - < "Oliver Bolte" ; > ; \ - < "Vladimir Glazounov" ; > ; \ - < "Ivo Hinkelmann" ; > ; \ - < "Hans-Joachim Lankenau" ; > ; \ - < "Jens-Heiner Rechtien" ; > ; \ - < "Kurt Zenker" ; > ; \ - < "" ; > ; \ - < "DEVELOPMENT TOOLS" ; 8 ; > ; \ - < "" ; > ; \ - < "Joerg Jahnke" ; > ; \ - < "" ; > ; \ - < "Bernd Eilers" ; > ; \ - < "Gregor Hartmann" ; > ; \ - < "Frank Mau" ; > ; \ - < "Nikolai Pretzell" ; > ; \ - < "" ; > ; \ - < "QUALITY ASSURANCE" ; 8 ; > ; \ - < "" ; > ; \ - < "Thorsten Ziehm" ; > ; \ - < "" ; > ; \ - < "QA %PRODUCTNAME AUTOMATION" ; 8 ; > ; \ - < "" ; > ; \ - < "Thorsten Bosbach" ; > ; \ - < "Helge Delfs" ; > ; \ - < "Joerg Sievers" ; > ; \ - < "" ; > ; \ - < "QA %PRODUCTNAME WRITER" ; 8 ; > ; \ - < "" ; > ; \ - < "Stefan Baltzer" ; > ; \ - < "Hasan Ilter" ; > ; \ - < "Michael Ruess" ; > ; \ - < "Eric Savary" ; > ; \ - < "Ulf Stroehler" ; > ; \ - < "" ; > ; \ - < "QA %PRODUCTNAME CALC" ; 8 ; > ; \ - < "" ; > ; \ - < "Oliver Craemer" ; > ; \ - < "Thomas Klarhoefer" ; > ; \ - < "Frank Stecher" ; > ; \ - < "" ; > ; \ - < "QA %PRODUCTNAME IMPRESS & BASE" ; 8 ; > ; \ - < "" ; > ; \ - < "Christoph Lukasiak" ; > ; \ - < "Marc Neumann" ; > ; \ - < "Wolfram Garten" ; > ; \ - < "Christian Guenther" ; > ; \ - < "" ; > ; \ - < "QA %PRODUCTNAME INFRASTRUCTURE" ; 8 ; > ; \ - < "" ; > ; \ - < "Olaf Felka" ; > ; \ - < "Thorsten Martens" ; > ; \ - < "Joerg W. Skottke" ; > ; \ - < "Andreas Treumann" ; > ; \ - < "" ; > ; \ - < "INFORMATION TECHNOLOGY" ; 8 ; > ; \ - < "" ; > ; \ - < "Dirk Marquardt" ; > ; \ - < "Gerd Weiss" ; > ; \ - < "" ; > ; \ - < "" ; > ; \ - < "MANUALS & ONLINE HELP" ; 8 ; > ; \ - < "" ; > ; \ - < "Frank Peters" ; > ; \ - < "" ; > ; \ - < "Clayton Cornell" ; > ; \ - < "Uwe Fischer" ; > ; \ - < "Martina Waller" ; > ; \ - < "" ; > ; \ - < "" ; > ; \ - < "GLOBALIZATION PROGRAM MANAGEMENT" ; 8 ; > ; \ - < "" ; > ; \ - < "Rafaella Braconi" ; > ; \ - < "" ; > ; \ - < "MARKETING & OPERATIONS" ; 8 ; > ; \ - < "" ; > ; \ - < "PRODUCT MANAGMENT" ; 8 ; > ; \ - < "" ; > ; \ - < "Goetz Wohlberg" ; > ; \ - < "Lutz Hoeger" ; > ; \ - < "" ; > ; \ - < "MARKETING" ; 8 ; > ; \ - < "" ; > ; \ - < "Rosana Ardila Biela" ; > ; \ - < "Kay Koll" ; > ; \ - < "Iyer Venkatesan" ; > ; \ - < "" ; > ; \ - < "OPERATIONS" ; 8 ; > ; \ - < "" ; > ; \ - < "Parker Proffitt" ; > ; \ - < "" ; > ; \ - < "SUN SIGMA BLACK BELT" ; 8 ; > ; \ - < "" ; > ; \ - < "Stefan Zimmermann" ; > ; \ - < "" ; > ; \ -};\ - -#define TEXT_DEFAULTABOUT \ - Text [ x-comment ] = "PB: ; PB: only %PRODUCTNAME"; \ - Text [ en-US ] = "About %PRODUCTNAME" ; \ - -// ******************************************************************* EOF - diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src index be0ec5d20c..be0ec5d20c 100644..100755 --- a/svx/source/intro/iso.src +++ b/svx/source/intro/iso.src diff --git a/svx/source/intro/makefile.mk b/svx/source/intro/makefile.mk deleted file mode 100644 index 4d0686baac..0000000000 --- a/svx/source/intro/makefile.mk +++ /dev/null @@ -1,66 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$ - -PRJNAME=svx -TARGET=intro - -# --- Settings ------------------------------------------------------------ - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -RSCLOCINC!:=$(RSCLOCINC);$(PRJ)$/RES - -# --- Allgemein ----------------------------------------------------------- - -LOCALIZE_ME=intro_tmpl.hrc - -SRS1NAME= iso -SRC1FILES= \ - $(SRS1NAME).src - -RESLIB1NAME=$(SRS1NAME) -RESLIB1IMAGES=$(PRJ)$/res -RESLIB1SRSFILES= \ - $(SRS)$/$(SRS1NAME).srs - -# Version "OpenOffice.org" -SRS2NAME= ooo -SRC2FILES= \ - $(SRS2NAME).src - -RESLIB2NAME=$(SRS2NAME) -RESLIB2IMAGES=$(PRJ)$/res -RESLIB2SRSFILES= \ - $(SRS)$/$(SRS2NAME).srs - -.INCLUDE : target.mk - -$(SRS)$/iso.srs: $(INCCOM)$/intro.hrc -$(SRS)$/ooo.srs: $(INCCOM)$/intro.hrc - diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src index 07f3daab9f..07f3daab9f 100644..100755 --- a/svx/source/intro/ooo.src +++ b/svx/source/intro/ooo.src diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx index c16a739db4..bc76611c69 100644..100755 --- a/svx/source/items/SmartTagItem.cxx +++ b/svx/source/items/SmartTagItem.cxx @@ -40,7 +40,7 @@ TYPEINIT1(SvxSmartTagItem, SfxPoolItem); // class SvxFontItem ----------------------------------------------------- -SvxSmartTagItem::SvxSmartTagItem( const USHORT nId, +SvxSmartTagItem::SvxSmartTagItem( const sal_uInt16 nId, const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::smarttags::XSmartTagAction > > >& rActionComponentsSequence, const com::sun::star::uno::Sequence < com::sun::star::uno::Sequence< sal_Int32 > >& rActionIndicesSequence, const com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::container::XStringKeyMap > >& rStringKeyMaps, @@ -65,12 +65,12 @@ SvxSmartTagItem::SvxSmartTagItem( const USHORT nId, // ----------------------------------------------------------------------- -bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, BYTE /* nMemberId */ ) const +bool SvxSmartTagItem::QueryValue( uno::Any& /* rVal */, sal_uInt8 /* nMemberId */ ) const { return false; } // ----------------------------------------------------------------------- -bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, BYTE /* nMemberId */) +bool SvxSmartTagItem::PutValue( const uno::Any& /*rVal*/, sal_uInt8 /* nMemberId */) { return false; } @@ -103,14 +103,14 @@ SfxPoolItem* SvxSmartTagItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- -SvStream& SvxSmartTagItem::Store( SvStream& rStream, USHORT /*nItemVersion*/ ) const +SvStream& SvxSmartTagItem::Store( SvStream& rStream, sal_uInt16 /*nItemVersion*/ ) const { return rStream; } // ----------------------------------------------------------------------- -SfxPoolItem* SvxSmartTagItem::Create(SvStream& , USHORT) const +SfxPoolItem* SvxSmartTagItem::Create(SvStream& , sal_uInt16) const { return 0; } diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index a6086d903a..8e060c86f0 100644..100755 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -66,12 +66,12 @@ TYPEINIT1_FACTORY( SvxMarginItem, SfxPoolItem, new SvxMarginItem(0) ); // class SvxOrientationItem ---------------------------------------------- SvxOrientationItem::SvxOrientationItem( const SvxCellOrientation eOrientation, - const USHORT nId): - SfxEnumItem( nId, (USHORT)eOrientation ) + const sal_uInt16 nId): + SfxEnumItem( nId, (sal_uInt16)eOrientation ) { } -SvxOrientationItem::SvxOrientationItem( INT32 nRotation, BOOL bStacked, const USHORT nId ) : +SvxOrientationItem::SvxOrientationItem( sal_Int32 nRotation, sal_Bool bStacked, const sal_uInt16 nId ) : SfxEnumItem( nId ) { SetFromRotation( nRotation, bStacked ); @@ -102,7 +102,7 @@ SfxItemPresentation SvxOrientationItem::GetPresentation //------------------------------------------------------------------------ -bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SvxOrientationItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { table::CellOrientation eUno = table::CellOrientation_STANDARD; switch ( (SvxCellOrientation)GetValue() ) @@ -116,7 +116,7 @@ bool SvxOrientationItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const return true; } -bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { table::CellOrientation eOrient; if(!(rVal >>= eOrient)) @@ -135,13 +135,13 @@ bool SvxOrientationItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) case table::CellOrientation_STACKED: eSvx = SVX_ORIENTATION_STACKED; break; default: ; //prevent warning } - SetValue( (USHORT)eSvx ); + SetValue( (sal_uInt16)eSvx ); return true; } //------------------------------------------------------------------------ -XubString SvxOrientationItem::GetValueText( USHORT nVal ) const +XubString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) const { DBG_ASSERT( nVal <= SVX_ORIENTATION_STACKED, "enum overflow!" ); return SVX_RESSTR(RID_SVXITEMS_ORI_STANDARD + nVal); @@ -156,30 +156,30 @@ SfxPoolItem* SvxOrientationItem::Clone( SfxItemPool* ) const //------------------------------------------------------------------------ -SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, USHORT ) const +SfxPoolItem* SvxOrientationItem::Create( SvStream& rStream, sal_uInt16 ) const { - USHORT nVal; + sal_uInt16 nVal; rStream >> nVal; return new SvxOrientationItem( (SvxCellOrientation)nVal, Which() ); } //------------------------------------------------------------------------ -USHORT SvxOrientationItem::GetValueCount() const +sal_uInt16 SvxOrientationItem::GetValueCount() const { return SVX_ORIENTATION_STACKED + 1; // letzter Enum-Wert + 1 } //------------------------------------------------------------------------ -BOOL SvxOrientationItem::IsStacked() const +sal_Bool SvxOrientationItem::IsStacked() const { return static_cast< SvxCellOrientation >( GetValue() ) == SVX_ORIENTATION_STACKED; } -INT32 SvxOrientationItem::GetRotation( INT32 nStdAngle ) const +sal_Int32 SvxOrientationItem::GetRotation( sal_Int32 nStdAngle ) const { - INT32 nAngle = nStdAngle; + sal_Int32 nAngle = nStdAngle; switch( static_cast< SvxCellOrientation >( GetValue() ) ) { case SVX_ORIENTATION_BOTTOMTOP: nAngle = 9000; @@ -189,7 +189,7 @@ INT32 SvxOrientationItem::GetRotation( INT32 nStdAngle ) const return nAngle; } -void SvxOrientationItem::SetFromRotation( INT32 nRotation, BOOL bStacked ) +void SvxOrientationItem::SetFromRotation( sal_Int32 nRotation, sal_Bool bStacked ) { if( bStacked ) { @@ -205,7 +205,7 @@ void SvxOrientationItem::SetFromRotation( INT32 nRotation, BOOL bStacked ) // class SvxMarginItem --------------------------------------------------- -SvxMarginItem::SvxMarginItem( const USHORT nId ) : +SvxMarginItem::SvxMarginItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), @@ -222,7 +222,7 @@ SvxMarginItem::SvxMarginItem( sal_Int16 nLeft, sal_Int16 nTop, sal_Int16 nRight, sal_Int16 nBottom, - const USHORT nId ) : + const sal_uInt16 nId ) : SfxPoolItem( nId ), nLeftMargin ( nLeft ), @@ -316,7 +316,7 @@ SfxPoolItem* SvxMarginItem::Clone( SfxItemPool* ) const //------------------------------------------------------------------------ -SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, USHORT ) const +SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, sal_uInt16 ) const { sal_Int16 nLeft; sal_Int16 nTop; @@ -331,7 +331,7 @@ SfxPoolItem* SvxMarginItem::Create( SvStream& rStream, USHORT ) const //------------------------------------------------------------------------ -SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) const +SvStream& SvxMarginItem::Store( SvStream &rStream, sal_uInt16 /*nItemVersion*/) const { rStream << nLeftMargin; rStream << nTopMargin; @@ -343,7 +343,7 @@ SvStream& SvxMarginItem::Store( SvStream &rStream, USHORT /*nItemVersion*/) cons //------------------------------------------------------------------------ -bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SvxMarginItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -371,7 +371,7 @@ bool SvxMarginItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const //------------------------------------------------------------------------ -bool SvxMarginItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SvxMarginItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = ( ( nMemberId & CONVERT_TWIPS ) != 0 ); long nMaxVal = bConvert ? TWIP_TO_MM100(SHRT_MAX) : SHRT_MAX; // Members sind sal_Int16 diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 951ecb4e1c..e6bba7d2c0 100644..100755 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -43,7 +43,7 @@ #include <float.h> #include <rtl/math.hxx> -#include "chrtitem.hxx" +#include "svx/chrtitem.hxx" using namespace ::rtl; using namespace ::com::sun::star; @@ -51,7 +51,6 @@ using namespace ::com::sun::star; TYPEINIT1_FACTORY(SvxChartStyleItem, SfxEnumItem, new SvxChartStyleItem(CHSTYLE_2D_LINE, 0)); TYPEINIT1(SvxChartDataDescrItem, SfxEnumItem); -TYPEINIT1(SvxChartLegendPosItem, SfxEnumItem); TYPEINIT1(SvxChartTextOrderItem, SfxEnumItem); TYPEINIT1(SvxChartTextOrientItem, SfxEnumItem); TYPEINIT1(SvxChartIndicateItem, SfxEnumItem); @@ -65,14 +64,14 @@ TYPEINIT1_FACTORY(SvxDoubleItem, SfxPoolItem, new SvxDoubleItem(0.0, 0)); |* *************************************************************************/ -SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, USHORT nId) : - SfxEnumItem(nId, (USHORT)eStyle) +SvxChartStyleItem::SvxChartStyleItem(SvxChartStyle eStyle, sal_uInt16 nId) : + SfxEnumItem(nId, (sal_uInt16)eStyle) { } // ----------------------------------------------------------------------- -SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, USHORT nId) : +SvxChartStyleItem::SvxChartStyleItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } @@ -86,7 +85,7 @@ SfxPoolItem* SvxChartStyleItem::Clone(SfxItemPool* /*pPool*/) const // ----------------------------------------------------------------------- -SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartStyleItem(rIn, Which()); } @@ -98,14 +97,14 @@ SfxPoolItem* SvxChartStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const *************************************************************************/ SvxChartDataDescrItem::SvxChartDataDescrItem(SvxChartDataDescr eDataDescr, - USHORT nId) : - SfxEnumItem(nId, (USHORT)eDataDescr) + sal_uInt16 nId) : + SfxEnumItem(nId, (sal_uInt16)eDataDescr) { } // ----------------------------------------------------------------------- -SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, USHORT nId) : +SvxChartDataDescrItem::SvxChartDataDescrItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } @@ -119,59 +118,26 @@ SfxPoolItem* SvxChartDataDescrItem::Clone(SfxItemPool* /*pPool*/) const // ----------------------------------------------------------------------- -SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SvxChartDataDescrItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartDataDescrItem(rIn, Which()); } /************************************************************************* |* -|* SvxChartLegendPosItem -|* -*************************************************************************/ - -SvxChartLegendPosItem::SvxChartLegendPosItem(SvxChartLegendPos eLegendPos, - USHORT nId) : - SfxEnumItem(nId, (USHORT)eLegendPos) -{ -} - -// ----------------------------------------------------------------------- - -SvxChartLegendPosItem::SvxChartLegendPosItem(SvStream& rIn, USHORT nId) : - SfxEnumItem(nId, rIn) -{ -} - -// ----------------------------------------------------------------------- - -SfxPoolItem* SvxChartLegendPosItem::Clone(SfxItemPool* /*pPool*/) const -{ - return new SvxChartLegendPosItem(*this); -} - -// ----------------------------------------------------------------------- - -SfxPoolItem* SvxChartLegendPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const -{ - return new SvxChartLegendPosItem(rIn, Which()); -} - -/************************************************************************* -|* |* SvxChartTextOrderItem |* *************************************************************************/ SvxChartTextOrderItem::SvxChartTextOrderItem(SvxChartTextOrder eOrder, - USHORT nId) : - SfxEnumItem(nId, (USHORT)eOrder) + sal_uInt16 nId) : + SfxEnumItem(nId, (sal_uInt16)eOrder) { } // ----------------------------------------------------------------------- -SvxChartTextOrderItem::SvxChartTextOrderItem(SvStream& rIn, USHORT nId) : +SvxChartTextOrderItem::SvxChartTextOrderItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } @@ -185,14 +151,14 @@ SfxPoolItem* SvxChartTextOrderItem::Clone(SfxItemPool* /*pPool*/) const // ----------------------------------------------------------------------- -SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SvxChartTextOrderItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartTextOrderItem(rIn, Which()); } // ----------------------------------------------------------------------- -bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // the order of the two enums is not equal, so a mapping is required ::com::sun::star::chart::ChartAxisArrangeOrderType eAO; @@ -217,7 +183,7 @@ bool SvxChartTextOrderItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE / // ----------------------------------------------------------------------- -bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // the order of the two enums is not equal, so a mapping is required ::com::sun::star::chart::ChartAxisArrangeOrderType eAO; @@ -246,7 +212,7 @@ bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY return false; } - SetValue( (USHORT)eOrder ); + SetValue( (sal_uInt16)eOrder ); return true; } @@ -258,14 +224,14 @@ bool SvxChartTextOrderItem::PutValue( const ::com::sun::star::uno::Any& rVal, BY *************************************************************************/ SvxChartTextOrientItem::SvxChartTextOrientItem(SvxChartTextOrient eOrient, - USHORT nId) : - SfxEnumItem(nId, (USHORT)eOrient) + sal_uInt16 nId) : + SfxEnumItem(nId, (sal_uInt16)eOrient) { } // ----------------------------------------------------------------------- -SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, USHORT nId) : +SvxChartTextOrientItem::SvxChartTextOrientItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } @@ -279,7 +245,7 @@ SfxPoolItem* SvxChartTextOrientItem::Clone(SfxItemPool* /*pPool*/) const // ----------------------------------------------------------------------- -SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartTextOrientItem(rIn, Which()); } @@ -290,7 +256,7 @@ SfxPoolItem* SvxChartTextOrientItem::Create(SvStream& rIn, USHORT /*nVer*/) cons |* *************************************************************************/ -SvxDoubleItem::SvxDoubleItem(double fValue, USHORT nId) : +SvxDoubleItem::SvxDoubleItem(double fValue, sal_uInt16 nId) : SfxPoolItem(nId), fVal(fValue) { @@ -298,7 +264,7 @@ SvxDoubleItem::SvxDoubleItem(double fValue, USHORT nId) : // ----------------------------------------------------------------------- -SvxDoubleItem::SvxDoubleItem(SvStream& rIn, USHORT nId) : +SvxDoubleItem::SvxDoubleItem(SvStream& rIn, sal_uInt16 nId) : SfxPoolItem(nId) { rIn >> fVal; @@ -354,7 +320,7 @@ SfxPoolItem* SvxDoubleItem::Clone(SfxItemPool* /*pPool*/) const // ----------------------------------------------------------------------- -SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, USHORT /*nVersion*/) const +SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, sal_uInt16 /*nVersion*/) const { double _fVal; rIn >> _fVal; @@ -363,7 +329,7 @@ SfxPoolItem* SvxDoubleItem::Create(SvStream& rIn, USHORT /*nVersion*/) const // ----------------------------------------------------------------------- -SvStream& SvxDoubleItem::Store(SvStream& rOut, USHORT /*nItemVersion*/) const +SvStream& SvxDoubleItem::Store(SvStream& rOut, sal_uInt16 /*nItemVersion*/) const { rOut << fVal; return rOut; @@ -394,14 +360,14 @@ SfxFieldUnit SvxDoubleItem::GetUnit() const // ----------------------------------------------------------------------- -bool SvxDoubleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SvxDoubleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= fVal; return true; } // ----------------------------------------------------------------------- -bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SvxDoubleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { return rVal >>= fVal; } @@ -415,14 +381,14 @@ bool SvxDoubleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) *************************************************************************/ SvxChartKindErrorItem::SvxChartKindErrorItem(SvxChartKindError eOrient, - USHORT nId) : - SfxEnumItem(nId, (USHORT)eOrient) + sal_uInt16 nId) : + SfxEnumItem(nId, (sal_uInt16)eOrient) { } // ----------------------------------------------------------------------- -SvxChartKindErrorItem::SvxChartKindErrorItem(SvStream& rIn, USHORT nId) : +SvxChartKindErrorItem::SvxChartKindErrorItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } @@ -436,14 +402,14 @@ SfxPoolItem* SvxChartKindErrorItem::Clone(SfxItemPool* /*pPool*/) const // ----------------------------------------------------------------------- -SfxPoolItem* SvxChartKindErrorItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SvxChartKindErrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartKindErrorItem(rIn, Which()); } // ----------------------------------------------------------------------- -USHORT SvxChartKindErrorItem::GetVersion (USHORT nFileFormatVersion) const +sal_uInt16 SvxChartKindErrorItem::GetVersion (sal_uInt16 nFileFormatVersion) const { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) ? USHRT_MAX @@ -457,14 +423,14 @@ USHORT SvxChartKindErrorItem::GetVersion (USHORT nFileFormatVersion) const *************************************************************************/ SvxChartIndicateItem::SvxChartIndicateItem(SvxChartIndicate eOrient, - USHORT nId) : - SfxEnumItem(nId, (USHORT)eOrient) + sal_uInt16 nId) : + SfxEnumItem(nId, (sal_uInt16)eOrient) { } // ----------------------------------------------------------------------- -SvxChartIndicateItem::SvxChartIndicateItem(SvStream& rIn, USHORT nId) : +SvxChartIndicateItem::SvxChartIndicateItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } @@ -478,14 +444,14 @@ SfxPoolItem* SvxChartIndicateItem::Clone(SfxItemPool* /*pPool*/) const // ----------------------------------------------------------------------- -SfxPoolItem* SvxChartIndicateItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SvxChartIndicateItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartIndicateItem(rIn, Which()); } // ----------------------------------------------------------------------- -USHORT SvxChartIndicateItem::GetVersion (USHORT nFileFormatVersion) const +sal_uInt16 SvxChartIndicateItem::GetVersion (sal_uInt16 nFileFormatVersion) const { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) ? USHRT_MAX @@ -499,14 +465,14 @@ USHORT SvxChartIndicateItem::GetVersion (USHORT nFileFormatVersion) const *************************************************************************/ SvxChartRegressItem::SvxChartRegressItem(SvxChartRegress eOrient, - USHORT nId) : - SfxEnumItem(nId, (USHORT)eOrient) + sal_uInt16 nId) : + SfxEnumItem(nId, (sal_uInt16)eOrient) { } // ----------------------------------------------------------------------- -SvxChartRegressItem::SvxChartRegressItem(SvStream& rIn, USHORT nId) : +SvxChartRegressItem::SvxChartRegressItem(SvStream& rIn, sal_uInt16 nId) : SfxEnumItem(nId, rIn) { } @@ -520,14 +486,14 @@ SfxPoolItem* SvxChartRegressItem::Clone(SfxItemPool* /*pPool*/) const // ----------------------------------------------------------------------- -SfxPoolItem* SvxChartRegressItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SvxChartRegressItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SvxChartRegressItem(rIn, Which()); } // ----------------------------------------------------------------------- -USHORT SvxChartRegressItem::GetVersion (USHORT nFileFormatVersion) const +sal_uInt16 SvxChartRegressItem::GetVersion (sal_uInt16 nFileFormatVersion) const { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) ? USHRT_MAX diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index 0868a34f35..e52e3e3523 100644..100755 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -33,7 +33,7 @@ #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> -#include <clipfmtitem.hxx> +#include <svx/clipfmtitem.hxx> #include <com/sun/star/frame/status/ClipboardFormats.hpp> struct SvxClipboardFmtItem_Impl @@ -54,7 +54,7 @@ SvxClipboardFmtItem_Impl::SvxClipboardFmtItem_Impl( const SvxClipboardFmtItem_Impl& rCpy ) { aFmtIds.Insert( &rCpy.aFmtIds, 0 ); - for( USHORT n = 0, nEnd = rCpy.aFmtNms.Count(); n < nEnd; ++n ) + for( sal_uInt16 n = 0, nEnd = rCpy.aFmtNms.Count(); n < nEnd; ++n ) { String* pStr = rCpy.aFmtNms[ n ]; if( pStr ) @@ -63,7 +63,7 @@ SvxClipboardFmtItem_Impl::SvxClipboardFmtItem_Impl( } } -SvxClipboardFmtItem::SvxClipboardFmtItem( USHORT nId ) +SvxClipboardFmtItem::SvxClipboardFmtItem( sal_uInt16 nId ) : SfxPoolItem( nId ), pImpl( new SvxClipboardFmtItem_Impl ) { } @@ -79,15 +79,15 @@ SvxClipboardFmtItem::~SvxClipboardFmtItem() delete pImpl; } -bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { - USHORT nCount = Count(); + sal_uInt16 nCount = Count(); ::com::sun::star::frame::status::ClipboardFormats aClipFormats; aClipFormats.Identifiers.realloc( nCount ); aClipFormats.Names.realloc( nCount ); - for ( USHORT n=0; n < nCount; n++ ) + for ( sal_uInt16 n=0; n < nCount; n++ ) { aClipFormats.Identifiers[n] = (sal_Int64)GetClipbrdFormatId( n ); aClipFormats.Names[n] = GetClipbrdFormatName( n ); @@ -97,17 +97,17 @@ bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMe return true; } -bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { ::com::sun::star::frame::status::ClipboardFormats aClipFormats; if ( rVal >>= aClipFormats ) { - USHORT nCount = USHORT( aClipFormats.Identifiers.getLength() ); + sal_uInt16 nCount = sal_uInt16( aClipFormats.Identifiers.getLength() ); pImpl->aFmtIds.Remove( 0, pImpl->aFmtIds.Count() ); pImpl->aFmtNms.Remove( 0, pImpl->aFmtNms.Count() ); - for ( USHORT n=0; n < nCount; n++ ) - AddClipbrdFormat( ULONG( aClipFormats.Identifiers[n] ), aClipFormats.Names[n], n ); + for ( sal_uInt16 n=0; n < nCount; n++ ) + AddClipbrdFormat( sal_uIntPtr( aClipFormats.Identifiers[n] ), aClipFormats.Names[n], n ); return true; } @@ -123,7 +123,7 @@ int SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const { nRet = 1; const String* pStr1, *pStr2; - for( USHORT n = 0, nEnd = rCmp.pImpl->aFmtNms.Count(); n < nEnd; ++n ) + for( sal_uInt16 n = 0, nEnd = rCmp.pImpl->aFmtNms.Count(); n < nEnd; ++n ) { if( pImpl->aFmtIds[ n ] != rCmp.pImpl->aFmtIds[ n ] || ( (0 == ( pStr1 = pImpl->aFmtNms[ n ] )) ^ @@ -143,7 +143,7 @@ SfxPoolItem* SvxClipboardFmtItem::Clone( SfxItemPool * /*pPool*/ ) const return new SvxClipboardFmtItem( *this ); } -void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, USHORT nPos ) +void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, sal_uInt16 nPos ) { if( nPos > pImpl->aFmtNms.Count() ) nPos = pImpl->aFmtNms.Count(); @@ -152,8 +152,8 @@ void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, USHORT nPos ) pImpl->aFmtIds.Insert( nId, nPos ); } -void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, const String& rName, - USHORT nPos ) +void SvxClipboardFmtItem::AddClipbrdFormat( sal_uIntPtr nId, const String& rName, + sal_uInt16 nPos ) { if( nPos > pImpl->aFmtNms.Count() ) nPos = pImpl->aFmtNms.Count(); @@ -162,17 +162,17 @@ void SvxClipboardFmtItem::AddClipbrdFormat( ULONG nId, const String& rName, pImpl->aFmtIds.Insert( nId, nPos ); } -USHORT SvxClipboardFmtItem::Count() const +sal_uInt16 SvxClipboardFmtItem::Count() const { return pImpl->aFmtIds.Count(); } -ULONG SvxClipboardFmtItem::GetClipbrdFormatId( USHORT nPos ) const +sal_uIntPtr SvxClipboardFmtItem::GetClipbrdFormatId( sal_uInt16 nPos ) const { return pImpl->aFmtIds[ nPos ]; } -const String& SvxClipboardFmtItem::GetClipbrdFormatName( USHORT nPos ) const +const String& SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const { const String* pS = pImpl->aFmtNms[ nPos ]; return pS ? *pS : SvxClipboardFmtItem_Impl::sEmptyStr; diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx index 277de0f666..c3b45ce301 100644..100755 --- a/svx/source/items/customshapeitem.cxx +++ b/svx/source/items/customshapeitem.cxx @@ -61,7 +61,7 @@ size_t SdrCustomShapeGeometryItem::PropertyPairHash::operator()( const SdrCustom return (size_t)r1.first.hashCode() + r1.second.hashCode(); }; -TYPEINIT1_FACTORY( SdrCustomShapeGeometryItem, SfxPoolItem , new SdrCustomShapeGeometryItem(0)); +TYPEINIT1_FACTORY( SdrCustomShapeGeometryItem, SfxPoolItem , new SdrCustomShapeGeometryItem); SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem() : SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) {} @@ -335,12 +335,12 @@ sal_uInt16 SdrCustomShapeGeometryItem::GetVersion( sal_uInt16 /*nFileFormatVersi { return 1; } -bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SdrCustomShapeGeometryItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { rVal <<= aPropSeq; return true; } -bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SdrCustomShapeGeometryItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { if ( ! ( rVal >>= aPropSeq ) ) return false; diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 05269deeea..045facf489 100644..100755 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -34,7 +34,7 @@ #include <svx/svxids.hrc> -#include "drawitem.hxx" +#include "svx/drawitem.hxx" #include <svx/xtable.hxx> using namespace ::com::sun::star; @@ -105,19 +105,19 @@ SfxPoolItem* SvxColorTableItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- -bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SvxColorTableItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. // Please ask CD if you want to change this. - sal_Int64 aValue = sal_Int64( (ULONG)pColorTable ); + sal_Int64 aValue = sal_Int64( (sal_uLong)pColorTable ); rVal = uno::makeAny( aValue ); return true; } // ----------------------------------------------------------------------- -bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. @@ -125,7 +125,7 @@ bool SvxColorTableItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*n sal_Int64 aValue = 0; if ( rVal >>= aValue ) { - pColorTable = (XColorTable *)(ULONG)aValue; + pColorTable = (XColorTable *)(sal_uLong)aValue; return true; } @@ -189,19 +189,19 @@ SfxPoolItem* SvxGradientListItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- -bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SvxGradientListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. // Please ask CD if you want to change this. - sal_Int64 aValue = sal_Int64( (ULONG)pGradientList ); + sal_Int64 aValue = sal_Int64( (sal_uLong)pGradientList ); rVal = uno::makeAny( aValue ); return true; } // ----------------------------------------------------------------------- -bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. @@ -209,7 +209,7 @@ bool SvxGradientListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE / sal_Int64 aValue = 0; if ( rVal >>= aValue ) { - pGradientList = (XGradientList *)(ULONG)aValue; + pGradientList = (XGradientList *)(sal_uLong)aValue; return true; } @@ -273,19 +273,19 @@ SfxPoolItem* SvxHatchListItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- -bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SvxHatchListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. // Please ask CD if you want to change this. - sal_Int64 aValue = sal_Int64( (ULONG)pHatchList ); + sal_Int64 aValue = sal_Int64( (sal_uLong)pHatchList ); rVal = uno::makeAny( aValue ); return true; } // ----------------------------------------------------------------------- -bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. @@ -293,7 +293,7 @@ bool SvxHatchListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nM sal_Int64 aValue = 0; if ( rVal >>= aValue ) { - pHatchList = (XHatchList *)(ULONG)aValue; + pHatchList = (XHatchList *)(sal_uLong)aValue; return true; } @@ -357,19 +357,19 @@ SfxPoolItem* SvxBitmapListItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- -bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SvxBitmapListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. // Please ask CD if you want to change this. - sal_Int64 aValue = sal_Int64( (ULONG)pBitmapList ); + sal_Int64 aValue = sal_Int64( (sal_uLong)pBitmapList ); rVal = uno::makeAny( aValue ); return true; } // ----------------------------------------------------------------------- -bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. @@ -377,7 +377,7 @@ bool SvxBitmapListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*n sal_Int64 aValue = 0; if ( rVal >>= aValue ) { - pBitmapList = (XBitmapList *)(ULONG)aValue; + pBitmapList = (XBitmapList *)(sal_uLong)aValue; return true; } @@ -443,25 +443,25 @@ SfxPoolItem* SvxDashListItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- -bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SvxDashListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. - sal_Int64 aValue = sal_Int64( (ULONG)pDashList ); + sal_Int64 aValue = sal_Int64( (sal_uLong)pDashList ); rVal = uno::makeAny( aValue ); return true; } // ----------------------------------------------------------------------- -bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SvxDashListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. sal_Int64 aValue = 0; if ( rVal >>= aValue ) { - pDashList = (XDashList *)(ULONG)aValue; + pDashList = (XDashList *)(sal_uLong)aValue; return true; } @@ -532,25 +532,25 @@ SfxPoolItem* SvxLineEndListItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- -bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SvxLineEndListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. - sal_Int64 aValue = sal_Int64( (ULONG)pLineEndList ); + sal_Int64 aValue = sal_Int64( (sal_uLong)pLineEndList ); rVal = uno::makeAny( aValue ); return true; } // ----------------------------------------------------------------------- -bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SvxLineEndListItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { // This is only a quick helper to have UI support for these list items. Don't use // this method to query for a valid UNO representation. sal_Int64 aValue = 0; if ( rVal >>= aValue ) { - pLineEndList = (XLineEndList *)(ULONG)aValue; + pLineEndList = (XLineEndList *)(sal_uLong)aValue; return true; } diff --git a/svx/source/items/e3ditem.cxx b/svx/source/items/e3ditem.cxx index 64b6219402..80acfbec84 100644..100755 --- a/svx/source/items/e3ditem.cxx +++ b/svx/source/items/e3ditem.cxx @@ -59,7 +59,7 @@ SvxB3DVectorItem::~SvxB3DVectorItem() // ----------------------------------------------------------------------- -SvxB3DVectorItem::SvxB3DVectorItem( USHORT _nWhich, const basegfx::B3DVector& rVal ) : +SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, const basegfx::B3DVector& rVal ) : SfxPoolItem( _nWhich ), aVal( rVal ) { @@ -68,7 +68,7 @@ SvxB3DVectorItem::SvxB3DVectorItem( USHORT _nWhich, const basegfx::B3DVector& rV // ----------------------------------------------------------------------- -SvxB3DVectorItem::SvxB3DVectorItem( USHORT _nWhich, SvStream& rStream ) : +SvxB3DVectorItem::SvxB3DVectorItem( sal_uInt16 _nWhich, SvStream& rStream ) : SfxPoolItem( _nWhich ) { DBG_CTOR(SvxB3DVectorItem, 0); @@ -106,7 +106,7 @@ SfxPoolItem* SvxB3DVectorItem::Clone( SfxItemPool* /*pPool*/ ) const // ----------------------------------------------------------------------- -SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, USHORT /*nVersion*/) const +SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, sal_uInt16 /*nVersion*/) const { DBG_CHKTHIS(SvxB3DVectorItem, 0); basegfx::B3DVector aStr; @@ -119,7 +119,7 @@ SfxPoolItem* SvxB3DVectorItem::Create(SvStream &rStream, USHORT /*nVersion*/) co // ----------------------------------------------------------------------- -SvStream& SvxB3DVectorItem::Store(SvStream &rStream, USHORT /*nItemVersion*/) const +SvStream& SvxB3DVectorItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/) const { DBG_CHKTHIS(SvxB3DVectorItem, 0); @@ -134,7 +134,7 @@ SvStream& SvxB3DVectorItem::Store(SvStream &rStream, USHORT /*nItemVersion*/) co // ----------------------------------------------------------------------- -bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { drawing::Direction3D aDirection; @@ -149,7 +149,7 @@ bool SvxB3DVectorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const // ----------------------------------------------------------------------- -bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { drawing::Direction3D aDirection; if(!(rVal >>= aDirection)) @@ -163,7 +163,7 @@ bool SvxB3DVectorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) // ----------------------------------------------------------------------- -USHORT SvxB3DVectorItem::GetVersion (USHORT nFileFormatVersion) const +sal_uInt16 SvxB3DVectorItem::GetVersion (sal_uInt16 nFileFormatVersion) const { return (nFileFormatVersion == SOFFICE_FILEFORMAT_31) ? USHRT_MAX : 0; } diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx index 3ac7188349..312953bbaa 100644..100755 --- a/svx/source/items/grfitem.cxx +++ b/svx/source/items/grfitem.cxx @@ -45,13 +45,13 @@ using namespace ::com::sun::star; * Implementierung class SwCropGrf ******************************************************************************/ -SvxGrfCrop::SvxGrfCrop( USHORT nItemId ) +SvxGrfCrop::SvxGrfCrop( sal_uInt16 nItemId ) : SfxPoolItem( nItemId ), nLeft( 0 ), nRight( 0 ), nTop( 0 ), nBottom( 0 ) {} SvxGrfCrop::SvxGrfCrop( sal_Int32 nL, sal_Int32 nR, - sal_Int32 nT, sal_Int32 nB, USHORT nItemId ) + sal_Int32 nT, sal_Int32 nB, sal_uInt16 nItemId ) : SfxPoolItem( nItemId ), nLeft( nL ), nRight( nR ), nTop( nT ), nBottom( nB ) {} @@ -77,7 +77,7 @@ SfxPoolItem* SvxGrfCrop::Clone( SfxItemPool* ) const */ /* -USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const +sal_uInt16 SvxGrfCrop::GetVersion( sal_uInt16 nFFVer ) const { DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer || SOFFICE_FILEFORMAT_40==nFFVer || @@ -87,9 +87,9 @@ USHORT SvxGrfCrop::GetVersion( USHORT nFFVer ) const } */ -SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, USHORT nVersion ) const +SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, sal_uInt16 nVersion ) const { - INT32 top, left, right, bottom; + sal_Int32 top, left, right, bottom; rStrm >> top >> left >> right >> bottom; if( GRFCROP_VERSION_SWDEFAULT == nVersion ) @@ -104,9 +104,9 @@ SfxPoolItem* SvxGrfCrop::Create( SvStream& rStrm, USHORT nVersion ) const } -SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const +SvStream& SvxGrfCrop::Store( SvStream& rStrm, sal_uInt16 nVersion ) const { - INT32 left = GetLeft(), right = GetRight(), + sal_Int32 left = GetLeft(), right = GetRight(), top = GetTop(), bottom = GetBottom(); if( GRFCROP_VERSION_SWDEFAULT == nVersion ) top = -top, bottom = -bottom, left = -left, right = -right; @@ -118,7 +118,7 @@ SvStream& SvxGrfCrop::Store( SvStream& rStrm, USHORT nVersion ) const -bool SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SvxGrfCrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -141,7 +141,7 @@ bool SvxGrfCrop::QueryValue( uno::Any& rVal, BYTE nMemberId ) const return true; } -bool SvxGrfCrop::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SvxGrfCrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index 414c0fd7ba..73a0421e8f 100644..100755 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -37,7 +37,7 @@ #include <svl/memberid.hrc> #include <basic/sbxvar.hxx> -#include "hlnkitem.hxx" +#include "svx/hlnkitem.hxx" // ----------------------------------------------------------------------- @@ -320,7 +320,7 @@ void SvxHyperlinkItem::SetMacroTable( const SvxMacroTableDtor& rTbl ) pMacroTable = new SvxMacroTableDtor ( rTbl ); } -bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -348,7 +348,7 @@ bool SvxHyperlinkItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberI return true; } -bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxHyperlinkItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk index b2f2033719..b2f2033719 100644..100755 --- a/svx/source/items/makefile.mk +++ b/svx/source/items/makefile.mk diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx index 3d84f3b02c..837fdea456 100644..100755 --- a/svx/source/items/numfmtsh.cxx +++ b/svx/source/items/numfmtsh.cxx @@ -456,7 +456,7 @@ void SvxNumberFormatShell::MakePreviewString( const String& rFormatStr, { rpFontColor = NULL; - ULONG nExistingFormat = pFormatter->GetEntryKey( rFormatStr, eCurLanguage ); + sal_uIntPtr nExistingFormat = pFormatter->GetEntryKey( rFormatStr, eCurLanguage ); if ( nExistingFormat == NUMBERFORMAT_ENTRY_NOT_FOUND ) { // real preview - not implemented in NumberFormatter for text formats @@ -469,7 +469,7 @@ void SvxNumberFormatShell::MakePreviewString( const String& rFormatStr, // format exists // #50441# if a string was set in addition to the value, use it for text formats - BOOL bUseText = ( eValType == SVX_VALUE_TYPE_STRING || + sal_Bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING || ( aValStr.Len() && ( pFormatter->GetType(nExistingFormat) & NUMBERFORMAT_TEXT ) ) ); if ( bUseText ) pFormatter->GetOutputString( aValStr, nExistingFormat, @@ -1031,7 +1031,7 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n aWSStringsDtor, *pTmpCurrencyEntry, bTmpBanking ); if ( !bTmpBanking ) pFormatter->GetCurrencyFormatStrings( - aWSStringsDtor, *pTmpCurrencyEntry, TRUE ); + aWSStringsDtor, *pTmpCurrencyEntry, sal_True ); } else nDefault = 0; @@ -1045,8 +1045,8 @@ short SvxNumberFormatShell::FillEListWithUserCurrencys( SvStrings& rList,short n const NfCurrencyEntry* pCurr = rCurrencyTable[i]; if ( pCurr->GetLanguage() == eLang && pTmpCurrencyEntry != pCurr ) { - pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, FALSE ); - pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, TRUE ); + pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, sal_False ); + pFormatter->GetCurrencyFormatStrings( aWSStringsDtor, *pCurr, sal_True ); } } } @@ -1175,7 +1175,7 @@ void SvxNumberFormatShell::GetPreviewString_Impl( String& rString, Color*& rpCol rpColor = NULL; // #50441# if a string was set in addition to the value, use it for text formats - BOOL bUseText = ( eValType == SVX_VALUE_TYPE_STRING || + sal_Bool bUseText = ( eValType == SVX_VALUE_TYPE_STRING || ( aValStr.Len() && ( pFormatter->GetType(nCurFormatKey) & NUMBERFORMAT_TEXT ) ) ); if ( bUseText ) diff --git a/svx/source/items/numinf.cxx b/svx/source/items/numinf.cxx index ca769b2802..ca769b2802 100644..100755 --- a/svx/source/items/numinf.cxx +++ b/svx/source/items/numinf.cxx diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx index 1c021c0b8b..f3f7e505f9 100644..100755 --- a/svx/source/items/ofaitem.cxx +++ b/svx/source/items/ofaitem.cxx @@ -29,9 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "ofaitem.hxx" +#include "svx/ofaitem.hxx" -OfaPtrItem::OfaPtrItem( USHORT _nWhich, void *_pPtr ) +OfaPtrItem::OfaPtrItem( sal_uInt16 _nWhich, void *_pPtr ) : SfxPoolItem( _nWhich ), pPtr( _pPtr ) { @@ -55,7 +55,7 @@ SfxPoolItem* OfaPtrItem::Clone( SfxItemPool * ) const /* TYPEINIT1_FACTORY(DashListPtrItem, SvxDashListPtrItem, new DashListPtrItem(0)); -DashListPtrItem::DashListPtrItem( USHORT nWhich, SvxDashListItem* pPtr ) +DashListPtrItem::DashListPtrItem( sal_uInt16 nWhich, SvxDashListItem* pPtr ) : OfaPtrItem( nWhich ), pPtr( pPtr ) { } @@ -75,11 +75,11 @@ SfxPoolItem* DashListPtrItem::Clone( SfxItemPool *pPool ) const return new DashListPtrItem( *this ); } -sal_Bool DashListPtrItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const +sal_Bool DashListPtrItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const { } -sal_Bool DashListPtrItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) +sal_Bool DashListPtrItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) { sal_Int64 nHyper; if ( rVal >>= nHyper ) diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx index a98d32c4fd..8d1b135388 100644..100755 --- a/svx/source/items/pageitem.cxx +++ b/svx/source/items/pageitem.cxx @@ -53,7 +53,7 @@ TYPEINIT1_FACTORY( SvxPageItem, SfxPoolItem , new SvxPageItem(0)); Beschreibung: Konstruktor --------------------------------------------------------------------*/ -SvxPageItem::SvxPageItem( const USHORT nId ) : SfxPoolItem( nId ), +SvxPageItem::SvxPageItem( const sal_uInt16 nId ) : SfxPoolItem( nId ), eNumType ( SVX_ARABIC ), bLandscape ( sal_False ), @@ -95,7 +95,7 @@ int SvxPageItem::operator==( const SfxPoolItem& rAttr ) const eUse == rItem.eUse ); } -inline XubString GetUsageText( const USHORT eU ) +inline XubString GetUsageText( const sal_uInt16 eU ) { if ( eU & SVX_PAGE_LEFT ) return SVX_RESSTR(RID_SVXITEMS_PAGE_USAGE_LEFT); @@ -165,7 +165,7 @@ SfxItemPresentation SvxPageItem::GetPresentation } //------------------------------------------------------------------------ -bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const +bool SvxPageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -202,7 +202,7 @@ bool SvxPageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const return true; } //------------------------------------------------------------------------ -bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) +bool SvxPageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) { switch( nMemberId ) { @@ -245,12 +245,12 @@ bool SvxPageItem::PutValue( const uno::Any& rVal, BYTE nMemberId ) //------------------------------------------------------------------------ -SfxPoolItem* SvxPageItem::Create( SvStream& rStream, USHORT ) const +SfxPoolItem* SvxPageItem::Create( SvStream& rStream, sal_uInt16 ) const { XubString sStr; - BYTE eType; + sal_uInt8 eType; sal_Bool bLand; - USHORT nUse; + sal_uInt16 nUse; // UNICODE: rStream >> sStr; rStream.ReadByteString( sStr ); @@ -269,12 +269,12 @@ SfxPoolItem* SvxPageItem::Create( SvStream& rStream, USHORT ) const //------------------------------------------------------------------------ -SvStream& SvxPageItem::Store( SvStream &rStrm, USHORT /*nItemVersion*/ ) const +SvStream& SvxPageItem::Store( SvStream &rStrm, sal_uInt16 /*nItemVersion*/ ) const { // UNICODE: rStrm << aDescName; rStrm.WriteByteString(aDescName); - rStrm << (BYTE)eNumType << bLandscape << eUse; + rStrm << (sal_uInt8)eNumType << bLandscape << eUse; return rStrm; } @@ -282,7 +282,7 @@ SvStream& SvxPageItem::Store( SvStream &rStrm, USHORT /*nItemVersion*/ ) const Beschreibung: HeaderFooterSet --------------------------------------------------------------------*/ -SvxSetItem::SvxSetItem( const USHORT nId, const SfxItemSet& rSet ) : +SvxSetItem::SvxSetItem( const sal_uInt16 nId, const SfxItemSet& rSet ) : SfxSetItem( nId, rSet ) { @@ -294,7 +294,7 @@ SvxSetItem::SvxSetItem( const SvxSetItem& rItem ) : { } -SvxSetItem::SvxSetItem( const USHORT nId, SfxItemSet* _pSet ) : +SvxSetItem::SvxSetItem( const sal_uInt16 nId, SfxItemSet* _pSet ) : SfxSetItem( nId, _pSet ) { @@ -319,7 +319,7 @@ SfxItemPresentation SvxSetItem::GetPresentation return SFX_ITEM_PRESENTATION_NONE; } -SfxPoolItem* SvxSetItem::Create(SvStream &rStrm, USHORT /*nVersion*/) const +SfxPoolItem* SvxSetItem::Create(SvStream &rStrm, sal_uInt16 /*nVersion*/) const { SfxItemSet* _pSet = new SfxItemSet( *GetItemSet().GetPool(), GetItemSet().GetRanges() ); @@ -329,7 +329,7 @@ SfxPoolItem* SvxSetItem::Create(SvStream &rStrm, USHORT /*nVersion*/) const return new SvxSetItem( Which(), *_pSet ); } -SvStream& SvxSetItem::Store(SvStream &rStrm, USHORT nItemVersion) const +SvStream& SvxSetItem::Store(SvStream &rStrm, sal_uInt16 nItemVersion) const { GetItemSet().Store( rStrm, nItemVersion ); diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 8f8516204a..21b27d7fb3 100644..100755 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- #define _SVX_POSTATTR_CXX -#include "postattr.hxx" +#include "svx/postattr.hxx" #include <editeng/itemtype.hxx> #include <svx/svxitems.hrc> #include <svx/dialmgr.hxx> diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index d8ed34e6cf..6b132a1000 100644..100755 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/table/CellOrientation.hpp> #include <com/sun/star/table/CellAddress.hpp> -#include "rotmodit.hxx" +#include "svx/rotmodit.hxx" using namespace ::rtl; using namespace ::com::sun::star; @@ -56,8 +56,8 @@ TYPEINIT1_FACTORY(SvxRotateModeItem, SfxEnumItem, new SvxRotateModeItem(SVX_ROTA // SvxRotateModeItem - Ausrichtung bei gedrehtem Text //----------------------------------------------------------------------- -SvxRotateModeItem::SvxRotateModeItem( SvxRotateMode eMode, USHORT _nWhich ) - : SfxEnumItem( _nWhich, (USHORT)eMode ) +SvxRotateModeItem::SvxRotateModeItem( SvxRotateMode eMode, sal_uInt16 _nWhich ) + : SfxEnumItem( _nWhich, (sal_uInt16)eMode ) { } @@ -70,9 +70,9 @@ SvxRotateModeItem::~SvxRotateModeItem() { } -SfxPoolItem* SvxRotateModeItem::Create( SvStream& rStream, USHORT ) const +SfxPoolItem* SvxRotateModeItem::Create( SvStream& rStream, sal_uInt16 ) const { - USHORT nVal; + sal_uInt16 nVal; rStream >> nVal; return new SvxRotateModeItem( (SvxRotateMode) nVal,Which() ); } @@ -100,7 +100,7 @@ SfxItemPresentation SvxRotateModeItem::GetPresentation( return ePres; } -String SvxRotateModeItem::GetValueText( USHORT nVal ) const +String SvxRotateModeItem::GetValueText( sal_uInt16 nVal ) const { String aText; @@ -119,7 +119,7 @@ String SvxRotateModeItem::GetValueText( USHORT nVal ) const return aText; } -USHORT SvxRotateModeItem::GetValueCount() const +sal_uInt16 SvxRotateModeItem::GetValueCount() const { return 4; // STANDARD, TOP, CENTER, BOTTOM } @@ -129,12 +129,12 @@ SfxPoolItem* SvxRotateModeItem::Clone( SfxItemPool* ) const return new SvxRotateModeItem( *this ); } -USHORT SvxRotateModeItem::GetVersion( USHORT /*nFileVersion*/ ) const +sal_uInt16 SvxRotateModeItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const { return 0; } -bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const +bool SvxRotateModeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const { sal_Int32 nUno = table::CellVertJustify2::STANDARD; switch ( (SvxRotateMode)GetValue() ) @@ -148,7 +148,7 @@ bool SvxRotateModeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const return true; } -bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) +bool SvxRotateModeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) { sal_Int32 nUno(0); if(!(rVal >>= nUno)) @@ -165,7 +165,7 @@ bool SvxRotateModeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ ) case table::CellVertJustify2::BOTTOM: eSvx = SVX_ROTATE_MODE_BOTTOM; break; default: ;//prevent warning } - SetValue( (USHORT)eSvx ); + SetValue( (sal_uInt16)eSvx ); return true; } diff --git a/svx/source/items/svxempty.cxx b/svx/source/items/svxempty.cxx index 8a574d2e8e..8a574d2e8e 100644..100755 --- a/svx/source/items/svxempty.cxx +++ b/svx/source/items/svxempty.cxx diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx index e02c30a767..37b02b906d 100644..100755 --- a/svx/source/items/svxerr.cxx +++ b/svx/source/items/svxerr.cxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#include "svxerr.hxx" +#include "svx/svxerr.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src index 8d27e3fc3e..3bf3294346 100644..100755 --- a/svx/source/items/svxerr.src +++ b/svx/source/items/svxerr.src @@ -26,7 +26,7 @@ ************************************************************************/ // include --------------------------------------------------------------- #define __RSC -#include "svxerr.hxx" +#include "svx/svxerr.hxx" #include <svx/dialogs.hrc> #include <editeng/editerr.hxx> diff --git a/svx/source/items/svxitems.src b/svx/source/items/svxitems.src index 9b15b00bf5..9b15b00bf5 100644..100755 --- a/svx/source/items/svxitems.src +++ b/svx/source/items/svxitems.src diff --git a/svx/source/items/viewlayoutitem.cxx b/svx/source/items/viewlayoutitem.cxx index dd879efa33..5ec42b2bd4 100644..100755 --- a/svx/source/items/viewlayoutitem.cxx +++ b/svx/source/items/viewlayoutitem.cxx @@ -46,7 +46,7 @@ TYPEINIT1_FACTORY(SvxViewLayoutItem,SfxUInt16Item, new SvxViewLayoutItem); SvxViewLayoutItem::SvxViewLayoutItem ( - USHORT nColumns, + sal_uInt16 nColumns, bool bBookMode, sal_uInt16 _nWhich ) @@ -112,7 +112,7 @@ int SvxViewLayoutItem::operator==( const SfxPoolItem& rAttr ) const mbBookMode == rItem.IsBookMode() ); } -bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -138,7 +138,7 @@ bool SvxViewLayoutItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember return true; } -bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -169,7 +169,7 @@ bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe if ( bAllConverted && nConvertedCount == VIEWLAYOUT_PARAMS ) { - SetValue( (UINT16)nColumns ); + SetValue( (sal_uInt16)nColumns ); mbBookMode = bBookMode; return true; } @@ -183,7 +183,7 @@ bool SvxViewLayoutItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe sal_Int32 nVal = 0; if ( rVal >>= nVal ) { - SetValue( (UINT16)nVal ); + SetValue( (sal_uInt16)nVal ); return true; } else diff --git a/svx/source/items/zoomitem.cxx b/svx/source/items/zoomitem.cxx index f914ae9b1c..61a947f382 100644..100755 --- a/svx/source/items/zoomitem.cxx +++ b/svx/source/items/zoomitem.cxx @@ -116,7 +116,7 @@ int SvxZoomItem::operator==( const SfxPoolItem& rAttr ) const eType == rItem.GetType() ); } -bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -146,7 +146,7 @@ bool SvxZoomItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) c return true; } -bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -183,7 +183,7 @@ bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId if ( bAllConverted && nConvertedCount == ZOOM_PARAMS ) { - SetValue( (UINT16)nValueTmp ); + SetValue( (sal_uInt16)nValueTmp ); nValueSet = nValueSetTmp; eType = SvxZoomType( nTypeTmp ); return true; @@ -198,7 +198,7 @@ bool SvxZoomItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId sal_Int32 nVal = 0; if ( rVal >>= nVal ) { - SetValue( (UINT16)nVal ); + SetValue( (sal_uInt16)nVal ); return true; } else diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx index d7f519f775..ed706bb147 100644..100755 --- a/svx/source/items/zoomslideritem.cxx +++ b/svx/source/items/zoomslideritem.cxx @@ -45,7 +45,7 @@ TYPEINIT1_FACTORY(SvxZoomSliderItem,SfxUInt16Item, new SvxZoomSliderItem); // ----------------------------------------------------------------------- -SvxZoomSliderItem::SvxZoomSliderItem( USHORT nCurrentZoom, USHORT nMinZoom, USHORT nMaxZoom, USHORT _nWhich ) +SvxZoomSliderItem::SvxZoomSliderItem( sal_uInt16 nCurrentZoom, sal_uInt16 nMinZoom, sal_uInt16 nMaxZoom, sal_uInt16 _nWhich ) : SfxUInt16Item( _nWhich, nCurrentZoom ), mnMinZoom( nMinZoom ), mnMaxZoom( nMaxZoom ) { } @@ -109,7 +109,7 @@ int SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const mnMinZoom == rItem.mnMinZoom && mnMaxZoom == rItem.mnMaxZoom ); } -bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -157,7 +157,7 @@ bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMember return true; } -bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -198,13 +198,13 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe ++nConvertedCount; } } - + if ( bAllConverted && nConvertedCount == ZOOMSLIDER_PARAMS ) { - SetValue( (UINT16)nCurrentZoom ); + SetValue( (sal_uInt16)nCurrentZoom ); maValues = aValues; - mnMinZoom = sal::static_int_cast< USHORT >( nMinZoom ); - mnMaxZoom = sal::static_int_cast< USHORT >( nMaxZoom ); + mnMinZoom = sal::static_int_cast< sal_uInt16 >( nMinZoom ); + mnMaxZoom = sal::static_int_cast< sal_uInt16 >( nMaxZoom ); return true; } @@ -218,7 +218,7 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe sal_Int32 nVal = 0; if ( rVal >>= nVal ) { - SetValue( (UINT16)nVal ); + SetValue( (sal_uInt16)nVal ); return true; } else @@ -241,7 +241,7 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe sal_Int32 nVal = 0; if( rVal >>= nVal ) { - mnMinZoom = (UINT16)nVal; + mnMinZoom = (sal_uInt16)nVal; return true; } else @@ -252,7 +252,7 @@ bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMe sal_Int32 nVal = 0; if( rVal >>= nVal ) { - mnMaxZoom = (UINT16)nVal; + mnMaxZoom = (sal_uInt16)nVal; return true; } else diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx index f98541b98d..a3f80dd26a 100644..100755 --- a/svx/source/mnuctrls/SmartTagCtl.cxx +++ b/svx/source/mnuctrls/SmartTagCtl.cxx @@ -50,7 +50,7 @@ SFX_IMPL_MENU_CONTROL(SvxSmartTagsControl, SvxSmartTagItem); SvxSmartTagsControl::SvxSmartTagsControl ( - USHORT _nId, + sal_uInt16 _nId, Menu& rMenu, SfxBindings& /*rBindings*/ ) : @@ -63,17 +63,17 @@ SvxSmartTagsControl::SvxSmartTagsControl //-------------------------------------------------------------------- -const USHORT MN_ST_INSERT_START = 500; +const sal_uInt16 MN_ST_INSERT_START = 500; void SvxSmartTagsControl::FillMenu() { if ( !mpSmartTagItem ) return; - USHORT nMenuPos = 0; - USHORT nSubMenuPos = 0; - USHORT nMenuId = 1; - USHORT nSubMenuId = MN_ST_INSERT_START; + sal_uInt16 nMenuPos = 0; + sal_uInt16 nSubMenuPos = 0; + sal_uInt16 nMenuId = 1; + sal_uInt16 nSubMenuId = MN_ST_INSERT_START; const Sequence < Sequence< Reference< smarttags::XSmartTagAction > > >& rActionComponentsSequence = mpSmartTagItem->GetActionComponentsSequence(); const Sequence < Sequence< sal_Int32 > >& rActionIndicesSequence = mpSmartTagItem->GetActionIndicesSequence(); @@ -84,7 +84,7 @@ void SvxSmartTagsControl::FillMenu() const Reference<text::XTextRange>& xTextRange = mpSmartTagItem->GetTextRange(); const Reference<frame::XController>& xController = mpSmartTagItem->GetController(); - for ( USHORT j = 0; j < rActionComponentsSequence.getLength(); ++j ) + for ( sal_uInt16 j = 0; j < rActionComponentsSequence.getLength(); ++j ) { Reference< container::XStringKeyMap > xSmartTagProperties = rStringKeyMaps[j]; @@ -122,7 +122,7 @@ void SvxSmartTagsControl::FillMenu() pSbMenu->InsertSeparator( nSubMenuPos++ ); // Add subitem for every action reference for the current smart tag type: - for ( USHORT i = 0; i < rActionComponents.getLength(); ++i ) + for ( sal_uInt16 i = 0; i < rActionComponents.getLength(); ++i ) { xAction = rActionComponents[i]; @@ -148,7 +148,7 @@ void SvxSmartTagsControl::FillMenu() //-------------------------------------------------------------------- -void SvxSmartTagsControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState ) +void SvxSmartTagsControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { mrParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState ); @@ -195,7 +195,7 @@ IMPL_LINK_INLINE_START( SvxSmartTagsControl, MenuSelect, PopupMenu *, pMen ) // ohne dispatcher!!! // GetBindings().Execute( GetId(), SFX_CALLMODE_RECORD,meine beiden items, 0L );*/ - //SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, TRUE); + //SfxBoolItem aBool(SID_OPEN_SMARTTAGOPTIONS, sal_True); //GetBindings().GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SFX_CALLMODE_ASYNCHRON, &aBool, 0L ); return 0; diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 97ee979548..d3043e0727 100644..100755 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -37,8 +37,8 @@ #include <sot/exchange.hxx> #include <svl/eitem.hxx> #include <vcl/toolbox.hxx> -#include <clipboardctl.hxx> -#include <clipfmtitem.hxx> +#include <svx/clipboardctl.hxx> +#include <svx/clipfmtitem.hxx> #include <svtools/insdlg.hxx> #include <svx/svxids.hrc> @@ -52,13 +52,13 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxClipBoardControl, SfxVoidItem /*SfxUInt16Item*/ ); SvxClipBoardControl::SvxClipBoardControl( - USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : + sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), pClipboardFmtItem( 0 ), pPopup (0), nItemId (nId), - bDisabled( FALSE ) + bDisabled( sal_False ) { addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ClipboardFormatItems" ))); ToolBox& rBox = GetToolBox(); @@ -84,25 +84,25 @@ SfxPopupWindow* SvxClipBoardControl::CreatePopupWindow() else pPopup = new PopupMenu; - USHORT nCount = pFmtItem->Count(); - for (USHORT i = 0; i < nCount; ++i) + sal_uInt16 nCount = pFmtItem->Count(); + for (sal_uInt16 i = 0; i < nCount; ++i) { - ULONG nFmtID = pFmtItem->GetClipbrdFormatId( i ); + sal_uIntPtr nFmtID = pFmtItem->GetClipbrdFormatId( i ); String aFmtStr( pFmtItem->GetClipbrdFormatName( i ) ); if (!aFmtStr.Len()) aFmtStr = SvPasteObjectHelper::GetSotFormatUIName( nFmtID ); - pPopup->InsertItem( (USHORT)nFmtID, aFmtStr ); + pPopup->InsertItem( (sal_uInt16)nFmtID, aFmtStr ); } ToolBox& rBox = GetToolBox(); - USHORT nId = GetId(); - rBox.SetItemDown( nId, TRUE ); + sal_uInt16 nId = GetId(); + rBox.SetItemDown( nId, sal_True ); pPopup->Execute( &rBox, rBox.GetItemRect( nId ), (rBox.GetAlign() == WINDOWALIGN_TOP || rBox.GetAlign() == WINDOWALIGN_BOTTOM) ? POPUPMENU_EXECUTE_DOWN : POPUPMENU_EXECUTE_RIGHT ); - rBox.SetItemDown( nId, FALSE ); + rBox.SetItemDown( nId, sal_False ); SfxUInt32Item aItem( SID_CLIPBOARD_FORMAT_ITEMS, pPopup->GetCurItemId() ); @@ -127,7 +127,7 @@ SfxPopupWindowType SvxClipBoardControl::GetPopupWindowType() const } -void SvxClipBoardControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +void SvxClipBoardControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if ( SID_CLIPBOARD_FORMAT_ITEMS == nSID ) { diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx index cbadeaa6e1..4f00a265dd 100644..100755 --- a/svx/source/mnuctrls/fntctl.cxx +++ b/svx/source/mnuctrls/fntctl.cxx @@ -54,7 +54,7 @@ SFX_IMPL_MENU_CONTROL(SvxFontMenuControl, SvxFontItem); SvxFontMenuControl::SvxFontMenuControl ( - USHORT _nId, + sal_uInt16 _nId, Menu& rMenu, SfxBindings& rBindings ) : @@ -103,7 +103,7 @@ void SvxFontMenuControl::FillMenu() void SvxFontMenuControl::StateChanged( - USHORT, SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { rParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState ); diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index 53bebaa88d..be22e1f5ed 100644..100755 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -44,7 +44,7 @@ #include "editeng/fontitem.hxx" #include "editeng/flstitem.hxx" -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> #define LOGIC OutputDevice::LogicToLogic @@ -68,7 +68,7 @@ IMPL_LINK( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen ) return 0; const SfxItemPool& rPool = pSh->GetPool(); - USHORT nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT ); + sal_uInt16 nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT ); const SfxMapUnit eUnit = rPool.GetMetric( nWhich ); long nH = LOGIC( pMen->GetCurHeight(), MAP_POINT, (MapUnit)eUnit ) / 10; SvxFontHeightItem aItem( nH, 100, GetId() ); @@ -88,7 +88,7 @@ IMPL_LINK( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen ) void SvxFontSizeMenuControl::StateChanged( - USHORT, SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { rParent.EnableItem( GetId(), SFX_ITEM_DISABLED != eState ); @@ -111,7 +111,7 @@ void SvxFontSizeMenuControl::StateChanged( return; const SfxItemPool& rPool = pSh->GetPool(); - USHORT nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT ); + sal_uInt16 nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT ); const SfxMapUnit eUnit = rPool.GetMetric( nWhich ); long nH = pItem->GetHeight() * 10; nVal = LOGIC( nH, (MapUnit)eUnit, MAP_POINT ); @@ -170,7 +170,7 @@ void SvxFontSizeMenuControl::StateChanged( SvxFontSizeMenuControl::SvxFontSizeMenuControl ( - USHORT _nId, + sal_uInt16 _nId, Menu& rMenu, SfxBindings& rBindings ) : diff --git a/svx/source/mnuctrls/makefile.mk b/svx/source/mnuctrls/makefile.mk deleted file mode 100644 index 9c208d9a78..0000000000 --- a/svx/source/mnuctrls/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PROJECTPCH4DLL=TRUE -PROJECTPCH=svxpch -PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch - -ENABLE_EXCEPTIONS=TRUE - -PRJNAME=svx -TARGET=mnuctrls - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - mnuctrls.src - -SLOFILES= \ - $(SLO)$/clipboardctl.obj \ - $(SLO)$/fntctl.obj \ - $(SLO)$/fntszctl.obj \ - $(SLO)$/SmartTagCtl.obj - -HXX1TARGET=mnuctrls -HXX1EXT= hxx -HXX1EXCL= -E:*include* -HXX1DEPN=\ - $(INC)$/clipboardctl.hxx \ - $(INC)$/fntctl.hxx \ - $(INC)$/fntszctl.hxx \ - $(INC)$/SmartTagCtl.hxx - -EXCEPTIONSFILES= \ - $(SLO)$/SmartTagCtl.obj - - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/mnuctrls/mnuctrls.src b/svx/source/mnuctrls/mnuctrls.src index 8b27fa22f7..8b27fa22f7 100644..100755 --- a/svx/source/mnuctrls/mnuctrls.src +++ b/svx/source/mnuctrls/mnuctrls.src diff --git a/svx/source/sdr/animation/animationstate.cxx b/svx/source/sdr/animation/animationstate.cxx index 343d8d895d..343d8d895d 100644..100755 --- a/svx/source/sdr/animation/animationstate.cxx +++ b/svx/source/sdr/animation/animationstate.cxx diff --git a/svx/source/sdr/animation/objectanimator.cxx b/svx/source/sdr/animation/objectanimator.cxx index 2c66eb2a00..2c66eb2a00 100644..100755 --- a/svx/source/sdr/animation/objectanimator.cxx +++ b/svx/source/sdr/animation/objectanimator.cxx diff --git a/svx/source/sdr/animation/scheduler.cxx b/svx/source/sdr/animation/scheduler.cxx index 1b299a24be..1b299a24be 100644..100755 --- a/svx/source/sdr/animation/scheduler.cxx +++ b/svx/source/sdr/animation/scheduler.cxx diff --git a/svx/source/sdr/attribute/makefile.mk b/svx/source/sdr/attribute/makefile.mk deleted file mode 100644 index 177654ff1e..0000000000 --- a/svx/source/sdr/attribute/makefile.mk +++ /dev/null @@ -1,50 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=svx -TARGET=attribute -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/sdrfilltextattribute.obj \ - $(SLO)$/sdrlinefillshadowtextattribute.obj \ - $(SLO)$/sdrlineshadowtextattribute.obj \ - $(SLO)$/sdrshadowtextattribute.obj \ - $(SLO)$/sdrtextattribute.obj \ - $(SLO)$/sdrformtextattribute.obj \ - $(SLO)$/sdrformtextoutlineattribute.obj - -.INCLUDE : target.mk diff --git a/svx/source/sdr/attribute/sdrfilltextattribute.cxx b/svx/source/sdr/attribute/sdrfilltextattribute.cxx index 0cbcafb2ad..0cbcafb2ad 100644..100755 --- a/svx/source/sdr/attribute/sdrfilltextattribute.cxx +++ b/svx/source/sdr/attribute/sdrfilltextattribute.cxx diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx index 077455b8e8..077455b8e8 100644..100755 --- a/svx/source/sdr/attribute/sdrformtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx diff --git a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx index f0f79f28cd..f0f79f28cd 100644..100755 --- a/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx +++ b/svx/source/sdr/attribute/sdrformtextoutlineattribute.cxx diff --git a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx index d5f58123fc..d5f58123fc 100644..100755 --- a/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlinefillshadowtextattribute.cxx diff --git a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx index 76959f054c..76959f054c 100644..100755 --- a/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrlineshadowtextattribute.cxx diff --git a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx index 81a7ecb9be..81a7ecb9be 100644..100755 --- a/svx/source/sdr/attribute/sdrshadowtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrshadowtextattribute.cxx diff --git a/svx/source/sdr/attribute/sdrtextattribute.cxx b/svx/source/sdr/attribute/sdrtextattribute.cxx index e03fe04366..e03fe04366 100644..100755 --- a/svx/source/sdr/attribute/sdrtextattribute.cxx +++ b/svx/source/sdr/attribute/sdrtextattribute.cxx diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx index 7853da15d9..7853da15d9 100644..100755 --- a/svx/source/sdr/contact/displayinfo.cxx +++ b/svx/source/sdr/contact/displayinfo.cxx diff --git a/svx/source/sdr/contact/makefile.mk b/svx/source/sdr/contact/makefile.mk deleted file mode 100644 index 9e4356c4aa..0000000000 --- a/svx/source/sdr/contact/makefile.mk +++ /dev/null @@ -1,92 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source - -PRJNAME=svx -TARGET=contact -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES=\ - $(SLO)$/viewobjectcontactofunocontrol.obj - -SLOFILES=\ - $(EXCEPTIONSFILES) \ - $(SLO)$/displayinfo.obj \ - $(SLO)$/viewcontact.obj \ - $(SLO)$/viewcontactofe3d.obj \ - $(SLO)$/viewcontactofsdrobj.obj \ - $(SLO)$/viewcontactofvirtobj.obj \ - $(SLO)$/viewcontactoftextobj.obj \ - $(SLO)$/viewcontactofsdrrectobj.obj \ - $(SLO)$/viewcontactofsdrpathobj.obj \ - $(SLO)$/viewcontactofsdrole2obj.obj \ - $(SLO)$/viewcontactofsdrcircobj.obj \ - $(SLO)$/viewcontactofsdrcaptionobj.obj \ - $(SLO)$/viewcontactofsdrmeasureobj.obj \ - $(SLO)$/viewcontactofsdredgeobj.obj \ - $(SLO)$/viewcontactofsdrpage.obj \ - $(SLO)$/viewcontactofmasterpagedescriptor.obj \ - $(SLO)$/viewcontactofgroup.obj \ - $(SLO)$/viewcontactofe3dscene.obj \ - $(SLO)$/viewcontactofe3dcube.obj \ - $(SLO)$/viewcontactofe3dextrude.obj \ - $(SLO)$/viewcontactofe3dlathe.obj \ - $(SLO)$/viewcontactofe3dsphere.obj \ - $(SLO)$/viewcontactofe3dpolygon.obj \ - $(SLO)$/viewcontactofpageobj.obj \ - $(SLO)$/viewcontactofgraphic.obj \ - $(SLO)$/viewcontactofsdrobjcustomshape.obj \ - $(SLO)$/viewcontactofsdrmediaobj.obj \ - $(SLO)$/viewcontactofunocontrol.obj \ - $(SLO)$/objectcontact.obj \ - $(SLO)$/objectcontacttools.obj \ - $(SLO)$/objectcontactofobjlistpainter.obj \ - $(SLO)$/objectcontactofpageview.obj \ - $(SLO)$/viewobjectcontact.obj \ - $(SLO)$/viewobjectcontactofe3d.obj \ - $(SLO)$/viewobjectcontactredirector.obj \ - $(SLO)$/viewobjectcontactofsdrmediaobj.obj \ - $(SLO)$/viewobjectcontactofgroup.obj \ - $(SLO)$/viewobjectcontactofe3dscene.obj \ - $(SLO)$/viewobjectcontactofsdrpage.obj \ - $(SLO)$/viewobjectcontactofsdrobj.obj \ - $(SLO)$/viewobjectcontactofpageobj.obj \ - $(SLO)$/viewobjectcontactofsdrole2obj.obj \ - $(SLO)$/viewobjectcontactofgraphic.obj \ - $(SLO)$/viewobjectcontactofmasterpagedescriptor.obj \ - $(SLO)$/sdrmediawindow.obj - -.INCLUDE : target.mk diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx index 3e30021c3b..3e30021c3b 100644..100755 --- a/svx/source/sdr/contact/objectcontact.cxx +++ b/svx/source/sdr/contact/objectcontact.cxx diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index 283bbd4a10..0b331bf4ca 100644..100755 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -38,7 +38,7 @@ #include <drawinglayer/processor2d/vclprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/contact/objectcontacttools.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -122,7 +122,7 @@ namespace sdr aViewRange, GetXDrawPageForSdrPage(const_cast< SdrPage* >(mpProcessedPage)), 0.0, - 0); + com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>()); updateViewInformation2D(aNewViewInformation2D); // collect primitive data in a sequence; this will already use the updated ViewInformation2D @@ -152,6 +152,25 @@ namespace sdr } } + // VirtualDevice? + bool ObjectContactOfObjListPainter::isOutputToVirtualDevice() const + { + return (OUTDEV_VIRDEV == mrTargetOutputDevice.GetOutDevType()); + } + + // recording MetaFile? + bool ObjectContactOfObjListPainter::isOutputToRecordingMetaFile() const + { + GDIMetaFile* pMetaFile = mrTargetOutputDevice.GetConnectMetaFile(); + return (pMetaFile && pMetaFile->IsRecord() && !pMetaFile->IsPause()); + } + + // pdf export? + bool ObjectContactOfObjListPainter::isOutputToPDFFile() const + { + return (0 != mrTargetOutputDevice.GetPDFWriter()); + } + OutputDevice* ObjectContactOfObjListPainter::TryToGetOutputDevice() const { return &mrTargetOutputDevice; diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 49052fbf74..94da0ae0d1 100644..100755 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -39,13 +39,13 @@ #include <svx/sdr/animation/objectanimator.hxx> #include <svx/sdr/event/eventhandler.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <drawinglayer/processor2d/vclprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <svx/sdr/contact/objectcontacttools.hxx> #include <com/sun/star/rendering/XSpriteCanvas.hpp> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -242,7 +242,7 @@ namespace sdr aViewRange, GetXDrawPageForSdrPage(GetSdrPage()), fCurrentTime, - 0); + uno::Sequence<beans::PropertyValue>()); updateViewInformation2D(aNewViewInformation2D); // get whole Primitive2DSequence; this will already make use of updated ViewInformation2D diff --git a/svx/source/sdr/contact/objectcontacttools.cxx b/svx/source/sdr/contact/objectcontacttools.cxx index aa79df2dac..aa79df2dac 100644..100755 --- a/svx/source/sdr/contact/objectcontacttools.cxx +++ b/svx/source/sdr/contact/objectcontacttools.cxx diff --git a/svx/source/sdr/contact/sdrmediawindow.cxx b/svx/source/sdr/contact/sdrmediawindow.cxx index ff969c5110..ff969c5110 100644..100755 --- a/svx/source/sdr/contact/sdrmediawindow.cxx +++ b/svx/source/sdr/contact/sdrmediawindow.cxx diff --git a/svx/source/sdr/contact/sdrmediawindow.hxx b/svx/source/sdr/contact/sdrmediawindow.hxx index 35b12177a7..35b12177a7 100644..100755 --- a/svx/source/sdr/contact/sdrmediawindow.hxx +++ b/svx/source/sdr/contact/sdrmediawindow.hxx diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx index c96994f0c9..c96994f0c9 100644..100755 --- a/svx/source/sdr/contact/viewcontact.cxx +++ b/svx/source/sdr/contact/viewcontact.cxx diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx index 032e3cad76..032e3cad76 100644..100755 --- a/svx/source/sdr/contact/viewcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewcontactofe3d.cxx diff --git a/svx/source/sdr/contact/viewcontactofe3dcube.cxx b/svx/source/sdr/contact/viewcontactofe3dcube.cxx index 22be314198..22be314198 100644..100755 --- a/svx/source/sdr/contact/viewcontactofe3dcube.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dcube.cxx diff --git a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx index 20906efa07..20906efa07 100644..100755 --- a/svx/source/sdr/contact/viewcontactofe3dextrude.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dextrude.cxx diff --git a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx index ca97545e50..ca97545e50 100644..100755 --- a/svx/source/sdr/contact/viewcontactofe3dlathe.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dlathe.cxx diff --git a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx index 33c6711c01..33c6711c01 100644..100755 --- a/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dpolygon.cxx diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx index 777cdb2ac5..777cdb2ac5 100644..100755 --- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx diff --git a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx index f08462bcd7..f08462bcd7 100644..100755 --- a/svx/source/sdr/contact/viewcontactofe3dsphere.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dsphere.cxx diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 4397b7ec48..c6dd1d8fc7 100644..100755 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -45,8 +45,8 @@ #include <svx/sdr/event/eventhandler.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/primitive2d/sdrgrafprimitive2d.hxx> -#include "svdstr.hrc" -#include <svdglob.hxx> +#include "svx/svdstr.hrc" +#include <svx/svdglob.hxx> #include <vcl/svapp.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> @@ -297,7 +297,7 @@ namespace sdr // decompose immediately with neutral ViewInformation. This will // layout the text to more simple TextPrimitives from drawinglayer - const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0); + const drawinglayer::geometry::ViewInformation2D aViewInformation2D; drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence( xRetval, @@ -327,7 +327,7 @@ namespace sdr aLocalGrafInfo.SetChannelG(((SdrGrafGreenItem&)rItemSet.Get(SDRATTR_GRAFGREEN)).GetValue()); aLocalGrafInfo.SetChannelB(((SdrGrafBlueItem&)rItemSet.Get(SDRATTR_GRAFBLUE)).GetValue()); aLocalGrafInfo.SetGamma(((SdrGrafGamma100Item&)rItemSet.Get(SDRATTR_GRAFGAMMA)).GetValue() * 0.01); - aLocalGrafInfo.SetTransparency((BYTE)::basegfx::fround(Min(nTrans, (USHORT)100) * 2.55)); + aLocalGrafInfo.SetTransparency((sal_uInt8)::basegfx::fround(Min(nTrans, (sal_uInt16)100) * 2.55)); aLocalGrafInfo.SetInvert(((SdrGrafInvertItem&)rItemSet.Get(SDRATTR_GRAFINVERT)).GetValue()); aLocalGrafInfo.SetDrawMode(((SdrGrafModeItem&)rItemSet.Get(SDRATTR_GRAFMODE)).GetValue()); aLocalGrafInfo.SetCrop(rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom()); diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx index b6a2cb846c..b6a2cb846c 100644..100755 --- a/svx/source/sdr/contact/viewcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewcontactofgroup.cxx diff --git a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx index f26393811a..f26393811a 100644..100755 --- a/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewcontactofmasterpagedescriptor.cxx diff --git a/svx/source/sdr/contact/viewcontactofpageobj.cxx b/svx/source/sdr/contact/viewcontactofpageobj.cxx index 21d4d2a76a..21d4d2a76a 100644..100755 --- a/svx/source/sdr/contact/viewcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewcontactofpageobj.cxx diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx index fb1676c083..fb1676c083 100644..100755 --- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx diff --git a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx index 78151a98a3..78151a98a3 100644..100755 --- a/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcircobj.cxx diff --git a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx index 059a5d94ef..059a5d94ef 100644..100755 --- a/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdredgeobj.cxx diff --git a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx index 61d6f1354a..61d6f1354a 100644..100755 --- a/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmeasureobj.cxx diff --git a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx index 20f7d410d4..20f7d410d4 100644..100755 --- a/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrmediaobj.cxx diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index 05b0f1a3d8..cba1eac035 100644..100755 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -41,7 +41,7 @@ #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx> #include <svx/sdr/contact/objectcontactofpageview.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdr/primitive2d/sdrprimitivetools.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index 8d0a1d5504..d0532060d4 100644..100755 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -32,7 +32,7 @@ #include <svx/svdoashp.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx index 1ad45c22c3..1ad45c22c3 100644..100755 --- a/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrole2obj.cxx diff --git a/svx/source/sdr/contact/viewcontactofsdrpage.cxx b/svx/source/sdr/contact/viewcontactofsdrpage.cxx index 1e754d5db4..902bfe48a1 100644..100755 --- a/svx/source/sdr/contact/viewcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpage.cxx @@ -45,6 +45,10 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> #include <svx/sdr/primitive2d/sdrdecompositiontools.hxx> +#include <vcl/lazydelete.hxx> +#include <svx/svdstr.hrc> +#include <svx/svdglob.hxx> +#include <drawinglayer/primitive2d/discreteshadowprimitive2d.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -132,31 +136,54 @@ namespace sdr drawinglayer::primitive2d::Primitive2DSequence ViewContactOfPageShadow::createViewIndependentPrimitive2DSequence() const { + static bool bUseOldPageShadow(false); const SdrPage& rPage = getPage(); basegfx::B2DHomMatrix aPageMatrix; aPageMatrix.set(0, 0, (double)rPage.GetWdt()); aPageMatrix.set(1, 1, (double)rPage.GetHgt()); - // create page shadow polygon - const double fPageBorderFactor(1.0 / 256.0); - basegfx::B2DPolygon aPageShadowPolygon; - aPageShadowPolygon.append(basegfx::B2DPoint(1.0, fPageBorderFactor)); - aPageShadowPolygon.append(basegfx::B2DPoint(1.0 + fPageBorderFactor, fPageBorderFactor)); - aPageShadowPolygon.append(basegfx::B2DPoint(1.0 + fPageBorderFactor, 1.0 + fPageBorderFactor)); - aPageShadowPolygon.append(basegfx::B2DPoint(fPageBorderFactor, 1.0 + fPageBorderFactor)); - aPageShadowPolygon.append(basegfx::B2DPoint(fPageBorderFactor, 1.0)); - aPageShadowPolygon.append(basegfx::B2DPoint(1.0, 1.0)); - aPageShadowPolygon.setClosed(true); - aPageShadowPolygon.transform(aPageMatrix); - - // We have only the page information, not the view information. Use the - // svtools::FONTCOLOR color for initialisation - const svtools::ColorConfig aColorConfig; - const Color aShadowColor(aColorConfig.GetColorValue(svtools::FONTCOLOR).nColor); - const basegfx::BColor aRGBShadowColor(aShadowColor.getBColor()); - const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D(basegfx::B2DPolyPolygon(aPageShadowPolygon), aRGBShadowColor)); - - return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + if(bUseOldPageShadow) + { + // create page shadow polygon + const double fPageBorderFactor(1.0 / 256.0); + basegfx::B2DPolygon aPageShadowPolygon; + aPageShadowPolygon.append(basegfx::B2DPoint(1.0, fPageBorderFactor)); + aPageShadowPolygon.append(basegfx::B2DPoint(1.0 + fPageBorderFactor, fPageBorderFactor)); + aPageShadowPolygon.append(basegfx::B2DPoint(1.0 + fPageBorderFactor, 1.0 + fPageBorderFactor)); + aPageShadowPolygon.append(basegfx::B2DPoint(fPageBorderFactor, 1.0 + fPageBorderFactor)); + aPageShadowPolygon.append(basegfx::B2DPoint(fPageBorderFactor, 1.0)); + aPageShadowPolygon.append(basegfx::B2DPoint(1.0, 1.0)); + aPageShadowPolygon.setClosed(true); + aPageShadowPolygon.transform(aPageMatrix); + + // We have only the page information, not the view information. Use the + // svtools::FONTCOLOR color for initialisation + const svtools::ColorConfig aColorConfig; + const Color aShadowColor(aColorConfig.GetColorValue(svtools::FONTCOLOR).nColor); + const basegfx::BColor aRGBShadowColor(aShadowColor.getBColor()); + const drawinglayer::primitive2d::Primitive2DReference xReference( + new drawinglayer::primitive2d::PolyPolygonColorPrimitive2D( + basegfx::B2DPolyPolygon(aPageShadowPolygon), + aRGBShadowColor)); + + return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + } + else + { + static vcl::DeleteOnDeinit<drawinglayer::primitive2d::DiscreteShadow> + aDiscreteShadow(new drawinglayer::primitive2d::DiscreteShadow( + BitmapEx(ResId(SIP_SA_PAGESHADOW35X35, *ImpGetResMgr())))); + if (aDiscreteShadow.get() != NULL) + { + const drawinglayer::primitive2d::Primitive2DReference xReference( + new drawinglayer::primitive2d::DiscreteShadowPrimitive2D( + aPageMatrix, + *aDiscreteShadow.get())); + + return drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1); + } + return drawinglayer::primitive2d::Primitive2DSequence(); + } } ViewContactOfPageShadow::ViewContactOfPageShadow(ViewContactOfSdrPage& rParentViewContactOfSdrPage) @@ -313,12 +340,18 @@ namespace sdr drawinglayer::primitive2d::Primitive2DSequence xRetval; const SdrPage& rPage = getPage(); const basegfx::B2DRange aPageBorderRange(0.0, 0.0, (double)rPage.GetWdt(), (double)rPage.GetHgt()); + + // Changed to 0x949599 for renaissance, before svtools::FONTCOLOR was used. + // Added old case as fallback for HighContrast. + basegfx::BColor aRGBBorderColor(0x94 / (double)0xff, 0x95 / (double)0xff, 0x99 / (double)0xff); - // We have only the page information, not the view information. Use the - // svtools::FONTCOLOR color for initialisation - const svtools::ColorConfig aColorConfig; - const Color aBorderColor(aColorConfig.GetColorValue(svtools::FONTCOLOR).nColor); - const basegfx::BColor aRGBBorderColor(aBorderColor.getBColor()); + if(Application::GetSettings().GetStyleSettings().GetHighContrastMode()) + { + const svtools::ColorConfig aColorConfig; + const Color aBorderColor(aColorConfig.GetColorValue(svtools::FONTCOLOR).nColor); + + aRGBBorderColor = aBorderColor.getBColor(); + } if(rPage.getPageBorderOnlyLeftRight()) { @@ -328,10 +361,10 @@ namespace sdr aLeft.append(basegfx::B2DPoint(aPageBorderRange.getMinX(), aPageBorderRange.getMinY())); aLeft.append(basegfx::B2DPoint(aPageBorderRange.getMinX(), aPageBorderRange.getMaxY())); - + aRight.append(basegfx::B2DPoint(aPageBorderRange.getMaxX(), aPageBorderRange.getMinY())); aRight.append(basegfx::B2DPoint(aPageBorderRange.getMaxX(), aPageBorderRange.getMaxY())); - + xRetval.realloc(2); xRetval[0] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aLeft, aRGBBorderColor)); xRetval[1] = drawinglayer::primitive2d::Primitive2DReference(new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(aRight, aRGBBorderColor)); @@ -436,7 +469,7 @@ namespace sdr { const ViewContact& rCandidate(GetViewContact(a)); const drawinglayer::primitive2d::Primitive2DSequence aCandSeq(rCandidate.getViewIndependentPrimitive2DSequence()); - + drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(xRetval, aCandSeq); } @@ -621,7 +654,7 @@ namespace sdr maViewContactOfPageBackground.ActionChanged(); maViewContactOfPageShadow.ActionChanged(); maViewContactOfPageFill.ActionChanged(); - + const SdrPage& rPage = GetSdrPage(); if(rPage.TRG_HasMasterPage()) @@ -632,7 +665,7 @@ namespace sdr { maViewContactOfMasterPage.ActionChanged(); } - + maViewContactOfOuterPageBorder.ActionChanged(); maViewContactOfInnerPageBorder.ActionChanged(); maViewContactOfGridBack.ActionChanged(); diff --git a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx index 53528e608c..53528e608c 100644..100755 --- a/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx index ea5448a51a..ea5448a51a 100644..100755 --- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx diff --git a/svx/source/sdr/contact/viewcontactoftextobj.cxx b/svx/source/sdr/contact/viewcontactoftextobj.cxx index b36f7e2cd9..b36f7e2cd9 100644..100755 --- a/svx/source/sdr/contact/viewcontactoftextobj.cxx +++ b/svx/source/sdr/contact/viewcontactoftextobj.cxx diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index ac3d10c271..6404472290 100644..100755 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/awt/XWindow2.hpp> /** === end UNO includes === **/ -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" #include <tools/diagnose_ex.h> #include <vcl/pdfextoutdevdata.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/svx/source/sdr/contact/viewcontactofvirtobj.cxx b/svx/source/sdr/contact/viewcontactofvirtobj.cxx index 31d1a2d9a9..31d1a2d9a9 100644..100755 --- a/svx/source/sdr/contact/viewcontactofvirtobj.cxx +++ b/svx/source/sdr/contact/viewcontactofvirtobj.cxx diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx index dc562ba2b4..dc562ba2b4 100644..100755 --- a/svx/source/sdr/contact/viewobjectcontact.cxx +++ b/svx/source/sdr/contact/viewobjectcontact.cxx diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx index 40c16bea60..40c16bea60 100644..100755 --- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx diff --git a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx index 40868bc979..40868bc979 100644..100755 --- a/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3dscene.cxx diff --git a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx index cb746f5318..f686333174 100644..100755 --- a/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgraphic.cxx @@ -178,7 +178,7 @@ namespace sdr if(rGrafObj.IsLinkedGraphic()) { // update graphic link - rGrafObj.ImpUpdateGraphicLink(); + rGrafObj.ImpUpdateGraphicLink( sal_False ); } else { @@ -197,7 +197,7 @@ namespace sdr rGrafObj.mbInsidePaint = sal_True; rGrafObj.ForceSwapIn(); rGrafObj.mbInsidePaint = sal_False; - } + } bRetval = true; } @@ -253,19 +253,27 @@ namespace sdr // prepare primitive generation with evtl. loading the graphic when it's swapped out SdrGrafObj& rGrafObj = const_cast< ViewObjectContactOfGraphic* >(this)->getSdrGrafObj(); bool bDoAsynchronGraphicLoading(rGrafObj.GetModel() && rGrafObj.GetModel()->IsSwapGraphics()); - static bool bSuppressAsynchLoading(false); bool bSwapInDone(false); + bool bSwapInExclusive(false); - if(bDoAsynchronGraphicLoading - && rGrafObj.IsSwappedOut() - && rGrafObj.GetPage() - && rGrafObj.GetPage()->IsMasterPage()) + if( bDoAsynchronGraphicLoading && rGrafObj.IsSwappedOut() ) { - // #i102380# force Swap-In for GraphicObjects on MasterPage to have a nicer visualisation - bDoAsynchronGraphicLoading = false; + // sometimes it is needed that each graphic is completely available and swapped in + // for these cases a ForceSwapIn is called later at the graphic object + if ( rGrafObj.GetPage() && rGrafObj.GetPage()->IsMasterPage() ) + { + // #i102380# force Swap-In for GraphicObjects on MasterPage to have a nicer visualisation + bDoAsynchronGraphicLoading = false; + } + else if ( GetObjectContact().isOutputToPrinter() + || GetObjectContact().isOutputToRecordingMetaFile() + || GetObjectContact().isOutputToPDFFile() ) + { + bDoAsynchronGraphicLoading = false; + bSwapInExclusive = true; + } } - - if(bDoAsynchronGraphicLoading && !bSuppressAsynchLoading) + if( bDoAsynchronGraphicLoading ) { bSwapInDone = const_cast< ViewObjectContactOfGraphic* >(this)->impPrepareGraphicWithAsynchroniousLoading(); } @@ -294,10 +302,8 @@ namespace sdr } } - // if swap in was forced only for printing, swap out again - const bool bSwapInExclusiveForPrinting(bSwapInDone && GetObjectContact().isOutputToPrinter()); - - if(bSwapInExclusiveForPrinting) + // if swap in was forced only for printing metafile and pdf, swap out again + if( bSwapInDone && bSwapInExclusive ) { rGrafObj.ForceSwapOut(); } diff --git a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx index 6df1f2db07..6df1f2db07 100644..100755 --- a/svx/source/sdr/contact/viewobjectcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofgroup.cxx diff --git a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx index 16e58f80dd..16e58f80dd 100644..100755 --- a/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofmasterpagedescriptor.cxx diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index d4622546d3..f92863ceca 100644..100755 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -39,7 +39,7 @@ #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/svdpage.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index af7eeeb220..e92136f987 100644..100755 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -40,7 +40,7 @@ #include <avmedia/mediaitem.hxx> #include "sdrmediawindow.hxx" #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx index b469841f9a..b469841f9a 100644..100755 --- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx index 7a5da52ee3..ac297d8822 100644..100755 --- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx @@ -77,7 +77,7 @@ namespace sdr const bool bIsInplaceActive((nState == embed::EmbedStates::INPLACE_ACTIVE) || (nState == embed::EmbedStates::UI_ACTIVE)); const bool bIsChart(rSdrOle2.IsChart()); bool bDone(false); - + if(!bDone && bIsInplaceActive) { if( !GetObjectContact().isOutputToPrinter() && !GetObjectContact().isOutputToRecordingMetaFile() ) @@ -119,7 +119,7 @@ namespace sdr // determine if embedding and PrettyPrinting shall be done at all uno::Reference< frame::XModel > xChartModel; bool bDoChartPrettyPrinting(true); - + // the original ChartPrettyPainter does not do it for Window if(bDoChartPrettyPrinting && GetObjectContact().isOutputToWindow()) { @@ -225,7 +225,7 @@ namespace sdr } } - + return xRetval; } diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx index 84ad73d2df..aae0fa90e9 100644..100755 --- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx @@ -321,6 +321,12 @@ namespace sdr return false; } + // no page shadow for high contrast mode + if(GetObjectContact().isDrawModeHighContrast()) + { + return false; + } + return true; } } // end of namespace contact diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index bcf023a1c2..c0a1468013 100644..100755 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -39,7 +39,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <svx/sdrpagewindow.hxx> -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" /** === begin UNO includes === **/ #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -368,6 +368,10 @@ namespace sdr { namespace contact { ::basegfx::B2DTuple aViewScale, aViewTranslate; double nViewRotate(0), nViewShearX(0); _rViewTransformation.decompose( aViewScale, aViewTranslate, nViewRotate, nViewShearX ); + + ::basegfx::B2DTuple aZoomScale, aZoomTranslate; + double nZoomRotate(0), nZoomShearX(0); + _rZoomLevelNormalization.decompose( aZoomScale, aZoomTranslate, nZoomRotate, nZoomShearX ); #endif // transform the logic bound rect, using the view transformation, to pixel coordinates @@ -980,6 +984,10 @@ namespace sdr { namespace contact { aScaleNormalization.set( 0, 0, (double)aCurrentDeviceMapMode.GetScaleX() ); aScaleNormalization.set( 1, 1, (double)aCurrentDeviceMapMode.GetScaleY() ); m_aZoomLevelNormalization *= aScaleNormalization; + + #if OSL_DEBUG_LEVEL > 1 + m_aZoomLevelNormalization.decompose( aScale, aTranslate, fRotate, fShearX ); + #endif } //-------------------------------------------------------------------- @@ -1817,6 +1825,10 @@ namespace sdr { namespace contact { // disposed the control though it doesn't own it. So, /me thinks we should not bother here. return drawinglayer::primitive2d::Primitive2DSequence(); + if ( GetObjectContact().getViewInformation2D().getViewTransformation().isIdentity() ) + // remove this when #i115754# is fixed + return drawinglayer::primitive2d::Primitive2DSequence(); + // ignore existing controls which are in alive mode and manually switched to "invisible" // #102090# / 2009-06-05 / frank.schoenheit@sun.com const ControlHolder& rControl( m_pImpl->getExistentControl() ); diff --git a/svx/source/sdr/contact/viewobjectcontactredirector.cxx b/svx/source/sdr/contact/viewobjectcontactredirector.cxx index 1c26d9e2e0..1c26d9e2e0 100644..100755 --- a/svx/source/sdr/contact/viewobjectcontactredirector.cxx +++ b/svx/source/sdr/contact/viewobjectcontactredirector.cxx diff --git a/svx/source/sdr/event/eventhandler.cxx b/svx/source/sdr/event/eventhandler.cxx index 6edef73bcb..6edef73bcb 100644..100755 --- a/svx/source/sdr/event/eventhandler.cxx +++ b/svx/source/sdr/event/eventhandler.cxx diff --git a/svx/source/sdr/overlay/makefile.mk b/svx/source/sdr/overlay/makefile.mk deleted file mode 100644 index 155053826f..0000000000 --- a/svx/source/sdr/overlay/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJNAME=svx -TARGET=overlay -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/overlayanimatedbitmapex.obj \ - $(SLO)$/overlaybitmapex.obj \ - $(SLO)$/overlaycrosshair.obj \ - $(SLO)$/overlayhatchrect.obj \ - $(SLO)$/overlayhelpline.obj \ - $(SLO)$/overlayline.obj \ - $(SLO)$/overlaymanager.obj \ - $(SLO)$/overlaymanagerbuffered.obj \ - $(SLO)$/overlayobject.obj \ - $(SLO)$/overlayobjectcell.obj \ - $(SLO)$/overlayobjectlist.obj \ - $(SLO)$/overlaypolypolygon.obj \ - $(SLO)$/overlayprimitive2dsequenceobject.obj \ - $(SLO)$/overlayrollingrectangle.obj \ - $(SLO)$/overlayselection.obj \ - $(SLO)$/overlaytools.obj \ - $(SLO)$/overlaytriangle.obj - -.INCLUDE : target.mk diff --git a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx index 4d6c3fe09d..4d6c3fe09d 100644..100755 --- a/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx +++ b/svx/source/sdr/overlay/overlayanimatedbitmapex.cxx diff --git a/svx/source/sdr/overlay/overlaybitmapex.cxx b/svx/source/sdr/overlay/overlaybitmapex.cxx index 813d778d37..813d778d37 100644..100755 --- a/svx/source/sdr/overlay/overlaybitmapex.cxx +++ b/svx/source/sdr/overlay/overlaybitmapex.cxx diff --git a/svx/source/sdr/overlay/overlaycrosshair.cxx b/svx/source/sdr/overlay/overlaycrosshair.cxx index a903996c9a..a903996c9a 100644..100755 --- a/svx/source/sdr/overlay/overlaycrosshair.cxx +++ b/svx/source/sdr/overlay/overlaycrosshair.cxx diff --git a/svx/source/sdr/overlay/overlayhatchrect.cxx b/svx/source/sdr/overlay/overlayhatchrect.cxx index b459004e92..b459004e92 100644..100755 --- a/svx/source/sdr/overlay/overlayhatchrect.cxx +++ b/svx/source/sdr/overlay/overlayhatchrect.cxx diff --git a/svx/source/sdr/overlay/overlayhelpline.cxx b/svx/source/sdr/overlay/overlayhelpline.cxx index 9517438405..9517438405 100644..100755 --- a/svx/source/sdr/overlay/overlayhelpline.cxx +++ b/svx/source/sdr/overlay/overlayhelpline.cxx diff --git a/svx/source/sdr/overlay/overlayline.cxx b/svx/source/sdr/overlay/overlayline.cxx index 19dbdd0846..19dbdd0846 100644..100755 --- a/svx/source/sdr/overlay/overlayline.cxx +++ b/svx/source/sdr/overlay/overlayline.cxx diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index b71c55934e..00c7b20308 100644..100755 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -139,7 +139,7 @@ namespace sdr mnStripeLengthPixel(5), maDrawinglayerOpt(), maViewTransformation(), - maViewInformation2D(0), + maViewInformation2D(), mfDiscreteOne(0.0) { // set Property 'ReducedDisplayQuality' to true to allow simpler interaction diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index cec3908406..cec3908406 100644..100755 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index 3e81f2ff2a..3e81f2ff2a 100644..100755 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx diff --git a/svx/source/sdr/overlay/overlayobjectcell.cxx b/svx/source/sdr/overlay/overlayobjectcell.cxx index 79eabbcf0a..79eabbcf0a 100644..100755 --- a/svx/source/sdr/overlay/overlayobjectcell.cxx +++ b/svx/source/sdr/overlay/overlayobjectcell.cxx diff --git a/svx/source/sdr/overlay/overlayobjectlist.cxx b/svx/source/sdr/overlay/overlayobjectlist.cxx index f683472655..f683472655 100644..100755 --- a/svx/source/sdr/overlay/overlayobjectlist.cxx +++ b/svx/source/sdr/overlay/overlayobjectlist.cxx diff --git a/svx/source/sdr/overlay/overlaypolypolygon.cxx b/svx/source/sdr/overlay/overlaypolypolygon.cxx index 8de6b9f1c6..8de6b9f1c6 100644..100755 --- a/svx/source/sdr/overlay/overlaypolypolygon.cxx +++ b/svx/source/sdr/overlay/overlaypolypolygon.cxx diff --git a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx index b81e46a0a6..b81e46a0a6 100644..100755 --- a/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx +++ b/svx/source/sdr/overlay/overlayprimitive2dsequenceobject.cxx diff --git a/svx/source/sdr/overlay/overlayrollingrectangle.cxx b/svx/source/sdr/overlay/overlayrollingrectangle.cxx index d13171d5d8..d13171d5d8 100644..100755 --- a/svx/source/sdr/overlay/overlayrollingrectangle.cxx +++ b/svx/source/sdr/overlay/overlayrollingrectangle.cxx diff --git a/svx/source/sdr/overlay/overlayselection.cxx b/svx/source/sdr/overlay/overlayselection.cxx index 45ff1d0960..45ff1d0960 100644..100755 --- a/svx/source/sdr/overlay/overlayselection.cxx +++ b/svx/source/sdr/overlay/overlayselection.cxx diff --git a/svx/source/sdr/overlay/overlaytools.cxx b/svx/source/sdr/overlay/overlaytools.cxx index fdd28cd173..fdd28cd173 100644..100755 --- a/svx/source/sdr/overlay/overlaytools.cxx +++ b/svx/source/sdr/overlay/overlaytools.cxx diff --git a/svx/source/sdr/overlay/overlaytriangle.cxx b/svx/source/sdr/overlay/overlaytriangle.cxx index d4b1e4d1a7..d4b1e4d1a7 100644..100755 --- a/svx/source/sdr/overlay/overlaytriangle.cxx +++ b/svx/source/sdr/overlay/overlaytriangle.cxx diff --git a/svx/source/sdr/primitive2d/makefile.mk b/svx/source/sdr/primitive2d/makefile.mk deleted file mode 100644 index 078bc4bc97..0000000000 --- a/svx/source/sdr/primitive2d/makefile.mk +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJNAME=svx -TARGET=primitive2d -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/primitivefactory2d.obj \ - $(SLO)$/sdrdecompositiontools.obj \ - $(SLO)$/sdrattributecreator.obj \ - $(SLO)$/sdrellipseprimitive2d.obj \ - $(SLO)$/sdrrectangleprimitive2d.obj \ - $(SLO)$/sdrcustomshapeprimitive2d.obj \ - $(SLO)$/sdrcaptionprimitive2d.obj \ - $(SLO)$/sdrgrafprimitive2d.obj \ - $(SLO)$/sdrole2primitive2d.obj \ - $(SLO)$/sdrolecontentprimitive2d.obj \ - $(SLO)$/sdrpathprimitive2d.obj \ - $(SLO)$/sdrprimitivetools.obj \ - $(SLO)$/sdrmeasureprimitive2d.obj \ - $(SLO)$/sdrconnectorprimitive2d.obj \ - $(SLO)$/sdrtextprimitive2d.obj - -.INCLUDE : target.mk diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index 8ef1f85dd9..d1eed0201e 100644..100755 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -31,7 +31,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <svx/sdr/contact/viewcontact.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index 1c788312b4..37d99089ee 100644..100755 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -561,7 +561,7 @@ namespace drawinglayer { const SfxPoolItem* pGradientItem; - if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, TRUE, &pGradientItem) + if(SFX_ITEM_SET == rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_True, &pGradientItem) && ((XFillFloatTransparenceItem*)pGradientItem)->IsEnabled()) { // test if float transparence is completely transparent diff --git a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx index 10a78cda73..10a78cda73 100644..100755 --- a/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcaptionprimitive2d.cxx diff --git a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx index a87473f7ce..a87473f7ce 100644..100755 --- a/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrconnectorprimitive2d.cxx diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx index 25e48eb361..25e48eb361 100644..100755 --- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx diff --git a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx index 4825422655..4825422655 100644..100755 --- a/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx +++ b/svx/source/sdr/primitive2d/sdrdecompositiontools.cxx diff --git a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx index cce345bc31..cce345bc31 100644..100755 --- a/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrellipseprimitive2d.cxx diff --git a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx index c611b4c7c9..c611b4c7c9 100644..100755 --- a/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrgrafprimitive2d.cxx diff --git a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx index 0ba9a65cb3..0ba9a65cb3 100644..100755 --- a/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrmeasureprimitive2d.cxx diff --git a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx index 14c23fdcdb..14c23fdcdb 100644..100755 --- a/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrole2primitive2d.cxx diff --git a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx index f71148c72d..a82fbc341f 100644..100755 --- a/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrolecontentprimitive2d.cxx @@ -75,7 +75,7 @@ namespace drawinglayer const GraphicObject aGraphicObject(aGraphic); const GraphicAttr aGraphicAttr; drawinglayer::primitive2d::Primitive2DSequence xOLEContent; - + if(bScaleContent) { // get transformation atoms @@ -184,7 +184,7 @@ namespace drawinglayer { basegfx::B2DRange aRange(0.0, 0.0, 1.0, 1.0); aRange.transform(getObjectTransform()); - + return aRange; } diff --git a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx index a839d978ed..a839d978ed 100644..100755 --- a/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrpathprimitive2d.cxx diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx index 5cc4a4a278..5cc4a4a278 100644..100755 --- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx +++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx diff --git a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx index c6af6de417..c6af6de417 100644..100755 --- a/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrrectangleprimitive2d.cxx diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 5cd9529c1b..d493c1969c 100644..100755 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -36,7 +36,7 @@ #include <editeng/editobj.hxx> #include <editeng/flditem.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> #include <svx/svdoutl.hxx> diff --git a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx index f8f28dc936..f8f28dc936 100644..100755 --- a/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx +++ b/svx/source/sdr/primitive3d/sdrattributecreator3d.cxx diff --git a/svx/source/sdr/properties/attributeproperties.cxx b/svx/source/sdr/properties/attributeproperties.cxx index 81ef0063a1..6ea4fe9480 100644..100755 --- a/svx/source/sdr/properties/attributeproperties.cxx +++ b/svx/source/sdr/properties/attributeproperties.cxx @@ -278,7 +278,7 @@ namespace sdr ImpRemoveStyleSheet(); } - mpItemSet = mpItemSet->Clone(FALSE, pDestPool); + mpItemSet = mpItemSet->Clone(sal_False, pDestPool); GetSdrObject().GetModel()->MigrateItemSet(pOldSet, mpItemSet, pNewModel); // set stylesheet (if used) @@ -381,7 +381,7 @@ namespace sdr while(pSheet) { pNewSheet = &pNewPool->Make(pSheet->GetName(), pSheet->GetFamily(), pSheet->GetMask()); - pNewSheet->GetItemSet().Put(pSheet->GetItemSet(), FALSE); + pNewSheet->GetItemSet().Put(pSheet->GetItemSet(), sal_False); if(bScaleUnitChanged) { @@ -452,7 +452,7 @@ namespace sdr while(nWhich) { - if(mpItemSet->GetItemState(nWhich, FALSE) == SFX_ITEM_SET) + if(mpItemSet->GetItemState(nWhich, sal_False) == SFX_ITEM_SET) { pNewSet->Put(mpItemSet->Get(nWhich)); } diff --git a/svx/source/sdr/properties/captionproperties.cxx b/svx/source/sdr/properties/captionproperties.cxx index 15c480d536..15c480d536 100644..100755 --- a/svx/source/sdr/properties/captionproperties.cxx +++ b/svx/source/sdr/properties/captionproperties.cxx diff --git a/svx/source/sdr/properties/circleproperties.cxx b/svx/source/sdr/properties/circleproperties.cxx index 4cc3e7fcf2..4cc3e7fcf2 100644..100755 --- a/svx/source/sdr/properties/circleproperties.cxx +++ b/svx/source/sdr/properties/circleproperties.cxx diff --git a/svx/source/sdr/properties/connectorproperties.cxx b/svx/source/sdr/properties/connectorproperties.cxx index f0a9f83e29..f0a9f83e29 100644..100755 --- a/svx/source/sdr/properties/connectorproperties.cxx +++ b/svx/source/sdr/properties/connectorproperties.cxx diff --git a/svx/source/sdr/properties/customshapeproperties.cxx b/svx/source/sdr/properties/customshapeproperties.cxx index 3abce475f1..3abce475f1 100644..100755 --- a/svx/source/sdr/properties/customshapeproperties.cxx +++ b/svx/source/sdr/properties/customshapeproperties.cxx diff --git a/svx/source/sdr/properties/defaultproperties.cxx b/svx/source/sdr/properties/defaultproperties.cxx index 2d1e99f14b..878623417a 100644..100755 --- a/svx/source/sdr/properties/defaultproperties.cxx +++ b/svx/source/sdr/properties/defaultproperties.cxx @@ -63,7 +63,7 @@ namespace sdr { if(rProps.mpItemSet) { - mpItemSet = rProps.mpItemSet->Clone(TRUE); + mpItemSet = rProps.mpItemSet->Clone(sal_True); // do not keep parent info, this may be changed by later construrtors. // This class just copies the ItemSet, ignore parent. @@ -163,7 +163,7 @@ namespace sdr while(nWhich) { - if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE, &pPoolItem)) + if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False, &pPoolItem)) { if(AllowItemChange(nWhich, pPoolItem)) { diff --git a/svx/source/sdr/properties/e3dcompoundproperties.cxx b/svx/source/sdr/properties/e3dcompoundproperties.cxx index 39a6fe42c6..39a6fe42c6 100644..100755 --- a/svx/source/sdr/properties/e3dcompoundproperties.cxx +++ b/svx/source/sdr/properties/e3dcompoundproperties.cxx diff --git a/svx/source/sdr/properties/e3dextrudeproperties.cxx b/svx/source/sdr/properties/e3dextrudeproperties.cxx index a86addb11e..a86addb11e 100644..100755 --- a/svx/source/sdr/properties/e3dextrudeproperties.cxx +++ b/svx/source/sdr/properties/e3dextrudeproperties.cxx diff --git a/svx/source/sdr/properties/e3dlatheproperties.cxx b/svx/source/sdr/properties/e3dlatheproperties.cxx index 662070fad5..662070fad5 100644..100755 --- a/svx/source/sdr/properties/e3dlatheproperties.cxx +++ b/svx/source/sdr/properties/e3dlatheproperties.cxx diff --git a/svx/source/sdr/properties/e3dproperties.cxx b/svx/source/sdr/properties/e3dproperties.cxx index 85fe364ca3..85fe364ca3 100644..100755 --- a/svx/source/sdr/properties/e3dproperties.cxx +++ b/svx/source/sdr/properties/e3dproperties.cxx diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index 2c981128cb..fceabea58f 100644..100755 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -33,7 +33,7 @@ #include <svl/whiter.hxx> #include <svx/svddef.hxx> #include <svx/scene3d.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> ////////////////////////////////////////////////////////////////////////////// @@ -103,13 +103,13 @@ namespace sdr // and always equal. if(nWhich <= SDRATTR_3DSCENE_FIRST || nWhich >= SDRATTR_3DSCENE_LAST) { - if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE)) + if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False)) { mpItemSet->InvalidateItem(nWhich); } else { - mpItemSet->MergeValue(rSet.Get(nWhich), TRUE); + mpItemSet->MergeValue(rSet.Get(nWhich), sal_True); } } @@ -132,7 +132,7 @@ namespace sdr { // Generate filtered ItemSet which contains all but the SDRATTR_3DSCENE items. // #i50808# Leak fix, Clone produces a new instance and we get ownership here - SfxItemSet* pNewSet = rSet.Clone(TRUE); + SfxItemSet* pNewSet = rSet.Clone(sal_True); DBG_ASSERT(pNewSet, "E3dSceneProperties::SetMergedItemSet(): Could not clone ItemSet (!)"); for(sal_uInt16 b(SDRATTR_3DSCENE_FIRST); b <= SDRATTR_3DSCENE_LAST; b++) @@ -320,13 +320,13 @@ namespace sdr Camera3D aSceneCam(rObj.GetCamera()); // ProjectionType - mpItemSet->Put(Svx3DPerspectiveItem((UINT16)aSceneCam.GetProjection())); + mpItemSet->Put(Svx3DPerspectiveItem((sal_uInt16)aSceneCam.GetProjection())); // CamPos - mpItemSet->Put(Svx3DDistanceItem((UINT32)(aSceneCam.GetPosition().getZ() + 0.5))); + mpItemSet->Put(Svx3DDistanceItem((sal_uInt32)(aSceneCam.GetPosition().getZ() + 0.5))); // FocalLength - mpItemSet->Put(Svx3DFocalLengthItem((UINT32)((aSceneCam.GetFocalLength() * 100.0) + 0.5))); + mpItemSet->Put(Svx3DFocalLengthItem((sal_uInt32)((aSceneCam.GetFocalLength() * 100.0) + 0.5))); } } // end of namespace properties } // end of namespace sdr diff --git a/svx/source/sdr/properties/e3dsphereproperties.cxx b/svx/source/sdr/properties/e3dsphereproperties.cxx index de636eac0b..de636eac0b 100644..100755 --- a/svx/source/sdr/properties/e3dsphereproperties.cxx +++ b/svx/source/sdr/properties/e3dsphereproperties.cxx diff --git a/svx/source/sdr/properties/emptyproperties.cxx b/svx/source/sdr/properties/emptyproperties.cxx index cd247b5b1c..cd247b5b1c 100644..100755 --- a/svx/source/sdr/properties/emptyproperties.cxx +++ b/svx/source/sdr/properties/emptyproperties.cxx diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index e2c478831a..a74099656d 100644..100755 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -129,7 +129,7 @@ namespace sdr mpItemSet->Put( SdrGrafBlueItem( 0 ) ); mpItemSet->Put( SdrGrafGamma100Item( 100 ) ); mpItemSet->Put( SdrGrafTransparenceItem( 0 ) ); - mpItemSet->Put( SdrGrafInvertItem( FALSE ) ); + mpItemSet->Put( SdrGrafInvertItem( sal_False ) ); mpItemSet->Put( SdrGrafModeItem( GRAPHICDRAWMODE_STANDARD ) ); mpItemSet->Put( SdrGrafCropItem( 0, 0, 0, 0 ) ); diff --git a/svx/source/sdr/properties/groupproperties.cxx b/svx/source/sdr/properties/groupproperties.cxx index 3bffbff838..3992cb9897 100644..100755 --- a/svx/source/sdr/properties/groupproperties.cxx +++ b/svx/source/sdr/properties/groupproperties.cxx @@ -103,13 +103,13 @@ namespace sdr while(nWhich) { - if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE)) + if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False)) { mpItemSet->InvalidateItem(nWhich); } else { - mpItemSet->MergeValue(rSet.Get(nWhich), TRUE); + mpItemSet->MergeValue(rSet.Get(nWhich), sal_True); } nWhich = aIter.NextWhich(); diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index a60661a8aa..db3ecd9619 100644..100755 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -35,7 +35,7 @@ #include <vector> #include <svx/svdogrp.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> ////////////////////////////////////////////////////////////////////////////// // class to remember broadcast start positions @@ -128,7 +128,7 @@ namespace sdr while(nWhich) { - if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE, &pItem)) + if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False, &pItem)) { if(pItem->HasMetrics()) { diff --git a/svx/source/sdr/properties/makefile.mk b/svx/source/sdr/properties/makefile.mk deleted file mode 100644 index 5296765769..0000000000 --- a/svx/source/sdr/properties/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=svx -TARGET=properties -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES=\ - $(SLO)$/properties.obj \ - $(SLO)$/emptyproperties.obj \ - $(SLO)$/pageproperties.obj \ - $(SLO)$/defaultproperties.obj \ - $(SLO)$/attributeproperties.obj \ - $(SLO)$/textproperties.obj \ - $(SLO)$/customshapeproperties.obj \ - $(SLO)$/rectangleproperties.obj \ - $(SLO)$/oleproperties.obj \ - $(SLO)$/captionproperties.obj \ - $(SLO)$/circleproperties.obj \ - $(SLO)$/connectorproperties.obj \ - $(SLO)$/e3dproperties.obj \ - $(SLO)$/e3dcompoundproperties.obj \ - $(SLO)$/e3dextrudeproperties.obj \ - $(SLO)$/e3dlatheproperties.obj \ - $(SLO)$/e3dsceneproperties.obj \ - $(SLO)$/e3dsphereproperties.obj \ - $(SLO)$/graphicproperties.obj \ - $(SLO)$/groupproperties.obj \ - $(SLO)$/measureproperties.obj \ - $(SLO)$/itemsettools.obj - -.INCLUDE : target.mk diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index 971b4de127..0a4465dcac 100644..100755 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -118,9 +118,9 @@ namespace sdr GetObjectItemSet(); //#71958# by default, the show units Bool-Item is set as hard - // attribute to TRUE to aviod confusion when copying SdrMeasureObj's + // attribute to sal_True to aviod confusion when copying SdrMeasureObj's // from one application to another - mpItemSet->Put(SdrMeasureShowUnitItem(TRUE)); + mpItemSet->Put(SdrMeasureShowUnitItem(sal_True)); basegfx::B2DPolygon aNewPolygon; aNewPolygon.append(basegfx::B2DPoint(100.0, 0.0)); diff --git a/svx/source/sdr/properties/oleproperties.cxx b/svx/source/sdr/properties/oleproperties.cxx index ce51dc1a51..ce51dc1a51 100644..100755 --- a/svx/source/sdr/properties/oleproperties.cxx +++ b/svx/source/sdr/properties/oleproperties.cxx diff --git a/svx/source/sdr/properties/pageproperties.cxx b/svx/source/sdr/properties/pageproperties.cxx index 75b66a8072..75b66a8072 100644..100755 --- a/svx/source/sdr/properties/pageproperties.cxx +++ b/svx/source/sdr/properties/pageproperties.cxx diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index 80c5035e0e..0046765553 100644..100755 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -32,7 +32,7 @@ #include <svx/sdr/properties/itemsettools.hxx> #include <svl/itemset.hxx> #include <svx/svdogrp.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/rectangleproperties.cxx b/svx/source/sdr/properties/rectangleproperties.cxx index e686601466..e686601466 100644..100755 --- a/svx/source/sdr/properties/rectangleproperties.cxx +++ b/svx/source/sdr/properties/rectangleproperties.cxx diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 99eca41001..574279868e 100644..100755 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -489,7 +489,7 @@ namespace sdr if(bHasURL) { SfxItemSet aColorSet(*aSet.GetPool(), EE_CHAR_COLOR, EE_CHAR_COLOR ); - aColorSet.Put(aSet, FALSE); + aColorSet.Put(aSet, sal_False); ESelection aSel((sal_uInt16)nPara, 0); @@ -520,7 +520,7 @@ namespace sdr } - aSet.Put(aParaSet, FALSE); + aSet.Put(aParaSet, sal_False); if(bHasURL) { diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx index 8b309a0d39..e1e27ba5ef 100644..100755 --- a/svx/source/smarttags/SmartTagMgr.cxx +++ b/svx/source/smarttags/SmartTagMgr.cxx @@ -146,7 +146,7 @@ void SmartTagMgr::GetActionSequences( Sequence < rtl::OUString >& rSmartTagTypes rActionComponentsSequence.realloc( rSmartTagTypes.getLength() ); rActionIndicesSequence.realloc( rSmartTagTypes.getLength() ); - for ( USHORT j = 0; j < rSmartTagTypes.getLength(); ++j ) + for ( sal_uInt16 j = 0; j < rSmartTagTypes.getLength(); ++j ) { const rtl::OUString& rSmartTagType = rSmartTagTypes[j]; @@ -155,7 +155,7 @@ void SmartTagMgr::GetActionSequences( Sequence < rtl::OUString >& rSmartTagTypes Sequence< Reference< smarttags::XSmartTagAction > > aActions( nNumberOfActionRefs ); Sequence< sal_Int32 > aIndices( nNumberOfActionRefs ); - USHORT i = 0; + sal_uInt16 i = 0; SmartTagMapIter aActionsIter; SmartTagMapIter aEnd = maSmartTagMap.upper_bound( rSmartTagType ); diff --git a/svx/source/smarttags/makefile.mk b/svx/source/smarttags/makefile.mk deleted file mode 100644 index e92a4c0a6b..0000000000 --- a/svx/source/smarttags/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=svx -TARGET=smarttags - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES = \ - $(SLO)$/SmartTagMgr.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - - diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc index 19efa7a88d..69f5766f97 100644..100755 --- a/svx/source/src/app.hrc +++ b/svx/source/src/app.hrc @@ -24,11 +24,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -//======================================================================== -// Resource-Id's f"ur die OFA -// -// (C) 1998 - 2000 StarOffice Software Entw. GmbH, Hamburg, Germany -//------------------------------------------------------------------------ + +// Resource-Id's for OFA + #ifndef _OFF_APP_HRC #define _OFF_APP_HRC diff --git a/svx/source/src/app.src b/svx/source/src/app.src index a5ffd7ecfb..546e393f1e 100644..100755 --- a/svx/source/src/app.src +++ b/svx/source/src/app.src @@ -29,6 +29,10 @@ #include "app.hrc" //---------------------------------------------------------------------------- +String RID_APPTITLE +{ + Text = "%PRODUCTNAME %PRODUCTVERSION %PRODUCTEXTENSION" ; +}; #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; diff --git a/svx/source/src/errtxt.src b/svx/source/src/errtxt.src new file mode 100755 index 0000000000..a8089830df --- /dev/null +++ b/svx/source/src/errtxt.src @@ -0,0 +1,515 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#define __RSC +#include <svtools/svtools.hrc> +#include <svtools/sfxecode.hxx> + +// pragma ---------------------------------------------------------------- +Resource RID_ERRCTX +{ + String ERRCTX_ERROR + { + Text [ en-US ] = "Error" ; + }; + String ERRCTX_WARNING + { + Text [ en-US ] = "Warning" ; + }; + String ERRCTX_SFX_LOADTEMPLATE + { + Text [ en-US ] = "$(ERR) loading the template $(ARG1)" ; + }; + String ERRCTX_SFX_SAVEDOC + { + Text [ en-US ] = "$(ERR) saving the document $(ARG1)"; + }; + String ERRCTX_SFX_SAVEASDOC + { + Text [ en-US ] = "$(ERR) saving the document $(ARG1)"; + }; + String ERRCTX_SFX_DOCINFO + { + Text [ en-US ] = "$(ERR) displaying doc. information for document $(ARG1)" ; + }; + String ERRCTX_SFX_DOCTEMPLATE + { + Text [ en-US ] = "$(ERR) writing document $(ARG1) as template" ; + }; + String ERRCTX_SFX_MOVEORCOPYCONTENTS + { + Text [ en-US ] = "$(ERR) copying or moving document contents" ; + }; + String ERRCTX_SFX_DOCMANAGER + { + Text [ en-US ] = "$(ERR) starting the Document Manager" ; + }; + String ERRCTX_SFX_OPENDOC + { + Text [ en-US ] = "$(ERR) loading document $(ARG1)" ; + }; + String ERRCTX_SFX_NEWDOCDIRECT + { + Text [ en-US ] = "$(ERR) creating a new document" ; + }; + String ERRCTX_SFX_NEWDOC + { + Text [ en-US ] = "$(ERR) creating a new document" ; + }; + String ERRCTX_SFX_CREATEOBJSH + { + Text [ en-US ] = "$(ERR) expanding entry" ; + }; + String ERRCTX_SFX_LOADBASIC + { + Text [ en-US ] = "$(ERR) loading BASIC of document $(ARG1)" ; + }; + String ERRCTX_SFX_SEARCHADDRESS + { + Text [ en-US ] = "$(ERR) searching for an address"; + }; +}; +Resource RID_ERRHDL +{ + String ERRCODE_CLASS_ABORT + { + Text [ en-US ] = "Abort" ; + }; + String ERRCODE_CLASS_NOTEXISTS + { + Text [ en-US ] = "Nonexistent object" ; + }; + String ERRCODE_CLASS_ALREADYEXISTS + { + Text [ en-US ] = "Object already exists" ; + }; + String ERRCODE_CLASS_ACCESS + { + Text [ en-US ] = "Object not accessible" ; + }; + String ERRCODE_CLASS_PATH + { + Text [ en-US ] = "Inadmissible path" ; + }; + String ERRCODE_CLASS_LOCKING + { + Text [ en-US ] = "Locking problem" ; + }; + String ERRCODE_CLASS_PARAMETER + { + Text [ en-US ] = "Wrong parameter" ; + }; + String ERRCODE_CLASS_SPACE + { + Text [ en-US ] = "Resource exhausted" ; + }; + String ERRCODE_CLASS_NOTSUPPORTED + { + Text [ en-US ] = "Action not supported" ; + }; + String ERRCODE_CLASS_READ + { + Text [ en-US ] = "Read-Error" ; + }; + String ERRCODE_CLASS_WRITE + { + Text [ en-US ] = "Write Error" ; + }; + String ERRCODE_CLASS_UNKNOWN + { + Text [ en-US ] = "unknown" ; + }; + String ERRCODE_CLASS_VERSION + { + Text [ en-US ] = "Version Incompatibility" ; + }; + String ERRCODE_CLASS_GENERAL + { + Text [ en-US ] = "General Error" ; + }; + String ERRCODE_CLASS_FORMAT + { + Text [ en-US ] = "Incorrect format" ; + }; + String ERRCODE_CLASS_CREATE + { + Text [ en-US ] = "Error creating object" ; + }; + String ERRCODE_CLASS_SBX + { + Text [ en-US ] = "Inadmissible value or data type" ; + }; + String ERRCODE_CLASS_RUNTIME + { + Text [ en-US ] = "BASIC runtime error" ; + }; + String ERRCODE_CLASS_COMPILER + { + Text [ en-US ] = "BASIC syntax error" ; + }; + String 1 + { + Text [ en-US ] = "General Error" ; + }; + String ERRCODE_IO_GENERAL + { + Text [ en-US ] = "General input/output error." ; + }; + String ERRCODE_IO_MISPLACEDCHAR + { + Text [ en-US ] = "Invalid file name." ; + }; + String ERRCODE_IO_NOTEXISTS + { + Text [ en-US ] = "Nonexistent file." ; + }; + String ERRCODE_IO_ALREADYEXISTS + { + Text [ en-US ] = "File already exists." ; + }; + String ERRCODE_IO_NOTADIRECTORY + { + Text [ en-US ] = "The object is not a directory." ; + }; + String ERRCODE_IO_NOTAFILE + { + Text [ en-US ] = "The object is not a file." ; + }; + String ERRCODE_IO_INVALIDDEVICE + { + Text [ en-US ] = "The specified device is invalid." ; + }; + String ERRCODE_IO_ACCESSDENIED + { + Text [ en-US ] = "The object cannot be accessed\ndue to insufficient user rights." ; + }; + String ERRCODE_IO_LOCKVIOLATION + { + Text [ en-US ] = "Sharing violation while accessing the object." ; + }; + String ERRCODE_IO_OUTOFSPACE + { + Text [ en-US ] = "No more space on device." ; + }; + String ERRCODE_IO_ISWILDCARD + { + Text [ en-US ] = "This operation cannot be run on\nfiles containing wildcards." ; + }; + String ERRCODE_IO_NOTSUPPORTED + { + Text [ en-US ] = "This operation is not supported on this operating system." ; + }; + String ERRCODE_IO_TOOMANYOPENFILES + { + Text [ en-US ] = "There are too many files open." ; + }; + String ERRCODE_IO_CANTREAD + { + Text [ en-US ] = "Data could not be read from the file." ; + }; + String ERRCODE_IO_CANTWRITE + { + Text [ en-US ] = "The file could not be written." ; + }; + String ERRCODE_IO_OUTOFMEMORY + { + Text [ en-US ] = "The operation could not be run due to insufficient memory." ; + }; + String ERRCODE_IO_CANTSEEK + { + Text [ en-US ] = "The seek operation could not be run." ; + }; + String ERRCODE_IO_CANTTELL + { + Text [ en-US ] = "The tell operation could not be run." ; + }; + String ERRCODE_IO_WRONGVERSION + { + Text [ en-US ] = "Incorrect file version." ; + }; + String ERRCODE_IO_WRONGFORMAT + { + Text [ en-US ] = "Incorrect file format." ; + }; + String ERRCODE_IO_INVALIDCHAR + { + Text [ en-US ] = "The file name contains invalid characters." ; + }; + String ERRCODE_IO_UNKNOWN + { + Text [ en-US ] = "An unknown I/O error has occurred." ; + }; + String ERRCODE_IO_INVALIDACCESS + { + Text [ en-US ] = "An invalid attempt was made to access the file." ; + }; + String ERRCODE_IO_CANTCREATE + { + Text [ en-US ] = "The file could not be created." ; + }; + String ERRCODE_IO_INVALIDPARAMETER + { + Text [ en-US ] = "The operation was started under an invalid parameter." ; + }; + String ERRCODE_IO_ABORT + { + Text [ en-US ] = "The operation on the file was aborted." ; + }; + String ERRCODE_IO_NOTEXISTSPATH + { + Text [ en-US ] = "Path to the file does not exist." ; + }; + String ERRCODE_IO_RECURSIVE + { + Text [ en-US ] = "An object cannot be copied into itself." ; + }; + String ERRCODE_SFX_NOSTDTEMPLATE + { + Text [ en-US ] = "The default template could not be opened." ; + }; + String ERRCODE_SFX_TEMPLATENOTFOUND + { + Text [ en-US ] = "The specified template could not be found." ; + }; + String ERRCODE_SFX_NOTATEMPLATE + { + Text [ en-US ] = "The file cannot be used as template." ; + }; + String ERRCODE_SFX_CANTREADDOCINFO + { + Text [ en-US ] = "Document information could not be read from the file because\nthe document information format is unknown or because document information does not\nexist." ; + }; + String ERRCODE_SFX_ALREADYOPEN + { + Text [ en-US ] = "This document has already been opened for editing." ; + }; + String ERRCODE_SFX_WRONGPASSWORD + { + Text [ en-US ] = "The wrong password has been entered." ; + }; + String ERRCODE_SFX_DOLOADFAILED + { + Text [ en-US ] = "Error reading file." ; + }; + String ERRCODE_SFX_DOCUMENTREADONLY + { + Text [ en-US ] = "The document was opened as read-only." ; + }; + String ERRCODE_SFX_OLEGENERAL + { + Text [ en-US ] = "General OLE Error." ; + }; + String ERRCODE_INET_NAME_RESOLVE + { + Text [ en-US ] = "The host name $(ARG1) could not be resolved." ; + }; + String ERRCODE_INET_CONNECT + { + Text [ en-US ] = "Could not establish Internet connection to $(ARG1)." ; + }; + String ERRCODE_INET_READ + { + Text [ en-US ] = "Error reading data from the Internet.\nServer error message: $(ARG1)." ; + }; + String ERRCODE_INET_WRITE + { + Text [ en-US ] = "Error transferring data to the Internet.\nServer error message: $(ARG1)." ; + }; + String ERRCODE_INET_GENERAL + { + Text [ en-US ] = "General Internet error has occurred." ; + }; + String ERRCODE_INET_OFFLINE + { + Text [ en-US ] = "The requested Internet data is not available in the cache and cannot be transmitted as the Online mode has not be activated." ; + }; + String ERRCODE_SFXMSG_STYLEREPLACE + { + ExtraData = ERRCODE_MSG_ERROR | ERRCODE_BUTTON_OK_CANCEL ; + Text [ en-US ] = "Should the $(ARG1) Style be replaced?" ; + }; + String ERRCODE_SFX_NOFILTER + { + Text [ en-US ] = "A filter has not been found." ; + }; + String ERRCODE_SFX_CANTFINDORIGINAL + { + Text [ en-US ] = "The original could not be determined." ; + }; + String ERRCODE_SFX_CANTCREATECONTENT + { + Text [ en-US ] = "The contents could not be created." ; + }; + String ERRCODE_SFX_CANTCREATELINK + { + Text [ en-US ] = "The link could not be created." ; + }; + String ERRCODE_SFX_WRONGBMKFORMAT + { + Text [ en-US ] = "The link format is invalid." ; + }; + String ERRCODE_SFX_WRONGICONFILE + { + Text [ en-US ] = "The configuration of the icon display is invalid." ; + }; + String ERRCODE_SFX_CANTWRITEICONFILE + { + Text [ en-US ] = "The configuration of the icon display can not be saved." ; + }; + String ERRCODE_SFX_CANTDELICONFILE + { + Text [ en-US ] = "The configuration of the icon display could not be deleted." ; + }; + String ERRCODE_SFX_CANTRENAMECONTENT + { + Text [ en-US ] = "Contents cannot be renamed." ; + }; + String ERRCODE_SFX_INVALIDBMKPATH + { + Text [ en-US ] = "The bookmark folder is invalid." ; + }; + String ERRCODE_SFX_CANTWRITEURLCFGFILE + { + Text [ en-US ] = "The configuration of the URLs to be saved locally could not be saved." ; + }; + String ERRCODE_SFX_WRONGURLCFGFORMAT + { + Text [ en-US ] = "The configuration format of the URLs to be saved locally is invalid." ; + }; + String ERRCODE_SFX_NODOCUMENT + { + Text [ en-US ] = "This action cannot be applied to a document that does not exist." ; + }; + String ERRCODE_SFX_INVALIDLINK + { + Text [ en-US ] = "The link refers to an invalid target." ; + }; + String ERRCODE_SFX_INVALIDTRASHPATH + { + Text [ en-US ] = "The Recycle Bin path is invalid." ; + }; + String ERRCODE_SFX_NOTRESTORABLE + { + Text [ en-US ] = "The entry could not be restored." ; + }; + String ERRCODE_IO_NAMETOOLONG + { + Text [ en-US ] = "The file name is too long for the target file system." ; + }; + String ERRCODE_SFX_CONSULTUSER + { + Text [ en-US ] = "The details for running the function are incomplete." ; + }; + String ERRCODE_SFX_INVALIDSYNTAX + { + Text [ en-US ] = "The input syntax is invalid." ; + }; + String ERRCODE_SFX_CANTCREATEFOLDER + { + Text [ en-US ] = "The input syntax is invalid." ; + }; + String ERRCODE_SFX_CANTRENAMEFOLDER + { + Text [ en-US ] = "The input syntax is invalid." ; + }; + String ERRCODE_SFX_WRONG_CDF_FORMAT + { + Text [ en-US ] = "The channel document has an invalid format." ; + }; + String ERRCODE_SFX_EMPTY_SERVER + { + Text [ en-US ] = "The server must not be empty." ; + }; + String ERRCODE_SFX_NO_ABOBOX + { + Text [ en-US ] = "A subscription folder is required to install a Channel." ; + }; + String ERRCODE_IO_NOTSTORABLEINBINARYFORMAT + { + Text [ en-US ] = "This document contains attributes that cannot be saved in the selected format.\nPlease save the document in a %PRODUCTNAME %PRODUCTVERSION file format."; + }; + String ERRCODE_SFX_TARGETFILECORRUPTED + { + Text [ en-US ] = "The file $(FILENAME) cannot be saved. Please check your system settings. You can find an automatically generated backup copy of this file in folder $(PATH) named $(BACKUPNAME)."; + }; + String ERRCODE_SFX_NOMOREDOCUMENTSALLOWED + { + Text [ en-US ] = "The maximum number of documents that can be opened at the same time has been reached. You need to close one or more documents before you can open a new document."; + }; + String ERRCODE_SFX_CANTCREATEBACKUP + { + Text [ en-US ] = "Could not create backup copy." ; + }; + String ERRCODE_SFX_MACROS_SUPPORT_DISABLED + { + Text [ en-US ] = "An attempt was made to execute a macro.\nFor security reasons, macro support is disabled."; + }; + String ERRCODE_SFX_DOCUMENT_MACRO_DISABLED + { + Text [ en-US ] = "This document contains macros.\n\nMacros may contain viruses. Execution of macros is disabled due to the current macro security setting in Tools - Options - %PRODUCTNAME - Security.\n\nTherefore, some functionality may not be available." ; + }; + String ERRCODE_SFX_BROKENSIGNATURE + { + Text [ en-US ] = "The digitally signed document content and/or macros do not match the current document signature.\n\nThis could be the result of document manipulation or of structural document damage due to data transmission.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ; + }; + String ERRCODE_SFX_INCOMPLETE_ENCRYPTION + { + Text [ en-US ] = "The encrypted document contains unexpected non-encrypted streams.\n\nThis could be the result of document manipulation.\n\nWe recommend that you do not trust the content of the current document.\nExecution of macros is disabled for this document.\n " ; + }; + + String ERRCODE_IO_INVALIDLENGTH + { + Text [ en-US ] = "Invalid data length." ; + }; + String ERRCODE_IO_CURRENTDIR + { + Text [ en-US ] = "Function not possible: path contains current directory." ; + }; + String ERRCODE_IO_NOTSAMEDEVICE + { + Text [ en-US ] = "Function not possible: device (drive) not identical." ; + }; + String ERRCODE_IO_DEVICENOTREADY + { + Text [ en-US ] = "Device (drive) not ready." ; + }; + String ERRCODE_IO_BADCRC + { + Text [ en-US ] = "Wrong check amount." ; + }; + String ERRCODE_IO_WRITEPROTECTED + { + Text [ en-US ] = "Function not possible: write protected." ; + }; + String ERRCODE_SFX_SHARED_NOPASSWORDCHANGE + { + Text [ en-US ] = "The password of a shared spreadsheet cannot be set or changed.\nDeactivate sharing mode first."; + }; +}; + +// eof ------------------------------------------------------------------------ + diff --git a/svx/source/src/hidgen.hrc b/svx/source/src/hidgen.hrc index afed9a7878..afed9a7878 100644..100755 --- a/svx/source/src/hidgen.hrc +++ b/svx/source/src/hidgen.hrc diff --git a/svx/source/src/makefile.mk b/svx/source/src/makefile.mk deleted file mode 100644 index fb96866ca0..0000000000 --- a/svx/source/src/makefile.mk +++ /dev/null @@ -1,57 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - - -PRJ=..$/..$ - -PRJNAME=svx -TARGET=ofa - -# --- Settings ------------------------------------------------------------ - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -RES1FILELIST=\ - $(SRS)$/app.srs \ - $(SOLARCOMMONRESDIR)$/svtools.srs \ - $(SOLARCOMMONRESDIR)$/sfx.srs \ - $(SOLARCOMMONRESDIR)$/basic.srs - -RESLIB1NAME=$(TARGET) -RESLIB1IMAGES=$(PRJ)$/res $(PRJ)$/source/src -RESLIB1SRSFILES=$(RES1FILELIST) - -# --- Allgemein ----------------------------------------------------------- - -SRS1NAME= app -SRC1FILES= \ - app.src - -.INCLUDE : target.mk - diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 95175b8163..dc3a8af972 100644..100755 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -40,7 +40,7 @@ #include <svx/dialogs.hrc> -#include "insctrl.hxx" +#include "svx/insctrl.hxx" #include <svx/dialmgr.hxx> #define PAINT_OFFSET 5 @@ -49,14 +49,13 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxInsertStatusBarControl, SfxBoolItem); // class SvxInsertStatusBarControl --------------------------------------- -SvxInsertStatusBarControl::SvxInsertStatusBarControl( USHORT _nSlotId, - USHORT _nId, +SvxInsertStatusBarControl::SvxInsertStatusBarControl( sal_uInt16 _nSlotId, + sal_uInt16 _nId, StatusBar& rStb ) : SfxStatusBarControl( _nSlotId, _nId, rStb ), - bInsert( TRUE ) + bInsert( sal_True ) { - rStb.SetHelpId( _nId, _nSlotId ); } // ----------------------------------------------------------------------- @@ -67,7 +66,7 @@ SvxInsertStatusBarControl::~SvxInsertStatusBarControl() // ----------------------------------------------------------------------- -void SvxInsertStatusBarControl::StateChanged( USHORT , SfxItemState eState, +void SvxInsertStatusBarControl::StateChanged( sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) { if ( SFX_ITEM_AVAILABLE != eState ) @@ -110,14 +109,14 @@ void SvxInsertStatusBarControl::Paint( const UserDrawEvent& ) void SvxInsertStatusBarControl::DrawItemText_Impl() { - USHORT _nId = RID_SVXSTR_OVERWRITE_TEXT; + sal_uInt16 _nId = RID_SVXSTR_OVERWRITE_TEXT; if ( bInsert ) _nId = RID_SVXSTR_INSERT_TEXT; GetStatusBar().SetItemText( GetId(), SVX_RESSTR( _nId ) ); } -ULONG SvxInsertStatusBarControl::GetDefItemWidth(const StatusBar& rStb) +sal_uIntPtr SvxInsertStatusBarControl::GetDefItemWidth(const StatusBar& rStb) { long nWidth1 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_OVERWRITE_TEXT)); long nWidth2 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_INSERT_TEXT)); diff --git a/svx/source/stbctrls/makefile.mk b/svx/source/stbctrls/makefile.mk index ac9445d982..ac9445d982 100644..100755 --- a/svx/source/stbctrls/makefile.mk +++ b/svx/source/stbctrls/makefile.mk diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index 265804c29b..9d1014aa74 100644..100755 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -31,14 +31,13 @@ // include --------------------------------------------------------------- -#include "modctrl.hxx" - #include <vcl/status.hxx> #include <vcl/image.hxx> #include <svl/eitem.hxx> #include <sfx2/app.hxx> #include <svx/dialogs.hrc> +#include <svx/modctrl.hxx> #include <svx/dialmgr.hxx> #include <com/sun/star/beans/PropertyValue.hpp> @@ -66,8 +65,8 @@ struct SvxModifyControl::ImplData } }; -SvxModifyControl::SvxModifyControl( USHORT _nSlotId, - USHORT _nId, +SvxModifyControl::SvxModifyControl( sal_uInt16 _nSlotId, + sal_uInt16 _nId, StatusBar& rStb ) : SfxStatusBarControl( _nSlotId, _nId, rStb ), @@ -77,7 +76,7 @@ SvxModifyControl::SvxModifyControl( USHORT _nSlotId, // ----------------------------------------------------------------------- -void SvxModifyControl::StateChanged( USHORT, SfxItemState eState, +void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { if ( SFX_ITEM_AVAILABLE != eState ) @@ -147,7 +146,7 @@ void SvxModifyControl::DoubleClick() execute(OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save")), aArgs); } -ULONG SvxModifyControl::GetDefItemWidth(const StatusBar& rStb) +sal_uIntPtr SvxModifyControl::GetDefItemWidth(const StatusBar& rStb) { return rStb.GetTextWidth(String::CreateFromAscii("XX")); } diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 6c6171534a..54d0220b34 100644..100755 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -46,13 +46,13 @@ #include <svl/intitem.hxx> #define _SVX_PSZCTRL_CXX -#include "pszctrl.hxx" +#include "svx/pszctrl.hxx" #define PAINT_OFFSET 5 #include <editeng/sizeitem.hxx> #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include "stbctrls.h" #include "sfx2/module.hxx" @@ -112,19 +112,19 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxPosSizeStatusBarControl, SvxSizeItem); class FunctionPopup_Impl : public PopupMenu { public: - FunctionPopup_Impl( USHORT nCheck ); + FunctionPopup_Impl( sal_uInt16 nCheck ); - USHORT GetSelected() const { return nSelected; } + sal_uInt16 GetSelected() const { return nSelected; } private: - USHORT nSelected; + sal_uInt16 nSelected; virtual void Select(); }; // ----------------------------------------------------------------------- -FunctionPopup_Impl::FunctionPopup_Impl( USHORT nCheck ) : +FunctionPopup_Impl::FunctionPopup_Impl( sal_uInt16 nCheck ) : PopupMenu( ResId( RID_SVXMNU_PSZ_FUNC, DIALOG_MGR() ) ), nSelected( 0 ) { @@ -157,11 +157,11 @@ struct SvxPosSizeStatusBarControl_Impl Point aPos; // g"ultig, wenn eine Position angezeigt wird Size aSize; // g"ultig, wenn eine Gr"o/se angezeigt wird String aStr; // g"ultig, wenn ein Text angezeigt wird - BOOL bPos; // show position - BOOL bSize; // Gr"o/se anzeigen? - BOOL bTable; // Tabellenindex anzeigen? - BOOL bHasMenu; // StarCalc Popup-Menue anzeigen? - USHORT nFunction; // selektierte StarCalc Funktion + sal_Bool bPos; // show position + sal_Bool bSize; // Gr"o/se anzeigen? + sal_Bool bTable; // Tabellenindex anzeigen? + sal_Bool bHasMenu; // StarCalc Popup-Menue anzeigen? + sal_uInt16 nFunction; // selektierte StarCalc Funktion Image aPosImage; // Image f"ur die Positionsanzeige Image aSizeImage; // Image f"ur die Gr"o/senanzeige }; @@ -175,23 +175,27 @@ struct SvxPosSizeStatusBarControl_Impl Images fu"r die Position und Gro"sse laden. */ -SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( USHORT _nSlotId, - USHORT _nId, +#define STR_POSITION ".uno:Position" +#define STR_TABLECELL ".uno:StateTableCell" +#define STR_FUNC ".uno:StatusBarFunc" + +SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( sal_uInt16 _nSlotId, + sal_uInt16 _nId, StatusBar& rStb ) : SfxStatusBarControl( _nSlotId, _nId, rStb ), pImp( new SvxPosSizeStatusBarControl_Impl ) { - pImp->bPos = FALSE; - pImp->bSize = FALSE; - pImp->bTable = FALSE; - pImp->bHasMenu = FALSE; + pImp->bPos = sal_False; + pImp->bSize = sal_False; + pImp->bTable = sal_False; + pImp->bHasMenu = sal_False; pImp->nFunction = 0; pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) ); pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) ); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Position" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StateTableCell" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StatusBarFunc" ))); + addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_POSITION ))); // SID_ATTR_POSITION + addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_TABLECELL ))); // SID_TABLE_CELL + addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_FUNC ))); // SID_PSZ_FUNCTION } // ----------------------------------------------------------------------- @@ -218,32 +222,39 @@ SvxPosSizeStatusBarControl::~SvxPosSizeStatusBarControl() NULL/Void SfxPointItem SvxSizeItem SfxStringItem ------------------------------------------------------------------------ - Zeit TRUE FALSE FALSE FALSE - Position FALSE FALSE + Zeit sal_True sal_False sal_False FALSE + Position sal_False FALSE Gro"sse FALSE TRUE FALSE - Text FALSE FALSE TRUE + Text sal_False sal_False TRUE Ein anderes Item bewirkt einen Assert, die Zeitanzeige wird enabled. */ -void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, +void SvxPosSizeStatusBarControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { // da Kombi-Controller, immer die aktuelle Id als HelpId setzen // gecachten HelpText vorher l"oschen GetStatusBar().SetHelpText( GetId(), String() ); - GetStatusBar().SetHelpId( GetId(), nSID ); + + switch ( nSID ) + { + case SID_ATTR_POSITION : GetStatusBar().SetHelpId( GetId(), STR_POSITION ); break; + case SID_TABLE_CELL: GetStatusBar().SetHelpId( GetId(), STR_TABLECELL ); break; + case SID_PSZ_FUNCTION: GetStatusBar().SetHelpId( GetId(), STR_FUNC ); break; + default: break; + } if ( nSID == SID_PSZ_FUNCTION ) { if ( eState == SFX_ITEM_AVAILABLE ) { - pImp->bHasMenu = TRUE; + pImp->bHasMenu = sal_True; if ( pState && pState->ISA(SfxUInt16Item) ) pImp->nFunction = ((const SfxUInt16Item*)pState)->GetValue(); } else - pImp->bHasMenu = FALSE; + pImp->bHasMenu = sal_False; } else if ( SFX_ITEM_AVAILABLE != eState ) { @@ -251,11 +262,11 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, // notified for all display types if ( nSID == SID_TABLE_CELL ) - pImp->bTable = FALSE; + pImp->bTable = sal_False; else if ( nSID == SID_ATTR_POSITION ) - pImp->bPos = FALSE; + pImp->bPos = sal_False; else if ( nSID == GetSlotId() ) // controller is registered for SID_ATTR_SIZE - pImp->bSize = FALSE; + pImp->bSize = sal_False; else { DBG_ERRORFILE("unknown slot id"); @@ -265,31 +276,31 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, { // Position anzeigen pImp->aPos = ( (SfxPointItem*)pState )->GetValue(); - pImp->bPos = TRUE; - pImp->bTable = FALSE; + pImp->bPos = sal_True; + pImp->bTable = sal_False; } else if ( pState->ISA( SvxSizeItem ) ) { // Groesse anzeigen pImp->aSize = ( (SvxSizeItem*)pState )->GetSize(); - pImp->bSize = TRUE; - pImp->bTable = FALSE; + pImp->bSize = sal_True; + pImp->bTable = sal_False; } else if ( pState->ISA( SfxStringItem ) ) { // String anzeigen (Tabellen-Zelle oder anderes) pImp->aStr = ( (SfxStringItem*)pState )->GetValue(); - pImp->bTable = TRUE; - pImp->bPos = FALSE; - pImp->bSize = FALSE; + pImp->bTable = sal_True; + pImp->bPos = sal_False; + pImp->bSize = sal_False; } else { DBG_ERRORFILE( "invalid item type" ); // trotzdem Datum und Zeit anzeigen - pImp->bPos = FALSE; - pImp->bSize = FALSE; - pImp->bTable = FALSE; + pImp->bPos = sal_False; + pImp->bSize = sal_False; + pImp->bTable = sal_False; } if ( GetStatusBar().AreItemsVisible() ) @@ -314,7 +325,7 @@ void SvxPosSizeStatusBarControl::Command( const CommandEvent& rCEvt ) { if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU && pImp->bHasMenu ) { - USHORT nSelect = pImp->nFunction; + sal_uInt16 nSelect = pImp->nFunction; if (!nSelect) nSelect = PSZ_FUNC_NONE; FunctionPopup_Impl aMenu( nSelect ); @@ -420,12 +431,12 @@ void SvxPosSizeStatusBarControl::Paint( const UserDrawEvent& rUsrEvt ) // ----------------------------------------------------------------------- -ULONG SvxPosSizeStatusBarControl::GetDefItemWidth(const StatusBar& rStb) +sal_uIntPtr SvxPosSizeStatusBarControl::GetDefItemWidth(const StatusBar& rStb) { Image aTmpPosImage( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) ); Image aTmpSizeImage( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) ); - ULONG nWidth=PAINT_OFFSET+aTmpPosImage.GetSizePixel().Width(); + sal_uIntPtr nWidth=PAINT_OFFSET+aTmpPosImage.GetSizePixel().Width(); nWidth+=PAINT_OFFSET+aTmpSizeImage.GetSizePixel().Width(); nWidth+=2*(PAINT_OFFSET+rStb.GetTextWidth(String::CreateFromAscii("XXXX,XX / XXXX,XX"))); diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 62a6cb29e1..f96c498ceb 100644..100755 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -38,7 +38,7 @@ #define _SVX_SELCTRL_CXX -#include "selctrl.hxx" +#include "svx/selctrl.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> @@ -49,8 +49,8 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxSelectionModeControl, SfxUInt16Item); // class SvxSelectionModeControl ----------------------------------------- -SvxSelectionModeControl::SvxSelectionModeControl( USHORT _nSlotId, - USHORT _nId, +SvxSelectionModeControl::SvxSelectionModeControl( sal_uInt16 _nSlotId, + sal_uInt16 _nId, StatusBar& rStb ) : SfxStatusBarControl( _nSlotId, _nId, rStb ), nState( 0 ) @@ -59,7 +59,7 @@ SvxSelectionModeControl::SvxSelectionModeControl( USHORT _nSlotId, // ----------------------------------------------------------------------- -void SvxSelectionModeControl::StateChanged( USHORT, SfxItemState eState, +void SvxSelectionModeControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { if ( SFX_ITEM_AVAILABLE != eState ) @@ -107,7 +107,7 @@ void SvxSelectionModeControl::Paint( const UserDrawEvent& ) void SvxSelectionModeControl::DrawItemText_Impl() { String sTxt; - USHORT _nId = 0; + sal_uInt16 _nId = 0; switch ( nState ) { @@ -131,7 +131,7 @@ void SvxSelectionModeControl::DrawItemText_Impl() GetStatusBar().SetItemText( GetId(), sTxt ); } -ULONG SvxSelectionModeControl::GetDefItemWidth(const StatusBar& rStb) +sal_uIntPtr SvxSelectionModeControl::GetDefItemWidth(const StatusBar& rStb) { long nWidth1 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_STD)); long nWidth2 = rStb.GetTextWidth(SVX_RESSTR(RID_SVXSTR_SELMODE_ER)); diff --git a/svx/source/stbctrls/stbctrls.h b/svx/source/stbctrls/stbctrls.h index 23eb8b0e3a..23eb8b0e3a 100644..100755 --- a/svx/source/stbctrls/stbctrls.h +++ b/svx/source/stbctrls/stbctrls.h diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src index f4ecdc0027..f4ecdc0027 100644..100755 --- a/svx/source/stbctrls/stbctrls.src +++ b/svx/source/stbctrls/stbctrls.src diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 0fc8151904..dfc85e5c97 100644..100755 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -46,7 +46,7 @@ #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> -#include "xmlsecctrl.hxx" +#include "svx/xmlsecctrl.hxx" #include <tools/urlobj.hxx> #define PAINT_OFFSET 5 @@ -58,18 +58,18 @@ struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl { Point maPos; Size maSize; - UINT16 mnState; + sal_uInt16 mnState; Image maImage; Image maImageBroken; Image maImageNotValidated; }; -XmlSecStatusBarControl::XmlSecStatusBarControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb ) +XmlSecStatusBarControl::XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ) :SfxStatusBarControl( _nSlotId, _nId, _rStb ) ,mpImpl( new XmlSecStatusBarControl_Impl ) { - mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN; + mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN; mpImpl->maImage = Image( SVX_RES( RID_SVXBMP_SIGNET ) ); mpImpl->maImageBroken = Image( SVX_RES( RID_SVXBMP_SIGNET_BROKEN ) ); @@ -81,15 +81,11 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl() delete mpImpl; } -void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +void XmlSecStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { - GetStatusBar().SetHelpText( GetId(), String() );// necessary ? - - GetStatusBar().SetHelpId( GetId(), nSID ); // necessary ? - if( SFX_ITEM_AVAILABLE != eState ) { - mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN; + mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN; } else if( pState->ISA( SfxUInt16Item ) ) { @@ -98,7 +94,7 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con else { DBG_ERRORFILE( "+XmlSecStatusBarControl::StateChanged(): invalid item type" ); - mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN; + mpImpl->mnState = (sal_uInt16)SIGNATURESTATE_UNKNOWN; } if( GetStatusBar().AreItemsVisible() ) // necessary ? @@ -106,7 +102,7 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con GetStatusBar().SetItemText( GetId(), String() ); // necessary ? - USHORT nResId = RID_SVXSTR_XMLSEC_NO_SIG; + sal_uInt16 nResId = RID_SVXSTR_XMLSEC_NO_SIG; if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_OK ) nResId = RID_SVXSTR_XMLSEC_SIG_OK; else if ( mpImpl->mnState == SIGNATURESTATE_SIGNATURES_BROKEN ) diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index f311eed28e..44fa48220d 100644..100755 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -36,7 +36,7 @@ #include <svx/dialogs.hrc> -#include "zoomctrl.hxx" +#include "svx/zoomctrl.hxx" #include <svx/zoomitem.hxx> #include "stbctrls.h" #include <svx/dialmgr.hxx> @@ -48,27 +48,27 @@ SFX_IMPL_STATUSBAR_CONTROL(SvxZoomStatusBarControl,SvxZoomItem); class ZoomPopup_Impl : public PopupMenu { public: - ZoomPopup_Impl( USHORT nZ, USHORT nValueSet ); + ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet ); - USHORT GetZoom() const { return nZoom; } - USHORT GetCurId() const { return nCurId; } + sal_uInt16 GetZoom() const { return nZoom; } + sal_uInt16 GetCurId() const { return nCurId; } private: - USHORT nZoom; - USHORT nCurId; + sal_uInt16 nZoom; + sal_uInt16 nCurId; virtual void Select(); }; // ----------------------------------------------------------------------- -ZoomPopup_Impl::ZoomPopup_Impl( USHORT nZ, USHORT nValueSet ) +ZoomPopup_Impl::ZoomPopup_Impl( sal_uInt16 nZ, sal_uInt16 nValueSet ) : PopupMenu( ResId( RID_SVXMNU_ZOOM, DIALOG_MGR() ) ), nZoom( nZ ) { - static USHORT aTable[] = + static sal_uInt16 aTable[] = { SVX_ZOOM_ENABLE_50, ZOOM_50, SVX_ZOOM_ENABLE_100, ZOOM_100, @@ -79,9 +79,9 @@ ZoomPopup_Impl::ZoomPopup_Impl( USHORT nZ, USHORT nValueSet ) SVX_ZOOM_ENABLE_PAGEWIDTH, ZOOM_PAGE_WIDTH }; - for ( USHORT nPos = 0; nPos < SAL_N_ELEMENTS(aTable); nPos += 2 ) + for ( sal_uInt16 nPos = 0; nPos < SAL_N_ELEMENTS(aTable); nPos += 2 ) if ( ( aTable[nPos] != ( aTable[nPos] & nValueSet ) ) ) - EnableItem( aTable[nPos+1], FALSE ); + EnableItem( aTable[nPos+1], sal_False ); } // ----------------------------------------------------------------------- @@ -107,8 +107,8 @@ void ZoomPopup_Impl::Select() // class SvxZoomStatusBarControl ------------------------------------------ -SvxZoomStatusBarControl::SvxZoomStatusBarControl( USHORT _nSlotId, - USHORT _nId, +SvxZoomStatusBarControl::SvxZoomStatusBarControl( sal_uInt16 _nSlotId, + sal_uInt16 _nId, StatusBar& rStb ) : SfxStatusBarControl( _nSlotId, _nId, rStb ), @@ -119,7 +119,7 @@ SvxZoomStatusBarControl::SvxZoomStatusBarControl( USHORT _nSlotId, // ----------------------------------------------------------------------- -void SvxZoomStatusBarControl::StateChanged( USHORT, SfxItemState eState, +void SvxZoomStatusBarControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { if( SFX_ITEM_AVAILABLE != eState ) @@ -210,7 +210,7 @@ void SvxZoomStatusBarControl::Command( const CommandEvent& rCEvt ) SfxStatusBarControl::Command( rCEvt ); } -ULONG SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar& rStb) +sal_uIntPtr SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar& rStb) { long nWidth1 = rStb.GetTextWidth(String::CreateFromAscii("XXXXX%")); return nWidth1; diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx b/svx/source/stbctrls/zoomsliderctrl.cxx index 5b9298a0b1..7062870936 100644..100755 --- a/svx/source/stbctrls/zoomsliderctrl.cxx +++ b/svx/source/stbctrls/zoomsliderctrl.cxx @@ -48,12 +48,12 @@ SFX_IMPL_STATUSBAR_CONTROL( SvxZoomSliderControl, SvxZoomSliderItem ); struct SvxZoomSliderControl::SvxZoomSliderControl_Impl { - USHORT mnCurrentZoom; - USHORT mnMinZoom; - USHORT mnMaxZoom; - USHORT mnSliderCenter; + sal_uInt16 mnCurrentZoom; + sal_uInt16 mnMinZoom; + sal_uInt16 mnMaxZoom; + sal_uInt16 mnSliderCenter; std::vector< long > maSnappingPointOffsets; - std::vector< USHORT > maSnappingPointZooms; + std::vector< sal_uInt16 > maSnappingPointZooms; Image maSliderButton; Image maIncreaseButton; Image maDecreaseButton; @@ -90,10 +90,10 @@ const long nSnappingPointsMinDist = nSnappingEpsilon; // minimum distance of two // nOffset referes to the origin of the control: // + ----------- - -USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const +sal_uInt16 SvxZoomSliderControl::Offset2Zoom( long nOffset ) const { const long nControlWidth = getControlRect().GetWidth(); - USHORT nRet = 0; + sal_uInt16 nRet = 0; if ( nOffset < nSliderXOffset ) return mpImpl->mnMinZoom;; @@ -102,7 +102,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const return mpImpl->mnMaxZoom; // check for snapping points: - USHORT nCount = 0; + sal_uInt16 nCount = 0; std::vector< long >::iterator aSnappingPointIter; for ( aSnappingPointIter = mpImpl->maSnappingPointOffsets.begin(); aSnappingPointIter != mpImpl->maSnappingPointOffsets.end(); @@ -127,7 +127,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset; const long nZoomPerSliderPixel = (1000 * nFirstHalfRange) / nHalfSliderWidth; const long nOffsetToSliderLeft = nOffset - nSliderXOffset; - nRet = mpImpl->mnMinZoom + USHORT( nOffsetToSliderLeft * nZoomPerSliderPixel / 1000 ); + nRet = mpImpl->mnMinZoom + sal_uInt16( nOffsetToSliderLeft * nZoomPerSliderPixel / 1000 ); } else { @@ -136,7 +136,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const const long nHalfSliderWidth = nControlWidth/2 - nSliderXOffset; const long nZoomPerSliderPixel = 1000 * nSecondHalfRange / nHalfSliderWidth; const long nOffsetToSliderCenter = nOffset - nControlWidth/2; - nRet = mpImpl->mnSliderCenter + USHORT( nOffsetToSliderCenter * nZoomPerSliderPixel / 1000 ); + nRet = mpImpl->mnSliderCenter + sal_uInt16( nOffsetToSliderCenter * nZoomPerSliderPixel / 1000 ); } } @@ -149,7 +149,7 @@ USHORT SvxZoomSliderControl::Offset2Zoom( long nOffset ) const } // returns the offset to the left control border -long SvxZoomSliderControl::Zoom2Offset( USHORT nCurrentZoom ) const +long SvxZoomSliderControl::Zoom2Offset( sal_uInt16 nCurrentZoom ) const { const long nControlWidth = getControlRect().GetWidth(); long nRet = nSliderXOffset; @@ -178,7 +178,7 @@ long SvxZoomSliderControl::Zoom2Offset( USHORT nCurrentZoom ) const // ----------------------------------------------------------------------- -SvxZoomSliderControl::SvxZoomSliderControl( USHORT _nSlotId, USHORT _nId, StatusBar& _rStb ) : +SvxZoomSliderControl::SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ) : SfxStatusBarControl( _nSlotId, _nId, _rStb ), mpImpl( new SvxZoomSliderControl_Impl ) { @@ -196,7 +196,7 @@ SvxZoomSliderControl::~SvxZoomSliderControl() // ----------------------------------------------------------------------- -void SvxZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) +void SvxZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { if ( (SFX_ITEM_AVAILABLE != eState) || pState->ISA( SfxVoidItem ) ) { @@ -213,7 +213,7 @@ void SvxZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, c mpImpl->mbValuesSet = true; if ( mpImpl->mnSliderCenter == mpImpl->mnMaxZoom ) - mpImpl->mnSliderCenter = mpImpl->mnMinZoom + (USHORT)((mpImpl->mnMaxZoom - mpImpl->mnMinZoom) * 0.5); + mpImpl->mnSliderCenter = mpImpl->mnMinZoom + (sal_uInt16)((mpImpl->mnMaxZoom - mpImpl->mnMinZoom) * 0.5); DBG_ASSERT( mpImpl->mnMinZoom <= mpImpl->mnCurrentZoom && @@ -227,20 +227,20 @@ void SvxZoomSliderControl::StateChanged( USHORT /*nSID*/, SfxItemState eState, c mpImpl->maSnappingPointZooms.clear(); // get all snapping points: - std::set< USHORT > aTmpSnappingPoints; - for ( USHORT j = 0; j < rSnappingPoints.getLength(); ++j ) + std::set< sal_uInt16 > aTmpSnappingPoints; + for ( sal_uInt16 j = 0; j < rSnappingPoints.getLength(); ++j ) { const sal_Int32 nSnappingPoint = rSnappingPoints[j]; - aTmpSnappingPoints.insert( (USHORT)nSnappingPoint ); + aTmpSnappingPoints.insert( (sal_uInt16)nSnappingPoint ); } // remove snapping points that are to close to each other: - std::set< USHORT >::iterator aSnappingPointIter; + std::set< sal_uInt16 >::iterator aSnappingPointIter; long nLastOffset = 0; for ( aSnappingPointIter = aTmpSnappingPoints.begin(); aSnappingPointIter != aTmpSnappingPoints.end(); ++aSnappingPointIter ) { - const USHORT nCurrent = *aSnappingPointIter; + const sal_uInt16 nCurrent = *aSnappingPointIter; const long nCurrentOffset = Zoom2Offset( nCurrent ); if ( nCurrentOffset - nLastOffset >= nSnappingPointsMinDist ) @@ -343,10 +343,10 @@ void SvxZoomSliderControl::Paint( const UserDrawEvent& rUsrEvt ) // ----------------------------------------------------------------------- -BOOL SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) +sal_Bool SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) { if ( !mpImpl->mbValuesSet ) - return TRUE;; + return sal_True;; const Rectangle aControlRect = getControlRect(); const Point aPoint = rEvt.GetPosPixel(); @@ -374,7 +374,7 @@ BOOL SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) mpImpl->mnCurrentZoom = mpImpl->mnMaxZoom; if ( nOldZoom == mpImpl->mnCurrentZoom ) - return TRUE; + return sal_True; if ( GetStatusBar().AreItemsVisible() ) GetStatusBar().SetItemData( GetId(), 0 ); // force repaint @@ -395,15 +395,15 @@ BOOL SvxZoomSliderControl::MouseButtonDown( const MouseEvent & rEvt ) mpImpl->mbOmitPaint = false; - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- -BOOL SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) +sal_Bool SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) { if ( !mpImpl->mbValuesSet ) - return TRUE;; + return sal_True;; const short nButtons = rEvt.GetButtons(); @@ -440,7 +440,7 @@ BOOL SvxZoomSliderControl::MouseMove( const MouseEvent & rEvt ) } } - return TRUE; + return sal_True; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx index 91a79d0123..031ffdfbf7 100644..100755 --- a/svx/source/svdraw/ActionDescriptionProvider.cxx +++ b/svx/source/svdraw/ActionDescriptionProvider.cxx @@ -29,14 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "ActionDescriptionProvider.hxx" -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/ActionDescriptionProvider.hxx" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" ::rtl::OUString ActionDescriptionProvider::createDescription( ActionType eActionType , const ::rtl::OUString& rObjectName ) { - USHORT nResID=0; + sal_uInt16 nResID=0; switch( eActionType ) { case INSERT: diff --git a/svx/source/svdraw/clonelist.cxx b/svx/source/svdraw/clonelist.cxx index a39bb2f1f3..a39bb2f1f3 100644..100755 --- a/svx/source/svdraw/clonelist.cxx +++ b/svx/source/svdraw/clonelist.cxx diff --git a/svx/source/svdraw/gradtrns.cxx b/svx/source/svdraw/gradtrns.cxx index 6b33979da3..6b33979da3 100644..100755 --- a/svx/source/svdraw/gradtrns.cxx +++ b/svx/source/svdraw/gradtrns.cxx diff --git a/svx/source/svdraw/gradtrns.hxx b/svx/source/svdraw/gradtrns.hxx index ce0f6ee236..ce0f6ee236 100644..100755 --- a/svx/source/svdraw/gradtrns.hxx +++ b/svx/source/svdraw/gradtrns.hxx diff --git a/svx/source/svdraw/impgrfll.cxx b/svx/source/svdraw/impgrfll.cxx index f8332089c4..d2cedabab9 100644..100755 --- a/svx/source/svdraw/impgrfll.cxx +++ b/svx/source/svdraw/impgrfll.cxx @@ -43,12 +43,12 @@ void ImpCalcBmpFillSizes( Size& rStartOffset, const Size& rBmpSize, const Size& rBmpPerCent, const Size& rBmpOffPerCent, - BOOL bBmpLogSize, - BOOL bBmpTile, - BOOL bBmpStretch, + sal_Bool bBmpLogSize, + sal_Bool bBmpTile, + sal_Bool bBmpStretch, RECT_POINT eBmpRectPoint ) { - BOOL bOriginalSize = FALSE, bScaleSize = FALSE; + sal_Bool bOriginalSize = sal_False, bScaleSize = sal_False; // Falls keine Groessen gegeben sind ( z.B. alte Dokumente ) // berechnen wir uns die Groesse selber aus der Bitmap @@ -58,16 +58,16 @@ void ImpCalcBmpFillSizes( Size& rStartOffset, if( bBmpLogSize ) { if( !rBmpSize.Width() && !rBmpSize.Height() ) - bOriginalSize = TRUE; + bOriginalSize = sal_True; else if( !rBmpSize.Width() || !rBmpSize.Height() ) - bScaleSize = TRUE; + bScaleSize = sal_True; } else { if( !rBmpPerCent.Width() && !rBmpPerCent.Height() ) - bOriginalSize = TRUE; + bOriginalSize = sal_True; else if( !rBmpPerCent.Width() || !rBmpPerCent.Height() ) - bScaleSize = TRUE; + bScaleSize = sal_True; } // entweder Originalgroesse oder angepasste Groesse diff --git a/svx/source/svdraw/makefile.mk b/svx/source/svdraw/makefile.mk deleted file mode 100644 index 514c5b6d2c..0000000000 --- a/svx/source/svdraw/makefile.mk +++ /dev/null @@ -1,124 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=svdraw -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/svdxcgv.obj \ - $(SLO)$/svdmodel.obj \ - $(SLO)$/svdpage.obj \ - $(SLO)$/svdobj.obj \ - $(SLO)$/svdedtv1.obj \ - $(SLO)$/svdcrtv.obj \ - $(SLO)$/svdograf.obj \ - $(SLO)$/svdoole2.obj \ - $(SLO)$/svdhdl.obj \ - $(SLO)$/svdmrkv.obj \ - $(SLO)$/svdogrp.obj \ - $(SLO)$/svdotxln.obj \ - $(SLO)$/svdotextdecomposition.obj \ - $(SLO)$/svdotextpathdecomposition.obj \ - $(SLO)$/svdouno.obj \ - $(SLO)$/svdpagv.obj \ - $(SLO)$/svddrgmt.obj \ - $(SLO)$/svdpntv.obj \ - $(SLO)$/svdsnpv.obj \ - $(SLO)$/svdview.obj \ - $(SLO)$/svdtext.obj \ - $(SLO)$/svdoashp.obj \ - $(SLO)$/svdoattr.obj \ - $(SLO)$/svdotext.obj \ - $(SLO)$/svdotxat.obj \ - $(SLO)$/svdotxdr.obj \ - $(SLO)$/svdotxed.obj \ - $(SLO)$/svdotxfl.obj \ - $(SLO)$/svdotxtr.obj \ - $(SLO)$/svdorect.obj \ - $(SLO)$/svdoedge.obj \ - $(SLO)$/svdomeas.obj \ - $(SLO)$/svdopath.obj \ - $(SLO)$/svdocapt.obj \ - $(SLO)$/svdocirc.obj \ - $(SLO)$/svdopage.obj \ - $(SLO)$/svdoutl.obj \ - $(SLO)$/svdovirt.obj \ - $(SLO)$/svdoutlinercache.obj \ - $(SLO)$/gradtrns.obj \ - $(SLO)$/svdattr.obj \ - $(SLO)$/svddrag.obj \ - $(SLO)$/svddrgv.obj \ - $(SLO)$/svdedtv2.obj \ - $(SLO)$/svdedxv.obj \ - $(SLO)$/svdetc.obj \ - $(SLO)$/sdrhittesthelper.obj \ - $(SLO)$/svdfmtf.obj \ - $(SLO)$/svdglev.obj \ - $(SLO)$/svdglue.obj \ - $(SLO)$/svdhlpln.obj \ - $(SLO)$/svditer.obj \ - $(SLO)$/svdlayer.obj \ - $(SLO)$/svdmark.obj \ - $(SLO)$/svdmrkv1.obj \ - $(SLO)$/sdrcomment.obj \ - $(SLO)$/sdrmasterpagedescriptor.obj \ - $(SLO)$/sdrpagewindow.obj \ - $(SLO)$/sdrpaintwindow.obj \ - $(SLO)$/svdpoev.obj \ - $(SLO)$/svdtrans.obj \ - $(SLO)$/svdundo.obj \ - $(SLO)$/svdviter.obj \ - $(SLO)$/clonelist.obj \ - $(SLO)$/svdedtv.obj \ - $(SLO)$/selectioncontroller.obj \ - $(SLO)$/polypolygoneditor.obj \ - $(SLO)$/svdibrow.obj \ - $(SLO)$/svdomedia.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/ActionDescriptionProvider.obj \ - $(SLO)$/impgrfll.obj - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -SRS1NAME=svdstr -SRC1FILES= svdstr.src - -.INCLUDE : target.mk diff --git a/svx/source/svdraw/polypolygoneditor.cxx b/svx/source/svdraw/polypolygoneditor.cxx index 64774e59b3..64774e59b3 100644..100755 --- a/svx/source/svdraw/polypolygoneditor.cxx +++ b/svx/source/svdraw/polypolygoneditor.cxx diff --git a/svx/source/svdraw/sdrcomment.cxx b/svx/source/svdraw/sdrcomment.cxx index ae6011d6b0..ae6011d6b0 100644..100755 --- a/svx/source/svdraw/sdrcomment.cxx +++ b/svx/source/svdraw/sdrcomment.cxx diff --git a/svx/source/svdraw/sdrhittesthelper.cxx b/svx/source/svdraw/sdrhittesthelper.cxx index 5b51232cbd..5b51232cbd 100644..100755 --- a/svx/source/svdraw/sdrhittesthelper.cxx +++ b/svx/source/svdraw/sdrhittesthelper.cxx diff --git a/svx/source/svdraw/sdrmasterpagedescriptor.cxx b/svx/source/svdraw/sdrmasterpagedescriptor.cxx index 5f55e4d1d2..5f55e4d1d2 100644..100755 --- a/svx/source/svdraw/sdrmasterpagedescriptor.cxx +++ b/svx/source/svdraw/sdrmasterpagedescriptor.cxx diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 5153fb702f..d62e0859a6 100644..100755 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -40,7 +40,7 @@ #include <svx/svdpage.hxx> #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdr/contact/objectcontactofpageview.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <osl/mutex.hxx> @@ -80,8 +80,8 @@ using namespace ::com::sun::star; // , thus it seems not necessary to make // it visible her at all. // #58917# Das Show darf nicht am VCL-Fenster landen, weil dann Assertion vom SFX - // BOOL bVis = pWindow->IsVisible(); - // xC->setVisible(TRUE); + // sal_Bool bVis = pWindow->IsVisible(); + // xC->setVisible(sal_True); // if ( !bVis ) // pWindow->Hide(); // if( !mxContext.is() && bVisible ) @@ -193,6 +193,10 @@ void SdrPageWindow::PrePaint() } } +void SdrPageWindow::PostPaint() +{ +} + void SdrPageWindow::PrepareRedraw(const Region& rReg) { // evtl. give OC the chance to do ProcessDisplay preparations diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index ba77883b38..17ccfde01d 100644..100755 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdr/overlay/overlaymanagerbuffered.hxx> #include <svx/svdpntv.hxx> #include <vcl/gdimtf.hxx> diff --git a/svx/source/svdraw/selectioncontroller.cxx b/svx/source/svdraw/selectioncontroller.cxx index 375f9bfcb9..375f9bfcb9 100644..100755 --- a/svx/source/svdraw/selectioncontroller.cxx +++ b/svx/source/svdraw/selectioncontroller.cxx diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index 174e7f4239..2b54168c9a 100644..100755 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -55,11 +55,11 @@ #include <svx/svxids.hrc> #include <svx/xtable.hxx> // fuer RGB_Color() -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // fuer DEGREE_CHAR #include <svx/svdtrans.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" #include <svx/sdgcpitm.hxx> #include <editeng/adjitem.hxx> #include <svx/sdtfchim.hxx> @@ -300,11 +300,11 @@ SdrItemPool::SdrItemPool( SvxBoxInfoItem* pBoxInfoItem = new SvxBoxInfoItem( SDRATTR_TABLE_BORDER_INNER ); - pBoxInfoItem->SetTable( TRUE ); - pBoxInfoItem->SetDist( TRUE); // Abstandsfeld immer anzeigen -// pBoxInfoItem->SetMinDist( TRUE );// Minimalgroesse in Tabellen und Absaetzen setzen + pBoxInfoItem->SetTable( sal_True ); + pBoxInfoItem->SetDist( sal_True); // Abstandsfeld immer anzeigen +// pBoxInfoItem->SetMinDist( sal_True );// Minimalgroesse in Tabellen und Absaetzen setzen // pBoxInfoItem->SetDefDist( MIN_BORDER_DIST );// Default-Abstand immer setzen - pBoxInfoItem->SetValid( VALID_DISABLE, TRUE ); // Einzelne Linien koennen nur in Tabellen DontCare-Status haben + pBoxInfoItem->SetValid( VALID_DISABLE, sal_True ); // Einzelne Linien koennen nur in Tabellen DontCare-Status haben mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_INNER - SDRATTR_START ] = pBoxInfoItem; // mppLocalPoolDefaults[ SDRATTR_TABLE_BORDER_SHADOW - SDRATTR_START ] = new SvxShadowItem( SDRATTR_TABLE_BORDER_SHADOW ); @@ -330,7 +330,7 @@ SdrItemPool::SdrItemPool( /************************************************************************* |* |* copy ctor, sorgt dafuer, dass die static defaults gecloned werden -|* (Parameter 2 = TRUE) +|* (Parameter 2 = sal_True) |* \************************************************************************/ @@ -385,7 +385,7 @@ SfxItemPresentation SdrItemPool::GetPresentation( const IntlWrapper * pIntlWrapper) const { if (!IsInvalidItem(&rItem)) { - USHORT nWhich=rItem.Which(); + sal_uInt16 nWhich=rItem.Which(); if (nWhich>=SDRATTR_SHADOW_FIRST && nWhich<=SDRATTR_END) { rItem.GetPresentation(SFX_ITEM_PRESENTATION_NAMELESS, GetMetric(nWhich),ePresentationMetric,rText, @@ -405,7 +405,7 @@ SfxItemPresentation SdrItemPool::GetPresentation( void SdrItemPool::TakeItemName(sal_uInt16 nWhich, String& rItemName) { ResMgr* pResMgr = ImpGetResMgr(); - USHORT nResId = SIP_UNKNOWN_ATTR; + sal_uInt16 nResId = SIP_UNKNOWN_ATTR; switch (nWhich) { @@ -633,10 +633,10 @@ void SdrItemPool::TakeItemName(sal_uInt16 nWhich, String& rItemName) TYPEINIT1_AUTOFACTORY(SdrFractionItem,SfxPoolItem); -SdrFractionItem::SdrFractionItem(USHORT nId, SvStream& rIn): +SdrFractionItem::SdrFractionItem(sal_uInt16 nId, SvStream& rIn): SfxPoolItem(nId) { - INT32 nMul,nDiv; + sal_Int32 nMul,nDiv; rIn>>nMul; rIn>>nDiv; nValue=Fraction(nMul,nDiv); @@ -654,7 +654,7 @@ SfxItemPresentation SdrFractionItem::GetPresentation( { if(nValue.IsValid()) { - INT32 nDiv = nValue.GetDenominator(); + sal_Int32 nDiv = nValue.GetDenominator(); rText = UniString::CreateFromInt32(nValue.GetNumerator()); if(nDiv != 1) @@ -681,15 +681,15 @@ SfxItemPresentation SdrFractionItem::GetPresentation( return ePresentation; } -SfxPoolItem* SdrFractionItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrFractionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrFractionItem(Which(),rIn); } -SvStream& SdrFractionItem::Store(SvStream& rOut, USHORT /*nItemVers*/) const +SvStream& SdrFractionItem::Store(SvStream& rOut, sal_uInt16 /*nItemVers*/) const { - rOut<<INT32(nValue.GetNumerator()); - rOut<<INT32(nValue.GetDenominator()); + rOut<<sal_Int32(nValue.GetNumerator()); + rOut<<sal_Int32(nValue.GetDenominator()); return rOut; } @@ -710,7 +710,7 @@ SfxItemPresentation SdrScaleItem::GetPresentation( { if(GetValue().IsValid()) { - INT32 nDiv = GetValue().GetDenominator(); + sal_Int32 nDiv = GetValue().GetDenominator(); rText = UniString::CreateFromInt32(GetValue().GetNumerator()); rText += sal_Unicode(':'); @@ -734,7 +734,7 @@ SfxItemPresentation SdrScaleItem::GetPresentation( return ePresentation; } -SfxPoolItem* SdrScaleItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrScaleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrScaleItem(Which(),rIn); } @@ -755,12 +755,12 @@ SfxPoolItem* SdrOnOffItem::Clone(SfxItemPool* /*pPool*/) const return new SdrOnOffItem(Which(),GetValue()); } -SfxPoolItem* SdrOnOffItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrOnOffItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrOnOffItem(Which(),rIn); } -XubString SdrOnOffItem::GetValueTextByVal(BOOL bVal) const +XubString SdrOnOffItem::GetValueTextByVal(sal_Bool bVal) const { if (bVal) return ImpGetResStr(STR_ItemValON); else return ImpGetResStr(STR_ItemValOFF); @@ -787,12 +787,12 @@ SfxPoolItem* SdrYesNoItem::Clone(SfxItemPool* /*pPool*/) const return new SdrYesNoItem(Which(),GetValue()); } -SfxPoolItem* SdrYesNoItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrYesNoItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrYesNoItem(Which(),rIn); } -XubString SdrYesNoItem::GetValueTextByVal(BOOL bVal) const +XubString SdrYesNoItem::GetValueTextByVal(sal_Bool bVal) const { if (bVal) return ImpGetResStr(STR_ItemValYES); else return ImpGetResStr(STR_ItemValNO); @@ -823,7 +823,7 @@ SfxPoolItem* SdrPercentItem::Clone(SfxItemPool* /*pPool*/) const return new SdrPercentItem(Which(),GetValue()); } -SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrPercentItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrPercentItem(Which(),rIn); } @@ -858,7 +858,7 @@ SfxPoolItem* SdrAngleItem::Clone(SfxItemPool* /*pPool*/) const return new SdrAngleItem(Which(),GetValue()); } -SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrAngleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrAngleItem(Which(),rIn); } @@ -867,8 +867,8 @@ SfxItemPresentation SdrAngleItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper * pIntlWrapper) const { - INT32 nValue(GetValue()); - BOOL bNeg(nValue < 0); + sal_Int32 nValue(GetValue()); + sal_Bool bNeg(nValue < 0); if(bNeg) nValue = -nValue; @@ -894,8 +894,8 @@ SfxItemPresentation SdrAngleItem::GetPresentation( rText.Insert(aUnicodeNull, 0); xub_StrLen nLen = rText.Len(); - BOOL bNull1(rText.GetChar(nLen-1) == aUnicodeNull); - BOOL bNull2(bNull1 && rText.GetChar(nLen-2) == aUnicodeNull); + sal_Bool bNull1(rText.GetChar(nLen-1) == aUnicodeNull); + sal_Bool bNull2(bNull1 && rText.GetChar(nLen-2) == aUnicodeNull); if(bNull2) { @@ -947,14 +947,14 @@ SfxPoolItem* SdrMetricItem::Clone(SfxItemPool* /*pPool*/) const return new SdrMetricItem(Which(),GetValue()); } -SfxPoolItem* SdrMetricItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrMetricItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMetricItem(Which(),rIn); } bool SdrMetricItem::HasMetrics() const { - return TRUE; + return sal_True; } bool SdrMetricItem::ScaleMetrics(long nMul, long nDiv) @@ -966,7 +966,7 @@ bool SdrMetricItem::ScaleMetrics(long nMul, long nDiv) aVal/=nDiv; SetValue(long(aVal)); } - return TRUE; + return sal_True; } SfxItemPresentation SdrMetricItem::GetPresentation(SfxItemPresentation ePres, @@ -996,11 +996,11 @@ TYPEINIT1_AUTOFACTORY(SdrCaptionTypeItem,SfxEnumItem); SfxPoolItem* SdrCaptionTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionTypeItem(*this); } -SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrCaptionTypeItem(rIn); } +SfxPoolItem* SdrCaptionTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCaptionTypeItem(rIn); } -USHORT SdrCaptionTypeItem::GetValueCount() const { return 4; } +sal_uInt16 SdrCaptionTypeItem::GetValueCount() const { return 4; } -XubString SdrCaptionTypeItem::GetValueTextByPos(USHORT nPos) const +XubString SdrCaptionTypeItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCAPTIONTYPE1+nPos); } @@ -1008,7 +1008,7 @@ XubString SdrCaptionTypeItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrCaptionTypeItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1023,11 +1023,11 @@ TYPEINIT1_AUTOFACTORY(SdrCaptionEscDirItem,SfxEnumItem); SfxPoolItem* SdrCaptionEscDirItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCaptionEscDirItem(*this); } -SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrCaptionEscDirItem(rIn); } +SfxPoolItem* SdrCaptionEscDirItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCaptionEscDirItem(rIn); } -USHORT SdrCaptionEscDirItem::GetValueCount() const { return 3; } +sal_uInt16 SdrCaptionEscDirItem::GetValueCount() const { return 3; } -XubString SdrCaptionEscDirItem::GetValueTextByPos(USHORT nPos) const +XubString SdrCaptionEscDirItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCAPTIONESCHORI+nPos); } @@ -1035,7 +1035,7 @@ XubString SdrCaptionEscDirItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrCaptionEscDirItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1055,11 +1055,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextFitToSizeTypeItem,SfxEnumItem); SfxPoolItem* SdrTextFitToSizeTypeItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextFitToSizeTypeItem(*this); } -SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextFitToSizeTypeItem(rIn); } +SfxPoolItem* SdrTextFitToSizeTypeItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextFitToSizeTypeItem(rIn); } -USHORT SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; } +sal_uInt16 SdrTextFitToSizeTypeItem::GetValueCount() const { return 4; } -XubString SdrTextFitToSizeTypeItem::GetValueTextByPos(USHORT nPos) const +XubString SdrTextFitToSizeTypeItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValFITTOSIZENONE+nPos); } @@ -1067,7 +1067,7 @@ XubString SdrTextFitToSizeTypeItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1078,13 +1078,13 @@ SfxItemPresentation SdrTextFitToSizeTypeItem::GetPresentation(SfxItemPresentatio return ePres; } -int SdrTextFitToSizeTypeItem::HasBoolValue() const { return TRUE; } +int SdrTextFitToSizeTypeItem::HasBoolValue() const { return sal_True; } -BOOL SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; } +sal_Bool SdrTextFitToSizeTypeItem::GetBoolValue() const { return GetValue()!=SDRTEXTFIT_NONE; } -void SdrTextFitToSizeTypeItem::SetBoolValue(BOOL bVal) { SetValue(sal::static_int_cast< USHORT >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); } +void SdrTextFitToSizeTypeItem::SetBoolValue(sal_Bool bVal) { SetValue(sal::static_int_cast< sal_uInt16 >(bVal ? SDRTEXTFIT_PROPORTIONAL : SDRTEXTFIT_NONE)); } -bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { drawing::TextFitToSizeType eFS = (drawing::TextFitToSizeType)GetValue(); rVal <<= eFS; @@ -1092,7 +1092,7 @@ bool SdrTextFitToSizeTypeItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) c return true; } -bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextFitToSizeType eFS; if(!(rVal >>= eFS)) @@ -1104,7 +1104,7 @@ bool SdrTextFitToSizeTypeItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId* eFS = (drawing::TextFitToSizeType) nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrFitToSizeType)eFS ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrFitToSizeType)eFS ) ); return true; } @@ -1113,11 +1113,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextVertAdjustItem,SfxEnumItem); SfxPoolItem* SdrTextVertAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextVertAdjustItem(*this); } -SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextVertAdjustItem(rIn); } +SfxPoolItem* SdrTextVertAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextVertAdjustItem(rIn); } -USHORT SdrTextVertAdjustItem::GetValueCount() const { return 5; } +sal_uInt16 SdrTextVertAdjustItem::GetValueCount() const { return 5; } -XubString SdrTextVertAdjustItem::GetValueTextByPos(USHORT nPos) const +XubString SdrTextVertAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTVADJTOP+nPos); } @@ -1125,7 +1125,7 @@ XubString SdrTextVertAdjustItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1136,13 +1136,13 @@ SfxItemPresentation SdrTextVertAdjustItem::GetPresentation(SfxItemPresentation e return ePres; } -bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrTextVertAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextVerticalAdjust)GetValue(); return true; } -bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextVerticalAdjust eAdj; if(!(rVal >>= eAdj)) @@ -1154,7 +1154,7 @@ bool SdrTextVertAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) eAdj = (drawing::TextVerticalAdjust)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrTextVertAdjust)eAdj ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextVertAdjust)eAdj ) ); return true; } @@ -1163,11 +1163,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextHorzAdjustItem,SfxEnumItem); SfxPoolItem* SdrTextHorzAdjustItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextHorzAdjustItem(*this); } -SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextHorzAdjustItem(rIn); } +SfxPoolItem* SdrTextHorzAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextHorzAdjustItem(rIn); } -USHORT SdrTextHorzAdjustItem::GetValueCount() const { return 5; } +sal_uInt16 SdrTextHorzAdjustItem::GetValueCount() const { return 5; } -XubString SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const +XubString SdrTextHorzAdjustItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTHADJLEFT+nPos); } @@ -1175,7 +1175,7 @@ XubString SdrTextHorzAdjustItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1186,13 +1186,13 @@ SfxItemPresentation SdrTextHorzAdjustItem::GetPresentation(SfxItemPresentation e return ePres; } -bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrTextHorzAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextHorizontalAdjust)GetValue(); return true; } -bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextHorizontalAdjust eAdj; if(!(rVal >>= eAdj)) @@ -1204,7 +1204,7 @@ bool SdrTextHorzAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) eAdj = (drawing::TextHorizontalAdjust)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrTextHorzAdjust)eAdj ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextHorzAdjust)eAdj ) ); return true; } @@ -1213,11 +1213,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniKindItem,SfxEnumItem); SfxPoolItem* SdrTextAniKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniKindItem(*this); } -SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniKindItem(rIn); } +SfxPoolItem* SdrTextAniKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniKindItem(rIn); } -USHORT SdrTextAniKindItem::GetValueCount() const { return 5; } +sal_uInt16 SdrTextAniKindItem::GetValueCount() const { return 5; } -XubString SdrTextAniKindItem::GetValueTextByPos(USHORT nPos) const +XubString SdrTextAniKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTANI_NONE+nPos); } @@ -1225,7 +1225,7 @@ XubString SdrTextAniKindItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1236,13 +1236,13 @@ SfxItemPresentation SdrTextAniKindItem::GetPresentation(SfxItemPresentation ePre return ePres; } -bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrTextAniKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextAnimationKind)GetValue(); return true; } -bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextAnimationKind eKind; if(!(rVal >>= eKind)) @@ -1253,7 +1253,7 @@ bool SdrTextAniKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) eKind = (drawing::TextAnimationKind)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrTextAniKind)eKind ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextAniKind)eKind ) ); return true; } @@ -1262,11 +1262,11 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniDirectionItem,SfxEnumItem); SfxPoolItem* SdrTextAniDirectionItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDirectionItem(*this); } -SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniDirectionItem(rIn); } +SfxPoolItem* SdrTextAniDirectionItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniDirectionItem(rIn); } -USHORT SdrTextAniDirectionItem::GetValueCount() const { return 4; } +sal_uInt16 SdrTextAniDirectionItem::GetValueCount() const { return 4; } -XubString SdrTextAniDirectionItem::GetValueTextByPos(USHORT nPos) const +XubString SdrTextAniDirectionItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValTEXTANI_LEFT+nPos); } @@ -1274,7 +1274,7 @@ XubString SdrTextAniDirectionItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1285,13 +1285,13 @@ SfxItemPresentation SdrTextAniDirectionItem::GetPresentation(SfxItemPresentation return ePres; } -bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrTextAniDirectionItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::TextAnimationDirection)GetValue(); return true; } -bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::TextAnimationDirection eDir; if(!(rVal >>= eDir)) @@ -1303,7 +1303,7 @@ bool SdrTextAniDirectionItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ eDir = (drawing::TextAnimationDirection)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrTextAniDirection)eDir ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrTextAniDirection)eDir ) ); return true; } @@ -1312,7 +1312,7 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniDelayItem,SfxUInt16Item); SfxPoolItem* SdrTextAniDelayItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniDelayItem(*this); } -SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniDelayItem(rIn); } +SfxPoolItem* SdrTextAniDelayItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniDelayItem(rIn); } SfxItemPresentation SdrTextAniDelayItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, @@ -1338,7 +1338,7 @@ TYPEINIT1_AUTOFACTORY(SdrTextAniAmountItem,SfxInt16Item); SfxPoolItem* SdrTextAniAmountItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrTextAniAmountItem(*this); } -SfxPoolItem* SdrTextAniAmountItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrTextAniAmountItem(rIn); } +SfxPoolItem* SdrTextAniAmountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrTextAniAmountItem(rIn); } bool SdrTextAniAmountItem::HasMetrics() const { @@ -1353,15 +1353,15 @@ bool SdrTextAniAmountItem::ScaleMetrics(long nMul, long nDiv) aVal+=nDiv/2; // fuer korrektes Runden aVal/=nDiv; SetValue(short(aVal)); - return TRUE; - } else return FALSE; + return sal_True; + } else return sal_False; } SfxItemPresentation SdrTextAniAmountItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, XubString& rText, const IntlWrapper *) const { - INT32 nValue(GetValue()); + sal_Int32 nValue(GetValue()); if(!nValue) nValue = -1L; @@ -1394,12 +1394,12 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation( } TYPEINIT1_AUTOFACTORY( SdrTextFixedCellHeightItem, SfxBoolItem ); -SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( BOOL bUseFixedCellHeight ) +SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( sal_Bool bUseFixedCellHeight ) : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, bUseFixedCellHeight ) { } SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( SvStream & rStream, sal_uInt16 nVersion ) - : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, FALSE ) + : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, sal_False ) { if ( nVersion ) { @@ -1443,13 +1443,13 @@ sal_uInt16 SdrTextFixedCellHeightItem::GetVersion( sal_uInt16 /*nFileFormatVersi { return 1; } -bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrTextFixedCellHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { sal_Bool bValue = (sal_Bool)GetValue(); rVal <<= bValue; return true; } -bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrTextFixedCellHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Bool bValue = sal_Bool(); if( !( rVal >>= bValue ) ) @@ -1572,7 +1572,7 @@ sal_uInt16 SdrCustomShapeAdjustmentItem::GetVersion( sal_uInt16 /*nFileFormatVer return 1; } -bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { sal_uInt32 i, nCount = GetCount(); uno::Sequence< sal_Int32 > aSequence( nCount ); @@ -1586,7 +1586,7 @@ bool SdrCustomShapeAdjustmentItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId* return true; } -bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrCustomShapeAdjustmentItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { uno::Sequence< sal_Int32 > aSequence; if( !( rVal >>= aSequence ) ) @@ -1618,11 +1618,11 @@ TYPEINIT1_AUTOFACTORY(SdrEdgeKindItem,SfxEnumItem); SfxPoolItem* SdrEdgeKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrEdgeKindItem(*this); } -SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrEdgeKindItem(rIn); } +SfxPoolItem* SdrEdgeKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrEdgeKindItem(rIn); } -USHORT SdrEdgeKindItem::GetValueCount() const { return 4; } +sal_uInt16 SdrEdgeKindItem::GetValueCount() const { return 4; } -XubString SdrEdgeKindItem::GetValueTextByPos(USHORT nPos) const +XubString SdrEdgeKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValEDGE_ORTHOLINES+nPos); } @@ -1630,7 +1630,7 @@ XubString SdrEdgeKindItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1641,7 +1641,7 @@ SfxItemPresentation SdrEdgeKindItem::GetPresentation(SfxItemPresentation ePres, return ePres; } -bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { drawing::ConnectorType eCT = drawing::ConnectorType_STANDARD; @@ -1661,7 +1661,7 @@ bool SdrEdgeKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const return true; } -bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::ConnectorType eCT; if(!(rVal >>= eCT)) @@ -1683,18 +1683,18 @@ bool SdrEdgeKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) default: OSL_FAIL( "SdrEdgeKindItem::PuValue : unknown enum" ); } - SetValue( sal::static_int_cast< USHORT >( eEK ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( eEK ) ); return true; } -bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeNode1HorzDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1704,13 +1704,13 @@ bool SdrEdgeNode1HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId* return true; } -bool SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeNode1VertDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1720,13 +1720,13 @@ bool SdrEdgeNode1VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId* return true; } -bool SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeNode2HorzDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1736,13 +1736,13 @@ bool SdrEdgeNode2HorzDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId* return true; } -bool SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeNode2VertDistItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1752,13 +1752,13 @@ bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId* return true; } -bool SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1768,13 +1768,13 @@ bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) return true; } -bool SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1784,13 +1784,13 @@ bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) return true; } -bool SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1809,11 +1809,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureKindItem,SfxEnumItem); SfxPoolItem* SdrMeasureKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureKindItem(*this); } -SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureKindItem(rIn); } +SfxPoolItem* SdrMeasureKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureKindItem(rIn); } -USHORT SdrMeasureKindItem::GetValueCount() const { return 2; } +sal_uInt16 SdrMeasureKindItem::GetValueCount() const { return 2; } -XubString SdrMeasureKindItem::GetValueTextByPos(USHORT nPos) const +XubString SdrMeasureKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_STD+nPos); } @@ -1821,7 +1821,7 @@ XubString SdrMeasureKindItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1832,13 +1832,13 @@ SfxItemPresentation SdrMeasureKindItem::GetPresentation(SfxItemPresentation ePre return ePres; } -bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrMeasureKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::MeasureKind)GetValue(); return true; } -bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::MeasureKind eKind; if(!(rVal >>= eKind)) @@ -1850,7 +1850,7 @@ bool SdrMeasureKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) eKind = (drawing::MeasureKind)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrMeasureKind)eKind ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureKind)eKind ) ); return true; } @@ -1858,11 +1858,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureTextHPosItem,SfxEnumItem); SfxPoolItem* SdrMeasureTextHPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextHPosItem(*this); } -SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureTextHPosItem(rIn); } +SfxPoolItem* SdrMeasureTextHPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureTextHPosItem(rIn); } -USHORT SdrMeasureTextHPosItem::GetValueCount() const { return 4; } +sal_uInt16 SdrMeasureTextHPosItem::GetValueCount() const { return 4; } -XubString SdrMeasureTextHPosItem::GetValueTextByPos(USHORT nPos) const +XubString SdrMeasureTextHPosItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_TEXTHAUTO+nPos); } @@ -1870,7 +1870,7 @@ XubString SdrMeasureTextHPosItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1881,13 +1881,13 @@ SfxItemPresentation SdrMeasureTextHPosItem::GetPresentation(SfxItemPresentation return ePres; } -bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrMeasureTextHPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::MeasureTextHorzPos)GetValue(); return true; } -bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::MeasureTextHorzPos ePos; if(!(rVal >>= ePos)) @@ -1899,7 +1899,7 @@ bool SdrMeasureTextHPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) ePos = (drawing::MeasureTextHorzPos)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrMeasureTextHPos)ePos ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureTextHPos)ePos ) ); return true; } @@ -1907,11 +1907,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureTextVPosItem,SfxEnumItem); SfxPoolItem* SdrMeasureTextVPosItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureTextVPosItem(*this); } -SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureTextVPosItem(rIn); } +SfxPoolItem* SdrMeasureTextVPosItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureTextVPosItem(rIn); } -USHORT SdrMeasureTextVPosItem::GetValueCount() const { return 5; } +sal_uInt16 SdrMeasureTextVPosItem::GetValueCount() const { return 5; } -XubString SdrMeasureTextVPosItem::GetValueTextByPos(USHORT nPos) const +XubString SdrMeasureTextVPosItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValMEASURE_TEXTVAUTO+nPos); } @@ -1919,7 +1919,7 @@ XubString SdrMeasureTextVPosItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1930,13 +1930,13 @@ SfxItemPresentation SdrMeasureTextVPosItem::GetPresentation(SfxItemPresentation return ePres; } -bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrMeasureTextVPosItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::MeasureTextVertPos)GetValue(); return true; } -bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::MeasureTextVertPos ePos; if(!(rVal >>= ePos)) @@ -1948,7 +1948,7 @@ bool SdrMeasureTextVPosItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) ePos = (drawing::MeasureTextVertPos)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrMeasureTextHPos)ePos ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrMeasureTextHPos)ePos ) ); return true; } @@ -1956,11 +1956,11 @@ TYPEINIT1_AUTOFACTORY(SdrMeasureUnitItem,SfxEnumItem); SfxPoolItem* SdrMeasureUnitItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrMeasureUnitItem(*this); } -SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrMeasureUnitItem(rIn); } +SfxPoolItem* SdrMeasureUnitItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrMeasureUnitItem(rIn); } -USHORT SdrMeasureUnitItem::GetValueCount() const { return 14; } +sal_uInt16 SdrMeasureUnitItem::GetValueCount() const { return 14; } -XubString SdrMeasureUnitItem::GetValueTextByPos(USHORT nPos) const +XubString SdrMeasureUnitItem::GetValueTextByPos(sal_uInt16 nPos) const { XubString aRetval; @@ -1975,7 +1975,7 @@ XubString SdrMeasureUnitItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -1986,19 +1986,19 @@ SfxItemPresentation SdrMeasureUnitItem::GetPresentation(SfxItemPresentation ePre return ePres; } -bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrMeasureUnitItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrMeasureUnitItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nMeasure = 0; if(!(rVal >>= nMeasure)) return false; - SetValue( sal::static_int_cast< USHORT >( (FieldUnit)nMeasure ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (FieldUnit)nMeasure ) ); return true; } @@ -2011,11 +2011,11 @@ TYPEINIT1_AUTOFACTORY(SdrCircKindItem,SfxEnumItem); SfxPoolItem* SdrCircKindItem::Clone(SfxItemPool* /*pPool*/) const { return new SdrCircKindItem(*this); } -SfxPoolItem* SdrCircKindItem::Create(SvStream& rIn, USHORT /*nVer*/) const { return new SdrCircKindItem(rIn); } +SfxPoolItem* SdrCircKindItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrCircKindItem(rIn); } -USHORT SdrCircKindItem::GetValueCount() const { return 4; } +sal_uInt16 SdrCircKindItem::GetValueCount() const { return 4; } -XubString SdrCircKindItem::GetValueTextByPos(USHORT nPos) const +XubString SdrCircKindItem::GetValueTextByPos(sal_uInt16 nPos) const { return ImpGetResStr(STR_ItemValCIRC_FULL+nPos); } @@ -2023,7 +2023,7 @@ XubString SdrCircKindItem::GetValueTextByPos(USHORT nPos) const SfxItemPresentation SdrCircKindItem::GetPresentation(SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText=GetValueTextByPos(sal::static_int_cast< USHORT >(GetValue())); + rText=GetValueTextByPos(sal::static_int_cast< sal_uInt16 >(GetValue())); if (ePres==SFX_ITEM_PRESENTATION_COMPLETE) { String aStr; @@ -2034,13 +2034,13 @@ SfxItemPresentation SdrCircKindItem::GetPresentation(SfxItemPresentation ePres, return ePres; } -bool SdrCircKindItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrCircKindItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (drawing::CircleKind)GetValue(); return true; } -bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrCircKindItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { drawing::CircleKind eKind; if(!(rVal >>= eKind)) @@ -2052,7 +2052,7 @@ bool SdrCircKindItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) eKind = (drawing::CircleKind)nEnum; } - SetValue( sal::static_int_cast< USHORT >( (SdrCircKind)eKind ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( (SdrCircKind)eKind ) ); return true; } @@ -2068,7 +2068,7 @@ SfxPoolItem* SdrSignedPercentItem::Clone(SfxItemPool* /*pPool*/) const return new SdrSignedPercentItem( Which(), GetValue() ); } -SfxPoolItem* SdrSignedPercentItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrSignedPercentItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrSignedPercentItem( Which(), rIn ); } @@ -2103,7 +2103,7 @@ SfxPoolItem* SdrGrafRedItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafRedItem( *this ); } -SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafRedItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafRedItem( rIn ); } @@ -2119,7 +2119,7 @@ SfxPoolItem* SdrGrafGreenItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafGreenItem( *this ); } -SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafGreenItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafGreenItem( rIn ); } @@ -2135,7 +2135,7 @@ SfxPoolItem* SdrGrafBlueItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafBlueItem( *this ); } -SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafBlueItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafBlueItem( rIn ); } @@ -2151,7 +2151,7 @@ SfxPoolItem* SdrGrafLuminanceItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafLuminanceItem( *this ); } -SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafLuminanceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafLuminanceItem( rIn ); } @@ -2167,7 +2167,7 @@ SfxPoolItem* SdrGrafContrastItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafContrastItem( *this ); } -SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafContrastItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafContrastItem( rIn ); } @@ -2183,24 +2183,24 @@ SfxPoolItem* SdrGrafGamma100Item::Clone( SfxItemPool* /*pPool */) const return new SdrGrafGamma100Item( *this ); } -SfxPoolItem* SdrGrafGamma100Item::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafGamma100Item::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafGamma100Item( rIn ); } -bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool SdrGrafGamma100Item::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= ((double)GetValue()) / 100.0; return true; } -bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool SdrGrafGamma100Item::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { double nGamma = 0; if(!(rVal >>= nGamma)) return false; - SetValue( (UINT32)(nGamma * 100.0 ) ); + SetValue( (sal_uInt32)(nGamma * 100.0 ) ); return true; } @@ -2215,7 +2215,7 @@ SfxPoolItem* SdrGrafInvertItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafInvertItem( *this ); } -SfxPoolItem* SdrGrafInvertItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafInvertItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafInvertItem( rIn ); } @@ -2231,7 +2231,7 @@ SfxPoolItem* SdrGrafTransparenceItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafTransparenceItem( *this ); } -SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafTransparenceItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafTransparenceItem( rIn ); } @@ -2247,17 +2247,17 @@ SfxPoolItem* SdrGrafModeItem::Clone(SfxItemPool* /*pPool*/) const return new SdrGrafModeItem( *this ); } -SfxPoolItem* SdrGrafModeItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* SdrGrafModeItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new SdrGrafModeItem( rIn ); } -USHORT SdrGrafModeItem::GetValueCount() const +sal_uInt16 SdrGrafModeItem::GetValueCount() const { return 4; } -XubString SdrGrafModeItem::GetValueTextByPos(UINT16 nPos) const +XubString SdrGrafModeItem::GetValueTextByPos(sal_uInt16 nPos) const { XubString aStr; @@ -2292,7 +2292,7 @@ SfxItemPresentation SdrGrafModeItem::GetPresentation( SfxItemPresentation ePres, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/, XubString& rText, const IntlWrapper *) const { - rText = GetValueTextByPos( sal::static_int_cast< USHORT >( GetValue() ) ); + rText = GetValueTextByPos( sal::static_int_cast< sal_uInt16 >( GetValue() ) ); if( ePres == SFX_ITEM_PRESENTATION_COMPLETE ) { @@ -2317,12 +2317,12 @@ SfxPoolItem* SdrGrafCropItem::Clone( SfxItemPool* /*pPool*/) const return new SdrGrafCropItem( *this ); } -SfxPoolItem* SdrGrafCropItem::Create( SvStream& rIn, USHORT nVer ) const +SfxPoolItem* SdrGrafCropItem::Create( SvStream& rIn, sal_uInt16 nVer ) const { return( ( 0 == nVer ) ? Clone( NULL ) : SvxGrfCrop::Create( rIn, nVer ) ); } -USHORT SdrGrafCropItem::GetVersion( USHORT /*nFileVersion*/) const +sal_uInt16 SdrGrafCropItem::GetVersion( sal_uInt16 /*nFileVersion*/) const { // GRFCROP_VERSION_MOVETOSVX is 1 return GRFCROP_VERSION_MOVETOSVX; diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 352672d969..60e1e00768 100644..100755 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/svdcrtv.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/svdundo.hxx> #include <svx/svdocapt.hxx> // Spezialbehandlung: Nach dem Create transparente Fuellung #include <svx/svdoedge.hxx> @@ -46,7 +46,7 @@ #include <svx/svdopath.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include "fmobj.hxx" #include <svx/svdocirc.hxx> #include <svx/sdr/contact/viewcontact.hxx> @@ -215,11 +215,11 @@ void SdrCreateView::ImpClearVars() nAktIdent=OBJ_NONE; pAktCreate=NULL; pCreatePV=NULL; - bAutoTextEdit=FALSE; - b1stPointAsCenter=FALSE; + bAutoTextEdit=sal_False; + b1stPointAsCenter=sal_False; aAktCreatePointer=Pointer(POINTER_CROSS); - bUseIncompatiblePathCreateInterface=FALSE; - bAutoClosePolys=TRUE; + bUseIncompatiblePathCreateInterface=sal_False; + bAutoClosePolys=sal_True; nAutoCloseDistPix=5; nFreeHandMinDistPix=10; @@ -250,7 +250,7 @@ void SdrCreateView::ImpDelCreateAttr() { } -BOOL SdrCreateView::IsAction() const +sal_Bool SdrCreateView::IsAction() const { return SdrDragView::IsAction() || pAktCreate!=NULL; } @@ -297,22 +297,22 @@ void SdrCreateView::TakeActionRect(Rectangle& rRect) const } } -BOOL SdrCreateView::CheckEdgeMode() +sal_Bool SdrCreateView::CheckEdgeMode() { if (pAktCreate!=NULL) { // wird vom EdgeObj gemanaged - if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return FALSE; + if (nAktInvent==SdrInventor && nAktIdent==OBJ_EDGE) return sal_False; } if (!IsCreateMode() || nAktInvent!=SdrInventor || nAktIdent!=OBJ_EDGE) { ImpClearConnectMarker(); - return FALSE; + return sal_False; } else { - // TRUE heisst: MouseMove soll Connect checken + // sal_True heisst: MouseMove soll Connect checken return !IsAction(); } } @@ -345,7 +345,7 @@ void SdrCreateView::HideConnectMarker() ImpClearConnectMarker(); } -BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin) { if(CheckEdgeMode() && pWin) { @@ -355,7 +355,7 @@ BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin) { // Defaultete Hit-Toleranz bei IsMarkedHit() mal aendern !!!! Point aPos(pWin->PixelToLogic(rMEvt.GetPosPixel())); - BOOL bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos); + sal_Bool bMarkHit=PickHandle(aPos)!=NULL || IsMarkedObjHit(aPos); SdrObjConnection aCon; if (!bMarkHit) SdrEdgeObj::ImpFindConnector(aPos,*pPV,aCon,NULL,pWin); SetConnectMarker(aCon,*pPV); @@ -364,22 +364,22 @@ BOOL SdrCreateView::MouseMove(const MouseEvent& rMEvt, Window* pWin) return SdrDragView::MouseMove(rMEvt,pWin); } -BOOL SdrCreateView::IsTextTool() const +sal_Bool SdrCreateView::IsTextTool() const { return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_TEXT || nAktIdent==OBJ_TEXTEXT || nAktIdent==OBJ_TITLETEXT || nAktIdent==OBJ_OUTLINETEXT); } -BOOL SdrCreateView::IsEdgeTool() const +sal_Bool SdrCreateView::IsEdgeTool() const { return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_EDGE); } -BOOL SdrCreateView::IsMeasureTool() const +sal_Bool SdrCreateView::IsMeasureTool() const { return eEditMode==SDREDITMODE_CREATE && nAktInvent==SdrInventor && (nAktIdent==OBJ_MEASURE); } -void SdrCreateView::SetCurrentObj(UINT16 nIdent, UINT32 nInvent) +void SdrCreateView::SetCurrentObj(sal_uInt16 nIdent, sal_uInt32 nInvent) { if (nAktInvent!=nInvent || nAktIdent!=nIdent) { @@ -413,10 +413,10 @@ void SdrCreateView::SetCurrentObj(UINT16 nIdent, UINT32 nInvent) ImpSetGlueVisible3(IsEdgeTool()); } -BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& rPnt, OutputDevice* pOut, +sal_Bool SdrCreateView::ImpBegCreateObj(sal_uInt32 nInvent, sal_uInt16 nIdent, const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV, const Rectangle& rLogRect, SdrObject* pPreparedFactoryObject) { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; UnmarkAllObj(); BrkAction(); @@ -439,7 +439,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& aLay = aMeasureLayer; } - SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,TRUE); + SdrLayerID nLayer=pCreatePV->GetPage()->GetLayerAdmin().GetLayerID(aLay,sal_True); if (nLayer==SDRLAYER_NOTFOUND) nLayer=0; if (!pCreatePV->GetLockedLayers().IsSet(nLayer) && pCreatePV->GetVisibleLayers().IsSet(nLayer)) { @@ -462,9 +462,9 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& } Point aPnt(rPnt); - if (nAktInvent!=SdrInventor || (nAktIdent!=USHORT(OBJ_EDGE) && - nAktIdent!=USHORT(OBJ_FREELINE) && - nAktIdent!=USHORT(OBJ_FREEFILL) )) { // Kein Fang fuer Edge und Freihand! + if (nAktInvent!=SdrInventor || (nAktIdent!=sal_uInt16(OBJ_EDGE) && + nAktIdent!=sal_uInt16(OBJ_FREELINE) && + nAktIdent!=sal_uInt16(OBJ_FREEFILL) )) { // Kein Fang fuer Edge und Freihand! aPnt=GetSnapPos(aPnt,pCreatePV); } if (pAktCreate!=NULL) @@ -535,8 +535,8 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& pDragWin=pOut; if (pAktCreate->BegCreate(aDragStat)) { - ShowCreateObj(/*pOut,TRUE*/); - bRet=TRUE; + ShowCreateObj(/*pOut,sal_True*/); + bRet=sal_True; } else { @@ -550,7 +550,7 @@ BOOL SdrCreateView::ImpBegCreateObj(UINT32 nInvent, UINT16 nIdent, const Point& return bRet; } -BOOL SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV) +sal_Bool SdrCreateView::BegCreateObj(const Point& rPnt, OutputDevice* pOut, short nMinMov, SdrPageView* pPV) { return ImpBegCreateObj(nAktInvent,nAktIdent,rPnt,pOut,nMinMov,pPV,Rectangle(), 0L); } @@ -569,7 +569,7 @@ sal_Bool SdrCreateView::BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMi return ImpBegCreateObj(nInvent, nIdent, rPnt, 0L, nMinMov, 0L, Rectangle(), pPreparedFactoryObject); } -BOOL SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, +sal_Bool SdrCreateView::BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut, short nMinMov, SdrPageView* pPV) { return ImpBegCreateObj(SdrInventor,OBJ_CAPTION,rPnt,pOut,nMinMov,pPV, @@ -596,9 +596,9 @@ void SdrCreateView::MovCreateObj(const Point& rPnt) if(bDidLimit && IsOrtho()) { if(aDragStat.IsOrtho8Possible()) - OrthoDistance8(aDragStat.GetPrev(), aPnt, FALSE); + OrthoDistance8(aDragStat.GetPrev(), aPnt, sal_False); else if(aDragStat.IsOrtho4Possible()) - OrthoDistance4(aDragStat.GetPrev(), aPnt, FALSE); + OrthoDistance4(aDragStat.GetPrev(), aPnt, sal_False); } if (aPnt==aDragStat.GetNow()) return; @@ -620,24 +620,24 @@ void SdrCreateView::MovCreateObj(const Point& rPnt) } } -BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) +sal_Bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; SdrObject* pObjMerk=pAktCreate; SdrPageView* pPVMerk=pCreatePV; if (pAktCreate!=NULL) { - ULONG nAnz=aDragStat.GetPointAnz(); + sal_uIntPtr nAnz=aDragStat.GetPointAnz(); if (nAnz<=1 && eCmd==SDRCREATE_FORCEEND) { BrkCreateObj(); // Objekte mit nur einem Punkt gibt's nicht (zumindest noch nicht) - return FALSE; // FALSE=Event nicht ausgewertet + return sal_False; // sal_False=Event nicht ausgewertet } - BOOL bPntsEq=nAnz>1; - ULONG i=1; + sal_Bool bPntsEq=nAnz>1; + sal_uIntPtr i=1; Point aP0=aDragStat.GetPoint(0); while (bPntsEq && i<nAnz) { bPntsEq=aP0==aDragStat.GetPoint(i); i++; } @@ -662,7 +662,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) } else { - nLayer = rAd.GetLayerID(aAktLayer, TRUE); + nLayer = rAd.GetLayerID(aAktLayer, sal_True); } if(SDRLAYER_NOTFOUND == nLayer) @@ -673,7 +673,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) pObj->SetLayer(nLayer); // #83403# recognize creation of a new 3D object inside a 3D scene - BOOL bSceneIntoScene(FALSE); + sal_Bool bSceneIntoScene(sal_False); if(pObjMerk && pObjMerk->ISA(E3dScene) @@ -681,7 +681,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) && pCreatePV->GetAktGroup() && pCreatePV->GetAktGroup()->ISA(E3dScene)) { - BOOL bDidInsert = ((E3dView*)this)->ImpCloneAll3DObjectsToDestScene( + sal_Bool bDidInsert = ((E3dView*)this)->ImpCloneAll3DObjectsToDestScene( (E3dScene*)pObjMerk, (E3dScene*)pCreatePV->GetAktGroup(), Point(0, 0)); if(bDidInsert) @@ -689,8 +689,8 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) // delete object, it's content is cloned and inserted SdrObject::Free( pObjMerk ); pObjMerk = 0L; - bRet = FALSE; - bSceneIntoScene = TRUE; + bRet = sal_False; + bSceneIntoScene = sal_True; } } @@ -701,7 +701,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) } pCreatePV=NULL; - bRet=TRUE; // TRUE=Event ausgewertet + bRet=sal_True; // sal_True=Event ausgewertet } else { @@ -721,7 +721,7 @@ BOOL SdrCreateView::EndCreateObj(SdrCreateCmd eCmd) HideCreateObj(); ShowCreateObj(); aDragStat.ResetMinMoved(); // NextPoint gibt's bei MovCreateObj() - bRet=TRUE; + bRet=sal_True; } } if (bRet && pObjMerk!=NULL && IsTextEditAfterCreate()) @@ -772,7 +772,7 @@ void SdrCreateView::BrkCreateObj() } } -void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/) +void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, sal_Bool bFull*/) { if(IsCreateObj() && !aDragStat.IsShown()) { @@ -881,7 +881,7 @@ void SdrCreateView::ShowCreateObj(/*OutputDevice* pOut, BOOL bFull*/) } } - aDragStat.SetShown(TRUE); + aDragStat.SetShown(sal_True); } } @@ -894,19 +894,19 @@ void SdrCreateView::HideCreateObj() mpCreateViewExtraData->HideOverlay(); //DrawCreateObj(pOut,bFull); - aDragStat.SetShown(FALSE); + aDragStat.SetShown(sal_False); } } //////////////////////////////////////////////////////////////////////////////////////////////////// /* new interface src537 */ -BOOL SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const +sal_Bool SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const { if(pAktCreate) { rTargetSet.Put(pAktCreate->GetMergedItemSet()); - return TRUE; + return sal_True; } else { @@ -914,13 +914,13 @@ BOOL SdrCreateView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) co } } -BOOL SdrCreateView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) +sal_Bool SdrCreateView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) { if(pAktCreate) { pAktCreate->SetMergedItemSetAndBroadcast(rSet, bReplaceAll); - return TRUE; + return sal_True; } else { @@ -928,11 +928,11 @@ BOOL SdrCreateView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) } } -SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateView::GetStyleSheet(BOOL& rOk) const +SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateView::GetStyleSheet(sal_Bool& rOk) const { if (pAktCreate!=NULL) { - //rOk=TRUE; + //rOk=sal_True; return pAktCreate->GetStyleSheet(); } else @@ -941,12 +941,12 @@ SfxStyleSheet* SdrCreateView::GetStyleSheet() const // SfxStyleSheet* SdrCreateV } } -BOOL SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) +sal_Bool SdrCreateView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) { if (pAktCreate!=NULL) { pAktCreate->SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); - return TRUE; + return sal_True; } else { diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx index c64891bdf5..23c2fe84a5 100644..100755 --- a/svx/source/svdraw/svddrag.cxx +++ b/svx/source/svdraw/svddrag.cxx @@ -50,20 +50,20 @@ void SdrDragStat::Reset() { pView=NULL; pPageView=NULL; - bShown=FALSE; + bShown=sal_False; nMinMov=1; - bMinMoved=FALSE; - bHorFixed=FALSE; - bVerFixed=FALSE; - bWantNoSnap=FALSE; + bMinMoved=sal_False; + bHorFixed=sal_False; + bVerFixed=sal_False; + bWantNoSnap=sal_False; pHdl=NULL; - bOrtho4=FALSE; - bOrtho8=FALSE; + bOrtho4=sal_False; + bOrtho8=sal_False; pDragMethod=NULL; - bEndDragChangesAttributes=FALSE; - bEndDragChangesGeoAndAttributes=FALSE; - bMouseIsUp=FALSE; - Clear(TRUE); + bEndDragChangesAttributes=sal_False; + bEndDragChangesGeoAndAttributes=sal_False; + bMouseIsUp=sal_False; + Clear(sal_True); aActionRect=Rectangle(); } @@ -115,7 +115,7 @@ bool SdrDragStat::CheckMinMoved(const Point& rPnt) long dx=rPnt.X()-GetPrev().X(); if (dx<0) dx=-dx; long dy=rPnt.Y()-GetPrev().Y(); if (dy<0) dy=-dy; if (dx>=long(nMinMov) || dy>=long(nMinMov)) - bMinMoved=TRUE; + bMinMoved=sal_True; } return bMinMoved; } diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx index f0d2ea7790..f0d2ea7790 100644..100755 --- a/svx/source/svdraw/svddrgm1.hxx +++ b/svx/source/svdraw/svddrgm1.hxx diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 6276dcbb4a..60c8d4eda0 100644..100755 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -38,7 +38,7 @@ #include <tools/bigint.hxx> #include <vcl/svapp.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xpoly.hxx> #include <svx/svdetc.hxx> #include <svx/svdtrans.hxx> @@ -46,8 +46,8 @@ #include <svx/svdmark.hxx> #include <svx/svdocapt.hxx> #include <svx/svdpagv.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svddrgv.hxx> #include <svx/svdundo.hxx> #include <svx/svdograf.hxx> @@ -60,7 +60,7 @@ #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdr/overlay/overlayrollingrectangle.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> @@ -69,7 +69,7 @@ #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <svx/sdr/contact/objectcontact.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdopath.hxx> #include <svx/polypolygoneditor.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> @@ -903,6 +903,9 @@ void SdrDragMovHdl::TakeSdrDragComment(XubString& rStr) const bool SdrDragMovHdl::BeginSdrDrag() { + if( !GetDragHdl() ) + return false; + DragStat().Ref1()=GetDragHdl()->GetPos(); DragStat().SetShown(!DragStat().IsShown()); SdrHdlKind eKind=GetDragHdl()->GetKind(); @@ -932,7 +935,7 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt) { Point aPnt(rNoSnapPnt); - if (DragStat().CheckMinMoved(rNoSnapPnt)) + if ( GetDragHdl() && DragStat().CheckMinMoved(rNoSnapPnt)) { if (GetDragHdl()->GetKind()==HDL_MIRX) { @@ -1043,22 +1046,25 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt) bool SdrDragMovHdl::EndSdrDrag(bool /*bCopy*/) { - switch (GetDragHdl()->GetKind()) + if( GetDragHdl() ) { - case HDL_REF1: - Ref1()=DragStat().GetNow(); - break; + switch (GetDragHdl()->GetKind()) + { + case HDL_REF1: + Ref1()=DragStat().GetNow(); + break; - case HDL_REF2: - Ref2()=DragStat().GetNow(); - break; + case HDL_REF2: + Ref2()=DragStat().GetNow(); + break; - case HDL_MIRX: - Ref1()+=DragStat().GetNow()-DragStat().GetStart(); - Ref2()+=DragStat().GetNow()-DragStat().GetStart(); - break; + case HDL_MIRX: + Ref1()+=DragStat().GetNow()-DragStat().GetStart(); + Ref2()+=DragStat().GetNow()-DragStat().GetStart(); + break; - default: break; + default: break; + } } return true; @@ -1067,7 +1073,11 @@ bool SdrDragMovHdl::EndSdrDrag(bool /*bCopy*/) void SdrDragMovHdl::CancelSdrDrag() { Hide(); - GetDragHdl()->SetPos(DragStat().GetRef1()); + + SdrHdl* pHdl = GetDragHdl(); + if( pHdl ) + pHdl->SetPos(DragStat().GetRef1()); + SdrHdl* pHM = GetHdlList().GetHdl(HDL_MIRX); if(pHM) @@ -1576,13 +1586,13 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_) { // Klebepunkte aufs BoundRect des Obj limitieren aPt1-=DragStat().GetStart(); const SdrMarkList& rML=GetMarkedObjectList(); - ULONG nMarkAnz=rML.GetMarkCount(); + sal_uLong nMarkAnz=rML.GetMarkCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) + for (sal_uLong nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=rML.GetMark(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); + sal_uLong nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); if (nPtAnz!=0) { @@ -1590,7 +1600,7 @@ void SdrDragMove::MoveSdrDrag(const Point& rNoSnapPnt_) const SdrGluePointList* pGPL=pObj->GetGluePointList(); Rectangle aBound(pObj->GetCurrentBoundRect()); - for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) + for (sal_uLong nPtNum=0; nPtNum<nPtAnz; nPtNum++) { sal_uInt16 nId=pPts->GetObject(nPtNum); sal_uInt16 nGlueNum=pGPL->FindGluePoint(nId); @@ -1679,12 +1689,12 @@ void SdrDragResize::TakeSdrDragComment(XubString& rStr) const Fraction aFact1(1,1); Point aStart(DragStat().GetStart()); Point aRef(DragStat().GetRef1()); - INT32 nXDiv(aStart.X() - aRef.X()); + sal_Int32 nXDiv(aStart.X() - aRef.X()); if(!nXDiv) nXDiv = 1; - INT32 nYDiv(aStart.Y() - aRef.Y()); + sal_Int32 nYDiv(aStart.Y() - aRef.Y()); if(!nYDiv) nYDiv = 1; @@ -2021,7 +2031,7 @@ void SdrDragRotate::TakeSdrDragComment(XubString& rStr) const ImpTakeDescriptionStr(STR_DragMethRotate, rStr); rStr.AppendAscii(" ("); XubString aStr; - INT32 nTmpWink(NormAngle360(nWink)); + sal_Int32 nTmpWink(NormAngle360(nWink)); if(bRight && nWink) { @@ -2157,7 +2167,7 @@ void SdrDragShear::TakeSdrDragComment(XubString& rStr) const ImpTakeDescriptionStr(STR_DragMethShear, rStr); rStr.AppendAscii(" ("); - INT32 nTmpWink(nWink); + sal_Int32 nTmpWink(nWink); if(bUpSideDown) nTmpWink += 18000; @@ -2749,7 +2759,7 @@ void SdrDragCrook::TakeSdrDragComment(XubString& rStr) const rStr.AppendAscii(" ("); XubString aStr; - INT32 nVal(nWink); + sal_Int32 nVal(nWink); if(bAtCenter) nVal *= 2; @@ -3344,9 +3354,9 @@ bool SdrDragCrook::EndSdrDrag(bool bCopy) if (bCopy) getSdrDragView().CopyMarkedObj(); - ULONG nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount(); + sal_uLong nMarkAnz=getSdrDragView().GetMarkedObjectList().GetMarkCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + for (sal_uLong nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=getSdrDragView().GetMarkedObjectList().GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj(); diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index a6b090eb2d..40f13df9aa 100644..100755 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/svddrgv.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xpoly.hxx> #include <svx/svdetc.hxx> #include <svx/svdtrans.hxx> @@ -39,12 +39,12 @@ #include <svx/svdpagv.hxx> #include <svx/svdopath.hxx> #include <svx/svdoedge.hxx> -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include "svddrgm1.hxx" #include <svx/obj3d.hxx> #include <svx/svdoashp.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/polypolygoneditor.hxx> @@ -69,34 +69,34 @@ using namespace sdr; void SdrDragView::ImpClearVars() { - bFramDrag=FALSE; + bFramDrag=sal_False; eDragMode=SDRDRAG_MOVE; - bDragLimit=FALSE; - bMarkedHitMovesAlways=FALSE; + bDragLimit=sal_False; + bMarkedHitMovesAlways=sal_False; eDragHdl=HDL_MOVE; pDragHdl=NULL; - bDragHdl=FALSE; - bDragSpecial=FALSE; + bDragHdl=sal_False; + bDragSpecial=sal_False; mpCurrentSdrDragMethod=NULL; - bDragStripes=FALSE; - bMirrRefDragObj=TRUE; - bDragWithCopy=FALSE; + bDragStripes=sal_False; + bMirrRefDragObj=sal_True; + bDragWithCopy=sal_False; pInsPointUndo=NULL; - bInsGluePoint=FALSE; - bInsObjPointMode=FALSE; - bInsGluePointMode=FALSE; + bInsGluePoint=sal_False; + bInsObjPointMode=sal_False; + bInsGluePointMode=sal_False; nDragXorPolyLimit=100; nDragXorPointLimit=500; - bNoDragXorPolys=FALSE; - bAutoVertexCon=TRUE; - bAutoCornerCon=FALSE; - bRubberEdgeDragging=TRUE; + bNoDragXorPolys=sal_False; + bAutoVertexCon=sal_True; + bAutoCornerCon=sal_False; + bRubberEdgeDragging=sal_True; nRubberEdgeDraggingLimit=100; - bDetailedEdgeDragging=TRUE; + bDetailedEdgeDragging=sal_True; nDetailedEdgeDraggingLimit=10; - bResizeAtCenter=FALSE; - bCrookAtCenter=FALSE; - bMouseHideWhileDraggingPoints=FALSE; + bResizeAtCenter=sal_False; + bCrookAtCenter=sal_False; + bMouseHideWhileDraggingPoints=sal_False; // init using default mbSolidDragging = getOptionsDrawinglayer().IsSolidDragCreate(); @@ -123,7 +123,7 @@ void SdrDragView::ImpDelDragAttr() { } -BOOL SdrDragView::IsAction() const +sal_Bool SdrDragView::IsAction() const { return (mpCurrentSdrDragMethod || SdrExchangeView::IsAction()); } @@ -141,7 +141,7 @@ void SdrDragView::EndAction() { if (mpCurrentSdrDragMethod) { - EndDragObj(FALSE); + EndDragObj(sal_False); } SdrExchangeView::EndAction(); } @@ -187,7 +187,7 @@ void SdrDragView::TakeActionRect(Rectangle& rRect) const } } -BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const +sal_Bool SdrDragView::TakeDragObjAnchorPos(Point& rPos, sal_Bool bTR ) const { Rectangle aR; TakeActionRect(aR); @@ -200,8 +200,8 @@ BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const if (pObj->ISA(SdrCaptionObj)) { Point aPt(((SdrCaptionObj*)pObj)->GetTailPos()); - BOOL bTail=eDragHdl==HDL_POLY; // Schwanz wird gedraggt (nicht so ganz feine Abfrage hier) - BOOL bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // Objektspeziefisch + sal_Bool bTail=eDragHdl==HDL_POLY; // Schwanz wird gedraggt (nicht so ganz feine Abfrage hier) + sal_Bool bOwn=mpCurrentSdrDragMethod->ISA(SdrDragObjOwn); // Objektspeziefisch if (!bTail) { // bei bTail liefert TakeActionRect schon das richtige if (bOwn) @@ -217,30 +217,30 @@ BOOL SdrDragView::TakeDragObjAnchorPos(Point& rPos, BOOL bTR ) const } } } - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const +sal_Bool SdrDragView::TakeDragLimit(SdrDragMode /*eMode*/, Rectangle& /*rRect*/) const { - return FALSE; + return sal_False; } -BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth) +sal_Bool SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl, short nMinMov, SdrDragMethod* pForcedMeth) { BrkAction(); bool bRet=false; { - SetDragWithCopy(FALSE); + SetDragWithCopy(sal_False); //ForceEdgesOfMarkedNodes(); //TODO: aAni.Reset(); mpCurrentSdrDragMethod=NULL; - bDragSpecial=FALSE; - bDragLimit=FALSE; + bDragSpecial=sal_False; + bDragLimit=sal_False; SdrDragMode eTmpMode=eDragMode; if (eTmpMode==SDRDRAG_MOVE && pHdl!=NULL && pHdl->GetKind()!=HDL_MOVE) { eTmpMode=SDRDRAG_RESIZE; @@ -250,7 +250,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl if (!bFramDrag && (pMarkedObj==NULL || !pMarkedObj->hasSpecialDrag()) && (pHdl==NULL || pHdl->GetObj()==NULL)) { - bFramDrag=TRUE; + bFramDrag=sal_True; } Point aPnt(rPnt); @@ -278,7 +278,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl bDragHdl=eDragHdl==HDL_REF1 || eDragHdl==HDL_REF2 || eDragHdl==HDL_MIRX; // #103894# Expand test for HDL_ANCHOR_TR - BOOL bNotDraggable = (HDL_ANCHOR == eDragHdl || HDL_ANCHOR_TR == eDragHdl); + sal_Bool bNotDraggable = (HDL_ANCHOR == eDragHdl || HDL_ANCHOR_TR == eDragHdl); if(pHdl && (pHdl->GetKind() == HDL_SMARTTAG) && pForcedMeth ) { @@ -300,18 +300,18 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl case HDL_UPPER: case HDL_LOWER: { // Sind 3D-Objekte selektiert? - BOOL b3DObjSelected = FALSE; - for(UINT32 a=0;!b3DObjSelected && a<GetMarkedObjectCount();a++) + sal_Bool b3DObjSelected = sal_False; + for(sal_uInt32 a=0;!b3DObjSelected && a<GetMarkedObjectCount();a++) { SdrObject* pObj = GetMarkedObjectByIndex(a); if(pObj && pObj->ISA(E3dObject)) - b3DObjSelected = TRUE; + b3DObjSelected = sal_True; } // Falls ja, Shear auch bei !IsShearAllowed zulassen, // da es sich bei 3D-Objekten um eingeschraenkte // Rotationen handelt if (!b3DObjSelected && !IsShearAllowed()) - return FALSE; + return sal_False; mpCurrentSdrDragMethod = new SdrDragShear(*this,eDragMode==SDRDRAG_ROTATE); } break; case HDL_UPLFT: case HDL_UPRGT: @@ -319,12 +319,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl { if (eDragMode==SDRDRAG_SHEAR || eDragMode==SDRDRAG_DISTORT) { - if (!IsDistortAllowed(TRUE) && !IsDistortAllowed(FALSE)) return FALSE; + if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return sal_False; mpCurrentSdrDragMethod = new SdrDragDistort(*this); } else { - if (!IsRotateAllowed(TRUE)) return FALSE; + if (!IsRotateAllowed(sal_True)) return sal_False; mpCurrentSdrDragMethod = new SdrDragRotate(*this); } } break; @@ -332,12 +332,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl { if (IsMarkedHitMovesAlways() && eDragHdl==HDL_MOVE) { // HDL_MOVE ist auch wenn Obj direkt getroffen - if (!IsMoveAllowed()) return FALSE; + if (!IsMoveAllowed()) return sal_False; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { - if (!IsRotateAllowed(TRUE)) return FALSE; + if (!IsRotateAllowed(sal_True)) return sal_False; mpCurrentSdrDragMethod = new SdrDragRotate(*this); } } @@ -347,12 +347,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl { if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways()) { - if (!IsMoveAllowed()) return FALSE; + if (!IsMoveAllowed()) return sal_False; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { - if (!IsMirrorAllowed(TRUE,TRUE)) return FALSE; + if (!IsMirrorAllowed(sal_True,sal_True)) return sal_False; mpCurrentSdrDragMethod = new SdrDragMirror(*this); } } break; @@ -362,13 +362,13 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways()) { if (!IsMoveAllowed()) - return FALSE; + return sal_False; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { - if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE)) - return FALSE; + if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) + return sal_False; mpCurrentSdrDragMethod = new SdrDragCrop(*this); } } @@ -379,15 +379,15 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways()) { if(!IsMoveAllowed()) - return FALSE; + return sal_False; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { if(!IsTransparenceAllowed()) - return FALSE; + return sal_False; - mpCurrentSdrDragMethod = new SdrDragGradient(*this, FALSE); + mpCurrentSdrDragMethod = new SdrDragGradient(*this, sal_False); } break; } @@ -396,13 +396,13 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl if(eDragHdl == HDL_MOVE && IsMarkedHitMovesAlways()) { if(!IsMoveAllowed()) - return FALSE; + return sal_False; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { if(!IsGradientAllowed()) - return FALSE; + return sal_False; mpCurrentSdrDragMethod = new SdrDragGradient(*this); } @@ -413,12 +413,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl { if (eDragHdl==HDL_MOVE && IsMarkedHitMovesAlways()) { - if (!IsMoveAllowed()) return FALSE; + if (!IsMoveAllowed()) return sal_False; mpCurrentSdrDragMethod = new SdrDragMove(*this); } else { - if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE)) return FALSE; + if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return sal_False; mpCurrentSdrDragMethod = new SdrDragCrook(*this); } } break; @@ -428,7 +428,7 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl // SDRDRAG_MOVE if((eDragHdl == HDL_MOVE) && !IsMoveAllowed()) { - return FALSE; + return sal_False; } else if(eDragHdl == HDL_GLUE) { @@ -444,9 +444,9 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl } else { - if(!IsResizeAllowed(TRUE)) + if(!IsResizeAllowed(sal_True)) { - return FALSE; + return sal_False; } sal_Bool bSingleTextObjMark = sal_False; // SJ: #i100490# @@ -489,14 +489,14 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl { // #i77187# // do not allow move of polygon points if object is move or size protected - return FALSE; + return sal_False; } } if(!mpCurrentSdrDragMethod) { // fallback to DragSpecial if no interaction defined - bDragSpecial = TRUE; + bDragSpecial = sal_True; mpCurrentSdrDragMethod = new SdrDragObjOwn(*this); } } @@ -520,12 +520,12 @@ BOOL SdrDragView::BegDragObj(const Point& rPnt, OutputDevice* pOut, SdrHdl* pHdl // Aha, Obj kann nicht Move SpecialDrag, also MoveFrameDrag versuchen delete mpCurrentSdrDragMethod; mpCurrentSdrDragMethod = 0; - bDragSpecial=FALSE; + bDragSpecial=sal_False; if (!IsMoveAllowed()) - return FALSE; + return sal_False; - bFramDrag=TRUE; + bFramDrag=sal_True; mpCurrentSdrDragMethod = new SdrDragMove(*this); aDragStat.SetDragMethod(mpCurrentSdrDragMethod); bRet = mpCurrentSdrDragMethod->BeginSdrDrag(); @@ -553,14 +553,14 @@ void SdrDragView::MovDragObj(const Point& rPnt) } } -BOOL SdrDragView::EndDragObj(BOOL bCopy) +sal_Bool SdrDragView::EndDragObj(sal_Bool bCopy) { bool bRet(false); // #i73341# If insert GluePoint, do not insist on last points being different if(mpCurrentSdrDragMethod && aDragStat.IsMinMoved() && (IsInsertGluePoint() || aDragStat.GetNow() != aDragStat.GetPrev())) { - ULONG nHdlAnzMerk=0; + sal_uIntPtr nHdlAnzMerk=0; if (bEliminatePolyPoints) { // IBM Special @@ -593,7 +593,7 @@ BOOL SdrDragView::EndDragObj(BOOL bCopy) if (bInsPolyPoint) { SetMarkHandles(); - bInsPolyPoint=FALSE; + bInsPolyPoint=sal_False; if( bUndo ) { BegUndo(aInsPointUndoStr); @@ -619,8 +619,8 @@ BOOL SdrDragView::EndDragObj(BOOL bCopy) BrkDragObj(); } - bInsPolyPoint=FALSE; - SetInsertGluePoint(FALSE); + bInsPolyPoint=sal_False; + SetInsertGluePoint(sal_False); return bRet; } @@ -640,7 +640,7 @@ void SdrDragView::BrkDragObj() delete pInsPointUndo; pInsPointUndo=NULL; SetMarkHandles(); - bInsPolyPoint=FALSE; + bInsPolyPoint=sal_False; } if (IsInsertGluePoint()) @@ -648,7 +648,7 @@ void SdrDragView::BrkDragObj() pInsPointUndo->Undo(); // Den eingefuegten Klebepunkt wieder raus delete pInsPointUndo; pInsPointUndo=NULL; - SetInsertGluePoint(FALSE); + SetInsertGluePoint(sal_False); } eDragHdl=HDL_MOVE; @@ -656,7 +656,7 @@ void SdrDragView::BrkDragObj() } } -BOOL SdrDragView::IsInsObjPointPossible() const +sal_Bool SdrDragView::IsInsObjPointPossible() const { return pMarkedObj!=NULL && pMarkedObj->IsPolyObj(); } @@ -732,51 +732,51 @@ sal_Bool SdrDragView::ImpBegInsObjPoint(sal_Bool bIdxZwang, sal_uInt32 nIdx, con return bRet; } -BOOL SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd) +sal_Bool SdrDragView::EndInsObjPoint(SdrCreateCmd eCmd) { if(IsInsObjPoint()) { sal_uInt32 nNextPnt(mnInsPointNum); Point aPnt(aDragStat.GetNow()); - BOOL bOk=EndDragObj(FALSE); - if (bOk==TRUE && eCmd!=SDRCREATE_FORCEEND) + sal_Bool bOk=EndDragObj(sal_False); + if (bOk==sal_True && eCmd!=SDRCREATE_FORCEEND) { // Ret=True bedeutet: Action ist vorbei. bOk=!(ImpBegInsObjPoint(sal_True, nNextPnt, aPnt, eCmd == SDRCREATE_NEXTOBJECT, pDragWin)); } return bOk; - } else return FALSE; + } else return sal_False; } -BOOL SdrDragView::IsInsGluePointPossible() const +sal_Bool SdrDragView::IsInsGluePointPossible() const { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; if (IsInsGluePointMode() && AreObjectsMarked()) { if (GetMarkedObjectCount()==1) { - // FALSE liefern, wenn 1 Objekt und dieses ein Verbinder ist. + // sal_False liefern, wenn 1 Objekt und dieses ein Verbinder ist. const SdrObject* pObj=GetMarkedObjectByIndex(0); if (!HAS_BASE(SdrEdgeObj,pObj)) { - bRet=TRUE; + bRet=sal_True; } } else { - bRet=TRUE; + bRet=sal_True; } } return bRet; } -BOOL SdrDragView::BegInsGluePoint(const Point& rPnt) +sal_Bool SdrDragView::BegInsGluePoint(const Point& rPnt) { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; SdrObject* pObj; SdrPageView* pPV; - ULONG nMarkNum; + sal_uIntPtr nMarkNum; if (PickMarkedObj(rPnt,pObj,pPV,&nMarkNum,SDRSEARCH_PASS2BOUND)) { BrkAction(); @@ -792,9 +792,9 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt) SdrGluePointList* pGPL=pObj->ForceGluePointList(); if (pGPL!=NULL) { - USHORT nGlueIdx=pGPL->Insert(SdrGluePoint()); + sal_uInt16 nGlueIdx=pGPL->Insert(SdrGluePoint()); SdrGluePoint& rGP=(*pGPL)[nGlueIdx]; - USHORT nGlueId=rGP.GetId(); + sal_uInt16 nGlueId=rGP.GetId(); rGP.SetAbsolutePos(rPnt,*pObj); SdrHdl* pHdl=NULL; @@ -804,7 +804,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt) } if (pHdl!=NULL && pHdl->GetKind()==HDL_GLUE && pHdl->GetObj()==pObj && pHdl->GetObjHdlNum()==nGlueId) { - SetInsertGluePoint(TRUE); + SetInsertGluePoint(sal_True); bRet=BegDragObj(rPnt,NULL,pHdl,0); if (bRet) { @@ -813,7 +813,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt) } else { - SetInsertGluePoint(FALSE); + SetInsertGluePoint(sal_False); delete pInsPointUndo; pInsPointUndo=NULL; } @@ -826,7 +826,7 @@ BOOL SdrDragView::BegInsGluePoint(const Point& rPnt) else { // Keine Klebepunkte moeglich bei diesem Objekt (z.B. Edge) - SetInsertGluePoint(FALSE); + SetInsertGluePoint(sal_False); delete pInsPointUndo; pInsPointUndo=NULL; } @@ -853,7 +853,7 @@ void SdrDragView::ShowDragObj() } } - aDragStat.SetShown(TRUE); + aDragStat.SetShown(sal_True); } } @@ -862,13 +862,13 @@ void SdrDragView::HideDragObj() if(mpCurrentSdrDragMethod && aDragStat.IsShown()) { mpCurrentSdrDragMethod->destroyOverlayGeometry(); - aDragStat.SetShown(FALSE); + aDragStat.SetShown(sal_False); } } //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrDragView::SetNoDragXorPolys(BOOL bOn) +void SdrDragView::SetNoDragXorPolys(sal_Bool bOn) { if (IsNoDragXorPolys()!=bOn) { @@ -895,7 +895,7 @@ void SdrDragView::SetNoDragXorPolys(BOOL bOn) } } -void SdrDragView::SetDragStripes(BOOL bOn) +void SdrDragView::SetDragStripes(sal_Bool bOn) { if (mpCurrentSdrDragMethod && aDragStat.IsShown()) { @@ -909,24 +909,24 @@ void SdrDragView::SetDragStripes(BOOL bOn) } } -BOOL SdrDragView::IsOrthoDesired() const +sal_Bool SdrDragView::IsOrthoDesired() const { if(mpCurrentSdrDragMethod && (IS_TYPE(SdrDragObjOwn, mpCurrentSdrDragMethod) || IS_TYPE(SdrDragResize, mpCurrentSdrDragMethod))) { return bOrthoDesiredOnMarked; } - return FALSE; + return sal_False; } //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrDragView::SetRubberEdgeDragging(BOOL bOn) +void SdrDragView::SetRubberEdgeDragging(sal_Bool bOn) { if (bOn!=IsRubberEdgeDragging()) { - ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); - BOOL bShowHide=nAnz!=0 && IsDragObj() && + sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); + sal_Bool bShowHide=nAnz!=0 && IsDragObj() && (nRubberEdgeDraggingLimit>=nAnz); if (bShowHide) HideDragObj(); @@ -936,12 +936,12 @@ void SdrDragView::SetRubberEdgeDragging(BOOL bOn) } } -void SdrDragView::SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz) +void SdrDragView::SetRubberEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz) { if (nEdgeObjAnz!=nRubberEdgeDraggingLimit) { - ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); - BOOL bShowHide=IsRubberEdgeDragging() && nAnz!=0 && IsDragObj() && + sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); + sal_Bool bShowHide=IsRubberEdgeDragging() && nAnz!=0 && IsDragObj() && (nEdgeObjAnz>=nAnz)!=(nRubberEdgeDraggingLimit>=nAnz); if (bShowHide) HideDragObj(); @@ -951,12 +951,12 @@ void SdrDragView::SetRubberEdgeDraggingLimit(USHORT nEdgeObjAnz) } } -void SdrDragView::SetDetailedEdgeDragging(BOOL bOn) +void SdrDragView::SetDetailedEdgeDragging(sal_Bool bOn) { if (bOn!=IsDetailedEdgeDragging()) { - ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); - BOOL bShowHide=nAnz!=0 && IsDragObj() && + sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); + sal_Bool bShowHide=nAnz!=0 && IsDragObj() && (nDetailedEdgeDraggingLimit>=nAnz); if (bShowHide) HideDragObj(); @@ -966,12 +966,12 @@ void SdrDragView::SetDetailedEdgeDragging(BOOL bOn) } } -void SdrDragView::SetDetailedEdgeDraggingLimit(USHORT nEdgeObjAnz) +void SdrDragView::SetDetailedEdgeDraggingLimit(sal_uInt16 nEdgeObjAnz) { if (nEdgeObjAnz!=nDetailedEdgeDraggingLimit) { - ULONG nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); - BOOL bShowHide=IsDetailedEdgeDragging() && nAnz!=0 && IsDragObj() && + sal_uIntPtr nAnz = GetEdgesOfMarkedNodes().GetMarkCount(); + sal_Bool bShowHide=IsDetailedEdgeDragging() && nAnz!=0 && IsDragObj() && (nEdgeObjAnz>=nAnz)!=(nDetailedEdgeDraggingLimit>=nAnz); if (bShowHide) HideDragObj(); diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 66e5f36b21..10716edbd5 100644..100755 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -41,8 +41,8 @@ #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> #include <svx/svdpoev.hxx> // fuer die PolyPossiblities -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/e3dsceneupdater.hxx> // #i13033# @@ -64,55 +64,55 @@ void SdrEditView::ImpResetPossibilityFlags() { - bReadOnly =FALSE; - - bGroupPossible =FALSE; - bUnGroupPossible =FALSE; - bGrpEnterPossible =FALSE; - bDeletePossible =FALSE; - bToTopPossible =FALSE; - bToBtmPossible =FALSE; - bReverseOrderPossible =FALSE; - - bImportMtfPossible =FALSE; - bCombinePossible =FALSE; - bDismantlePossible =FALSE; - bCombineNoPolyPolyPossible =FALSE; - bDismantleMakeLinesPossible=FALSE; - bOrthoDesiredOnMarked =FALSE; - - bMoreThanOneNotMovable =FALSE; - bOneOrMoreMovable =FALSE; - bMoreThanOneNoMovRot =FALSE; - bContortionPossible =FALSE; - bAllPolys =FALSE; - bOneOrMorePolys =FALSE; - bMoveAllowed =FALSE; - bResizeFreeAllowed =FALSE; - bResizePropAllowed =FALSE; - bRotateFreeAllowed =FALSE; - bRotate90Allowed =FALSE; - bMirrorFreeAllowed =FALSE; - bMirror45Allowed =FALSE; - bMirror90Allowed =FALSE; - bTransparenceAllowed =FALSE; - bGradientAllowed =FALSE; - bShearAllowed =FALSE; - bEdgeRadiusAllowed =FALSE; - bCanConvToPath =FALSE; - bCanConvToPoly =FALSE; - bCanConvToContour =FALSE; - bCanConvToPathLineToArea=FALSE; - bCanConvToPolyLineToArea=FALSE; - bMoveProtect =FALSE; - bResizeProtect =FALSE; + bReadOnly =sal_False; + + bGroupPossible =sal_False; + bUnGroupPossible =sal_False; + bGrpEnterPossible =sal_False; + bDeletePossible =sal_False; + bToTopPossible =sal_False; + bToBtmPossible =sal_False; + bReverseOrderPossible =sal_False; + + bImportMtfPossible =sal_False; + bCombinePossible =sal_False; + bDismantlePossible =sal_False; + bCombineNoPolyPolyPossible =sal_False; + bDismantleMakeLinesPossible=sal_False; + bOrthoDesiredOnMarked =sal_False; + + bMoreThanOneNotMovable =sal_False; + bOneOrMoreMovable =sal_False; + bMoreThanOneNoMovRot =sal_False; + bContortionPossible =sal_False; + bAllPolys =sal_False; + bOneOrMorePolys =sal_False; + bMoveAllowed =sal_False; + bResizeFreeAllowed =sal_False; + bResizePropAllowed =sal_False; + bRotateFreeAllowed =sal_False; + bRotate90Allowed =sal_False; + bMirrorFreeAllowed =sal_False; + bMirror45Allowed =sal_False; + bMirror90Allowed =sal_False; + bTransparenceAllowed =sal_False; + bGradientAllowed =sal_False; + bShearAllowed =sal_False; + bEdgeRadiusAllowed =sal_False; + bCanConvToPath =sal_False; + bCanConvToPoly =sal_False; + bCanConvToContour =sal_False; + bCanConvToPathLineToArea=sal_False; + bCanConvToPolyLineToArea=sal_False; + bMoveProtect =sal_False; + bResizeProtect =sal_False; } void SdrEditView::ImpClearVars() { ImpResetPossibilityFlags(); - bPossibilitiesDirty=TRUE; // << war von Purify angemeckert - bBundleVirtObj=FALSE; + bPossibilitiesDirty=sal_True; // << war von Purify angemeckert + bBundleVirtObj=sal_False; } SdrEditView::SdrEditView(SdrModel* pModel1, OutputDevice* pOut): @@ -127,10 +127,10 @@ SdrEditView::~SdrEditView() //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, USHORT nPos) +SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, sal_uInt16 nPos) { SdrLayerAdmin& rLA=pMod->GetLayerAdmin(); - USHORT nMax=rLA.GetLayerCount(); + sal_uInt16 nMax=rLA.GetLayerCount(); if (nPos>nMax) nPos=nMax; SdrLayer* pNewLayer=rLA.NewLayer(rName,nPos); @@ -144,7 +144,7 @@ SdrLayer* SdrEditView::InsertNewLayer(const XubString& rName, USHORT nPos) #include <svx/svdogrp.hxx> #include <svx/scene3d.hxx> -BOOL SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const +sal_Bool SdrEditView::ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const { sal_Bool bDelAll(sal_True); sal_uInt32 nObjAnz(pOL->GetObjCount()); @@ -225,7 +225,7 @@ void SdrEditView::ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID) void SdrEditView::DeleteLayer(const XubString& rName) { SdrLayerAdmin& rLA = pMod->GetLayerAdmin(); - SdrLayer* pLayer = rLA.GetLayer(rName, TRUE); + SdrLayer* pLayer = rLA.GetLayer(rName, sal_True); sal_uInt16 nLayerNum(rLA.GetLayerPos(pLayer)); if(SDRLAYER_NOTFOUND != nLayerNum) @@ -307,11 +307,11 @@ void SdrEditView::DeleteLayer(const XubString& rName) } } -void SdrEditView::MoveLayer(const XubString& rName, USHORT nNewPos) +void SdrEditView::MoveLayer(const XubString& rName, sal_uInt16 nNewPos) { SdrLayerAdmin& rLA=pMod->GetLayerAdmin(); - SdrLayer* pLayer=rLA.GetLayer(rName,TRUE); - USHORT nLayerNum=rLA.GetLayerPos(pLayer); + SdrLayer* pLayer=rLA.GetLayer(rName,sal_True); + sal_uInt16 nLayerNum=rLA.GetLayerPos(pLayer); if (nLayerNum!=SDRLAYER_NOTFOUND) { if( IsUndoEnabled() ) @@ -383,8 +383,8 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes() } } - ULONG nMarkedEdgeAnz = GetMarkedEdgesOfMarkedNodes().GetMarkCount(); - USHORT i; + sal_uIntPtr nMarkedEdgeAnz = GetMarkedEdgesOfMarkedNodes().GetMarkCount(); + sal_uInt16 i; for (i=0; i<nMarkedEdgeAnz; i++) { SdrMark* pEM = GetMarkedEdgesOfMarkedNodes().GetMark(i); @@ -409,95 +409,95 @@ void SdrEditView::ImpBroadcastEdgesOfMarkedNodes() void SdrEditView::MarkListHasChanged() { SdrMarkView::MarkListHasChanged(); - bPossibilitiesDirty=TRUE; + bPossibilitiesDirty=sal_True; } void SdrEditView::ModelHasChanged() { SdrMarkView::ModelHasChanged(); - bPossibilitiesDirty=TRUE; + bPossibilitiesDirty=sal_True; } -BOOL SdrEditView::IsResizeAllowed(BOOL bProp) const +sal_Bool SdrEditView::IsResizeAllowed(sal_Bool bProp) const { ForcePossibilities(); - if (bResizeProtect) return FALSE; + if (bResizeProtect) return sal_False; if (bProp) return bResizePropAllowed; return bResizeFreeAllowed; } -BOOL SdrEditView::IsRotateAllowed(BOOL b90Deg) const +sal_Bool SdrEditView::IsRotateAllowed(sal_Bool b90Deg) const { ForcePossibilities(); - if (bMoveProtect) return FALSE; + if (bMoveProtect) return sal_False; if (b90Deg) return bRotate90Allowed; return bRotateFreeAllowed; } -BOOL SdrEditView::IsMirrorAllowed(BOOL b45Deg, BOOL b90Deg) const +sal_Bool SdrEditView::IsMirrorAllowed(sal_Bool b45Deg, sal_Bool b90Deg) const { ForcePossibilities(); - if (bMoveProtect) return FALSE; + if (bMoveProtect) return sal_False; if (b90Deg) return bMirror90Allowed; if (b45Deg) return bMirror45Allowed; return bMirrorFreeAllowed && !bMoveProtect; } -BOOL SdrEditView::IsTransparenceAllowed() const +sal_Bool SdrEditView::IsTransparenceAllowed() const { ForcePossibilities(); return bTransparenceAllowed; } -BOOL SdrEditView::IsGradientAllowed() const +sal_Bool SdrEditView::IsGradientAllowed() const { ForcePossibilities(); return bGradientAllowed; } -BOOL SdrEditView::IsShearAllowed() const +sal_Bool SdrEditView::IsShearAllowed() const { ForcePossibilities(); - if (bResizeProtect) return FALSE; + if (bResizeProtect) return sal_False; return bShearAllowed; } -BOOL SdrEditView::IsEdgeRadiusAllowed() const +sal_Bool SdrEditView::IsEdgeRadiusAllowed() const { ForcePossibilities(); return bEdgeRadiusAllowed; } -BOOL SdrEditView::IsCrookAllowed(BOOL bNoContortion) const +sal_Bool SdrEditView::IsCrookAllowed(sal_Bool bNoContortion) const { // CrookMode fehlt hier (weil kein Rotate bei Shear ...) ForcePossibilities(); if (bNoContortion) { - if (!bRotateFreeAllowed) return FALSE; // Crook is nich + if (!bRotateFreeAllowed) return sal_False; // Crook is nich return !bMoveProtect && bMoveAllowed; } else { return !bResizeProtect && bContortionPossible; } } -BOOL SdrEditView::IsDistortAllowed(BOOL bNoContortion) const +sal_Bool SdrEditView::IsDistortAllowed(sal_Bool bNoContortion) const { ForcePossibilities(); if (bNoContortion) { - return FALSE; + return sal_False; } else { return !bResizeProtect && bContortionPossible; } } -BOOL SdrEditView::IsCombinePossible(BOOL bNoPolyPoly) const +sal_Bool SdrEditView::IsCombinePossible(sal_Bool bNoPolyPoly) const { ForcePossibilities(); if (bNoPolyPoly) return bCombineNoPolyPolyPossible; else return bCombinePossible; } -BOOL SdrEditView::IsDismantlePossible(BOOL bMakeLines) const +sal_Bool SdrEditView::IsDismantlePossible(sal_Bool bMakeLines) const { ForcePossibilities(); if (bMakeLines) return bDismantleMakeLinesPossible; @@ -506,7 +506,7 @@ BOOL SdrEditView::IsDismantlePossible(BOOL bMakeLines) const void SdrEditView::CheckPossibilities() { - if (bSomeObjChgdFlag) bPossibilitiesDirty=TRUE; + if (bSomeObjChgdFlag) bPossibilitiesDirty=sal_True; if(bSomeObjChgdFlag) { @@ -519,11 +519,11 @@ void SdrEditView::CheckPossibilities() if (bPossibilitiesDirty) { ImpResetPossibilityFlags(); SortMarkedObjects(); - ULONG nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz!=0) { bReverseOrderPossible=nMarkAnz>=2; - ULONG nMovableCount=0; + sal_uIntPtr nMovableCount=0; bGroupPossible=nMarkAnz>=2; bCombinePossible=nMarkAnz>=2; if (nMarkAnz==1) { @@ -531,27 +531,27 @@ void SdrEditView::CheckPossibilities() // fehlt noch ... const SdrObject* pObj=GetMarkedObjectByIndex(0); //const SdrPathObj* pPath=PTR_CAST(SdrPathObj,pObj); - BOOL bGroup=pObj->GetSubList()!=NULL; - BOOL bHasText=pObj->GetOutlinerParaObject()!=NULL; + sal_Bool bGroup=pObj->GetSubList()!=NULL; + sal_Bool bHasText=pObj->GetOutlinerParaObject()!=NULL; if (bGroup || bHasText) { - bCombinePossible=TRUE; + bCombinePossible=sal_True; } } bCombineNoPolyPolyPossible=bCombinePossible; - bDeletePossible=TRUE; + bDeletePossible=sal_True; // Zu den Transformationen erstmal ja sagen - bMoveAllowed =TRUE; - bResizeFreeAllowed=TRUE; - bResizePropAllowed=TRUE; - bRotateFreeAllowed=TRUE; - bRotate90Allowed =TRUE; - bMirrorFreeAllowed=TRUE; - bMirror45Allowed =TRUE; - bMirror90Allowed =TRUE; - bShearAllowed =TRUE; - bEdgeRadiusAllowed=FALSE; - bContortionPossible=TRUE; - bCanConvToContour = TRUE; + bMoveAllowed =sal_True; + bResizeFreeAllowed=sal_True; + bResizePropAllowed=sal_True; + bRotateFreeAllowed=sal_True; + bRotate90Allowed =sal_True; + bMirrorFreeAllowed=sal_True; + bMirror45Allowed =sal_True; + bMirror90Allowed =sal_True; + bShearAllowed =sal_True; + bEdgeRadiusAllowed=sal_False; + bContortionPossible=sal_True; + bCanConvToContour = sal_True; // these ones are only allowed when single object is selected bTransparenceAllowed = (nMarkAnz == 1); @@ -564,7 +564,7 @@ void SdrEditView::CheckPossibilities() // maybe group object, so get merged ItemSet const SfxItemSet& rSet = pObj->GetMergedItemSet(); - SfxItemState eState = rSet.GetItemState(XATTR_FILLSTYLE, FALSE); + SfxItemState eState = rSet.GetItemState(XATTR_FILLSTYLE, sal_False); if(SFX_ITEM_DONTCARE != eState) { @@ -573,67 +573,67 @@ void SdrEditView::CheckPossibilities() if(eFillStyle != XFILL_GRADIENT) { - bGradientAllowed = FALSE; + bGradientAllowed = sal_False; } } } - BOOL bNoMovRotFound=FALSE; + sal_Bool bNoMovRotFound=sal_False; const SdrPageView* pPV0=NULL; - for (ULONG nm=0; nm<nMarkAnz; nm++) { + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { const SdrMark* pM=GetSdrMarkByIndex(nm); const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrPageView* pPV=pM->GetPageView(); if (pPV!=pPV0) { - if (pPV->IsReadOnly()) bReadOnly=TRUE; + if (pPV->IsReadOnly()) bReadOnly=sal_True; pPV0=pPV; } SdrObjTransformInfoRec aInfo; pObj->TakeObjInfo(aInfo); - BOOL bMovPrt=pObj->IsMoveProtect(); - BOOL bSizPrt=pObj->IsResizeProtect(); + sal_Bool bMovPrt=pObj->IsMoveProtect(); + sal_Bool bSizPrt=pObj->IsResizeProtect(); if (!bMovPrt && aInfo.bMoveAllowed) nMovableCount++; // Menge der MovableObjs zaehlen - if (bMovPrt) bMoveProtect=TRUE; - if (bSizPrt) bResizeProtect=TRUE; + if (bMovPrt) bMoveProtect=sal_True; + if (bSizPrt) bResizeProtect=sal_True; // not allowed when not allowed at one object if(!aInfo.bTransparenceAllowed) - bTransparenceAllowed = FALSE; + bTransparenceAllowed = sal_False; // Wenn einer was nicht kann, duerfen's alle nicht - if (!aInfo.bMoveAllowed ) bMoveAllowed =FALSE; - if (!aInfo.bResizeFreeAllowed) bResizeFreeAllowed=FALSE; - if (!aInfo.bResizePropAllowed) bResizePropAllowed=FALSE; - if (!aInfo.bRotateFreeAllowed) bRotateFreeAllowed=FALSE; - if (!aInfo.bRotate90Allowed ) bRotate90Allowed =FALSE; - if (!aInfo.bMirrorFreeAllowed) bMirrorFreeAllowed=FALSE; - if (!aInfo.bMirror45Allowed ) bMirror45Allowed =FALSE; - if (!aInfo.bMirror90Allowed ) bMirror90Allowed =FALSE; - if (!aInfo.bShearAllowed ) bShearAllowed =FALSE; - if (aInfo.bEdgeRadiusAllowed) bEdgeRadiusAllowed=TRUE; - if (aInfo.bNoContortion ) bContortionPossible=FALSE; + if (!aInfo.bMoveAllowed ) bMoveAllowed =sal_False; + if (!aInfo.bResizeFreeAllowed) bResizeFreeAllowed=sal_False; + if (!aInfo.bResizePropAllowed) bResizePropAllowed=sal_False; + if (!aInfo.bRotateFreeAllowed) bRotateFreeAllowed=sal_False; + if (!aInfo.bRotate90Allowed ) bRotate90Allowed =sal_False; + if (!aInfo.bMirrorFreeAllowed) bMirrorFreeAllowed=sal_False; + if (!aInfo.bMirror45Allowed ) bMirror45Allowed =sal_False; + if (!aInfo.bMirror90Allowed ) bMirror90Allowed =sal_False; + if (!aInfo.bShearAllowed ) bShearAllowed =sal_False; + if (aInfo.bEdgeRadiusAllowed) bEdgeRadiusAllowed=sal_True; + if (aInfo.bNoContortion ) bContortionPossible=sal_False; // Fuer Crook mit Contortion: Alle Objekte muessen // Movable und Rotatable sein, ausser maximal 1 if (!bMoreThanOneNoMovRot) { if (!aInfo.bMoveAllowed || !aInfo.bResizeFreeAllowed) { bMoreThanOneNoMovRot=bNoMovRotFound; - bNoMovRotFound=TRUE; + bNoMovRotFound=sal_True; } } // when one member cannot be converted, no conversion is possible if(!aInfo.bCanConvToContour) - bCanConvToContour = FALSE; + bCanConvToContour = sal_False; // Ungroup if (!bUnGroupPossible) bUnGroupPossible=pObj->GetSubList()!=NULL; // ConvertToCurve: Wenn mind. einer konvertiert werden kann ist das ok. - if (aInfo.bCanConvToPath ) bCanConvToPath =TRUE; - if (aInfo.bCanConvToPoly ) bCanConvToPoly =TRUE; - if (aInfo.bCanConvToPathLineToArea) bCanConvToPathLineToArea=TRUE; - if (aInfo.bCanConvToPolyLineToArea) bCanConvToPolyLineToArea=TRUE; + if (aInfo.bCanConvToPath ) bCanConvToPath =sal_True; + if (aInfo.bCanConvToPoly ) bCanConvToPoly =sal_True; + if (aInfo.bCanConvToPathLineToArea) bCanConvToPathLineToArea=sal_True; + if (aInfo.bCanConvToPolyLineToArea) bCanConvToPolyLineToArea=sal_True; // Combine/Dismantle if(bCombinePossible) @@ -645,15 +645,15 @@ void SdrEditView::CheckPossibilities() if (!bDismantlePossible) bDismantlePossible = ImpCanDismantle(pObj, sal_False); if (!bDismantleMakeLinesPossible) bDismantleMakeLinesPossible = ImpCanDismantle(pObj, sal_True); // OrthoDesiredOnMarked checken - if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=TRUE; + if (!bOrthoDesiredOnMarked && !aInfo.bNoOrthoDesired) bOrthoDesiredOnMarked=sal_True; // ImportMtf checken if (!bImportMtfPossible) { - BOOL bGraf=HAS_BASE(SdrGrafObj,pObj); - BOOL bOle2=HAS_BASE(SdrOle2Obj,pObj); + sal_Bool bGraf=HAS_BASE(SdrGrafObj,pObj); + sal_Bool bOle2=HAS_BASE(SdrOle2Obj,pObj); if( bGraf && ((SdrGrafObj*)pObj)->HasGDIMetaFile() && !((SdrGrafObj*)pObj)->IsEPS() ) - bImportMtfPossible = TRUE; + bImportMtfPossible = sal_True; if (bOle2) bImportMtfPossible=((SdrOle2Obj*)pObj)->GetObjRef().is(); @@ -666,12 +666,12 @@ void SdrEditView::CheckPossibilities() } ImpCheckToTopBtmPossible(); ((SdrPolyEditView*)this)->ImpCheckPolyPossibilities(); - bPossibilitiesDirty=FALSE; + bPossibilitiesDirty=sal_False; if (bReadOnly) { - BOOL bMerker1=bGrpEnterPossible; + sal_Bool bMerker1=bGrpEnterPossible; ImpResetPossibilityFlags(); - bReadOnly=TRUE; + bReadOnly=sal_True; bGrpEnterPossible=bMerker1; } if (bMoveAllowed) { @@ -681,9 +681,9 @@ void SdrEditView::CheckPossibilities() SdrObject* pObj=GetMarkedObjectByIndex(0); SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj); if (pEdge!=NULL) { - SdrObject* pNode1=pEdge->GetConnectedNode(TRUE); - SdrObject* pNode2=pEdge->GetConnectedNode(FALSE); - if (pNode1!=NULL || pNode2!=NULL) bMoveAllowed=FALSE; + SdrObject* pNode1=pEdge->GetConnectedNode(sal_True); + SdrObject* pNode2=pEdge->GetConnectedNode(sal_False); + if (pNode1!=NULL || pNode2!=NULL) bMoveAllowed=sal_False; } } } @@ -694,14 +694,14 @@ void SdrEditView::CheckPossibilities() void SdrEditView::ForceMarkedObjToAnotherPage() { - BOOL bFlg=FALSE; - for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) { + sal_Bool bFlg=sal_False; + for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); Rectangle aObjRect(pObj->GetCurrentBoundRect()); Rectangle aPgRect(pM->GetPageView()->GetPageRect()); if (!aObjRect.IsOver(aPgRect)) { - BOOL bFnd=FALSE; + sal_Bool bFnd=sal_False; SdrPageView* pPV = GetSdrPageView(); if(pPV) @@ -716,7 +716,7 @@ void SdrEditView::ForceMarkedObjToAnotherPage() pPV->GetObjList()->InsertObject(pObj,CONTAINER_APPEND,&aReason); pM->SetPageView(pPV); InvalidateAllWin(aObjRect); - bFlg=TRUE; + bFlg=sal_True; } } } @@ -923,8 +923,8 @@ void SdrEditView::CopyMarkedObj() SdrMarkList aSourceObjectsForCopy(GetMarkedObjectList()); // Folgende Schleife Anstatt MarkList::Merge(), damit // ich jeweils mein Flag an die MarkEntries setzen kann. - ULONG nEdgeAnz = GetEdgesOfMarkedNodes().GetMarkCount(); - for (ULONG nEdgeNum=0; nEdgeNum<nEdgeAnz; nEdgeNum++) { + sal_uIntPtr nEdgeAnz = GetEdgesOfMarkedNodes().GetMarkCount(); + for (sal_uIntPtr nEdgeNum=0; nEdgeNum<nEdgeAnz; nEdgeNum++) { SdrMark aM(*GetEdgesOfMarkedNodes().GetMark(nEdgeNum)); aM.SetUser(1); aSourceObjectsForCopy.InsertEntry(aM); @@ -938,9 +938,9 @@ void SdrEditView::CopyMarkedObj() const bool bUndo = IsUndoEnabled(); GetMarkedObjectListWriteAccess().Clear(); - ULONG nCloneErrCnt=0; - ULONG nMarkAnz=aSourceObjectsForCopy.GetMarkCount(); - ULONG nm; + sal_uIntPtr nCloneErrCnt=0; + sal_uIntPtr nMarkAnz=aSourceObjectsForCopy.GetMarkCount(); + sal_uIntPtr nm; for (nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=aSourceObjectsForCopy.GetMark(nm); SdrObject* pO=pM->GetMarkedSdrObj()->Clone(); @@ -994,14 +994,14 @@ void SdrEditView::CopyMarkedObj() //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions) +sal_Bool SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, sal_uIntPtr nOptions) { if ((nOptions & SDRINSERT_SETDEFLAYER)!=0) { - SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,TRUE); + SdrLayerID nLayer=rPV.GetPage()->GetLayerAdmin().GetLayerID(aAktLayer,sal_True); if (nLayer==SDRLAYER_NOTFOUND) nLayer=0; if (rPV.GetLockedLayers().IsSet(nLayer) || !rPV.GetVisibleLayers().IsSet(nLayer)) { SdrObject::Free( pObj ); // Layer gesperrt oder nicht sichtbar - return FALSE; + return sal_False; } pObj->NbcSetLayer(nLayer); } @@ -1024,10 +1024,10 @@ BOOL SdrEditView::InsertObjectAtView(SdrObject* pObj, SdrPageView& rPV, ULONG nO if ((nOptions & SDRINSERT_ADDMARK)==0) UnmarkAllObj(); MarkObj(pObj,&rPV); } - return TRUE; + return sal_True; } -void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, BOOL bMark) +void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrObject* pNewObj, sal_Bool bMark) { SdrObjList* pOL=pOldObj->GetObjList(); const bool bUndo = IsUndoEnabled(); @@ -1035,7 +1035,7 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoReplaceObject(*pOldObj,*pNewObj)); if( IsObjMarked( pOldObj ) ) - MarkObj( pOldObj, &rPV, TRUE /*unmark!*/ ); + MarkObj( pOldObj, &rPV, sal_True /*unmark!*/ ); pOL->ReplaceObject(pNewObj,pOldObj->GetOrdNum()); @@ -1047,46 +1047,6 @@ void SdrEditView::ReplaceObjectAtView(SdrObject* pOldObj, SdrPageView& rPV, SdrO //////////////////////////////////////////////////////////////////////////////////////////////////// -#ifdef WIN -void SdrEditView::BegUndo() // Undo-Klammerung auf -{ - pMod->BegUndo(); -} - -void SdrEditView::BegUndo(const String& rComment) // Undo-Klammerung auf -{ - pMod->BegUndo(rComment); -} - -void SdrEditView::BegUndo(const String& rComment, const String& rObjDescr, - SdrRepeatFunc eFunc) // Undo-Klammerung auf -{ - pMod->BegUndo(rComment,rObjDescr,eFunc); -} - -void SdrEditView::BegUndo(SdrUndoGroup* pUndoGrp) // Undo-Klammerung auf -{ - pMod->BegUndo(pUndoGrp); -} - -void SdrEditView::AddUndo(SdrUndoAction* pUndo) // Action hinzufuegen -{ - pMod->AddUndo(pUndo); -} - // nur nach dem 1. BegUndo oder vor dem letzten EndUndo: -void SdrEditView::SetUndoComment(const String& rComment) -{ - pMod->SetUndoComment(rComment); -} - - -void SdrEditView::SetUndoComment(const String& rComment, - const String& rObjDescr) -{ - pMod->SetUndoComment(rComment,rObjDescr); -} -#endif - bool SdrEditView::IsUndoEnabled() const { return pMod->IsUndoEnabled(); diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 816ec0a169..ca170aecfd 100644..100755 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -41,8 +41,8 @@ #include <svx/rectenum.hxx> #include <svx/svxids.hrc> // fuer SID_ATTR_TRANSFORM_... #include <svx/svdattr.hxx> // fuer Get/SetGeoAttr -#include "svditext.hxx" -#include "svditer.hxx" +#include "svx/svditext.hxx" +#include "svx/svditer.hxx" #include <svx/svdtrans.hxx> #include <svx/svdundo.hxx> #include <svx/svdpage.hxx> @@ -51,8 +51,8 @@ #include <svx/svdattrx.hxx> // fuer MergeNotPersistAttr #include <svx/svdetc.hxx> // fuer SearchOutlinerItems #include <svx/svdopath.hxx> // fuer Crook -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <editeng/eeitem.hxx> #include <svl/aeitem.hxx> #include <svl/whiter.hxx> @@ -77,11 +77,11 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy) +void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, sal_Bool bCopy) { DBG_ASSERT(!rRect.IsEmpty(),"SetMarkedObjRect() mit leerem Rect mach keinen Sinn"); if (rRect.IsEmpty()) return; - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nAnz=GetMarkedObjectCount(); if (nAnz==0) return; Rectangle aR0(GetMarkedObjRect()); DBG_ASSERT(!aR0.IsEmpty(),"SetMarkedObjRect(): GetMarkedObjRect() ist leer"); @@ -106,7 +106,7 @@ void SdrEditView::SetMarkedObjRect(const Rectangle& rRect, BOOL bCopy) if (bCopy) CopyMarkedObj(); - for (ULONG nm=0; nm<nAnz; nm++) + for (sal_uIntPtr nm=0; nm<nAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -204,8 +204,8 @@ void SdrEditView::MoveMarkedObj(const Size& rSiz, bool bCopy) if (bCopy) CopyMarkedObj(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -237,8 +237,8 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons if (bCopy) CopyMarkedObj(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -257,17 +257,17 @@ void SdrEditView::ResizeMarkedObj(const Point& rRef, const Fraction& xFact, cons long SdrEditView::GetMarkedObjRotate() const { - BOOL b1st=TRUE; - BOOL bOk=TRUE; + sal_Bool b1st=sal_True; + sal_Bool bOk=sal_True; long nWink=0; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz && bOk; nm++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); long nWink2=pO->GetRotateAngle(); if (b1st) nWink=nWink2; - else if (nWink2!=nWink) bOk=FALSE; - b1st=FALSE; + else if (nWink2!=nWink) bOk=sal_False; + b1st=sal_False; } if (!bOk) nWink=0; return nWink; @@ -390,7 +390,7 @@ void SdrEditView::MirrorMarkedObj(const Point& rRef1, const Point& rRef2, bool b EndUndo(); } -void SdrEditView::MirrorMarkedObjHorizontal(BOOL bCopy) +void SdrEditView::MirrorMarkedObjHorizontal(sal_Bool bCopy) { Point aCenter(GetMarkedObjRect().Center()); Point aPt2(aCenter); @@ -398,7 +398,7 @@ void SdrEditView::MirrorMarkedObjHorizontal(BOOL bCopy) MirrorMarkedObj(aCenter,aPt2,bCopy); } -void SdrEditView::MirrorMarkedObjVertical(BOOL bCopy) +void SdrEditView::MirrorMarkedObjVertical(sal_Bool bCopy) { Point aCenter(GetMarkedObjRect().Center()); Point aPt2(aCenter); @@ -408,17 +408,17 @@ void SdrEditView::MirrorMarkedObjVertical(BOOL bCopy) long SdrEditView::GetMarkedObjShear() const { - BOOL b1st=TRUE; - BOOL bOk=TRUE; + sal_Bool b1st=sal_True; + sal_Bool bOk=sal_True; long nWink=0; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz && bOk; nm++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz && bOk; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); long nWink2=pO->GetShearAngle(); if (b1st) nWink=nWink2; - else if (nWink2!=nWink) bOk=FALSE; - b1st=FALSE; + else if (nWink2!=nWink) bOk=sal_False; + b1st=sal_False; } if (nWink>SDRMAXSHEAR) nWink=SDRMAXSHEAR; if (nWink<-SDRMAXSHEAR) nWink=-SDRMAXSHEAR; @@ -443,8 +443,8 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo CopyMarkedObj(); double nTan=tan(nWink*nPi180); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -462,10 +462,10 @@ void SdrEditView::ShearMarkedObj(const Point& rRef, long nWink, bool bVShear, bo } void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, - SdrCrookMode eMode, BOOL bVertical, BOOL bNoContortion, BOOL bRotate, const Rectangle& rMarkRect) + SdrCrookMode eMode, sal_Bool bVertical, sal_Bool bNoContortion, sal_Bool bRotate, const Rectangle& rMarkRect) { SdrPathObj* pPath=PTR_CAST(SdrPathObj,pO); - BOOL bDone = FALSE; + sal_Bool bDone = sal_False; if(pPath!=NULL && !bNoContortion) { @@ -476,7 +476,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa case SDRCROOK_STRETCH: CrookStretchPoly(aXPP,rRef,rRad,bVertical,rMarkRect); break; } // switch pPath->SetPathPoly(aXPP.getB2DPolyPolygon()); - bDone = TRUE; + bDone = sal_True; } if(!bDone && !pPath && pO->IsPolyObj() && 0L != pO->GetPointCount()) @@ -506,7 +506,7 @@ void SdrEditView::ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRa pO->SetPoint(aXP[(sal_uInt16)nPtNum],nPtNum); } - bDone = TRUE; + bDone = sal_True; } if(!bDone) @@ -545,7 +545,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM Rectangle aMarkRect(GetMarkedObjRect()); const bool bUndo = IsUndoEnabled(); - bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed(FALSE); + bool bRotate=bNoContortion && eMode==SDRCROOK_ROTATE && IsRotateAllowed(sal_False); if( bUndo ) { @@ -559,8 +559,8 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM if (bCopy) CopyMarkedObj(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -583,7 +583,7 @@ void SdrEditView::CrookMarkedObj(const Point& rRef, const Point& rRad, SdrCrookM EndUndo(); } -void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, BOOL bNoContortion) +void SdrEditView::ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, sal_Bool bNoContortion) { SdrPathObj* pPath = PTR_CAST(SdrPathObj, pO); @@ -633,8 +633,8 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto if (bCopy) CopyMarkedObj(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); @@ -660,47 +660,47 @@ void SdrEditView::DistortMarkedObj(const Rectangle& rRef, const XPolygon& rDisto //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bReplaceAll*/) +void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/) { // bReplaceAll hat hier keinerlei Wirkung Rectangle aAllSnapRect(GetMarkedObjRect()); const SfxPoolItem *pPoolItem=NULL; - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrTransformRef1XItem*)pPoolItem)->GetValue(); SetRef1(Point(n,GetRef1().Y())); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrTransformRef1YItem*)pPoolItem)->GetValue(); SetRef1(Point(GetRef1().X(),n)); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrTransformRef2XItem*)pPoolItem)->GetValue(); SetRef2(Point(n,GetRef2().Y())); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrTransformRef2YItem*)pPoolItem)->GetValue(); SetRef2(Point(GetRef2().X(),n)); } - long nAllPosX=0; BOOL bAllPosX=FALSE; - long nAllPosY=0; BOOL bAllPosY=FALSE; - long nAllWdt=0; BOOL bAllWdt=FALSE; - long nAllHgt=0; BOOL bAllHgt=FALSE; - BOOL bDoIt=FALSE; - if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,TRUE,&pPoolItem)==SFX_ITEM_SET) { + long nAllPosX=0; sal_Bool bAllPosX=sal_False; + long nAllPosY=0; sal_Bool bAllPosY=sal_False; + long nAllWdt=0; sal_Bool bAllWdt=sal_False; + long nAllHgt=0; sal_Bool bAllHgt=sal_False; + sal_Bool bDoIt=sal_False; + if (rAttr.GetItemState(SDRATTR_ALLPOSITIONX,sal_True,&pPoolItem)==SFX_ITEM_SET) { nAllPosX=((const SdrAllPositionXItem*)pPoolItem)->GetValue(); - bAllPosX=TRUE; bDoIt=TRUE; + bAllPosX=sal_True; bDoIt=sal_True; } - if (rAttr.GetItemState(SDRATTR_ALLPOSITIONY,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ALLPOSITIONY,sal_True,&pPoolItem)==SFX_ITEM_SET) { nAllPosY=((const SdrAllPositionYItem*)pPoolItem)->GetValue(); - bAllPosY=TRUE; bDoIt=TRUE; + bAllPosY=sal_True; bDoIt=sal_True; } - if (rAttr.GetItemState(SDRATTR_ALLSIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ALLSIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) { nAllWdt=((const SdrAllSizeWidthItem*)pPoolItem)->GetValue(); - bAllWdt=TRUE; bDoIt=TRUE; + bAllWdt=sal_True; bDoIt=sal_True; } - if (rAttr.GetItemState(SDRATTR_ALLSIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ALLSIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) { nAllHgt=((const SdrAllSizeHeightItem*)pPoolItem)->GetValue(); - bAllHgt=TRUE; bDoIt=TRUE; + bAllHgt=sal_True; bDoIt=sal_True; } if (bDoIt) { Rectangle aRect(aAllSnapRect); // !!! fuer PolyPt's und GluePt's aber bitte noch aendern !!! @@ -710,32 +710,32 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bRep if (bAllHgt) aRect.Bottom()=aAllSnapRect.Top()+nAllHgt; SetMarkedObjRect(aRect); } - if (rAttr.GetItemState(SDRATTR_RESIZEXALL,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_RESIZEXALL,sal_True,&pPoolItem)==SFX_ITEM_SET) { Fraction aXFact=((const SdrResizeXAllItem*)pPoolItem)->GetValue(); ResizeMarkedObj(aAllSnapRect.TopLeft(),aXFact,Fraction(1,1)); } - if (rAttr.GetItemState(SDRATTR_RESIZEYALL,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_RESIZEYALL,sal_True,&pPoolItem)==SFX_ITEM_SET) { Fraction aYFact=((const SdrResizeYAllItem*)pPoolItem)->GetValue(); ResizeMarkedObj(aAllSnapRect.TopLeft(),Fraction(1,1),aYFact); } - if (rAttr.GetItemState(SDRATTR_ROTATEALL,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ROTATEALL,sal_True,&pPoolItem)==SFX_ITEM_SET) { long nAngle=((const SdrRotateAllItem*)pPoolItem)->GetValue(); RotateMarkedObj(aAllSnapRect.Center(),nAngle); } - if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_HORZSHEARALL,sal_True,&pPoolItem)==SFX_ITEM_SET) { long nAngle=((const SdrHorzShearAllItem*)pPoolItem)->GetValue(); - ShearMarkedObj(aAllSnapRect.Center(),nAngle,FALSE); + ShearMarkedObj(aAllSnapRect.Center(),nAngle,sal_False); } - if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_VERTSHEARALL,sal_True,&pPoolItem)==SFX_ITEM_SET) { long nAngle=((const SdrVertShearAllItem*)pPoolItem)->GetValue(); - ShearMarkedObj(aAllSnapRect.Center(),nAngle,TRUE); + ShearMarkedObj(aAllSnapRect.Center(),nAngle,sal_True); } const bool bUndo = IsUndoEnabled(); // Todo: WhichRange nach Notwendigkeit ueberpruefen. - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { const SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -747,7 +747,7 @@ void SdrEditView::SetNotPersistAttrToMarked(const SfxItemSet& rAttr, BOOL /*bRep } } -void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyHardAttr*/) const +void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const { // bOnlyHardAttr hat hier keinerlei Wirkung // Hier muss ausserdem noch der Nullpunkt und @@ -758,24 +758,24 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH long nAllSnapWdt=aAllSnapRect.GetWidth()-1; long nAllSnapHgt=aAllSnapRect.GetHeight()-1; // koennte mal zu CheckPossibilities mit rein - BOOL bMovProtect=FALSE,bMovProtectDC=FALSE; - BOOL bSizProtect=FALSE,bSizProtectDC=FALSE; - BOOL bPrintable =TRUE ,bPrintableDC=FALSE; - BOOL bVisible = TRUE, bVisibleDC=FALSE; - SdrLayerID nLayerId=0; BOOL bLayerDC=FALSE; - XubString aObjName; BOOL bObjNameDC=FALSE,bObjNameSet=FALSE; - long nSnapPosX=0; BOOL bSnapPosXDC=FALSE; - long nSnapPosY=0; BOOL bSnapPosYDC=FALSE; - long nSnapWdt=0; BOOL bSnapWdtDC=FALSE; - long nSnapHgt=0; BOOL bSnapHgtDC=FALSE; - long nLogicWdt=0; BOOL bLogicWdtDC=FALSE,bLogicWdtDiff=FALSE; - long nLogicHgt=0; BOOL bLogicHgtDC=FALSE,bLogicHgtDiff=FALSE; - long nRotAngle=0; BOOL bRotAngleDC=FALSE; - long nShrAngle=0; BOOL bShrAngleDC=FALSE; + sal_Bool bMovProtect=sal_False,bMovProtectDC=sal_False; + sal_Bool bSizProtect=sal_False,bSizProtectDC=sal_False; + sal_Bool bPrintable =sal_True ,bPrintableDC=sal_False; + sal_Bool bVisible = sal_True, bVisibleDC=sal_False; + SdrLayerID nLayerId=0; sal_Bool bLayerDC=sal_False; + XubString aObjName; sal_Bool bObjNameDC=sal_False,bObjNameSet=sal_False; + long nSnapPosX=0; sal_Bool bSnapPosXDC=sal_False; + long nSnapPosY=0; sal_Bool bSnapPosYDC=sal_False; + long nSnapWdt=0; sal_Bool bSnapWdtDC=sal_False; + long nSnapHgt=0; sal_Bool bSnapHgtDC=sal_False; + long nLogicWdt=0; sal_Bool bLogicWdtDC=sal_False,bLogicWdtDiff=sal_False; + long nLogicHgt=0; sal_Bool bLogicHgtDC=sal_False,bLogicHgtDiff=sal_False; + long nRotAngle=0; sal_Bool bRotAngleDC=sal_False; + long nShrAngle=0; sal_Bool bShrAngleDC=sal_False; Rectangle aSnapRect; Rectangle aLogicRect; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { const SdrMark* pM=GetSdrMarkByIndex(nm); const SdrObject* pObj=pM->GetMarkedSdrObj(); if (nm==0) { @@ -797,33 +797,33 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH nRotAngle=pObj->GetRotateAngle(); nShrAngle=pObj->GetShearAngle(); } else { - if (!bLayerDC && nLayerId !=pObj->GetLayer()) bLayerDC=TRUE; - if (!bMovProtectDC && bMovProtect!=pObj->IsMoveProtect()) bMovProtectDC=TRUE; - if (!bSizProtectDC && bSizProtect!=pObj->IsResizeProtect()) bSizProtectDC=TRUE; - if (!bPrintableDC && bPrintable !=pObj->IsPrintable()) bPrintableDC=TRUE; - if (!bVisibleDC && bVisible !=pObj->IsVisible()) bVisibleDC=TRUE; - if (!bRotAngleDC && nRotAngle !=pObj->GetRotateAngle()) bRotAngleDC=TRUE; - if (!bShrAngleDC && nShrAngle !=pObj->GetShearAngle()) bShrAngleDC=TRUE; + if (!bLayerDC && nLayerId !=pObj->GetLayer()) bLayerDC=sal_True; + if (!bMovProtectDC && bMovProtect!=pObj->IsMoveProtect()) bMovProtectDC=sal_True; + if (!bSizProtectDC && bSizProtect!=pObj->IsResizeProtect()) bSizProtectDC=sal_True; + if (!bPrintableDC && bPrintable !=pObj->IsPrintable()) bPrintableDC=sal_True; + if (!bVisibleDC && bVisible !=pObj->IsVisible()) bVisibleDC=sal_True; + if (!bRotAngleDC && nRotAngle !=pObj->GetRotateAngle()) bRotAngleDC=sal_True; + if (!bShrAngleDC && nShrAngle !=pObj->GetShearAngle()) bShrAngleDC=sal_True; if (!bSnapWdtDC || !bSnapHgtDC || !bSnapPosXDC || !bSnapPosYDC || !bLogicWdtDiff || !bLogicHgtDiff) { aSnapRect=pObj->GetSnapRect(); - if (nSnapPosX!=aSnapRect.Left()) bSnapPosXDC=TRUE; - if (nSnapPosY!=aSnapRect.Top()) bSnapPosYDC=TRUE; - if (nSnapWdt!=aSnapRect.GetWidth()-1) bSnapWdtDC=TRUE; - if (nSnapHgt!=aSnapRect.GetHeight()-1) bSnapHgtDC=TRUE; + if (nSnapPosX!=aSnapRect.Left()) bSnapPosXDC=sal_True; + if (nSnapPosY!=aSnapRect.Top()) bSnapPosYDC=sal_True; + if (nSnapWdt!=aSnapRect.GetWidth()-1) bSnapWdtDC=sal_True; + if (nSnapHgt!=aSnapRect.GetHeight()-1) bSnapHgtDC=sal_True; } if (!bLogicWdtDC || !bLogicHgtDC || !bLogicWdtDiff || !bLogicHgtDiff) { aLogicRect=pObj->GetLogicRect(); - if (nLogicWdt!=aLogicRect.GetWidth()-1) bLogicWdtDC=TRUE; - if (nLogicHgt!=aLogicRect.GetHeight()-1) bLogicHgtDC=TRUE; - if (!bLogicWdtDiff && aSnapRect.GetWidth()!=aLogicRect.GetWidth()) bLogicWdtDiff=TRUE; - if (!bLogicHgtDiff && aSnapRect.GetHeight()!=aLogicRect.GetHeight()) bLogicHgtDiff=TRUE; + if (nLogicWdt!=aLogicRect.GetWidth()-1) bLogicWdtDC=sal_True; + if (nLogicHgt!=aLogicRect.GetHeight()-1) bLogicHgtDC=sal_True; + if (!bLogicWdtDiff && aSnapRect.GetWidth()!=aLogicRect.GetWidth()) bLogicWdtDiff=sal_True; + if (!bLogicHgtDiff && aSnapRect.GetHeight()!=aLogicRect.GetHeight()) bLogicHgtDiff=sal_True; } } if (!bObjNameDC ) { if (!bObjNameSet) { aObjName=pObj->GetName(); } else { - if (aObjName!=pObj->GetName()) bObjNameDC=TRUE; + if (aObjName!=pObj->GetName()) bObjNameDC=sal_True; } } } @@ -863,7 +863,7 @@ void SdrEditView::MergeNotPersistAttrFromMarked(SfxItemSet& rAttr, BOOL /*bOnlyH } } -SfxItemSet SdrEditView::GetAttrFromMarked(BOOL bOnlyHardAttr) const +SfxItemSet SdrEditView::GetAttrFromMarked(sal_Bool bOnlyHardAttr) const { SfxItemSet aSet(pMod->GetItemPool()); MergeAttrFromMarked(aSet,bOnlyHardAttr); @@ -878,7 +878,7 @@ SfxItemSet SdrEditView::GetAttrFromMarked(BOOL bOnlyHardAttr) const return aSet; } -void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) const +void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, sal_Bool bOnlyHardAttr) const { sal_uInt32 nMarkAnz(GetMarkedObjectCount()); @@ -894,15 +894,15 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) con { if(!bOnlyHardAttr) { - if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE)) + if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False)) rAttr.InvalidateItem(nWhich); else - rAttr.MergeValue(rSet.Get(nWhich), TRUE); + rAttr.MergeValue(rSet.Get(nWhich), sal_True); } - else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE)) + else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False)) { const SfxPoolItem& rItem = rSet.Get(nWhich); - rAttr.MergeValue(rItem, TRUE); + rAttr.MergeValue(rItem, sal_True); } nWhich = aIter.NextWhich(); @@ -910,19 +910,19 @@ void SdrEditView::MergeAttrFromMarked(SfxItemSet& rAttr, BOOL bOnlyHardAttr) con } } -void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) +void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, sal_Bool bReplaceAll) { if (AreObjectsMarked()) { #ifdef DBG_UTIL { - BOOL bHasEEFeatureItems=FALSE; + sal_Bool bHasEEFeatureItems=sal_False; SfxItemIter aIter(rAttr); const SfxPoolItem* pItem=aIter.FirstItem(); while (!bHasEEFeatureItems && pItem!=NULL) { if (!IsInvalidItem(pItem)) { - USHORT nW=pItem->Which(); - if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=TRUE; + sal_uInt16 nW=pItem->Which(); + if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=sal_True; } pItem=aIter.NextItem(); } @@ -956,13 +956,13 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) } // Joe, 2.7.98: Damit Undo nach Format.Standard auch die Textattribute korrekt restauriert - BOOL bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll); + sal_Bool bHasEEItems=SearchOutlinerItems(rAttr,bReplaceAll); // AW 030100: save additional geom info when para or char attributes // are changed and the geom form of the text object might be changed - BOOL bPossibleGeomChange(FALSE); + sal_Bool bPossibleGeomChange(sal_False); SfxWhichIter aIter(rAttr); - UINT16 nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while(!bPossibleGeomChange && nWhich) { SfxItemState eState = rAttr.GetItemState(nWhich); @@ -975,7 +975,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) || nWhich == SDRATTR_3DOBJ_END_ANGLE || nWhich == SDRATTR_3DSCENE_DISTANCE) { - bPossibleGeomChange = TRUE; + bPossibleGeomChange = sal_True; } } nWhich = aIter.NextWhich(); @@ -996,12 +996,12 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) // uses it's second parameter (bInvalidAsDefault) to // remove all such items to set them to default. SfxItemSet aAttr(*rAttr.GetPool(), rAttr.GetRanges()); - aAttr.Put(rAttr, TRUE); + aAttr.Put(rAttr, sal_True); // #i38135# bool bResetAnimationTimer(false); - for (ULONG nm=0; nm<nMarkAnz; nm++) + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj = pM->GetMarkedSdrObj(); @@ -1011,7 +1011,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) std::vector< SdrUndoAction* > vConnectorUndoActions; SdrEdgeObj* pEdgeObj = dynamic_cast< SdrEdgeObj* >( pObj ); if ( pEdgeObj ) - bPossibleGeomChange = TRUE; + bPossibleGeomChange = sal_True; else if( bUndo ) vConnectorUndoActions = CreateConnectorUndo( *pObj ); @@ -1036,7 +1036,7 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) const bool bRescueText = dynamic_cast< SdrTextObj* >(pObj) != 0; // add attribute undo - AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,FALSE,bHasEEItems || bPossibleGeomChange || bRescueText)); + AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoAttrObject(*pObj,sal_False,bHasEEItems || bPossibleGeomChange || bRescueText)); } // set up a scxene updater if object is a 3d object @@ -1105,19 +1105,19 @@ void SdrEditView::SetAttrToMarked(const SfxItemSet& rAttr, BOOL bReplaceAll) SfxStyleSheet* SdrEditView::GetStyleSheetFromMarked() const { SfxStyleSheet* pRet=NULL; - BOOL b1st=TRUE; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) { + sal_Bool b1st=sal_True; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SfxStyleSheet* pSS=pM->GetMarkedSdrObj()->GetStyleSheet(); if (b1st) pRet=pSS; else if (pRet!=pSS) return NULL; // verschiedene StyleSheets - b1st=FALSE; + b1st=sal_False; } return pRet; } -void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) +void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) { if (AreObjectsMarked()) { @@ -1133,8 +1133,8 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRe BegUndo(aStr); } - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); if( bUndo ) @@ -1153,12 +1153,12 @@ void SdrEditView::SetStyleSheetToMarked(SfxStyleSheet* pStyleSheet, BOOL bDontRe //////////////////////////////////////////////////////////////////////////////////////////////////// /* new interface src537 */ -BOOL SdrEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const +sal_Bool SdrEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const { if(GetMarkedObjectCount()) { - rTargetSet.Put(GetAttrFromMarked(bOnlyHardAttr), FALSE); - return TRUE; + rTargetSet.Put(GetAttrFromMarked(bOnlyHardAttr), sal_False); + return sal_True; } else { @@ -1166,31 +1166,31 @@ BOOL SdrEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) cons } } -BOOL SdrEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) +sal_Bool SdrEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) { if (GetMarkedObjectCount()!=0) { SetAttrToMarked(rSet,bReplaceAll); - return TRUE; + return sal_True; } else { return SdrMarkView::SetAttributes(rSet,bReplaceAll); } } -SfxStyleSheet* SdrEditView::GetStyleSheet() const // SfxStyleSheet* SdrEditView::GetStyleSheet(BOOL& rOk) const +SfxStyleSheet* SdrEditView::GetStyleSheet() const // SfxStyleSheet* SdrEditView::GetStyleSheet(sal_Bool& rOk) const { if (GetMarkedObjectCount()!=0) { - //rOk=TRUE; + //rOk=sal_True; return GetStyleSheetFromMarked(); } else { return SdrMarkView::GetStyleSheet(); // SdrMarkView::GetStyleSheet(rOk); } } -BOOL SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) +sal_Bool SdrEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) { if (GetMarkedObjectCount()!=0) { SetStyleSheetToMarked(pStyleSheet,bDontRemoveHardAttr); - return TRUE; + return sal_True; } else { return SdrMarkView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); } @@ -1206,7 +1206,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const SDRATTR_ECKENRADIUS,SDRATTR_ECKENRADIUS, 0); if (AreObjectsMarked()) { - SfxItemSet aMarkAttr(GetAttrFromMarked(FALSE)); // wg. AutoGrowHeight und Eckenradius + SfxItemSet aMarkAttr(GetAttrFromMarked(sal_False)); // wg. AutoGrowHeight und Eckenradius Rectangle aRect(GetMarkedObjRect()); if(GetSdrPageView()) @@ -1261,16 +1261,16 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const // Pruefen der einzelnen Objekte, ob Objekte geschuetzt sind const SdrMarkList& rMarkList=GetMarkedObjectList(); - ULONG nMarkCount=rMarkList.GetMarkCount(); + sal_uIntPtr nMarkCount=rMarkList.GetMarkCount(); SdrObject* pObj=rMarkList.GetMark(0)->GetMarkedSdrObj(); - BOOL bPosProt=pObj->IsMoveProtect(); - BOOL bSizProt=pObj->IsResizeProtect(); - BOOL bPosProtDontCare=FALSE; - BOOL bSizProtDontCare=FALSE; - for (ULONG i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); i++) { + sal_Bool bPosProt=pObj->IsMoveProtect(); + sal_Bool bSizProt=pObj->IsResizeProtect(); + sal_Bool bPosProtDontCare=sal_False; + sal_Bool bSizProtDontCare=sal_False; + for (sal_uIntPtr i=1; i<nMarkCount && (!bPosProtDontCare || !bSizProtDontCare); i++) { pObj=rMarkList.GetMark(i)->GetMarkedSdrObj(); - if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=TRUE; - if (bSizProt!=pObj->IsResizeProtect()) bSizProtDontCare=TRUE; + if (bPosProt!=pObj->IsMoveProtect()) bPosProtDontCare=sal_True; + if (bSizProt!=pObj->IsResizeProtect()) bSizProtDontCare=sal_True; } // InvalidateItem setzt das Item auf DONT_CARE @@ -1286,7 +1286,7 @@ SfxItemSet SdrEditView::GetGeoAttrFromMarked() const } SfxItemState eState=aMarkAttr.GetItemState(SDRATTR_TEXT_AUTOGROWWIDTH); - BOOL bAutoGrow=((SdrTextAutoGrowWidthItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue(); + sal_Bool bAutoGrow=((SdrTextAutoGrowWidthItem&)(aMarkAttr.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue(); if (eState==SFX_ITEM_DONTCARE) { aRetSet.InvalidateItem(SID_ATTR_TRANSFORM_AUTOWIDTH); } else if (eState==SFX_ITEM_SET) { @@ -1341,7 +1341,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) long nOldRotateAngle=GetMarkedObjRotate(); long nOldShearAngle=GetMarkedObjShear(); const SdrMarkList& rMarkList=GetMarkedObjectList(); - ULONG nMarkCount=rMarkList.GetMarkCount(); + sal_uIntPtr nMarkCount=rMarkList.GetMarkCount(); SdrObject* pObj=NULL; RECT_POINT eSizePoint=RP_MM; @@ -1373,56 +1373,56 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) long nShearAngle=0; long nShearX=0; long nShearY=0; - BOOL bShearVert=FALSE; + sal_Bool bShearVert=sal_False; - BOOL bChgPos=FALSE; - BOOL bChgSiz=FALSE; - BOOL bRotate=FALSE; - BOOL bShear =FALSE; + sal_Bool bChgPos=sal_False; + sal_Bool bChgSiz=sal_False; + sal_Bool bRotate=sal_False; + sal_Bool bShear =sal_False; - BOOL bSetAttr=FALSE; + sal_Bool bSetAttr=sal_False; SfxItemSet aSetAttr(pMod->GetItemPool()); const SfxPoolItem* pPoolItem=NULL; // Position - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,TRUE,&pPoolItem)) { + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_X,sal_True,&pPoolItem)) { nPosDX=((const SfxInt32Item*)pPoolItem)->GetValue()-aRect.Left(); - bChgPos=TRUE; + bChgPos=sal_True; } - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_Y,TRUE,&pPoolItem)){ + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_POS_Y,sal_True,&pPoolItem)){ nPosDY=((const SfxInt32Item*)pPoolItem)->GetValue()-aRect.Top(); - bChgPos=TRUE; + bChgPos=sal_True; } // Groesse - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_WIDTH,TRUE,&pPoolItem)) { + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_WIDTH,sal_True,&pPoolItem)) { nSizX=((const SfxUInt32Item*)pPoolItem)->GetValue(); - bChgSiz=TRUE; + bChgSiz=sal_True; } - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,TRUE,&pPoolItem)) { + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_HEIGHT,sal_True,&pPoolItem)) { nSizY=((const SfxUInt32Item*)pPoolItem)->GetValue(); - bChgSiz=TRUE; + bChgSiz=sal_True; } if (bChgSiz) { eSizePoint=(RECT_POINT)((const SfxAllEnumItem&)rAttr.Get(SID_ATTR_TRANSFORM_SIZE_POINT)).GetValue(); } // Rotation - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ANGLE,TRUE,&pPoolItem)) { + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ANGLE,sal_True,&pPoolItem)) { nRotateAngle=((const SfxInt32Item*)pPoolItem)->GetValue()-nOldRotateAngle; bRotate = (nRotateAngle != 0); } // #86909# pos rot point x - if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, TRUE ,&pPoolItem)) + if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_X, sal_True ,&pPoolItem)) nRotateX = ((const SfxInt32Item&)rAttr.Get(SID_ATTR_TRANSFORM_ROT_X)).GetValue(); // #86909# pos rot point y - if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, TRUE ,&pPoolItem)) + if(bRotate || SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_ROT_Y, sal_True ,&pPoolItem)) nRotateY = ((const SfxInt32Item&)rAttr.Get(SID_ATTR_TRANSFORM_ROT_Y)).GetValue(); // Shear - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,TRUE,&pPoolItem)) { + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_SHEAR,sal_True,&pPoolItem)) { long nNewShearAngle=((const SfxInt32Item*)pPoolItem)->GetValue(); if (nNewShearAngle>SDRMAXSHEAR) nNewShearAngle=SDRMAXSHEAR; if (nNewShearAngle<-SDRMAXSHEAR) nNewShearAngle=-SDRMAXSHEAR; @@ -1451,23 +1451,23 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) } // AutoGrow - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,TRUE,&pPoolItem)) { - BOOL bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue(); + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOWIDTH,sal_True,&pPoolItem)) { + sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue(); aSetAttr.Put(SdrTextAutoGrowWidthItem(bAutoGrow)); - bSetAttr=TRUE; + bSetAttr=sal_True; } - if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,TRUE,&pPoolItem)) { - BOOL bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue(); + if (SFX_ITEM_SET==rAttr.GetItemState(SID_ATTR_TRANSFORM_AUTOHEIGHT,sal_True,&pPoolItem)) { + sal_Bool bAutoGrow=((const SfxBoolItem*)pPoolItem)->GetValue(); aSetAttr.Put(SdrTextAutoGrowHeightItem(bAutoGrow)); - bSetAttr=TRUE; + bSetAttr=sal_True; } // Eckenradius - if (bEdgeRadiusAllowed && SFX_ITEM_SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,TRUE,&pPoolItem)) { + if (bEdgeRadiusAllowed && SFX_ITEM_SET==rAttr.GetItemState(SDRATTR_ECKENRADIUS,sal_True,&pPoolItem)) { long nRadius=((SdrEckenradiusItem*)pPoolItem)->GetValue(); aSetAttr.Put(SdrEckenradiusItem(nRadius)); - bSetAttr=TRUE; + bSetAttr=sal_True; } ForcePossibilities(); @@ -1475,7 +1475,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) BegUndo(ImpGetResStr(STR_EditTransform),GetDescriptionOfMarkedObjects()); if (bSetAttr) { - SetAttrToMarked(aSetAttr,FALSE); + SetAttrToMarked(aSetAttr,sal_False); } // Groesse und Hoehe aendern @@ -1542,7 +1542,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) } // protect position - if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, TRUE, &pPoolItem)) + if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_POS, sal_True, &pPoolItem)) { const sal_Bool bProtPos(((const SfxBoolItem*)pPoolItem)->GetValue()); bool bChanged(false); @@ -1583,7 +1583,7 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) if(!bMoveProtect) { // protect size - if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, TRUE, &pPoolItem)) + if(SFX_ITEM_SET == rAttr.GetItemState(SID_ATTR_TRANSFORM_PROTECT_SIZE, sal_True, &pPoolItem)) { const sal_Bool bProtSize(((const SfxBoolItem*)pPoolItem)->GetValue()); bool bChanged(false); @@ -1614,16 +1614,16 @@ void SdrEditView::SetGeoAttrToMarked(const SfxItemSet& rAttr) //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrEditView::IsAlignPossible() const +sal_Bool SdrEditView::IsAlignPossible() const { // Mindestens 2 markierte Objekte, davon mind. 1 beweglich ForcePossibilities(); - ULONG nAnz=GetMarkedObjectCount(); - if (nAnz==0) return FALSE; // Nix markiert! + sal_uIntPtr nAnz=GetMarkedObjectCount(); + if (nAnz==0) return sal_False; // Nix markiert! if (nAnz==1) return bMoveAllowed; // einzelnes Obj an der Seite ausrichten return bOneOrMoreMovable; // ansonsten ist MarkCount>=2 } -void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL bBoundRects) +void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, sal_Bool bBoundRects) { if (eHor==SDRHALIGN_NONE && eVert==SDRVALIGN_NONE) return; @@ -1668,9 +1668,9 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL } Rectangle aBound; - ULONG nMarkAnz=GetMarkedObjectCount(); - ULONG nm; - BOOL bHasFixed=FALSE; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nm; + sal_Bool bHasFixed=sal_False; for (nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); @@ -1681,7 +1681,7 @@ void SdrEditView::AlignMarkedObjects(SdrHorAlign eHor, SdrVertAlign eVert, BOOL { Rectangle aObjRect(bBoundRects?pObj->GetCurrentBoundRect():pObj->GetSnapRect()); aBound.Union(aObjRect); - bHasFixed=TRUE; + bHasFixed=sal_True; } } if (!bHasFixed) diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index e02ade62e1..9bb5ac7711 100644..100755 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -37,11 +37,11 @@ #include <svx/svdopath.hxx> // fuer CombineObjects #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdograf.hxx> // fuer Possibilities #include <svx/svdoole2.hxx> // und Mtf-Import -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include "svdfmtf.hxx" #include <svx/svdetc.hxx> #include <sfx2/basedlgs.hxx> @@ -92,13 +92,13 @@ SdrObject* SdrEditView::GetMaxToBtmObj(SdrObject* /*pObj*/) const return NULL; } -void SdrEditView::ObjOrderChanged(SdrObject* /*pObj*/, ULONG /*nOldPos*/, ULONG /*nNewPos*/) +void SdrEditView::ObjOrderChanged(SdrObject* /*pObj*/, sal_uIntPtr /*nOldPos*/, sal_uIntPtr /*nNewPos*/) { } void SdrEditView::MovMarkedToTop() { - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nAnz=GetMarkedObjectCount(); if (nAnz!=0) { const bool bUndo = IsUndoEnabled(); @@ -107,14 +107,14 @@ void SdrEditView::MovMarkedToTop() BegUndo(ImpGetResStr(STR_EditMovToTop),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_MOVTOTOP); SortMarkedObjects(); - ULONG nm; + sal_uIntPtr nm; for (nm=0; nm<nAnz; nm++) { // Ordnums muessen alle stimmen! GetMarkedObjectByIndex(nm)->GetOrdNum(); } - BOOL bChg=FALSE; + sal_Bool bChg=sal_False; SdrObjList* pOL0=NULL; - ULONG nNewPos=0; + sal_uIntPtr nNewPos=0; for (nm=nAnz; nm>0;) { nm--; @@ -123,16 +123,16 @@ void SdrEditView::MovMarkedToTop() SdrObjList* pOL=pObj->GetObjList(); if (pOL!=pOL0) { - nNewPos=ULONG(pOL->GetObjCount()-1); + nNewPos=sal_uIntPtr(pOL->GetObjCount()-1); pOL0=pOL; } - ULONG nNowPos=pObj->GetOrdNumDirect(); + sal_uIntPtr nNowPos=pObj->GetOrdNumDirect(); const Rectangle& rBR=pObj->GetCurrentBoundRect(); - ULONG nCmpPos=nNowPos+1; + sal_uIntPtr nCmpPos=nNowPos+1; SdrObject* pMaxObj=GetMaxToTopObj(pObj); if (pMaxObj!=NULL) { - ULONG nMaxPos=pMaxObj->GetOrdNum(); + sal_uIntPtr nMaxPos=pMaxObj->GetOrdNum(); if (nMaxPos!=0) nMaxPos--; if (nNewPos>nMaxPos) @@ -140,25 +140,25 @@ void SdrEditView::MovMarkedToTop() if (nNewPos<nNowPos) nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben } - BOOL bEnd=FALSE; + sal_Bool bEnd=sal_False; while (nCmpPos<nNewPos && !bEnd) { SdrObject* pCmpObj=pOL->GetObj(nCmpPos); if (pCmpObj==NULL) { OSL_FAIL("MovMarkedToTop(): Vergleichsobjekt nicht gefunden"); - bEnd=TRUE; + bEnd=sal_True; } else if (pCmpObj==pMaxObj) { nNewPos=nCmpPos; nNewPos--; - bEnd=TRUE; + bEnd=sal_True; } else if (rBR.IsOver(pCmpObj->GetCurrentBoundRect())) { nNewPos=nCmpPos; - bEnd=TRUE; + bEnd=sal_True; } else { @@ -167,7 +167,7 @@ void SdrEditView::MovMarkedToTop() } if (nNowPos!=nNewPos) { - bChg=TRUE; + bChg=sal_True; pOL->SetObjectOrdNum(nNowPos,nNewPos); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos)); @@ -186,7 +186,7 @@ void SdrEditView::MovMarkedToTop() void SdrEditView::MovMarkedToBtm() { - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nAnz=GetMarkedObjectCount(); if (nAnz!=0) { const bool bUndo = IsUndoEnabled(); @@ -195,15 +195,15 @@ void SdrEditView::MovMarkedToBtm() BegUndo(ImpGetResStr(STR_EditMovToBtm),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_MOVTOBTM); SortMarkedObjects(); - ULONG nm; + sal_uIntPtr nm; for (nm=0; nm<nAnz; nm++) { // Ordnums muessen alle stimmen! GetMarkedObjectByIndex(nm)->GetOrdNum(); } - BOOL bChg=FALSE; + sal_Bool bChg=sal_False; SdrObjList* pOL0=NULL; - ULONG nNewPos=0; + sal_uIntPtr nNewPos=0; for (nm=0; nm<nAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); @@ -214,19 +214,19 @@ void SdrEditView::MovMarkedToBtm() nNewPos=0; pOL0=pOL; } - ULONG nNowPos=pObj->GetOrdNumDirect(); + sal_uIntPtr nNowPos=pObj->GetOrdNumDirect(); const Rectangle& rBR=pObj->GetCurrentBoundRect(); - ULONG nCmpPos=nNowPos; if (nCmpPos>0) nCmpPos--; + sal_uIntPtr nCmpPos=nNowPos; if (nCmpPos>0) nCmpPos--; SdrObject* pMaxObj=GetMaxToBtmObj(pObj); if (pMaxObj!=NULL) { - ULONG nMinPos=pMaxObj->GetOrdNum()+1; + sal_uIntPtr nMinPos=pMaxObj->GetOrdNum()+1; if (nNewPos<nMinPos) nNewPos=nMinPos; // diesen nicht ueberholen. if (nNewPos>nNowPos) nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben } - BOOL bEnd=FALSE; + sal_Bool bEnd=sal_False; // nNewPos ist an dieser Stelle noch die maximale Position, // an der das Obj hinruecken darf, ohne seinen Vorgaenger // (Mehrfachselektion) zu ueberholen. @@ -236,18 +236,18 @@ void SdrEditView::MovMarkedToBtm() if (pCmpObj==NULL) { OSL_FAIL("MovMarkedToBtm(): Vergleichsobjekt nicht gefunden"); - bEnd=TRUE; + bEnd=sal_True; } else if (pCmpObj==pMaxObj) { nNewPos=nCmpPos; nNewPos++; - bEnd=TRUE; + bEnd=sal_True; } else if (rBR.IsOver(pCmpObj->GetCurrentBoundRect())) { nNewPos=nCmpPos; - bEnd=TRUE; + bEnd=sal_True; } else { @@ -256,7 +256,7 @@ void SdrEditView::MovMarkedToBtm() } if (nNowPos!=nNewPos) { - bChg=TRUE; + bChg=sal_True; pOL->SetObjectOrdNum(nNowPos,nNewPos); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos)); @@ -280,7 +280,7 @@ void SdrEditView::PutMarkedToTop() void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) { - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nAnz=GetMarkedObjectCount(); if (nAnz!=0) { const bool bUndo = IsUndoEnabled(); @@ -293,7 +293,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) { // Damit "Vor das Objekt" auch funktioniert wenn die // markierten Objekte bereits vor dem Objekt stehen - ULONG nRefMark=TryToFindMarkedObject(pRefObj); + sal_uIntPtr nRefMark=TryToFindMarkedObject(pRefObj); SdrMark aRefMark; if (nRefMark!=CONTAINER_ENTRY_NOTFOUND) { @@ -307,14 +307,14 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) SortMarkedObjects(); } } - ULONG nm; + sal_uIntPtr nm; for (nm=0; nm<nAnz; nm++) { // Ordnums muessen alle stimmen! GetMarkedObjectByIndex(nm)->GetOrdNum(); } - BOOL bChg=FALSE; + sal_Bool bChg=sal_False; SdrObjList* pOL0=NULL; - ULONG nNewPos=0; + sal_uIntPtr nNewPos=0; for (nm=nAnz; nm>0;) { nm--; @@ -325,14 +325,14 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) SdrObjList* pOL=pObj->GetObjList(); if (pOL!=pOL0) { - nNewPos=ULONG(pOL->GetObjCount()-1); + nNewPos=sal_uIntPtr(pOL->GetObjCount()-1); pOL0=pOL; } - ULONG nNowPos=pObj->GetOrdNumDirect(); + sal_uIntPtr nNowPos=pObj->GetOrdNumDirect(); SdrObject* pMaxObj=GetMaxToTopObj(pObj); if (pMaxObj!=NULL) { - ULONG nMaxOrd=pMaxObj->GetOrdNum(); // geht leider nicht anders + sal_uIntPtr nMaxOrd=pMaxObj->GetOrdNum(); // geht leider nicht anders if (nMaxOrd>0) nMaxOrd--; if (nNewPos>nMaxOrd) @@ -344,7 +344,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) { if (pRefObj->GetObjList()==pObj->GetObjList()) { - ULONG nMaxOrd=pRefObj->GetOrdNum(); // geht leider nicht anders + sal_uIntPtr nMaxOrd=pRefObj->GetOrdNum(); // geht leider nicht anders if (nNewPos>nMaxOrd) nNewPos=nMaxOrd; // nicht ueberholen. if (nNewPos<nNowPos) @@ -357,7 +357,7 @@ void SdrEditView::PutMarkedInFrontOfObj(const SdrObject* pRefObj) } if (nNowPos!=nNewPos) { - bChg=TRUE; + bChg=sal_True; pOL->SetObjectOrdNum(nNowPos,nNewPos); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos)); @@ -382,7 +382,7 @@ void SdrEditView::PutMarkedToBtm() void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) { - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nAnz=GetMarkedObjectCount(); if (nAnz!=0) { const bool bUndo = IsUndoEnabled(); @@ -395,7 +395,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) { // Damit "Hinter das Objekt" auch funktioniert wenn die // markierten Objekte bereits hinter dem Objekt stehen - ULONG nRefMark=TryToFindMarkedObject(pRefObj); + sal_uIntPtr nRefMark=TryToFindMarkedObject(pRefObj); SdrMark aRefMark; if (nRefMark!=CONTAINER_ENTRY_NOTFOUND) { @@ -409,13 +409,13 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) SortMarkedObjects(); } } - ULONG nm; + sal_uIntPtr nm; for (nm=0; nm<nAnz; nm++) { // Ordnums muessen alle stimmen! GetMarkedObjectByIndex(nm)->GetOrdNum(); } - BOOL bChg=FALSE; + sal_Bool bChg=sal_False; SdrObjList* pOL0=NULL; - ULONG nNewPos=0; + sal_uIntPtr nNewPos=0; for (nm=0; nm<nAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -425,16 +425,16 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) nNewPos=0; pOL0=pOL; } - ULONG nNowPos=pObj->GetOrdNumDirect(); + sal_uIntPtr nNowPos=pObj->GetOrdNumDirect(); SdrObject* pMinObj=GetMaxToBtmObj(pObj); if (pMinObj!=NULL) { - ULONG nMinOrd=pMinObj->GetOrdNum()+1; // geht leider nicht anders + sal_uIntPtr nMinOrd=pMinObj->GetOrdNum()+1; // geht leider nicht anders if (nNewPos<nMinOrd) nNewPos=nMinOrd; // nicht ueberholen. if (nNewPos>nNowPos) nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben } if (pRefObj!=NULL) { if (pRefObj->GetObjList()==pObj->GetObjList()) { - ULONG nMinOrd=pRefObj->GetOrdNum(); // geht leider nicht anders + sal_uIntPtr nMinOrd=pRefObj->GetOrdNum(); // geht leider nicht anders if (nNewPos<nMinOrd) nNewPos=nMinOrd; // nicht ueberholen. if (nNewPos>nNowPos) nNewPos=nNowPos; // aber dabei auch nicht in die falsche Richtung schieben } else { @@ -442,7 +442,7 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) } } if (nNowPos!=nNewPos) { - bChg=TRUE; + bChg=sal_True; pOL->SetObjectOrdNum(nNowPos,nNewPos); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj,nNowPos,nNewPos)); @@ -463,32 +463,32 @@ void SdrEditView::PutMarkedBehindObj(const SdrObject* pRefObj) void SdrEditView::ReverseOrderOfMarked() { SortMarkedObjects(); - ULONG nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz>0) { - //BOOL bNeedBundle=FALSE; - BOOL bChg=FALSE; + //sal_Bool bNeedBundle=sal_False; + sal_Bool bChg=sal_False; bool bUndo = IsUndoEnabled(); if( bUndo ) BegUndo(ImpGetResStr(STR_EditRevOrder),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_REVORDER); - ULONG a=0; + sal_uIntPtr a=0; do { // Markierung ueber mehrere PageViews berueksichtigen - ULONG b=a+1; + sal_uIntPtr b=a+1; while (b<nMarkAnz && GetSdrPageViewOfMarkedByIndex(b) == GetSdrPageViewOfMarkedByIndex(a)) b++; b--; SdrObjList* pOL=GetSdrPageViewOfMarkedByIndex(a)->GetObjList(); - ULONG c=b; + sal_uIntPtr c=b; if (a<c) { // Sicherstellen, dass die OrdNums nicht Dirty sind GetMarkedObjectByIndex(a)->GetOrdNum(); } while (a<c) { SdrObject* pObj1=GetMarkedObjectByIndex(a); SdrObject* pObj2=GetMarkedObjectByIndex(c); - ULONG nOrd1=pObj1->GetOrdNumDirect(); - ULONG nOrd2=pObj2->GetOrdNumDirect(); + sal_uIntPtr nOrd1=pObj1->GetOrdNumDirect(); + sal_uIntPtr nOrd2=pObj2->GetOrdNumDirect(); if( bUndo ) { AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoObjectOrdNum(*pObj1,nOrd1,nOrd2)); @@ -499,7 +499,7 @@ void SdrEditView::ReverseOrderOfMarked() pOL->SetObjectOrdNum(nOrd2-1,nOrd1); // Verwendung von Replace statt SetOrdNum wg. Performance (Neuberechnung der Ordnums) a++; c--; - bChg=TRUE; + bChg=sal_True; } a=b+1; } while (a<nMarkAnz); @@ -514,30 +514,30 @@ void SdrEditView::ReverseOrderOfMarked() void SdrEditView::ImpCheckToTopBtmPossible() { - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nAnz=GetMarkedObjectCount(); if (nAnz==0) return; if (nAnz==1) { // Sonderbehandlung fuer Einzelmarkierung SdrObject* pObj=GetMarkedObjectByIndex(0); SdrObjList* pOL=pObj->GetObjList(); - ULONG nMax=pOL->GetObjCount(); - ULONG nMin=0; - ULONG nObjNum=pObj->GetOrdNum(); + sal_uIntPtr nMax=pOL->GetObjCount(); + sal_uIntPtr nMin=0; + sal_uIntPtr nObjNum=pObj->GetOrdNum(); SdrObject* pRestrict=GetMaxToTopObj(pObj); if (pRestrict!=NULL) { - ULONG nRestrict=pRestrict->GetOrdNum(); + sal_uIntPtr nRestrict=pRestrict->GetOrdNum(); if (nRestrict<nMax) nMax=nRestrict; } pRestrict=GetMaxToBtmObj(pObj); if (pRestrict!=NULL) { - ULONG nRestrict=pRestrict->GetOrdNum(); + sal_uIntPtr nRestrict=pRestrict->GetOrdNum(); if (nRestrict>nMin) nMin=nRestrict; } - bToTopPossible=nObjNum<ULONG(nMax-1); + bToTopPossible=nObjNum<sal_uIntPtr(nMax-1); bToBtmPossible=nObjNum>nMin; } else { // Mehrfachselektion - ULONG nm=0; + sal_uIntPtr nm=0; SdrObjList* pOL0=NULL; long nPos0=-1; while (!bToBtmPossible && nm<nAnz) { // 'nach hinten' checken @@ -547,8 +547,8 @@ void SdrEditView::ImpCheckToTopBtmPossible() nPos0=-1; pOL0=pOL; } - ULONG nPos=pObj->GetOrdNum(); - bToBtmPossible=nPos>ULONG(nPos0+1); + sal_uIntPtr nPos=pObj->GetOrdNum(); + bToBtmPossible=nPos>sal_uIntPtr(nPos0+1); nPos0=long(nPos); nm++; } @@ -563,8 +563,8 @@ void SdrEditView::ImpCheckToTopBtmPossible() nPos0=pOL->GetObjCount(); pOL0=pOL; } - ULONG nPos=pObj->GetOrdNum(); - bToTopPossible=nPos+1<ULONG(nPos0); + sal_uIntPtr nPos=pObj->GetOrdNum(); + bToTopPossible=nPos+1<sal_uIntPtr(nPos0); nPos0=nPos; } } @@ -758,12 +758,12 @@ basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPol const basegfx::B2DPoint aCB(aCandidate.getB2DPoint(aCandidate.count() - 1L)); const basegfx::B2DPoint aRA(aRetval.getB2DPoint(0L)); const basegfx::B2DPoint aRB(aRetval.getB2DPoint(aRetval.count() - 1L)); - + const double fRACA(basegfx::B2DVector(aCA - aRA).getLength()); const double fRACB(basegfx::B2DVector(aCB - aRA).getLength()); const double fRBCA(basegfx::B2DVector(aCA - aRB).getLength()); const double fRBCB(basegfx::B2DVector(aCB - aRB).getLength()); - + const double fSmallestRA(fRACA < fRACB ? fRACA : fRACB); const double fSmallestRB(fRBCA < fRBCB ? fRBCA : fRBCB); @@ -800,8 +800,8 @@ basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPol struct ImpDistributeEntry { SdrObject* mpObj; - INT32 mnPos; - INT32 mnLength; + sal_Int32 mnPos; + sal_Int32 mnLength; }; typedef vector< ImpDistributeEntry*> ImpDistributeEntryList; @@ -820,7 +820,7 @@ void SdrEditView::DistributeMarkedObjects() AbstractSvxDistributeDialog *pDlg = pFact->CreateSvxDistributeDialog(NULL, aNewAttr); DBG_ASSERT(pDlg, "Dialogdiet fail!"); - UINT16 nResult = pDlg->Execute(); + sal_uInt16 nResult = pDlg->Execute(); if(nResult == RET_OK) { @@ -828,7 +828,7 @@ void SdrEditView::DistributeMarkedObjects() SvxDistributeVertical eVer = pDlg->GetDistributeVer(); ImpDistributeEntryList aEntryList; ImpDistributeEntryList::iterator itEntryList; - UINT32 nFullLength; + sal_uInt32 nFullLength; const bool bUndo = IsUndoEnabled(); if( bUndo ) @@ -875,7 +875,8 @@ void SdrEditView::DistributeMarkedObjects() for ( itEntryList = aEntryList.begin(); itEntryList < aEntryList.end() && (*itEntryList)->mnPos < pNew->mnPos; - ++itEntryList ); + ++itEntryList ) + {}; if ( itEntryList < aEntryList.end() ) aEntryList.insert( itEntryList, pNew ); else @@ -885,7 +886,7 @@ void SdrEditView::DistributeMarkedObjects() if(eHor == SvxDistributeHorizontalDistance) { // calc room in-between - INT32 nWidth = GetAllMarkedBoundRect().GetWidth() + 1; + sal_Int32 nWidth = GetAllMarkedBoundRect().GetWidth() + 1; double fStepWidth = ((double)nWidth - (double)nFullLength) / (double)(aEntryList.size() - 1); double fStepStart = (double)aEntryList[ 0 ]->mnPos; fStepStart += fStepWidth + (double)((aEntryList[ 0 ]->mnLength + aEntryList[ 1 ]->mnLength) / 2); @@ -895,7 +896,7 @@ void SdrEditView::DistributeMarkedObjects() { ImpDistributeEntry* pCurr = aEntryList[ i ]; ImpDistributeEntry* pNext = aEntryList[ i + 1]; - INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos; + sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos; if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj)); pCurr->mpObj->Move(Size(nDelta, 0)); @@ -905,7 +906,7 @@ void SdrEditView::DistributeMarkedObjects() else { // calc distances - INT32 nWidth = aEntryList[ aEntryList.size() - 1 ]->mnPos - aEntryList[ 0 ]->mnPos; + sal_Int32 nWidth = aEntryList[ aEntryList.size() - 1 ]->mnPos - aEntryList[ 0 ]->mnPos; double fStepWidth = (double)nWidth / (double)(aEntryList.size() - 1); double fStepStart = (double)aEntryList[ 0 ]->mnPos; fStepStart += fStepWidth; @@ -914,7 +915,7 @@ void SdrEditView::DistributeMarkedObjects() for( size_t i = 1 ; i < aEntryList.size()-1 ; ++i ) { ImpDistributeEntry* pCurr = aEntryList[ i ]; - INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos; + sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos; if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj)); pCurr->mpObj->Move(Size(nDelta, 0)); @@ -969,7 +970,8 @@ void SdrEditView::DistributeMarkedObjects() for ( itEntryList = aEntryList.begin(); itEntryList < aEntryList.end() && (*itEntryList)->mnPos < pNew->mnPos; - ++itEntryList ); + ++itEntryList ) + {}; if ( itEntryList < aEntryList.end() ) aEntryList.insert( itEntryList, pNew ); else @@ -979,7 +981,7 @@ void SdrEditView::DistributeMarkedObjects() if(eVer == SvxDistributeVerticalDistance) { // calc room in-between - INT32 nHeight = GetAllMarkedBoundRect().GetHeight() + 1; + sal_Int32 nHeight = GetAllMarkedBoundRect().GetHeight() + 1; double fStepWidth = ((double)nHeight - (double)nFullLength) / (double)(aEntryList.size() - 1); double fStepStart = (double)aEntryList[ 0 ]->mnPos; fStepStart += fStepWidth + (double)((aEntryList[ 0 ]->mnLength + aEntryList[ 1 ]->mnLength) / 2); @@ -989,7 +991,7 @@ void SdrEditView::DistributeMarkedObjects() { ImpDistributeEntry* pCurr = aEntryList[ i ]; ImpDistributeEntry* pNext = aEntryList[ i + 1 ]; - INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos; + sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos; if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj)); pCurr->mpObj->Move(Size(0, nDelta)); @@ -999,7 +1001,7 @@ void SdrEditView::DistributeMarkedObjects() else { // calc distances - INT32 nHeight = aEntryList[ aEntryList.size() - 1 ]->mnPos - aEntryList[ 0 ]->mnPos; + sal_Int32 nHeight = aEntryList[ aEntryList.size() - 1 ]->mnPos - aEntryList[ 0 ]->mnPos; double fStepWidth = (double)nHeight / (double)(aEntryList.size() - 1); double fStepStart = (double)aEntryList[ 0 ]->mnPos; fStepStart += fStepWidth; @@ -1008,7 +1010,7 @@ void SdrEditView::DistributeMarkedObjects() for(size_t i = 1, n = aEntryList.size()-1; i < n; ++i) { ImpDistributeEntry* pCurr = aEntryList[ i ]; - INT32 nDelta = (INT32)(fStepStart + 0.5) - pCurr->mnPos; + sal_Int32 nDelta = (sal_Int32)(fStepStart + 0.5) - pCurr->mnPos; if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pCurr->mpObj)); pCurr->mpObj->Move(Size(0, nDelta)); @@ -1047,24 +1049,24 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) if( bUndo ) BegUndo(); - UINT32 nInsPos=0xFFFFFFFF; + sal_uInt32 nInsPos=0xFFFFFFFF; const SdrObject* pAttrObj = NULL; basegfx::B2DPolyPolygon aMergePolyPolygonA; basegfx::B2DPolyPolygon aMergePolyPolygonB; SdrObjList* pInsOL = NULL; SdrPageView* pInsPV = NULL; - BOOL bFirstObjectComplete(FALSE); + sal_Bool bFirstObjectComplete(sal_False); // make sure selected objects are contour objects // since now basegfx::tools::adaptiveSubdivide() is used, it is no longer // necessary to use ConvertMarkedToPolyObj which will subdivide curves using the old // mechanisms. In a next step the polygon clipper will even be able to clip curves... - // ConvertMarkedToPolyObj(TRUE); + // ConvertMarkedToPolyObj(sal_True); ConvertMarkedToPathObj(sal_True); OSL_ENSURE(AreObjectsMarked(), "no more objects selected after preparations (!)"); - for(UINT32 a=0;a<GetMarkedObjectCount();a++) + for(sal_uInt32 a=0;a<GetMarkedObjectCount();a++) { SdrMark* pM = GetSdrMarkByIndex(a); SdrObject* pObj = pM->GetMarkedSdrObj(); @@ -1132,7 +1134,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) // was there something added to the first poly? if(!bFirstObjectComplete && aMergePolyPolygonA.count()) { - bFirstObjectComplete = TRUE; + bFirstObjectComplete = sal_True; } // move object to temporary delete list @@ -1179,7 +1181,7 @@ void SdrEditView::MergeMarkedObjects(SdrMergeMode eMode) pInsOL->InsertObject(pPath, nInsPos, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath)); - MarkObj(pPath, pInsPV, FALSE, TRUE); + MarkObj(pPath, pInsPV, sal_False, sal_True); } aRemove.ForceSort(); @@ -1375,7 +1377,7 @@ void SdrEditView::CombineMarkedObjects(sal_Bool bNoPolyPoly) // in the UNDO there is no problem, but as soon as they get deleted, the // MarkList will contain deleted objects -> GPF. UnmarkAllObj(pInsPV); - MarkObj(pPath, pInsPV, FALSE, TRUE); + MarkObj(pPath, pInsPV, sal_False, sal_True); } // UndoComment aus den tatsaechlich verwendeten Objekten zusammenbauen @@ -1428,8 +1430,8 @@ sal_Bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolyg sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines) const { - sal_Bool bOtherObjs(sal_False); // TRUE=andere Objekte ausser PathObj's vorhanden - sal_Bool bMin1PolyPoly(sal_False); // TRUE=mind. 1 PolyPolygon mit mehr als ein Polygon vorhanden + sal_Bool bOtherObjs(sal_False); // sal_True=andere Objekte ausser PathObj's vorhanden + sal_Bool bMin1PolyPoly(sal_False); // sal_True=mind. 1 PolyPolygon mit mehr als ein Polygon vorhanden SdrObjList* pOL = pObj->GetSubList(); if(pOL) @@ -1504,7 +1506,7 @@ sal_Bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, sal_Bool bMakeLines return bMin1PolyPoly && !bOtherObjs; } -void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, ULONG& rPos, SdrPageView* pPV, BOOL bMakeLines) +void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, sal_uIntPtr& rPos, SdrPageView* pPV, sal_Bool bMakeLines) { const SdrPathObj* pSrcPath = PTR_CAST(SdrPathObj, pObj); const SdrObjCustomShape* pCustomShape = PTR_CAST(SdrObjCustomShape, pObj); @@ -1531,8 +1533,8 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, SdrInsertReason aReason(SDRREASON_VIEWCALL, pSrcPath); rOL.InsertObject(pPath, rPos, &aReason); if( bUndo ) - AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, TRUE)); - MarkObj(pPath, pPV, FALSE, TRUE); + AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, sal_True)); + MarkObj(pPath, pPV, sal_False, sal_True); rPos++; } else @@ -1566,8 +1568,8 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, SdrInsertReason aReason(SDRREASON_VIEWCALL, pSrcPath); rOL.InsertObject(pPath, rPos, &aReason); if( bUndo ) - AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, TRUE)); - MarkObj(pPath, pPV, FALSE, TRUE); + AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pPath, sal_True)); + MarkObj(pPath, pPV, sal_False, sal_True); rPos++; } } @@ -1603,7 +1605,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, rOL.InsertObject(pCandidate, rPos, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pCandidate, true)); - MarkObj(pCandidate, pPV, FALSE, TRUE); + MarkObj(pCandidate, pPV, sal_False, sal_True); if(pCustomShape->HasText() && !pCustomShape->IsTextPath()) { @@ -1648,16 +1650,16 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, rOL.InsertObject(pTextObj, rPos + 1, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pTextObj, true)); - MarkObj(pTextObj, pPV, FALSE, TRUE); + MarkObj(pTextObj, pPV, sal_False, sal_True); } } } } } -void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines) +void SdrEditView::DismantleMarkedObjects(sal_Bool bMakeLines) { - //UINT32 nCnt(0); + //sal_uInt32 nCnt(0); // Temporaere Marklist SdrMarkList aRemoveMerker; @@ -1672,8 +1674,8 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines) bMakeLines ? SDRREPFUNC_OBJ_DISMANTLE_LINES : SDRREPFUNC_OBJ_DISMANTLE_POLYS); } - ULONG nm; - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nm; + sal_uIntPtr nAnz=GetMarkedObjectCount(); SdrObjList* pOL0=NULL; for (nm=nAnz; nm>0;) { nm--; @@ -1684,8 +1686,8 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines) if (pOL!=pOL0) { pOL0=pOL; pObj->GetOrdNum(); } // sicherstellen, dass OrdNums stimmen! if (ImpCanDismantle(pObj,bMakeLines)) { aRemoveMerker.InsertEntry(SdrMark(pObj,pM->GetPageView())); - ULONG nPos0=pObj->GetOrdNumDirect(); - ULONG nPos=nPos0+1; + sal_uIntPtr nPos0=pObj->GetOrdNumDirect(); + sal_uIntPtr nPos=nPos0+1; SdrObjList* pSubList=pObj->GetSubList(); if (pSubList!=NULL && !pObj->Is3DObj()) { SdrObjListIter aIter(*pSubList,IM_DEEPNOGROUPS); @@ -1697,7 +1699,7 @@ void SdrEditView::DismantleMarkedObjects(BOOL bMakeLines) ImpDismantleOneObject(pObj,*pOL,nPos,pPV,bMakeLines); } if( bUndo ) - AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pObj,TRUE)); + AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoDeleteObject(*pObj,sal_True)); pOL->RemoveObject(nPos0); if( !bUndo ) @@ -1735,8 +1737,8 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) { BegUndo(ImpGetResStr(STR_EditGroup),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_GROUP); - const ULONG nAnz = GetMarkedObjectCount(); - for(ULONG nm = nAnz; nm>0; ) + const sal_uIntPtr nAnz = GetMarkedObjectCount(); + for(sal_uIntPtr nm = nAnz; nm>0; ) { // UndoActions fuer alle betroffenen Objekte anlegen nm--; @@ -1766,9 +1768,9 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) SdrObjList* pDstLst=NULL; // Falls alle markierten Objekte aus Fremden Obj-Listen // kommen, kommt das Gruppenobjekt an das Ende der Liste. - ULONG nInsPos=pSrcLst->GetObjCount(); - BOOL bNeedInsPos=TRUE; - for (ULONG nm=GetMarkedObjectCount(); nm>0;) + sal_uIntPtr nInsPos=pSrcLst->GetObjCount(); + sal_Bool bNeedInsPos=sal_True; + for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) { nm--; SdrMark* pM=GetSdrMarkByIndex(nm); @@ -1790,13 +1792,13 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) if (pSrcLst->IsObjOrdNumsDirty()) pSrcLst->RecalcObjOrdNums(); } - BOOL bForeignList=pSrcLst!=pAktLst; - BOOL bGrouped=pSrcLst!=pPage; + sal_Bool bForeignList=pSrcLst!=pAktLst; + sal_Bool bGrouped=pSrcLst!=pPage; if (!bForeignList && bNeedInsPos) { nInsPos=pObj->GetOrdNum(); // ua, damit sind alle ObjOrdNum der Page gesetzt nInsPos++; - bNeedInsPos=FALSE; + bNeedInsPos=sal_False; } pSrcLst->RemoveObject(pObj->GetOrdNumDirect()); if (!bForeignList) @@ -1819,13 +1821,13 @@ void SdrEditView::GroupMarked(const SdrObject* pUserGrp) if (pGrp!=NULL) { aNewMark.InsertEntry(SdrMark(pGrp,pPV)); - ULONG nAnz=pDstLst->GetObjCount(); + sal_uIntPtr nAnz=pDstLst->GetObjCount(); SdrInsertReason aReason(SDRREASON_VIEWCALL,pRefObj); pAktLst->InsertObject(pGrp,nInsPos,&aReason); if( bUndo ) { AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pGrp,true)); // Kein Recalc! - for (ULONG no=0; no<nAnz; no++) + for (sal_uIntPtr no=0; no<nAnz; no++) { AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoInsertObject(*pDstLst->GetObj(no))); } @@ -1858,11 +1860,11 @@ void SdrEditView::UnGroupMarked() if( bUndo ) BegUndo(String(), String(), SDRREPFUNC_OBJ_UNGROUP); - ULONG nCount=0; + sal_uIntPtr nCount=0; XubString aName1; XubString aName; - BOOL bNameOk=FALSE; - for (ULONG nm=GetMarkedObjectCount(); nm>0;) { + sal_Bool bNameOk=sal_False; + for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) { nm--; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pGrp=pM->GetMarkedSdrObj(); @@ -1872,7 +1874,7 @@ void SdrEditView::UnGroupMarked() if (nCount==1) { pGrp->TakeObjNameSingul(aName); // Bezeichnung der Gruppe holen pGrp->TakeObjNamePlural(aName1); // Bezeichnung der Gruppe holen - bNameOk=TRUE; + bNameOk=sal_True; } else { if (nCount==2) aName=aName1; // Pluralname setzen if (bNameOk) { @@ -1880,17 +1882,17 @@ void SdrEditView::UnGroupMarked() pGrp->TakeObjNamePlural(aStr); // Bezeichnung der Gruppe holen if(!aStr.Equals(aName)) - bNameOk = FALSE; + bNameOk = sal_False; } } - ULONG nDstCnt=pGrp->GetOrdNum(); + sal_uIntPtr nDstCnt=pGrp->GetOrdNum(); SdrObjList* pDstLst=pM->GetPageView()->GetObjList(); // FIRST move contained objects to parent of group, so that // the contained objects are NOT migrated to the UNDO-ItemPool // when AddUndo(new SdrUndoDelObj(*pGrp)) is called. - ULONG nAnz=pSrcLst->GetObjCount(); - ULONG no; + sal_uIntPtr nAnz=pSrcLst->GetObjCount(); + sal_uIntPtr no; if( bUndo ) { @@ -1912,7 +1914,7 @@ void SdrEditView::UnGroupMarked() // Kein SortCheck beim einfuegen in die MarkList, denn das // wuerde wg. pObj->GetOrdNum() jedesmal ein RecalcOrdNums() // provozieren: - aNewMark.InsertEntry(SdrMark(pObj,pM->GetPageView()),FALSE); + aNewMark.InsertEntry(SdrMark(pObj,pM->GetPageView()),sal_False); } if( bUndo ) @@ -1943,7 +1945,7 @@ void SdrEditView::UnGroupMarked() if (nCount!=0) { - GetMarkedObjectListWriteAccess().Merge(aNewMark,TRUE); // Durch das obige Einsortieren ist aNewMark genau verkehrtherum + GetMarkedObjectListWriteAccess().Merge(aNewMark,sal_True); // Durch das obige Einsortieren ist aNewMark genau verkehrtherum MarkListHasChanged(); } } @@ -1958,7 +1960,7 @@ void SdrEditView::UnGroupMarked() // //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLineToArea) +SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, sal_Bool bPath, sal_Bool bLineToArea) { SdrObject* pNewObj = pObj->ConvertToPolyObj(bPath, bLineToArea); if (pNewObj!=NULL) @@ -1980,12 +1982,12 @@ SdrObject* SdrEditView::ImpConvertOneObj(SdrObject* pObj, BOOL bPath, BOOL bLine return pNewObj; } -void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea) +void SdrEditView::ImpConvertTo(sal_Bool bPath, sal_Bool bLineToArea) { - BOOL bMrkChg=FALSE; + sal_Bool bMrkChg=sal_False; if (AreObjectsMarked()) { - ULONG nMarkAnz=GetMarkedObjectCount(); - USHORT nDscrID=0; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_uInt16 nDscrID=0; if(bLineToArea) { if(nMarkAnz == 1) @@ -2007,7 +2009,7 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea) BegUndo(ImpGetResStr(nDscrID),GetDescriptionOfMarkedObjects(),SDRREPFUNC_OBJ_CONVERTTOPOLY); } } - for (ULONG nm=nMarkAnz; nm>0;) { + for (sal_uIntPtr nm=nMarkAnz; nm>0;) { nm--; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -2022,7 +2024,7 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea) } else { SdrObject* pNewObj=ImpConvertOneObj(pObj,bPath,bLineToArea); if (pNewObj!=NULL) { - bMrkChg=TRUE; + bMrkChg=sal_True; GetMarkedObjectListWriteAccess().ReplaceMark(SdrMark(pNewObj,pPV),nm); } } @@ -2033,14 +2035,14 @@ void SdrEditView::ImpConvertTo(BOOL bPath, BOOL bLineToArea) } } -void SdrEditView::ConvertMarkedToPathObj(BOOL bLineToArea) +void SdrEditView::ConvertMarkedToPathObj(sal_Bool bLineToArea) { - ImpConvertTo(TRUE, bLineToArea); + ImpConvertTo(sal_True, bLineToArea); } -void SdrEditView::ConvertMarkedToPolyObj(BOOL bLineToArea) +void SdrEditView::ConvertMarkedToPolyObj(sal_Bool bLineToArea) { - ImpConvertTo(FALSE, bLineToArea); + ImpConvertTo(sal_False, bLineToArea); } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -2063,9 +2065,9 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) SortMarkedObjects(); SdrMarkList aForTheDescription; SdrMarkList aNewMarked; - ULONG nAnz=GetMarkedObjectCount(); + sal_uIntPtr nAnz=GetMarkedObjectCount(); - for (ULONG nm=nAnz; nm>0;) + for (sal_uIntPtr nm=nAnz; nm>0;) { // Undo Objekte fuer alle neuen Objekte erzeugen // zwischen den Metafiles auf Abbruch testen if( pProgrInfo != NULL ) @@ -2080,10 +2082,10 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); SdrObjList* pOL=pObj->GetObjList(); - ULONG nInsPos=pObj->GetOrdNum()+1; + sal_uIntPtr nInsPos=pObj->GetOrdNum()+1; SdrGrafObj* pGraf=PTR_CAST(SdrGrafObj,pObj); SdrOle2Obj* pOle2=PTR_CAST(SdrOle2Obj,pObj); - ULONG nInsAnz=0; + sal_uIntPtr nInsAnz=0; if (pGraf!=NULL && pGraf->HasGDIMetaFile()) { ImpSdrGDIMetaFileImport aFilter(*pMod); @@ -2101,8 +2103,8 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) } if (nInsAnz!=0) { - ULONG nObj=nInsPos; - for (ULONG i=0; i<nInsAnz; i++) + sal_uIntPtr nObj=nInsPos; + for (sal_uIntPtr i=0; i<nInsAnz; i++) { if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pOL->GetObj(nObj))); @@ -2131,7 +2133,7 @@ void SdrEditView::DoImportMarkedMtf(SvdProgressInfo *pProgrInfo) if(aNewMarked.GetMarkCount()) { // Neue Selektion bilden - for(ULONG a(0); a < aNewMarked.GetMarkCount(); a++) + for(sal_uIntPtr a(0); a < aNewMarked.GetMarkCount(); a++) { GetMarkedObjectListWriteAccess().InsertEntry(*aNewMarked.GetMark(a)); } diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 310a05699a..bd6874ea0d 100644..100755 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -50,12 +50,12 @@ #include <editeng/editobj.hxx> #include <editeng/outlobj.hxx> #include <editeng/scripttypeitem.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdoutl.hxx> #include <svx/sdtfchim.hxx> #include <svx/svdotext.hxx> #include <svx/svdundo.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "svx/svdpagv.hxx" #include "svx/svdpage.hxx" #include "svx/svdetc.hxx" // fuer GetDraftFillColor @@ -67,36 +67,36 @@ #include <svx/svdoutl.hxx> #include <svx/svddrgv.hxx> // fuer SetSolidDragging() -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache -#include "globl3d.hxx" +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache +#include "svx/globl3d.hxx" #include <editeng/outliner.hxx> #include <editeng/adjitem.hxx> #include <svtools/colorcfg.hxx> #include <vcl/svapp.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// void SdrObjEditView::ImpClearVars() { - bQuickTextEditMode=TRUE; - bMacroMode=TRUE; + bQuickTextEditMode=sal_True; + bMacroMode=sal_True; pTextEditOutliner=NULL; pTextEditOutlinerView=NULL; pTextEditPV=NULL; pTextEditWin=NULL; pTextEditCursorMerker=NULL; pEditPara=NULL; - bTextEditNewObj=FALSE; - bMacroDown=FALSE; + bTextEditNewObj=sal_False; + bMacroDown=sal_False; pMacroObj=NULL; pMacroPV=NULL; pMacroWin=NULL; nMacroTol=0; - bTextEditDontDelete=FALSE; - bTextEditOnlyOneView=FALSE; + bTextEditDontDelete=sal_False; + bTextEditOnlyOneView=sal_False; } SdrObjEditView::SdrObjEditView(SdrModel* pModel1, OutputDevice* pOut): @@ -116,7 +116,7 @@ SdrObjEditView::~SdrObjEditView() //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrObjEditView::IsAction() const +sal_Bool SdrObjEditView::IsAction() const { return IsMacroObj() || SdrGlueEditView::IsAction(); } @@ -184,10 +184,10 @@ void SdrObjEditView::ModelHasChanged() if (IsTextEdit()) { SdrTextObj* pTextObj=dynamic_cast<SdrTextObj*>( mxTextEditObj.get() ); if (pTextObj!=NULL) { - ULONG nOutlViewAnz=pTextEditOutliner->GetViewCount(); - BOOL bAreaChg=FALSE; - BOOL bAnchorChg=FALSE; - BOOL bColorChg=FALSE; + sal_uIntPtr nOutlViewAnz=pTextEditOutliner->GetViewCount(); + sal_Bool bAreaChg=sal_False; + sal_Bool bAnchorChg=sal_False; + sal_Bool bColorChg=sal_False; bool bContourFrame=pTextObj->IsContourTextFrame(); EVAnchorMode eNewAnchor(ANCHOR_VCENTER_HCENTER); Rectangle aOldArea(aMinTextEditArea); @@ -211,34 +211,34 @@ void SdrObjEditView::ModelHasChanged() pTextEditOutliner->GetMinAutoPaperSize()!=aPaperMin1 || pTextEditOutliner->GetMaxAutoPaperSize()!=aPaperMax1) { aTextEditArea=aEditArea1; aMinTextEditArea=aMinArea1; - pTextEditOutliner->SetUpdateMode(FALSE); + pTextEditOutliner->SetUpdateMode(sal_False); pTextEditOutliner->SetMinAutoPaperSize(aPaperMin1); pTextEditOutliner->SetMaxAutoPaperSize(aPaperMax1); pTextEditOutliner->SetPaperSize(Size(0,0)); // Damit der Outliner neu formatiert if (!bContourFrame) { pTextEditOutliner->ClearPolygon(); - ULONG nStat=pTextEditOutliner->GetControlWord(); + sal_uIntPtr nStat=pTextEditOutliner->GetControlWord(); nStat|=EE_CNTRL_AUTOPAGESIZE; pTextEditOutliner->SetControlWord(nStat); } else { - ULONG nStat=pTextEditOutliner->GetControlWord(); + sal_uIntPtr nStat=pTextEditOutliner->GetControlWord(); nStat&=~EE_CNTRL_AUTOPAGESIZE; pTextEditOutliner->SetControlWord(nStat); Rectangle aAnchorRect; pTextObj->TakeTextAnchorRect(aAnchorRect); - pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, TRUE); + pTextObj->ImpSetContourPolygon(*pTextEditOutliner,aAnchorRect, sal_True); } - for (ULONG nOV=0; nOV<nOutlViewAnz; nOV++) { + for (sal_uIntPtr nOV=0; nOV<nOutlViewAnz; nOV++) { OutlinerView* pOLV=pTextEditOutliner->GetView(nOV); - ULONG nStat0=pOLV->GetControlWord(); - ULONG nStat=nStat0; + sal_uIntPtr nStat0=pOLV->GetControlWord(); + sal_uIntPtr nStat=nStat0; // AutoViewSize nur wenn nicht KontourFrame. if (!bContourFrame) nStat|=EV_CNTRL_AUTOSIZE; else nStat&=~EV_CNTRL_AUTOSIZE; if (nStat!=nStat0) pOLV->SetControlWord(nStat); } - pTextEditOutliner->SetUpdateMode(TRUE); - bAreaChg=TRUE; + pTextEditOutliner->SetUpdateMode(sal_True); + bAreaChg=sal_True; } } if (pTextEditOutlinerView!=NULL) { // Fuellfarbe und Anker checken @@ -266,13 +266,13 @@ void SdrObjEditView::ModelHasChanged() // again on ModelHasChanged(). if (bContourFrame || bAreaChg || bAnchorChg || bColorChg) { - for (ULONG nOV=0; nOV<nOutlViewAnz; nOV++) + for (sal_uIntPtr nOV=0; nOV<nOutlViewAnz; nOV++) { OutlinerView* pOLV=pTextEditOutliner->GetView(nOV); { // Alten OutlinerView-Bereich invalidieren Window* pWin=pOLV->GetWindow(); Rectangle aTmpRect(aOldArea); - USHORT nPixSiz=pOLV->GetInvalidateMore()+1; + sal_uInt16 nPixSiz=pOLV->GetInvalidateMore()+1; Size aMore(pWin->PixelToLogic(Size(nPixSiz,nPixSiz))); aTmpRect.Left()-=aMore.Width(); aTmpRect.Right()+=aMore.Width(); @@ -321,7 +321,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang aBlankRect.Union(aMinTextEditArea); Rectangle aPixRect(pWin->LogicToPixel(aBlankRect)); aBlankRect.Intersection(rRect); - rOutlView.GetOutliner()->SetUpdateMode(TRUE); // Bugfix #22596# + rOutlView.GetOutliner()->SetUpdateMode(sal_True); // Bugfix #22596# rOutlView.Paint(aBlankRect); if(!bModifyMerk) @@ -358,7 +358,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang aOuterPix.Bottom()+=nPixSiz; bool bMerk(pWin->IsMapModeEnabled()); - pWin->EnableMapMode(FALSE); + pWin->EnableMapMode(sal_False); PolyPolygon aPolyPoly( 2 ); svtools::ColorConfig aColorConfig; @@ -418,32 +418,32 @@ void SdrObjEditView::ImpInvalidateOutlinerView(OutlinerView& rOutlView) const aOuterPix.Bottom()+=nPixSiz; bool bMerk(pWin->IsMapModeEnabled()); - pWin->EnableMapMode(FALSE); + pWin->EnableMapMode(sal_False); pWin->Invalidate(aOuterPix); pWin->EnableMapMode(bMerk); } } } -OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, BOOL /*bNoPaint*/, OutlinerView* pGivenView) const +OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, sal_Bool /*bNoPaint*/, OutlinerView* pGivenView) const { // Hintergrund Color aBackground(GetTextEditBackgroundColor(*this)); SdrTextObj* pText = dynamic_cast< SdrTextObj * >( mxTextEditObj.get() ); - BOOL bTextFrame=pText!=NULL && pText->IsTextFrame(); - BOOL bContourFrame=pText!=NULL && pText->IsContourTextFrame(); + sal_Bool bTextFrame=pText!=NULL && pText->IsTextFrame(); + sal_Bool bContourFrame=pText!=NULL && pText->IsContourTextFrame(); // OutlinerView erzeugen OutlinerView* pOutlView=pGivenView; - pTextEditOutliner->SetUpdateMode(FALSE); + pTextEditOutliner->SetUpdateMode(sal_False); if (pOutlView==NULL) pOutlView=new OutlinerView(pTextEditOutliner,pWin); else pOutlView->SetWindow(pWin); // Scrollen verbieten - ULONG nStat=pOutlView->GetControlWord(); + sal_uIntPtr nStat=pOutlView->GetControlWord(); nStat&=~EV_CNTRL_AUTOSCROLL; // AutoViewSize nur wenn nicht KontourFrame. if (!bContourFrame) nStat|=EV_CNTRL_AUTOSIZE; if (bTextFrame) { - USHORT nPixSiz=aHdl.GetHdlSize()*2+1; + sal_uInt16 nPixSiz=aHdl.GetHdlSize()*2+1; nStat|=EV_CNTRL_INVONEMORE; pOutlView->SetInvalidateMore(nPixSiz); } @@ -455,12 +455,12 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(Window* pWin, BOOL /*bNoPaint* pTextEditOutliner->SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)pText->GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue()); } pOutlView->SetOutputArea(aTextEditArea); - pTextEditOutliner->SetUpdateMode(TRUE); + pTextEditOutliner->SetUpdateMode(sal_True); ImpInvalidateOutlinerView(*pOutlView); return pOutlView; } -BOOL SdrObjEditView::IsTextEditFrame() const +sal_Bool SdrObjEditView::IsTextEditFrame() const { SdrTextObj* pText = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() ); return pText!=NULL && pText->IsTextFrame(); @@ -488,7 +488,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI) if (pTextObj!=NULL) { Color* pTxtCol=NULL; Color* pFldCol=NULL; - bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),TRUE,pTxtCol,pFldCol,rStr); + bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),sal_True,pTxtCol,pFldCol,rStr); if (bOk) { if (pTxtCol!=NULL) { pFI->SetTxtColor(*pTxtCol); @@ -506,7 +506,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI) Link aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl(); if (!bOk && aDrawOutlLink.IsSet()) { aDrawOutlLink.Call(pFI); - bOk = (BOOL)rStr.Len(); + bOk = (sal_Bool)rStr.Len(); } if (!bOk && aOldCalcFieldValueLink.IsSet()) { return aOldCalcFieldValueLink.Call(pFI); @@ -524,7 +524,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( SdrEndTextEdit(); if( dynamic_cast< SdrTextObj* >( pObj ) == 0 ) - return FALSE; // currently only possible with text objects + return sal_False; // currently only possible with text objects if(bGrabFocus && pWin) { @@ -605,7 +605,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( pTextEditOutliner->ForceAutoColor( aOptions.GetIsAutomaticFontColor() ); } - BOOL bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL; + sal_Bool bEmpty = mxTextEditObj->GetOutlinerParaObject()==NULL; aOldCalcFieldValueLink=pTextEditOutliner->GetCalcFieldValueHdl(); // Der FieldHdl muss von SdrBeginTextEdit gesetzt sein, da dor ein UpdateFields gerufen wird. @@ -623,7 +623,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( mxTextEditObj.get() ); DBG_ASSERT( pTextObj, "svx::SdrObjEditView::BegTextEdit(), no text object?" ); if( !pTextObj ) - return FALSE; + return sal_False; // #111096# Switch off evtl. running TextAnimation pTextObj->SetTextAnimationAllowed(sal_False); @@ -643,8 +643,8 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( Rectangle aTextRect; Rectangle aAnchorRect; - pTextObj->TakeTextRect(*pTextEditOutliner, aTextRect, TRUE, - &aAnchorRect /* #97097# Give TRUE here, not FALSE */); + pTextObj->TakeTextRect(*pTextEditOutliner, aTextRect, sal_True, + &aAnchorRect /* #97097# Give sal_True here, not sal_False */); if ( !pTextObj->IsContourTextFrame() ) { @@ -662,7 +662,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( aMinTextEditArea.Move(aPvOfs.X(),aPvOfs.Y()); pTextEditCursorMerker=pWin->GetCursor(); - aHdl.SetMoveOutside(TRUE); + aHdl.SetMoveOutside(sal_True); // #i72757# // Since IsMarkHdlWhenTextEdit() is ignored, it is necessary @@ -672,7 +672,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( pTextEditOutlinerView=ImpMakeOutlinerView(pWin,!bEmpty,pGivenOutlinerView); // check if this view is already inserted - ULONG i2,nCount = pTextEditOutliner->GetViewCount(); + sal_uIntPtr i2,nCount = pTextEditOutliner->GetViewCount(); for( i2 = 0; i2 < nCount; i2++ ) { if( pTextEditOutliner->GetView(i2) == pTextEditOutlinerView ) @@ -682,8 +682,8 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( if( i2 == nCount ) pTextEditOutliner->InsertView(pTextEditOutlinerView,0); - aHdl.SetMoveOutside(FALSE); - aHdl.SetMoveOutside(TRUE); + aHdl.SetMoveOutside(sal_False); + aHdl.SetMoveOutside(sal_True); //OLMRefreshAllIAOManagers(); // alle Wins als OutlinerView beim Outliner anmelden @@ -783,7 +783,7 @@ sal_Bool SdrObjEditView::SdrBeginTextEdit( //HMHif (bMarkHdlWhenTextEdit) { //HMH HideMarkHdl(); //HMH} - aHdl.SetMoveOutside(FALSE); + aHdl.SetMoveOutside(sal_False); //HMHShowMarkHdl(); return sal_False; @@ -816,7 +816,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) if (pTEOutliner!=NULL) { - BOOL bModified=pTEOutliner->IsModified(); + sal_Bool bModified=pTEOutliner->IsModified(); if (pTEOutlinerView!=NULL) { pTEOutlinerView->HideCursor(); @@ -870,7 +870,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) } // Loeschung des gesamten TextObj checken SdrUndoAction* pDelUndo=NULL; - BOOL bDelObj=FALSE; + sal_Bool bDelObj=sal_False; SdrTextObj* pTextObj=PTR_CAST(SdrTextObj,pTEObj); if (pTextObj!=NULL && bTextEditNewObj) { @@ -934,11 +934,11 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) AdjustMarkHdl(); } // alle OutlinerViews loeschen - for (ULONG i=pTEOutliner->GetViewCount(); i>0;) + for (sal_uIntPtr i=pTEOutliner->GetViewCount(); i>0;) { i--; OutlinerView* pOLV=pTEOutliner->GetView(i); - USHORT nMorePix=pOLV->GetInvalidateMore() + 10; // solaris aw033 test #i# + sal_uInt16 nMorePix=pOLV->GetInvalidateMore() + 10; // solaris aw033 test #i# Window* pWin=pOLV->GetWindow(); Rectangle aRect(pOLV->GetOutputArea()); pTEOutliner->RemoveView(i); @@ -977,7 +977,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(sal_Bool bDontDeleteReally) //HMH if (bMarkHdlWhenTextEdit) { //HMH HideMarkHdl(); //HMH } - aHdl.SetMoveOutside(FALSE); + aHdl.SetMoveOutside(sal_False); if (eRet!=SDRENDTEXTEDIT_UNCHANGED) //HMH { //HMH ShowMarkHdl(); // Handles kommen ansonsten via Broadcast @@ -1029,8 +1029,8 @@ OutlinerView* SdrObjEditView::ImpFindOutlinerView(Window* pWin) const if (pWin==NULL) return NULL; if (pTextEditOutliner==NULL) return NULL; OutlinerView* pNewView=NULL; - ULONG nWinAnz=pTextEditOutliner->GetViewCount(); - for (ULONG i=0; i<nWinAnz && pNewView==NULL; i++) { + sal_uIntPtr nWinAnz=pTextEditOutliner->GetViewCount(); + for (sal_uIntPtr i=0; i<nWinAnz && pNewView==NULL; i++) { OutlinerView* pView=pTextEditOutliner->GetView(i); if (pView->GetWindow()==pWin) pNewView=pView; } @@ -1057,9 +1057,9 @@ void SdrObjEditView::SetTextEditWin(Window* pWin) } } -BOOL SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const +sal_Bool SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const { - BOOL bOk=FALSE; + sal_Bool bOk=sal_False; if(mxTextEditObj.is()) { nTol=ImpGetHitTolLogic(nTol,NULL); @@ -1095,9 +1095,9 @@ BOOL SdrObjEditView::IsTextEditHit(const Point& rHit, short nTol) const return bOk; } -BOOL SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const +sal_Bool SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const { - BOOL bOk=FALSE; + sal_Bool bOk=sal_False; if(mxTextEditObj.is()) { SdrTextObj* pText= dynamic_cast<SdrTextObj*>(mxTextEditObj.get()); @@ -1106,7 +1106,7 @@ BOOL SdrObjEditView::IsTextEditFrameHit(const Point& rHit) const { Window* pWin=pOLV->GetWindow(); if (pText!=NULL && pText->IsTextFrame() && pOLV!=NULL && pWin!=NULL) { - USHORT nPixSiz=pOLV->GetInvalidateMore(); + sal_uInt16 nPixSiz=pOLV->GetInvalidateMore(); Rectangle aEditArea(aMinTextEditArea); aEditArea.Union(pOLV->GetOutputArea()); if (!aEditArea.IsInside(rHit)) { @@ -1143,7 +1143,7 @@ void SdrObjEditView::AddTextEditOfs(MouseEvent& rMEvt) const //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin) +sal_Bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin) { if(pTextEditOutlinerView) { @@ -1172,16 +1172,16 @@ BOOL SdrObjEditView::KeyInput(const KeyEvent& rKEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return TRUE; + return sal_True; } } return SdrGlueEditView::KeyInput(rKEvt,pWin); } -BOOL SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) { if (pTextEditOutlinerView!=NULL) { - BOOL bPostIt=pTextEditOutliner->IsInSelectionMode(); + sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode(); if (!bPostIt) { Point aPt(rMEvt.GetPosPixel()); if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); @@ -1203,17 +1203,17 @@ BOOL SdrObjEditView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return TRUE; + return sal_True; } } } return SdrGlueEditView::MouseButtonDown(rMEvt,pWin); } -BOOL SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) { if (pTextEditOutlinerView!=NULL) { - BOOL bPostIt=pTextEditOutliner->IsInSelectionMode(); + sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode(); if (!bPostIt) { Point aPt(rMEvt.GetPosPixel()); if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); @@ -1234,18 +1234,18 @@ BOOL SdrObjEditView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return TRUE; + return sal_True; } } } return SdrGlueEditView::MouseButtonUp(rMEvt,pWin); } -BOOL SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin) { if (pTextEditOutlinerView!=NULL) { - BOOL bSelMode=pTextEditOutliner->IsInSelectionMode(); - BOOL bPostIt=bSelMode; + sal_Bool bSelMode=pTextEditOutliner->IsInSelectionMode(); + sal_Bool bPostIt=bSelMode; if (!bPostIt) { Point aPt(rMEvt.GetPosPixel()); if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); @@ -1266,21 +1266,21 @@ BOOL SdrObjEditView::MouseMove(const MouseEvent& rMEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return TRUE; + return sal_True; } } } return SdrGlueEditView::MouseMove(rMEvt,pWin); } -BOOL SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin) +sal_Bool SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin) { - // solange bis die OutlinerView einen BOOL zurueckliefert + // solange bis die OutlinerView einen sal_Bool zurueckliefert // bekommt sie nur COMMAND_STARTDRAG if (pTextEditOutlinerView!=NULL) { if (rCEvt.GetCommand()==COMMAND_STARTDRAG) { - BOOL bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent(); + sal_Bool bPostIt=pTextEditOutliner->IsInSelectionMode() || !rCEvt.IsMouseEvent(); if (!bPostIt && rCEvt.IsMouseEvent()) { Point aPt(rCEvt.GetMousePosPixel()); if (pWin!=NULL) aPt=pWin->PixelToLogic(aPt); @@ -1304,19 +1304,19 @@ BOOL SdrObjEditView::Command(const CommandEvent& rCEvt, Window* pWin) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return TRUE; + return sal_True; } } else // if (rCEvt.GetCommand() == COMMAND_VOICE ) { pTextEditOutlinerView->Command(rCEvt); - return TRUE; + return sal_True; } } return SdrGlueEditView::Command(rCEvt,pWin); } -BOOL SdrObjEditView::Cut(ULONG nFormat) +sal_Bool SdrObjEditView::Cut(sal_uIntPtr nFormat) { if (pTextEditOutliner!=NULL) { pTextEditOutlinerView->Cut(); @@ -1324,23 +1324,23 @@ BOOL SdrObjEditView::Cut(ULONG nFormat) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return TRUE; + return sal_True; } else { return SdrGlueEditView::Cut(nFormat); } } -BOOL SdrObjEditView::Yank(ULONG nFormat) +sal_Bool SdrObjEditView::Yank(sal_uIntPtr nFormat) { if (pTextEditOutliner!=NULL) { pTextEditOutlinerView->Copy(); - return TRUE; + return sal_True; } else { return SdrGlueEditView::Yank(nFormat); } } -BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat) +sal_Bool SdrObjEditView::Paste(Window* pWin, sal_uIntPtr nFormat) { if (pTextEditOutliner!=NULL) { if (pWin!=NULL) { @@ -1355,7 +1355,7 @@ BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat) if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif ImpMakeTextCursorAreaVisible(); - return TRUE; + return sal_True; } else { return SdrGlueEditView::Paste(pWin,nFormat); } @@ -1363,9 +1363,9 @@ BOOL SdrObjEditView::Paste(Window* pWin, ULONG nFormat) //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrObjEditView::ImpIsTextEditAllSelected() const +sal_Bool SdrObjEditView::ImpIsTextEditAllSelected() const { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; if (pTextEditOutliner!=NULL && pTextEditOutlinerView!=NULL) { if(SdrTextObj::HasTextImpl( pTextEditOutliner ) ) @@ -1374,25 +1374,25 @@ BOOL SdrObjEditView::ImpIsTextEditAllSelected() const Paragraph* pLastPara=pTextEditOutliner->GetParagraph( nParaAnz > 1 ? nParaAnz - 1 : 0 ); ESelection aESel(pTextEditOutlinerView->GetSelection()); - if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==USHORT(nParaAnz-1)) + if (aESel.nStartPara==0 && aESel.nStartPos==0 && aESel.nEndPara==sal_uInt16(nParaAnz-1)) { XubString aStr(pTextEditOutliner->GetText(pLastPara)); if(aStr.Len() == aESel.nEndPos) - bRet = TRUE; + bRet = sal_True; } // und nun auch noch fuer den Fall, das rueckwaerts selektiert wurde - if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==USHORT(nParaAnz-1)) + if (!bRet && aESel.nEndPara==0 && aESel.nEndPos==0 && aESel.nStartPara==sal_uInt16(nParaAnz-1)) { XubString aStr(pTextEditOutliner->GetText(pLastPara)); if(aStr.Len() == aESel.nStartPos) - bRet = TRUE; + bRet = sal_True; } } else { - bRet=TRUE; + bRet=sal_True; } } return bRet; @@ -1411,9 +1411,9 @@ void SdrObjEditView::ImpMakeTextCursorAreaVisible() } } -USHORT SdrObjEditView::GetScriptType() const +sal_uInt16 SdrObjEditView::GetScriptType() const { - USHORT nScriptType = 0; + sal_uInt16 nScriptType = 0; if( IsTextEdit() ) { @@ -1445,11 +1445,11 @@ USHORT SdrObjEditView::GetScriptType() const } /* new interface src537 */ -BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const +sal_Bool SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const { if( mxSelectionController.is() ) if( mxSelectionController->GetAttributes( rTargetSet, bOnlyHardAttr ) ) - return TRUE; + return sal_True; if(IsTextEdit()) { @@ -1469,8 +1469,8 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c if(pTextEditOutlinerView) { // FALSE= InvalidItems nicht al Default, sondern als "Loecher" betrachten - rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), FALSE); - rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), FALSE ); + rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False); + rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), sal_False ); } if(GetMarkedObjectCount()==1 && GetMarkedObjectByIndex(0)==mxTextEditObj.get()) @@ -1478,7 +1478,7 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c MergeNotPersistAttrFromMarked(rTargetSet, bOnlyHardAttr); } - return TRUE; + return sal_True; } else { @@ -1486,11 +1486,11 @@ BOOL SdrObjEditView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) c } } -BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) +sal_Bool SdrObjEditView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) { - BOOL bRet=FALSE; - BOOL bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is(); - BOOL bAllTextSelected=ImpIsTextEditAllSelected(); + sal_Bool bRet=sal_False; + sal_Bool bTextEdit=pTextEditOutlinerView!=NULL && mxTextEditObj.is(); + sal_Bool bAllTextSelected=ImpIsTextEditAllSelected(); SfxItemSet* pModifiedSet=NULL; const SfxItemSet* pSet=&rSet; //const SvxAdjustItem* pParaJust=NULL; @@ -1510,16 +1510,16 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) { #ifdef DBG_UTIL { - BOOL bHasEEFeatureItems=FALSE; + sal_Bool bHasEEFeatureItems=sal_False; SfxItemIter aIter(rSet); const SfxPoolItem* pItem=aIter.FirstItem(); while (!bHasEEFeatureItems && pItem!=NULL) { if (!IsInvalidItem(pItem)) { - USHORT nW=pItem->Which(); + sal_uInt16 nW=pItem->Which(); if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) - bHasEEFeatureItems=TRUE; + bHasEEFeatureItems=sal_True; } pItem=aIter.NextItem(); @@ -1534,8 +1534,8 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) } #endif - BOOL bOnlyEEItems; - BOOL bNoEEItems=!SearchOutlinerItems(*pSet,bReplaceAll,&bOnlyEEItems); + sal_Bool bOnlyEEItems; + sal_Bool bNoEEItems=!SearchOutlinerItems(*pSet,bReplaceAll,&bOnlyEEItems); // alles selektiert? -> Attrs auch an den Rahmen // und falls keine EEItems, dann Attrs nur an den Rahmen if (bAllTextSelected || bNoEEItems) @@ -1569,7 +1569,7 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) mxTextEditObj->SetMergedItemSetAndBroadcast(*pSet, bReplaceAll); FlushComeBackTimer(); // Damit ModeHasChanged sofort kommt - bRet=TRUE; + bRet=sal_True; } } else if (!bOnlyEEItems) @@ -1577,15 +1577,15 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) // sonst Set ggf. splitten // Es wird nun ein ItemSet aSet gemacht, in den die EE_Items von // *pSet nicht enhalten ist (ansonsten ist es eine Kopie). - USHORT* pNewWhichTable=RemoveWhichRange(pSet->GetRanges(),EE_ITEMS_START,EE_ITEMS_END); + sal_uInt16* pNewWhichTable=RemoveWhichRange(pSet->GetRanges(),EE_ITEMS_START,EE_ITEMS_END); SfxItemSet aSet(pMod->GetItemPool(),pNewWhichTable); /*90353*/ delete[] pNewWhichTable; SfxWhichIter aIter(aSet); - USHORT nWhich=aIter.FirstWhich(); + sal_uInt16 nWhich=aIter.FirstWhich(); while (nWhich!=0) { const SfxPoolItem* pItem; - SfxItemState eState=pSet->GetItemState(nWhich,FALSE,&pItem); + SfxItemState eState=pSet->GetItemState(nWhich,sal_False,&pItem); if (eState==SFX_ITEM_SET) aSet.Put(*pItem); nWhich=aIter.NextWhich(); } @@ -1614,14 +1614,14 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) } } FlushComeBackTimer(); - bRet=TRUE; + bRet=sal_True; } if(!bNoEEItems) { // und nun die Attribute auch noch an die EditEngine if (bReplaceAll) { // Am Outliner kann man leider nur alle Attribute platthauen - pTextEditOutlinerView->RemoveAttribs( TRUE ); + pTextEditOutlinerView->RemoveAttribs( sal_True ); } pTextEditOutlinerView->SetAttribs(rSet); @@ -1632,7 +1632,7 @@ BOOL SdrObjEditView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) ImpMakeTextCursorAreaVisible(); } - bRet=TRUE; + bRet=sal_True; } if (pModifiedSet!=NULL) delete pModifiedSet; @@ -1660,12 +1660,12 @@ SfxStyleSheet* SdrObjEditView::GetStyleSheet() const return pSheet; } -BOOL SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) +sal_Bool SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) { if( mxSelectionController.is() ) { if( mxSelectionController->SetStyleSheet( pStyleSheet, bDontRemoveHardAttr ) ) - return TRUE; + return sal_True; } // if we are currently in edit mode we must also set the stylesheet @@ -1675,8 +1675,8 @@ BOOL SdrObjEditView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveH { Outliner* pOutliner = pTextEditOutlinerView->GetOutliner(); - const ULONG nParaCount = pOutliner->GetParagraphCount(); - ULONG nPara; + const sal_uIntPtr nParaCount = pOutliner->GetParagraphCount(); + sal_uIntPtr nPara; for( nPara = 0; nPara < nParaCount; nPara++ ) { pOutliner->SetStyleSheet( nPara, pStyleSheet ); @@ -1694,7 +1694,7 @@ void SdrObjEditView::AddWindowToPaintView(OutputDevice* pNewWin) if(mxTextEditObj.is() && !bTextEditOnlyOneView && pNewWin->GetOutDevType()==OUTDEV_WINDOW) { - OutlinerView* pOutlView=ImpMakeOutlinerView((Window*)pNewWin,FALSE,NULL); + OutlinerView* pOutlView=ImpMakeOutlinerView((Window*)pNewWin,sal_False,NULL); pTextEditOutliner->InsertView(pOutlView); } } @@ -1705,7 +1705,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin) if(mxTextEditObj.is() && !bTextEditOnlyOneView && pOldWin->GetOutDevType()==OUTDEV_WINDOW) { - for (ULONG i=pTextEditOutliner->GetViewCount(); i>0;) { + for (sal_uIntPtr i=pTextEditOutliner->GetViewCount(); i>0;) { i--; OutlinerView* pOLV=pTextEditOutliner->GetView(i); if (pOLV && pOLV->GetWindow()==(Window*)pOldWin) { @@ -1715,7 +1715,7 @@ void SdrObjEditView::DeleteWindowFromPaintView(OutputDevice* pOldWin) } } -BOOL SdrObjEditView::IsTextEditInSelectionMode() const +sal_Bool SdrObjEditView::IsTextEditInSelectionMode() const { return pTextEditOutliner!=NULL && pTextEditOutliner->IsInSelectionMode(); } @@ -1732,17 +1732,17 @@ BOOL SdrObjEditView::IsTextEditInSelectionMode() const // //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin) +sal_Bool SdrObjEditView::BegMacroObj(const Point& rPnt, short nTol, SdrObject* pObj, SdrPageView* pPV, Window* pWin) { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; BrkMacroObj(); if (pObj!=NULL && pPV!=NULL && pWin!=NULL && pObj->HasMacro()) { nTol=ImpGetHitTolLogic(nTol,NULL); pMacroObj=pObj; pMacroPV=pPV; pMacroWin=pWin; - bMacroDown=FALSE; - nMacroTol=USHORT(nTol); + bMacroDown=sal_False; + nMacroTol=sal_uInt16(nTol); aMacroDownPos=rPnt; MovMacroObj(rPnt); } @@ -1761,7 +1761,7 @@ void SdrObjEditView::ImpMacroUp(const Point& rUpPos) aHitRec.pPageView=pMacroPV; aHitRec.pOut=pMacroWin; pMacroObj->PaintMacro(*pMacroWin,Rectangle(),aHitRec); - bMacroDown=FALSE; + bMacroDown=sal_False; } } @@ -1775,10 +1775,10 @@ void SdrObjEditView::ImpMacroDown(const Point& rDownPos) aHitRec.nTol=nMacroTol; aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers(); aHitRec.pPageView=pMacroPV; - aHitRec.bDown=TRUE; + aHitRec.bDown=sal_True; aHitRec.pOut=pMacroWin; pMacroObj->PaintMacro(*pMacroWin,Rectangle(),aHitRec); - bMacroDown=TRUE; + bMacroDown=sal_True; } } @@ -1793,7 +1793,7 @@ void SdrObjEditView::MovMacroObj(const Point& rPnt) aHitRec.pPageView=pMacroPV; aHitRec.bDown=bMacroDown; aHitRec.pOut=pMacroWin; - BOOL bDown=pMacroObj->IsMacroHit(aHitRec); + sal_Bool bDown=pMacroObj->IsMacroHit(aHitRec); if (bDown) ImpMacroDown(rPnt); else ImpMacroUp(rPnt); } @@ -1809,7 +1809,7 @@ void SdrObjEditView::BrkMacroObj() } } -BOOL SdrObjEditView::EndMacroObj() +sal_Bool SdrObjEditView::EndMacroObj() { if (pMacroObj!=NULL && bMacroDown) { ImpMacroUp(aMacroDownPos); @@ -1819,7 +1819,7 @@ BOOL SdrObjEditView::EndMacroObj() aHitRec.nTol=nMacroTol; aHitRec.pVisiLayer=&pMacroPV->GetVisibleLayers(); aHitRec.pPageView=pMacroPV; - aHitRec.bDown=TRUE; + aHitRec.bDown=sal_True; aHitRec.pOut=pMacroWin; bool bRet=pMacroObj->DoMacro(aHitRec); pMacroObj=NULL; @@ -1828,7 +1828,7 @@ BOOL SdrObjEditView::EndMacroObj() return bRet; } else { BrkMacroObj(); - return FALSE; + return sal_False; } } @@ -1921,7 +1921,7 @@ void SdrObjEditView::OnEndPasteOrDrop( PasteOrDropInfos* ) // applications can derive from these virtual methods to do something before a drop or paste operation } -bool SdrObjEditView::SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nObjectIdentifier ) const +bool SdrObjEditView::SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const { if( nObjectInventor != SdrInventor && nObjectInventor != E3dInventor ) return false; @@ -1971,9 +1971,9 @@ bool SdrObjEditView::SupportsFormatPaintbrush( UINT32 nObjectInventor, UINT16 nO } } -static const USHORT* GetFormatRangeImpl( bool bTextOnly ) +static const sal_uInt16* GetFormatRangeImpl( bool bTextOnly ) { - static const USHORT gRanges[] = { + static const sal_uInt16 gRanges[] = { SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, SDRATTR_GRAF_FIRST, SDRATTR_GRAF_LAST, SDRATTR_TABLE_FIRST, SDRATTR_TABLE_LAST, @@ -2003,7 +2003,7 @@ bool SdrObjEditView::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFor } else { - const BOOL bOnlyHardAttr = FALSE; + const sal_Bool bOnlyHardAttr = sal_False; rFormatSet->Put( GetAttrFromMarked(bOnlyHardAttr) ); } return true; @@ -2012,14 +2012,14 @@ bool SdrObjEditView::TakeFormatPaintBrush( boost::shared_ptr< SfxItemSet >& rFor return false; } -static SfxItemSet CreatePaintSet( const USHORT *pRanges, SfxItemPool& rPool, const SfxItemSet& rSourceSet, const SfxItemSet& rTargetSet, bool bNoCharacterFormats, bool bNoParagraphFormats ) +static SfxItemSet CreatePaintSet( const sal_uInt16 *pRanges, SfxItemPool& rPool, const SfxItemSet& rSourceSet, const SfxItemSet& rTargetSet, bool bNoCharacterFormats, bool bNoParagraphFormats ) { SfxItemSet aPaintSet( rPool, pRanges ); while( *pRanges ) { - USHORT nWhich = *pRanges++; - const USHORT nLastWhich = *pRanges++; + sal_uInt16 nWhich = *pRanges++; + const sal_uInt16 nLastWhich = *pRanges++; if( bNoCharacterFormats && (nWhich == EE_CHAR_START) ) continue; @@ -2088,7 +2088,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar // All formating items (see ranges above) that are unequal in selected shape and // the format paintbrush are hard set on the selected shape. - const USHORT* pRanges = rFormatSet.GetRanges(); + const sal_uInt16* pRanges = rFormatSet.GetRanges(); bool bTextOnly = true; while( *pRanges ) @@ -2104,7 +2104,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar if( !bTextOnly ) { SfxItemSet aPaintSet( CreatePaintSet( GetFormatRangeImpl(false), *rShapeSet.GetPool(), rFormatSet, rShapeSet, bNoCharacterFormats, bNoParagraphFormats ) ); - const BOOL bReplaceAll = FALSE; + const sal_Bool bReplaceAll = sal_False; SetAttrToMarked(aPaintSet, bReplaceAll); } @@ -2132,7 +2132,7 @@ void SdrObjEditView::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoChar if( !aSel.HasRange() ) pOLV->SetSelection( rEditEngine.GetWord( aSel, com::sun::star::i18n::WordType::DICTIONARY_WORD ) ); - const BOOL bRemoveParaAttribs = !bNoParagraphFormats; + const sal_Bool bRemoveParaAttribs = !bNoParagraphFormats; pOLV->RemoveAttribsKeepLanguages( bRemoveParaAttribs ); SfxItemSet aSet( pOLV->GetAttribs() ); SfxItemSet aPaintSet( CreatePaintSet(GetFormatRangeImpl(true), *aSet.GetPool(), rFormatSet, aSet, bNoCharacterFormats, bNoParagraphFormats ) ); diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 50b30f3e7d..6e7c8441db 100644..100755 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -32,12 +32,12 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <svx/svdetc.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <svx/svdtrans.hxx> -#include "svdglob.hxx" -#include "svdstr.hrc" -#include "svdviter.hxx" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdviter.hxx" #include <svx/svdview.hxx> #include <svx/svdoutl.hxx> #include <vcl/bmpacc.hxx> @@ -152,8 +152,8 @@ void OLEObjCache::UnloadOnDemand() { // more objects than configured cache size try to remove objects // of course not the freshly inserted one at nIndex=0 - ULONG nCount2 = Count(); - ULONG nIndex = nCount2-1; + sal_uIntPtr nCount2 = Count(); + sal_uIntPtr nIndex = nCount2-1; while( nIndex && nCount2 > nSize ) { SdrOle2Obj* pUnloadObj = (SdrOle2Obj*) GetObject(nIndex--); @@ -172,7 +172,7 @@ void OLEObjCache::UnloadOnDemand() uno::Reference< frame::XModel > xUnloadModel( xUnloadObj->getComponent(), uno::UNO_QUERY ); if ( xUnloadModel.is() ) { - for ( ULONG nCheckInd = 0; nCheckInd < Count(); nCheckInd++ ) + for ( sal_uIntPtr nCheckInd = 0; nCheckInd < Count(); nCheckInd++ ) { SdrOle2Obj* pCacheObj = (SdrOle2Obj*) GetObject(nCheckInd); if ( pCacheObj && pCacheObj != pUnloadObj ) @@ -196,7 +196,7 @@ void OLEObjCache::UnloadOnDemand() } } -void OLEObjCache::SetSize(ULONG nNewSize) +void OLEObjCache::SetSize(sal_uIntPtr nNewSize) { nSize = nNewSize; } @@ -212,11 +212,11 @@ void OLEObjCache::InsertObj(SdrOle2Obj* pObj) } // get the old position of the object to know whether it is already in container - ULONG nOldPos = GetPos( pObj ); + sal_uIntPtr nOldPos = GetPos( pObj ); // insert object into first position Remove( nOldPos ); - Insert(pObj, (ULONG) 0L); + Insert(pObj, (sal_uIntPtr) 0L); if ( nOldPos == CONTAINER_ENTRY_NOTFOUND ) { @@ -230,9 +230,9 @@ void OLEObjCache::RemoveObj(SdrOle2Obj* pObj) Remove(pObj); } -BOOL OLEObjCache::UnloadObj(SdrOle2Obj* pObj) +sal_Bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj) { - BOOL bUnloaded = FALSE; + sal_Bool bUnloaded = sal_False; if (pObj) { //#i80528# The old mechanism is completely useless, only taking into account if @@ -260,9 +260,9 @@ IMPL_LINK(OLEObjCache, UnloadCheckHdl, AutoTimer*, /*pTim*/) return 0; } -void ContainerSorter::DoSort(ULONG a, ULONG b) const +void ContainerSorter::DoSort(sal_uIntPtr a, sal_uIntPtr b) const { - ULONG nAnz=rCont.Count(); + sal_uIntPtr nAnz=rCont.Count(); if (b>nAnz) b=nAnz; if (b>0) b--; if (a<b) ImpSubSort(a,b); @@ -307,8 +307,8 @@ public: int ImpUShortContainerSorter::Compare(const void* pElem1, const void* pElem2) const { - USHORT n1=USHORT(ULONG(pElem1)); - USHORT n2=USHORT(ULONG(pElem2)); + sal_uInt16 n1=sal_uInt16(sal_uIntPtr(pElem1)); + sal_uInt16 n2=sal_uInt16(sal_uIntPtr(pElem2)); return n1<n2 ? -1 : n1>n2 ? 1 : 0; } @@ -330,10 +330,10 @@ public: // Kein Clipping in die Metafileaufzeichnung GDIMetaFile* pMtf=rOut.GetConnectMetaFile(); if (pMtf!=NULL && (!pMtf->IsRecord() || pMtf->IsPause())) pMtf=NULL; - if (pMtf!=NULL) pMtf->Pause(TRUE); + if (pMtf!=NULL) pMtf->Pause(sal_True); if (bClip) rOut.SetClipRegion(aClip); else rOut.SetClipRegion(); - if (pMtf!=NULL) pMtf->Pause(FALSE); + if (pMtf!=NULL) pMtf->Pause(sal_False); } }; @@ -349,7 +349,7 @@ public: aBckgrdColor( rOut.GetBackground().GetColor() ), aFont (rOut.GetFont()) {} - ImpColorMerk(const OutputDevice& rOut, USHORT nMode) + ImpColorMerk(const OutputDevice& rOut, sal_uInt16 nMode) { if ( (nMode & SDRHDC_SAVEPEN) == SDRHDC_SAVEPEN ) aLineColor = rOut.GetLineColor(); @@ -364,7 +364,7 @@ public: aFont=rOut.GetFont(); } - void Restore(OutputDevice& rOut, USHORT nMode=SDRHDC_SAVEPENANDBRUSHANDFONT) + void Restore(OutputDevice& rOut, sal_uInt16 nMode=SDRHDC_SAVEPENANDBRUSHANDFONT) { if ( (nMode & SDRHDC_SAVEPEN) == SDRHDC_SAVEPEN) rOut.SetLineColor( aLineColor ); @@ -386,7 +386,7 @@ public: const Color& GetLineColor() const { return aLineColor; } }; -ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, USHORT nNewMode, bool bAutoMerk): +ImpSdrHdcMerk::ImpSdrHdcMerk(const OutputDevice& rOut, sal_uInt16 nNewMode, bool bAutoMerk): pFarbMerk(NULL), pClipMerk(NULL), pLineColorMerk(NULL), @@ -422,7 +422,7 @@ void ImpSdrHdcMerk::Save(const OutputDevice& rOut) if ((nMode & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING) pClipMerk=new ImpClipMerk(rOut); - USHORT nCol=nMode & SDRHDC_SAVEPENANDBRUSHANDFONT; + sal_uInt16 nCol=nMode & SDRHDC_SAVEPENANDBRUSHANDFONT; if (nCol==SDRHDC_SAVEPEN) pLineColorMerk=new Color( rOut.GetLineColor() ); @@ -432,14 +432,14 @@ void ImpSdrHdcMerk::Save(const OutputDevice& rOut) pFarbMerk=new ImpColorMerk(rOut,nCol); } -void ImpSdrHdcMerk::Restore(OutputDevice& rOut, USHORT nMask) const +void ImpSdrHdcMerk::Restore(OutputDevice& rOut, sal_uInt16 nMask) const { nMask&=nMode; // nur restaurieren, was auch gesichert wurde if ((nMask & SDRHDC_SAVECLIPPING) ==SDRHDC_SAVECLIPPING && pClipMerk!=NULL) pClipMerk->Restore(rOut); - USHORT nCol=nMask & SDRHDC_SAVEPENANDBRUSHANDFONT; + sal_uInt16 nCol=nMask & SDRHDC_SAVEPENANDBRUSHANDFONT; if (nCol==SDRHDC_SAVEPEN) { @@ -565,7 +565,7 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) for(sal_uInt32 nX(0L); nX < nWidth; nX += nXStep) { const BitmapColor& rCol2 = (pAccess->HasPalette()) - ? pAccess->GetPaletteColor((BYTE)pAccess->GetPixel(nY, nX)) + ? pAccess->GetPaletteColor((sal_uInt8)pAccess->GetPixel(nY, nX)) : pAccess->GetPixel(nY, nX); nRt += rCol2.GetRed(); @@ -579,7 +579,7 @@ bool GetDraftFillColor(const SfxItemSet& rSet, Color& rCol) nGn /= nAnz; nBl /= nAnz; - rCol = Color(UINT8(nRt), UINT8(nGn), UINT8(nBl)); + rCol = Color(sal_uInt8(nRt), sal_uInt8(nGn), sal_uInt8(nBl)); bRetval = true; } @@ -631,7 +631,7 @@ void SdrEngineDefaults::LanguageHasChanged() //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pModel ) +SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pModel ) { //SdrEngineDefaults& rDefaults = SdrEngineDefaults::GetDefaults(); @@ -697,47 +697,47 @@ String GetResourceString(sal_uInt16 nResID) //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SearchOutlinerItems(const SfxItemSet& rSet, BOOL bInklDefaults, BOOL* pbOnlyEE) +sal_Bool SearchOutlinerItems(const SfxItemSet& rSet, sal_Bool bInklDefaults, sal_Bool* pbOnlyEE) { - BOOL bHas=FALSE; - BOOL bOnly=TRUE; - BOOL bLookOnly=pbOnlyEE!=NULL; + sal_Bool bHas=sal_False; + sal_Bool bOnly=sal_True; + sal_Bool bLookOnly=pbOnlyEE!=NULL; SfxWhichIter aIter(rSet); - USHORT nWhich=aIter.FirstWhich(); + sal_uInt16 nWhich=aIter.FirstWhich(); while (((bLookOnly && bOnly) || !bHas) && nWhich!=0) { // bei bInklDefaults ist der gesamte Which-Range // ausschlaggebend, ansonsten nur die gesetzten Items // Disabled und DontCare wird als Loch im Which-Range betrachtet SfxItemState eState=rSet.GetItemState(nWhich); if ((eState==SFX_ITEM_DEFAULT && bInklDefaults) || eState==SFX_ITEM_SET) { - if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=FALSE; - else bHas=TRUE; + if (nWhich<EE_ITEMS_START || nWhich>EE_ITEMS_END) bOnly=sal_False; + else bHas=sal_True; } nWhich=aIter.NextWhich(); } - if (!bHas) bOnly=FALSE; + if (!bHas) bOnly=sal_False; if (pbOnlyEE!=NULL) *pbOnlyEE=bOnly; return bHas; } -USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT nRangeEnd) +sal_uInt16* RemoveWhichRange(const sal_uInt16* pOldWhichTable, sal_uInt16 nRangeBeg, sal_uInt16 nRangeEnd) { // insgesamt sind 6 Faelle moeglich (je Range): // [Beg..End] zu entfernender Range // [b..e] [b..e] [b..e] Fall 1,3,2: egal, ganz weg, egal + Ranges // [b........e] [b........e] Fall 4,5 : Bereich verkleinern | in // [b......................e] Fall 6 : Splitting + pOldWhichTable - USHORT nAnz=0; + sal_uInt16 nAnz=0; while (pOldWhichTable[nAnz]!=0) nAnz++; nAnz++; // nAnz muesste nun in jedem Fall eine ungerade Zahl sein (0 am Ende des Arrays) DBG_ASSERT((nAnz&1)==1,"Joe: RemoveWhichRange: WhichTable hat keine ungerade Anzahl von Eintraegen"); - USHORT nAlloc=nAnz; + sal_uInt16 nAlloc=nAnz; // benoetigte Groesse des neuen Arrays ermitteln - USHORT nNum=nAnz-1; + sal_uInt16 nNum=nAnz-1; while (nNum!=0) { nNum-=2; - USHORT nBeg=pOldWhichTable[nNum]; - USHORT nEnd=pOldWhichTable[nNum+1]; + sal_uInt16 nBeg=pOldWhichTable[nNum]; + sal_uInt16 nEnd=pOldWhichTable[nNum+1]; if (nEnd<nRangeBeg) /*nCase=1*/ ; else if (nBeg>nRangeEnd) /* nCase=2 */ ; else if (nBeg>=nRangeBeg && nEnd<=nRangeEnd) /* nCase=3 */ nAlloc-=2; @@ -746,15 +746,15 @@ USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT else /* nCase=6 */ nAlloc+=2; } - USHORT* pNewWhichTable=new USHORT[nAlloc]; - memcpy(pNewWhichTable,pOldWhichTable,nAlloc*sizeof(USHORT)); + sal_uInt16* pNewWhichTable=new sal_uInt16[nAlloc]; + memcpy(pNewWhichTable,pOldWhichTable,nAlloc*sizeof(sal_uInt16)); pNewWhichTable[nAlloc-1]=0; // im Falle 3 fehlt die 0 am Ende // nun die unerwuenschten Ranges entfernen nNum=nAlloc-1; while (nNum!=0) { nNum-=2; - USHORT nBeg=pNewWhichTable[nNum]; - USHORT nEnd=pNewWhichTable[nNum+1]; + sal_uInt16 nBeg=pNewWhichTable[nNum]; + sal_uInt16 nEnd=pNewWhichTable[nNum+1]; unsigned nCase=0; if (nEnd<nRangeBeg) nCase=1; else if (nBeg>nRangeEnd) nCase=2; @@ -764,14 +764,14 @@ USHORT* RemoveWhichRange(const USHORT* pOldWhichTable, USHORT nRangeBeg, USHORT else nCase=6; switch (nCase) { case 3: { - unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(USHORT); + unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(sal_uInt16); memcpy(&pNewWhichTable[nNum],&pNewWhichTable[nNum+2],nTailBytes); nAnz-=2; // Merken: Array hat sich verkleinert } break; case 4: pNewWhichTable[nNum+1]=nRangeBeg-1; break; case 5: pNewWhichTable[nNum]=nRangeEnd+1; break; case 6: { - unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(USHORT); + unsigned nTailBytes=(nAnz-(nNum+2))*sizeof(sal_uInt16); memcpy(&pNewWhichTable[nNum+4],&pNewWhichTable[nNum+2],nTailBytes); nAnz+=2; // Merken: Array hat sich vergroessert pNewWhichTable[nNum+2]=nRangeEnd+1; @@ -803,13 +803,13 @@ SvdProgressInfo::SvdProgressInfo( Link *_pLink ) nCurInsert = 0; } -void SvdProgressInfo::Init( ULONG _nSumActionCount, ULONG _nObjCount ) +void SvdProgressInfo::Init( sal_uIntPtr _nSumActionCount, sal_uIntPtr _nObjCount ) { nSumActionCount = _nSumActionCount; nObjCount = _nObjCount; } -BOOL SvdProgressInfo::ReportActions( ULONG nAnzActions ) +sal_Bool SvdProgressInfo::ReportActions( sal_uIntPtr nAnzActions ) { nSumCurAction += nAnzActions; nCurAction += nAnzActions; @@ -819,7 +819,7 @@ BOOL SvdProgressInfo::ReportActions( ULONG nAnzActions ) return pLink->Call(NULL) == 1L; } -BOOL SvdProgressInfo::ReportInserts( ULONG nAnzInserts ) +sal_Bool SvdProgressInfo::ReportInserts( sal_uIntPtr nAnzInserts ) { nSumCurAction += nAnzInserts; nCurInsert += nAnzInserts; @@ -827,23 +827,23 @@ BOOL SvdProgressInfo::ReportInserts( ULONG nAnzInserts ) return pLink->Call(NULL) == 1L; } -BOOL SvdProgressInfo::ReportRescales( ULONG nAnzRescales ) +sal_Bool SvdProgressInfo::ReportRescales( sal_uIntPtr nAnzRescales ) { nSumCurAction += nAnzRescales; return pLink->Call(NULL) == 1L; } -void SvdProgressInfo::SetActionCount( ULONG _nActionCount ) +void SvdProgressInfo::SetActionCount( sal_uIntPtr _nActionCount ) { nActionCount = _nActionCount; } -void SvdProgressInfo::SetInsertCount( ULONG _nInsertCount ) +void SvdProgressInfo::SetInsertCount( sal_uIntPtr _nInsertCount ) { nInsertCount = _nInsertCount; } -BOOL SvdProgressInfo::SetNextObject() +sal_Bool SvdProgressInfo::SetNextObject() { nActionCount = 0; nCurAction = 0; @@ -879,7 +879,7 @@ namespace bool bRet(false); bool bMaster(rList.GetPage() ? rList.GetPage()->IsMasterPage() : false); - for(ULONG no(rList.GetObjCount()); !bRet && no > 0; ) + for(sal_uIntPtr no(rList.GetObjCount()); !bRet && no > 0; ) { no--; SdrObject* pObj = rList.GetObj(no); @@ -963,17 +963,17 @@ namespace if(!rStyleSettings.GetHighContrastMode()) { // search in page - const USHORT SPOTCOUNT(5); + const sal_uInt16 SPOTCOUNT(5); Point aSpotPos[SPOTCOUNT]; Color aSpotColor[SPOTCOUNT]; - ULONG nHeight( rArea.GetSize().Height() ); - ULONG nWidth( rArea.GetSize().Width() ); - ULONG nWidth14 = nWidth / 4; - ULONG nHeight14 = nHeight / 4; - ULONG nWidth34 = ( 3 * nWidth ) / 4; - ULONG nHeight34 = ( 3 * nHeight ) / 4; - - USHORT i; + sal_uIntPtr nHeight( rArea.GetSize().Height() ); + sal_uIntPtr nWidth( rArea.GetSize().Width() ); + sal_uIntPtr nWidth14 = nWidth / 4; + sal_uIntPtr nHeight14 = nHeight / 4; + sal_uIntPtr nWidth34 = ( 3 * nWidth ) / 4; + sal_uIntPtr nHeight34 = ( 3 * nHeight ) / 4; + + sal_uInt16 i; for ( i = 0; i < SPOTCOUNT; i++ ) { // five spots are used @@ -1028,14 +1028,14 @@ namespace impGetSdrPageFillColor(rPage, aSpotPos[i], rTextEditPV, rTextEditPV.GetVisibleLayers(), aSpotColor[i], false); } - USHORT aMatch[SPOTCOUNT]; + sal_uInt16 aMatch[SPOTCOUNT]; for ( i = 0; i < SPOTCOUNT; i++ ) { // were same spot colors found? aMatch[i] = 0; - for ( USHORT j = 0; j < SPOTCOUNT; j++ ) + for ( sal_uInt16 j = 0; j < SPOTCOUNT; j++ ) { if( j != i ) { @@ -1050,7 +1050,7 @@ namespace // highest weight to center spot aBackground = aSpotColor[0]; - for ( USHORT nMatchCount = SPOTCOUNT - 1; nMatchCount > 1; nMatchCount-- ) + for ( sal_uInt16 nMatchCount = SPOTCOUNT - 1; nMatchCount > 1; nMatchCount-- ) { // which spot color was found most? for ( i = 0; i < SPOTCOUNT; i++ ) diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 1984b654db..11c1b06845 100644..100755 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -58,7 +58,7 @@ #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdotext.hxx> #include <svx/svdorect.hxx> #include <svx/svdocirc.hxx> @@ -83,10 +83,10 @@ ImpSdrGDIMetaFileImport::ImpSdrGDIMetaFileImport(SdrModel& rModel): maLineJoin(basegfx::B2DLINEJOIN_NONE), maDash(XDASH_RECT, 0, 0, 0, 0, 0), fScaleX(0.0),fScaleY(0.0), - bFntDirty(TRUE), - bLastObjWasPolyWithoutLine(FALSE),bNoLine(FALSE),bNoFill(FALSE),bLastObjWasLine(FALSE) + bFntDirty(sal_True), + bLastObjWasPolyWithoutLine(sal_False),bNoLine(sal_False),bNoFill(sal_False),bLastObjWasLine(sal_False) { - aVD.EnableOutput(FALSE); + aVD.EnableOutput(sal_False); // #i111954# init to no fill and no line initially aVD.SetLineColor(); @@ -106,15 +106,15 @@ ImpSdrGDIMetaFileImport::~ImpSdrGDIMetaFileImport() delete pTextAttr; } -ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, +sal_uIntPtr ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, SdrObjList& rOL, - ULONG nInsPos, + sal_uIntPtr nInsPos, SvdProgressInfo *pProgrInfo) { pPage = rOL.GetPage(); GDIMetaFile* pTmpMtf=NULL; GDIMetaFile* pMtf = (GDIMetaFile*) &rMtf; - ULONG nActionAnz=pMtf->GetActionCount(); + sal_uIntPtr nActionAnz=pMtf->GetActionCount(); sal_Bool bError = sal_False; @@ -150,13 +150,13 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, if(65000 < nActionAnz) { nActionAnz = 65000; - bError = TRUE; + bError = sal_True; } if(pProgrInfo) pProgrInfo->SetActionCount(nActionAnz); - ULONG nActionsToReport = 0; + sal_uIntPtr nActionsToReport = 0; for( MetaAction* pAct = pMtf->FirstAction(); pAct; pAct = pMtf->NextAction() ) { @@ -221,7 +221,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, // MapMode-Scaling vornehmen MapScaling(); // Objekte in vorgegebenes Rechteck hineinskalieren - ULONG nAnz=aTmpList.GetObjCount(); + sal_uIntPtr nAnz=aTmpList.GetObjCount(); // Beim berechnen der Fortschrittsanzeige wird GetActionCount()*3 benutzt. // Da in aTmpList allerdings weniger eintraege als GetActionCount() @@ -241,7 +241,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, // alle in aTmpList zwischengespeicherten Objekte nun in rOL ab der Position nInsPos einfuegen if (nInsPos>rOL.GetObjCount()) nInsPos=rOL.GetObjCount(); SdrInsertReason aReason(SDRREASON_VIEWCALL); - for (ULONG i=0; i<nAnz; i++) + for (sal_uIntPtr i=0; i<nAnz; i++) { SdrObject* pObj=aTmpList.GetObj(i); rOL.NbcInsertObject(pObj,nInsPos,&aReason); @@ -272,7 +272,7 @@ ULONG ImpSdrGDIMetaFileImport::DoImport(const GDIMetaFile& rMtf, void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr) { - bNoLine = FALSE; bNoFill = FALSE; + bNoLine = sal_False; bNoFill = sal_False; bool bLine = !bForceTextAttr; bool bFill = (pObj==NULL) || (pObj->IsClosedObj() && !bForceTextAttr); bool bText = bForceTextAttr || (pObj!=NULL && pObj->GetOutlinerParaObject()!=NULL); @@ -322,7 +322,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr } } else - bNoLine = TRUE; + bNoLine = sal_True; if ( bFill ) { @@ -335,7 +335,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr pFillAttr->Put(XFillStyleItem(XFILL_NONE)); } else - bNoFill = TRUE; + bNoFill = sal_True; if ( bText && bFntDirty ) { @@ -362,7 +362,7 @@ void ImpSdrGDIMetaFileImport::SetAttributes(SdrObject* pObj, bool bForceTextAttr pTextAttr->Put(SvxContourItem(aFnt.IsOutline(), EE_CHAR_OUTLINE)); pTextAttr->Put(SvxColorItem(aFnt.GetColor(), EE_CHAR_COLOR)); //... svxfont textitem svditext - bFntDirty=FALSE; + bFntDirty=sal_False; } if (pObj!=NULL) { @@ -439,8 +439,8 @@ void ImpSdrGDIMetaFileImport::InsertObj( SdrObject* pObj, sal_Bool bScale ) } else { - bLastObjWasPolyWithoutLine = FALSE; - bLastObjWasLine = FALSE; + bLastObjWasPolyWithoutLine = sal_False; + bLastObjWasLine = sal_False; } } } @@ -773,7 +773,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rS if ( aFnt.GetWidth() || ( rAct.GetType() == META_STRETCHTEXT_ACTION ) ) { pText->ClearMergedItem( SDRATTR_TEXT_AUTOGROWWIDTH ); - pText->SetMergedItem( SdrTextAutoGrowHeightItem( FALSE ) ); + pText->SetMergedItem( SdrTextAutoGrowHeightItem( sal_False ) ); // don't let the margins eat the space needed for the text pText->SetMergedItem ( SdrTextUpperDistItem (0)); pText->SetMergedItem ( SdrTextLowerDistItem (0)); @@ -787,7 +787,7 @@ void ImpSdrGDIMetaFileImport::ImportText( const Point& rPos, const XubString& rS pText->SetModel( pModel ); pText->SetLayer( nLayer ); pText->NbcSetText( rStr ); - SetAttributes( pText, TRUE ); + SetAttributes( pText, sal_True ); pText->SetSnapRect( aTextRect ); if (!aFnt.IsTransparent()) @@ -928,8 +928,8 @@ void ImpSdrGDIMetaFileImport::DoAction(MetaMapModeAction& rAct) { MapScaling(); rAct.Execute(&aVD); - bLastObjWasPolyWithoutLine=FALSE; - bLastObjWasLine=FALSE; + bLastObjWasPolyWithoutLine=sal_False; + bLastObjWasLine=sal_False; } void ImpSdrGDIMetaFileImport::MapScaling() @@ -979,7 +979,7 @@ void ImpSdrGDIMetaFileImport::DoAction( MetaCommentAction& rAct, GDIMetaFile* pM aXGradient.SetGradientStyle((XGradientStyle)rGrad.GetStyle()); aXGradient.SetStartColor(rGrad.GetStartColor()); aXGradient.SetEndColor(rGrad.GetEndColor()); - aXGradient.SetAngle((USHORT)rGrad.GetAngle()); + aXGradient.SetAngle((sal_uInt16)rGrad.GetAngle()); aXGradient.SetBorder(rGrad.GetBorder()); aXGradient.SetXOffset(rGrad.GetOfsX()); aXGradient.SetYOffset(rGrad.GetOfsY()); diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx index aa14791284..b92b6e0170 100644..100755 --- a/svx/source/svdraw/svdfmtf.hxx +++ b/svx/source/svdraw/svdfmtf.hxx @@ -58,11 +58,11 @@ public: {} void Clear() { aList.Clear(); } - ULONG GetObjCount() const { return aList.Count(); } - SdrObject* GetObj(ULONG nNum) const { return (SdrObject*)aList.GetObject(nNum); } - SdrObject* operator[](ULONG nNum) const { return (SdrObject*)aList.GetObject(nNum); } - void InsertObject(SdrObject* pObj, ULONG nPos=CONTAINER_APPEND) { aList.Insert(pObj,nPos); } - void RemoveObject(ULONG nPos) { aList.Remove(nPos); } + sal_uLong GetObjCount() const { return aList.Count(); } + SdrObject* GetObj(sal_uLong nNum) const { return (SdrObject*)aList.GetObject(nNum); } + SdrObject* operator[](sal_uLong nNum) const { return (SdrObject*)aList.GetObject(nNum); } + void InsertObject(SdrObject* pObj, sal_uLong nPos=CONTAINER_APPEND) { aList.Insert(pObj,nPos); } + void RemoveObject(sal_uLong nPos) { aList.Remove(nPos); } }; //************************************************************ @@ -75,7 +75,7 @@ protected: SdrObjRefList aTmpList; VirtualDevice aVD; Rectangle aScaleRect; - ULONG nMapScalingOfs; // ab hier nocht nicht mit MapScaling bearbeitet + sal_uLong nMapScalingOfs; // ab hier nocht nicht mit MapScaling bearbeitet SfxItemSet* pLineAttr; SfxItemSet* pFillAttr; SfxItemSet* pTextAttr; @@ -131,12 +131,12 @@ protected: void DoAction(MetaFillColorAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaTextColorAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaTextFillColorAction & rAct) { rAct.Execute(&aVD); } - void DoAction(MetaFontAction & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; } - void DoAction(MetaTextAlignAction & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; } + void DoAction(MetaFontAction & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; } + void DoAction(MetaTextAlignAction & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; } void DoAction(MetaClipRegionAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaRasterOpAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaPushAction & rAct) { rAct.Execute(&aVD); } - void DoAction(MetaPopAction & rAct) { rAct.Execute(&aVD); bFntDirty=TRUE; } + void DoAction(MetaPopAction & rAct) { rAct.Execute(&aVD); bFntDirty=sal_True; } void DoAction(MetaMoveClipRegionAction & rAct) { rAct.Execute(&aVD); } void DoAction(MetaISectRectClipRegionAction& rAct) { rAct.Execute(&aVD); } void DoAction(MetaISectRegionClipRegionAction& rAct) { rAct.Execute(&aVD); } @@ -154,7 +154,7 @@ protected: public: ImpSdrGDIMetaFileImport(SdrModel& rModel); ~ImpSdrGDIMetaFileImport(); - ULONG DoImport(const GDIMetaFile& rMtf, SdrObjList& rDestList, ULONG nInsPos=CONTAINER_APPEND, SvdProgressInfo *pProgrInfo = NULL); + sal_uLong DoImport(const GDIMetaFile& rMtf, SdrObjList& rDestList, sal_uLong nInsPos=CONTAINER_APPEND, SvdProgressInfo *pProgrInfo = NULL); void SetLayer(SdrLayerID nLay) { nLayer=nLay; } SdrLayerID GetLayer() const { return nLayer; } void SetScaleRect(const Rectangle& rRect) { aScaleRect=rRect; } diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index 368ff3db61..84aa13e925 100644..100755 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -33,8 +33,8 @@ #include <math.h> #include <svx/svdundo.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svdpagv.hxx> #include <svx/svdglue.hxx> #include <svx/svdtrans.hxx> @@ -58,14 +58,14 @@ SdrGlueEditView::~SdrGlueEditView() //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) +void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, sal_Bool bConst, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); + sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); if (nPtAnz!=0) { SdrGluePointList* pGPL=NULL; if (bConst) { @@ -79,10 +79,10 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, co if(!bConst && IsUndoEnabled() ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); - for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) + for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++) { - USHORT nPtId=pPts->GetObject(nPtNum); - USHORT nGlueIdx=pGPL->FindGluePoint(nPtId); + sal_uInt16 nPtId=pPts->GetObject(nPtNum); + sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId); if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND) { SdrGluePoint& rGP=(*pGPL)[nGlueIdx]; @@ -104,38 +104,38 @@ void SdrGlueEditView::ImpDoMarkedGluePoints(PGlueDoFunc pDoFunc, BOOL bConst, co static void ImpGetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnThisEsc, const void* pnRet, const void*, const void*) { - USHORT& nRet=*(USHORT*)pnRet; - BOOL& bFirst=*(BOOL*)pbFirst; + sal_uInt16& nRet=*(sal_uInt16*)pnRet; + sal_Bool& bFirst=*(sal_Bool*)pbFirst; if (nRet!=FUZZY) { - USHORT nEsc=rGP.GetEscDir(); - BOOL bOn=(nEsc & *(USHORT*)pnThisEsc)!=0; - if (bFirst) { nRet=bOn; bFirst=FALSE; } + sal_uInt16 nEsc=rGP.GetEscDir(); + sal_Bool bOn=(nEsc & *(sal_uInt16*)pnThisEsc)!=0; + if (bFirst) { nRet=bOn; bFirst=sal_False; } else if (nRet!=bOn) nRet=FUZZY; } } -TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(USHORT nThisEsc) const +TRISTATE SdrGlueEditView::IsMarkedGluePointsEscDir(sal_uInt16 nThisEsc) const { ForceUndirtyMrkPnt(); - BOOL bFirst=TRUE; - USHORT nRet=FALSE; - ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,TRUE,&bFirst,&nThisEsc,&nRet); + sal_Bool bFirst=sal_True; + sal_uInt16 nRet=sal_False; + ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetEscDir,sal_True,&bFirst,&nThisEsc,&nRet); return (TRISTATE)nRet; } static void ImpSetEscDir(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pnThisEsc, const void* pbOn, const void*, const void*, const void*) { - USHORT nEsc=rGP.GetEscDir(); - if (*(BOOL*)pbOn) nEsc|=*(USHORT*)pnThisEsc; - else nEsc&=~*(USHORT*)pnThisEsc; + sal_uInt16 nEsc=rGP.GetEscDir(); + if (*(sal_Bool*)pbOn) nEsc|=*(sal_uInt16*)pnThisEsc; + else nEsc&=~*(sal_uInt16*)pnThisEsc; rGP.SetEscDir(nEsc); } -void SdrGlueEditView::SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn) +void SdrGlueEditView::SetMarkedGluePointsEscDir(sal_uInt16 nThisEsc, sal_Bool bOn) { ForceUndirtyMrkPnt(); BegUndo(ImpGetResStr(STR_EditSetGlueEscDir),GetDescriptionOfMarkedGluePoints()); - ImpDoMarkedGluePoints(ImpSetEscDir,FALSE,&nThisEsc,&bOn); + ImpDoMarkedGluePoints(ImpSetEscDir,sal_False,&nThisEsc,&bOn); EndUndo(); } @@ -143,11 +143,11 @@ void SdrGlueEditView::SetMarkedGluePointsEscDir(USHORT nThisEsc, BOOL bOn) static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pnRet, const void*, const void*, const void*) { - USHORT& nRet=*(USHORT*)pnRet; - BOOL& bFirst=*(BOOL*)pbFirst; + sal_uInt16& nRet=*(sal_uInt16*)pnRet; + sal_Bool& bFirst=*(sal_Bool*)pbFirst; if (nRet!=FUZZY) { bool bOn=rGP.IsPercent(); - if (bFirst) { nRet=bOn; bFirst=FALSE; } + if (bFirst) { nRet=bOn; bFirst=sal_False; } else if ((nRet!=0)!=bOn) nRet=FUZZY; } } @@ -155,24 +155,24 @@ static void ImpGetPercent(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const vo TRISTATE SdrGlueEditView::IsMarkedGluePointsPercent() const { ForceUndirtyMrkPnt(); - BOOL bFirst=TRUE; - USHORT nRet=TRUE; - ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,TRUE,&bFirst,&nRet); + sal_Bool bFirst=sal_True; + sal_uInt16 nRet=sal_True; + ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetPercent,sal_True,&bFirst,&nRet); return (TRISTATE)nRet; } static void ImpSetPercent(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbOn, const void*, const void*, const void*, const void*) { Point aPos(rGP.GetAbsolutePos(*pObj)); - rGP.SetPercent(*(BOOL*)pbOn); + rGP.SetPercent(*(sal_Bool*)pbOn); rGP.SetAbsolutePos(aPos,*pObj); } -void SdrGlueEditView::SetMarkedGluePointsPercent(BOOL bOn) +void SdrGlueEditView::SetMarkedGluePointsPercent(sal_Bool bOn) { ForceUndirtyMrkPnt(); BegUndo(ImpGetResStr(STR_EditSetGluePercent),GetDescriptionOfMarkedGluePoints()); - ImpDoMarkedGluePoints(ImpSetPercent,FALSE,&bOn); + ImpDoMarkedGluePoints(ImpSetPercent,sal_False,&bOn); EndUndo(); } @@ -180,61 +180,61 @@ void SdrGlueEditView::SetMarkedGluePointsPercent(BOOL bOn) static void ImpGetAlign(SdrGluePoint& rGP, const SdrObject* /*pObj*/, const void* pbFirst, const void* pbDontCare, const void* pbVert, const void* pnRet, const void*) { - USHORT& nRet=*(USHORT*)pnRet; - BOOL& bFirst=*(BOOL*)pbFirst; - BOOL& bDontCare=*(BOOL*)pbDontCare; - BOOL bVert=*(BOOL*)pbVert; + sal_uInt16& nRet=*(sal_uInt16*)pnRet; + sal_Bool& bFirst=*(sal_Bool*)pbFirst; + sal_Bool& bDontCare=*(sal_Bool*)pbDontCare; + sal_Bool bVert=*(sal_Bool*)pbVert; if (!bDontCare) { - USHORT nAlg=0; + sal_uInt16 nAlg=0; if (bVert) { nAlg=rGP.GetVertAlign(); } else { nAlg=rGP.GetHorzAlign(); } - if (bFirst) { nRet=nAlg; bFirst=FALSE; } + if (bFirst) { nRet=nAlg; bFirst=sal_False; } else if (nRet!=nAlg) { if (bVert) { nRet=SDRVERTALIGN_DONTCARE; } else { nRet=SDRHORZALIGN_DONTCARE; } - bDontCare=TRUE; + bDontCare=sal_True; } } } -USHORT SdrGlueEditView::GetMarkedGluePointsAlign(BOOL bVert) const +sal_uInt16 SdrGlueEditView::GetMarkedGluePointsAlign(sal_Bool bVert) const { ForceUndirtyMrkPnt(); - BOOL bFirst=TRUE; - BOOL bDontCare=FALSE; - USHORT nRet=0; - ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,TRUE,&bFirst,&bDontCare,&bVert,&nRet); + sal_Bool bFirst=sal_True; + sal_Bool bDontCare=sal_False; + sal_uInt16 nRet=0; + ((SdrGlueEditView*)this)->ImpDoMarkedGluePoints(ImpGetAlign,sal_True,&bFirst,&bDontCare,&bVert,&nRet); return nRet; } static void ImpSetAlign(SdrGluePoint& rGP, const SdrObject* pObj, const void* pbVert, const void* pnAlign, const void*, const void*, const void*) { Point aPos(rGP.GetAbsolutePos(*pObj)); - if (*(BOOL*)pbVert) { // bVert? - rGP.SetVertAlign(*(USHORT*)pnAlign); + if (*(sal_Bool*)pbVert) { // bVert? + rGP.SetVertAlign(*(sal_uInt16*)pnAlign); } else { - rGP.SetHorzAlign(*(USHORT*)pnAlign); + rGP.SetHorzAlign(*(sal_uInt16*)pnAlign); } rGP.SetAbsolutePos(aPos,*pObj); } -void SdrGlueEditView::SetMarkedGluePointsAlign(BOOL bVert, USHORT nAlign) +void SdrGlueEditView::SetMarkedGluePointsAlign(sal_Bool bVert, sal_uInt16 nAlign) { ForceUndirtyMrkPnt(); BegUndo(ImpGetResStr(STR_EditSetGlueAlign),GetDescriptionOfMarkedGluePoints()); - ImpDoMarkedGluePoints(ImpSetAlign,FALSE,&bVert,&nAlign); + ImpDoMarkedGluePoints(ImpSetAlign,sal_False,&bVert,&nAlign); EndUndo(); } //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrGlueEditView::IsDeleteMarkedGluePointsPossible() const +sal_Bool SdrGlueEditView::IsDeleteMarkedGluePointsPossible() const { return HasMarkedGluePoints(); } @@ -247,13 +247,13 @@ void SdrGlueEditView::DeleteMarkedGluePoints() if( bUndo ) BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedGluePoints(),SDRREPFUNC_OBJ_DELETE); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); + sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); if (nPtAnz!=0) { SdrGluePointList* pGPL=pObj->ForceGluePointList(); @@ -262,10 +262,10 @@ void SdrGlueEditView::DeleteMarkedGluePoints() if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); - for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) + for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++) { - USHORT nPtId=pPts->GetObject(nPtNum); - USHORT nGlueIdx=pGPL->FindGluePoint(nPtId); + sal_uInt16 nPtId=pPts->GetObject(nPtNum); + sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId); if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND) { pGPL->Delete(nGlueIdx); @@ -292,28 +292,28 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints() if( bUndo ) BegUndo(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrUShortCont* pPts=pM->GetMarkedGluePoints(); SdrGluePointList* pGPL=pObj->ForceGluePointList(); - ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); + sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); if (nPtAnz!=0 && pGPL!=NULL) { if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); - for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) + for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++) { - USHORT nPtId=pPts->GetObject(nPtNum); - USHORT nGlueIdx=pGPL->FindGluePoint(nPtId); + sal_uInt16 nPtId=pPts->GetObject(nPtNum); + sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId); if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND) { SdrGluePoint aNewGP((*pGPL)[nGlueIdx]); // GluePoint klonen - USHORT nNewIdx=pGPL->Insert(aNewGP); // und einfuegen - USHORT nNewId=(*pGPL)[nNewIdx].GetId(); // Id des neuen GluePoints ermitteln + sal_uInt16 nNewIdx=pGPL->Insert(aNewGP); // und einfuegen + sal_uInt16 nNewId=(*pGPL)[nNewIdx].GetId(); // Id des neuen GluePoints ermitteln pPts->Replace(nNewId,nPtNum); // und diesen markieren (anstelle des alten) } } @@ -330,12 +330,12 @@ void SdrGlueEditView::ImpCopyMarkedGluePoints() void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const void* p1, const void* p2, const void* p3, const void* p4, const void* p5) { - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); - ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); + sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); if (nPtAnz!=0) { SdrGluePointList* pGPL=pObj->ForceGluePointList(); if (pGPL!=NULL) @@ -343,9 +343,9 @@ void SdrGlueEditView::ImpTransformMarkedGluePoints(PGlueTrFunc pTrFunc, const vo if( IsUndoEnabled() ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoGeoObject(*pObj)); - for (ULONG nPtNum=0; nPtNum<nPtAnz; nPtNum++) { - USHORT nPtId=pPts->GetObject(nPtNum); - USHORT nGlueIdx=pGPL->FindGluePoint(nPtId); + for (sal_uIntPtr nPtNum=0; nPtNum<nPtAnz; nPtNum++) { + sal_uInt16 nPtId=pPts->GetObject(nPtNum); + sal_uInt16 nGlueIdx=pGPL->FindGluePoint(nPtId); if (nGlueIdx!=SDRGLUEPOINT_NOTFOUND) { SdrGluePoint& rGP=(*pGPL)[nGlueIdx]; Point aPos(rGP.GetAbsolutePos(*pObj)); diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index e43faf9d0c..a44cafa62e 100644..100755 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -160,7 +160,7 @@ void SdrGluePoint::SetAlignAngle(long nWink) else if (nWink<33750) nAlign=SDRHORZALIGN_RIGHT |SDRVERTALIGN_BOTTOM; } -long SdrGluePoint::EscDirToAngle(USHORT nEsc) const +long SdrGluePoint::EscDirToAngle(sal_uInt16 nEsc) const { switch (nEsc) { case SDRESC_RIGHT : return 0; @@ -171,7 +171,7 @@ long SdrGluePoint::EscDirToAngle(USHORT nEsc) const return 0; } -USHORT SdrGluePoint::EscAngleToDir(long nWink) const +sal_uInt16 SdrGluePoint::EscAngleToDir(long nWink) const { nWink=NormAngle360(nWink); if (nWink>=31500 || nWink<4500) return SDRESC_RIGHT; @@ -191,8 +191,8 @@ void SdrGluePoint::Rotate(const Point& rRef, long nWink, double sn, double cs, c SetAlignAngle(GetAlignAngle()+nWink); } // Austrittsrichtungen drehen - USHORT nEscDir0=nEscDir; - USHORT nEscDir1=0; + sal_uInt16 nEscDir0=nEscDir; + sal_uInt16 nEscDir1=0; if ((nEscDir0&SDRESC_LEFT )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_LEFT )+nWink); if ((nEscDir0&SDRESC_TOP )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_TOP )+nWink); if ((nEscDir0&SDRESC_RIGHT )!=0) nEscDir1|=EscAngleToDir(EscDirToAngle(SDRESC_RIGHT )+nWink); @@ -220,8 +220,8 @@ void SdrGluePoint::Mirror(const Point& rRef1, const Point& rRef2, long nWink, co SetAlignAngle(nAW); } // Austrittsrichtungen spiegeln - USHORT nEscDir0=nEscDir; - USHORT nEscDir1=0; + sal_uInt16 nEscDir0=nEscDir; + sal_uInt16 nEscDir1=0; if ((nEscDir0&SDRESC_LEFT)!=0) { long nEW=EscDirToAngle(SDRESC_LEFT); nEW+=2*(nWink-nEW); @@ -261,7 +261,7 @@ void SdrGluePoint::Draw(OutputDevice& rOut, const SdrObject* pObj) const bool bMapMerk=rOut.IsMapModeEnabled(); Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); aPt=rOut.LogicToPixel(aPt); - rOut.EnableMapMode(FALSE); + rOut.EnableMapMode(sal_False); long x=aPt.X(),y=aPt.Y(); // Groesse erstmal fest auf 7 Pixel rOut.SetLineColor( aBackPenColor ); @@ -296,7 +296,7 @@ void SdrGluePoint::Invalidate(Window& rWin, const SdrObject* pObj) const bool bMapMerk=rWin.IsMapModeEnabled(); Point aPt(pObj!=NULL ? GetAbsolutePos(*pObj) : GetPos()); aPt=rWin.LogicToPixel(aPt); - rWin.EnableMapMode(FALSE); + rWin.EnableMapMode(sal_False); long x=aPt.X(),y=aPt.Y(); // Groesse erstmal fest auf 7 Pixel // #111096# @@ -318,8 +318,8 @@ bool SdrGluePoint::IsHit(const Point& rPnt, const OutputDevice& rOut, const SdrO void SdrGluePointList::Clear() { - USHORT nAnz=GetCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { delete GetObject(i); } aList.Clear(); @@ -328,8 +328,8 @@ void SdrGluePointList::Clear() void SdrGluePointList::operator=(const SdrGluePointList& rSrcList) { if (GetCount()!=0) Clear(); - USHORT nAnz=rSrcList.GetCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rSrcList.GetCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { Insert(rSrcList[i]); } } @@ -337,13 +337,13 @@ void SdrGluePointList::operator=(const SdrGluePointList& rSrcList) // Die Id's der Klebepunkte in der Liste sind stets streng monoton steigend! // Ggf. wird dem neuen Klebepunkt eine neue Id zugewiesen (wenn diese bereits // vergeben ist). Die Id 0 ist reserviert. -USHORT SdrGluePointList::Insert(const SdrGluePoint& rGP) +sal_uInt16 SdrGluePointList::Insert(const SdrGluePoint& rGP) { SdrGluePoint* pGP=new SdrGluePoint(rGP); - USHORT nId=pGP->GetId(); - USHORT nAnz=GetCount(); - USHORT nInsPos=nAnz; - USHORT nLastId=nAnz!=0 ? GetObject(nAnz-1)->GetId() : 0; + sal_uInt16 nId=pGP->GetId(); + sal_uInt16 nAnz=GetCount(); + sal_uInt16 nInsPos=nAnz; + sal_uInt16 nLastId=nAnz!=0 ? GetObject(nAnz-1)->GetId() : 0; DBG_ASSERT(nLastId>=nAnz,"SdrGluePointList::Insert(): nLastId<nAnz"); bool bHole = nLastId>nAnz; if (nId<=nLastId) { @@ -351,9 +351,9 @@ USHORT SdrGluePointList::Insert(const SdrGluePoint& rGP) nId=nLastId+1; } else { bool bBrk = false; - for (USHORT nNum=0; nNum<nAnz && !bBrk; nNum++) { + for (sal_uInt16 nNum=0; nNum<nAnz && !bBrk; nNum++) { const SdrGluePoint* pGP2=GetObject(nNum); - USHORT nTmpId=pGP2->GetId(); + sal_uInt16 nTmpId=pGP2->GetId(); if (nTmpId==nId) { nId=nLastId+1; // bereits vorhanden bBrk = true; @@ -372,35 +372,35 @@ USHORT SdrGluePointList::Insert(const SdrGluePoint& rGP) void SdrGluePointList::Invalidate(Window& rWin, const SdrObject* pObj) const { - USHORT nAnz=GetCount(); - for (USHORT nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { GetObject(nNum)->Invalidate(rWin,pObj); } } -USHORT SdrGluePointList::FindGluePoint(USHORT nId) const +sal_uInt16 SdrGluePointList::FindGluePoint(sal_uInt16 nId) const { // Hier noch einen optimaleren Suchalgorithmus implementieren. // Die Liste sollte stets sortiert sein!!!! - USHORT nAnz=GetCount(); - USHORT nRet=SDRGLUEPOINT_NOTFOUND; - for (USHORT nNum=0; nNum<nAnz && nRet==SDRGLUEPOINT_NOTFOUND; nNum++) { + sal_uInt16 nAnz=GetCount(); + sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND; + for (sal_uInt16 nNum=0; nNum<nAnz && nRet==SDRGLUEPOINT_NOTFOUND; nNum++) { const SdrGluePoint* pGP=GetObject(nNum); if (pGP->GetId()==nId) nRet=nNum; } return nRet; } -USHORT SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack, bool bNext, USHORT nId0) const +sal_uInt16 SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, const SdrObject* pObj, bool bBack, bool bNext, sal_uInt16 nId0) const { - USHORT nAnz=GetCount(); - USHORT nRet=SDRGLUEPOINT_NOTFOUND; - USHORT nNum=bBack ? 0 : nAnz; + sal_uInt16 nAnz=GetCount(); + sal_uInt16 nRet=SDRGLUEPOINT_NOTFOUND; + sal_uInt16 nNum=bBack ? 0 : nAnz; while ((bBack ? nNum<nAnz : nNum>0) && nRet==SDRGLUEPOINT_NOTFOUND) { if (!bBack) nNum--; const SdrGluePoint* pGP=GetObject(nNum); if (bNext) { - if (pGP->GetId()==nId0) bNext=FALSE; + if (pGP->GetId()==nId0) bNext=sal_False; } else { if (pGP->IsHit(rPnt,rOut,pObj)) nRet=nNum; } @@ -411,16 +411,16 @@ USHORT SdrGluePointList::HitTest(const Point& rPnt, const OutputDevice& rOut, co void SdrGluePointList::SetReallyAbsolute(bool bOn, const SdrObject& rObj) { - USHORT nAnz=GetCount(); - for (USHORT nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { GetObject(nNum)->SetReallyAbsolute(bOn,rObj); } } void SdrGluePointList::Rotate(const Point& rRef, long nWink, double sn, double cs, const SdrObject* pObj) { - USHORT nAnz=GetCount(); - for (USHORT nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { GetObject(nNum)->Rotate(rRef,nWink,sn,cs,pObj); } } @@ -434,16 +434,16 @@ void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, const SdrO void SdrGluePointList::Mirror(const Point& rRef1, const Point& rRef2, long nWink, const SdrObject* pObj) { - USHORT nAnz=GetCount(); - for (USHORT nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { GetObject(nNum)->Mirror(rRef1,rRef2,nWink,pObj); } } void SdrGluePointList::Shear(const Point& rRef, long nWink, double tn, bool bVShear, const SdrObject* pObj) { - USHORT nAnz=GetCount(); - for (USHORT nNum=0; nNum<nAnz; nNum++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { GetObject(nNum)->Shear(rRef,nWink,tn,bVShear,pObj); } } diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 0791ee2be9..385e939fa8 100644..100755 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -42,8 +42,8 @@ #include <vcl/bmpacc.hxx> #include <svx/sxekitm.hxx> -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/svdmodel.hxx> #include "gradtrns.hxx" @@ -63,7 +63,7 @@ #include <svx/sdr/overlay/overlaytriangle.hxx> #include <svx/sdr/overlay/overlayhatchrect.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <vcl/svapp.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <vcl/lazydelete.hxx> @@ -89,10 +89,10 @@ class SdrHdlBitmapSet BitmapEx& impGetOrCreateTargetBitmap(sal_uInt16 nIndex, const Rectangle& rRectangle); public: - SdrHdlBitmapSet(UINT16 nResId); + SdrHdlBitmapSet(sal_uInt16 nResId); ~SdrHdlBitmapSet(); - const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, UINT16 nInd=0); + const BitmapEx& GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd=0); }; //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -100,7 +100,7 @@ public: #define INDEX_COUNT (6) #define INDIVIDUAL_COUNT (4) -SdrHdlBitmapSet::SdrHdlBitmapSet(UINT16 nResId) +SdrHdlBitmapSet::SdrHdlBitmapSet(sal_uInt16 nResId) : maMarkersBitmap(), // 14 kinds (BitmapMarkerKind) use index [0..5], 4 extra maRealMarkers((KIND_COUNT * INDEX_COUNT) + INDIVIDUAL_COUNT) @@ -133,7 +133,7 @@ BitmapEx& SdrHdlBitmapSet::impGetOrCreateTargetBitmap(sal_uInt16 nIndex, const R } // change getting of bitmap to use the big ressource bitmap -const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, UINT16 nInd) +const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd) { // fill in size and source position in maMarkersBitmap const sal_uInt16 nYPos(nInd * 11); @@ -298,9 +298,9 @@ SdrHdl::SdrHdl(): nPolyNum(0), nPPntNum(0), nSourceHdlNum(0), - bSelect(FALSE), - b1PixMore(FALSE), - bPlusHdl(FALSE), + bSelect(sal_False), + b1PixMore(sal_False), + bPlusHdl(sal_False), mbMoveOutside(false), mbMouseOver(false) { @@ -317,9 +317,9 @@ SdrHdl::SdrHdl(const Point& rPnt, SdrHdlKind eNewKind): nPolyNum(0), nPPntNum(0), nSourceHdlNum(0), - bSelect(FALSE), - b1PixMore(FALSE), - bPlusHdl(FALSE), + bSelect(sal_False), + b1PixMore(sal_False), + bPlusHdl(sal_False), mbMoveOutside(false), mbMouseOver(false) { @@ -330,7 +330,7 @@ SdrHdl::~SdrHdl() GetRidOfIAObject(); } -void SdrHdl::Set1PixMore(BOOL bJa) +void SdrHdl::Set1PixMore(sal_Bool bJa) { if(b1PixMore != bJa) { @@ -375,7 +375,7 @@ void SdrHdl::SetPos(const Point& rPnt) } } -void SdrHdl::SetSelected(BOOL bJa) +void SdrHdl::SetSelected(sal_Bool bJa) { if(bSelect != bJa) { @@ -435,7 +435,7 @@ void SdrHdl::CreateB2dIAObject() BitmapColorIndex eColIndex = LightGreen; BitmapMarkerKind eKindOfMarker = Rect_7x7; - BOOL bRot = pHdlList->IsRotateShear(); + sal_Bool bRot = pHdlList->IsRotateShear(); if(pObj) eColIndex = (bSelect) ? Cyan : LightCyan; if(bRot) @@ -723,17 +723,17 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd { // #101688# AnchorTR for SW, take top right as (0,0) pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime, - (UINT16)(aBmpEx1.GetSizePixel().Width() - 1), 0, - (UINT16)(aBmpEx2.GetSizePixel().Width() - 1), 0); + (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1), 0, + (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1), 0); } else { // create centered handle as default pRetval = new ::sdr::overlay::OverlayAnimatedBitmapEx(rPos, aBmpEx1, aBmpEx2, nBlinkTime, - (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1, - (UINT16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1); + (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1, + (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1); } } else @@ -751,7 +751,7 @@ BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd { // #101688# AnchorTR for SW, take top right as (0,0) pRetval = new ::sdr::overlay::OverlayBitmapEx(rPos, aBmpEx, - (UINT16)(aBmpEx.GetSizePixel().Width() - 1), 0); + (sal_uInt16)(aBmpEx.GetSizePixel().Width() - 1), 0); } else { @@ -794,9 +794,9 @@ bool SdrHdl::IsHdlHit(const Point& rPnt) const Pointer SdrHdl::GetPointer() const { PointerStyle ePtr=POINTER_MOVE; - const BOOL bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT; - const BOOL bRot=pHdlList!=NULL && pHdlList->IsRotateShear(); - const BOOL bDis=pHdlList!=NULL && pHdlList->IsDistortShear(); + const sal_Bool bSize=eKind>=HDL_UPLFT && eKind<=HDL_LWRGT; + const sal_Bool bRot=pHdlList!=NULL && pHdlList->IsRotateShear(); + const sal_Bool bDis=pHdlList!=NULL && pHdlList->IsDistortShear(); if (bSize && pHdlList!=NULL && (bRot || bDis)) { switch (eKind) { case HDL_UPLFT: case HDL_UPRGT: @@ -826,7 +826,7 @@ Pointer SdrHdl::GetPointer() const while (nHdlWink<0) nHdlWink+=36000; while (nHdlWink>=36000) nHdlWink-=36000; nHdlWink/=4500; - switch ((BYTE)nHdlWink) { + switch ((sal_uInt8)nHdlWink) { case 0: ePtr=POINTER_ESIZE; break; case 1: ePtr=POINTER_NESIZE; break; case 2: ePtr=POINTER_NSIZE; break; @@ -862,7 +862,7 @@ Pointer SdrHdl::GetPointer() const } // #97016# II -BOOL SdrHdl::IsFocusHdl() const +sal_Bool SdrHdl::IsFocusHdl() const { switch(eKind) { @@ -877,9 +877,9 @@ BOOL SdrHdl::IsFocusHdl() const { // if it's a activated TextEdit, it's moved to extended points if(pHdlList && pHdlList->IsMoveOutside()) - return FALSE; + return sal_False; else - return TRUE; + return sal_True; } case HDL_MOVE: // Handle zum Verschieben des Objekts @@ -896,7 +896,7 @@ BOOL SdrHdl::IsFocusHdl() const //case HDL_ANCHOR: // anchor symbol (SD, SW) // #101688# same for AnchorTR //case HDL_ANCHOR_TR: // anchor symbol (SD, SW) - + //case HDL_TRNS: // interactive transparence //case HDL_GRAD: // interactive gradient //case HDL_COLR: // interactive color @@ -906,12 +906,12 @@ BOOL SdrHdl::IsFocusHdl() const case HDL_USER: { - return TRUE; + return sal_True; } default: { - return FALSE; + return sal_False; } } } @@ -932,7 +932,7 @@ bool SdrHdl::isMouseOver() const //////////////////////////////////////////////////////////////////////////////////////////////////// // class SdrHdlColor -SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, BOOL bLum) +SdrHdlColor::SdrHdlColor(const Point& rRef, Color aCol, const Size& rSize, sal_Bool bLum) : SdrHdl(rRef, HDL_COLR), aMarkerSize(rSize), bUseLuminance(bLum) @@ -952,7 +952,7 @@ void SdrHdlColor::CreateB2dIAObject() { // first throw away old one GetRidOfIAObject(); - + if(pHdlList) { SdrMarkView* pView = pHdlList->GetView(); @@ -978,8 +978,8 @@ void SdrHdlColor::CreateB2dIAObject() ::sdr::overlay::OverlayBitmapEx( aPosition, BitmapEx(aBmpCol), - (UINT16)(aBmpCol.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBmpCol.GetSizePixel().Height() - 1) >> 1 + (sal_uInt16)(aBmpCol.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBmpCol.GetSizePixel().Height() - 1) >> 1 ); DBG_ASSERT(pNewOverlayObject, "Got NO new IAO!"); @@ -1010,8 +1010,8 @@ Bitmap SdrHdlColor::CreateColorDropper(Color aCol) if(pWrite) { // draw outer border - INT32 nWidth = aMarkerSize.Width(); - INT32 nHeight = aMarkerSize.Height(); + sal_Int32 nWidth = aMarkerSize.Width(); + sal_Int32 nHeight = aMarkerSize.Height(); pWrite->SetLineColor(Color(COL_LIGHTGRAY)); pWrite->DrawLine(Point(0, 0), Point(0, nHeight - 1)); @@ -1047,7 +1047,7 @@ Bitmap SdrHdlColor::CreateColorDropper(Color aCol) Color SdrHdlColor::GetLuminance(const Color& rCol) { - UINT8 aLum = rCol.GetLuminance(); + sal_uInt8 aLum = rCol.GetLuminance(); Color aRetval(aLum, aLum, aLum); return aRetval; } @@ -1057,7 +1057,7 @@ void SdrHdlColor::CallColorChangeLink() aColorChangeHdl.Call(this); } -void SdrHdlColor::SetColor(Color aNew, BOOL bCallLink) +void SdrHdlColor::SetColor(Color aNew, sal_Bool bCallLink) { if(IsUseLuminance()) aNew = GetLuminance(aNew); @@ -1091,7 +1091,7 @@ void SdrHdlColor::SetSize(const Size& rNew) //////////////////////////////////////////////////////////////////////////////////////////////////// // class SdrHdlGradient -SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, BOOL bGrad) +SdrHdlGradient::SdrHdlGradient(const Point& rRef1, const Point& rRef2, sal_Bool bGrad) : SdrHdl(rRef1, bGrad ? HDL_GRAD : HDL_TRNS), pColHdl1(NULL), pColHdl2(NULL), @@ -1120,7 +1120,7 @@ void SdrHdlGradient::CreateB2dIAObject() { // first throw away old one GetRidOfIAObject(); - + if(pHdlList) { SdrMarkView* pView = pHdlList->GetView(); @@ -1146,8 +1146,8 @@ void SdrHdlGradient::CreateB2dIAObject() double fHalfArrowWidth = (0.05 * 0.5) * fVecLen; aVec.normalize(); basegfx::B2DVector aPerpend(-aVec.getY(), aVec.getX()); - INT32 nMidX = (INT32)(aPos.X() + aVec.getX() * fLongPercentArrow); - INT32 nMidY = (INT32)(aPos.Y() + aVec.getY() * fLongPercentArrow); + sal_Int32 nMidX = (sal_Int32)(aPos.X() + aVec.getX() * fLongPercentArrow); + sal_Int32 nMidY = (sal_Int32)(aPos.Y() + aVec.getY() * fLongPercentArrow); Point aMidPoint(nMidX, nMidY); basegfx::B2DPoint aPosition(aPos.X(), aPos.Y()); @@ -1164,10 +1164,10 @@ void SdrHdlGradient::CreateB2dIAObject() maOverlayGroup.append(*pNewOverlayObject); // arrowhead - Point aLeft(aMidPoint.X() + (INT32)(aPerpend.getX() * fHalfArrowWidth), - aMidPoint.Y() + (INT32)(aPerpend.getY() * fHalfArrowWidth)); - Point aRight(aMidPoint.X() - (INT32)(aPerpend.getX() * fHalfArrowWidth), - aMidPoint.Y() - (INT32)(aPerpend.getY() * fHalfArrowWidth)); + Point aLeft(aMidPoint.X() + (sal_Int32)(aPerpend.getX() * fHalfArrowWidth), + aMidPoint.Y() + (sal_Int32)(aPerpend.getY() * fHalfArrowWidth)); + Point aRight(aMidPoint.X() - (sal_Int32)(aPerpend.getX() * fHalfArrowWidth), + aMidPoint.Y() - (sal_Int32)(aPerpend.getY() * fHalfArrowWidth)); basegfx::B2DPoint aPositionLeft(aLeft.X(), aLeft.Y()); basegfx::B2DPoint aPositionRight(aRight.X(), aRight.Y()); @@ -1195,11 +1195,11 @@ void SdrHdlGradient::CreateB2dIAObject() IMPL_LINK(SdrHdlGradient, ColorChangeHdl, SdrHdl*, /*pHdl*/) { if(GetObj()) - FromIAOToItem(GetObj(), TRUE, TRUE); + FromIAOToItem(GetObj(), sal_True, sal_True); return 0; } -void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, BOOL bSetItemOnObject, BOOL bUndo) +void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, sal_Bool bSetItemOnObject, sal_Bool bUndo) { // from IAO positions and colors to gradient const SfxItemSet& rSet = _pObj->GetMergedItemSet(); @@ -1217,7 +1217,7 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, BOOL bSetItemOnObject, BOOL aGradTransVector.aCol1 = pColHdl1->GetColor(); if(pColHdl2) aGradTransVector.aCol2 = pColHdl2->GetColor(); - + if(IsGradient()) aOldGradTransGradient.aGradient = ((XFillGradientItem&)rSet.Get(XATTR_FILLGRADIENT)).GetGradientValue(); else @@ -1243,7 +1243,7 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, BOOL bSetItemOnObject, BOOL XFillFloatTransparenceItem aNewTransItem(aString, aGradTransGradient.aGradient); aNewSet.Put(aNewTransItem); } - + if(bUndo && pModel->IsUndoEnabled()) { pModel->BegUndo(SVX_RESSTR(IsGradient() ? SIP_XA_FILLGRADIENT : SIP_XA_FILLTRANSPARENCE)); @@ -1427,7 +1427,7 @@ void E3dVolumeMarker::CreateB2dIAObject() if(pNewOverlayObject) { pNewOverlayObject->setBaseColor(Color(COL_BLACK)); - + rPageWindow.GetOverlayManager()->add(*pNewOverlayObject); maOverlayGroup.append(*pNewOverlayObject); } @@ -1536,13 +1536,13 @@ Pointer ImpEdgeHdl::GetPointer() const return Pointer(POINTER_SSIZE); } -BOOL ImpEdgeHdl::IsHorzDrag() const +sal_Bool ImpEdgeHdl::IsHorzDrag() const { SdrEdgeObj* pEdge=PTR_CAST(SdrEdgeObj,pObj); if (pEdge==NULL) - return FALSE; + return sal_False; if (nObjHdlNum<=1) - return FALSE; + return sal_False; SdrEdgeKind eEdgeKind = ((SdrEdgeKindItem&)(pEdge->GetObjectItem(SDRATTR_EDGEKIND))).GetValue(); @@ -1555,11 +1555,11 @@ BOOL ImpEdgeHdl::IsHorzDrag() const { long nWink=nObjHdlNum==2 ? rInfo.nAngle1 : rInfo.nAngle2; if (nWink==0 || nWink==18000) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } - return FALSE; + return sal_False; } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1742,7 +1742,7 @@ int ImpSdrHdlListSorter::Compare(const void* pElem1, const void* pElem2) const { // #48763# if (eKind1==eKind2) return (long)pElem1<(long)pElem2 ? -1 : 1; // Notloesung, um immer die gleiche Sortierung zu haben - return (USHORT)eKind1<(USHORT)eKind2 ? -1 : 1; + return (sal_uInt16)eKind1<(sal_uInt16)eKind2 ? -1 : 1; } else return nNum1<nNum2 ? -1 : 1; @@ -1863,10 +1863,10 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward) if(aList.Count()) { // take care of old handle - const ULONG nOldHdlNum(mnFocusIndex); + const sal_uIntPtr nOldHdlNum(mnFocusIndex); SdrHdl* pOld = GetHdl(nOldHdlNum); //SDOsal_Bool bRefresh(sal_False); - + if(pOld) { // switch off old handle @@ -1890,7 +1890,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward) qsort(pHdlAndIndex, aList.Count(), sizeof(ImplHdlAndIndex), ImplSortHdlFunc); // #105678# look for old num in sorted array - ULONG nOldHdl(nOldHdlNum); + sal_uIntPtr nOldHdl(nOldHdlNum); if(nOldHdlNum != CONTAINER_ENTRY_NOTFOUND) { @@ -1905,7 +1905,7 @@ void SdrHdlList::TravelFocusHdl(sal_Bool bForward) } // #105678# build new HdlNum - ULONG nNewHdl(nOldHdl); + sal_uIntPtr nNewHdl(nOldHdl); // #105678# do the focus travel if(bForward) @@ -2004,7 +2004,7 @@ void SdrHdlList::SetFocusHdl(SdrHdl* pNew) if(!pActual || pActual != pNew) { - ULONG nNewHdlNum = GetHdlNum(pNew); + sal_uIntPtr nNewHdlNum = GetHdlNum(pNew); if(nNewHdlNum != CONTAINER_ENTRY_NOTFOUND) { @@ -2053,10 +2053,10 @@ SdrHdlList::SdrHdlList(SdrMarkView* pV) aList(1024,32,32) { nHdlSize = 3; - bRotateShear = FALSE; - bMoveOutside = FALSE; - bDistortShear = FALSE; - bFineHandles = FALSE; + bRotateShear = sal_False; + bMoveOutside = sal_False; + bDistortShear = sal_False; + bFineHandles = sal_False; } SdrHdlList::~SdrHdlList() @@ -2064,7 +2064,7 @@ SdrHdlList::~SdrHdlList() Clear(); } -void SdrHdlList::SetHdlSize(USHORT nSiz) +void SdrHdlList::SetHdlSize(sal_uInt16 nSiz) { if(nHdlSize != nSiz) { @@ -2072,7 +2072,7 @@ void SdrHdlList::SetHdlSize(USHORT nSiz) nHdlSize = nSiz; // propagate change to IAOs - for(UINT32 i=0; i<GetHdlCount(); i++) + for(sal_uInt32 i=0; i<GetHdlCount(); i++) { SdrHdl* pHdl = GetHdl(i); pHdl->Touch(); @@ -2080,7 +2080,7 @@ void SdrHdlList::SetHdlSize(USHORT nSiz) } } -void SdrHdlList::SetMoveOutside(BOOL bOn) +void SdrHdlList::SetMoveOutside(sal_Bool bOn) { if(bMoveOutside != bOn) { @@ -2088,7 +2088,7 @@ void SdrHdlList::SetMoveOutside(BOOL bOn) bMoveOutside = bOn; // propagate change to IAOs - for(UINT32 i=0; i<GetHdlCount(); i++) + for(sal_uInt32 i=0; i<GetHdlCount(); i++) { SdrHdl* pHdl = GetHdl(i); pHdl->Touch(); @@ -2096,17 +2096,17 @@ void SdrHdlList::SetMoveOutside(BOOL bOn) } } -void SdrHdlList::SetRotateShear(BOOL bOn) +void SdrHdlList::SetRotateShear(sal_Bool bOn) { bRotateShear = bOn; } -void SdrHdlList::SetDistortShear(BOOL bOn) +void SdrHdlList::SetDistortShear(sal_Bool bOn) { bDistortShear = bOn; } -void SdrHdlList::SetFineHdl(BOOL bOn) +void SdrHdlList::SetFineHdl(sal_Bool bOn) { if(bFineHandles != bOn) { @@ -2114,7 +2114,7 @@ void SdrHdlList::SetFineHdl(BOOL bOn) bFineHandles = bOn; // propagate change to IAOs - for(UINT32 i=0; i<GetHdlCount(); i++) + for(sal_uInt32 i=0; i<GetHdlCount(); i++) { SdrHdl* pHdl = GetHdl(i); pHdl->Touch(); @@ -2122,7 +2122,7 @@ void SdrHdlList::SetFineHdl(BOOL bOn) } } -SdrHdl* SdrHdlList::RemoveHdl(ULONG nNum) +SdrHdl* SdrHdlList::RemoveHdl(sal_uIntPtr nNum) { SdrHdl* pRetval = (SdrHdl*)aList.Remove(nNum); @@ -2131,15 +2131,15 @@ SdrHdl* SdrHdlList::RemoveHdl(ULONG nNum) void SdrHdlList::Clear() { - for (ULONG i=0; i<GetHdlCount(); i++) + for (sal_uIntPtr i=0; i<GetHdlCount(); i++) { SdrHdl* pHdl=GetHdl(i); delete pHdl; } aList.Clear(); - bRotateShear=FALSE; - bDistortShear=FALSE; + bRotateShear=sal_False; + bDistortShear=sal_False; } void SdrHdlList::Sort() @@ -2171,21 +2171,21 @@ void SdrHdlList::Sort() } } -ULONG SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const +sal_uIntPtr SdrHdlList::GetHdlNum(const SdrHdl* pHdl) const { if (pHdl==NULL) return CONTAINER_ENTRY_NOTFOUND; - ULONG nPos=aList.GetPos(pHdl); + sal_uIntPtr nPos=aList.GetPos(pHdl); return nPos; } -void SdrHdlList::AddHdl(SdrHdl* pHdl, BOOL bAtBegin) +void SdrHdlList::AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin) { if (pHdl!=NULL) { if (bAtBegin) { - aList.Insert(pHdl,ULONG(0)); + aList.Insert(pHdl,sal_uIntPtr(0)); } else { @@ -2195,11 +2195,11 @@ void SdrHdlList::AddHdl(SdrHdl* pHdl, BOOL bAtBegin) } } -SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrHdl* pHdl0) const +SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, sal_Bool bBack, sal_Bool bNext, SdrHdl* pHdl0) const { SdrHdl* pRet=NULL; - ULONG nAnz=GetHdlCount(); - ULONG nNum=bBack ? 0 : nAnz; + sal_uIntPtr nAnz=GetHdlCount(); + sal_uIntPtr nNum=bBack ? 0 : nAnz; while ((bBack ? nNum<nAnz : nNum>0) && pRet==NULL) { if (!bBack) @@ -2208,7 +2208,7 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrH if (bNext) { if (pHdl==pHdl0) - bNext=FALSE; + bNext=sal_False; } else { @@ -2224,7 +2224,7 @@ SdrHdl* SdrHdlList::IsHdlListHit(const Point& rPnt, BOOL bBack, BOOL bNext, SdrH SdrHdl* SdrHdlList::GetHdl(SdrHdlKind eKind1) const { SdrHdl* pRet=NULL; - for (ULONG i=0; i<GetHdlCount() && pRet==NULL; i++) + for (sal_uIntPtr i=0; i<GetHdlCount() && pRet==NULL; i++) { SdrHdl* pHdl=GetHdl(i); if (pHdl->GetKind()==eKind1) @@ -2347,17 +2347,17 @@ void SdrCropHdl::CreateB2dIAObject() const sal_uInt32 nBlinkTime = sal::static_int_cast<sal_uInt32>(rStyleSettings.GetCursorBlinkTime()); pOverlayObject = new ::sdr::overlay::OverlayAnimatedBitmapEx(aPosition, aBmpEx1, aBmpEx2, nBlinkTime, - (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1, - (UINT16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1); + (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1, + (sal_uInt16)(aBmpEx2.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBmpEx2.GetSizePixel().Height() - 1) >> 1); } else { // create centered handle as default pOverlayObject = new ::sdr::overlay::OverlayBitmapEx(aPosition, aBmpEx1, - (UINT16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, - (UINT16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1); + (sal_uInt16)(aBmpEx1.GetSizePixel().Width() - 1) >> 1, + (sal_uInt16)(aBmpEx1.GetSizePixel().Height() - 1) >> 1); } // OVERLAYMANAGER diff --git a/svx/source/svdraw/svdhlpln.cxx b/svx/source/svdraw/svdhlpln.cxx index dc03845e52..4445ab5b61 100644..100755 --- a/svx/source/svdraw/svdhlpln.cxx +++ b/svx/source/svdraw/svdhlpln.cxx @@ -48,7 +48,7 @@ Pointer SdrHelpLine::GetPointer() const } // switch } -bool SdrHelpLine::IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const +bool SdrHelpLine::IsHit(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const { Size a1Pix(rOut.PixelToLogic(Size(1,1))); bool bXHit=rPnt.X()>=aPos.X()-nTolLog && rPnt.X()<=aPos.X()+nTolLog+a1Pix.Width(); @@ -64,7 +64,7 @@ bool SdrHelpLine::IsHit(const Point& rPnt, USHORT nTolLog, const OutputDevice& r } } break; } // switch - return FALSE; + return sal_False; } Rectangle SdrHelpLine::GetBoundRect(const OutputDevice& rOut) const @@ -106,8 +106,8 @@ bool SdrHelpLine::IsVisibleEqual( const SdrHelpLine& rHelpLine, const OutputDevi void SdrHelpLineList::Clear() { - USHORT nAnz=GetCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { delete GetObject(i); } aList.Clear(); @@ -116,8 +116,8 @@ void SdrHelpLineList::Clear() void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList) { Clear(); - USHORT nAnz=rSrcList.GetCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rSrcList.GetCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { Insert(rSrcList[i]); } } @@ -125,10 +125,10 @@ void SdrHelpLineList::operator=(const SdrHelpLineList& rSrcList) bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const { bool bEqual = false; - USHORT nAnz=GetCount(); + sal_uInt16 nAnz=GetCount(); if (nAnz==rSrcList.GetCount()) { bEqual = true; - for (USHORT i=0; i<nAnz && bEqual; i++) { + for (sal_uInt16 i=0; i<nAnz && bEqual; i++) { if (*GetObject(i)!=*rSrcList.GetObject(i)) { bEqual = false; } @@ -137,10 +137,10 @@ bool SdrHelpLineList::operator==(const SdrHelpLineList& rSrcList) const return bEqual; } -USHORT SdrHelpLineList::HitTest(const Point& rPnt, USHORT nTolLog, const OutputDevice& rOut) const +sal_uInt16 SdrHelpLineList::HitTest(const Point& rPnt, sal_uInt16 nTolLog, const OutputDevice& rOut) const { - USHORT nAnz=GetCount(); - for (USHORT i=nAnz; i>0;) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 i=nAnz; i>0;) { i--; if (GetObject(i)->IsHit(rPnt,nTolLog,rOut)) return i; } diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 97509fde30..0dd549b77b 100644..100755 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -37,7 +37,7 @@ #define _STDLIB_H #endif -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <editeng/flditem.hxx> #include <editeng/editdata.hxx> #include <svx/svdpool.hxx> @@ -67,7 +67,7 @@ #include <svl/rectitem.hxx> #include <svl/rngitem.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -92,18 +92,18 @@ public: XubString aName; XubString aValue; SfxItemState eState; - UINT16 nWhichId; + sal_uInt16 nWhichId; TypeId pType; ItemType eItemType; - INT32 nVal; - INT32 nMin; - INT32 nMax; + sal_Int32 nVal; + sal_Int32 nMin; + sal_Int32 nMax; - BOOL bComment; - BOOL bIsNum; - BOOL bCanNum; + sal_Bool bComment; + sal_Bool bIsNum; + sal_Bool bCanNum; public: ImpItemListRow() @@ -114,14 +114,14 @@ public: nVal(0), nMin(0), nMax(0), - bComment(FALSE), - bIsNum(FALSE), - bCanNum(FALSE) + bComment(sal_False), + bIsNum(sal_False), + bCanNum(sal_False) {} XubString GetItemTypeStr() const; - BOOL operator==(const ImpItemListRow& rEntry) const; - BOOL operator!=(const ImpItemListRow& rEntry) const { return !operator==(rEntry); } + sal_Bool operator==(const ImpItemListRow& rEntry) const; + sal_Bool operator!=(const ImpItemListRow& rEntry) const { return !operator==(rEntry); } }; XubString ImpItemListRow::GetItemTypeStr() const @@ -156,7 +156,7 @@ XubString ImpItemListRow::GetItemTypeStr() const return aStr; } -BOOL ImpItemListRow::operator==(const ImpItemListRow& rEntry) const +sal_Bool ImpItemListRow::operator==(const ImpItemListRow& rEntry) const { return (aName.Equals(rEntry.aName) && aValue.Equals(rEntry.aValue) @@ -196,7 +196,7 @@ void ImpItemEdit::KeyInput(const KeyEvent& rKEvt) { _SdrItemBrowserControl* pBrowseMerk = pBrowse; - UINT16 nKeyCode(rKEvt.GetKeyCode().GetCode() + rKEvt.GetKeyCode().GetModifier()); + sal_uInt16 nKeyCode(rKEvt.GetKeyCode().GetCode() + rKEvt.GetKeyCode().GetModifier()); if(nKeyCode == KEY_RETURN) { @@ -248,13 +248,13 @@ void _SdrItemBrowserControl::ImpCtor() nLastWhich = 0; nLastWhichOben = 0; // not implemented yet nLastWhichUnten = 0; // not implemented yet - bWhichesButNames = FALSE; - bDontHideIneffectiveItems = FALSE; - bDontSortItems = FALSE; - bShowWhichIds = FALSE; - bShowRealValues = FALSE; - bShowWhichIds = TRUE; // not implemented yet - bShowRealValues = TRUE; // not implemented yet + bWhichesButNames = sal_False; + bDontHideIneffectiveItems = sal_False; + bDontSortItems = sal_False; + bShowWhichIds = sal_False; + bShowRealValues = sal_False; + bShowWhichIds = sal_True; // not implemented yet + bShowRealValues = sal_True; // not implemented yet rtl_TextEncoding aTextEncoding = gsl_getSystemTextEncoding(); @@ -295,8 +295,8 @@ void _SdrItemBrowserControl::ImpCtor() void _SdrItemBrowserControl::Clear() { - ULONG nAnz=aList.Count(); - for (ULONG nNum=0; nNum<nAnz; nNum++) { + sal_uIntPtr nAnz=aList.Count(); + for (sal_uIntPtr nNum=0; nNum<nAnz; nNum++) { delete ImpGetEntry(nNum); } aList.Clear(); @@ -308,13 +308,13 @@ long _SdrItemBrowserControl::GetRowCount() const return aList.Count(); } -BOOL _SdrItemBrowserControl::SeekRow(long nRow) +sal_Bool _SdrItemBrowserControl::SeekRow(long nRow) { nAktPaintRow=nRow; - return TRUE; + return sal_True; } -String _SdrItemBrowserControl::GetCellText(long _nRow, USHORT _nColId) const +String _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const { String sRet; if ( _nRow >= 0 && _nRow < (sal_Int32)aList.Count() ) @@ -357,9 +357,9 @@ String _SdrItemBrowserControl::GetCellText(long _nRow, USHORT _nColId) const return sRet; } -void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId) const +void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const { - if (nAktPaintRow<0 || (ULONG)nAktPaintRow>=aList.Count()) { + if (nAktPaintRow<0 || (sal_uIntPtr)nAktPaintRow>=aList.Count()) { return; } Rectangle aR(rRect); @@ -383,22 +383,22 @@ void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRe } } -ULONG _SdrItemBrowserControl::GetCurrentPos() const +sal_uIntPtr _SdrItemBrowserControl::GetCurrentPos() const { - ULONG nRet=CONTAINER_ENTRY_NOTFOUND; + sal_uIntPtr nRet=CONTAINER_ENTRY_NOTFOUND; if (GetSelectRowCount()==1) { long nPos=((BrowseBox*)this)->FirstSelectedRow(); - if (nPos>=0 && (ULONG)nPos<aList.Count()) { - nRet=(ULONG)nPos; + if (nPos>=0 && (sal_uIntPtr)nPos<aList.Count()) { + nRet=(sal_uIntPtr)nPos; } } return nRet; } -USHORT _SdrItemBrowserControl::GetCurrentWhich() const +sal_uInt16 _SdrItemBrowserControl::GetCurrentWhich() const { - USHORT nRet=0; - ULONG nPos=GetCurrentPos(); + sal_uInt16 nRet=0; + sal_uIntPtr nPos=GetCurrentPos(); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { nRet=ImpGetEntry(nPos)->nWhichId; } @@ -407,7 +407,7 @@ USHORT _SdrItemBrowserControl::GetCurrentWhich() const void _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&) { - ULONG nPos=GetCurrentPos(); + sal_uIntPtr nPos=GetCurrentPos(); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { BegChangeEntry(nPos); } @@ -415,9 +415,9 @@ void _SdrItemBrowserControl::DoubleClick(const BrowserMouseEvent&) void _SdrItemBrowserControl::KeyInput(const KeyEvent& rKEvt) { - USHORT nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier(); + sal_uInt16 nKeyCode=rKEvt.GetKeyCode().GetCode()+rKEvt.GetKeyCode().GetModifier(); bool bAusgewertet = false; - ULONG nPos=GetCurrentPos(); + sal_uIntPtr nPos=GetCurrentPos(); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { if (nKeyCode==KEY_RETURN) { if (BegChangeEntry(nPos)) bAusgewertet = true; @@ -467,7 +467,7 @@ void _SdrItemBrowserControl::Select() void _SdrItemBrowserControl::ImpSaveWhich() { - USHORT nWh=GetCurrentWhich(); + sal_uInt16 nWh=GetCurrentWhich(); if (nWh!=0) { long nPos=GetCurrentPos(); long nTop=GetTopRow(); @@ -485,12 +485,12 @@ void _SdrItemBrowserControl::ImpRestoreWhich() { if (nLastWhich!=0) { bool bFnd = false; - ULONG nAnz=aList.Count(); - ULONG nNum; + sal_uIntPtr nAnz=aList.Count(); + sal_uIntPtr nNum; for (nNum=0; nNum<nAnz && !bFnd; nNum++) { ImpItemListRow* pEntry=ImpGetEntry(nNum); if (!pEntry->bComment) { - USHORT nWh=pEntry->nWhichId; + sal_uInt16 nWh=pEntry->nWhichId; if (nWh==nLastWhich) bFnd = true; } } @@ -505,7 +505,7 @@ void _SdrItemBrowserControl::ImpRestoreWhich() } } -bool _SdrItemBrowserControl::BegChangeEntry(ULONG nPos) +bool _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos) { BrkChangeEntry(); bool bRet = false; @@ -513,7 +513,7 @@ bool _SdrItemBrowserControl::BegChangeEntry(ULONG nPos) if (pEntry!=NULL && !pEntry->bComment) { SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT); pEditControl=new ImpItemEdit(&GetDataWindow(),this,0/*|WB_BORDER|WB_3DLOOK*/); - Rectangle aRect(GetFieldRectPixel(nPos,ITEMBROWSER_VALUECOL_ID,FALSE)); + Rectangle aRect(GetFieldRectPixel(nPos,ITEMBROWSER_VALUECOL_ID,sal_False)); aRect.Left()+=2; // Kleiner Offset fuer's Edit, damit's pixelgenau stimmt aRect.Right()--; pEditControl->SetPosSizePixel(aRect.TopLeft(),aRect.GetSize()); @@ -574,7 +574,7 @@ void _SdrItemBrowserControl::BrkChangeEntry() } } -void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEntryNum) +void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, sal_uIntPtr nEntryNum) { ImpItemListRow* pAktEntry=ImpGetEntry(nEntryNum); if (pAktEntry==NULL) { @@ -601,19 +601,19 @@ void _SdrItemBrowserControl::ImpSetEntry(const ImpItemListRow& rEntry, ULONG nEn } } -bool ImpGetItem(const SfxItemSet& rSet, USHORT nWhich, const SfxPoolItem*& rpItem) +bool ImpGetItem(const SfxItemSet& rSet, sal_uInt16 nWhich, const SfxPoolItem*& rpItem) { - SfxItemState eState=rSet.GetItemState(nWhich,TRUE,&rpItem); + SfxItemState eState=rSet.GetItemState(nWhich,sal_True,&rpItem); if (eState==SFX_ITEM_DEFAULT) { rpItem=&rSet.Get(nWhich); } return (eState==SFX_ITEM_DEFAULT || eState==SFX_ITEM_SET) && rpItem!=NULL; } -bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) +bool IsItemIneffective(sal_uInt16 nWhich, const SfxItemSet* pSet, sal_uInt16& rIndent) { rIndent=0; - if (pSet==NULL) return FALSE; + if (pSet==NULL) return sal_False; const SfxPoolItem* pItem=NULL; bool bRet = false; switch (nWhich) { @@ -630,21 +630,21 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,XATTR_LINESTYLE,pItem)) { XLineStyle eLineStyle=((const XLineStyleItem*)pItem)->GetValue(); - if (eLineStyle==XLINE_NONE) return TRUE; - if (eLineStyle!=XLINE_DASH && nWhich==XATTR_LINEDASH) return TRUE; + if (eLineStyle==XLINE_NONE) return sal_True; + if (eLineStyle!=XLINE_DASH && nWhich==XATTR_LINEDASH) return sal_True; } if (nWhich==XATTR_LINESTART || nWhich==XATTR_LINESTARTCENTER) { rIndent=2; if (ImpGetItem(*pSet,XATTR_LINESTARTWIDTH,pItem)) { - INT32 nWdt=((const XLineStartWidthItem*)pItem)->GetValue(); - if (nWdt==0) return TRUE; + sal_Int32 nWdt=((const XLineStartWidthItem*)pItem)->GetValue(); + if (nWdt==0) return sal_True; } } if (nWhich==XATTR_LINEEND || nWhich==XATTR_LINEENDCENTER) { rIndent=2; if (ImpGetItem(*pSet,XATTR_LINEENDWIDTH,pItem)) { - INT32 nWdt=((const XLineEndWidthItem*)pItem)->GetValue(); - if (nWdt==0) return TRUE; + sal_Int32 nWdt=((const XLineEndWidthItem*)pItem)->GetValue(); + if (nWdt==0) return sal_True; } } } break; @@ -658,31 +658,31 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) { XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue(); - if (eFillStyle==XFILL_NONE) return TRUE; + if (eFillStyle==XFILL_NONE) return sal_True; // Transparenz z.Zt. nur fuer SolidFill - if (eFillStyle!=XFILL_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return TRUE; - if (eFillStyle!=XFILL_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return TRUE; - if (eFillStyle!=XFILL_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return TRUE; + if (eFillStyle!=XFILL_SOLID && (nWhich==XATTR_FILLCOLOR || nWhich==XATTR_FILLTRANSPARENCE)) return sal_True; + if (eFillStyle!=XFILL_GRADIENT && (nWhich==XATTR_FILLGRADIENT || nWhich==XATTR_GRADIENTSTEPCOUNT)) return sal_True; + if (eFillStyle!=XFILL_HATCH && (nWhich==XATTR_FILLHATCH || nWhich==XATTR_FILLBACKGROUND)) return sal_True; } } break; case XATTR_FILLBITMAP : case XATTR_FILLBMP_TILE : - case XATTR_FILLBMP_POS : /* z.Zt. nur wenn TILE=TRUE */ + case XATTR_FILLBMP_POS : /* z.Zt. nur wenn TILE=sal_True */ case XATTR_FILLBMP_SIZEX : /* nur wenn nicht Stretch */ case XATTR_FILLBMP_SIZEY : /* nur wenn nicht Stretch */ - case XATTR_FILLBMP_SIZELOG : /* nur wenn SIZELOG=FALSE zum ruecksetzen auf TRUE (alt) -> doch noch in Gebrauch */ - case XATTR_FILLBMP_TILEOFFSETX : /* nur wenn TILE=TRUE */ - case XATTR_FILLBMP_TILEOFFSETY : /* nur wenn TILE=TRUE */ - case XATTR_FILLBMP_STRETCH : /* nur wenn TILE=FALSE */ - case XATTR_FILLBMP_POSOFFSETX : /* nur wenn TILE=TRUE*/ - case XATTR_FILLBMP_POSOFFSETY : { /* nur wenn TILE=TRUE*/ + case XATTR_FILLBMP_SIZELOG : /* nur wenn SIZELOG=sal_False zum ruecksetzen auf sal_True (alt) -> doch noch in Gebrauch */ + case XATTR_FILLBMP_TILEOFFSETX : /* nur wenn TILE=sal_True */ + case XATTR_FILLBMP_TILEOFFSETY : /* nur wenn TILE=sal_True */ + case XATTR_FILLBMP_STRETCH : /* nur wenn TILE=sal_False */ + case XATTR_FILLBMP_POSOFFSETX : /* nur wenn TILE=sal_True*/ + case XATTR_FILLBMP_POSOFFSETY : { /* nur wenn TILE=sal_True*/ rIndent=1; if (ImpGetItem(*pSet,XATTR_FILLSTYLE,pItem)) { XFillStyle eFillStyle=((const XFillStyleItem*)pItem)->GetValue(); - if (eFillStyle!=XFILL_BITMAP) return TRUE; + if (eFillStyle!=XFILL_BITMAP) return sal_True; } if (nWhich==XATTR_FILLBITMAP || nWhich==XATTR_FILLBMP_TILE) { - return FALSE; // immer anwaehlbar + return sal_False; // immer anwaehlbar } bool bTileTRUE = false; bool bTileFALSE = false; @@ -710,8 +710,8 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) } // Noch 2 Items speziell fuer Tile die sich jedoch gegenseitig ausschliessen if (nWhich==XATTR_FILLBMP_TILEOFFSETX || nWhich==XATTR_FILLBMP_TILEOFFSETY) { - if (bTileFALSE) return TRUE; - USHORT nX=0,nY=0; + if (bTileFALSE) return sal_True; + sal_uInt16 nX=0,nY=0; bool bX = false,bY = false; if (ImpGetItem(*pSet,XATTR_FILLBMP_TILEOFFSETX,pItem)) { nX=((const XFillBmpTileOffsetXItem*)pItem)->GetValue(); @@ -722,19 +722,19 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) bY = true; } if (nWhich==XATTR_FILLBMP_TILEOFFSETX) { - if (nX!=0 || !bX) return FALSE; - if (nY!=0) return TRUE; + if (nX!=0 || !bX) return sal_False; + if (nY!=0) return sal_True; } else { - if (nY!=0 || !bY) return FALSE; - if (nX!=0) return TRUE; + if (nY!=0 || !bY) return sal_False; + if (nX!=0) return sal_True; } } // SizeLog nicht anwaehlbar bei Stretch=TRUE - // und sonst auch nur wenn es auf SizeLog=FALSE gesetzt ist. + // und sonst auch nur wenn es auf SizeLog=sal_False gesetzt ist. // -> wohl doch noch in Gebrauch - // (TRUE ist der statische PoolDefault) + // (sal_True ist der statische PoolDefault) if (nWhich==XATTR_FILLBMP_SIZELOG) { - if (bTileFALSE && bStretchTRUE) return TRUE; + if (bTileFALSE && bStretchTRUE) return sal_True; } } break; @@ -753,13 +753,13 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,XATTR_FORMTXTSTYLE,pItem)) { XFormTextStyle eStyle=((const XFormTextStyleItem*)pItem)->GetValue(); - if (eStyle==XFT_NONE) return TRUE; + if (eStyle==XFT_NONE) return sal_True; } if ((nWhich>=XATTR_FORMTXTSHDWCOLOR && nWhich<=XATTR_FORMTXTSHDWYVAL) || nWhich>=XATTR_FORMTXTSHDWTRANSP) { rIndent=2; if (ImpGetItem(*pSet,XATTR_FORMTXTSHADOW,pItem)) { XFormTextShadow eShadow=((const XFormTextShadowItem*)pItem)->GetValue(); - if (eShadow==XFTSHADOW_NONE) return TRUE; + if (eShadow==XFTSHADOW_NONE) return sal_True; } } } break; @@ -773,7 +773,7 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,SDRATTR_SHADOW,pItem)) { bool bShadow=((const SdrShadowItem*)pItem)->GetValue(); - if (!bShadow) return TRUE; + if (!bShadow) return sal_True; } } break; @@ -781,7 +781,7 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CAPTIONFIXEDANGLE,pItem)) { bool bFixed=((const SdrCaptionFixedAngleItem*)pItem)->GetValue(); - if (!bFixed) return TRUE; + if (!bFixed) return sal_True; } } break; case SDRATTR_CAPTIONESCREL: @@ -789,15 +789,15 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CAPTIONESCISREL,pItem)) { bool bRel=((const SdrCaptionEscIsRelItem*)pItem)->GetValue(); - if (bRel && nWhich==SDRATTR_CAPTIONESCABS) return TRUE; - if (!bRel && nWhich==SDRATTR_CAPTIONESCREL) return TRUE; + if (bRel && nWhich==SDRATTR_CAPTIONESCABS) return sal_True; + if (!bRel && nWhich==SDRATTR_CAPTIONESCREL) return sal_True; } } break; case SDRATTR_CAPTIONLINELEN: { rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CAPTIONFITLINELEN,pItem)) { bool bFit=((const SdrCaptionFitLineLenItem*)pItem)->GetValue(); - if (bFit) return TRUE; + if (bFit) return sal_True; } } break; @@ -806,7 +806,7 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWHEIGHT,pItem)) { bool bAutoGrow=((const SdrTextAutoGrowHeightItem*)pItem)->GetValue(); - if (!bAutoGrow) return TRUE; + if (!bAutoGrow) return sal_True; } } break; case SDRATTR_TEXT_MINFRAMEWIDTH: @@ -814,14 +814,14 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,SDRATTR_TEXT_AUTOGROWWIDTH,pItem)) { bool bAutoGrow=((const SdrTextAutoGrowWidthItem*)pItem)->GetValue(); - if (!bAutoGrow) return TRUE; + if (!bAutoGrow) return sal_True; } } break; case SDRATTR_TEXT_VERTADJUST: case SDRATTR_TEXT_HORZADJUST: { if (ImpGetItem(*pSet,SDRATTR_TEXT_FITTOSIZE,pItem)) { SdrFitToSizeType eFit=((const SdrTextFitToSizeTypeItem*)pItem)->GetValue(); - if (eFit!=SDRTEXTFIT_NONE) return TRUE; + if (eFit!=SDRTEXTFIT_NONE) return sal_True; } } break; @@ -834,30 +834,30 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,SDRATTR_TEXT_ANIKIND,pItem)) { SdrTextAniKind eAniKind=((const SdrTextAniKindItem*)pItem)->GetValue(); - if (eAniKind==SDRTEXTANI_NONE) return TRUE; - if (eAniKind==SDRTEXTANI_BLINK && (nWhich==SDRATTR_TEXT_ANIDIRECTION || nWhich==SDRATTR_TEXT_ANIAMOUNT)) return TRUE; - if (eAniKind==SDRTEXTANI_SLIDE && (nWhich==SDRATTR_TEXT_ANISTARTINSIDE || nWhich==SDRATTR_TEXT_ANISTOPINSIDE)) return TRUE; + if (eAniKind==SDRTEXTANI_NONE) return sal_True; + if (eAniKind==SDRTEXTANI_BLINK && (nWhich==SDRATTR_TEXT_ANIDIRECTION || nWhich==SDRATTR_TEXT_ANIAMOUNT)) return sal_True; + if (eAniKind==SDRTEXTANI_SLIDE && (nWhich==SDRATTR_TEXT_ANISTARTINSIDE || nWhich==SDRATTR_TEXT_ANISTOPINSIDE)) return sal_True; } } break; - case SDRATTR_EDGELINEDELTAANZ: return TRUE; + case SDRATTR_EDGELINEDELTAANZ: return sal_True; case SDRATTR_EDGELINE1DELTA: case SDRATTR_EDGELINE2DELTA: case SDRATTR_EDGELINE3DELTA: { if (ImpGetItem(*pSet,SDRATTR_EDGEKIND,pItem)) { SdrEdgeKind eKind=((const SdrEdgeKindItem*)pItem)->GetValue(); if (eKind==SDREDGE_THREELINES) { - if (nWhich>SDRATTR_EDGELINE2DELTA) return TRUE; - else return FALSE; + if (nWhich>SDRATTR_EDGELINE2DELTA) return sal_True; + else return sal_False; } - if (eKind!=SDREDGE_ORTHOLINES && eKind!=SDREDGE_BEZIER) return TRUE; + if (eKind!=SDREDGE_ORTHOLINES && eKind!=SDREDGE_BEZIER) return sal_True; } if (ImpGetItem(*pSet,SDRATTR_EDGELINEDELTAANZ,pItem)) { - UINT16 nAnz=((const SdrEdgeLineDeltaAnzItem*)pItem)->GetValue(); - if (nAnz==0) return TRUE; - if (nAnz==1 && nWhich>SDRATTR_EDGELINE1DELTA) return TRUE; - if (nAnz==2 && nWhich>SDRATTR_EDGELINE2DELTA) return TRUE; - if (nAnz==3 && nWhich>SDRATTR_EDGELINE3DELTA) return TRUE; + sal_uInt16 nAnz=((const SdrEdgeLineDeltaAnzItem*)pItem)->GetValue(); + if (nAnz==0) return sal_True; + if (nAnz==1 && nWhich>SDRATTR_EDGELINE1DELTA) return sal_True; + if (nAnz==2 && nWhich>SDRATTR_EDGELINE2DELTA) return sal_True; + if (nAnz==3 && nWhich>SDRATTR_EDGELINE3DELTA) return sal_True; } } break; @@ -866,14 +866,14 @@ bool IsItemIneffective(USHORT nWhich, const SfxItemSet* pSet, USHORT& rIndent) rIndent=1; if (ImpGetItem(*pSet,SDRATTR_CIRCKIND,pItem)) { SdrCircKind eKind=((const SdrCircKindItem*)pItem)->GetValue(); - if (eKind==SDRCIRC_FULL) return TRUE; + if (eKind==SDRCIRC_FULL) return sal_True; } } break; } // switch return bRet; } -USHORT ImpSortWhich(USHORT nWhich) +sal_uInt16 ImpSortWhich(sal_uInt16 nWhich) { switch (nWhich) { // Line @@ -928,11 +928,11 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT); if (pSet!=NULL) { rtl_TextEncoding aTextEncoding = gsl_getSystemTextEncoding(); - USHORT nEntryNum=0; + sal_uInt16 nEntryNum=0; SfxWhichIter aIter(*pSet); const SfxItemPool* pPool=pSet->GetPool(); - USHORT nWhich0=0; - USHORT nWhich=aIter.FirstWhich(); + sal_uInt16 nWhich0=0; + sal_uInt16 nWhich=aIter.FirstWhich(); while (nWhich!=0) { // Nun erstmal etwas umsortieren // Geht nur, solange keine InvalidItems, d.h. keine Luecken @@ -946,12 +946,12 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem } if (eState!=SFX_ITEM_DISABLED) { const SfxPoolItem& rItem=pSet->Get(nWhich); - USHORT nIndent=0; + sal_uInt16 nIndent=0; if (!HAS_BASE(SfxVoidItem,&rItem) && !HAS_BASE(SfxSetItem,&rItem) && (!IsItemIneffective(nWhich,pSet,nIndent) || bDontHideIneffectiveItems)) { XubString aCommentStr; INSERTCOMMENT(XATTR_LINE_FIRST,XATTR_LINE_LAST,String("L I N I E", aTextEncoding)); - INSERTCOMMENT(XATTR_FILL_FIRST,XATTR_FILL_LAST,String("F L Ä C H E", aTextEncoding)); + INSERTCOMMENT(XATTR_FILL_FIRST,XATTR_FILL_LAST,String("F L � C H E", aTextEncoding)); INSERTCOMMENT(XATTR_TEXT_FIRST,XATTR_TEXT_LAST,String("F O N T W O R K", aTextEncoding)); INSERTCOMMENT(SDRATTR_SHADOW_FIRST,SDRATTR_SHADOW_LAST,String("S C H A T T E N", aTextEncoding)); INSERTCOMMENT(SDRATTR_CAPTION_FIRST,SDRATTR_CAPTION_LAST,String("L E G E N D E", aTextEncoding)); @@ -1039,7 +1039,7 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem if (aEntry.eItemType==ITEM_BOOL) aEntry.aValue.AppendAscii(aEntry.nVal!=0 ? "True" : "False"); else if (aEntry.bCanNum) aEntry.aValue = UniString::CreateFromInt32(aEntry.nVal); else if (aEntry.eItemType==ITEM_STRING) aEntry.aValue=((SfxStringItem&)rItem).GetValue(); - else if (aEntry.eItemType==ITEM_ENUM && nWhich!=EE_CHAR_WEIGHT) aEntry.aValue=((SfxEnumItemInterface&)rItem).GetValueTextByPos((BOOL)aEntry.nVal); + else if (aEntry.eItemType==ITEM_ENUM && nWhich!=EE_CHAR_WEIGHT) aEntry.aValue=((SfxEnumItemInterface&)rItem).GetValueTextByPos((sal_Bool)aEntry.nVal); else aEntry.aValue = String("GPF", aTextEncoding); } } else { @@ -1053,8 +1053,8 @@ void _SdrItemBrowserControl::SetAttributes(const SfxItemSet* pSet, const SfxItem } // while if (aList.Count()>nEntryNum) { // evtl. noch zuviele Eintraege - ULONG nTooMuch=aList.Count()-nEntryNum; - for (ULONG nNum=0; nNum<nTooMuch; nNum++) { + sal_uIntPtr nTooMuch=aList.Count()-nEntryNum; + for (sal_uIntPtr nNum=0; nNum<nTooMuch; nNum++) { delete ImpGetEntry(nEntryNum); aList.Remove(nEntryNum); } @@ -1097,7 +1097,7 @@ void _SdrItemBrowserWindow::GetFocus() SdrItemBrowser::SdrItemBrowser(SdrView& rView): _SdrItemBrowserWindow(ImpGetViewWin(rView)), pView(&rView), - bDirty(FALSE) + bDirty(sal_False) { aIdleTimer.SetTimeoutHdl(LINK(this,SdrItemBrowser,IdleHdl)); GetBrowserControl().SetEntryChangedHdl(LINK(this,SdrItemBrowser,ChangedHdl)); @@ -1140,7 +1140,7 @@ void SdrItemBrowser::SetDirty() void SdrItemBrowser::Undirty() { aIdleTimer.Stop(); - bDirty = FALSE; + bDirty = sal_False; // SfxItemSet aSet(pView->GetAttributes()); SfxItemSet aSet(pView->GetModel()->GetItemPool()); @@ -1148,9 +1148,9 @@ void SdrItemBrowser::Undirty() if(pView->AreObjectsMarked()) { - // SfxItemSet a2ndSet(pView->GetAttributes(TRUE)); + // SfxItemSet a2ndSet(pView->GetAttributes(sal_True)); SfxItemSet a2ndSet(pView->GetModel()->GetItemPool()); - pView->GetAttributes(a2ndSet, TRUE); + pView->GetAttributes(a2ndSet, sal_True); SetAttributes(&aSet,&a2ndSet); } @@ -1177,7 +1177,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) SfxItemSet aNewSet(*aSet.GetPool(),pEntry->nWhichId,pEntry->nWhichId); XubString aNewText(pBrowse->GetNewEntryValue()); - BOOL bDel( aNewText.EqualsAscii("del") + sal_Bool bDel( aNewText.EqualsAscii("del") || aNewText.EqualsAscii("Del") || aNewText.EqualsAscii("DEL") || aNewText.EqualsAscii("default") @@ -1194,7 +1194,7 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) } bool bPairX = true; bool bPairY = false; - USHORT nSepLen=1; + sal_uInt16 nSepLen=1; long nLongX = aNewText.ToInt32(); long nLongY=0; xub_StrLen nPos = aNewText.Search(sal_Unicode('/')); @@ -1205,13 +1205,13 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) bPairX=nPos>0; XubString s(aNewText); s.Erase(0,nPos+nSepLen); - bPairY = (BOOL)aNewText.Len(); + bPairY = (sal_Bool)aNewText.Len(); nLongY = s.ToInt32(); } switch (pEntry->eItemType) { - case ITEM_BYTE : ((SfxByteItem *)pNewItem)->SetValue((BYTE )nLongVal); break; - case ITEM_INT16 : ((SfxInt16Item *)pNewItem)->SetValue((INT16 )nLongVal); break; - case ITEM_UINT16: ((SfxUInt16Item*)pNewItem)->SetValue((UINT16)nLongVal); break; + case ITEM_BYTE : ((SfxByteItem *)pNewItem)->SetValue((sal_uInt8 )nLongVal); break; + case ITEM_INT16 : ((SfxInt16Item *)pNewItem)->SetValue((sal_Int16 )nLongVal); break; + case ITEM_UINT16: ((SfxUInt16Item*)pNewItem)->SetValue((sal_uInt16)nLongVal); break; case ITEM_INT32: { if(HAS_BASE(SdrAngleItem, pNewItem)) { @@ -1219,10 +1219,10 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) double nVal = aNewText.ToFloat(); nLongVal = (long)(nVal * 100 + 0.5); } - ((SfxInt32Item *)pNewItem)->SetValue((INT32)nLongVal); + ((SfxInt32Item *)pNewItem)->SetValue((sal_Int32)nLongVal); } break; case ITEM_UINT32: ((SfxUInt32Item*)pNewItem)->SetValue(aNewText.ToInt32()); break; - case ITEM_ENUM : ((SfxEnumItemInterface*)pNewItem)->SetEnumValue((USHORT)nLongVal); break; + case ITEM_ENUM : ((SfxEnumItemInterface*)pNewItem)->SetEnumValue((sal_uInt16)nLongVal); break; case ITEM_BOOL: { aNewText.ToUpperAscii(); if (aNewText.EqualsAscii("TRUE")) nLongVal=1; @@ -1231,15 +1231,15 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) if (aNewText.EqualsAscii("EIN")) nLongVal=1; if (aNewText.EqualsAscii("ON")) nLongVal=1; if (aNewText.EqualsAscii("YES")) nLongVal=1; - ((SfxBoolItem*)pNewItem)->SetValue((BOOL)nLongVal); + ((SfxBoolItem*)pNewItem)->SetValue((sal_Bool)nLongVal); } break; - case ITEM_FLAG : ((SfxFlagItem *)pNewItem)->SetValue((USHORT)nLongVal); break; + case ITEM_FLAG : ((SfxFlagItem *)pNewItem)->SetValue((sal_uInt16)nLongVal); break; case ITEM_STRING: ((SfxStringItem*)pNewItem)->SetValue(aNewText); break; case ITEM_POINT : ((SfxPointItem*)pNewItem)->SetValue(Point(nLongX,nLongY)); break; case ITEM_RECT : break; case ITEM_RANGE : { - ((SfxRangeItem*)pNewItem)->From()=(USHORT)nLongX; - ((SfxRangeItem*)pNewItem)->From()=(USHORT)nLongY; + ((SfxRangeItem*)pNewItem)->From()=(sal_uInt16)nLongX; + ((SfxRangeItem*)pNewItem)->From()=(sal_uInt16)nLongY; } break; case ITEM_LRANGE : { } break; @@ -1256,19 +1256,19 @@ IMPL_LINK(SdrItemBrowser,ChangedHdl,_SdrItemBrowserControl*,pBrowse) ((SvxFontItem*)pNewItem)->GetStyleName().Erase(); } break; case ITEM_FONTHEIGHT: { - ULONG nHgt=0; - USHORT nProp=100; + sal_uIntPtr nHgt=0; + sal_uInt16 nProp=100; if (aNewText.Search(sal_Unicode('%'))!=STRING_NOTFOUND) { - nProp=(USHORT)nLongVal; + nProp=(sal_uInt16)nLongVal; } else { nHgt=nLongVal; } ((SvxFontHeightItem*)pNewItem)->SetHeight(nHgt,nProp); } break; case ITEM_FONTWIDTH: { - USHORT nProp=100; + sal_uInt16 nProp=100; if (aNewText.Search(sal_Unicode('%'))!=STRING_NOTFOUND) { - nProp=(USHORT)nLongVal; + nProp=(sal_uInt16)nLongVal; } ((SvxCharScaleWidthItem*)pNewItem)->SetValue(nProp); } break; diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx index 82f63a4ae8..9098dc4c87 100644..100755 --- a/svx/source/svdraw/svditer.cxx +++ b/svx/source/svdraw/svditer.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpage.hxx> #include <svx/svdogrp.hxx> #include <svx/svdobj.hxx> @@ -74,7 +74,7 @@ SdrObjListIter::SdrObjListIter( const SdrMarkList& rMarkList, SdrIterMode eMode, void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMode eMode, bool bUseZOrder) { - for( ULONG nIdx = 0, nCount = rObjList.GetObjCount(); nIdx < nCount; ++nIdx ) + for( sal_uIntPtr nIdx = 0, nCount = rObjList.GetObjCount(); nIdx < nCount; ++nIdx ) { SdrObject* pObj = bUseZOrder ? rObjList.GetObj( nIdx ) : rObjList.GetObjectForNavigationPosition( nIdx ); @@ -86,7 +86,7 @@ void SdrObjListIter::ImpProcessObjectList(const SdrObjList& rObjList, SdrIterMod void SdrObjListIter::ImpProcessMarkList( const SdrMarkList& rMarkList, SdrIterMode eMode ) { - for( ULONG nIdx = 0, nCount = rMarkList.GetMarkCount(); nIdx < nCount; ++nIdx ) + for( sal_uIntPtr nIdx = 0, nCount = rMarkList.GetMarkCount(); nIdx < nCount; ++nIdx ) if( SdrObject* pObj = rMarkList.GetMark( nIdx )->GetMarkedSdrObj() ) ImpProcessObj( pObj, eMode, false ); } diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 7ac1a2ced7..fbd4de18dd 100644..100755 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -32,8 +32,8 @@ #include <svx/svdlayer.hxx> #include <svx/svdmodel.hxx> // fuer Broadcasting -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource //////////////////////////////////////////////////////////////////////////////////////////////////// // SetOfByte @@ -158,7 +158,7 @@ void SetOfByte::PutValue( const com::sun::star::uno::Any & rAny ) sal_Int16 nIndex; for( nIndex = 0; nIndex < nCount; nIndex++ ) { - aData[nIndex] = static_cast<BYTE>(aSeq[nIndex]); + aData[nIndex] = static_cast<sal_uInt8>(aSeq[nIndex]); } for( ; nIndex < 32; nIndex++ ) @@ -199,7 +199,7 @@ void SetOfByte::QueryValue( com::sun::star::uno::Any & rAny ) const void SdrLayer::SetStandardLayer(bool bStd) { - nType=(UINT16)bStd; + nType=(sal_uInt16)bStd; if (bStd) { aName=ImpGetResStr(STR_StandardLayerName); } @@ -277,8 +277,8 @@ const SdrLayerAdmin& SdrLayerAdmin::operator=(const SdrLayerAdmin& rSrcLayerAdmi { ClearLayer(); pParent=rSrcLayerAdmin.pParent; - USHORT i; - USHORT nAnz=rSrcLayerAdmin.GetLayerCount(); + sal_uInt16 i; + sal_uInt16 nAnz=rSrcLayerAdmin.GetLayerCount(); for (i=0; i<nAnz; i++) { aLayer.Insert(new SdrLayer(*rSrcLayerAdmin.GetLayer(i)),CONTAINER_APPEND); } @@ -289,10 +289,10 @@ bool SdrLayerAdmin::operator==(const SdrLayerAdmin& rCmpLayerAdmin) const { if (pParent!=rCmpLayerAdmin.pParent || aLayer.Count()!=rCmpLayerAdmin.aLayer.Count() || - aLSets.Count()!=rCmpLayerAdmin.aLSets.Count()) return FALSE; + aLSets.Count()!=rCmpLayerAdmin.aLSets.Count()) return sal_False; bool bOk = true; - USHORT nAnz=GetLayerCount(); - USHORT i=0; + sal_uInt16 nAnz=GetLayerCount(); + sal_uInt16 i=0; while (bOk && i<nAnz) { bOk=*GetLayer(i)==*rCmpLayerAdmin.GetLayer(i); i++; @@ -304,8 +304,8 @@ void SdrLayerAdmin::SetModel(SdrModel* pNewModel) { if (pNewModel!=pModel) { pModel=pNewModel; - USHORT nAnz=GetLayerCount(); - USHORT i; + sal_uInt16 nAnz=GetLayerCount(); + sal_uInt16 i; for (i=0; i<nAnz; i++) { GetLayer(i)->SetModel(pNewModel); } @@ -321,14 +321,14 @@ void SdrLayerAdmin::Broadcast() const } } -SdrLayer* SdrLayerAdmin::RemoveLayer(USHORT nPos) +SdrLayer* SdrLayerAdmin::RemoveLayer(sal_uInt16 nPos) { SdrLayer* pRetLayer=(SdrLayer*)(aLayer.Remove(nPos)); Broadcast(); return pRetLayer; } -SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, USHORT nPos) +SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, sal_uInt16 nPos) { SdrLayerID nID=GetUniqueLayerID(); SdrLayer* pLay=new SdrLayer(nID,rName); @@ -338,7 +338,7 @@ SdrLayer* SdrLayerAdmin::NewLayer(const XubString& rName, USHORT nPos) return pLay; } -SdrLayer* SdrLayerAdmin::NewStandardLayer(USHORT nPos) +SdrLayer* SdrLayerAdmin::NewStandardLayer(sal_uInt16 nPos) { SdrLayerID nID=GetUniqueLayerID(); SdrLayer* pLay=new SdrLayer(nID,String()); @@ -349,7 +349,7 @@ SdrLayer* SdrLayerAdmin::NewStandardLayer(USHORT nPos) return pLay; } -SdrLayer* SdrLayerAdmin::MoveLayer(USHORT nPos, USHORT nNewPos) +SdrLayer* SdrLayerAdmin::MoveLayer(sal_uInt16 nPos, sal_uInt16 nNewPos) { SdrLayer* pLayer=(SdrLayer*)(aLayer.Remove(nPos)); if (pLayer!=NULL) { @@ -360,9 +360,9 @@ SdrLayer* SdrLayerAdmin::MoveLayer(USHORT nPos, USHORT nNewPos) return pLayer; } -void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, USHORT nNewPos) +void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, sal_uInt16 nNewPos) { - ULONG nPos=aLayer.GetPos(pLayer); + sal_uIntPtr nPos=aLayer.GetPos(pLayer); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { aLayer.Remove(nPos); aLayer.Insert(pLayer,nNewPos); @@ -370,21 +370,21 @@ void SdrLayerAdmin::MoveLayer(SdrLayer* pLayer, USHORT nNewPos) } } -USHORT SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const +sal_uInt16 SdrLayerAdmin::GetLayerPos(SdrLayer* pLayer) const { - ULONG nRet=SDRLAYER_NOTFOUND; + sal_uIntPtr nRet=SDRLAYER_NOTFOUND; if (pLayer!=NULL) { nRet=aLayer.GetPos(pLayer); if (nRet==CONTAINER_ENTRY_NOTFOUND) { nRet=SDRLAYER_NOTFOUND; } } - return USHORT(nRet); + return sal_uInt16(nRet); } const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, bool /*bInherited*/) const { - UINT16 i(0); + sal_uInt16 i(0); const SdrLayer* pLay = NULL; while(i < GetLayerCount() && !pLay) @@ -397,7 +397,7 @@ const SdrLayer* SdrLayerAdmin::GetLayer(const XubString& rName, bool /*bInherite if(!pLay && pParent) { - pLay = pParent->GetLayer(rName, TRUE); + pLay = pParent->GetLayer(rName, sal_True); } return pLay; @@ -411,9 +411,9 @@ SdrLayerID SdrLayerAdmin::GetLayerID(const XubString& rName, bool bInherited) co return nRet; } -const SdrLayer* SdrLayerAdmin::GetLayerPerID(USHORT nID) const +const SdrLayer* SdrLayerAdmin::GetLayerPerID(sal_uInt16 nID) const { - USHORT i=0; + sal_uInt16 i=0; const SdrLayer* pLay=NULL; while (i<GetLayerCount() && pLay==NULL) { if (nID==GetLayer(i)->GetID()) pLay=GetLayer(i); @@ -430,7 +430,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const { SetOfByte aSet; sal_Bool bDown = (pParent == NULL); - USHORT j; + sal_uInt16 j; for (j=0; j<GetLayerCount(); j++) { aSet.Set(GetLayer((sal_uInt16)j)->GetID()); @@ -439,7 +439,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const if (!bDown) { i=254; - while (i && aSet.IsSet(BYTE(i))) + while (i && aSet.IsSet(sal_uInt8(i))) --i; if (i == 0) i=254; @@ -447,7 +447,7 @@ SdrLayerID SdrLayerAdmin::GetUniqueLayerID() const else { i=0; - while (i<=254 && aSet.IsSet(BYTE(i))) + while (i<=254 && aSet.IsSet(sal_uInt8(i))) i++; if (i>254) i=0; diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index 439dcdb166..8981cfe1ff 100644..100755 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -35,13 +35,13 @@ #include <svx/svdetc.hxx> #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpagv.hxx> #include <svx/svdopath.hxx> // zur Abschaltung #include <svx/svdogrp.hxx> // des Cache bei #include <svx/svdorect.hxx> // GetMarkDescription -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache //////////////////////////////////////////////////////////////////////////////////////////////////// #include <svx/obj3d.hxx> @@ -75,7 +75,7 @@ void SdrUShortCont::Sort() const aSort.DoSort(); ((SdrUShortCont*)this)->mbSorted = sal_True; - ULONG nNum(GetCount()); + sal_uLong nNum(GetCount()); if(nNum > 1) { @@ -97,9 +97,9 @@ void SdrUShortCont::Sort() const } } -void SdrUShortCont::CheckSort(ULONG nPos) +void SdrUShortCont::CheckSort(sal_uLong nPos) { - ULONG nAnz(maArray.Count()); + sal_uLong nAnz(maArray.Count()); if(nPos > nAnz) nPos = nAnz; @@ -344,7 +344,7 @@ int ImpSdrMarkListSorter::Compare(const void* pElem1, const void* pElem2) const if (pOL1 == pOL2) { - // AF: Note that I reverted a change from sal_uInt32 to ULONG (made + // AF: Note that I reverted a change from sal_uInt32 to sal_uLong (made // for 64bit compliance, #i78198#) because internally in SdrObject // both nOrdNum and mnNavigationPosition are stored as sal_uInt32. sal_uInt32 nObjOrd1((pObj1) ? pObj1->GetNavigationPosition() : 0); @@ -373,7 +373,7 @@ void SdrMarkList::ImpForceSort() if(!mbSorted) { mbSorted = sal_True; - ULONG nAnz = maList.Count(); + sal_uLong nAnz = maList.Count(); // remove invalid if(nAnz > 0 ) @@ -432,7 +432,7 @@ void SdrMarkList::ImpForceSort() void SdrMarkList::Clear() { - for(ULONG i(0L); i < GetMarkCount(); i++) + for(sal_uLong i(0L); i < GetMarkCount(); i++) { SdrMark* pMark = GetMark(i); delete pMark; @@ -446,7 +446,7 @@ void SdrMarkList::operator=(const SdrMarkList& rLst) { Clear(); - for(ULONG i(0L); i < rLst.GetMarkCount(); i++) + for(sal_uLong i(0L); i < rLst.GetMarkCount(); i++) { SdrMark* pMark = rLst.GetMark(i); SdrMark* pNeuMark = new SdrMark(*pMark); @@ -462,7 +462,7 @@ void SdrMarkList::operator=(const SdrMarkList& rLst) mbSorted = rLst.mbSorted; } -ULONG SdrMarkList::FindObject(const SdrObject* pObj) const +sal_uLong SdrMarkList::FindObject(const SdrObject* pObj) const { // #109658# // @@ -477,7 +477,7 @@ ULONG SdrMarkList::FindObject(const SdrObject* pObj) const // less dangerous to change this method then changing SdrObject::GetOrdNum(). if(pObj && maList.Count()) { - for(ULONG a(0L); a < maList.Count(); a++) + for(sal_uLong a(0L); a < maList.Count(); a++) { if(((SdrMark*)(maList.GetObject(a)))->GetMarkedSdrObj() == pObj) { @@ -492,7 +492,7 @@ ULONG SdrMarkList::FindObject(const SdrObject* pObj) const void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort) { SetNameDirty(); - ULONG nAnz(maList.Count()); + sal_uLong nAnz(maList.Count()); if(!bChkSort || !mbSorted || nAnz == 0) { @@ -503,7 +503,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort) } else { - SdrMark* pLast = GetMark(ULONG(nAnz - 1)); + SdrMark* pLast = GetMark(sal_uLong(nAnz - 1)); const SdrObject* pLastObj = pLast->GetMarkedSdrObj(); const SdrObject* pNeuObj = rMark.GetMarkedSdrObj(); @@ -528,8 +528,8 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort) if(pLastOL == pNeuOL) { - const ULONG nLastNum(pLastObj!=0L ? pLastObj->GetOrdNum() : 0); - const ULONG nNeuNum(pNeuObj !=0L ? pNeuObj ->GetOrdNum() : 0); + const sal_uLong nLastNum(pLastObj!=0L ? pLastObj->GetOrdNum() : 0); + const sal_uLong nNeuNum(pNeuObj !=0L ? pNeuObj ->GetOrdNum() : 0); if(nNeuNum < nLastNum) { @@ -548,7 +548,7 @@ void SdrMarkList::InsertEntry(const SdrMark& rMark, sal_Bool bChkSort) return; } -void SdrMarkList::DeleteMark(ULONG nNum) +void SdrMarkList::DeleteMark(sal_uLong nNum) { SdrMark* pMark = GetMark(nNum); DBG_ASSERT(pMark!=0L,"DeleteMark: MarkEntry nicht gefunden"); @@ -561,7 +561,7 @@ void SdrMarkList::DeleteMark(ULONG nNum) } } -void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, ULONG nNum) +void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, sal_uLong nNum) { SdrMark* pMark = GetMark(nNum); DBG_ASSERT(pMark!=0L,"ReplaceMark: MarkEntry nicht gefunden"); @@ -578,7 +578,7 @@ void SdrMarkList::ReplaceMark(const SdrMark& rNewMark, ULONG nNum) void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse) { - ULONG nAnz(rSrcList.maList.Count()); + sal_uLong nAnz(rSrcList.maList.Count()); if(rSrcList.mbSorted) { @@ -588,7 +588,7 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse) if(!bReverse) { - for(ULONG i(0L); i < nAnz; i++) + for(sal_uLong i(0L); i < nAnz; i++) { SdrMark* pM = (SdrMark*)(rSrcList.maList.GetObject(i)); InsertEntry(*pM); @@ -596,7 +596,7 @@ void SdrMarkList::Merge(const SdrMarkList& rSrcList, sal_Bool bReverse) } else { - for(ULONG i(nAnz); i > 0;) + for(sal_uLong i(nAnz); i > 0;) { i--; SdrMark* pM = (SdrMark*)(rSrcList.maList.GetObject(i)); @@ -609,7 +609,7 @@ sal_Bool SdrMarkList::DeletePageView(const SdrPageView& rPV) { sal_Bool bChgd(sal_False); - for(ULONG i(GetMarkCount()); i > 0; ) + for(sal_uLong i(GetMarkCount()); i > 0; ) { i--; SdrMark* pMark = GetMark(i); @@ -632,9 +632,9 @@ sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV) DeletePageView(rPV); // erstmal alle raus, dann die ganze Seite hinten dran SdrObject* pObj; const SdrObjList* pOL = rPV.GetObjList(); - ULONG nObjAnz(pOL->GetObjCount()); + sal_uLong nObjAnz(pOL->GetObjCount()); - for(ULONG nO(0L); nO < nObjAnz; nO++) + for(sal_uLong nO(0L); nO < nObjAnz; nO++) { pObj = pOL->GetObj(nO); sal_Bool bDoIt(rPV.IsObjMarkable(pObj)); @@ -653,7 +653,7 @@ sal_Bool SdrMarkList::InsertPageView(const SdrPageView& rPV) const XubString& SdrMarkList::GetMarkDescription() const { - ULONG nAnz(GetMarkCount()); + sal_uLong nAnz(GetMarkCount()); if(mbNameOk && 1L == nAnz) { @@ -691,7 +691,7 @@ const XubString& SdrMarkList::GetMarkDescription() const XubString aStr1; sal_Bool bEq(sal_True); - for(ULONG i = 1; i < GetMarkCount() && bEq; i++) + for(sal_uLong i = 1; i < GetMarkCount() && bEq; i++) { SdrMark* pMark2 = GetMark(i); pMark2->GetMarkedSdrObj()->TakeObjNamePlural(aStr1); @@ -719,16 +719,16 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const { sal_Bool& rNameOk = (sal_Bool&)(bGlue ? mbGluePointNameOk : mbPointNameOk); XubString& rName = (XubString&)(bGlue ? maGluePointName : maPointName); - ULONG nMarkAnz(GetMarkCount()); - ULONG nMarkPtAnz(0L); - ULONG nMarkPtObjAnz(0L); - ULONG n1stMarkNum(ULONG_MAX); + sal_uLong nMarkAnz(GetMarkCount()); + sal_uLong nMarkPtAnz(0L); + sal_uLong nMarkPtObjAnz(0L); + sal_uLong n1stMarkNum(ULONG_MAX); - for(ULONG nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++) + for(sal_uLong nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++) { const SdrMark* pMark = GetMark(nMarkNum); const SdrUShortCont* pPts = bGlue ? pMark->GetMarkedGluePoints() : pMark->GetMarkedPoints(); - ULONG nAnz(pPts ? pPts->GetCount() : 0); + sal_uLong nAnz(pPts ? pPts->GetCount() : 0); if(nAnz) { @@ -787,7 +787,7 @@ const XubString& SdrMarkList::GetPointMarkDescription(sal_Bool bGlue) const XubString aStr1; sal_Bool bEq(sal_True); - for(ULONG i(n1stMarkNum + 1L); i < GetMarkCount() && bEq; i++) + for(sal_uLong i(n1stMarkNum + 1L); i < GetMarkCount() && bEq; i++) { const SdrMark* pMark2 = GetMark(i); const SdrUShortCont* pPts = bGlue ? pMark2->GetMarkedGluePoints() : pMark2->GetMarkedPoints(); @@ -833,7 +833,7 @@ sal_Bool SdrMarkList::TakeBoundRect(SdrPageView* pPV, Rectangle& rRect) const sal_Bool bFnd(sal_False); Rectangle aR; - for(ULONG i(0L); i < GetMarkCount(); i++) + for(sal_uLong i(0L); i < GetMarkCount(); i++) { SdrMark* pMark = GetMark(i); @@ -863,7 +863,7 @@ sal_Bool SdrMarkList::TakeSnapRect(SdrPageView* pPV, Rectangle& rRect) const { sal_Bool bFnd(sal_False); - for(ULONG i(0L); i < GetMarkCount(); i++) + for(sal_uLong i(0L); i < GetMarkCount(); i++) { SdrMark* pMark = GetMark(i); @@ -952,7 +952,7 @@ namespace sdr { SdrObjList* pList = pObj->GetSubList(); - for(ULONG a(0L); a < pList->GetObjCount(); a++) + for(sal_uLong a(0L); a < pList->GetObjCount(); a++) { SdrObject* pObj2 = pList->GetObj(a); ImplCollectCompleteSelection(pObj2); @@ -974,9 +974,9 @@ namespace sdr maAllMarkedObjects.clear(); // #126320# GetMarkCount after ForceSort - const ULONG nMarkAnz(maMarkedObjectList.GetMarkCount()); + const sal_uLong nMarkAnz(maMarkedObjectList.GetMarkCount()); - for(ULONG a(0L); a < nMarkAnz; a++) + for(sal_uLong a(0L); a < nMarkAnz; a++) { SdrObject* pCandidate = maMarkedObjectList.GetMark(a)->GetMarkedSdrObj(); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 8ea7a19827..23d88079c7 100644..100755 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -50,12 +50,12 @@ #include <svx/xflhtit.hxx> #include <svx/xlnstit.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <editeng/editeng.hxx> // Fuer EditEngine::CreatePool() #include <svx/xtable.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdtrans.hxx> #include <svx/svdpage.hxx> #include <svx/svdlayer.hxx> @@ -66,8 +66,8 @@ #include <svx/svdetc.hxx> #include <svx/svdoutl.hxx> #include <svx/svdoole2.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include "svdoutlinercache.hxx" @@ -124,10 +124,10 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe eUIUnit=FUNIT_MM; aUIScale=Fraction(1,1); nUIUnitKomma=0; - bUIOnlyKomma=FALSE; + bUIOnlyKomma=sal_False; pLayerAdmin=NULL; pItemPool=pPool; - bMyPool=FALSE; + bMyPool=sal_False; m_pEmbeddedHelper=_pEmbeddedHelper; pDrawOutliner=NULL; pHitTestOutliner=NULL; @@ -145,21 +145,21 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe mbUndoEnabled=true; nProgressPercent=0; nLoadVersion=0; - bExtColorTable=FALSE; + bExtColorTable=sal_False; mbChanged = sal_False; - bInfoChanged=FALSE; - bPagNumsDirty=FALSE; - bMPgNumsDirty=FALSE; - bPageNotValid=FALSE; - bSavePortable=FALSE; - bSaveCompressed=FALSE; - bSaveNative=FALSE; - bSwapGraphics=FALSE; + bInfoChanged=sal_False; + bPagNumsDirty=sal_False; + bMPgNumsDirty=sal_False; + bPageNotValid=sal_False; + bSavePortable=sal_False; + bSaveCompressed=sal_False; + bSaveNative=sal_False; + bSwapGraphics=sal_False; nSwapGraphicsMode=SDR_SWAPGRAPHICSMODE_DEFAULT; - bSaveOLEPreview=FALSE; - bPasteResize=FALSE; - bNoBitmapCaching=FALSE; - bReadOnly=FALSE; + bSaveOLEPreview=sal_False; + bPasteResize=sal_False; + bNoBitmapCaching=sal_False; + bReadOnly=sal_False; nStreamCompressMode=COMPRESSMODE_NONE; nStreamNumberFormat=NUMBERFORMAT_INT_BIGENDIAN; nDefaultTabulator=0; @@ -170,8 +170,8 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe pGradientList=NULL; pBitmapList=NULL; mpNumberFormatter = NULL; - bTransparentTextFrames=FALSE; - bStarDrawPreviewMode = FALSE; + bTransparentTextFrames=sal_False; + bStarDrawPreviewMode = sal_False; nStarDrawPreviewMasterPageNum = SDRPAGE_NOTFOUND; pModelStorage = NULL; mpForbiddenCharactersTable = NULL; @@ -197,7 +197,7 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe // OutlinerPool als SecondaryPool des SdrPool pItemPool->SetSecondaryPool(pOutlPool); // Merken, dass ich mir die beiden Pools selbst gemacht habe - bMyPool=TRUE; + bMyPool=sal_True; } pItemPool->SetDefaultMetric((SfxMapUnit)eObjUnit); @@ -208,6 +208,8 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe else nDefTextHgt = SdrEngineDefaults::GetFontHeight(); + pItemPool->SetPoolDefaultItem( SdrTextWordWrapItem( sal_False ) ); + SetTextDefaults(); pLayerAdmin=new SdrLayerAdmin; pLayerAdmin->SetModel(this); @@ -216,10 +218,10 @@ void SdrModel::ImpCtor(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* _pEmbe // den DrawOutliner OnDemand erzeugen geht noch nicht, weil ich den Pool // sonst nicht kriege (erst ab 302!) pDrawOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this ); - ImpSetOutlinerDefaults(pDrawOutliner, TRUE); + ImpSetOutlinerDefaults(pDrawOutliner, sal_True); pHitTestOutliner = SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this ); - ImpSetOutlinerDefaults(pHitTestOutliner, TRUE); + ImpSetOutlinerDefaults(pHitTestOutliner, sal_True); ImpCreateTables(); } @@ -233,7 +235,7 @@ SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal #endif DBG_CTOR(SdrModel,NULL); - ImpCtor(pPool,pPers,FALSE, (bool)bLoadRefCounts); + ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts); } SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, sal_Bool bLoadRefCounts): @@ -246,7 +248,7 @@ SdrModel::SdrModel(const String& rPath, SfxItemPool* pPool, ::comphelper::IEmbed #endif DBG_CTOR(SdrModel,NULL); - ImpCtor(pPool,pPers,FALSE, (bool)bLoadRefCounts); + ImpCtor(pPool, pPers, false, (bool)bLoadRefCounts); } SdrModel::SdrModel(SfxItemPool* pPool, ::comphelper::IEmbeddedHelper* pPers, bool bUseExtColorTable, sal_Bool bLoadRefCounts): @@ -400,7 +402,7 @@ void SdrModel::operator=(const SdrModel& /*rSrcModel*/) bool SdrModel::operator==(const SdrModel& /*rCmpModel*/) const { OSL_FAIL("SdrModel::operator==() ist noch nicht implementiert"); - return FALSE; + return sal_False; } void SdrModel::SetSwapGraphics( bool bSwap ) @@ -420,7 +422,7 @@ void SdrModel::SetReadOnly(bool bYes) //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrModel::SetMaxUndoActionCount(ULONG nAnz) +void SdrModel::SetMaxUndoActionCount(sal_uIntPtr nAnz) { if (nAnz<1) nAnz=1; nMaxUndoCount=nAnz; @@ -466,7 +468,7 @@ bool SdrModel::Undo() pDo->Undo(); if(pRedoStack==NULL) pRedoStack=new Container(1024,16,16); - pRedoStack->Insert(pUndoStack->Remove((ULONG)0),(ULONG)0); + pRedoStack->Insert(pUndoStack->Remove((sal_uIntPtr)0),(sal_uIntPtr)0); mbUndoEnabled = bWasUndoEnabled; } } @@ -475,7 +477,7 @@ bool SdrModel::Undo() bool SdrModel::Redo() { - bool bRet=FALSE; + bool bRet = false; if( mpImpl->mpUndoManager ) { OSL_FAIL("svx::SdrModel::Redo(), method not supported with application undo manager!"); @@ -490,7 +492,7 @@ bool SdrModel::Redo() pDo->Redo(); if(pUndoStack==NULL) pUndoStack=new Container(1024,16,16); - pUndoStack->Insert(pRedoStack->Remove((ULONG)0),(ULONG)0); + pUndoStack->Insert(pRedoStack->Remove((sal_uIntPtr)0),(sal_uIntPtr)0); mbUndoEnabled = bWasUndoEnabled; } } @@ -532,7 +534,7 @@ void SdrModel::ImpPostUndoAction(SdrUndoAction* pUndo) { if (pUndoStack==NULL) pUndoStack=new Container(1024,16,16); - pUndoStack->Insert(pUndo,(ULONG)0); + pUndoStack->Insert(pUndo,(sal_uIntPtr)0); while (pUndoStack->Count()>nMaxUndoCount) { delete (SfxUndoAction*)pUndoStack->Remove(pUndoStack->Count()-1); @@ -781,7 +783,7 @@ void SdrModel::ClearModel(sal_Bool bCalledFromDestructor) sal_Int32 nAnz=GetPageCount(); for (i=nAnz-1; i>=0; i--) { - DeletePage( (USHORT)i ); + DeletePage( (sal_uInt16)i ); } maPages.Clear(); // #109538# @@ -791,7 +793,7 @@ void SdrModel::ClearModel(sal_Bool bCalledFromDestructor) nAnz=GetMasterPageCount(); for(i=nAnz-1; i>=0; i--) { - DeleteMasterPage( (USHORT)i ); + DeleteMasterPage( (sal_uInt16)i ); } maMaPag.Clear(); // #109538# @@ -819,9 +821,9 @@ void SdrModel::SetTextDefaults() const void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rComplex) { - const USHORT nItemCnt = 3; + const sal_uInt16 nItemCnt = 3; static struct { - USHORT nFntType, nLanguage; + sal_uInt16 nFntType, nLanguage; } aOutTypeArr[ nItemCnt ] = { { DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US }, { DEFAULTFONT_CJK_TEXT, LANGUAGE_ENGLISH_US }, @@ -829,7 +831,7 @@ void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFo }; SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex }; - for( USHORT n = 0; n < nItemCnt; ++n ) + for( sal_uInt16 n = 0; n < nItemCnt; ++n ) { Font aFnt( OutputDevice::GetDefaultFont( aOutTypeArr[ n ].nFntType, aOutTypeArr[ n ].nLanguage, @@ -843,7 +845,7 @@ void ImpGetDefaultFontsLanguage( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFo } } -void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, ULONG nDefTextHgt ) +void SdrModel::SetTextDefaults( SfxItemPool* pItemPool, sal_uIntPtr nDefTextHgt ) { // #95114# set application-language specific dynamic pool language defaults SvxFontItem aSvxFontItem( EE_CHAR_FONTINFO) ; @@ -896,7 +898,7 @@ SdrOutliner& SdrModel::GetDrawOutliner(const SdrTextObj* pObj) const boost::shared_ptr< SdrOutliner > SdrModel::CreateDrawOutliner(const SdrTextObj* pObj) { boost::shared_ptr< SdrOutliner > xDrawOutliner( SdrMakeOutliner( OUTLINERMODE_TEXTOBJECT, this ) ); - ImpSetOutlinerDefaults(xDrawOutliner.get(), TRUE); + ImpSetOutlinerDefaults(xDrawOutliner.get(), sal_True); xDrawOutliner->SetTextObj(pObj); return xDrawOutliner; } @@ -909,7 +911,7 @@ const SdrTextObj* SdrModel::GetFormattingTextObj() const return NULL; } -void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit ) +void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, sal_Bool bInit ) { /************************************************************************** * Initialisierung der Outliner fuer Textausgabe und HitTest @@ -917,7 +919,7 @@ void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, BOOL bInit ) if( bInit ) { pOutliner->EraseVirtualDevice(); - pOutliner->SetUpdateMode(FALSE); + pOutliner->SetUpdateMode(sal_False); pOutliner->SetEditTextObjectPool(pItemPool); pOutliner->SetDefTab(nDefaultTabulator); } @@ -948,8 +950,8 @@ void SdrModel::ImpReformatAllTextObjects() if( isLocked() ) return; - USHORT nAnz=GetMasterPageCount(); - USHORT nNum; + sal_uInt16 nAnz=GetMasterPageCount(); + sal_uInt16 nNum; for (nNum=0; nNum<nAnz; nNum++) { GetMasterPage(nNum)->ReformatAllTextObjects(); } @@ -990,8 +992,8 @@ SvStream* SdrModel::GetDocumentStream(SdrDocumentStreamInfo& /*rStreamInfo*/) co // Die Vorlagenattribute der Zeichenobjekte in harte Attribute verwandeln. void SdrModel::BurnInStyleSheetAttributes() { - USHORT nAnz=GetMasterPageCount(); - USHORT nNum; + sal_uInt16 nAnz=GetMasterPageCount(); + sal_uInt16 nNum; for (nNum=0; nNum<nAnz; nNum++) { GetMasterPage(nNum)->BurnInStyleSheetAttributes(); } @@ -1007,7 +1009,7 @@ void SdrModel::RefDeviceChanged() ImpReformatAllTextObjects(); } -void SdrModel::SetDefaultFontHeight(ULONG nVal) +void SdrModel::SetDefaultFontHeight(sal_uIntPtr nVal) { if (nVal!=nDefTextHgt) { nDefTextHgt=nVal; @@ -1016,7 +1018,7 @@ void SdrModel::SetDefaultFontHeight(ULONG nVal) } } -void SdrModel::SetDefaultTabulator(USHORT nVal) +void SdrModel::SetDefaultTabulator(sal_uInt16 nVal) { if (nDefaultTabulator!=nVal) { nDefaultTabulator=nVal; @@ -1403,7 +1405,7 @@ void SdrModel::TakeMetricStr(long nVal, XubString& rStr, bool bNoUnitChars, sal_ void SdrModel::TakeWinkStr(long nWink, XubString& rStr, bool bNoDegChar) const { - BOOL bNeg(nWink < 0); + sal_Bool bNeg(nWink < 0); if(bNeg) nWink = -nWink; @@ -1431,9 +1433,9 @@ void SdrModel::TakeWinkStr(long nWink, XubString& rStr, bool bNoDegChar) const void SdrModel::TakePercentStr(const Fraction& rVal, XubString& rStr, bool bNoPercentChar) const { - INT32 nMul(rVal.GetNumerator()); - INT32 nDiv(rVal.GetDenominator()); - BOOL bNeg(nMul < 0); + sal_Int32 nMul(rVal.GetNumerator()); + sal_Int32 nDiv(rVal.GetDenominator()); + sal_Bool bNeg(nMul < 0); if(nDiv < 0) bNeg = !bNeg; @@ -1465,48 +1467,48 @@ void SdrModel::SetChanged(sal_Bool bFlg) void SdrModel::RecalcPageNums(bool bMaster) { Container& rPL=*(bMaster ? &maMaPag : &maPages); - USHORT nAnz=USHORT(rPL.Count()); - USHORT i; + sal_uInt16 nAnz=sal_uInt16(rPL.Count()); + sal_uInt16 i; for (i=0; i<nAnz; i++) { SdrPage* pPg=(SdrPage*)(rPL.GetObject(i)); pPg->SetPageNum(i); } - if (bMaster) bMPgNumsDirty=FALSE; - else bPagNumsDirty=FALSE; + if (bMaster) bMPgNumsDirty=sal_False; + else bPagNumsDirty=sal_False; } -void SdrModel::InsertPage(SdrPage* pPage, USHORT nPos) +void SdrModel::InsertPage(SdrPage* pPage, sal_uInt16 nPos) { - USHORT nAnz=GetPageCount(); + sal_uInt16 nAnz=GetPageCount(); if (nPos>nAnz) nPos=nAnz; maPages.Insert(pPage,nPos); // #109538# PageListChanged(); - pPage->SetInserted(TRUE); + pPage->SetInserted(sal_True); pPage->SetPageNum(nPos); pPage->SetModel(this); - if (nPos<nAnz) bPagNumsDirty=TRUE; + if (nPos<nAnz) bPagNumsDirty=sal_True; SetChanged(); SdrHint aHint(HINT_PAGEORDERCHG); aHint.SetPage(pPage); Broadcast(aHint); } -void SdrModel::DeletePage(USHORT nPgNum) +void SdrModel::DeletePage(sal_uInt16 nPgNum) { SdrPage* pPg=RemovePage(nPgNum); delete pPg; } -SdrPage* SdrModel::RemovePage(USHORT nPgNum) +SdrPage* SdrModel::RemovePage(sal_uInt16 nPgNum) { SdrPage* pPg=(SdrPage*)maPages.Remove(nPgNum); // #109538# PageListChanged(); if (pPg!=NULL) { - pPg->SetInserted(FALSE); + pPg->SetInserted(sal_False); } - bPagNumsDirty=TRUE; + bPagNumsDirty=sal_True; SetChanged(); SdrHint aHint(HINT_PAGEORDERCHG); aHint.SetPage(pPg); @@ -1514,29 +1516,29 @@ SdrPage* SdrModel::RemovePage(USHORT nPgNum) return pPg; } -void SdrModel::MovePage(USHORT nPgNum, USHORT nNewPos) +void SdrModel::MovePage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) { SdrPage* pPg=(SdrPage*)maPages.Remove(nPgNum); // #109538# PageListChanged(); if (pPg!=NULL) { - pPg->SetInserted(FALSE); + pPg->SetInserted(sal_False); InsertPage(pPg,nNewPos); } } -void SdrModel::InsertMasterPage(SdrPage* pPage, USHORT nPos) +void SdrModel::InsertMasterPage(SdrPage* pPage, sal_uInt16 nPos) { - USHORT nAnz=GetMasterPageCount(); + sal_uInt16 nAnz=GetMasterPageCount(); if (nPos>nAnz) nPos=nAnz; maMaPag.Insert(pPage,nPos); // #109538# MasterPageListChanged(); - pPage->SetInserted(TRUE); + pPage->SetInserted(sal_True); pPage->SetPageNum(nPos); pPage->SetModel(this); if (nPos<nAnz) { - bMPgNumsDirty=TRUE; + bMPgNumsDirty=sal_True; } SetChanged(); SdrHint aHint(HINT_PAGEORDERCHG); @@ -1544,13 +1546,13 @@ void SdrModel::InsertMasterPage(SdrPage* pPage, USHORT nPos) Broadcast(aHint); } -void SdrModel::DeleteMasterPage(USHORT nPgNum) +void SdrModel::DeleteMasterPage(sal_uInt16 nPgNum) { SdrPage* pPg=RemoveMasterPage(nPgNum); if (pPg!=NULL) delete pPg; } -SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum) +SdrPage* SdrModel::RemoveMasterPage(sal_uInt16 nPgNum) { SdrPage* pRetPg=(SdrPage*)maMaPag.Remove(nPgNum); // #109538# @@ -1566,10 +1568,10 @@ SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum) GetPage(np)->TRG_ImpMasterPageRemoved(*pRetPg); } - pRetPg->SetInserted(FALSE); + pRetPg->SetInserted(sal_False); } - bMPgNumsDirty=TRUE; + bMPgNumsDirty=sal_True; SetChanged(); SdrHint aHint(HINT_PAGEORDERCHG); aHint.SetPage(pRetPg); @@ -1577,18 +1579,18 @@ SdrPage* SdrModel::RemoveMasterPage(USHORT nPgNum) return pRetPg; } -void SdrModel::MoveMasterPage(USHORT nPgNum, USHORT nNewPos) +void SdrModel::MoveMasterPage(sal_uInt16 nPgNum, sal_uInt16 nNewPos) { SdrPage* pPg=(SdrPage*)maMaPag.Remove(nPgNum); // #109538# MasterPageListChanged(); if (pPg!=NULL) { - pPg->SetInserted(FALSE); + pPg->SetInserted(sal_False); maMaPag.Insert(pPg,nNewPos); // #109538# MasterPageListChanged(); } - bMPgNumsDirty=TRUE; + bMPgNumsDirty=sal_True; SetChanged(); SdrHint aHint(HINT_PAGEORDERCHG); aHint.SetPage(pPg); @@ -1609,8 +1611,8 @@ bool SdrModel::CheckConsistence() const //////////////////////////////////////////////////////////////////////////////////////////////////// // #48289# -void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum, - USHORT nDestPos, +void SdrModel::CopyPages(sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, + sal_uInt16 nDestPos, bool bUndo, bool bMoveNoCopy) { if( bUndo && !IsUndoEnabled() ) @@ -1619,8 +1621,8 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum, if( bUndo ) BegUndo(ImpGetResStr(STR_UndoMergeModel)); - USHORT nPageAnz=GetPageCount(); - USHORT nMaxPage=nPageAnz; + sal_uInt16 nPageAnz=GetPageCount(); + sal_uInt16 nMaxPage=nPageAnz; if (nMaxPage!=0) nMaxPage--; @@ -1633,10 +1635,10 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum, nDestPos=nPageAnz; // Zunaechst die Zeiger der betroffenen Seiten in einem Array sichern - USHORT nPageNum=nFirstPageNum; - USHORT nCopyAnz=((!bReverse)?(nLastPageNum-nFirstPageNum):(nFirstPageNum-nLastPageNum))+1; + sal_uInt16 nPageNum=nFirstPageNum; + sal_uInt16 nCopyAnz=((!bReverse)?(nLastPageNum-nFirstPageNum):(nFirstPageNum-nLastPageNum))+1; SdrPage** pPagePtrs=new SdrPage*[nCopyAnz]; - USHORT nCopyNum; + sal_uInt16 nCopyNum; for(nCopyNum=0; nCopyNum<nCopyAnz; nCopyNum++) { pPagePtrs[nCopyNum]=GetPage(nPageNum); @@ -1647,11 +1649,11 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum, } // Jetzt die Seiten kopieren - USHORT nDestNum=nDestPos; + sal_uInt16 nDestNum=nDestPos; for (nCopyNum=0; nCopyNum<nCopyAnz; nCopyNum++) { SdrPage* pPg=pPagePtrs[nCopyNum]; - USHORT nPageNum2=pPg->GetPageNum(); + sal_uInt16 nPageNum2=pPg->GetPageNum(); if (!bMoveNoCopy) { const SdrPage* pPg1=GetPage(nPageNum2); @@ -1687,8 +1689,8 @@ void SdrModel::CopyPages(USHORT nFirstPageNum, USHORT nLastPageNum, } void SdrModel::Merge(SdrModel& rSourceModel, - USHORT nFirstPageNum, USHORT nLastPageNum, - USHORT nDestPos, + sal_uInt16 nFirstPageNum, sal_uInt16 nLastPageNum, + sal_uInt16 nDestPos, bool bMergeMasterPages, bool bAllMasterPages, bool bUndo, bool bTreadSourceAsConst) { @@ -1704,30 +1706,30 @@ void SdrModel::Merge(SdrModel& rSourceModel, if (bUndo) BegUndo(ImpGetResStr(STR_UndoMergeModel)); - USHORT nSrcPageAnz=rSourceModel.GetPageCount(); - USHORT nSrcMasterPageAnz=rSourceModel.GetMasterPageCount(); - USHORT nDstMasterPageAnz=GetMasterPageCount(); + sal_uInt16 nSrcPageAnz=rSourceModel.GetPageCount(); + sal_uInt16 nSrcMasterPageAnz=rSourceModel.GetMasterPageCount(); + sal_uInt16 nDstMasterPageAnz=GetMasterPageCount(); bool bInsPages=(nFirstPageNum<nSrcPageAnz || nLastPageNum<nSrcPageAnz); - USHORT nMaxSrcPage=nSrcPageAnz; if (nMaxSrcPage!=0) nMaxSrcPage--; + sal_uInt16 nMaxSrcPage=nSrcPageAnz; if (nMaxSrcPage!=0) nMaxSrcPage--; if (nFirstPageNum>nMaxSrcPage) nFirstPageNum=nMaxSrcPage; if (nLastPageNum>nMaxSrcPage) nLastPageNum =nMaxSrcPage; bool bReverse=nLastPageNum<nFirstPageNum; - USHORT* pMasterMap=NULL; + sal_uInt16* pMasterMap=NULL; bool* pMasterNeed=NULL; - USHORT nMasterNeed=0; + sal_uInt16 nMasterNeed=0; if (bMergeMasterPages && nSrcMasterPageAnz!=0) { // Feststellen, welche MasterPages aus rSrcModel benoetigt werden - pMasterMap=new USHORT[nSrcMasterPageAnz]; + pMasterMap=new sal_uInt16[nSrcMasterPageAnz]; pMasterNeed=new bool[nSrcMasterPageAnz]; - memset(pMasterMap,0xFF,nSrcMasterPageAnz*sizeof(USHORT)); + memset(pMasterMap,0xFF,nSrcMasterPageAnz*sizeof(sal_uInt16)); if (bAllMasterPages) { memset(pMasterNeed, true, nSrcMasterPageAnz * sizeof(bool)); } else { memset(pMasterNeed, false, nSrcMasterPageAnz * sizeof(bool)); - USHORT nAnf= bReverse ? nLastPageNum : nFirstPageNum; - USHORT nEnd= bReverse ? nFirstPageNum : nLastPageNum; - for (USHORT i=nAnf; i<=nEnd; i++) { + sal_uInt16 nAnf= bReverse ? nLastPageNum : nFirstPageNum; + sal_uInt16 nEnd= bReverse ? nFirstPageNum : nLastPageNum; + for (sal_uInt16 i=nAnf; i<=nEnd; i++) { const SdrPage* pPg=rSourceModel.GetPage(i); if(pPg->TRG_HasMasterPage()) { @@ -1742,8 +1744,8 @@ void SdrModel::Merge(SdrModel& rSourceModel, } } // Nun das Mapping der MasterPages bestimmen - USHORT nAktMaPagNum=nDstMasterPageAnz; - for (USHORT i=0; i<nSrcMasterPageAnz; i++) { + sal_uInt16 nAktMaPagNum=nDstMasterPageAnz; + for (sal_uInt16 i=0; i<nSrcMasterPageAnz; i++) { if (pMasterNeed[i]) { pMasterMap[i]=nAktMaPagNum; nAktMaPagNum++; @@ -1754,7 +1756,7 @@ void SdrModel::Merge(SdrModel& rSourceModel, // rueberholen der Masterpages if (pMasterMap!=NULL && pMasterNeed!=NULL && nMasterNeed!=0) { - for (USHORT i=nSrcMasterPageAnz; i>0;) { + for (sal_uInt16 i=nSrcMasterPageAnz; i>0;) { i--; if (pMasterNeed[i]) { SdrPage* pPg=NULL; @@ -1771,9 +1773,9 @@ void SdrModel::Merge(SdrModel& rSourceModel, maMaPag.Insert(pPg,nDstMasterPageAnz); // #109538# MasterPageListChanged(); - pPg->SetInserted(TRUE); + pPg->SetInserted(sal_True); pPg->SetModel(this); - bMPgNumsDirty=TRUE; + bMPgNumsDirty=sal_True; if (bUndo) AddUndo(GetSdrUndoFactory().CreateUndoNewPage(*pPg)); } else { OSL_FAIL("SdrModel::Merge(): MasterPage im SourceModel nicht gefunden"); @@ -1784,8 +1786,8 @@ void SdrModel::Merge(SdrModel& rSourceModel, // rueberholen der Zeichenseiten if (bInsPages) { - USHORT nSourcePos=nFirstPageNum; - USHORT nMergeCount=USHORT(Abs((long)((long)nFirstPageNum-nLastPageNum))+1); + sal_uInt16 nSourcePos=nFirstPageNum; + sal_uInt16 nMergeCount=sal_uInt16(Abs((long)((long)nFirstPageNum-nLastPageNum))+1); if (nDestPos>GetPageCount()) nDestPos=GetPageCount(); while (nMergeCount>0) { SdrPage* pPg=NULL; @@ -1845,8 +1847,8 @@ void SdrModel::Merge(SdrModel& rSourceModel, delete [] pMasterMap; delete [] pMasterNeed; - bMPgNumsDirty=TRUE; - bPagNumsDirty=TRUE; + bMPgNumsDirty=sal_True; + bPagNumsDirty=sal_True; SetChanged(); // Fehlt: Mergen und Mapping der Layer @@ -1854,12 +1856,12 @@ void SdrModel::Merge(SdrModel& rSourceModel, if (bUndo) EndUndo(); } -void SdrModel::SetStarDrawPreviewMode(BOOL bPreview) +void SdrModel::SetStarDrawPreviewMode(sal_Bool bPreview) { if (!bPreview && bStarDrawPreviewMode && GetPageCount()) { // Das Zuruecksetzen ist nicht erlaubt, da das Model ev. nicht vollstaendig geladen wurde - DBG_ASSERT(FALSE,"SdrModel::SetStarDrawPreviewMode(): Zuruecksetzen nicht erlaubt, da Model ev. nicht vollstaendig"); + DBG_ASSERT(sal_False,"SdrModel::SetStarDrawPreviewMode(): Zuruecksetzen nicht erlaubt, da Model ev. nicht vollstaendig"); } else { @@ -1916,7 +1918,7 @@ void SdrModel::MigrateItemSet( const SfxItemSet* pSourceSet, SfxItemSet* pDestSe while(nWhich) { - if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, FALSE, &pPoolItem)) + if(SFX_ITEM_SET == pSourceSet->GetItemState(nWhich, sal_False, &pPoolItem)) { const SfxPoolItem* pItem = pPoolItem; @@ -1982,7 +1984,7 @@ rtl::Reference<SvxForbiddenCharactersTable> SdrModel::GetForbiddenCharsTable() c return mpForbiddenCharactersTable; } -void SdrModel::SetCharCompressType( UINT16 nType ) +void SdrModel::SetCharCompressType( sal_uInt16 nType ) { if( nType != mnCharCompressType ) { @@ -2017,10 +2019,10 @@ void SdrModel::ReformatAllTextObjects() ImpReformatAllTextObjects(); } -bool SdrModel::HasTransparentObjects( BOOL bCheckForAlphaChannel ) const +bool SdrModel::HasTransparentObjects( bool bCheckForAlphaChannel ) const { bool bRet = false; - USHORT n, nCount; + sal_uInt16 n, nCount; for( n = 0, nCount = GetMasterPageCount(); ( n < nCount ) && !bRet; n++ ) if( GetMasterPage( n )->HasTransparentObjects( bCheckForAlphaChannel ) ) @@ -2036,7 +2038,7 @@ bool SdrModel::HasTransparentObjects( BOOL bCheckForAlphaChannel ) const return bRet; } -SdrOutliner* SdrModel::createOutliner( USHORT nOutlinerMode ) +SdrOutliner* SdrModel::createOutliner( sal_uInt16 nOutlinerMode ) { if( NULL == mpOutlinerCache ) mpOutlinerCache = new SdrOutlinerCache(this); @@ -2108,6 +2110,11 @@ void SdrModel::SetSdrUndoManager( SfxUndoManager* pUndoManager ) mpImpl->mpUndoManager = pUndoManager; } +SfxUndoManager* SdrModel::GetSdrUndoManager() const +{ + return mpImpl->mpUndoManager; +} + SdrUndoFactory& SdrModel::GetSdrUndoFactory() const { if( !mpImpl->mpUndoFactory ) diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 30bc0892a7..202c187c26 100644..100755 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -32,8 +32,8 @@ #include <svx/svdmrkv.hxx> #include <svx/svdetc.hxx> #include <svx/svdoedge.hxx> -#include "svdglob.hxx" -#include "svditext.hxx" +#include "svx/svdglob.hxx" +#include "svx/svditext.hxx" #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> @@ -49,14 +49,14 @@ #include "gradtrns.hxx" #include <svx/xflftrit.hxx> #include <svx/dialmgr.hxx> -#include "svdstr.hrc" +#include "svx/svdstr.hrc" #include <svx/svdundo.hxx> #include <svx/svdopath.hxx> #include <svx/scene3d.hxx> #include <svx/svdovirt.hxx> #include <svx/sdr/overlay/overlayrollingrectangle.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrhittesthelper.hxx> @@ -147,24 +147,24 @@ void ImplMarkingOverlay::SetSecondPosition(const basegfx::B2DPoint& rNewPosition void SdrMarkView::ImpClearVars() { eDragMode=SDRDRAG_MOVE; - //HMHbHdlShown=FALSE; - bRefHdlShownOnly=FALSE; + //HMHbHdlShown=sal_False; + bRefHdlShownOnly=sal_False; eEditMode=SDREDITMODE_EDIT; eEditMode0=SDREDITMODE_EDIT; - bDesignMode=FALSE; + bDesignMode=sal_False; pMarkedObj=NULL; pMarkedPV=NULL; - bForceFrameHandles=FALSE; - bPlusHdlAlways=FALSE; + bForceFrameHandles=sal_False; + bPlusHdlAlways=sal_False; nFrameHandlesLimit=50; - bInsPolyPoint=FALSE; + bInsPolyPoint=sal_False; mnInsPointNum = 0L; - bMarkedObjRectDirty=FALSE; - bMarkedPointsRectsDirty=FALSE; + bMarkedObjRectDirty=sal_False; + bMarkedPointsRectsDirty=sal_False; mbMarkHandlesHidden = false; - bMrkPntDirty=FALSE; - bMarkHdlWhenTextEdit=FALSE; - bMarkableObjCountDirty=FALSE; // noch nicht implementiert + bMrkPntDirty=sal_False; + bMarkHdlWhenTextEdit=sal_False; + bMarkableObjCountDirty=sal_False; // noch nicht implementiert nMarkableObjCount=0; // noch nicht implementiert // #114409#-3 Migrate selections @@ -203,13 +203,13 @@ void SdrMarkView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) { - bMarkedObjRectDirty=TRUE; - bMarkedPointsRectsDirty=TRUE; + bMarkedObjRectDirty=sal_True; + bMarkedPointsRectsDirty=sal_True; } /* removed for now since this breaks existing code who iterates over the mark list and sequentially replaces objects if( eKind==HINT_OBJREMOVED && IsObjMarked( const_cast<SdrObject*>(pSdrHint->GetObject()) ) ) { - MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), TRUE ); + MarkObj( const_cast<SdrObject*>(pSdrHint->GetObject()), GetSdrPageView(), sal_True ); } */ } @@ -220,14 +220,14 @@ void SdrMarkView::ModelHasChanged() { SdrPaintView::ModelHasChanged(); GetMarkedObjectListWriteAccess().SetNameDirty(); - bMarkedObjRectDirty=TRUE; - bMarkedPointsRectsDirty=TRUE; + bMarkedObjRectDirty=sal_True; + bMarkedPointsRectsDirty=sal_True; // Es sind beispielsweise Obj markiert und maMarkedObjectListist Sorted. // In einer anderen View 2 wird die ObjOrder veraendert // (z.B. MovToTop()). Dann ist Neusortieren der MarkList erforderlich. GetMarkedObjectListWriteAccess().SetUnsorted(); SortMarkedObjects(); - bMrkPntDirty=TRUE; + bMrkPntDirty=sal_True; UndirtyMrkPnt(); SdrView* pV=(SdrView*)this; if (pV!=NULL && !pV->IsDragObj() && !pV->IsInsObjPoint()) { // an dieser Stelle habe ich ein ziemliches Problem !!! @@ -237,7 +237,7 @@ void SdrMarkView::ModelHasChanged() //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrMarkView::IsAction() const +sal_Bool SdrMarkView::IsAction() const { return SdrSnapView::IsAction() || IsMarkObj() || IsMarkPoints() || IsMarkGluePoints(); } @@ -539,16 +539,16 @@ void SdrMarkView::BrkMarkGluePoints() } } -BOOL SdrMarkView::HasMarkableObj() const +sal_Bool SdrMarkView::HasMarkableObj() const { - ULONG nCount=0; + sal_uIntPtr nCount=0; SdrPageView* pPV = GetSdrPageView(); if(pPV) { SdrObjList* pOL=pPV->GetObjList(); - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG nObjNum=0; nObjNum<nObjAnz && nCount==0; nObjNum++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz && nCount==0; nObjNum++) { SdrObject* pObj=pOL->GetObj(nObjNum); if (IsObjMarkable(pObj,pPV)) { nCount++; @@ -558,16 +558,16 @@ BOOL SdrMarkView::HasMarkableObj() const return nCount!=0; } -ULONG SdrMarkView::GetMarkableObjCount() const +sal_uIntPtr SdrMarkView::GetMarkableObjCount() const { - ULONG nCount=0; + sal_uIntPtr nCount=0; SdrPageView* pPV = GetSdrPageView(); if(pPV) { SdrObjList* pOL=pPV->GetObjList(); - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) { SdrObject* pObj=pOL->GetObj(nObjNum); if (IsObjMarkable(pObj,pPV)) { nCount++; @@ -579,26 +579,26 @@ ULONG SdrMarkView::GetMarkableObjCount() const //HMHvoid SdrMarkView::ImpShowMarkHdl(bool /*bNoRefHdl*/) //HMH{ -//HMH bNoRefHdl=FALSE; // geht leider erstmal nicht anders +//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders //HMH if (!bHdlShown) { -//HMH bRefHdlShownOnly=FALSE; -//HMH bHdlShown=TRUE; +//HMH bRefHdlShownOnly=sal_False; +//HMH bHdlShown=sal_True; //HMH } //HMH} //HMHvoid SdrMarkView::ShowMarkHdl(bool /*bNoRefHdl*/) //HMH{ -//HMH bNoRefHdl=FALSE; // geht leider erstmal nicht anders +//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders //HMH ImpShowMarkHdl(bNoRefHdl); //HMH} //HMHvoid SdrMarkView::HideMarkHdl(bool /*bNoRefHdl*/) //HMH{ -//HMH bNoRefHdl=FALSE; // geht leider erstmal nicht anders +//HMH bNoRefHdl=sal_False; // geht leider erstmal nicht anders //HMH if (bHdlShown) { //HMH bRefHdlShownOnly=bNoRefHdl; -//HMH bHdlShown=FALSE; +//HMH bHdlShown=sal_False; //HMH } //HMH} @@ -620,29 +620,29 @@ void SdrMarkView::showMarkHandles() } } -BOOL SdrMarkView::ImpIsFrameHandles() const +sal_Bool SdrMarkView::ImpIsFrameHandles() const { - ULONG nMarkAnz=GetMarkedObjectCount(); - BOOL bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles; - BOOL bStdDrag=eDragMode==SDRDRAG_MOVE; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_Bool bFrmHdl=nMarkAnz>nFrameHandlesLimit || bForceFrameHandles; + sal_Bool bStdDrag=eDragMode==SDRDRAG_MOVE; if (nMarkAnz==1 && bStdDrag && bFrmHdl) { const SdrObject* pObj=GetMarkedObjectByIndex(0); if (pObj->GetObjInventor()==SdrInventor) { - UINT16 nIdent=pObj->GetObjIdentifier(); + sal_uInt16 nIdent=pObj->GetObjIdentifier(); if (nIdent==OBJ_LINE || nIdent==OBJ_EDGE || nIdent==OBJ_CAPTION || nIdent==OBJ_MEASURE || nIdent==OBJ_CUSTOMSHAPE || nIdent==OBJ_TABLE ) { - bFrmHdl=FALSE; + bFrmHdl=sal_False; } } } if (!bStdDrag && !bFrmHdl) { // Grundsaetzlich erstmal alle anderen Dragmodi nur mit FrameHandles - bFrmHdl=TRUE; + bFrmHdl=sal_True; if (eDragMode==SDRDRAG_ROTATE) { // bei Rotate ObjOwn-Drag, wenn mind. 1 PolyObj - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; nMarkNum++) { + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && bFrmHdl; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); bFrmHdl=!pObj->IsPolyObj(); @@ -651,7 +651,7 @@ BOOL SdrMarkView::ImpIsFrameHandles() const } if (!bFrmHdl) { // FrameHandles, wenn wenigstens 1 Obj kein SpecialDrag kann - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) { + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bFrmHdl; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); bFrmHdl=!pObj->hasSpecialDrag(); @@ -691,9 +691,9 @@ void SdrMarkView::SetMarkHandles() // are handles enabled at all? Create only then if(!areMarkHandlesHidden()) { - ULONG nMarkAnz=GetMarkedObjectCount(); - BOOL bStdDrag=eDragMode==SDRDRAG_MOVE; - BOOL bSingleTextObjMark=FALSE; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_Bool bStdDrag=eDragMode==SDRDRAG_MOVE; + sal_Bool bSingleTextObjMark=sal_False; if (nMarkAnz==1) { @@ -704,13 +704,13 @@ void SdrMarkView::SetMarkHandles() static_cast<SdrTextObj*>(pMarkedObj)->IsTextFrame(); } - BOOL bFrmHdl=ImpIsFrameHandles(); + sal_Bool bFrmHdl=ImpIsFrameHandles(); if (nMarkAnz>0) { pMarkedPV=GetSdrPageViewOfMarkedByIndex(0); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && (pMarkedPV!=NULL || !bFrmHdl); nMarkNum++) + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && (pMarkedPV!=NULL || !bFrmHdl); nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); @@ -736,15 +736,15 @@ void SdrMarkView::SetMarkHandles() { // sonst nix gefunden if( bSingleTextObjMark ) { - const ULONG nSiz0=aHdl.GetHdlCount(); + const sal_uIntPtr nSiz0=aHdl.GetHdlCount(); pMarkedObj->AddToHdlList(aHdl); - const ULONG nSiz1=aHdl.GetHdlCount(); - for (ULONG i=nSiz0; i<nSiz1; i++) + const sal_uIntPtr nSiz1=aHdl.GetHdlCount(); + for (sal_uIntPtr i=nSiz0; i<nSiz1; i++) { SdrHdl* pHdl=aHdl.GetHdl(i); pHdl->SetObj(pMarkedObj); pHdl->SetPageView(pMarkedPV); - pHdl->SetObjHdlNum(USHORT(i-nSiz0)); + pHdl->SetObjHdlNum(sal_uInt16(i-nSiz0)); } } else if( eDragMode==SDRDRAG_CROP ) @@ -760,8 +760,8 @@ void SdrMarkView::SetMarkHandles() } else { - BOOL bWdt0=aRect.Left()==aRect.Right(); - BOOL bHgt0=aRect.Top()==aRect.Bottom(); + sal_Bool bWdt0=aRect.Left()==aRect.Right(); + sal_Bool bHgt0=aRect.Top()==aRect.Bottom(); if (bWdt0 && bHgt0) { aHdl.AddHdl(new SdrHdl(aRect.TopLeft(),HDL_UPLFT)); @@ -787,27 +787,27 @@ void SdrMarkView::SetMarkHandles() } else { - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); - const ULONG nSiz0=aHdl.GetHdlCount(); + const sal_uIntPtr nSiz0=aHdl.GetHdlCount(); pObj->AddToHdlList(aHdl); - const ULONG nSiz1=aHdl.GetHdlCount(); + const sal_uIntPtr nSiz1=aHdl.GetHdlCount(); bool bPoly=pObj->IsPolyObj(); const SdrUShortCont* pMrkPnts=pM->GetMarkedPoints(); - for (ULONG i=nSiz0; i<nSiz1; i++) + for (sal_uIntPtr i=nSiz0; i<nSiz1; i++) { SdrHdl* pHdl=aHdl.GetHdl(i); pHdl->SetObj(pObj); pHdl->SetPageView(pPV); - pHdl->SetObjHdlNum(USHORT(i-nSiz0)); + pHdl->SetObjHdlNum(sal_uInt16(i-nSiz0)); if (bPoly) { - BOOL bSelected=pMrkPnts!=NULL && pMrkPnts->Exist(USHORT(i-nSiz0)); + sal_Bool bSelected=pMrkPnts!=NULL && pMrkPnts->Exist(sal_uInt16(i-nSiz0)); pHdl->SetSelected(bSelected); - //BOOL bPlus=bPlusHdlAlways; + //sal_Bool bPlus=bPlusHdlAlways; if (bPlusHdlAlways || bSelected) { sal_uInt32 nPlusAnz=pObj->GetPlusHdlCount(*pHdl); @@ -818,7 +818,7 @@ void SdrMarkView::SetMarkHandles() { pPlusHdl->SetObj(pObj); pPlusHdl->SetPageView(pPV); - pPlusHdl->SetPlusHdl(TRUE); + pPlusHdl->SetPlusHdl(sal_True); aHdl.AddHdl(pPlusHdl); } } @@ -829,7 +829,7 @@ void SdrMarkView::SetMarkHandles() } // if bFrmHdl else // GluePoint-Handles - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); SdrObject* pObj=pM->GetMarkedSdrObj(); @@ -840,13 +840,13 @@ void SdrMarkView::SetMarkHandles() const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (pGPL!=NULL) { - //USHORT nGlueAnz=pGPL->GetCount(); - USHORT nAnz=(USHORT)pMrkGlue->GetCount(); - for (USHORT nNum=0; nNum<nAnz; nNum++) + //sal_uInt16 nGlueAnz=pGPL->GetCount(); + sal_uInt16 nAnz=(sal_uInt16)pMrkGlue->GetCount(); + for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { - USHORT nId=pMrkGlue->GetObject(nNum); + sal_uInt16 nId=pMrkGlue->GetObject(nNum); //nNum changed to nNumGP because already used in for loop - USHORT nNumGP=pGPL->FindGluePoint(nId); + sal_uInt16 nNumGP=pGPL->FindGluePoint(nId); if (nNumGP!=SDRGLUEPOINT_NOTFOUND) { const SdrGluePoint& rGP=(*pGPL)[nNumGP]; @@ -947,21 +947,21 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) case SDRDRAG_TRANSPARENCE: { // add interactive transparence handle - ULONG nMarkAnz = GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz = GetMarkedObjectCount(); if(nMarkAnz == 1) { SdrObject* pObj = GetMarkedObjectByIndex(0); SdrModel* pModel = GetModel(); const SfxItemSet& rSet = pObj->GetMergedItemSet(); - if(SFX_ITEM_SET != rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, FALSE)) + if(SFX_ITEM_SET != rSet.GetItemState(XATTR_FILLFLOATTRANSPARENCE, sal_False)) { // add this item, it's not yet there XFillFloatTransparenceItem aNewItem( (const XFillFloatTransparenceItem&)rSet.Get(XATTR_FILLFLOATTRANSPARENCE)); XGradient aGrad = aNewItem.GetGradientValue(); - aNewItem.SetEnabled(TRUE); + aNewItem.SetEnabled(sal_True); aGrad.SetStartIntens(100); aGrad.SetEndIntens(100); aNewItem.SetGradientValue(aGrad); @@ -991,9 +991,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) // build handles const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY())); const Point aTmpPos2(basegfx::fround(aGradTransVector.maPositionB.getX()), basegfx::fround(aGradTransVector.maPositionB.getY())); - SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, SDR_HANDLE_COLOR_SIZE_NORMAL, TRUE); - SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, SDR_HANDLE_COLOR_SIZE_NORMAL, TRUE); - SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, FALSE); + SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, SDR_HANDLE_COLOR_SIZE_NORMAL, sal_True); + SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, SDR_HANDLE_COLOR_SIZE_NORMAL, sal_True); + SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, sal_False); DBG_ASSERT(pColHdl1 && pColHdl2 && pGradHdl, "Got not all necessary handles!!"); // link them @@ -1012,7 +1012,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) case SDRDRAG_GRADIENT: { // add interactive gradient handle - ULONG nMarkAnz = GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz = GetMarkedObjectCount(); if(nMarkAnz == 1) { SdrObject* pObj = GetMarkedObjectByIndex(0); @@ -1033,9 +1033,9 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) // build handles const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY())); const Point aTmpPos2(basegfx::fround(aGradTransVector.maPositionB.getX()), basegfx::fround(aGradTransVector.maPositionB.getY())); - SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, aHdlSize, FALSE); - SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, aHdlSize, FALSE); - SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, TRUE); + SdrHdlColor* pColHdl1 = new SdrHdlColor(aTmpPos1, aGradTransVector.aCol1, aHdlSize, sal_False); + SdrHdlColor* pColHdl2 = new SdrHdlColor(aTmpPos2, aGradTransVector.aCol2, aHdlSize, sal_False); + SdrHdlGradient* pGradHdl = new SdrHdlGradient(aTmpPos1, aTmpPos2, sal_True); DBG_ASSERT(pColHdl1 && pColHdl2 && pGradHdl, "Got not all necessary handles!!"); // link them @@ -1062,7 +1062,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) } /** handle mouse over effects for handles */ -BOOL SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin) { if(aHdl.GetHdlCount()) { @@ -1074,9 +1074,9 @@ BOOL SdrMarkView::MouseMove(const MouseEvent& rMEvt, Window* pWin) } // notify last mouse over handle that he lost the mouse - const ULONG nHdlCount = aHdl.GetHdlCount(); + const sal_uIntPtr nHdlCount = aHdl.GetHdlCount(); - for(ULONG nHdl = 0; nHdl < nHdlCount; nHdl++ ) + for(sal_uIntPtr nHdl = 0; nHdl < nHdlCount; nHdl++ ) { SdrHdl* pCurrentHdl = GetHdl(nHdl); if( pCurrentHdl->mbMouseOver ) @@ -1216,13 +1216,13 @@ void SdrMarkView::SetRef2(const Point& rPt) void SdrMarkView::CheckMarked() { - for (ULONG nm=GetMarkedObjectCount(); nm>0;) { + for (sal_uIntPtr nm=GetMarkedObjectCount(); nm>0;) { nm--; SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); SdrPageView* pPV=pM->GetPageView(); SdrLayerID nLay=pObj->GetLayer(); - BOOL bRaus=!pObj->IsInserted(); // Obj geloescht? + sal_Bool bRaus=!pObj->IsInserted(); // Obj geloescht? if (!pObj->Is3DObj()) { bRaus=bRaus || pObj->GetPage()!=pPV->GetPage(); // Obj ploetzlich in anderer Page oder Group } @@ -1261,7 +1261,7 @@ void SdrMarkView::CheckMarked() // #97995# at least reset the remembered BoundRect to prevent handle // generation if bForceFrameHandles is TRUE. - bMarkedObjRectDirty = TRUE; + bMarkedObjRectDirty = sal_True; } void SdrMarkView::SetMarkRects() @@ -1275,12 +1275,12 @@ void SdrMarkView::SetMarkRects() } } -void SdrMarkView::SetFrameHandles(BOOL bOn) +void SdrMarkView::SetFrameHandles(sal_Bool bOn) { if (bOn!=bForceFrameHandles) { - BOOL bOld=ImpIsFrameHandles(); + sal_Bool bOld=ImpIsFrameHandles(); bForceFrameHandles=bOn; - BOOL bNew=ImpIsFrameHandles(); + sal_Bool bNew=ImpIsFrameHandles(); if (bNew!=bOld) { AdjustMarkHdl(); //HMHTRUE); MarkListHasChanged(); @@ -1291,12 +1291,12 @@ void SdrMarkView::SetFrameHandles(BOOL bOn) void SdrMarkView::SetEditMode(SdrViewEditMode eMode) { if (eMode!=eEditMode) { - BOOL bGlue0=eEditMode==SDREDITMODE_GLUEPOINTEDIT; - BOOL bEdge0=((SdrCreateView*)this)->IsEdgeTool(); + sal_Bool bGlue0=eEditMode==SDREDITMODE_GLUEPOINTEDIT; + sal_Bool bEdge0=((SdrCreateView*)this)->IsEdgeTool(); eEditMode0=eEditMode; eEditMode=eMode; - BOOL bGlue1=eEditMode==SDREDITMODE_GLUEPOINTEDIT; - BOOL bEdge1=((SdrCreateView*)this)->IsEdgeTool(); + sal_Bool bGlue1=eEditMode==SDREDITMODE_GLUEPOINTEDIT; + sal_Bool bEdge1=((SdrCreateView*)this)->IsEdgeTool(); // etwas Aufwand um Flackern zu verhindern beim Umschalten // zwischen GlueEdit und EdgeTool if (bGlue1 && !bGlue0) ImpSetGlueVisible2(bGlue1); @@ -1308,7 +1308,7 @@ void SdrMarkView::SetEditMode(SdrViewEditMode eMode) //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const +sal_Bool SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const { if (pObj) { @@ -1317,65 +1317,65 @@ BOOL SdrMarkView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const { // Objekt nicht selektierbar oder // SdrUnoObj nicht im DesignMode - return FALSE; + return sal_False; } } - return pPV!=NULL ? pPV->IsObjMarkable(pObj) : TRUE; + return pPV!=NULL ? pPV->IsObjMarkable(pObj) : sal_True; } -BOOL SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const +sal_Bool SdrMarkView::IsMarkedObjHit(const Point& rPnt, short nTol) const { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; nTol=ImpGetHitTolLogic(nTol,NULL); Point aPt(rPnt); - for (ULONG nm=0; nm<GetMarkedObjectCount() && !bRet; nm++) { + for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount() && !bRet; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); - bRet = 0 != CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0); + bRet = 0 != CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0); } return bRet; } -SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, ULONG nOptions, SdrHdl* pHdl0) const +SdrHdl* SdrMarkView::PickHandle(const Point& rPnt, sal_uIntPtr nOptions, SdrHdl* pHdl0) const { if (bSomeObjChgdFlag) { // ggf. Handles neu berechnen lassen! FlushComeBackTimer(); } - BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; - BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0; + sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; + sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; Point aPt(rPnt); return aHdl.IsHdlListHit(aPt,bBack,bNext,pHdl0); } -BOOL SdrMarkView::MarkObj(const Point& rPnt, short nTol, BOOL bToggle, BOOL bDeep) +sal_Bool SdrMarkView::MarkObj(const Point& rPnt, short nTol, sal_Bool bToggle, sal_Bool bDeep) { SdrObject* pObj; SdrPageView* pPV; nTol=ImpGetHitTolLogic(nTol,NULL); - ULONG nOptions=SDRSEARCH_PICKMARKABLE; + sal_uIntPtr nOptions=SDRSEARCH_PICKMARKABLE; if (bDeep) nOptions=nOptions|SDRSEARCH_DEEP; - BOOL bRet=PickObj(rPnt,(USHORT)nTol,pObj,pPV,nOptions); + sal_Bool bRet=PickObj(rPnt,(sal_uInt16)nTol,pObj,pPV,nOptions); if (bRet) { - BOOL bUnmark=bToggle && IsObjMarked(pObj); + sal_Bool bUnmark=bToggle && IsObjMarked(pObj); MarkObj(pObj,pPV,bUnmark); } return bRet; } -BOOL SdrMarkView::MarkNextObj(BOOL bPrev) +sal_Bool SdrMarkView::MarkNextObj(sal_Bool bPrev) { SdrPageView* pPageView = GetSdrPageView(); if(!pPageView) { - return FALSE; + return sal_False; } SortMarkedObjects(); - ULONG nMarkAnz=GetMarkedObjectCount(); - ULONG nChgMarkNum = ULONG_MAX; // Nummer des zu ersetzenden MarkEntries - ULONG nSearchObjNum = bPrev ? 0 : ULONG_MAX; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nChgMarkNum = ULONG_MAX; // Nummer des zu ersetzenden MarkEntries + sal_uIntPtr nSearchObjNum = bPrev ? 0 : ULONG_MAX; if (nMarkAnz!=0) { - nChgMarkNum=bPrev ? 0 : ULONG(nMarkAnz-1); + nChgMarkNum=bPrev ? 0 : sal_uIntPtr(nMarkAnz-1); SdrMark* pM=GetSdrMarkByIndex(nChgMarkNum); OSL_ASSERT(pM!=NULL); if (pM->GetMarkedSdrObj() != NULL) @@ -1384,7 +1384,7 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev) SdrObject* pMarkObj=NULL; SdrObjList* pSearchObjList=pPageView->GetObjList(); - ULONG nObjAnz=pSearchObjList->GetObjCount(); + sal_uIntPtr nObjAnz=pSearchObjList->GetObjCount(); if (nObjAnz!=0) { if (nSearchObjNum>nObjAnz) nSearchObjNum=nObjAnz; while (pMarkObj==NULL && ((!bPrev && nSearchObjNum>0) || (bPrev && nSearchObjNum<nObjAnz))) @@ -1405,7 +1405,7 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev) if(!pMarkObj) { - return FALSE; + return sal_False; } if (nChgMarkNum!=ULONG_MAX) @@ -1413,32 +1413,32 @@ BOOL SdrMarkView::MarkNextObj(BOOL bPrev) GetMarkedObjectListWriteAccess().DeleteMark(nChgMarkNum); } MarkObj(pMarkObj,pPageView); // ruft auch MarkListHasChanged(), AdjustMarkHdl() - return TRUE; + return sal_True; } -BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev) +sal_Bool SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, sal_Bool bPrev) { SortMarkedObjects(); nTol=ImpGetHitTolLogic(nTol,NULL); Point aPt(rPnt); SdrMark* pTopMarkHit=NULL; SdrMark* pBtmMarkHit=NULL; - ULONG nTopMarkHit=0; - ULONG nBtmMarkHit=0; + sal_uIntPtr nTopMarkHit=0; + sal_uIntPtr nBtmMarkHit=0; // oberstes der markierten Objekte suchen, das von rPnt getroffen wird - ULONG nMarkAnz=GetMarkedObjectCount(); - ULONG nm=0; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nm=0; for (nm=nMarkAnz; nm>0 && pTopMarkHit==NULL;) { nm--; SdrMark* pM=GetSdrMarkByIndex(nm); - if(CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0)) + if(CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pM->GetPageView(),0,0)) { pTopMarkHit=pM; nTopMarkHit=nm; } } // Nichts gefunden, dann ganz normal ein Obj markieren. - if (pTopMarkHit==NULL) return MarkObj(rPnt,USHORT(nTol),FALSE); + if (pTopMarkHit==NULL) return MarkObj(rPnt,sal_uInt16(nTol),sal_False); SdrObject* pTopObjHit=pTopMarkHit->GetMarkedSdrObj(); SdrObjList* pObjList=pTopObjHit->GetObjList(); @@ -1448,7 +1448,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev) for (nm=0; nm<nMarkAnz && pBtmMarkHit==NULL; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrPageView* pPV2=pM->GetPageView(); - if (pPV2==pPV && CheckSingleSdrObjectHit(aPt,USHORT(nTol),pM->GetMarkedSdrObj(),pPV2,0,0)) + if (pPV2==pPV && CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pM->GetMarkedSdrObj(),pPV2,0,0)) { pBtmMarkHit=pM; nBtmMarkHit=nm; @@ -1456,10 +1456,10 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev) } if (pBtmMarkHit==NULL) { pBtmMarkHit=pTopMarkHit; nBtmMarkHit=nTopMarkHit; } SdrObject* pBtmObjHit=pBtmMarkHit->GetMarkedSdrObj(); - ULONG nObjAnz=pObjList->GetObjCount(); + sal_uIntPtr nObjAnz=pObjList->GetObjCount(); // #110988# - //ULONG nSearchBeg=bPrev ? pBtmObjHit->GetOrdNum()+1 : pTopObjHit->GetOrdNum(); + //sal_uIntPtr nSearchBeg=bPrev ? pBtmObjHit->GetOrdNum()+1 : pTopObjHit->GetOrdNum(); sal_uInt32 nSearchBeg; E3dScene* pScene = NULL; SdrObject* pObjHit = (bPrev) ? pBtmObjHit : pTopObjHit; @@ -1490,7 +1490,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev) nSearchBeg = nOrdNumTop; } - ULONG no=nSearchBeg; + sal_uIntPtr no=nSearchBeg; SdrObject* pFndObj=NULL; //SdrObject* pAktObj=NULL; while (pFndObj==NULL && ((!bPrev && no>0) || (bPrev && no<nObjAnz))) { @@ -1506,7 +1506,7 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev) pObj = pObjList->GetObj(no); } - if (CheckSingleSdrObjectHit(aPt,USHORT(nTol),pObj,pPV,SDRSEARCH_TESTMARKABLE,0)) + if (CheckSingleSdrObjectHit(aPt,sal_uInt16(nTol),pObj,pPV,SDRSEARCH_TESTMARKABLE,0)) { if (TryToFindMarkedObject(pObj)==CONTAINER_ENTRY_NOTFOUND) { pFndObj=pObj; @@ -1526,9 +1526,9 @@ BOOL SdrMarkView::MarkNextObj(const Point& rPnt, short nTol, BOOL bPrev) return pFndObj!=NULL; } -BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark) +sal_Bool SdrMarkView::MarkObj(const Rectangle& rRect, sal_Bool bUnmark) { - BOOL bFnd=FALSE; + sal_Bool bFnd=sal_False; Rectangle aR(rRect); SdrObject* pObj; SdrObjList* pObjList; @@ -1539,8 +1539,8 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark) { pObjList=pPV->GetObjList(); Rectangle aFrm1(aR); - ULONG nObjAnz=pObjList->GetObjCount(); - for (ULONG nO=0; nO<nObjAnz; nO++) { + sal_uIntPtr nObjAnz=pObjList->GetObjCount(); + for (sal_uIntPtr nO=0; nO<nObjAnz; nO++) { pObj=pObjList->GetObj(nO); Rectangle aRect(pObj->GetCurrentBoundRect()); if (aFrm1.IsInside(aRect)) { @@ -1548,14 +1548,14 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark) if (IsObjMarkable(pObj,pPV)) { GetMarkedObjectListWriteAccess().InsertEntry(SdrMark(pObj,pPV)); - bFnd=TRUE; + bFnd=sal_True; } } else { - ULONG nPos=TryToFindMarkedObject(pObj); + sal_uIntPtr nPos=TryToFindMarkedObject(pObj); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { GetMarkedObjectListWriteAccess().DeleteMark(nPos); - bFnd=TRUE; + bFnd=sal_True; } } } @@ -1570,7 +1570,7 @@ BOOL SdrMarkView::MarkObj(const Rectangle& rRect, BOOL bUnmark) return bFnd; } -void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL bImpNoSetMarkHdl) +void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, sal_Bool bUnmark, sal_Bool bImpNoSetMarkHdl) { if (pObj!=NULL && pPV!=NULL && IsObjMarkable(pObj, pPV)) { BrkAction(); @@ -1580,7 +1580,7 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL } else { - ULONG nPos=TryToFindMarkedObject(pObj); + sal_uIntPtr nPos=TryToFindMarkedObject(pObj); if (nPos!=CONTAINER_ENTRY_NOTFOUND) { GetMarkedObjectListWriteAccess().DeleteMark(nPos); @@ -1597,20 +1597,20 @@ void SdrMarkView::MarkObj(SdrObject* pObj, SdrPageView* pPV, BOOL bUnmark, BOOL } } -BOOL SdrMarkView::IsObjMarked(SdrObject* pObj) const +sal_Bool SdrMarkView::IsObjMarked(SdrObject* pObj) const { // nicht so ganz die feine Art: Da FindObject() nicht const ist // muss ich mich hier auf non-const casten. - ULONG nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); + sal_uIntPtr nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); return nPos!=CONTAINER_ENTRY_NOTFOUND; } -USHORT SdrMarkView::GetMarkHdlSizePixel() const +sal_uInt16 SdrMarkView::GetMarkHdlSizePixel() const { return aHdl.GetHdlSize()*2+1; } -void SdrMarkView::SetSolidMarkHdl(BOOL bOn) +void SdrMarkView::SetSolidMarkHdl(sal_Bool bOn) { if (bOn!=aHdl.IsFineHdl()) { //HMHBOOL bMerk=IsMarkHdlShown(); @@ -1620,7 +1620,7 @@ void SdrMarkView::SetSolidMarkHdl(BOOL bOn) } } -void SdrMarkView::SetMarkHdlSizePixel(USHORT nSiz) +void SdrMarkView::SetMarkHdlSizePixel(sal_uInt16 nSiz) { if (nSiz<3) nSiz=3; nSiz/=2; @@ -1633,7 +1633,7 @@ void SdrMarkView::SetMarkHdlSizePixel(USHORT nSiz) } #define SDRSEARCH_IMPISMASTER 0x80000000 /* MasterPage wird gerade durchsucht */ -SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObject* pObj, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay) const +SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObject* pObj, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay) const { if(((nOptions & SDRSEARCH_IMPISMASTER) && pObj->IsNotVisibleAsMaster()) || (!pObj->IsVisible())) { @@ -1646,7 +1646,7 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, const bool bTXT(pObj->ISA(SdrTextObj) && ((SdrTextObj*)pObj)->IsTextFrame()); SdrObject* pRet=NULL; Rectangle aRect(pObj->GetCurrentBoundRect()); - USHORT nTol2(nTol); + sal_uInt16 nTol2(nTol); // double tolerance for OLE, text frames and objects in // active text edit @@ -1699,9 +1699,9 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, return pRet; } -SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, SdrObjList* pOL, SdrPageView* pPV, ULONG nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const +SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, sal_uInt16 nTol, SdrObjList* pOL, SdrPageView* pPV, sal_uIntPtr nOptions, const SetOfByte* pMVisLay, SdrObject*& rpRootObj) const { - BOOL bBack=(nOptions & SDRSEARCH_BACKWARD)!=0; + sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD)!=0; SdrObject* pRet=NULL; rpRootObj=NULL; if (pOL!=NULL) @@ -1710,8 +1710,8 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, sal_Bool bRemap(pOL->GetOwnerObj() && pOL->GetOwnerObj()->ISA(E3dScene)); E3dScene* pRemapScene = (bRemap ? (E3dScene*)pOL->GetOwnerObj() : 0L); - ULONG nObjAnz=pOL->GetObjCount(); - ULONG nObjNum=bBack ? 0 : nObjAnz; + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + sal_uIntPtr nObjNum=bBack ? 0 : nObjAnz; while (pRet==NULL && (bBack ? nObjNum<nObjAnz : nObjNum>0)) { if (!bBack) nObjNum--; SdrObject* pObj; @@ -1734,12 +1734,12 @@ SdrObject* SdrMarkView::CheckSingleSdrObjectHit(const Point& rPnt, USHORT nTol, return pRet; } -BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions) const +sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions) const { return PickObj(rPnt,nTol,rpObj,rpPV,nOptions,NULL,NULL,NULL); } -BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG nOptions, SdrObject** ppRootObj, ULONG* pnMarkNum, USHORT* pnPassNum) const +sal_Bool SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr nOptions, SdrObject** ppRootObj, sal_uIntPtr* pnMarkNum, sal_uInt16* pnPassNum) const { // Fehlt noch Pass2,Pass3 SortMarkedObjects(); if (ppRootObj!=NULL) *ppRootObj=NULL; @@ -1747,14 +1747,14 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP if (pnPassNum!=NULL) *pnPassNum=0; rpObj=NULL; rpPV=NULL; - BOOL bWholePage=(nOptions & SDRSEARCH_WHOLEPAGE) !=0; - BOOL bMarked=(nOptions & SDRSEARCH_MARKED) !=0; - BOOL bMasters=!bMarked && (nOptions & SDRSEARCH_ALSOONMASTER) !=0; - BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; + sal_Bool bWholePage=(nOptions & SDRSEARCH_WHOLEPAGE) !=0; + sal_Bool bMarked=(nOptions & SDRSEARCH_MARKED) !=0; + sal_Bool bMasters=!bMarked && (nOptions & SDRSEARCH_ALSOONMASTER) !=0; + sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; #if OSL_DEBUG_LEVEL > 0 - BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0; (void)bNext; // n.i. - BOOL bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; (void)bBoundCheckOn2ndPass;// n.i. - BOOL bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; (void)bCheckNearestOn3rdPass;// n.i. + sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; (void)bNext; // n.i. + sal_Bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; (void)bBoundCheckOn2ndPass;// n.i. + sal_Bool bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; (void)bCheckNearestOn3rdPass;// n.i. #endif if (nTol<0) nTol=ImpGetHitTolLogic(nTol,NULL); Point aPt(rPnt); @@ -1767,8 +1767,8 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP pPV=((SdrObjEditView*)this)->GetTextEditPageView(); } if (bMarked) { - ULONG nMrkAnz=GetMarkedObjectCount(); - ULONG nMrkNum=bBack ? 0 : nMrkAnz; + sal_uIntPtr nMrkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMrkNum=bBack ? 0 : nMrkAnz; while (pHitObj==NULL && (bBack ? nMrkNum<nMrkAnz : nMrkNum>0)) { if (!bBack) nMrkNum--; SdrMark* pM=GetSdrMarkByIndex(nMrkNum); @@ -1785,18 +1785,18 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP if(pPV) { SdrPage* pPage=pPV->GetPage(); - USHORT nPgAnz=1; + sal_uInt16 nPgAnz=1; if(bMasters && pPage->TRG_HasMasterPage()) { nPgAnz++; } - BOOL bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList(); + sal_Bool bExtraPassForWholePage=bWholePage && pPage!=pPV->GetObjList(); if (bExtraPassForWholePage) nPgAnz++; // Suche erst in AktObjList, dann auf der gesamten Page - USHORT nPgNum=bBack ? 0 : nPgAnz; + sal_uInt16 nPgNum=bBack ? 0 : nPgAnz; while (pHitObj==NULL && (bBack ? nPgNum<nPgAnz : nPgNum>0)) { - ULONG nTmpOptions=nOptions; + sal_uIntPtr nTmpOptions=nOptions; if (!bBack) nPgNum--; const SetOfByte* pMVisLay=NULL; SdrObjList* pObjList=NULL; @@ -1858,19 +1858,19 @@ BOOL SdrMarkView::PickObj(const Point& rPnt, short nTol, SdrObject*& rpObj, SdrP return rpObj!=NULL; } -BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, ULONG* pnMarkNum, ULONG nOptions) const +sal_Bool SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageView*& rpPV, sal_uIntPtr* pnMarkNum, sal_uIntPtr nOptions) const { SortMarkedObjects(); - BOOL bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; - BOOL bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; + sal_Bool bBoundCheckOn2ndPass=(nOptions & SDRSEARCH_PASS2BOUND) !=0; + sal_Bool bCheckNearestOn3rdPass=(nOptions & SDRSEARCH_PASS3NEAREST) !=0; rpObj=NULL; rpPV=NULL; if (pnMarkNum!=NULL) *pnMarkNum=CONTAINER_ENTRY_NOTFOUND; Point aPt(rPnt); - USHORT nTol=(USHORT)nHitTolLog; - BOOL bFnd=FALSE; - ULONG nMarkAnz=GetMarkedObjectCount(); - ULONG nMarkNum; + sal_uInt16 nTol=(sal_uInt16)nHitTolLog; + sal_Bool bFnd=sal_False; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkNum; for (nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) { nMarkNum--; SdrMark* pM=GetSdrMarkByIndex(nMarkNum); @@ -1886,8 +1886,8 @@ BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie if ((bBoundCheckOn2ndPass || bCheckNearestOn3rdPass) && !bFnd) { SdrObject* pBestObj=NULL; SdrPageView* pBestPV=NULL; - ULONG nBestMarkNum=0; - ULONG nBestDist=ULONG_MAX; + sal_uIntPtr nBestMarkNum=0; + sal_uIntPtr nBestDist=ULONG_MAX; for (nMarkNum=nMarkAnz; nMarkNum>0 && !bFnd;) { nMarkNum--; SdrMark* pM=GetSdrMarkByIndex(nMarkNum); @@ -1899,12 +1899,12 @@ BOOL SdrMarkView::PickMarkedObj(const Point& rPnt, SdrObject*& rpObj, SdrPageVie aRect.Right ()+=nTol; aRect.Bottom()+=nTol; if (aRect.IsInside(aPt)) { - bFnd=TRUE; + bFnd=sal_True; rpObj=pObj; rpPV=pPV; if (pnMarkNum!=NULL) *pnMarkNum=nMarkNum; } else if (bCheckNearestOn3rdPass) { - ULONG nDist=0; + sal_uIntPtr nDist=0; if (aPt.X()<aRect.Left()) nDist+=aRect.Left()-aPt.X(); if (aPt.X()>aRect.Right()) nDist+=aPt.X()-aRect.Right(); if (aPt.Y()<aRect.Top()) nDist+=aRect.Top()-aPt.Y(); @@ -1933,7 +1933,7 @@ SdrHitKind SdrMarkView::PickSomething(const Point& rPnt, short nTol) const Point aPt(rPnt); SdrObject* pObj=NULL; SdrPageView* pPV=NULL; - if (eRet==SDRHIT_NONE && PickObj(rPnt,USHORT(nTol),pObj,pPV,SDRSEARCH_PICKMARKABLE)) { + if (eRet==SDRHIT_NONE && PickObj(rPnt,sal_uInt16(nTol),pObj,pPV,SDRSEARCH_PICKMARKABLE)) { Rectangle aRct1(aPt-Point(nTol,nTol),aPt+Point(nTol,nTol)); // HitRect fuer Toleranz Rectangle aBR(pObj->GetCurrentBoundRect()); if (aRct1.IsInside(aBR.TopLeft())) eRet=SDRHIT_BOUNDTL; @@ -2016,7 +2016,7 @@ void SdrMarkView::AdjustMarkHdl() //HMHBOOL bRestraintPaint) Rectangle SdrMarkView::GetMarkedObjBoundRect() const { Rectangle aRect; - for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) { + for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); Rectangle aR1(pO->GetCurrentBoundRect()); @@ -2029,9 +2029,9 @@ Rectangle SdrMarkView::GetMarkedObjBoundRect() const const Rectangle& SdrMarkView::GetMarkedObjRect() const { if (bMarkedObjRectDirty) { - ((SdrMarkView*)this)->bMarkedObjRectDirty=FALSE; + ((SdrMarkView*)this)->bMarkedObjRectDirty=sal_False; Rectangle aRect; - for (ULONG nm=0; nm<GetMarkedObjectCount(); nm++) { + for (sal_uIntPtr nm=0; nm<GetMarkedObjectCount(); nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); Rectangle aR1(pO->GetSnapRect()); @@ -2045,7 +2045,7 @@ const Rectangle& SdrMarkView::GetMarkedObjRect() const //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrMarkView::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT nVal, USHORT nOpt) const +void SdrMarkView::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 nVal, sal_uInt16 nOpt) const { rStr = ImpGetResStr(nStrCacheID); xub_StrLen nPos = rStr.SearchAscii("%1"); @@ -2079,9 +2079,9 @@ void SdrMarkView::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USH //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrMarkView::EnterMarkedGroup() +sal_Bool SdrMarkView::EnterMarkedGroup() { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; // Es wird nur die erste gefundene Gruppe (also nur in einer PageView) geentert // Weil PageView::EnterGroup ein AdjustMarkHdl ruft. // Das muss ich per Flag mal unterbinden vvvvvvvv @@ -2089,7 +2089,7 @@ BOOL SdrMarkView::EnterMarkedGroup() if(pPV) { - BOOL bEnter=FALSE; + sal_Bool bEnter=sal_False; for (sal_uInt32 nm(GetMarkedObjectCount()); nm > 0 && !bEnter;) { nm--; @@ -2098,8 +2098,8 @@ BOOL SdrMarkView::EnterMarkedGroup() SdrObject* pObj=pM->GetMarkedSdrObj(); if (pObj->IsGroupObject()) { if (pPV->EnterGroup(pObj)) { - bRet=TRUE; - bEnter=TRUE; + bRet=sal_True; + bEnter=sal_True; } } } @@ -2113,18 +2113,18 @@ BOOL SdrMarkView::EnterMarkedGroup() void SdrMarkView::MarkListHasChanged() { GetMarkedObjectListWriteAccess().SetNameDirty(); - SetEdgesOfMarkedNodesDirty(); // bEdgesOfMarkedNodesDirty=TRUE; + SetEdgesOfMarkedNodesDirty(); // bEdgesOfMarkedNodesDirty=sal_True; - bMarkedObjRectDirty=TRUE; - bMarkedPointsRectsDirty=TRUE; + bMarkedObjRectDirty=sal_True; + bMarkedPointsRectsDirty=sal_True; #ifdef DBG_UTIL if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif - BOOL bOneEdgeMarked=FALSE; + sal_Bool bOneEdgeMarked=sal_False; if (GetMarkedObjectCount()==1) { const SdrObject* pObj=GetMarkedObjectByIndex(0); if (pObj->GetObjInventor()==SdrInventor) { - UINT16 nIdent=pObj->GetObjIdentifier(); + sal_uInt16 nIdent=pObj->GetObjIdentifier(); bOneEdgeMarked=nIdent==OBJ_EDGE; } } @@ -2133,17 +2133,17 @@ void SdrMarkView::MarkListHasChanged() //////////////////////////////////////////////////////////////////////////////////////////////////// -void SdrMarkView::SetMoveOutside(BOOL bOn) +void SdrMarkView::SetMoveOutside(sal_Bool bOn) { aHdl.SetMoveOutside(bOn); } -BOOL SdrMarkView::IsMoveOutside() const +sal_Bool SdrMarkView::IsMoveOutside() const { return aHdl.IsMoveOutside(); } -void SdrMarkView::SetDesignMode( BOOL _bOn ) +void SdrMarkView::SetDesignMode( sal_Bool _bOn ) { if ( bDesignMode != _bOn ) { diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index 9071aa6b69..a4d82bf9e0 100644..100755 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -32,7 +32,7 @@ #include <svx/svdmrkv.hxx> #include <svx/svdetc.hxx> #include <svx/svdoedge.hxx> -#include "svdglob.hxx" +#include "svx/svdglob.hxx" #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> #include "svddrgm1.hxx" @@ -51,14 +51,14 @@ // //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrMarkView::HasMarkablePoints() const +sal_Bool SdrMarkView::HasMarkablePoints() const { ForceUndirtyMrkPnt(); bool bRet=false; if (!ImpIsFrameHandles()) { - ULONG nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz<=nFrameHandlesLimit) { - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); bRet=pObj->IsPolyObj(); @@ -68,14 +68,14 @@ BOOL SdrMarkView::HasMarkablePoints() const return bRet; } -ULONG SdrMarkView::GetMarkablePointCount() const +sal_uIntPtr SdrMarkView::GetMarkablePointCount() const { ForceUndirtyMrkPnt(); - ULONG nAnz=0; + sal_uIntPtr nAnz=0; if (!ImpIsFrameHandles()) { - ULONG nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz<=nFrameHandlesLimit) { - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); if (pObj->IsPolyObj()) { @@ -87,14 +87,14 @@ ULONG SdrMarkView::GetMarkablePointCount() const return nAnz; } -BOOL SdrMarkView::HasMarkedPoints() const +sal_Bool SdrMarkView::HasMarkedPoints() const { ForceUndirtyMrkPnt(); - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; if (!ImpIsFrameHandles()) { - ULONG nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz<=nFrameHandlesLimit) { - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedPoints(); bRet=pPts!=NULL && pPts->GetCount()!=0; @@ -104,14 +104,14 @@ BOOL SdrMarkView::HasMarkedPoints() const return bRet; } -ULONG SdrMarkView::GetMarkedPointCount() const +sal_uIntPtr SdrMarkView::GetMarkedPointCount() const { ForceUndirtyMrkPnt(); - ULONG nAnz=0; + sal_uIntPtr nAnz=0; if (!ImpIsFrameHandles()) { - ULONG nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); if (nMarkAnz<=nFrameHandlesLimit) { - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedPoints(); if (pPts!=NULL) nAnz+=pPts->GetCount(); @@ -121,33 +121,33 @@ ULONG SdrMarkView::GetMarkedPointCount() const return nAnz; } -BOOL SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const +sal_Bool SdrMarkView::IsPointMarkable(const SdrHdl& rHdl) const { return !ImpIsFrameHandles() && &rHdl!=NULL && !rHdl.IsPlusHdl() && rHdl.GetKind()!=HDL_GLUE && rHdl.GetKind()!=HDL_SMARTTAG && rHdl.GetObj()!=NULL && rHdl.GetObj()->IsPolyObj(); } -BOOL SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark) +sal_Bool SdrMarkView::MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark) { return ImpMarkPoint( pHdl, pMark, bUnmark ); } -BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark) +sal_Bool SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, sal_Bool bUnmark) { if (pHdl==NULL || pHdl->IsPlusHdl() || pHdl->GetKind()==HDL_GLUE) - return FALSE; + return sal_False; if (pHdl->IsSelected() != bUnmark) - return FALSE; + return sal_False; SdrObject* pObj=pHdl->GetObj(); if (pObj==NULL || !pObj->IsPolyObj()) - return FALSE; + return sal_False; if (pMark==NULL) { - ULONG nMarkNum=TryToFindMarkedObject(pObj); + sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj); if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) - return FALSE; + return sal_False; pMark=GetSdrMarkByIndex(nMarkNum); } const sal_uInt32 nHdlNum(pHdl->GetObjHdlNum()); @@ -158,14 +158,14 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark) } else { - ULONG nBla=pPts->GetPos((sal_uInt16)nHdlNum); + sal_uIntPtr nBla=pPts->GetPos((sal_uInt16)nHdlNum); if (nBla!=CONTAINER_ENTRY_NOTFOUND) { pPts->Remove(nBla); } else { - return FALSE; // Fehlerfall! + return sal_False; // Fehlerfall! } } @@ -182,14 +182,14 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark) { pPlusHdl->SetObj(pObj); pPlusHdl->SetPageView(pMark->GetPageView()); - pPlusHdl->SetPlusHdl(TRUE); + pPlusHdl->SetPlusHdl(sal_True); aHdl.AddHdl(pPlusHdl); } } } else { - for (ULONG i = aHdl.GetHdlCount(); i>0;) + for (sal_uIntPtr i = aHdl.GetHdlCount(); i>0;) { i--; SdrHdl* pPlusHdl=aHdl.GetHdl(i); @@ -205,18 +205,18 @@ BOOL SdrMarkView::ImpMarkPoint(SdrHdl* pHdl, SdrMark* pMark, BOOL bUnmark) // #97016# II: Sort handles. This was missing in ImpMarkPoint all the time. aHdl.Sort(); - return TRUE; + return sal_True; } -BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark) +sal_Bool SdrMarkView::MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark) { - if (&rHdl==NULL) return FALSE; + if (&rHdl==NULL) return sal_False; ForceUndirtyMrkPnt(); - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; const SdrObject* pObj=rHdl.GetObj(); if (IsPointMarkable(rHdl) && rHdl.IsSelected()==bUnmark) { - ULONG nMarkNum=TryToFindMarkedObject(pObj); + sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj); if (nMarkNum!=CONTAINER_ENTRY_NOTFOUND) { SdrMark* pM=GetSdrMarkByIndex(nMarkNum); SdrUShortCont* pPts=pM->ForceMarkedPoints(); @@ -224,7 +224,7 @@ BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark) if (ImpMarkPoint(&rHdl,pM,bUnmark)) { pPts->ForceSort(); MarkListHasChanged(); - bRet=TRUE; + bRet=sal_True; } } } @@ -232,18 +232,18 @@ BOOL SdrMarkView::MarkPoint(SdrHdl& rHdl, BOOL bUnmark) return bRet; } -BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark) +sal_Bool SdrMarkView::MarkPoints(const Rectangle* pRect, sal_Bool bUnmark) { ForceUndirtyMrkPnt(); - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; SortMarkedObjects(); const SdrObject* pObj0=NULL; const SdrPageView* pPV0=NULL; SdrMark* pM=NULL; aHdl.Sort(); //HMHBOOL bHideHdl=IsMarkHdlShown() && IsSolidMarkHdl() && !bPlusHdlAlways; - ULONG nHdlAnz=aHdl.GetHdlCount(); - for (ULONG nHdlNum=nHdlAnz; nHdlNum>0;) { + sal_uIntPtr nHdlAnz=aHdl.GetHdlCount(); + for (sal_uIntPtr nHdlNum=nHdlAnz; nHdlNum>0;) { nHdlNum--; SdrHdl* pHdl=aHdl.GetHdl(nHdlNum); if (IsPointMarkable(*pHdl) && pHdl->IsSelected()==bUnmark) { @@ -254,7 +254,7 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark) SdrUShortCont* pPts=pM->GetMarkedPoints(); if (pPts!=NULL) pPts->ForceSort(); } - ULONG nMarkNum=TryToFindMarkedObject(pObj); // damit ImpMarkPoint() nicht staendig das + sal_uIntPtr nMarkNum=TryToFindMarkedObject(pObj); // damit ImpMarkPoint() nicht staendig das if (nMarkNum!=CONTAINER_ENTRY_NOTFOUND) { // Objekt in der MarkList suchen muss. pM=GetSdrMarkByIndex(nMarkNum); pObj0=pObj; @@ -276,7 +276,7 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark) //HMHsal_uInt32 nAnz=pHdl->GetObj()->GetPlusHdlCount(*pHdl); //HMHif (nAnz!=0L) HideMarkHdl(); // #36987# //HMH} - if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=TRUE; + if (ImpMarkPoint(pHdl,pM,bUnmark)) bChgd=sal_True; } } } @@ -292,10 +292,10 @@ BOOL SdrMarkView::MarkPoints(const Rectangle* pRect, BOOL bUnmark) return bChgd; } -BOOL SdrMarkView::MarkNextPoint(BOOL /*bPrev*/) +sal_Bool SdrMarkView::MarkNextPoint(sal_Bool /*bPrev*/) { ForceUndirtyMrkPnt(); - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; SortMarkedObjects(); // ... if (bChgd) { @@ -304,10 +304,10 @@ BOOL SdrMarkView::MarkNextPoint(BOOL /*bPrev*/) return bChgd; } -BOOL SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, BOOL /*bPrev*/) +sal_Bool SdrMarkView::MarkNextPoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/) { ForceUndirtyMrkPnt(); - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; SortMarkedObjects(); // ... if (bChgd) { @@ -323,7 +323,7 @@ const Rectangle& SdrMarkView::GetMarkedPointsRect() const return aMarkedPointsRect; } -void SdrMarkView::SetPlusHandlesAlwaysVisible(BOOL bOn) +void SdrMarkView::SetPlusHandlesAlwaysVisible(sal_Bool bOn) { // HandlePaint optimieren !!!!!!! ForceUndirtyMrkPnt(); if (bOn!=bPlusHdlAlways) { @@ -344,8 +344,8 @@ void SdrMarkView::ImpSetPointsRects() const { Rectangle aPnts; Rectangle aGlue; - ULONG nHdlAnz=aHdl.GetHdlCount(); - for (ULONG nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) { + sal_uIntPtr nHdlAnz=aHdl.GetHdlCount(); + for (sal_uIntPtr nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) { const SdrHdl* pHdl=aHdl.GetHdl(nHdlNum); SdrHdlKind eKind=pHdl->GetKind(); if ((eKind==HDL_POLY && pHdl->IsSelected()) || eKind==HDL_GLUE) { @@ -363,7 +363,7 @@ void SdrMarkView::ImpSetPointsRects() const } ((SdrMarkView*)this)->aMarkedPointsRect=aPnts; ((SdrMarkView*)this)->aMarkedGluePointsRect=aGlue; - ((SdrMarkView*)this)->bMarkedPointsRectsDirty=FALSE; + ((SdrMarkView*)this)->bMarkedPointsRectsDirty=sal_False; } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -372,9 +372,9 @@ void SdrMarkView::ImpSetPointsRects() const void SdrMarkView::UndirtyMrkPnt() const { - BOOL bChg=FALSE; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + sal_Bool bChg=sal_False; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); // PolyPoints @@ -396,7 +396,7 @@ void SdrMarkView::UndirtyMrkPnt() const if(nPtNum >= nMax) { pPts->Remove(nIndex); - bChg = TRUE; + bChg = sal_True; } } } @@ -406,7 +406,7 @@ void SdrMarkView::UndirtyMrkPnt() const if(pPts && pPts->GetCount()) { pPts->Clear(); - bChg = TRUE; + bChg = sal_True; } } } @@ -420,37 +420,37 @@ void SdrMarkView::UndirtyMrkPnt() const // Eintraege (Id's) die nicht in der GluePointList des // Objekts enthalten sind pPts->ForceSort(); - for (ULONG nIndex=pPts->GetCount(); nIndex>0;) { + for (sal_uIntPtr nIndex=pPts->GetCount(); nIndex>0;) { nIndex--; - USHORT nId=pPts->GetObject(nIndex); + sal_uInt16 nId=pPts->GetObject(nIndex); if (pGPL->FindGluePoint(nId)==SDRGLUEPOINT_NOTFOUND) { pPts->Remove(nIndex); - bChg=TRUE; + bChg=sal_True; } } } else { if (pPts!=NULL && pPts->GetCount()!=0) { pPts->Clear(); // Objekt hat keine Klebepunkte (mehr) - bChg=TRUE; + bChg=sal_True; } } } } - if (bChg) ((SdrMarkView*)this)->bMarkedPointsRectsDirty=TRUE; - ((SdrMarkView*)this)->bMrkPntDirty=FALSE; + if (bChg) ((SdrMarkView*)this)->bMarkedPointsRectsDirty=sal_True; + ((SdrMarkView*)this)->bMrkPntDirty=sal_False; } //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrMarkView::HasMarkableGluePoints() const +sal_Bool SdrMarkView::HasMarkableGluePoints() const { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; if (IsGluePointEditMode()) { ForceUndirtyMrkPnt(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); @@ -462,7 +462,7 @@ BOOL SdrMarkView::HasMarkableGluePoints() const { if((*pGPL)[a].IsUserDefined()) { - bRet = TRUE; + bRet = sal_True; } } } @@ -471,13 +471,13 @@ BOOL SdrMarkView::HasMarkableGluePoints() const return bRet; } -ULONG SdrMarkView::GetMarkableGluePointCount() const +sal_uIntPtr SdrMarkView::GetMarkableGluePointCount() const { - ULONG nAnz=0; + sal_uIntPtr nAnz=0; if (IsGluePointEditMode()) { ForceUndirtyMrkPnt(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); @@ -498,12 +498,12 @@ ULONG SdrMarkView::GetMarkableGluePointCount() const return nAnz; } -BOOL SdrMarkView::HasMarkedGluePoints() const +sal_Bool SdrMarkView::HasMarkedGluePoints() const { ForceUndirtyMrkPnt(); - BOOL bRet=FALSE; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { + sal_Bool bRet=sal_False; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz && !bRet; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); bRet=pPts!=NULL && pPts->GetCount()!=0; @@ -511,12 +511,12 @@ BOOL SdrMarkView::HasMarkedGluePoints() const return bRet; } -ULONG SdrMarkView::GetMarkedGluePointCount() const +sal_uIntPtr SdrMarkView::GetMarkedGluePointCount() const { ForceUndirtyMrkPnt(); - ULONG nAnz=0; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + sal_uIntPtr nAnz=0; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { const SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); if (pPts!=NULL) nAnz+=pPts->GetCount(); @@ -524,14 +524,14 @@ ULONG SdrMarkView::GetMarkedGluePointCount() const return nAnz; } -BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark) +sal_Bool SdrMarkView::MarkGluePoints(const Rectangle* pRect, sal_Bool bUnmark) { - if (!IsGluePointEditMode() && !bUnmark) return FALSE; + if (!IsGluePointEditMode() && !bUnmark) return sal_False; ForceUndirtyMrkPnt(); - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; SortMarkedObjects(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nMarkNum=0; nMarkNum<nMarkAnz; nMarkNum++) { SdrMark* pM=GetSdrMarkByIndex(nMarkNum); const SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); @@ -539,12 +539,12 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark) if (bUnmark && pRect==NULL) { // UnmarkAll if (pPts!=NULL && pPts->GetCount()!=0) { pPts->Clear(); - bChgd=TRUE; + bChgd=sal_True; } } else { if (pGPL!=NULL && (pPts!=NULL || !bUnmark)) { - USHORT nGPAnz=pGPL->GetCount(); - for (USHORT nGPNum=0; nGPNum<nGPAnz; nGPNum++) { + sal_uInt16 nGPAnz=pGPL->GetCount(); + for (sal_uInt16 nGPNum=0; nGPNum<nGPAnz; nGPNum++) { const SdrGluePoint& rGP=(*pGPL)[nGPNum]; // #i38892# @@ -554,13 +554,13 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark) if (pRect==NULL || pRect->IsInside(aPos)) { if (pPts==NULL) pPts=pM->ForceMarkedGluePoints(); else pPts->ForceSort(); - ULONG nPos=pPts->GetPos(rGP.GetId()); + sal_uIntPtr nPos=pPts->GetPos(rGP.GetId()); if (!bUnmark && nPos==CONTAINER_ENTRY_NOTFOUND) { - bChgd=TRUE; + bChgd=sal_True; pPts->Insert(rGP.GetId()); } if (bUnmark && nPos!=CONTAINER_ENTRY_NOTFOUND) { - bChgd=TRUE; + bChgd=sal_True; pPts->Remove(nPos); } } @@ -576,24 +576,24 @@ BOOL SdrMarkView::MarkGluePoints(const Rectangle* pRect, BOOL bUnmark) return bChgd; } -BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rnId, SdrPageView*& rpPV, ULONG nOptions) const +sal_Bool SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, sal_uInt16& rnId, SdrPageView*& rpPV, sal_uIntPtr nOptions) const { SdrObject* pObj0=rpObj; //SdrPageView* pPV0=rpPV; - USHORT nId0=rnId; + sal_uInt16 nId0=rnId; rpObj=NULL; rpPV=NULL; rnId=0; - if (!IsGluePointEditMode()) return FALSE; - BOOL bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; - BOOL bNext=(nOptions & SDRSEARCH_NEXT) !=0; + if (!IsGluePointEditMode()) return sal_False; + sal_Bool bBack=(nOptions & SDRSEARCH_BACKWARD) !=0; + sal_Bool bNext=(nOptions & SDRSEARCH_NEXT) !=0; OutputDevice* pOut=(OutputDevice*)pActualOutDev; if (pOut==NULL) pOut=GetFirstOutputDevice(); //GetWin(0); - if (pOut==NULL) return FALSE; + if (pOut==NULL) return sal_False; SortMarkedObjects(); - ULONG nMarkAnz=GetMarkedObjectCount(); - ULONG nMarkNum=bBack ? 0 : nMarkAnz; + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkNum=bBack ? 0 : nMarkAnz; if (bNext) { nMarkNum=((SdrMarkView*)this)->TryToFindMarkedObject(pObj0); - if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return FALSE; + if (nMarkNum==CONTAINER_ENTRY_NOTFOUND) return sal_False; if (!bBack) nMarkNum++; } while (bBack ? nMarkNum<nMarkAnz : nMarkNum>0) { @@ -603,7 +603,7 @@ BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rn SdrPageView* pPV=pM->GetPageView(); const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (pGPL!=NULL) { - USHORT nNum=pGPL->HitTest(rPnt,*pOut,pObj,bBack,bNext,nId0); + sal_uInt16 nNum=pGPL->HitTest(rPnt,*pOut,pObj,bBack,bNext,nId0); if (nNum!=SDRGLUEPOINT_NOTFOUND) { // #i38892# @@ -614,34 +614,34 @@ BOOL SdrMarkView::PickGluePoint(const Point& rPnt, SdrObject*& rpObj, USHORT& rn rpObj=pObj; rnId=(*pGPL)[nNum].GetId(); rpPV=pPV; - return TRUE; + return sal_True; } } } - bNext=FALSE; // HitNextGluePoint nur beim ersten Obj + bNext=sal_False; // HitNextGluePoint nur beim ersten Obj if (bBack) nMarkNum++; } - return FALSE; + return sal_False; } -BOOL SdrMarkView::MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPageView* /*pPV*/, BOOL bUnmark) +sal_Bool SdrMarkView::MarkGluePoint(const SdrObject* pObj, sal_uInt16 nId, const SdrPageView* /*pPV*/, sal_Bool bUnmark) { - if (!IsGluePointEditMode()) return FALSE; + if (!IsGluePointEditMode()) return sal_False; ForceUndirtyMrkPnt(); - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; if (pObj!=NULL) { - ULONG nMarkPos=TryToFindMarkedObject(pObj); + sal_uIntPtr nMarkPos=TryToFindMarkedObject(pObj); if (nMarkPos!=CONTAINER_ENTRY_NOTFOUND) { SdrMark* pM=GetSdrMarkByIndex(nMarkPos); SdrUShortCont* pPts=bUnmark ? pM->GetMarkedGluePoints() : pM->ForceMarkedGluePoints(); if (pPts!=NULL) { - ULONG nPointPos=pPts->GetPos(nId); + sal_uIntPtr nPointPos=pPts->GetPos(nId); if (!bUnmark && nPointPos==CONTAINER_ENTRY_NOTFOUND) { - bChgd=TRUE; + bChgd=sal_True; pPts->Insert(nId); } if (bUnmark && nPointPos!=CONTAINER_ENTRY_NOTFOUND) { - bChgd=TRUE; + bChgd=sal_True; pPts->Remove(nPointPos); } } @@ -657,11 +657,11 @@ BOOL SdrMarkView::MarkGluePoint(const SdrObject* pObj, USHORT nId, const SdrPage return bChgd; } -BOOL SdrMarkView::IsGluePointMarked(const SdrObject* pObj, USHORT nId) const +sal_Bool SdrMarkView::IsGluePointMarked(const SdrObject* pObj, sal_uInt16 nId) const { ForceUndirtyMrkPnt(); - BOOL bRet=FALSE; - ULONG nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting auf NonConst + sal_Bool bRet=sal_False; + sal_uIntPtr nPos=((SdrMarkView*)this)->TryToFindMarkedObject(pObj); // casting auf NonConst if (nPos!=CONTAINER_ENTRY_NOTFOUND) { const SdrMark* pM=GetSdrMarkByIndex(nPos); const SdrUShortCont* pPts=pM->GetMarkedGluePoints(); @@ -672,18 +672,18 @@ BOOL SdrMarkView::IsGluePointMarked(const SdrObject* pObj, USHORT nId) const return bRet; } -BOOL SdrMarkView::UnmarkGluePoint(const SdrHdl& rHdl) +sal_Bool SdrMarkView::UnmarkGluePoint(const SdrHdl& rHdl) { if (&rHdl!=NULL && rHdl.GetKind()==HDL_GLUE && rHdl.GetObj()!=NULL) { - return MarkGluePoint(rHdl.GetObj(),(sal_uInt16)rHdl.GetObjHdlNum(),rHdl.GetPageView(),TRUE); - } else return FALSE; + return MarkGluePoint(rHdl.GetObj(),(sal_uInt16)rHdl.GetObjHdlNum(),rHdl.GetPageView(),sal_True); + } else return sal_False; } -SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, USHORT nId) const +SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const { ForceUndirtyMrkPnt(); - ULONG nHdlAnz=aHdl.GetHdlCount(); - for (ULONG nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) { + sal_uIntPtr nHdlAnz=aHdl.GetHdlCount(); + for (sal_uIntPtr nHdlNum=0; nHdlNum<nHdlAnz; nHdlNum++) { SdrHdl* pHdl=aHdl.GetHdl(nHdlNum); if (pHdl->GetObj()==pObj && pHdl->GetKind()==HDL_GLUE && @@ -692,10 +692,10 @@ SdrHdl* SdrMarkView::GetGluePointHdl(const SdrObject* pObj, USHORT nId) const return NULL; } -BOOL SdrMarkView::MarkNextGluePoint(BOOL /*bPrev*/) +sal_Bool SdrMarkView::MarkNextGluePoint(sal_Bool /*bPrev*/) { ForceUndirtyMrkPnt(); - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; SortMarkedObjects(); // ... if (bChgd) { @@ -704,10 +704,10 @@ BOOL SdrMarkView::MarkNextGluePoint(BOOL /*bPrev*/) return bChgd; } -BOOL SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, BOOL /*bPrev*/) +sal_Bool SdrMarkView::MarkNextGluePoint(const Point& /*rPnt*/, sal_Bool /*bPrev*/) { ForceUndirtyMrkPnt(); - BOOL bChgd=FALSE; + sal_Bool bChgd=sal_False; SortMarkedObjects(); // ... if (bChgd) { diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index f8d47926c6..76f43df2b7 100644..100755 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/svdoashp.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/unoshape.hxx> #include <ucbhelper/content.hxx> #include <ucbhelper/contentbroker.hxx> @@ -53,22 +53,22 @@ #include <svx/xpoly.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdobj.hxx> #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> #include <svx/svdattrx.hxx> // NotPersistItems #include <svx/svdoedge.hxx> // #32383# Die Verbinder nach Move nochmal anbroadcasten -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <editeng/eeitem.hxx> #include "editeng/editstat.hxx" #include <svx/svdoutl.hxx> #include <editeng/outlobj.hxx> #include <svx/sdtfchim.hxx> -#include "../customshapes/EnhancedCustomShapeGeometry.hxx" -#include "../customshapes/EnhancedCustomShapeTypeNames.hxx" -#include "../customshapes/EnhancedCustomShape2d.hxx" +#include "../svx/EnhancedCustomShapeGeometry.hxx" +#include "../svx/EnhancedCustomShapeTypeNames.hxx" +#include "../svx/EnhancedCustomShape2d.hxx" #include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> @@ -631,7 +631,7 @@ SdrObjCustomShape::SdrObjCustomShape() : fObjectRotation( 0.0 ), mpLastShadowGeometry(0L) { - bTextFrame = TRUE; + bTextFrame = sal_True; } SdrObjCustomShape::~SdrObjCustomShape() @@ -1622,17 +1622,17 @@ sal_Bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) void SdrObjCustomShape::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { rInfo.bResizeFreeAllowed=fObjectRotation == 0.0; - rInfo.bResizePropAllowed=TRUE; - rInfo.bRotateFreeAllowed=TRUE; - rInfo.bRotate90Allowed =TRUE; - rInfo.bMirrorFreeAllowed=TRUE; - rInfo.bMirror45Allowed =TRUE; - rInfo.bMirror90Allowed =TRUE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =TRUE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bNoContortion =TRUE; + rInfo.bResizePropAllowed=sal_True; + rInfo.bRotateFreeAllowed=sal_True; + rInfo.bRotate90Allowed =sal_True; + rInfo.bMirrorFreeAllowed=sal_True; + rInfo.bMirror45Allowed =sal_True; + rInfo.bMirror90Allowed =sal_True; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_True; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bNoContortion =sal_True; // #i37011# if ( mXRenderedCustomShape.is() ) @@ -1679,9 +1679,9 @@ void SdrObjCustomShape::SetModel(SdrModel* pNewModel) mXRenderedCustomShape.clear(); } -UINT16 SdrObjCustomShape::GetObjIdentifier() const +sal_uInt16 SdrObjCustomShape::GetObjIdentifier() const { - return UINT16(OBJ_CUSTOMSHAPE); + return sal_uInt16(OBJ_CUSTOMSHAPE); } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1997,9 +1997,9 @@ void SdrObjCustomShape::NbcShear( const Point& rRef, long nWink, double tn, bool //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(USHORT nPosNum) const +SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(sal_uInt16 nPosNum) const { - INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue(); + sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue(); // #i25616# if(!LineIsOutsideGeometry()) @@ -2019,7 +2019,7 @@ SdrGluePoint SdrObjCustomShape::GetVertexGluePoint(USHORT nPosNum) const if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos); aPt-=GetSnapRect().Center(); SdrGluePoint aGP(aPt); - aGP.SetPercent(FALSE); + aGP.SetPercent(sal_False); return aGP; } @@ -2051,7 +2051,7 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded() for(a = 0; a < pSource->GetCount(); a++) { SdrGluePoint aCopy((*pSource)[a]); - aCopy.SetUserDefined(FALSE); + aCopy.SetUserDefined(sal_False); aNewList.Insert(aCopy); } @@ -2066,9 +2066,9 @@ void SdrObjCustomShape::ImpCheckCustomGluePointsAreAdded() Polygon aPoly( aRect ); if( nShearWink ) { - USHORT nPointCount=aPoly.GetSize(); - for (USHORT i=0; i<nPointCount; i++) - ShearPoint(aPoly[i],aRect.Center(), fTan, FALSE ); + sal_uInt16 nPointCount=aPoly.GetSize(); + for (sal_uInt16 i=0; i<nPointCount; i++) + ShearPoint(aPoly[i],aRect.Center(), fTan, sal_False ); } if ( aGeo.nDrehWink ) aPoly.Rotate( aRect.Center(), aGeo.nDrehWink / 10 ); @@ -2463,7 +2463,7 @@ void SdrObjCustomShape::DragCreateObject( SdrDragStat& rStat ) } SetBoundRectDirty(); - bSnapRectDirty=TRUE; + bSnapRectDirty=sal_True; } bool SdrObjCustomShape::BegCreate( SdrDragStat& rDrag ) @@ -2480,7 +2480,7 @@ bool SdrObjCustomShape::MovCreate(SdrDragStat& rStat) } DragCreateObject( rStat ); SetRectsDirty(); - return TRUE; + return sal_True; } bool SdrObjCustomShape::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) @@ -2526,7 +2526,7 @@ bool SdrObjCustomShape::IsAutoGrowHeight() const const SfxItemSet& rSet = GetMergedItemSet(); bool bIsAutoGrowHeight = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); if ( bIsAutoGrowHeight && IsVerticalWriting() ) - bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == FALSE; + bIsAutoGrowHeight = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False; return bIsAutoGrowHeight; } bool SdrObjCustomShape::IsAutoGrowWidth() const @@ -2534,7 +2534,7 @@ bool SdrObjCustomShape::IsAutoGrowWidth() const const SfxItemSet& rSet = GetMergedItemSet(); bool bIsAutoGrowWidth = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); if ( bIsAutoGrowWidth && !IsVerticalWriting() ) - bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == FALSE; + bIsAutoGrowWidth = ((SdrTextWordWrapItem&)(rSet.Get(SDRATTR_TEXT_WORDWRAP))).GetValue() == sal_False; return bIsAutoGrowWidth; } @@ -2658,7 +2658,7 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, { Outliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetPaperSize(aSiz); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); // !!! hier sollte ich wohl auch noch mal die Optimierung mit // bPortionInfoChecked usw einbauen OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); @@ -2695,9 +2695,9 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, long nWdtGrow = nWdt-(rR.Right()-rR.Left()); long nHgtGrow = nHgt-(rR.Bottom()-rR.Top()); if ( nWdtGrow == 0 ) - bWdtGrow = FALSE; + bWdtGrow = sal_False; if ( nHgtGrow == 0 ) - bHgtGrow=FALSE; + bHgtGrow=sal_False; if ( bWdtGrow || bHgtGrow ) { if ( bWdtGrow ) @@ -2737,11 +2737,11 @@ bool SdrObjCustomShape::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, aD2-=aD1; rR.Move(aD2.X(),aD2.Y()); } - return TRUE; + return sal_True; } } } - return FALSE; + return sal_False; } Rectangle SdrObjCustomShape::ImpCalculateTextFrame( const bool bHgt, const bool bWdt ) @@ -2968,13 +2968,13 @@ void SdrObjCustomShape::TakeTextAnchorRect( Rectangle& rAnchorRect ) const SdrTextObj::TakeTextAnchorRect( rAnchorRect ); } void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, - Rectangle* pAnchorRect, BOOL /*bLineWidth*/) const + Rectangle* pAnchorRect, sal_Bool /*bLineWidth*/) const { Rectangle aAnkRect; // Rect innerhalb dem geankert wird TakeTextAnchorRect(aAnkRect); SdrTextVertAdjust eVAdj=GetTextVerticalAdjust(); SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust(); - ULONG nStat0=rOutliner.GetControlWord(); + sal_uIntPtr nStat0=rOutliner.GetControlWord(); Size aNullSize; rOutliner.SetControlWord(nStat0|EE_CNTRL_AUTOPAGESIZE); @@ -3011,7 +3011,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe if (pPara) { - BOOL bHitTest = FALSE; + sal_Bool bHitTest = sal_False; if( pModel ) bHitTest = &pModel->GetHitTestOutliner() == &rOutliner; @@ -3022,7 +3022,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe if( bHitTest ) rOutliner.SetTextObj( this ); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetText(*pPara); } } @@ -3033,7 +3033,7 @@ void SdrObjCustomShape::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRe if (pEdtOutl && !bNoEditText && pPara) delete pPara; - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetControlWord(nStat0); SdrText* pText = getActiveText(); @@ -3103,7 +3103,7 @@ void SdrObjCustomShape::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject { SdrTextObj::NbcSetOutlinerParaObject( pTextObject ); SetBoundRectDirty(); - SetRectsDirty(TRUE); + SetRectsDirty(sal_True); InvalidateRenderGeometry(); } @@ -3147,7 +3147,7 @@ basegfx::B2DPolyPolygon SdrObjCustomShape::TakeContour() const return basegfx::B2DPolyPolygon(); } -SdrObject* SdrObjCustomShape::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrObjCustomShape::DoConvertToPolyObj(sal_Bool bBezier) const { // #i37011# SdrObject* pRetval = 0L; @@ -3318,7 +3318,7 @@ void SdrObjCustomShape::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, GeoStat aGeoStat; aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0); aGeoStat.RecalcTan(); - Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, FALSE); + Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False); } // rotation? @@ -3366,8 +3366,8 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() ); Point aRef2( aRef1.X(), aRef1.Y() + 1000 ); - USHORT i; - USHORT nPntAnz=aPol.GetSize(); + sal_uInt16 i; + sal_uInt16 nPntAnz=aPol.GetSize(); for (i=0; i<nPntAnz; i++) { MirrorPoint(aPol[i],aRef1,aRef2); @@ -3388,8 +3388,8 @@ sal_Bool SdrObjCustomShape::TRGetBaseGeometry(basegfx::B2DHomMatrix& rMatrix, ba Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 ); Point aRef2( aRef1.X() + 1000, aRef1.Y() ); - USHORT i; - USHORT nPntAnz=aPol.GetSize(); + sal_uInt16 i; + sal_uInt16 nPntAnz=aPol.GetSize(); for (i=0; i<nPntAnz; i++) { MirrorPoint(aPol[i],aRef1,aRef2); diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index d692ffe9ce..39e00397a7 100644..100755 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -31,7 +31,7 @@ #include <svx/svdoattr.hxx> #include <svx/xpool.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdattr.hxx> @@ -140,7 +140,7 @@ void SdrAttrObj::SetModel(SdrModel* pNewModel) void SdrAttrObj::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint) { SfxSimpleHint *pSimple = PTR_CAST(SfxSimpleHint, &rHint); - BOOL bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId()); + sal_Bool bDataChg(pSimple && SFX_HINT_DATACHANGED == pSimple->GetId()); if(bDataChg) { @@ -167,12 +167,12 @@ sal_Int32 SdrAttrObj::ImpGetLineWdt() const return nRetval; } -BOOL SdrAttrObj::HasFill() const +sal_Bool SdrAttrObj::HasFill() const { return bClosedObj && ((XFillStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_FILLSTYLE))).GetValue()!=XFILL_NONE; } -BOOL SdrAttrObj::HasLine() const +sal_Bool SdrAttrObj::HasLine() const { return ((XLineStyleItem&)(GetProperties().GetObjectItemSet().Get(XATTR_LINESTYLE))).GetValue()!=XLINE_NONE; } diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 06f1ad999e..f183e53e74 100644..100755 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -48,8 +48,8 @@ #include <svx/svdpage.hxx> #include <svx/svdovirt.hxx> // Fuer Add/Del Ref #include <svx/svdview.hxx> // fuer Dragging (Ortho abfragen) -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include <svx/svdstr.hrc> // Objektname #include <svx/svdogrp.hxx> // Factory #include <svx/svdopath.hxx> // Factory #include <svx/svdoedge.hxx> // Factory @@ -75,7 +75,7 @@ #include <svx/xlndsit.hxx> #include <svx/xlnclit.hxx> #include <svx/xflclit.hxx> -#include "svditer.hxx" +#include <svx/svditer.hxx> #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> #include <svx/xfltrit.hxx> @@ -151,12 +151,12 @@ void SdrObjUserData::operator=(const SdrObjUserData& /*rData*/) // nicht impl sal_Bool SdrObjUserData::operator==(const SdrObjUserData& /*rData*/) const // nicht implementiert { - return FALSE; + return sal_False; } sal_Bool SdrObjUserData::operator!=(const SdrObjUserData& /*rData*/) const // nicht implementiert { - return FALSE; + return sal_False; } SdrObjUserData::~SdrObjUserData() @@ -165,7 +165,7 @@ SdrObjUserData::~SdrObjUserData() bool SdrObjUserData::HasMacro(const SdrObject* /*pObj*/) const { - return FALSE; + return sal_False; } SdrObject* SdrObjUserData::CheckMacroHit(const SdrObjMacroHitRec& rRec, const SdrObject* pObj) const @@ -209,7 +209,7 @@ void SdrObjUserData::PaintMacro(OutputDevice& rOut, const Rectangle& /*rDirtyRec bool SdrObjUserData::DoMacro(const SdrObjMacroHitRec& /*rRec*/, SdrObject* /*pObj*/) { - return FALSE; + return sal_False; } XubString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/, const SdrObject* /*pObj*/) const @@ -219,8 +219,8 @@ XubString SdrObjUserData::GetMacroPopupComment(const SdrObjMacroHitRec& /*rRec*/ void SdrObjUserDataList::Clear() { - USHORT nAnz=GetUserDataCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=GetUserDataCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { delete GetUserData(i); } aList.Clear(); @@ -232,10 +232,10 @@ DBG_NAME(SdrObjGeoData); SdrObjGeoData::SdrObjGeoData(): pGPL(NULL), - bMovProt(FALSE), - bSizProt(FALSE), - bNoPrint(FALSE), - bClosedObj(FALSE), + bMovProt(sal_False), + bSizProt(sal_False), + bNoPrint(sal_False), + bClosedObj(sal_False), mbVisible(true), mnLayerID(0) { @@ -272,10 +272,10 @@ SdrObjPlusData* SdrObjPlusData::Clone(SdrObject* pObj1) const { SdrObjPlusData* pNeuPlusData=new SdrObjPlusData; if (pUserDataList!=NULL) { - USHORT nAnz=pUserDataList->GetUserDataCount(); + sal_uInt16 nAnz=pUserDataList->GetUserDataCount(); if (nAnz!=0) { pNeuPlusData->pUserDataList=new SdrObjUserDataList; - for (USHORT i=0; i<nAnz; i++) { + for (sal_uInt16 i=0; i<nAnz; i++) { SdrObjUserData* pNeuUserData=pUserDataList->GetUserData(i)->Clone(pObj1); if (pNeuUserData!=NULL) { pNeuPlusData->pUserDataList->InsertUserData(pNeuUserData); @@ -405,17 +405,17 @@ SdrObject::SdrObject() ,maWeakUnoShape() { DBG_CTOR(SdrObject,NULL); - bVirtObj =FALSE; - bSnapRectDirty =TRUE; - bNetLock =FALSE; - bInserted =FALSE; - bGrouped =FALSE; - bMovProt =FALSE; - bSizProt =FALSE; - bNoPrint =FALSE; - bEmptyPresObj =FALSE; - bNotVisibleAsMaster=FALSE; - bClosedObj =FALSE; + bVirtObj =sal_False; + bSnapRectDirty =sal_True; + bNetLock =sal_False; + bInserted =sal_False; + bGrouped =sal_False; + bMovProt =sal_False; + bSizProt =sal_False; + bNoPrint =sal_False; + bEmptyPresObj =sal_False; + bNotVisibleAsMaster=sal_False; + bClosedObj =sal_False; mbVisible = true; // #i25616# @@ -425,13 +425,13 @@ SdrObject::SdrObject() mbSupportTextIndentingOnLineWidthChange = sal_False; //#110094#-1 - //bWriterFlyFrame =FALSE; + //bWriterFlyFrame =sal_False; - bNotMasterCachable=FALSE; - bIsEdge=FALSE; - bIs3DObj=FALSE; - bMarkProt=FALSE; - bIsUnoObj=FALSE; + bNotMasterCachable=sal_False; + bIsEdge=sal_False; + bIs3DObj=sal_False; + bMarkProt=sal_False; + bIsUnoObj=sal_False; } SdrObject::~SdrObject() @@ -507,7 +507,7 @@ void SdrObject::SetRectsDirty(sal_Bool bNotMyself) { if (!bNotMyself) { SetBoundRectDirty(); - bSnapRectDirty=TRUE; + bSnapRectDirty=sal_True; } if (pObjList!=NULL) { pObjList->SetRectsDirty(); @@ -587,29 +587,29 @@ SdrItemPool* SdrObject::GetObjectItemPool() const return &SdrObject::GetGlobalDrawObjectItemPool(); } -UINT32 SdrObject::GetObjInventor() const +sal_uInt32 SdrObject::GetObjInventor() const { return SdrInventor; } -UINT16 SdrObject::GetObjIdentifier() const +sal_uInt16 SdrObject::GetObjIdentifier() const { - return UINT16(OBJ_NONE); + return sal_uInt16(OBJ_NONE); } void SdrObject::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bRotateFreeAllowed=FALSE; - rInfo.bMirrorFreeAllowed=FALSE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bCanConvToPath =FALSE; - rInfo.bCanConvToPoly =FALSE; - rInfo.bCanConvToContour = FALSE; - rInfo.bCanConvToPathLineToArea=FALSE; - rInfo.bCanConvToPolyLineToArea=FALSE; + rInfo.bRotateFreeAllowed=sal_False; + rInfo.bMirrorFreeAllowed=sal_False; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bCanConvToPath =sal_False; + rInfo.bCanConvToPoly =sal_False; + rInfo.bCanConvToContour = sal_False; + rInfo.bCanConvToPathLineToArea=sal_False; + rInfo.bCanConvToPolyLineToArea=sal_False; } SdrLayerID SdrObject::GetLayer() const @@ -622,8 +622,8 @@ void SdrObject::getMergedHierarchyLayerSet(SetOfByte& rSet) const rSet.Set(GetLayer()); SdrObjList* pOL=GetSubList(); if (pOL!=NULL) { - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) { pOL->GetObj(nObjNum)->getMergedHierarchyLayerSet(rSet); } } @@ -681,7 +681,7 @@ AutoTimer* SdrObject::ForceAutoTimer() bool SdrObject::HasRefPoint() const { - return FALSE; + return sal_False; } Point SdrObject::GetRefPoint() const @@ -859,7 +859,7 @@ String SdrObject::GetHTMLName() const return String(); } -UINT32 SdrObject::GetOrdNum() const +sal_uInt32 SdrObject::GetOrdNum() const { if (pObjList!=NULL) { if (pObjList->IsObjOrdNumsDirty()) { @@ -932,7 +932,7 @@ void SdrObject::RecalcBoundRect() if(xPrimitives.hasElements()) { // use neutral ViewInformation and get the range of the primitives - const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0); + const drawinglayer::geometry::ViewInformation2D aViewInformation2D; const basegfx::B2DRange aRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xPrimitives, aViewInformation2D)); if(!aRange.isEmpty()) @@ -998,7 +998,7 @@ sal_Bool SdrObject::SingleObjectPainter(OutputDevice& rOut) const return sal_True; } -BOOL SdrObject::LineGeometryUsageIsNecessary() const +sal_Bool SdrObject::LineGeometryUsageIsNecessary() const { XLineStyle eXLS = (XLineStyle)((const XLineStyleItem&)GetMergedItem(XATTR_LINESTYLE)).GetValue(); return (eXLS != XLINE_NONE); @@ -1049,7 +1049,7 @@ void SdrObject::operator=(const SdrObject& rObj) bEmptyPresObj =rObj.bEmptyPresObj; //NotVisibleAsMaster wird nicht kopiert: nun doch! (25-07-1995, Joe) bNotVisibleAsMaster=rObj.bNotVisibleAsMaster; - bSnapRectDirty=TRUE; //rObj.bSnapRectDirty; + bSnapRectDirty=sal_True; //rObj.bSnapRectDirty; bNotMasterCachable=rObj.bNotMasterCachable; if (pPlusData!=NULL) { delete pPlusData; pPlusData=NULL; } if (rObj.pPlusData!=NULL) { @@ -1080,7 +1080,7 @@ void SdrObject::TakeObjNamePlural(XubString& rName) const rName=ImpGetResStr(STR_ObjNamePluralNONE); } -void SdrObject::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT nVal) const +void SdrObject::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 nVal) const { rStr = ImpGetResStr(nStrCacheID); @@ -1160,17 +1160,17 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const { // create connections if connector, will be cleaned up when // deleting the connector again - SdrObject* pLeft = pEdgeObj->GetConnectedNode(TRUE); - SdrObject* pRight = pEdgeObj->GetConnectedNode(FALSE); + SdrObject* pLeft = pEdgeObj->GetConnectedNode(sal_True); + SdrObject* pRight = pEdgeObj->GetConnectedNode(sal_False); if(pLeft) { - pClone->ConnectToNode(TRUE, pLeft); + pClone->ConnectToNode(sal_True, pLeft); } if(pRight) { - pClone->ConnectToNode(FALSE, pRight); + pClone->ConnectToNode(sal_False, pRight); } } @@ -1194,7 +1194,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const if(xSequence.hasElements()) { // use neutral ViewInformation - const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0); + const drawinglayer::geometry::ViewInformation2D aViewInformation2D; // create extractor, process and get result drawinglayer::processor2d::ContourExtractor2D aExtractor(aViewInformation2D); @@ -1400,7 +1400,7 @@ bool SdrObject::BegCreate(SdrDragStat& rStat) aRect1.Justify(); rStat.SetActionRect(aRect1); aOutRect = aRect1; - return TRUE; + return sal_True; } bool SdrObject::MovCreate(SdrDragStat& rStat) @@ -1415,9 +1415,9 @@ bool SdrObject::MovCreate(SdrDragStat& rStat) // cause no further prolems // // SetBoundRectDirty(); - // bSnapRectDirty=TRUE; + // bSnapRectDirty=sal_True; - return TRUE; + return sal_True; } bool SdrObject::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) @@ -1438,7 +1438,7 @@ void SdrObject::BrkCreate(SdrDragStat& /*rStat*/) bool SdrObject::BckCreate(SdrDragStat& /*rStat*/) { - return FALSE; + return sal_False; } basegfx::B2DPolyPolygon SdrObject::TakeCreatePoly(const SdrDragStat& rDrag) const @@ -1488,7 +1488,7 @@ void SdrObject::NbcResize(const Point& rRef, const Fraction& xFact, const Fracti void SdrObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); aOutRect.Move(-rRef.X(),-rRef.Y()); Rectangle R(aOutRect); if (sn==1.0 && cs==0.0) { // 90deg @@ -1511,12 +1511,12 @@ void SdrObject::NbcRotate(const Point& rRef, long nWink, double sn, double cs) aOutRect.Justify(); // Sicherheitshalber SetRectsDirty(); NbcRotateGluePoints(rRef,nWink,sn,cs); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); aOutRect.Move(-rRef1.X(),-rRef1.Y()); Rectangle R(aOutRect); long dx=rRef2.X()-rRef1.X(); @@ -1542,14 +1542,14 @@ void SdrObject::NbcMirror(const Point& rRef1, const Point& rRef2) aOutRect.Justify(); // Sicherheitshalber SetRectsDirty(); NbcMirrorGluePoints(rRef1,rRef2); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } void SdrObject::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); NbcShearGluePoints(rRef,nWink,tn,bVShear); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } void SdrObject::Move(const Size& rSiz) @@ -1758,12 +1758,12 @@ void SdrObject::NbcSetPoint(const Point& /*rPnt*/, sal_uInt32 /*i*/) bool SdrObject::HasTextEdit() const { - return FALSE; + return sal_False; } sal_Bool SdrObject::BegTextEdit(SdrOutliner& /*rOutl*/) { - return FALSE; + return sal_False; } void SdrObject::EndTextEdit(SdrOutliner& /*rOutl*/) @@ -1815,8 +1815,8 @@ void SdrObject::BurnInStyleSheetAttributes() SdrObjUserData* SdrObject::ImpGetMacroUserData() const { SdrObjUserData* pData=NULL; - USHORT nAnz=GetUserDataCount(); - for (USHORT nNum=nAnz; nNum>0 && pData==NULL;) { + sal_uInt16 nAnz=GetUserDataCount(); + for (sal_uInt16 nNum=nAnz; nNum>0 && pData==NULL;) { nNum--; pData=GetUserData(nNum); if (!pData->HasMacro(this)) pData=NULL; @@ -1827,7 +1827,7 @@ SdrObjUserData* SdrObject::ImpGetMacroUserData() const bool SdrObject::HasMacro() const { SdrObjUserData* pData=ImpGetMacroUserData(); - return pData!=NULL ? pData->HasMacro(this) : FALSE; + return pData!=NULL ? pData->HasMacro(this) : sal_False; } SdrObject* SdrObject::CheckMacroHit(const SdrObjMacroHitRec& rRec) const @@ -1889,7 +1889,7 @@ bool SdrObject::DoMacro(const SdrObjMacroHitRec& rRec) if (pData!=NULL) { return pData->DoMacro(rRec,this); } - return FALSE; + return sal_False; } XubString SdrObject::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const @@ -2052,41 +2052,41 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) Point aRef1(rSnap.Center()); Point aRef2(aRef1); aRef2.Y()++; const SfxPoolItem *pPoolItem=NULL; - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1X,sal_True,&pPoolItem)==SFX_ITEM_SET) { aRef1.X()=((const SdrTransformRef1XItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF1Y,sal_True,&pPoolItem)==SFX_ITEM_SET) { aRef1.Y()=((const SdrTransformRef1YItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2X,sal_True,&pPoolItem)==SFX_ITEM_SET) { aRef2.X()=((const SdrTransformRef2XItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_TRANSFORMREF2Y,sal_True,&pPoolItem)==SFX_ITEM_SET) { aRef2.Y()=((const SdrTransformRef2YItem*)pPoolItem)->GetValue(); } Rectangle aNewSnap(rSnap); - if (rAttr.GetItemState(SDRATTR_MOVEX,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_MOVEX,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrMoveXItem*)pPoolItem)->GetValue(); aNewSnap.Move(n,0); } - if (rAttr.GetItemState(SDRATTR_MOVEY,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_MOVEY,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrMoveYItem*)pPoolItem)->GetValue(); aNewSnap.Move(0,n); } - if (rAttr.GetItemState(SDRATTR_ONEPOSITIONX,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ONEPOSITIONX,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrOnePositionXItem*)pPoolItem)->GetValue(); aNewSnap.Move(n-aNewSnap.Left(),0); } - if (rAttr.GetItemState(SDRATTR_ONEPOSITIONY,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ONEPOSITIONY,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrOnePositionYItem*)pPoolItem)->GetValue(); aNewSnap.Move(0,n-aNewSnap.Top()); } - if (rAttr.GetItemState(SDRATTR_ONESIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ONESIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrOneSizeWidthItem*)pPoolItem)->GetValue(); aNewSnap.Right()=aNewSnap.Left()+n; } - if (rAttr.GetItemState(SDRATTR_ONESIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ONESIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrOneSizeHeightItem*)pPoolItem)->GetValue(); aNewSnap.Bottom()=aNewSnap.Top()+n; } @@ -2098,15 +2098,15 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) } } - if (rAttr.GetItemState(SDRATTR_SHEARANGLE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_SHEARANGLE,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrShearAngleItem*)pPoolItem)->GetValue(); n-=GetShearAngle(); if (n!=0) { double nTan=tan(n*nPi180); - NbcShear(aRef1,n,nTan,FALSE); + NbcShear(aRef1,n,nTan,sal_False); } } - if (rAttr.GetItemState(SDRATTR_ROTATEANGLE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ROTATEANGLE,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrRotateAngleItem*)pPoolItem)->GetValue(); n-=GetRotateAngle(); if (n!=0) { @@ -2115,28 +2115,28 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) NbcRotate(aRef1,n,nSin,nCos); } } - if (rAttr.GetItemState(SDRATTR_ROTATEONE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_ROTATEONE,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrRotateOneItem*)pPoolItem)->GetValue(); double nSin=sin(n*nPi180); double nCos=cos(n*nPi180); NbcRotate(aRef1,n,nSin,nCos); } - if (rAttr.GetItemState(SDRATTR_HORZSHEARONE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_HORZSHEARONE,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrHorzShearOneItem*)pPoolItem)->GetValue(); double nTan=tan(n*nPi180); - NbcShear(aRef1,n,nTan,FALSE); + NbcShear(aRef1,n,nTan,sal_False); } - if (rAttr.GetItemState(SDRATTR_VERTSHEARONE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_VERTSHEARONE,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrVertShearOneItem*)pPoolItem)->GetValue(); double nTan=tan(n*nPi180); - NbcShear(aRef1,n,nTan,TRUE); + NbcShear(aRef1,n,nTan,sal_True); } - if (rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,sal_True,&pPoolItem)==SFX_ITEM_SET) { bool b=((const SdrObjMoveProtectItem*)pPoolItem)->GetValue(); SetMoveProtect(b); } - if (rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,sal_True,&pPoolItem)==SFX_ITEM_SET) { bool b=((const SdrObjSizeProtectItem*)pPoolItem)->GetValue(); SetResizeProtect(b); } @@ -2145,25 +2145,25 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) if( IsMoveProtect() ) SetResizeProtect( true ); - if (rAttr.GetItemState(SDRATTR_OBJPRINTABLE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJPRINTABLE,sal_True,&pPoolItem)==SFX_ITEM_SET) { bool b=((const SdrObjPrintableItem*)pPoolItem)->GetValue(); SetPrintable(b); } - if (rAttr.GetItemState(SDRATTR_OBJVISIBLE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJVISIBLE,sal_True,&pPoolItem)==SFX_ITEM_SET) { bool b=((const SdrObjVisibleItem*)pPoolItem)->GetValue(); SetVisible(b); } SdrLayerID nLayer=SDRLAYER_NOTFOUND; - if (rAttr.GetItemState(SDRATTR_LAYERID,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LAYERID,sal_True,&pPoolItem)==SFX_ITEM_SET) { nLayer=((const SdrLayerIdItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_LAYERNAME,TRUE,&pPoolItem)==SFX_ITEM_SET && pModel!=NULL) { + if (rAttr.GetItemState(SDRATTR_LAYERNAME,sal_True,&pPoolItem)==SFX_ITEM_SET && pModel!=NULL) { XubString aLayerName=((const SdrLayerNameItem*)pPoolItem)->GetValue(); const SdrLayerAdmin* pLayAd=pPage!=NULL ? &pPage->GetLayerAdmin() : pModel!=NULL ? &pModel->GetLayerAdmin() : NULL; if (pLayAd!=NULL) { - const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName, TRUE); + const SdrLayer* pLayer=pLayAd->GetLayer(aLayerName, sal_True); if (pLayer!=NULL) { nLayer=pLayer->GetID(); } @@ -2174,16 +2174,16 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) NbcSetLayer(nLayer); } - if (rAttr.GetItemState(SDRATTR_OBJECTNAME,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_OBJECTNAME,sal_True,&pPoolItem)==SFX_ITEM_SET) { XubString aName=((const SdrObjectNameItem*)pPoolItem)->GetValue(); SetName(aName); } Rectangle aNewLogic(rLogic); - if (rAttr.GetItemState(SDRATTR_LOGICSIZEWIDTH,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LOGICSIZEWIDTH,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrLogicSizeWidthItem*)pPoolItem)->GetValue(); aNewLogic.Right()=aNewLogic.Left()+n; } - if (rAttr.GetItemState(SDRATTR_LOGICSIZEHEIGHT,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LOGICSIZEHEIGHT,sal_True,&pPoolItem)==SFX_ITEM_SET) { long n=((const SdrLogicSizeHeightItem*)pPoolItem)->GetValue(); aNewLogic.Bottom()=aNewLogic.Top()+n; } @@ -2192,10 +2192,10 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) } Fraction aResizeX(1,1); Fraction aResizeY(1,1); - if (rAttr.GetItemState(SDRATTR_RESIZEXONE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_RESIZEXONE,sal_True,&pPoolItem)==SFX_ITEM_SET) { aResizeX*=((const SdrResizeXOneItem*)pPoolItem)->GetValue(); } - if (rAttr.GetItemState(SDRATTR_RESIZEYONE,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_RESIZEYONE,sal_True,&pPoolItem)==SFX_ITEM_SET) { aResizeY*=((const SdrResizeYOneItem*)pPoolItem)->GetValue(); } if (aResizeX!=Fraction(1,1) || aResizeY!=Fraction(1,1)) { @@ -2205,7 +2205,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet& rAttr) void lcl_SetItem(SfxItemSet& rAttr, bool bMerge, const SfxPoolItem& rItem) { - if (bMerge) rAttr.MergeValue(rItem,TRUE); + if (bMerge) rAttr.MergeValue(rItem,sal_True); else rAttr.Put(rItem); } @@ -2288,7 +2288,7 @@ bool SdrObject::IsNode() const return true; } -SdrGluePoint SdrObject::GetVertexGluePoint(USHORT nPosNum) const +SdrGluePoint SdrObject::GetVertexGluePoint(sal_uInt16 nPosNum) const { // #i41936# Use SnapRect for default GluePoints const Rectangle aR(GetSnapRect()); @@ -2304,12 +2304,12 @@ SdrGluePoint SdrObject::GetVertexGluePoint(USHORT nPosNum) const aPt -= aR.Center(); SdrGluePoint aGP(aPt); - aGP.SetPercent(FALSE); + aGP.SetPercent(sal_False); return aGP; } -SdrGluePoint SdrObject::GetCornerGluePoint(USHORT nPosNum) const +SdrGluePoint SdrObject::GetCornerGluePoint(sal_uInt16 nPosNum) const { Rectangle aR(GetCurrentBoundRect()); Point aPt; @@ -2321,7 +2321,7 @@ SdrGluePoint SdrObject::GetCornerGluePoint(USHORT nPosNum) const } aPt-=GetSnapRect().Center(); SdrGluePoint aGP(aPt); - aGP.SetPercent(FALSE); + aGP.SetPercent(sal_False); return aGP; } @@ -2410,7 +2410,7 @@ SdrObject* SdrObject::GetConnectedNode(bool /*bTail1*/) const //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash) const +SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash) const { bool bNoChange(true); @@ -2423,7 +2423,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas if(xSequence.hasElements()) { // use neutral ViewInformation - const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0); + const drawinglayer::geometry::ViewInformation2D aViewInformation2D; // create extractor, process and get result drawinglayer::processor2d::LineGeometryExtractor2D aExtractor(aViewInformation2D); @@ -2471,7 +2471,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas aSet.Put(XLineWidthItem(0L)); aSet.Put(XLineStyleItem(XLINE_NONE)); Color aColorLine = ((const XLineColorItem&)(aSet.Get(XATTR_LINECOLOR))).GetColorValue(); - UINT16 nTransLine = ((const XLineTransparenceItem&)(aSet.Get(XATTR_LINETRANSPARENCE))).GetValue(); + sal_uInt16 nTransLine = ((const XLineTransparenceItem&)(aSet.Get(XATTR_LINETRANSPARENCE))).GetValue(); aSet.Put(XFillColorItem(XubString(), aColorLine)); aSet.Put(XFillStyleItem(XFILL_SOLID)); aSet.Put(XFillTransparenceItem(nTransLine)); @@ -2584,7 +2584,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas } // convert this path object to contour object, even when it is a group -SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash) const +SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, sal_Bool bForceLineDash) const { if(pRet->ISA(SdrObjGroup)) { @@ -2592,7 +2592,7 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash) SdrObject* pGroup = new SdrObjGroup; pGroup->SetModel(pRet->GetModel()); - for(UINT32 a=0;a<pObjList2->GetObjCount();a++) + for(sal_uInt32 a=0;a<pObjList2->GetObjCount();a++) { SdrObject* pIterObj = pObjList2->GetObj(a); pGroup->GetSubList()->NbcInsertObject(ConvertToContourObj(pIterObj, bForceLineDash)); @@ -2626,7 +2626,7 @@ SdrObject* SdrObject::ConvertToContourObj(SdrObject* pRet, BOOL bForceLineDash) //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrObject* SdrObject::ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const +SdrObject* SdrObject::ConvertToPolyObj(sal_Bool bBezier, sal_Bool bLineToArea) const { SdrObject* pRet = DoConvertToPolyObj(bBezier); @@ -2648,7 +2648,7 @@ SdrObject* SdrObject::ConvertToPolyObj(BOOL bBezier, BOOL bLineToArea) const //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrObject* SdrObject::DoConvertToPolyObj(BOOL /*bBezier*/) const +SdrObject* SdrObject::DoConvertToPolyObj(sal_Bool /*bBezier*/) const { return NULL; } @@ -2723,19 +2723,19 @@ void SdrObject::SetVisible(sal_Bool bVisible) //////////////////////////////////////////////////////////////////////////////////////////////////// -USHORT SdrObject::GetUserDataCount() const +sal_uInt16 SdrObject::GetUserDataCount() const { if (pPlusData==NULL || pPlusData->pUserDataList==NULL) return 0; return pPlusData->pUserDataList->GetUserDataCount(); } -SdrObjUserData* SdrObject::GetUserData(USHORT nNum) const +SdrObjUserData* SdrObject::GetUserData(sal_uInt16 nNum) const { if (pPlusData==NULL || pPlusData->pUserDataList==NULL) return NULL; return pPlusData->pUserDataList->GetUserData(nNum); } -void SdrObject::InsertUserData(SdrObjUserData* pData, USHORT nPos) +void SdrObject::InsertUserData(SdrObjUserData* pData, sal_uInt16 nPos) { if (pData!=NULL) { ImpForcePlusData(); @@ -2746,9 +2746,9 @@ void SdrObject::InsertUserData(SdrObjUserData* pData, USHORT nPos) } } -void SdrObject::DeleteUserData(USHORT nNum) +void SdrObject::DeleteUserData(sal_uInt16 nNum) { - USHORT nAnz=GetUserDataCount(); + sal_uInt16 nAnz=GetUserDataCount(); if (nNum<nAnz) { pPlusData->pUserDataList->DeleteUserData(nNum); if (nAnz==1) { @@ -2848,7 +2848,7 @@ void SdrObject::MigrateItemPool(SfxItemPool* pSrcPool, SfxItemPool* pDestPool, S } } -sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const +sal_Bool SdrObject::IsTransparent( sal_Bool /*bCheckForAlphaChannel*/) const { bool bRet = false; @@ -2865,7 +2865,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const ( ( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) && ( (const XFillFloatTransparenceItem&) rAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled() ) ) { - bRet = TRUE; + bRet = sal_True; } else if( pO->ISA( SdrGrafObj ) ) { @@ -2873,7 +2873,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const if( ( (const SdrGrafTransparenceItem&) rAttr.Get( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() || ( pGrafObj->GetGraphicType() == GRAPHIC_BITMAP && pGrafObj->GetGraphic().GetBitmapEx().IsAlpha() ) ) { - bRet = TRUE; + bRet = sal_True; } } } @@ -2887,7 +2887,7 @@ sal_Bool SdrObject::IsTransparent( BOOL /*bCheckForAlphaChannel*/) const ( ( rAttr.GetItemState( XATTR_FILLFLOATTRANSPARENCE ) == SFX_ITEM_SET ) && ( (const XFillFloatTransparenceItem&) rAttr.Get( XATTR_FILLFLOATTRANSPARENCE ) ).IsEnabled() ) ) { - bRet = TRUE; + bRet = sal_True; } else if( ISA( SdrGrafObj ) ) { @@ -3149,7 +3149,7 @@ void SdrObject::SetContextWritingMode( const sal_Int16 /*_nContextWritingMode*/ // //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel) +SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pNewPage, SdrModel* pNewModel) { nInventor=nInvent; nIdentifier=nIdent; @@ -3160,7 +3160,7 @@ SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrPage* pNewPage, S pNewData=NULL; } -SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1) +SdrObjFactory::SdrObjFactory(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1) { nInventor=nInvent; nIdentifier=nIdent; @@ -3171,7 +3171,7 @@ SdrObjFactory::SdrObjFactory(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1) pNewData=NULL; } -SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* pPage, SdrModel* pModel) +SdrObject* SdrObjFactory::MakeNewObject(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrPage* pPage, SdrModel* pModel) { if(pModel == NULL && pPage != NULL) pModel = pPage->GetModel(); @@ -3181,37 +3181,37 @@ SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* { switch (nIdent) { - case USHORT(OBJ_NONE ): pObj=new SdrObject; break; - case USHORT(OBJ_GRUP ): pObj=new SdrObjGroup; break; - case USHORT(OBJ_LINE ): pObj=new SdrPathObj(OBJ_LINE ); break; - case USHORT(OBJ_POLY ): pObj=new SdrPathObj(OBJ_POLY ); break; - case USHORT(OBJ_PLIN ): pObj=new SdrPathObj(OBJ_PLIN ); break; - case USHORT(OBJ_PATHLINE ): pObj=new SdrPathObj(OBJ_PATHLINE ); break; - case USHORT(OBJ_PATHFILL ): pObj=new SdrPathObj(OBJ_PATHFILL ); break; - case USHORT(OBJ_FREELINE ): pObj=new SdrPathObj(OBJ_FREELINE ); break; - case USHORT(OBJ_FREEFILL ): pObj=new SdrPathObj(OBJ_FREEFILL ); break; - case USHORT(OBJ_PATHPOLY ): pObj=new SdrPathObj(OBJ_POLY ); break; - case USHORT(OBJ_PATHPLIN ): pObj=new SdrPathObj(OBJ_PLIN ); break; - case USHORT(OBJ_EDGE ): pObj=new SdrEdgeObj; break; - case USHORT(OBJ_RECT ): pObj=new SdrRectObj; break; - case USHORT(OBJ_CIRC ): pObj=new SdrCircObj(OBJ_CIRC ); break; - case USHORT(OBJ_SECT ): pObj=new SdrCircObj(OBJ_SECT ); break; - case USHORT(OBJ_CARC ): pObj=new SdrCircObj(OBJ_CARC ); break; - case USHORT(OBJ_CCUT ): pObj=new SdrCircObj(OBJ_CCUT ); break; - case USHORT(OBJ_TEXT ): pObj=new SdrRectObj(OBJ_TEXT ); break; - case USHORT(OBJ_TEXTEXT ): pObj=new SdrRectObj(OBJ_TEXTEXT ); break; - case USHORT(OBJ_TITLETEXT ): pObj=new SdrRectObj(OBJ_TITLETEXT ); break; - case USHORT(OBJ_OUTLINETEXT): pObj=new SdrRectObj(OBJ_OUTLINETEXT); break; - case USHORT(OBJ_MEASURE ): pObj=new SdrMeasureObj; break; - case USHORT(OBJ_GRAF ): pObj=new SdrGrafObj; break; - case USHORT(OBJ_OLE2 ): pObj=new SdrOle2Obj; break; - case USHORT(OBJ_FRAME ): pObj=new SdrOle2Obj(TRUE); break; - case USHORT(OBJ_CAPTION ): pObj=new SdrCaptionObj; break; - case USHORT(OBJ_PAGE ): pObj=new SdrPageObj; break; - case USHORT(OBJ_UNO ): pObj=new SdrUnoObj(String()); break; - case USHORT(OBJ_CUSTOMSHAPE ): pObj=new SdrObjCustomShape(); break; - case USHORT(OBJ_MEDIA ): pObj=new SdrMediaObj(); break; - case USHORT(OBJ_TABLE ): pObj=new ::sdr::table::SdrTableObj(pModel); break; + case sal_uInt16(OBJ_NONE ): pObj=new SdrObject; break; + case sal_uInt16(OBJ_GRUP ): pObj=new SdrObjGroup; break; + case sal_uInt16(OBJ_LINE ): pObj=new SdrPathObj(OBJ_LINE ); break; + case sal_uInt16(OBJ_POLY ): pObj=new SdrPathObj(OBJ_POLY ); break; + case sal_uInt16(OBJ_PLIN ): pObj=new SdrPathObj(OBJ_PLIN ); break; + case sal_uInt16(OBJ_PATHLINE ): pObj=new SdrPathObj(OBJ_PATHLINE ); break; + case sal_uInt16(OBJ_PATHFILL ): pObj=new SdrPathObj(OBJ_PATHFILL ); break; + case sal_uInt16(OBJ_FREELINE ): pObj=new SdrPathObj(OBJ_FREELINE ); break; + case sal_uInt16(OBJ_FREEFILL ): pObj=new SdrPathObj(OBJ_FREEFILL ); break; + case sal_uInt16(OBJ_PATHPOLY ): pObj=new SdrPathObj(OBJ_POLY ); break; + case sal_uInt16(OBJ_PATHPLIN ): pObj=new SdrPathObj(OBJ_PLIN ); break; + case sal_uInt16(OBJ_EDGE ): pObj=new SdrEdgeObj; break; + case sal_uInt16(OBJ_RECT ): pObj=new SdrRectObj; break; + case sal_uInt16(OBJ_CIRC ): pObj=new SdrCircObj(OBJ_CIRC ); break; + case sal_uInt16(OBJ_SECT ): pObj=new SdrCircObj(OBJ_SECT ); break; + case sal_uInt16(OBJ_CARC ): pObj=new SdrCircObj(OBJ_CARC ); break; + case sal_uInt16(OBJ_CCUT ): pObj=new SdrCircObj(OBJ_CCUT ); break; + case sal_uInt16(OBJ_TEXT ): pObj=new SdrRectObj(OBJ_TEXT ); break; + case sal_uInt16(OBJ_TEXTEXT ): pObj=new SdrRectObj(OBJ_TEXTEXT ); break; + case sal_uInt16(OBJ_TITLETEXT ): pObj=new SdrRectObj(OBJ_TITLETEXT ); break; + case sal_uInt16(OBJ_OUTLINETEXT): pObj=new SdrRectObj(OBJ_OUTLINETEXT); break; + case sal_uInt16(OBJ_MEASURE ): pObj=new SdrMeasureObj; break; + case sal_uInt16(OBJ_GRAF ): pObj=new SdrGrafObj; break; + case sal_uInt16(OBJ_OLE2 ): pObj=new SdrOle2Obj; break; + case sal_uInt16(OBJ_FRAME ): pObj=new SdrOle2Obj(sal_True); break; + case sal_uInt16(OBJ_CAPTION ): pObj=new SdrCaptionObj; break; + case sal_uInt16(OBJ_PAGE ): pObj=new SdrPageObj; break; + case sal_uInt16(OBJ_UNO ): pObj=new SdrUnoObj(String()); break; + case sal_uInt16(OBJ_CUSTOMSHAPE ): pObj=new SdrObjCustomShape(); break; + case sal_uInt16(OBJ_MEDIA ): pObj=new SdrMediaObj(); break; + case sal_uInt16(OBJ_TABLE ): pObj=new ::sdr::table::SdrTableObj(pModel); break; } } @@ -3245,13 +3245,13 @@ SdrObject* SdrObjFactory::MakeNewObject(UINT32 nInvent, UINT16 nIdent, SdrPage* return pObj; } -SdrObjUserData* SdrObjFactory::MakeNewObjUserData(UINT32 nInvent, UINT16 nIdent, SdrObject* pObj1) +SdrObjUserData* SdrObjFactory::MakeNewObjUserData(sal_uInt32 nInvent, sal_uInt16 nIdent, SdrObject* pObj1) { SdrObjUserData* pData=NULL; if (nInvent==SdrInventor) { switch (nIdent) { - case USHORT(SDRUSERDATA_OBJTEXTLINK) : pData=new ImpSdrObjTextLinkUserData((SdrTextObj*)pObj1); break; + case sal_uInt16(SDRUSERDATA_OBJTEXTLINK) : pData=new ImpSdrObjTextLinkUserData((SdrTextObj*)pObj1); break; } } if (pData==NULL) { diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index 0688408b22..a884e676b7 100644..100755 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -42,8 +42,8 @@ #include <svx/svddrag.hxx> #include <svx/svdmodel.hxx> #include <svx/svdview.hxx> // fuer RectSnap -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdogrp.hxx> #include <svx/svdpage.hxx> #include <svx/xflhtit.hxx> @@ -86,15 +86,15 @@ public: ImpCaptParams() { eType =SDRCAPT_TYPE3; - bFixedAngle=FALSE; + bFixedAngle=sal_False; nAngle =4500; nGap =0; eEscDir =SDRCAPT_ESCHORIZONTAL; - bEscRel =TRUE; + bEscRel =sal_True; nEscRel =5000; nEscAbs =0; nLineLen =0; - bFitLineLen=TRUE; + bFitLineLen=sal_True; } void CalcEscPos(const Point& rTail, const Rectangle& rRect, Point& rPt, EscDir& rDir) const; }; @@ -202,24 +202,24 @@ TYPEINIT1(SdrCaptionObj,SdrRectObj); SdrCaptionObj::SdrCaptionObj(): SdrRectObj(OBJ_TEXT), aTailPoly(3), // Default Groesse: 3 Punkte = 2 Linien - mbSpecialTextBoxShadow(FALSE), - mbFixedTail(FALSE) + mbSpecialTextBoxShadow(sal_False), + mbFixedTail(sal_False) { } SdrCaptionObj::SdrCaptionObj(const Rectangle& rRect): SdrRectObj(OBJ_TEXT,rRect), aTailPoly(3), // Default Groesse: 3 Punkte = 2 Linien - mbSpecialTextBoxShadow(FALSE), - mbFixedTail(FALSE) + mbSpecialTextBoxShadow(sal_False), + mbFixedTail(sal_False) { } SdrCaptionObj::SdrCaptionObj(const Rectangle& rRect, const Point& rTail): SdrRectObj(OBJ_TEXT,rRect), aTailPoly(3), // Default Groesse: 3 Punkte = 2 Linien - mbSpecialTextBoxShadow(FALSE), - mbFixedTail(FALSE) + mbSpecialTextBoxShadow(sal_False), + mbFixedTail(sal_False) { aTailPoly[0]=maFixedTailPos=rTail; } @@ -230,25 +230,25 @@ SdrCaptionObj::~SdrCaptionObj() void SdrCaptionObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bRotateFreeAllowed=FALSE; - rInfo.bRotate90Allowed =FALSE; - rInfo.bMirrorFreeAllowed=FALSE; - rInfo.bMirror45Allowed =FALSE; - rInfo.bMirror90Allowed =FALSE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bCanConvToPath =TRUE; - rInfo.bCanConvToPoly =TRUE; - rInfo.bCanConvToPathLineToArea=FALSE; - rInfo.bCanConvToPolyLineToArea=FALSE; + rInfo.bRotateFreeAllowed=sal_False; + rInfo.bRotate90Allowed =sal_False; + rInfo.bMirrorFreeAllowed=sal_False; + rInfo.bMirror45Allowed =sal_False; + rInfo.bMirror90Allowed =sal_False; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bCanConvToPath =sal_True; + rInfo.bCanConvToPoly =sal_True; + rInfo.bCanConvToPathLineToArea=sal_False; + rInfo.bCanConvToPolyLineToArea=sal_False; rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -UINT16 SdrCaptionObj::GetObjIdentifier() const +sal_uInt16 SdrCaptionObj::GetObjIdentifier() const { - return UINT16(OBJ_CAPTION); + return sal_uInt16(OBJ_CAPTION); } void SdrCaptionObj::operator=(const SdrObject& rObj) @@ -560,7 +560,7 @@ void SdrCaptionObj::ImpCalcTail(const ImpCaptParams& rPara, Polygon& rPoly, Rect bool SdrCaptionObj::BegCreate(SdrDragStat& rStat) { - if (aRect.IsEmpty()) return FALSE; // Create z.Zt. nur mit vorgegebenen Rect + if (aRect.IsEmpty()) return sal_False; // Create z.Zt. nur mit vorgegebenen Rect ImpCaptParams aPara; ImpGetCaptParams(aPara); @@ -568,7 +568,7 @@ bool SdrCaptionObj::BegCreate(SdrDragStat& rStat) aTailPoly[0]=rStat.GetStart(); ImpCalcTail(aPara,aTailPoly,aRect); rStat.SetActionRect(aRect); - return TRUE; + return sal_True; } bool SdrCaptionObj::MovCreate(SdrDragStat& rStat) @@ -579,8 +579,8 @@ bool SdrCaptionObj::MovCreate(SdrDragStat& rStat) ImpCalcTail(aPara,aTailPoly,aRect); rStat.SetActionRect(aRect); SetBoundRectDirty(); - bSnapRectDirty=TRUE; - return TRUE; + bSnapRectDirty=sal_True; + return sal_True; } bool SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) @@ -595,7 +595,7 @@ bool SdrCaptionObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) bool SdrCaptionObj::BckCreate(SdrDragStat& /*rStat*/) { - return FALSE; + return sal_False; } void SdrCaptionObj::BrkCreate(SdrDragStat& /*rStat*/) @@ -756,7 +756,7 @@ void SdrCaptionObj::RestGeoData(const SdrObjGeoData& rGeo) aTailPoly=rCGeo.aTailPoly; } -SdrObject* SdrCaptionObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrCaptionObj::DoConvertToPolyObj(sal_Bool bBezier) const { // #42334# - Convert implementiert SdrObject* pRect=SdrRectObj::DoConvertToPolyObj(bBezier); SdrObject* pTail = ImpConvertMakeObj(basegfx::B2DPolyPolygon(aTailPoly.getB2DPolygon()), sal_False, bBezier); diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index ee5bcb009c..a740e5723c 100644..100755 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -48,8 +48,8 @@ #include <svx/svdpage.hxx> #include <svx/svdopath.hxx> // fuer die Objektkonvertierung #include <svx/svdview.hxx> // Zum Draggen (Ortho) -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <editeng/eeitem.hxx> #include "svdoimp.hxx" #include <svx/sdr/properties/circleproperties.hxx> @@ -154,15 +154,15 @@ SdrCircObj::~SdrCircObj() void SdrCircObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { bool bCanConv=!HasText() || ImpCanConvTextToCurve(); - rInfo.bEdgeRadiusAllowed = FALSE; + rInfo.bEdgeRadiusAllowed = sal_False; rInfo.bCanConvToPath=bCanConv; rInfo.bCanConvToPoly=bCanConv; rInfo.bCanConvToContour = !IsFontwork() && (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -UINT16 SdrCircObj::GetObjIdentifier() const +sal_uInt16 SdrCircObj::GetObjIdentifier() const { - return UINT16(meCircleKind); + return sal_uInt16(meCircleKind); } bool SdrCircObj::PaintNeedsXPolyCirc() const @@ -172,10 +172,8 @@ bool SdrCircObj::PaintNeedsXPolyCirc() const // und wenn nicht WIN dann (erstmal) auch fuer Kreis-/Ellipsenausschnitte // und Kreis-/Ellipsenboegen (wg. Genauigkeit) bool bNeed=aGeo.nDrehWink!=0 || aGeo.nShearWink!=0 || meCircleKind==OBJ_CCUT; -#ifndef WIN // Wenn nicht Win, dann fuer alle ausser Vollkreis (erstmal!!!) if (meCircleKind!=OBJ_CIRC) bNeed = true; -#endif const SfxItemSet& rSet = GetObjectItemSet(); if(!bNeed) @@ -298,7 +296,7 @@ void SdrCircObj::RecalcXPoly() void SdrCircObj::TakeObjNameSingul(XubString& rName) const { - USHORT nID=STR_ObjNameSingulCIRC; + sal_uInt16 nID=STR_ObjNameSingulCIRC; if (aRect.GetWidth()==aRect.GetHeight() && aGeo.nShearWink==0) { switch (meCircleKind) { case OBJ_CIRC: nID=STR_ObjNameSingulCIRC; break; @@ -330,7 +328,7 @@ void SdrCircObj::TakeObjNameSingul(XubString& rName) const void SdrCircObj::TakeObjNamePlural(XubString& rName) const { - USHORT nID=STR_ObjNamePluralCIRC; + sal_uInt16 nID=STR_ObjNamePluralCIRC; if (aRect.GetWidth()==aRect.GetHeight() && aGeo.nShearWink==0) { switch (meCircleKind) { case OBJ_CIRC: nID=STR_ObjNamePluralCIRC; break; @@ -388,7 +386,7 @@ public: nStart(0), nEnd(0), nWink(0), - bRight(FALSE) + bRight(sal_False) {} void SetCreateParams(SdrDragStat& rStat); }; @@ -599,7 +597,7 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const nWink = pU->nEnd; } - aStr += GetWinkStr(nWink,FALSE); + aStr += GetWinkStr(nWink,sal_False); aStr += sal_Unicode(')'); } @@ -616,7 +614,7 @@ String SdrCircObj::getSpecialDragComment(const SdrDragStat& rDrag) const ImpTakeDescriptionStr(STR_DragCircAngle, aStr); aStr.AppendAscii(" ("); - aStr += GetWinkStr(nWink,FALSE); + aStr += GetWinkStr(nWink,sal_False); aStr += sal_Unicode(')'); return aStr; @@ -702,7 +700,7 @@ bool SdrCircObj::BegCreate(SdrDragStat& rStat) rStat.SetActionRect(aRect1); aRect = aRect1; ImpSetCreateParams(rStat); - return TRUE; + return sal_True; } bool SdrCircObj::MovCreate(SdrDragStat& rStat) @@ -715,7 +713,7 @@ bool SdrCircObj::MovCreate(SdrDragStat& rStat) nStartWink=pU->nStart; nEndWink=pU->nEnd; SetBoundRectDirty(); - bSnapRectDirty=TRUE; + bSnapRectDirty=sal_True; SetXPolyDirty(); // #i103058# push current angle settings to ItemSet to @@ -725,7 +723,7 @@ bool SdrCircObj::MovCreate(SdrDragStat& rStat) ImpSetCircInfoToAttr(); } - return TRUE; + return sal_True; } bool SdrCircObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) @@ -1102,8 +1100,8 @@ void SdrCircObj::ImpSetAttrToCircInfo() sal_Int32 nNewStart = ((SdrCircStartAngleItem&)rSet.Get(SDRATTR_CIRCSTARTANGLE)).GetValue(); sal_Int32 nNewEnd = ((SdrCircEndAngleItem&)rSet.Get(SDRATTR_CIRCENDANGLE)).GetValue(); - BOOL bKindChg = meCircleKind != eNewKind; - BOOL bWinkChg = nNewStart != nStartWink || nNewEnd != nEndWink; + sal_Bool bKindChg = meCircleKind != eNewKind; + sal_Bool bWinkChg = nNewStart != nStartWink || nNewEnd != nEndWink; if(bKindChg || bWinkChg) { @@ -1159,7 +1157,7 @@ void SdrCircObj::ImpSetCircInfoToAttr() } } -SdrObject* SdrCircObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrCircObj::DoConvertToPolyObj(sal_Bool bBezier) const { const sal_Bool bFill(OBJ_CARC == meCircleKind ? sal_False : sal_True); const basegfx::B2DPolygon aCircPolygon(ImpCalcXPolyCirc(meCircleKind, aRect, nStartWink, nEndWink)); diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index a5679115ee..2b7175c42b 100644..100755 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -44,8 +44,8 @@ #include <svx/svdhdl.hxx> #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svl/style.hxx> #include <svl/smplhint.hxx> #include <editeng/eeitem.hxx> @@ -69,12 +69,12 @@ void SdrObjConnection::ResetVars() nConId=0; nXDist=0; nYDist=0; - bBestConn=TRUE; - bBestVertex=TRUE; - bXDistOvr=FALSE; - bYDistOvr=FALSE; - bAutoVertex=FALSE; - bAutoCorner=FALSE; + bBestConn=sal_True; + bBestVertex=sal_True; + bXDistOvr=sal_False; + bYDistOvr=sal_False; + bAutoVertex=sal_False; + bAutoCorner=sal_False; } bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const @@ -90,7 +90,7 @@ bool SdrObjConnection::TakeGluePoint(SdrGluePoint& rGP, bool bSetAbsPos) const } else { const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (pGPL!=NULL) { - USHORT nNum=pGPL->FindGluePoint(nConId); + sal_uInt16 nNum=pGPL->FindGluePoint(nConId); if (nNum!=SDRGLUEPOINT_NOTFOUND) { rGP=(*pGPL)[nNum]; bRet = true; @@ -118,7 +118,7 @@ Point& SdrEdgeInfoRec::ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode) return aMiddleLine; } -USHORT SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const +sal_uInt16 SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const { switch (eLineCode) { case OBJ1LINE2 : return 1; @@ -132,7 +132,7 @@ USHORT SdrEdgeInfoRec::ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& bool SdrEdgeInfoRec::ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const { - USHORT nIdx=ImpGetPolyIdx(eLineCode,rXP); + sal_uInt16 nIdx=ImpGetPolyIdx(eLineCode,rXP); bool bHorz=nAngle1==0 || nAngle1==18000; if (eLineCode==OBJ2LINE2 || eLineCode==OBJ2LINE3) { nIdx=rXP.GetPointCount()-nIdx; // #36314# @@ -186,16 +186,16 @@ SdrEdgeObj::SdrEdgeObj() // #110649# mbBoundRectCalculationRunning(sal_False) { - bClosedObj=FALSE; - bIsEdge=TRUE; + bClosedObj=sal_False; + bIsEdge=sal_True; pEdgeTrack=new XPolygon; } SdrEdgeObj::~SdrEdgeObj() { - DisconnectFromNode(TRUE); - DisconnectFromNode(FALSE); + DisconnectFromNode(sal_True); + DisconnectFromNode(sal_False); delete pEdgeTrack; } @@ -244,8 +244,8 @@ void SdrEdgeObj::ImpSetAttrToEdgeInfo() } else if(eKind == SDREDGE_THREELINES) { - BOOL bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000; - BOOL bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000; + sal_Bool bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000; + sal_Bool bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000; if(bHor1) { @@ -315,8 +315,8 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr() } else if(eKind == SDREDGE_THREELINES) { - BOOL bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000; - BOOL bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000; + sal_Bool bHor1 = aEdgeInfo.nAngle1 == 0 || aEdgeInfo.nAngle1 == 18000; + sal_Bool bHor2 = aEdgeInfo.nAngle2 == 0 || aEdgeInfo.nAngle2 == 18000; n = 2; nVals[0] = bHor1 ? aEdgeInfo.aObj1Line2.X() : aEdgeInfo.aObj1Line2.Y(); @@ -365,24 +365,24 @@ void SdrEdgeObj::ImpSetEdgeInfoToAttr() void SdrEdgeObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bRotateFreeAllowed=FALSE; - rInfo.bRotate90Allowed =FALSE; - rInfo.bMirrorFreeAllowed=FALSE; - rInfo.bMirror45Allowed =FALSE; - rInfo.bMirror90Allowed =FALSE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; + rInfo.bRotateFreeAllowed=sal_False; + rInfo.bRotate90Allowed =sal_False; + rInfo.bMirrorFreeAllowed=sal_False; + rInfo.bMirror45Allowed =sal_False; + rInfo.bMirror90Allowed =sal_False; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; bool bCanConv=!HasText() || ImpCanConvTextToCurve(); rInfo.bCanConvToPath=bCanConv; rInfo.bCanConvToPoly=bCanConv; rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -UINT16 SdrEdgeObj::GetObjIdentifier() const +sal_uInt16 SdrEdgeObj::GetObjIdentifier() const { - return UINT16(OBJ_EDGE); + return sal_uInt16(OBJ_EDGE); } const Rectangle& SdrEdgeObj::GetCurrentBoundRect() const @@ -420,15 +420,15 @@ bool SdrEdgeObj::IsNode() const return true; } -SdrGluePoint SdrEdgeObj::GetVertexGluePoint(USHORT nNum) const +SdrGluePoint SdrEdgeObj::GetVertexGluePoint(sal_uInt16 nNum) const { Point aPt; - USHORT nPntAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nPntAnz=pEdgeTrack->GetPointCount(); if (nPntAnz>0) { Point aOfs = GetSnapRect().Center(); - if (nNum==2 && GetConnectedNode(TRUE)==NULL) aPt=(*pEdgeTrack)[0]; - else if (nNum==3 && GetConnectedNode(FALSE)==NULL) aPt=(*pEdgeTrack)[nPntAnz-1]; + if (nNum==2 && GetConnectedNode(sal_True)==NULL) aPt=(*pEdgeTrack)[0]; + else if (nNum==3 && GetConnectedNode(sal_False)==NULL) aPt=(*pEdgeTrack)[nPntAnz-1]; else { if ((nPntAnz & 1) ==1) { aPt=(*pEdgeTrack)[nPntAnz/2]; @@ -444,11 +444,11 @@ SdrGluePoint SdrEdgeObj::GetVertexGluePoint(USHORT nNum) const aPt-=aOfs; } SdrGluePoint aGP(aPt); - aGP.SetPercent(FALSE); + aGP.SetPercent(sal_False); return aGP; } -SdrGluePoint SdrEdgeObj::GetCornerGluePoint(USHORT nNum) const +SdrGluePoint SdrEdgeObj::GetCornerGluePoint(sal_uInt16 nNum) const { return GetVertexGluePoint(nNum); } @@ -499,13 +499,13 @@ bool SdrEdgeObj::CheckNodeConnection(bool bTail1) const { bool bRet = false; const SdrObjConnection& rCon=GetConnection(bTail1); - USHORT nPtAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount(); if (rCon.pObj!=NULL && rCon.pObj->GetPage()==pPage && nPtAnz!=0) { const SdrGluePointList* pGPL=rCon.pObj->GetGluePointList(); - USHORT nConAnz=pGPL==NULL ? 0 : pGPL->GetCount(); - USHORT nGesAnz=nConAnz+8; - Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[USHORT(nPtAnz-1)]); - for (USHORT i=0; i<nGesAnz && !bRet; i++) { + sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount(); + sal_uInt16 nGesAnz=nConAnz+8; + Point aTail(bTail1 ? (*pEdgeTrack)[0] : (*pEdgeTrack)[sal_uInt16(nPtAnz-1)]); + for (sal_uInt16 i=0; i<nGesAnz && !bRet; i++) { if (i<nConAnz) { // UserDefined bRet=aTail==(*pGPL)[i].GetAbsolutePos(*rCon.pObj); } else if (i<nConAnz+4) { // Vertex @@ -522,7 +522,7 @@ bool SdrEdgeObj::CheckNodeConnection(bool bTail1) const void SdrEdgeObj::ImpSetTailPoint(bool bTail1, const Point& rPt) { - USHORT nPtAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nPtAnz=pEdgeTrack->GetPointCount(); if (nPtAnz==0) { (*pEdgeTrack)[0]=rPt; (*pEdgeTrack)[1]=rPt; @@ -530,7 +530,7 @@ void SdrEdgeObj::ImpSetTailPoint(bool bTail1, const Point& rPt) if (!bTail1) (*pEdgeTrack)[1]=rPt; else { (*pEdgeTrack)[1]=(*pEdgeTrack)[0]; (*pEdgeTrack)[0]=rPt; } } else { - if (!bTail1) (*pEdgeTrack)[USHORT(nPtAnz-1)]=rPt; + if (!bTail1) (*pEdgeTrack)[sal_uInt16(nPtAnz-1)]=rPt; else (*pEdgeTrack)[0]=rPt; } ImpRecalcEdgeTrack(); @@ -598,7 +598,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack() } } -USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const +sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const { if (pObj==NULL) return SDRESC_ALL; Rectangle aR(pObj->GetSnapRect()); @@ -613,7 +613,7 @@ USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const bool bDiag=Abs(dx-dy)<2; if (bxMitt && byMitt) return SDRESC_ALL; // In der Mitte if (bDiag) { // diagonal - USHORT nRet=0; + sal_uInt16 nRet=0; if (byMitt) nRet|=SDRESC_VERT; if (bxMitt) nRet|=SDRESC_HORZ; if (dxl<dxr) { // Links @@ -639,7 +639,7 @@ USHORT SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const bool SdrEdgeObj::ImpStripPolyPoints(XPolygon& /*rXP*/) const { // fehlende Implementation !!! - return FALSE; + return sal_False; } XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rMeeting) const @@ -705,7 +705,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& { Point aPt1,aPt2; SdrGluePoint aGP1,aGP2; - USHORT nEsc1=SDRESC_ALL,nEsc2=SDRESC_ALL; + sal_uInt16 nEsc1=SDRESC_ALL,nEsc2=SDRESC_ALL; Rectangle aBoundRect1; Rectangle aBoundRect2; Rectangle aBewareRect1; @@ -713,7 +713,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& // Erstmal die alten Endpunkte wiederholen if (rTrack0.GetPointCount()!=0) { aPt1=rTrack0[0]; - USHORT nSiz=rTrack0.GetPointCount(); + sal_uInt16 nSiz=rTrack0.GetPointCount(); nSiz--; aPt2=rTrack0[nSiz]; } else { @@ -775,36 +775,36 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& aBewareRect2=aBoundRect2; } XPolygon aBestXP; - ULONG nBestQual=0xFFFFFFFF; + sal_uIntPtr nBestQual=0xFFFFFFFF; SdrEdgeInfoRec aBestInfo; bool bAuto1=bCon1 && rCon1.bBestVertex; bool bAuto2=bCon2 && rCon2.bBestVertex; - if (bAuto1) rCon1.bAutoVertex=TRUE; - if (bAuto2) rCon2.bAutoVertex=TRUE; - USHORT nBestAuto1=0; - USHORT nBestAuto2=0; - USHORT nAnz1=bAuto1 ? 4 : 1; - USHORT nAnz2=bAuto2 ? 4 : 1; - for (USHORT nNum1=0; nNum1<nAnz1; nNum1++) { + if (bAuto1) rCon1.bAutoVertex=sal_True; + if (bAuto2) rCon2.bAutoVertex=sal_True; + sal_uInt16 nBestAuto1=0; + sal_uInt16 nBestAuto2=0; + sal_uInt16 nAnz1=bAuto1 ? 4 : 1; + sal_uInt16 nAnz2=bAuto2 ? 4 : 1; + for (sal_uInt16 nNum1=0; nNum1<nAnz1; nNum1++) { if (bAuto1) rCon1.nConId=nNum1; - if (bCon1 && rCon1.TakeGluePoint(aGP1,TRUE)) { + if (bCon1 && rCon1.TakeGluePoint(aGP1,sal_True)) { aPt1=aGP1.GetPos(); nEsc1=aGP1.GetEscDir(); if (nEsc1==SDRESC_SMART) nEsc1=ImpCalcEscAngle(rCon1.pObj,aPt1-rCon1.aObjOfs); } - for (USHORT nNum2=0; nNum2<nAnz2; nNum2++) { + for (sal_uInt16 nNum2=0; nNum2<nAnz2; nNum2++) { if (bAuto2) rCon2.nConId=nNum2; - if (bCon2 && rCon2.TakeGluePoint(aGP2,TRUE)) { + if (bCon2 && rCon2.TakeGluePoint(aGP2,sal_True)) { aPt2=aGP2.GetPos(); nEsc2=aGP2.GetEscDir(); if (nEsc2==SDRESC_SMART) nEsc2=ImpCalcEscAngle(rCon2.pObj,aPt2-rCon2.aObjOfs); } for (long nA1=0; nA1<36000; nA1+=9000) { - USHORT nE1=nA1==0 ? SDRESC_RIGHT : nA1==9000 ? SDRESC_TOP : nA1==18000 ? SDRESC_LEFT : nA1==27000 ? SDRESC_BOTTOM : 0; + sal_uInt16 nE1=nA1==0 ? SDRESC_RIGHT : nA1==9000 ? SDRESC_TOP : nA1==18000 ? SDRESC_LEFT : nA1==27000 ? SDRESC_BOTTOM : 0; for (long nA2=0; nA2<36000; nA2+=9000) { - USHORT nE2=nA2==0 ? SDRESC_RIGHT : nA2==9000 ? SDRESC_TOP : nA2==18000 ? SDRESC_LEFT : nA2==27000 ? SDRESC_BOTTOM : 0; + sal_uInt16 nE2=nA2==0 ? SDRESC_RIGHT : nA2==9000 ? SDRESC_TOP : nA2==18000 ? SDRESC_LEFT : nA2==27000 ? SDRESC_BOTTOM : 0; if ((nEsc1&nE1)!=0 && (nEsc2&nE2)!=0) { - ULONG nQual=0; + sal_uIntPtr nQual=0; SdrEdgeInfoRec aInfo; if (pInfo!=NULL) aInfo=*pInfo; XPolygon aXP(ImpCalcEdgeTrack(aPt1,nA1,aBoundRect1,aBewareRect1,aPt2,nA2,aBoundRect2,aBewareRect2,&nQual,&aInfo)); @@ -828,7 +828,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1, const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2, - ULONG* pnQuality, SdrEdgeInfoRec* pInfo) const + sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const { SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetObjectItem(SDRATTR_EDGEKIND))).GetValue(); bool bRts1=nAngle1==0; @@ -903,7 +903,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } return aXP; } - USHORT nIntersections=0; + sal_uInt16 nIntersections=0; { Point aC1(aBewareRect1.Center()); Point aC2(aBewareRect2.Center()); @@ -941,8 +941,6 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec long nXMax=Max(aBewareRect1.Right(),aBewareRect2.Right()); long nYMin=Min(aBewareRect1.Top(),aBewareRect2.Top()); long nYMax=Max(aBewareRect1.Bottom(),aBewareRect2.Bottom()); - //bool bBoundOverlap=aBoundRect1.Right()>aBoundRect2.Left() && aBoundRect1.Left()<aBoundRect2.Right() && - // aBoundRect1.Bottom()>aBoundRect2.Top() && aBoundRect1.Top()<aBoundRect2.Bottom(); bool bBewareOverlap=aBewareRect1.Right()>aBewareRect2.Left() && aBewareRect1.Left()<aBewareRect2.Right() && aBewareRect1.Bottom()>aBewareRect2.Top() && aBewareRect1.Top()<aBewareRect2.Bottom(); unsigned nMainCase=3; @@ -971,21 +969,21 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } else if (nMainCase==2) { // Fall 2: if (bHor1) { // beide waagerecht - /* 9 Moeglichkeiten: ù ù ù */ - /* 2.1 Gegenueber, Ueberschneidung à ´ ù */ - /* nur auf der Y-Achse ù ù ù */ - /* 2.2, 2.3 Gegenueber, vertikal versetzt. à ù ù ù ù ù */ - /* Ueberschneidung weder auf der ù ´ ù ù ´ ù */ - /* X- noch auf der Y-Achse ù ù ù à ù ù */ - /* 2.4, 2.5 Untereinander, ù à ù ù ù ù */ - /* Ueberschneidung ù ´ ù ù ´ ù */ - /* nur auf X-Achse ù ù ù ù à ù */ - /* 2.6, 2.7 Gegeneinander, vertikal versetzt. ù ù à ù ù ù */ - /* Ueberschneidung weder auf der ù ´ ù ù ´ ù */ - /* X- noch auf der Y-Achse. ù ù ù ù ù à */ - /* 2.8 Gegeneinander. ù ù ù */ - /* Ueberschneidung nur ù ´ à */ - /* auf der Y-Achse. ù ù ù */ + /* 9 Moeglichkeiten: � � � */ + /* 2.1 Gegenueber, Ueberschneidung � � � */ + /* nur auf der Y-Achse � � � */ + /* 2.2, 2.3 Gegenueber, vertikal versetzt. � � � � � � */ + /* Ueberschneidung weder auf der � � � � � � */ + /* X- noch auf der Y-Achse � � � � � � */ + /* 2.4, 2.5 Untereinander, � � � � � � */ + /* Ueberschneidung � � � � � � */ + /* nur auf X-Achse � � � � � � */ + /* 2.6, 2.7 Gegeneinander, vertikal versetzt. � � � � � � */ + /* Ueberschneidung weder auf der � � � � � � */ + /* X- noch auf der Y-Achse. � � � � � � */ + /* 2.8 Gegeneinander. � � � */ + /* Ueberschneidung nur � � � */ + /* auf der Y-Achse. � � � */ /* 2.9 Die BewareRects der Objekte ueberschneiden */ /* sich auf X- und Y-Achse. */ /* Die Faelle gelten entsprechend umgesetzt auch fuer */ @@ -1004,7 +1002,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec // Ueberschneidung auf der Y-Achse. Faelle 2.1, 2.8, 2.9 if (aBewR1.Right()>aBewR2.Left()) { // Faelle 2.8, 2.9 - // Fall 2.8 ist immer Aussenrumlauf (bDirect=FALSE). + // Fall 2.8 ist immer Aussenrumlauf (bDirect=sal_False). // Fall 2.9 kann auch Direktverbindung sein (bei geringer // Ueberschneidung der BewareRects ohne Ueberschneidung der // Boundrects wenn die Linienaustritte sonst das BewareRect @@ -1062,7 +1060,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec // Ueberschneidung auf der Y-Achse. Faelle 2.1, 2.8, 2.9 if (aBewR1.Bottom()>aBewR2.Top()) { // Faelle 2.8, 2.9 - // Fall 2.8 ist immer Aussenrumlauf (bDirect=FALSE). + // Fall 2.8 ist immer Aussenrumlauf (bDirect=sal_False). // Fall 2.9 kann auch Direktverbindung sein (bei geringer // Ueberschneidung der BewareRects ohne Ueberschneidung der // Boundrects wenn die Linienaustritte sonst das BewareRect @@ -1113,39 +1111,39 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } } else if (nMainCase==3) { // Fall 3: Einer waagerecht und der andere senkrecht. Sehr viele Fallunterscheidungen - /* Kleine Legende: ù ú ù ú ù -> Ohne Ueberschneidung, maximal Beruehrung. */ - /* ú ú ú ú ú -> Ueberschneidung */ - /* ù ú à ú ù -> Selbe Hoehe */ - /* ú ú ú ú ú -> Ueberschneidung */ - /* ù ú ù ú ù -> Ohne Ueberschneidung, maximal Beruehrung. */ - /* Linienaustritte links ´, rechts Ã, oben Á und unten Â. */ + /* Kleine Legende: � � � � � -> Ohne Ueberschneidung, maximal Beruehrung. */ + /* � � � � � -> Ueberschneidung */ + /* � � � � � -> Selbe Hoehe */ + /* � � � � � -> Ueberschneidung */ + /* � � � � � -> Ohne Ueberschneidung, maximal Beruehrung. */ + /* Linienaustritte links �, rechts �, oben � und unten �. */ /* Insgesamt sind 96 Konstellationen moeglich, wobei einige nicht einmal */ /* eindeutig einem Fall und damit einer Behandlungsmethode zugeordnet werden */ /* koennen. */ /* 3.1: Hierzu moegen alle Konstellationen zaehlen, die durch den */ /* Default-MeetingPoint zufriedenstellend abgedeckt sind (20+12). */ - /*    ú Á Á ú    Diese 12 ù ú ù  ù ù ú ù ú ù ù  ù ú ù ù ú ù ú ù */ - /* ú ú ú ú Á Á ú ú ú ú Konstel. ú ú ú ú ú ú ú ú ú  ú ú ú ú ú  ú ú ú ú */ - /* ù ú à ú ù ù ú ´ ú ù jedoch ù ú à ú Á ù ú à ú  Á ú ´ ú ù  ú ´ ú ù */ - /* ú ú ú ú   ú ú ú ú nur zum ú ú ú ú Á ú ú ú ú ú Á ú ú ú ú ú ú ú ú ú */ - /* Á Á Á ú   ú Á Á Á Teil: ù ú ù Á ù ù ú ù ú ù ù Á ù ú ù ù ú ù ú ù */ + /* � � � � � � � � � � Diese 12 � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Konstel. � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � jedoch � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � nur zum � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Teil: � � � � � � � � � � � � � � � � � � � � */ /* Letztere 16 Faelle scheiden aus, sobald sich die Objekte offen */ /* gegenueberstehen (siehe Fall 3.2). */ /* 3.2: Die Objekte stehen sich offen gegenueber und somit ist eine */ /* Verbindung mit lediglich 2 Linien moeglich (4+20). */ /* Dieser Fall hat 1. Prioritaet. */ - /* ù ú ù ú   ú ù ú ù Diese 20 ù ú ù  ù ù  ù ú ù ù ú ù ú ù ù ú ù ú ù */ - /* ú ú ú ú ú ú ú ú ú ú Konstel. ú ú ú     ú ú ú ú ú ú ú ú ú ú ú ú ú */ - /* ù ú à ú ù ù ú ´ ú ù jedoch ù ú à Á Á Á Á ´ ú ù ù ú à     ´ ú ù */ - /* ú ú ú ú ú ú ú ú ú ú nur zum ú ú ú Á Á Á Á ú ú ú ú ú ú ú ú ú ú ú ú ú */ - /* ù ú ù ú Á Á ú ù ú ù Teil: ù ú ù Á ù ù Á ù ú ù ù ú ù ú ù ù ú ù ú ù */ + /* � � � � � � � � � � Diese 20 � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Konstel. � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � jedoch � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � nur zum � � � � � � � � � � � � � � � � � � � � */ + /* � � � � � � � � � � Teil: � � � � � � � � � � � � � � � � � � � � */ /* 3.3: Die Linienaustritte zeigen vom anderen Objekt weg bzw. hinter */ /* dessen Ruecken vorbei (52+4). */ - /* Á Á Á Á ù ù Á Á Á Á ù ú ú ú ù ù ú ù ú ù Diese 4 ù ú ù ú ù ù ú ù ú ù */ - /* Á Á Á Á ú ú Á Á Á Á    ú ú ú ú    Konstel. ú ú ú  ú ú  ú ú ú */ - /* Á Á à ú ù ù ú ´ Á Á   à ú ù ù ú ´   jedoch ù ú à ú ù ù ú ´ ú ù */ - /* Á Á Á ú ú ú ú Á Á Á     ú ú     nur zum ú ú ú Á ú ú Á ú ú ú */ - /* ù ú ù ú ù ù ú ù ú ù     ù ù     Teil: ù ú ù ú ù ù ú ù ú ù */ + /* � � � � � � � � � � � � � � � � � � � � Diese 4 � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � Konstel. � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � jedoch � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � nur zum � � � � � � � � � � */ + /* � � � � � � � � � � � � � � � � � � � � Teil: � � � � � � � � � � */ // Fall 3.2 Rectangle aTmpR1(aBewareRect1); @@ -1189,8 +1187,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec XPolygon aXP1(ImpCalcObjToCenter(aPt1,nAngle1,aBewareRect1,aMeeting)); XPolygon aXP2(ImpCalcObjToCenter(aPt2,nAngle2,aBewareRect2,aMeeting)); - USHORT nXP1Anz=aXP1.GetPointCount(); - USHORT nXP2Anz=aXP2.GetPointCount(); + sal_uInt16 nXP1Anz=aXP1.GetPointCount(); + sal_uInt16 nXP2Anz=aXP2.GetPointCount(); if (bInfo) { pInfo->nObj1Lines=nXP1Anz; if (nXP1Anz>1) pInfo->nObj1Lines--; pInfo->nObj2Lines=nXP2Anz; if (nXP2Anz>1) pInfo->nObj2Lines--; @@ -1228,13 +1226,13 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec // Dies wird die Mittellinie. pInfo->nMiddleLine=nXP1Anz-1; } - USHORT nNum=aXP2.GetPointCount(); + sal_uInt16 nNum=aXP2.GetPointCount(); if (aXP1[nXP1Anz-1]==aXP2[nXP2Anz-1] && nXP1Anz>1 && nXP2Anz>1) nNum--; while (nNum>0) { nNum--; aXP1.Insert(XPOLY_APPEND,aXP2[nNum],XPOLY_NORMAL); } - USHORT nPntAnz=aXP1.GetPointCount(); + sal_uInt16 nPntAnz=aXP1.GetPointCount(); char cForm=0; if (bInfo || pnQuality!=NULL) { cForm='?'; @@ -1243,8 +1241,8 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec else if (nPntAnz==4) { // Z oder U if (nAngle1==nAngle2) cForm='U'; else cForm='Z'; - } else if (nPntAnz==4) { /* Ú-¿ Ú-¿ */ - /* ... -Ù -Ù */ + } else if (nPntAnz==4) { /* �-� �-� */ + /* ... -� -� */ } else if (nPntAnz==6) { // S oder C oder ... if (nAngle1!=nAngle2) { // Fuer Typ S hat Linie2 dieselbe Richtung wie Linie4. @@ -1281,11 +1279,11 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } if (pnQuality!=NULL) { - ULONG nQual=0; - ULONG nQual0=nQual; // Ueberlaeufe vorbeugen + sal_uIntPtr nQual=0; + sal_uIntPtr nQual0=nQual; // Ueberlaeufe vorbeugen bool bOverflow = false; Point aPt0(aXP1[0]); - for (USHORT nPntNum=1; nPntNum<nPntAnz; nPntNum++) { + for (sal_uInt16 nPntNum=1; nPntNum<nPntAnz; nPntNum++) { Point aPt1b(aXP1[nPntNum]); nQual+=Abs(aPt1b.X()-aPt0.X())+Abs(aPt1b.Y()-aPt0.Y()); if (nQual<nQual0) bOverflow = true; @@ -1293,14 +1291,14 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec aPt0=aPt1b; } - USHORT nTmp=nPntAnz; + sal_uInt16 nTmp=nPntAnz; if (cForm=='Z') { nTmp=2; // Z-Form hat gute Qualitaet (nTmp=2 statt 4) - ULONG n1=Abs(aXP1[1].X()-aXP1[0].X())+Abs(aXP1[1].Y()-aXP1[0].Y()); - ULONG n2=Abs(aXP1[2].X()-aXP1[1].X())+Abs(aXP1[2].Y()-aXP1[1].Y()); - ULONG n3=Abs(aXP1[3].X()-aXP1[2].X())+Abs(aXP1[3].Y()-aXP1[2].Y()); + sal_uIntPtr n1=Abs(aXP1[1].X()-aXP1[0].X())+Abs(aXP1[1].Y()-aXP1[0].Y()); + sal_uIntPtr n2=Abs(aXP1[2].X()-aXP1[1].X())+Abs(aXP1[2].Y()-aXP1[1].Y()); + sal_uIntPtr n3=Abs(aXP1[3].X()-aXP1[2].X())+Abs(aXP1[3].Y()-aXP1[2].Y()); // fuer moeglichst gleichlange Linien sorgen - ULONG nBesser=0; + sal_uIntPtr nBesser=0; n1+=n3; n3=n2/4; if (n1>=n2) nBesser=6; @@ -1311,7 +1309,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } if (nTmp>=3) { nQual0=nQual; - nQual+=(ULONG)nTmp*0x01000000; + nQual+=(sal_uIntPtr)nTmp*0x01000000; if (nQual<nQual0 || nTmp>15) bOverflow = true; } if (nPntAnz>=2) { // Austrittswinkel nochmal pruefen @@ -1331,13 +1329,13 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec aBewareRect1=rBewareRect1; aBewareRect2=rBewareRect2; - for (USHORT i=0; i<nPntAnz; i++) { + for (sal_uInt16 i=0; i<nPntAnz; i++) { Point aPt1b(aXP1[i]); bool b1=aPt1b.X()>aBewareRect1.Left() && aPt1b.X()<aBewareRect1.Right() && aPt1b.Y()>aBewareRect1.Top() && aPt1b.Y()<aBewareRect1.Bottom(); bool b2=aPt1b.X()>aBewareRect2.Left() && aPt1b.X()<aBewareRect2.Right() && aPt1b.Y()>aBewareRect2.Top() && aPt1b.Y()<aBewareRect2.Bottom(); - USHORT nInt0=nIntersections; + sal_uInt16 nInt0=nIntersections; if (i==0 || i==nPntAnz-1) { if (b1 && b2) nIntersections++; } else { @@ -1366,7 +1364,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } if (nPntAnz<=1) nIntersections++; nQual0=nQual; - nQual+=(ULONG)nIntersections*0x10000000; + nQual+=(sal_uIntPtr)nIntersections*0x10000000; if (nQual<nQual0 || nIntersections>15) bOverflow = true; if (bOverflow || nQual==0xFFFFFFFF) nQual=0xFFFFFFFE; @@ -1374,7 +1372,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } if (bInfo) { // nun die Linienversaetze auf aXP1 anwenden if (pInfo->nMiddleLine!=0xFFFF) { - USHORT nIdx=pInfo->ImpGetPolyIdx(MIDDLELINE,aXP1); + sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(MIDDLELINE,aXP1); if (pInfo->ImpIsHorzLine(MIDDLELINE,aXP1)) { aXP1[nIdx].Y()+=pInfo->aMiddleLine.Y(); aXP1[nIdx+1].Y()+=pInfo->aMiddleLine.Y(); @@ -1384,7 +1382,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } if (pInfo->nObj1Lines>=2) { - USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE2,aXP1); + sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE2,aXP1); if (pInfo->ImpIsHorzLine(OBJ1LINE2,aXP1)) { aXP1[nIdx].Y()+=pInfo->aObj1Line2.Y(); aXP1[nIdx+1].Y()+=pInfo->aObj1Line2.Y(); @@ -1394,7 +1392,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } if (pInfo->nObj1Lines>=3) { - USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE3,aXP1); + sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ1LINE3,aXP1); if (pInfo->ImpIsHorzLine(OBJ1LINE3,aXP1)) { aXP1[nIdx].Y()+=pInfo->aObj1Line3.Y(); aXP1[nIdx+1].Y()+=pInfo->aObj1Line3.Y(); @@ -1404,7 +1402,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } if (pInfo->nObj2Lines>=2) { - USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE2,aXP1); + sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE2,aXP1); if (pInfo->ImpIsHorzLine(OBJ2LINE2,aXP1)) { aXP1[nIdx].Y()+=pInfo->aObj2Line2.Y(); aXP1[nIdx+1].Y()+=pInfo->aObj2Line2.Y(); @@ -1414,7 +1412,7 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec } } if (pInfo->nObj2Lines>=3) { - USHORT nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE3,aXP1); + sal_uInt16 nIdx=pInfo->ImpGetPolyIdx(OBJ2LINE3,aXP1); if (pInfo->ImpIsHorzLine(OBJ2LINE3,aXP1)) { aXP1[nIdx].Y()+=pInfo->aObj2Line3.Y(); aXP1[nIdx+1].Y()+=pInfo->aObj2Line3.Y(); @@ -1502,17 +1500,17 @@ Normalisiert auf 1. Austrittswinkel nach rechts bleiben dann noch 31. Dann noch eine vertikale Spiegelung wegnormalisiert bleiben noch 16 characteristische Verlaufszuege mit 1-5 Linien: Mit 1 Linie (Typ 'I'): -- -Mit 2 Linien (Typ 'L'): -Ù -Mit 3 Linien (Typ 'U'): -¿ (Typ 'Z'): Ú- - -Ù -Ù +Mit 2 Linien (Typ 'L'): -� +Mit 3 Linien (Typ 'U'): -� (Typ 'Z'): �- + -� -� Mit 4 Linien: 1 ist nicht plausibel, 3 ist=2 (90deg Drehung). Verbleibt 2,4 - Ú-Ù Ú¿ À¿ Ú¿ Ú¿ Ú-¿ - -Ù -Ù -Ù -Ù -Ù -Ù + �-� Ú¿ � Ú¿ Ú¿ �-� + -� -� -� -� -� -� Mit 5 Linien: nicht plausibel sind 1,2,4,5. 7 ist identisch mit 3 (Richtungsumkehr) Bleibt also 3,6 und 8. '4' 'S' 'C' - ¿ Ú -¿ Ú- Ú-¿ Ú- - Ú-Ù Ú-Ù Ú-¿ Ú-¿ À¿ À¿ -Ù ³ Ú-¿ Ú-¿ À¿ Ú-¿ - -Ù -Ù -Ù Ù -Ù À- -Ù -Ù --Ù À Ù -Ù Ù -Ù À Ù + � � -� �- �-� �- + �-� �-� �-� �-� � � -� � �-� �-� � �-� + -� -� -� � -� �- -� -� --� � � -� � -� � � Insgesamt sind also 9 Grundtypen zu unterscheiden die den 400 Konstellationen aus Objektposition und Austrittswinkeln zuzuordnen sind. 4 der 9 Grundtypen haben eine 'Mittellinie'. Die Anzahl der zu Objektabstaende @@ -1532,7 +1530,7 @@ je Objekt variiert von 0-3: void SdrEdgeObj::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) { SfxSimpleHint* pSimple=PTR_CAST(SfxSimpleHint,&rHint); - ULONG nId=pSimple==0 ? 0 : pSimple->GetId(); + sal_uIntPtr nId=pSimple==0 ? 0 : pSimple->GetId(); bool bDataChg=nId==SFX_HINT_DATACHANGED; bool bDying=nId==SFX_HINT_DYING; bool bObj1=aCon1.pObj!=NULL && aCon1.pObj->GetBroadcaster()==&rBC; @@ -1693,10 +1691,10 @@ sal_uInt32 SdrEdgeObj::GetHdlCount() const } else if (eKind==SDREDGE_THREELINES && nPntAnz == 4L) { - if(GetConnectedNode(TRUE)) + if(GetConnectedNode(sal_True)) nHdlAnz++; - if(GetConnectedNode(FALSE)) + if(GetConnectedNode(sal_False)) nHdlAnz++; } } @@ -1711,10 +1709,10 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const if (nPntAnz!=0) { if (nHdlNum==0) { pHdl=new ImpEdgeHdl((*pEdgeTrack)[0],HDL_POLY); - if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(TRUE); + if (aCon1.pObj!=NULL && aCon1.bBestVertex) pHdl->Set1PixMore(sal_True); } else if (nHdlNum==1) { - pHdl=new ImpEdgeHdl((*pEdgeTrack)[USHORT(nPntAnz-1)],HDL_POLY); - if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(TRUE); + pHdl=new ImpEdgeHdl((*pEdgeTrack)[sal_uInt16(nPntAnz-1)],HDL_POLY); + if (aCon2.pObj!=NULL && aCon2.bBestVertex) pHdl->Set1PixMore(sal_True); } else { SdrEdgeKind eKind=((SdrEdgeKindItem&)(GetObjectItem(SDRATTR_EDGEKIND))).GetValue(); if (eKind==SDREDGE_ORTHOLINES || eKind==SDREDGE_BEZIER) { @@ -1754,7 +1752,7 @@ SdrHdl* SdrEdgeObj::GetHdl(sal_uInt32 nHdlNum) const } } else if (eKind==SDREDGE_THREELINES) { sal_uInt32 nNum(nHdlNum); - if (GetConnectedNode(TRUE)==NULL) nNum++; + if (GetConnectedNode(sal_True)==NULL) nNum++; Point aPos((*pEdgeTrack)[(sal_uInt16)nNum-1]); pHdl=new ImpEdgeHdl(aPos,HDL_POLY); if (nNum==2) ((ImpEdgeHdl*)pHdl)->SetLineCode(OBJ1LINE2); @@ -1884,7 +1882,7 @@ bool SdrEdgeObj::applySpecialDrag(SdrDragStat& rDragStat) // force recalc EdgeTrack *pEdgeTrack = ImpCalcEdgeTrack(*pEdgeTrack, aCon1, aCon2, &aEdgeInfo); - bEdgeTrackDirty=FALSE; + bEdgeTrackDirty=sal_False; // save EdgeInfos and mark object as user modified ImpSetEdgeInfoToAttr(); @@ -1986,40 +1984,40 @@ basegfx::B2DPolygon SdrEdgeObj::ImplAddConnectorOverlay(SdrDragMethod& rDragMeth bool SdrEdgeObj::BegCreate(SdrDragStat& rDragStat) { - rDragStat.SetNoSnap(TRUE); + rDragStat.SetNoSnap(sal_True); pEdgeTrack->SetPointCount(2); (*pEdgeTrack)[0]=rDragStat.GetStart(); (*pEdgeTrack)[1]=rDragStat.GetNow(); if (rDragStat.GetPageView()!=NULL) { ImpFindConnector(rDragStat.GetStart(),*rDragStat.GetPageView(),aCon1,this); - ConnectToNode(TRUE,aCon1.pObj); + ConnectToNode(sal_True,aCon1.pObj); } *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo); - return TRUE; + return sal_True; } bool SdrEdgeObj::MovCreate(SdrDragStat& rDragStat) { - USHORT nMax=pEdgeTrack->GetPointCount(); + sal_uInt16 nMax=pEdgeTrack->GetPointCount(); (*pEdgeTrack)[nMax-1]=rDragStat.GetNow(); if (rDragStat.GetPageView()!=NULL) { ImpFindConnector(rDragStat.GetNow(),*rDragStat.GetPageView(),aCon2,this); rDragStat.GetView()->SetConnectMarker(aCon2,*rDragStat.GetPageView()); } SetBoundRectDirty(); - bSnapRectDirty=TRUE; - ConnectToNode(FALSE,aCon2.pObj); + bSnapRectDirty=sal_True; + ConnectToNode(sal_False,aCon2.pObj); *pEdgeTrack=ImpCalcEdgeTrack(*pEdgeTrack,aCon1,aCon2,&aEdgeInfo); - bEdgeTrackDirty=FALSE; - return TRUE; + bEdgeTrackDirty=sal_False; + return sal_True; } bool SdrEdgeObj::EndCreate(SdrDragStat& rDragStat, SdrCreateCmd eCmd) { bool bOk=(eCmd==SDRCREATE_FORCEEND || rDragStat.GetPointAnz()>=2); if (bOk) { - ConnectToNode(TRUE,aCon1.pObj); - ConnectToNode(FALSE,aCon2.pObj); + ConnectToNode(sal_True,aCon1.pObj); + ConnectToNode(sal_False,aCon2.pObj); if (rDragStat.GetView()!=NULL) { rDragStat.GetView()->HideConnectMarker(); } @@ -2034,7 +2032,7 @@ bool SdrEdgeObj::BckCreate(SdrDragStat& rDragStat) if (rDragStat.GetView()!=NULL) { rDragStat.GetView()->HideConnectMarker(); } - return FALSE; + return sal_False; } void SdrEdgeObj::BrkCreate(SdrDragStat& rDragStat) @@ -2060,11 +2058,11 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO { rCon.ResetVars(); if (pOut==NULL) pOut=rPV.GetView().GetFirstOutputDevice(); // GetWin(0); - if (pOut==NULL) return FALSE; + if (pOut==NULL) return sal_False; SdrObjList* pOL=rPV.GetObjList(); const SetOfByte& rVisLayer=rPV.GetVisibleLayers(); // Sensitiver Bereich der Konnektoren ist doppelt so gross wie die Handles: - USHORT nMarkHdSiz=rPV.GetView().GetMarkHdlSizePixel(); + sal_uInt16 nMarkHdSiz=rPV.GetView().GetMarkHdlSizePixel(); Size aHalfConSiz(nMarkHdSiz,nMarkHdSiz); aHalfConSiz=pOut->PixelToLogic(aHalfConSiz); Size aHalfCenterSiz(2*aHalfConSiz.Width(),2*aHalfConSiz.Height()); @@ -2073,8 +2071,8 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO aMouseRect.Top() -=aHalfConSiz.Height(); aMouseRect.Right() +=aHalfConSiz.Width(); aMouseRect.Bottom()+=aHalfConSiz.Height(); - USHORT nBoundHitTol=(USHORT)aHalfConSiz.Width()/2; if (nBoundHitTol==0) nBoundHitTol=1; - ULONG no=pOL->GetObjCount(); + sal_uInt16 nBoundHitTol=(sal_uInt16)aHalfConSiz.Width()/2; if (nBoundHitTol==0) nBoundHitTol=1; + sal_uIntPtr no=pOL->GetObjCount(); bool bFnd = false; SdrObjConnection aTestCon; SdrObjConnection aBestCon; @@ -2095,11 +2093,11 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO // Danach kommt Vertex, Corner und Mitte(Best) gleich priorisiert. // Zum Schluss kommt noch ein HitTest aufs Obj. const SdrGluePointList* pGPL=pObj->GetGluePointList(); - USHORT nConAnz=pGPL==NULL ? 0 : pGPL->GetCount(); - USHORT nGesAnz=nConAnz+9; + sal_uInt16 nConAnz=pGPL==NULL ? 0 : pGPL->GetCount(); + sal_uInt16 nGesAnz=nConAnz+9; bool bUserFnd = false; - ULONG nBestDist=0xFFFFFFFF; - for (USHORT i=0; i<nGesAnz; i++) + sal_uIntPtr nBestDist=0xFFFFFFFF; + for (sal_uInt16 i=0; i<nGesAnz; i++) { bool bUser=i<nConAnz; bool bVertex=i>=nConAnz+0 && i<nConAnz+4; @@ -2107,7 +2105,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO bool bCenter=i==nConAnz+8; bool bOk = false; Point aConPos; - USHORT nConNum=i; + sal_uInt16 nConNum=i; if (bUser) { const SdrGluePoint& rGP=(*pGPL)[nConNum]; aConPos=rGP.GetAbsolutePos(*pObj); @@ -2143,14 +2141,14 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO if (bOk && aMouseRect.IsInside(aConPos)) { if (bUser) bUserFnd = true; bFnd = true; - ULONG nDist=(ULONG)Abs(aConPos.X()-rPt.X())+(ULONG)Abs(aConPos.Y()-rPt.Y()); + sal_uIntPtr nDist=(sal_uIntPtr)Abs(aConPos.X()-rPt.X())+(sal_uIntPtr)Abs(aConPos.Y()-rPt.Y()); if (nDist<nBestDist) { nBestDist=nDist; aTestCon.pObj=pObj; aTestCon.nConId=nConNum; aTestCon.bAutoCorner=bCorner; aTestCon.bAutoVertex=bVertex; - aTestCon.bBestConn=FALSE; // bCenter; + aTestCon.bBestConn=sal_False; // bCenter; aTestCon.bBestVertex=bCenter; } } @@ -2167,7 +2165,7 @@ bool SdrEdgeObj::ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrO { bFnd = true; aTestCon.pObj=pObj; - aTestCon.bBestConn=TRUE; + aTestCon.bBestConn=sal_True; } } if (bFnd) { @@ -2238,7 +2236,7 @@ void SdrEdgeObj::NbcResize(const Point& rRefPnt, const Fraction& aXFact, const F } } -SdrObject* SdrEdgeObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrEdgeObj::DoConvertToPolyObj(sal_Bool bBezier) const { basegfx::B2DPolyPolygon aPolyPolygon; aPolyPolygon.append(pEdgeTrack->getB2DPolygon()); @@ -2256,7 +2254,7 @@ sal_uInt32 SdrEdgeObj::GetSnapPointCount() const Point SdrEdgeObj::GetSnapPoint(sal_uInt32 i) const { ((SdrEdgeObj*)this)->ImpUndirtyEdgeTrack(); - USHORT nAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nAnz=pEdgeTrack->GetPointCount(); if (i==0) return (*pEdgeTrack)[0]; else return (*pEdgeTrack)[nAnz-1]; } @@ -2274,7 +2272,7 @@ sal_uInt32 SdrEdgeObj::GetPointCount() const Point SdrEdgeObj::GetPoint(sal_uInt32 i) const { ((SdrEdgeObj*)this)->ImpUndirtyEdgeTrack(); - USHORT nAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nAnz=pEdgeTrack->GetPointCount(); if (0L == i) return (*pEdgeTrack)[0]; else @@ -2285,7 +2283,7 @@ void SdrEdgeObj::NbcSetPoint(const Point& rPnt, sal_uInt32 i) { // ToDo: Umconnekten fehlt noch ImpUndirtyEdgeTrack(); - USHORT nAnz=pEdgeTrack->GetPointCount(); + sal_uInt16 nAnz=pEdgeTrack->GetPointCount(); if (0L == i) (*pEdgeTrack)[0]=rPnt; if (1L == i) @@ -2341,7 +2339,7 @@ void SdrEdgeObj::RestGeoData(const SdrObjGeoData& rGeo) aEdgeInfo =rEGeo.aEdgeInfo; } -Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const +Point SdrEdgeObj::GetTailPoint( sal_Bool bTail ) const { if( pEdgeTrack && pEdgeTrack->GetPointCount()!=0) { @@ -2352,7 +2350,7 @@ Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const } else { - const USHORT nSiz = rTrack0.GetPointCount() - 1; + const sal_uInt16 nSiz = rTrack0.GetPointCount() - 1; return rTrack0[nSiz]; } } @@ -2366,7 +2364,7 @@ Point SdrEdgeObj::GetTailPoint( BOOL bTail ) const } -void SdrEdgeObj::SetTailPoint( BOOL bTail, const Point& rPt ) +void SdrEdgeObj::SetTailPoint( sal_Bool bTail, const Point& rPt ) { ImpSetTailPoint( bTail, rPt ); SetChanged(); @@ -2404,12 +2402,12 @@ void SdrEdgeObj::setGluePointIndex( sal_Bool bTail, sal_Int32 nIndex /* = -1 */ nIndex = 0; } - rConn1.SetConnectorId( (USHORT)nIndex ); + rConn1.SetConnectorId( (sal_uInt16)nIndex ); SetChanged(); SetRectsDirty(); ImpRecalcEdgeTrack(); - // bEdgeTrackDirty=TRUE; + // bEdgeTrackDirty=sal_True; } /** this method is used by the api to return a glue point id for a connection. diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 99f3cebcf9..2e8c65a1e4 100644..100755 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -46,15 +46,16 @@ #include <vcl/svapp.hxx> #include <sfx2/linkmgr.hxx> +#include <sfx2/docfile.hxx> #include <svx/svdetc.hxx> -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" #include <svx/svdpool.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdmrkv.hxx> #include <svx/svdpagv.hxx> -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <svx/svdview.hxx> #include "svtools/filter.hxx" #include <svx/svdograf.hxx> @@ -70,6 +71,7 @@ #include <svx/sdr/contact/viewcontactofgraphic.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +#include <osl/thread.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::io; @@ -81,13 +83,48 @@ using namespace ::com::sun::star::io; #define GRAFSTREAMPOS_INVALID 0xffffffff #define SWAPGRAPHIC_TIMEOUT 5000 + // ------------------ // - SdrGraphicLink - // ------------------ + +const Graphic ImpLoadLinkedGraphic( const String& rFileName, const String& rFilterName ) +{ + Graphic aGraphic; + + SfxMedium xMed( rFileName, STREAM_STD_READ, sal_True ); + xMed.DownLoad(); + + SvStream* pInStrm = xMed.GetInStream(); + if ( pInStrm ) + { + pInStrm->Seek( STREAM_SEEK_TO_BEGIN ); + GraphicFilter* pGF = GraphicFilter::GetGraphicFilter(); + + const sal_uInt16 nFilter = rFilterName.Len() && pGF->GetImportFormatCount() + ? pGF->GetImportFormatNumber( rFilterName ) + : GRFILTER_FORMAT_DONTKNOW; + + String aEmptyStr; + com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aFilterData( 1 ); + + // Room for improvment: + // As this is a linked graphic the GfxLink is not needed if saving/loading our own format. + // But this link is required by some filters to access the native graphic (pdf export/ms export), + // there we should create a new service to provide this data if needed + aFilterData[ 0 ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CreateNativeLink" ) ); + aFilterData[ 0 ].Value = Any( sal_True ); + pGF->ImportGraphic( aGraphic, aEmptyStr, *pInStrm, nFilter, NULL, 0, &aFilterData ); + } + return aGraphic; +} + +class SdrGraphicUpdater; class SdrGraphicLink : public sfx2::SvBaseLink { SdrGrafObj* pGrafObj; + SdrGraphicUpdater* pGraphicUpdater; public: SdrGraphicLink(SdrGrafObj* pObj); @@ -96,24 +133,111 @@ public: virtual void Closed(); virtual void DataChanged( const String& rMimeType, const ::com::sun::star::uno::Any & rValue ); + void DataChanged( const Graphic& rGraphic ); - BOOL Connect() { return 0 != GetRealObject(); } - void UpdateSynchron(); + sal_Bool Connect() { return 0 != GetRealObject(); } + void UpdateAsynchron(); + void RemoveGraphicUpdater(); }; +class SdrGraphicUpdater : public ::osl::Thread +{ +public: + SdrGraphicUpdater( const String& rFileName, const String& rFilterName, SdrGraphicLink& ); + virtual ~SdrGraphicUpdater( void ); + + void SAL_CALL Terminate( void ); + + sal_Bool GraphicLinkChanged( const String& rFileName ){ return mrFileName != rFileName; }; + +protected: + + /** is called from the inherited create method and acts as the + main function of this thread. + */ + virtual void SAL_CALL run(void); + + /** Called after the thread is terminated via the terminate + method. Used to kill the thread by calling delete on this. + */ + virtual void SAL_CALL onTerminated(void); + +private: + + ::osl::Mutex maMutex; + const String& mrFileName; + const String& mrFilterName; + SdrGraphicLink& mrGraphicLink; + + volatile bool mbIsTerminated; +}; + +SdrGraphicUpdater::SdrGraphicUpdater( const String& rFileName, const String& rFilterName, SdrGraphicLink& rGraphicLink ) +: mrFileName( rFileName ) +, mrFilterName( rFilterName ) +, mrGraphicLink( rGraphicLink ) +, mbIsTerminated( sal_False ) +{ + create(); +} + +SdrGraphicUpdater::~SdrGraphicUpdater( void ) +{ +} + +void SdrGraphicUpdater::Terminate() +{ + ::osl::MutexGuard aGuard( maMutex ); + mbIsTerminated = sal_True; +} + +void SAL_CALL SdrGraphicUpdater::onTerminated(void) +{ + delete this; +} + +void SAL_CALL SdrGraphicUpdater::run(void) +{ + Graphic aGraphic( ImpLoadLinkedGraphic( mrFileName, mrFilterName ) ); + ::osl::MutexGuard aGuard(maMutex); + SolarMutexGuard aSolarGuard; + if ( !mbIsTerminated ) + { + mrGraphicLink.DataChanged( aGraphic ); + mrGraphicLink.RemoveGraphicUpdater(); + } +} + // ----------------------------------------------------------------------------- -SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj): - ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ), - pGrafObj(pObj) +SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj) +: ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ) +, pGrafObj( pObj ) +, pGraphicUpdater( NULL ) { - SetSynchron( FALSE ); + SetSynchron( sal_False ); } // ----------------------------------------------------------------------------- SdrGraphicLink::~SdrGraphicLink() { + if ( pGraphicUpdater ) + pGraphicUpdater->Terminate(); +} + +// ----------------------------------------------------------------------------- + +void SdrGraphicLink::DataChanged( const Graphic& rGraphic ) +{ + pGrafObj->ImpSetLinkedGraphic( rGraphic ); +} + +// ----------------------------------------------------------------------------- + +void SdrGraphicLink::RemoveGraphicUpdater() +{ + pGraphicUpdater = NULL; } // ----------------------------------------------------------------------------- @@ -136,9 +260,8 @@ void SdrGraphicLink::DataChanged( const String& rMimeType, } else if( SotExchange::GetFormatIdFromMimeType( rMimeType ) != sfx2::LinkManager::RegisterStatusInfoId() ) { - // only repaint, no objectchange - pGrafObj->ActionChanged(); - // pGrafObj->BroadcastObjectChange(); + // broadcasting, to update slidesorter + pGrafObj->BroadcastObjectChange(); } } } @@ -156,14 +279,20 @@ void SdrGraphicLink::Closed() // ----------------------------------------------------------------------------- -void SdrGraphicLink::UpdateSynchron() +void SdrGraphicLink::UpdateAsynchron() { if( GetObj() ) { - String aMimeType( SotExchange::GetFormatMimeType( GetContentType() )); - ::com::sun::star::uno::Any aValue; - GetObj()->GetData( aValue, aMimeType, TRUE ); - DataChanged( aMimeType, aValue ); + if ( pGraphicUpdater ) + { + if ( pGraphicUpdater->GraphicLinkChanged( pGrafObj->GetFileName() ) ) + { + pGraphicUpdater->Terminate(); + pGraphicUpdater = new SdrGraphicUpdater( pGrafObj->GetFileName(), pGrafObj->GetFilterName(), *this ); + } + } + else + pGraphicUpdater = new SdrGraphicUpdater( pGrafObj->GetFileName(), pGrafObj->GetFilterName(), *this ); } } @@ -196,11 +325,11 @@ TYPEINIT1(SdrGrafObj,SdrRectObj); SdrGrafObj::SdrGrafObj() : SdrRectObj(), pGraphicLink ( NULL ), - bMirrored ( FALSE ) + bMirrored ( sal_False ) { pGraphic = new GraphicObject; pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT ); - bNoShear = TRUE; + bNoShear = sal_True; // #111096# mbGrafAnimationAllowed = sal_True; @@ -219,11 +348,11 @@ SdrGrafObj::SdrGrafObj() SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect) : SdrRectObj ( rRect ), pGraphicLink ( NULL ), - bMirrored ( FALSE ) + bMirrored ( sal_False ) { pGraphic = new GraphicObject( rGrf ); pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT ); - bNoShear = TRUE; + bNoShear = sal_True; // #111096# mbGrafAnimationAllowed = sal_True; @@ -242,11 +371,11 @@ SdrGrafObj::SdrGrafObj(const Graphic& rGrf, const Rectangle& rRect) SdrGrafObj::SdrGrafObj( const Graphic& rGrf ) : SdrRectObj(), pGraphicLink ( NULL ), - bMirrored ( FALSE ) + bMirrored ( sal_False ) { pGraphic = new GraphicObject( rGrf ); pGraphic->SetSwapStreamHdl( LINK( this, SdrGrafObj, ImpSwapHdl ), SWAPGRAPHIC_TIMEOUT ); - bNoShear = TRUE; + bNoShear = sal_True; // #111096# mbGrafAnimationAllowed = sal_True; @@ -318,7 +447,7 @@ const Graphic& SdrGrafObj::GetGraphic() const // ----------------------------------------------------------------------------- -Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const +Graphic SdrGrafObj::GetTransformedGraphic( sal_uIntPtr nTransformFlags ) const { // #107947# Refactored most of the code to GraphicObject, where // everybody can use e.g. the cropping functionality @@ -326,8 +455,8 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const GraphicType eType = GetGraphicType(); MapMode aDestMap( pModel->GetScaleUnit(), Point(), pModel->GetScaleFraction(), pModel->GetScaleFraction() ); const Size aDestSize( GetLogicRect().GetSize() ); - const BOOL bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0; - const BOOL bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) && + const sal_Bool bMirror = ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_MIRROR ) != 0; + const sal_Bool bRotate = ( ( nTransformFlags & SDRGRAFOBJ_TRANSFORMATTR_ROTATE ) != 0 ) && ( aGeo.nDrehWink && aGeo.nDrehWink != 18000 ) && ( GRAPHIC_NONE != eType ); // #104115# Need cropping info earlier @@ -343,7 +472,7 @@ Graphic SdrGrafObj::GetTransformedGraphic( ULONG nTransformFlags ) const if( bMirror ) { - USHORT nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 ); + sal_uInt16 nMirrorCase = ( aGeo.nDrehWink == 18000 ) ? ( bMirrored ? 3 : 4 ) : ( bMirrored ? 2 : 1 ); bool bHMirr = nMirrorCase == 2 || nMirrorCase == 4; bool bVMirr = nMirrorCase == 3 || nMirrorCase == 4; @@ -448,8 +577,10 @@ void SdrGrafObj::ForceSwapIn() const const_cast< SdrGrafObj* >( this )->mbIsPreview = sal_False; } - - pGraphic->FireSwapInRequest(); + if ( pGraphicLink && pGraphic->IsSwappedOut() ) + ImpUpdateGraphicLink( sal_False ); + else + pGraphic->FireSwapInRequest(); if( pGraphic->IsSwappedOut() || ( pGraphic->GetType() == GRAPHIC_NONE ) || @@ -533,57 +664,69 @@ void SdrGrafObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const aGeo.nDrehWink % 18000 == 0 || aGeo.nDrehWink % 27000 == 0; - rInfo.bResizePropAllowed = TRUE; + rInfo.bResizePropAllowed = sal_True; rInfo.bRotateFreeAllowed = bNoPresGrf && !bAnim; rInfo.bRotate90Allowed = bNoPresGrf && !bAnim; rInfo.bMirrorFreeAllowed = bNoPresGrf && !bAnim; rInfo.bMirror45Allowed = bNoPresGrf && !bAnim; rInfo.bMirror90Allowed = !bEmptyPresObj; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed = FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bCanConvToPath = FALSE; - rInfo.bCanConvToPathLineToArea = FALSE; - rInfo.bCanConvToPolyLineToArea = FALSE; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed = sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bCanConvToPath = sal_False; + rInfo.bCanConvToPathLineToArea = sal_False; + rInfo.bCanConvToPolyLineToArea = sal_False; rInfo.bCanConvToPoly = !IsEPS(); rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } // ----------------------------------------------------------------------------- -UINT16 SdrGrafObj::GetObjIdentifier() const +sal_uInt16 SdrGrafObj::GetObjIdentifier() const { - return UINT16( OBJ_GRAF ); + return sal_uInt16( OBJ_GRAF ); } // ----------------------------------------------------------------------------- -sal_Bool SdrGrafObj::ImpUpdateGraphicLink() const +/* The graphic of the GraphicLink will be loaded. If it is called with + bAsynchron = true then the graphic will be set later via DataChanged +*/ +sal_Bool SdrGrafObj::ImpUpdateGraphicLink( sal_Bool bAsynchron ) const { - sal_Bool bRet = sal_False; - + sal_Bool bRet = sal_False; if( pGraphicLink ) { - const sal_Bool bIsChanged = pModel->IsChanged(); - pGraphicLink->UpdateSynchron(); - pModel->SetChanged( bIsChanged ); - + if ( bAsynchron ) + pGraphicLink->UpdateAsynchron(); + else + pGraphicLink->DataChanged( ImpLoadLinkedGraphic( aFileName, aFilterName ) ); bRet = sal_True; } - return bRet; } // ----------------------------------------------------------------------------- +void SdrGrafObj::ImpSetLinkedGraphic( const Graphic& rGraphic ) +{ + const sal_Bool bIsChanged = GetModel()->IsChanged(); + NbcSetGraphic( rGraphic ); + ActionChanged(); + BroadcastObjectChange(); + GetModel()->SetChanged( bIsChanged ); +} + +// ----------------------------------------------------------------------------- + void SdrGrafObj::TakeObjNameSingul(XubString& rName) const { switch( pGraphic->GetType() ) { case GRAPHIC_BITMAP: { - const USHORT nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ? + const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ? ( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPTRANSLNK : STR_ObjNameSingulGRAFBMPTRANS ) : ( IsLinkedGraphic() ? STR_ObjNameSingulGRAFBMPLNK : STR_ObjNameSingulGRAFBMP ) ); @@ -622,7 +765,7 @@ void SdrGrafObj::TakeObjNamePlural( XubString& rName ) const { case GRAPHIC_BITMAP: { - const USHORT nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ? + const sal_uInt16 nId = ( ( pGraphic->IsTransparent() || ( (const SdrGrafTransparenceItem&) GetObjectItem( SDRATTR_GRAFTRANSPARENCE ) ).GetValue() ) ? ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPTRANSLNK : STR_ObjNamePluralGRAFBMPTRANS ) : ( IsLinkedGraphic() ? STR_ObjNamePluralGRAFBMPLNK : STR_ObjNamePluralGRAFBMP ) ); @@ -781,7 +924,6 @@ void SdrGrafObj::NbcSetSnapRect(const Rectangle& rRect) void SdrGrafObj::NbcSetLogicRect( const Rectangle& rRect) { - //bool bChg=rRect.GetSize()!=aRect.GetSize(); SdrRectObj::NbcSetLogicRect(rRect); } @@ -805,9 +947,6 @@ void SdrGrafObj::SaveGeoData(SdrObjGeoData& rGeo) const void SdrGrafObj::RestGeoData(const SdrObjGeoData& rGeo) { - //long nDrehMerk = aGeo.nDrehWink; - //long nShearMerk = aGeo.nShearWink; - //bool bMirrMerk = bMirrored; Size aSizMerk( aRect.GetSize() ); SdrRectObj::RestGeoData(rGeo); @@ -898,7 +1037,7 @@ const GDIMetaFile* SdrGrafObj::GetGDIMetaFile() const // ----------------------------------------------------------------------------- -SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrGrafObj::DoConvertToPolyObj(sal_Bool bBezier) const { SdrObject* pRetval = NULL; @@ -915,7 +1054,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const aFilter.SetScaleRect(GetSnapRect()); aFilter.SetLayer(GetLayer()); - UINT32 nInsAnz = aFilter.DoImport(GetTransformedGraphic().GetGDIMetaFile(), *pGrp->GetSubList(), 0); + sal_uInt32 nInsAnz = aFilter.DoImport(GetTransformedGraphic().GetGDIMetaFile(), *pGrp->GetSubList(), 0); if(nInsAnz) { pRetval = pGrp; @@ -961,7 +1100,7 @@ SdrObject* SdrGrafObj::DoConvertToPolyObj(BOOL bBezier) const Bitmap aBitmap( GetTransformedGraphic().GetBitmap() ); XOBitmap aXBmp(aBitmap, XBITMAP_STRETCH); aSet.Put(XFillBitmapItem(String(), aXBmp)); - aSet.Put(XFillBmpTileItem(FALSE)); + aSet.Put(XFillBmpTileItem(sal_False)); pRetval->SetMergedItemSet(aSet); } @@ -999,7 +1138,7 @@ void SdrGrafObj::ImpSetAttrToGrafInfo() aGrafInfo.SetChannelG( ( (SdrGrafGreenItem&) rSet.Get( SDRATTR_GRAFGREEN ) ).GetValue() ); aGrafInfo.SetChannelB( ( (SdrGrafBlueItem&) rSet.Get( SDRATTR_GRAFBLUE ) ).GetValue() ); aGrafInfo.SetGamma( ( (SdrGrafGamma100Item&) rSet.Get( SDRATTR_GRAFGAMMA ) ).GetValue() * 0.01 ); - aGrafInfo.SetTransparency( (BYTE) FRound( Min( nTrans, (USHORT) 100 ) * 2.55 ) ); + aGrafInfo.SetTransparency( (sal_uInt8) FRound( Min( nTrans, (sal_uInt16) 100 ) * 2.55 ) ); aGrafInfo.SetInvert( ( (SdrGrafInvertItem&) rSet.Get( SDRATTR_GRAFINVERT ) ).GetValue() ); aGrafInfo.SetDrawMode( ( (SdrGrafModeItem&) rSet.Get( SDRATTR_GRAFMODE ) ).GetValue() ); aGrafInfo.SetCrop( rCrop.GetLeft(), rCrop.GetTop(), rCrop.GetRight(), rCrop.GetBottom() ); @@ -1018,7 +1157,7 @@ void SdrGrafObj::ImpSetGrafInfoToAttr() SetObjectItem( SdrGrafGreenItem( aGrafInfo.GetChannelG() ) ); SetObjectItem( SdrGrafBlueItem( aGrafInfo.GetChannelB() ) ); SetObjectItem( SdrGrafGamma100Item( FRound( aGrafInfo.GetGamma() * 100.0 ) ) ); - SetObjectItem( SdrGrafTransparenceItem( (USHORT) FRound( aGrafInfo.GetTransparency() / 2.55 ) ) ); + SetObjectItem( SdrGrafTransparenceItem( (sal_uInt16) FRound( aGrafInfo.GetTransparency() / 2.55 ) ) ); SetObjectItem( SdrGrafInvertItem( aGrafInfo.IsInvert() ) ); SetObjectItem( SdrGrafModeItem( aGrafInfo.GetDrawMode() ) ); SetObjectItem( SdrGrafCropItem( aGrafInfo.GetLeftCrop(), aGrafInfo.GetTopCrop(), aGrafInfo.GetRightCrop(), aGrafInfo.GetBottomCrop() ) ); @@ -1091,12 +1230,12 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) // ## test only if there are VOCs other than the preview renderer if(!GetViewContact().HasViewObjectContacts(true)) { - const ULONG nSwapMode = pModel->GetSwapGraphicsMode(); + const sal_uIntPtr nSwapMode = pModel->GetSwapGraphicsMode(); if( ( pGraphic->HasUserData() || pGraphicLink ) && ( nSwapMode & SDR_SWAPGRAPHICSMODE_PURGE ) ) { - pRet = NULL; + pRet = GRFMGR_AUTOSWAPSTREAM_LINK; } else if( nSwapMode & SDR_SWAPGRAPHICSMODE_TEMP ) { @@ -1123,7 +1262,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) { SdrDocumentStreamInfo aStreamInfo; - aStreamInfo.mbDeleteAfterUse = FALSE; + aStreamInfo.mbDeleteAfterUse = sal_False; aStreamInfo.maUserData = pGraphic->GetUserData(); SvStream* pStream = pModel->GetDocumentStream( aStreamInfo ); @@ -1181,7 +1320,7 @@ IMPL_LINK( SdrGrafObj, ImpSwapHdl, GraphicObject*, pO ) } } } - else if( !ImpUpdateGraphicLink() ) + else if( !ImpUpdateGraphicLink( sal_False ) ) { pRet = GRFMGR_AUTOSWAPSTREAM_TEMP; } @@ -1241,7 +1380,7 @@ Reference< XInputStream > SdrGrafObj::getInputStream() { SdrDocumentStreamInfo aStreamInfo; - aStreamInfo.mbDeleteAfterUse = FALSE; + aStreamInfo.mbDeleteAfterUse = sal_False; aStreamInfo.maUserData = pGraphic->GetUserData(); SvStream* pStream = pModel->GetDocumentStream( aStreamInfo ); diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 6d36fd1b60..5c73ea0a78 100644..100755 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -46,14 +46,14 @@ #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdobj.hxx> #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> #include <svx/svdattrx.hxx> // NotPersistItems #include <svx/svdoedge.hxx> // #32383# Die Verbinder nach Move nochmal anbroadcasten -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svx/svxids.hrc> #include <svl/whiter.hxx> @@ -101,10 +101,10 @@ SdrObjGroup::SdrObjGroup() pSub=new SdrObjList(NULL,NULL); pSub->SetOwnerObj(this); pSub->SetListKind(SDROBJLIST_GROUPOBJ); - bRefPoint=FALSE; + bRefPoint=sal_False; nDrehWink=0; nShearWink=0; - bClosedObj=FALSE; + bClosedObj=sal_False; } @@ -115,51 +115,51 @@ SdrObjGroup::~SdrObjGroup() void SdrObjGroup::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bNoContortion=FALSE; + rInfo.bNoContortion=sal_False; SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); SdrObjTransformInfoRec aInfo; pObj->TakeObjInfo(aInfo); - if (!aInfo.bMoveAllowed ) rInfo.bMoveAllowed =FALSE; - if (!aInfo.bResizeFreeAllowed ) rInfo.bResizeFreeAllowed =FALSE; - if (!aInfo.bResizePropAllowed ) rInfo.bResizePropAllowed =FALSE; - if (!aInfo.bRotateFreeAllowed ) rInfo.bRotateFreeAllowed =FALSE; - if (!aInfo.bRotate90Allowed ) rInfo.bRotate90Allowed =FALSE; - if (!aInfo.bMirrorFreeAllowed ) rInfo.bMirrorFreeAllowed =FALSE; - if (!aInfo.bMirror45Allowed ) rInfo.bMirror45Allowed =FALSE; - if (!aInfo.bMirror90Allowed ) rInfo.bMirror90Allowed =FALSE; - if (!aInfo.bShearAllowed ) rInfo.bShearAllowed =FALSE; - if (!aInfo.bEdgeRadiusAllowed ) rInfo.bEdgeRadiusAllowed =FALSE; - if (!aInfo.bNoOrthoDesired ) rInfo.bNoOrthoDesired =FALSE; - if (aInfo.bNoContortion ) rInfo.bNoContortion =TRUE; - if (!aInfo.bCanConvToPath ) rInfo.bCanConvToPath =FALSE; + if (!aInfo.bMoveAllowed ) rInfo.bMoveAllowed =sal_False; + if (!aInfo.bResizeFreeAllowed ) rInfo.bResizeFreeAllowed =sal_False; + if (!aInfo.bResizePropAllowed ) rInfo.bResizePropAllowed =sal_False; + if (!aInfo.bRotateFreeAllowed ) rInfo.bRotateFreeAllowed =sal_False; + if (!aInfo.bRotate90Allowed ) rInfo.bRotate90Allowed =sal_False; + if (!aInfo.bMirrorFreeAllowed ) rInfo.bMirrorFreeAllowed =sal_False; + if (!aInfo.bMirror45Allowed ) rInfo.bMirror45Allowed =sal_False; + if (!aInfo.bMirror90Allowed ) rInfo.bMirror90Allowed =sal_False; + if (!aInfo.bShearAllowed ) rInfo.bShearAllowed =sal_False; + if (!aInfo.bEdgeRadiusAllowed ) rInfo.bEdgeRadiusAllowed =sal_False; + if (!aInfo.bNoOrthoDesired ) rInfo.bNoOrthoDesired =sal_False; + if (aInfo.bNoContortion ) rInfo.bNoContortion =sal_True; + if (!aInfo.bCanConvToPath ) rInfo.bCanConvToPath =sal_False; if(!aInfo.bCanConvToContour) - rInfo.bCanConvToContour = FALSE; + rInfo.bCanConvToContour = sal_False; - if (!aInfo.bCanConvToPoly ) rInfo.bCanConvToPoly =FALSE; - if (!aInfo.bCanConvToPathLineToArea) rInfo.bCanConvToPathLineToArea=FALSE; - if (!aInfo.bCanConvToPolyLineToArea) rInfo.bCanConvToPolyLineToArea=FALSE; + if (!aInfo.bCanConvToPoly ) rInfo.bCanConvToPoly =sal_False; + if (!aInfo.bCanConvToPathLineToArea) rInfo.bCanConvToPathLineToArea=sal_False; + if (!aInfo.bCanConvToPolyLineToArea) rInfo.bCanConvToPolyLineToArea=sal_False; } if (nObjAnz==0) { - rInfo.bRotateFreeAllowed=FALSE; - rInfo.bRotate90Allowed =FALSE; - rInfo.bMirrorFreeAllowed=FALSE; - rInfo.bMirror45Allowed =FALSE; - rInfo.bMirror90Allowed =FALSE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bNoContortion =TRUE; + rInfo.bRotateFreeAllowed=sal_False; + rInfo.bRotate90Allowed =sal_False; + rInfo.bMirrorFreeAllowed=sal_False; + rInfo.bMirror45Allowed =sal_False; + rInfo.bMirror90Allowed =sal_False; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bNoContortion =sal_True; } if(nObjAnz != 1) { // only allowed if single object selected - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; } } @@ -170,9 +170,9 @@ void SdrObjGroup::SetBoundRectDirty() // not re-creatable view data } -UINT16 SdrObjGroup::GetObjIdentifier() const +sal_uInt16 SdrObjGroup::GetObjIdentifier() const { - return UINT16(OBJ_GRUP); + return sal_uInt16(OBJ_GRUP); } @@ -181,8 +181,8 @@ SdrLayerID SdrObjGroup::GetLayer() const bool b1st = true; SdrLayerID nLay=SdrLayerID(SdrObject::GetLayer()); SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrLayerID nLay1=pOL->GetObj(i)->GetLayer(); if (b1st) { nLay=nLay1; b1st = false; } else if (nLay1!=nLay) return 0; @@ -195,8 +195,8 @@ void SdrObjGroup::NbcSetLayer(SdrLayerID nLayer) { SdrObject::NbcSetLayer(nLayer); SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { pOL->GetObj(i)->NbcSetLayer(nLayer); } } @@ -260,7 +260,7 @@ Point SdrObjGroup::GetRefPoint() const void SdrObjGroup::SetRefPoint(const Point& rPnt) { - bRefPoint=TRUE; + bRefPoint=sal_True; aRefPoint=rPnt; } @@ -384,7 +384,7 @@ bool SdrObjGroup::beginSpecialDrag(SdrDragStat& /*rDrag*/) const bool SdrObjGroup::BegCreate(SdrDragStat& /*rStat*/) { - return FALSE; + return sal_False; } @@ -431,8 +431,8 @@ void SdrObjGroup::NbcMove(const Size& rSiz) MovePoint(aRefPoint,rSiz); if (pSub->GetObjCount()!=0) { SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); pObj->NbcMove(rSiz); } @@ -463,8 +463,8 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac ResizePoint(aRefPoint,rRef,xFact,yFact); if (pSub->GetObjCount()!=0) { SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); pObj->NbcResize(rRef,xFact,yFact); } @@ -477,48 +477,48 @@ void SdrObjGroup::NbcResize(const Point& rRef, const Fraction& xFact, const Frac void SdrObjGroup::NbcRotate(const Point& rRef, long nWink, double sn, double cs) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); nDrehWink=NormAngle360(nDrehWink+nWink); RotatePoint(aRefPoint,rRef,sn,cs); SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); pObj->NbcRotate(rRef,nWink,sn,cs); } NbcRotateGluePoints(rRef,nWink,sn,cs); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } void SdrObjGroup::NbcMirror(const Point& rRef1, const Point& rRef2) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!! SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); pObj->NbcMirror(rRef1,rRef2); } NbcMirrorGluePoints(rRef1,rRef2); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } void SdrObjGroup::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); nShearWink+=nWink; ShearPoint(aRefPoint,rRef,tn); SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); pObj->NbcShear(rRef,nWink,tn,bVShear); } NbcShearGluePoints(rRef,nWink,tn,bVShear); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } @@ -528,8 +528,8 @@ void SdrObjGroup::NbcSetAnchorPos(const Point& rPnt) Size aSiz(rPnt.X()-aAnchor.X(),rPnt.Y()-aAnchor.Y()); MovePoint(aRefPoint,aSiz); SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG i=0; i<nObjAnz; i++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); pObj->NbcSetAnchorPos(rPnt); } @@ -575,8 +575,8 @@ void SdrObjGroup::Move(const Size& rSiz) if (pSub->GetObjCount()!=0) { // #32383# Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - ULONG i; + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + sal_uIntPtr i; for (i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); if (pObj->IsEdgeObj()) pObj->Move(rSiz); @@ -621,8 +621,8 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio if (pSub->GetObjCount()!=0) { // #32383# Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - ULONG i; + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + sal_uIntPtr i; for (i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); if (pObj->IsEdgeObj()) pObj->Resize(rRef,xFact,yFact); @@ -647,14 +647,14 @@ void SdrObjGroup::Resize(const Point& rRef, const Fraction& xFact, const Fractio void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs) { if (nWink!=0) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); nDrehWink=NormAngle360(nDrehWink+nWink); RotatePoint(aRefPoint,rRef,sn,cs); // #32383# Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - ULONG i; + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + sal_uIntPtr i; for (i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); if (pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs); @@ -664,7 +664,7 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs) if (!pObj->IsEdgeObj()) pObj->Rotate(rRef,nWink,sn,cs); } NbcRotateGluePoints(rRef,nWink,sn,cs); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); SetChanged(); BroadcastObjectChange(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); @@ -674,13 +674,13 @@ void SdrObjGroup::Rotate(const Point& rRef, long nWink, double sn, double cs) void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); MirrorPoint(aRefPoint,rRef1,rRef2); // fehlende Implementation in SvdEtc !!! // #32383# Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - ULONG i; + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + sal_uIntPtr i; for (i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); if (pObj->IsEdgeObj()) pObj->Mirror(rRef1,rRef2); @@ -690,7 +690,7 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2) if (!pObj->IsEdgeObj()) pObj->Mirror(rRef1,rRef2); } NbcMirrorGluePoints(rRef1,rRef2); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); SetChanged(); BroadcastObjectChange(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); @@ -700,14 +700,14 @@ void SdrObjGroup::Mirror(const Point& rRef1, const Point& rRef2) void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear) { if (nWink!=0) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); nShearWink+=nWink; ShearPoint(aRefPoint,rRef,tn); // #32383# Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - ULONG i; + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + sal_uIntPtr i; for (i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); if (pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear); @@ -717,7 +717,7 @@ void SdrObjGroup::Shear(const Point& rRef, long nWink, double tn, bool bVShear) if (!pObj->IsEdgeObj()) pObj->Shear(rRef,nWink,tn,bVShear); } NbcShearGluePoints(rRef,nWink,tn,bVShear); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); SetChanged(); BroadcastObjectChange(); SendUserCall(SDRUSERCALL_RESIZE,aBoundRect0); @@ -734,8 +734,8 @@ void SdrObjGroup::SetAnchorPos(const Point& rPnt) MovePoint(aRefPoint,aSiz); // #32383# Erst die Verbinder verschieben, dann den Rest SdrObjList* pOL=pSub; - ULONG nObjAnz=pOL->GetObjCount(); - ULONG i; + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + sal_uIntPtr i; for (i=0; i<nObjAnz; i++) { SdrObject* pObj=pOL->GetObj(i); if (pObj->IsEdgeObj()) pObj->SetAnchorPos(rPnt); @@ -777,12 +777,12 @@ void SdrObjGroup::ReformatText() pSub->ReformatAllTextObjects(); } -SdrObject* SdrObjGroup::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrObjGroup::DoConvertToPolyObj(sal_Bool bBezier) const { SdrObject* pGroup = new SdrObjGroup; pGroup->SetModel(GetModel()); - for(UINT32 a=0;a<pSub->GetObjCount();a++) + for(sal_uInt32 a=0;a<pSub->GetObjCount();a++) { SdrObject* pIterObj = pSub->GetObj(a); SdrObject* pResult = pIterObj->DoConvertToPolyObj(bBezier); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index f56ca8ecd9..f27f6db300 100644..100755 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -31,7 +31,7 @@ #include <svx/svdomeas.hxx> #include <math.h> -#include "svditext.hxx" // +#include "svx/svditext.hxx" // #include <svx/xpoly.hxx> #include <svx/svdtrans.hxx> #include <svx/svdhdl.hxx> @@ -41,8 +41,8 @@ #include <svx/svdattrx.hxx> #include <svx/svdmodel.hxx> #include <svx/svdview.hxx> -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svl/style.hxx> #include <svl/smplhint.hxx> #include <editeng/eeitem.hxx> @@ -80,8 +80,8 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe { rStr.Erase(); Fraction aMeasureScale(1, 1); - BOOL bTextRota90(FALSE); - BOOL bShowUnit(FALSE); + sal_Bool bTextRota90(sal_False); + sal_Bool bShowUnit(sal_False); FieldUnit eMeasureUnit(FUNIT_NONE); FieldUnit eModUIUnit(FUNIT_NONE); @@ -105,7 +105,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe if(eMeasureUnit == FUNIT_NONE) eMeasureUnit = eModUIUnit; - INT32 nLen(GetLen(aPt2 - aPt1)); + sal_Int32 nLen(GetLen(aPt2 - aPt1)); Fraction aFact(1,1); if(eMeasureUnit != eModUIUnit) @@ -125,7 +125,7 @@ void SdrMeasureObj::TakeRepresentation( XubString& rStr, SdrMeasureFieldKind eMe nLen = BigMulDiv(nLen, aFact.GetNumerator(), aFact.GetDenominator()); } - pModel->TakeMetricStr(nLen, rStr, TRUE, nNumDigits); + pModel->TakeMetricStr(nLen, rStr, sal_True, nNumDigits); if(!aFact.IsValid()) { @@ -216,7 +216,7 @@ sdr::contact::ViewContact* SdrMeasureObj::CreateObjectSpecificViewContact() TYPEINIT1(SdrMeasureObj,SdrTextObj); SdrMeasureObj::SdrMeasureObj(): - bTextDirty(FALSE) + bTextDirty(sal_False) { // #i25616# mbSupportTextIndentingOnLineWidthChange = sal_False; @@ -225,7 +225,7 @@ SdrMeasureObj::SdrMeasureObj(): SdrMeasureObj::SdrMeasureObj(const Point& rPt1, const Point& rPt2): aPt1(rPt1), aPt2(rPt2), - bTextDirty(FALSE) + bTextDirty(sal_False) { // #i25616# mbSupportTextIndentingOnLineWidthChange = sal_False; @@ -237,31 +237,31 @@ SdrMeasureObj::~SdrMeasureObj() void SdrMeasureObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bSelectAllowed =TRUE; - rInfo.bMoveAllowed =TRUE; - rInfo.bResizeFreeAllowed=TRUE; - rInfo.bResizePropAllowed=TRUE; - rInfo.bRotateFreeAllowed=TRUE; - rInfo.bRotate90Allowed =TRUE; - rInfo.bMirrorFreeAllowed=TRUE; - rInfo.bMirror45Allowed =TRUE; - rInfo.bMirror90Allowed =TRUE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =TRUE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bNoOrthoDesired =TRUE; - rInfo.bNoContortion =FALSE; - rInfo.bCanConvToPath =FALSE; - rInfo.bCanConvToPoly =TRUE; - rInfo.bCanConvToPathLineToArea=FALSE; - rInfo.bCanConvToPolyLineToArea=FALSE; + rInfo.bSelectAllowed =sal_True; + rInfo.bMoveAllowed =sal_True; + rInfo.bResizeFreeAllowed=sal_True; + rInfo.bResizePropAllowed=sal_True; + rInfo.bRotateFreeAllowed=sal_True; + rInfo.bRotate90Allowed =sal_True; + rInfo.bMirrorFreeAllowed=sal_True; + rInfo.bMirror45Allowed =sal_True; + rInfo.bMirror90Allowed =sal_True; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_True; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bNoOrthoDesired =sal_True; + rInfo.bNoContortion =sal_False; + rInfo.bCanConvToPath =sal_False; + rInfo.bCanConvToPoly =sal_True; + rInfo.bCanConvToPathLineToArea=sal_False; + rInfo.bCanConvToPolyLineToArea=sal_False; rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -UINT16 SdrMeasureObj::GetObjIdentifier() const +sal_uInt16 SdrMeasureObj::GetObjIdentifier() const { - return (UINT16)OBJ_MEASURE; + return (sal_uInt16)OBJ_MEASURE; } struct ImpMeasureRec : public SdrDragStatUserData @@ -313,7 +313,7 @@ struct ImpMeasurePoly double nLineCos; double nHlpSin; double nHlpCos; - USHORT nMainlineAnz; + sal_uInt16 nMainlineAnz; SdrMeasureTextHPos eUsedTextHPos; SdrMeasureTextVPos eUsedTextVPos; long nLineWdt2; // Halbe Strichstaerke @@ -426,7 +426,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& OutlinerParaObject* pOutlinerParaObject = SdrTextObj::GetOutlinerParaObject(); if (pOutlinerParaObject!=NULL && pOutlinerParaObject->GetTextObject().GetParagraphCount()==1) { - bBrkLine=TRUE; // Unterbrochene Linie, wenn nur 1 Absatz. + bBrkLine=sal_True; // Unterbrochene Linie, wenn nur 1 Absatz. } } rPol.bBreakedLine=bBrkLine; @@ -462,12 +462,12 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol.nTextWink=rPol.nLineWink; if (rRec.bTextRota90) rPol.nTextWink+=9000; - rPol.bAutoUpsideDown=FALSE; + rPol.bAutoUpsideDown=sal_False; if (rRec.bTextAutoAngle) { long nTmpWink=NormAngle360(rPol.nTextWink-rRec.nTextAutoAngleView); if (nTmpWink>=18000) { rPol.nTextWink+=18000; - rPol.bAutoUpsideDown=TRUE; + rPol.bAutoUpsideDown=sal_True; } } @@ -582,7 +582,7 @@ basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol) return aRetval; } -bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, +bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, bool bEdit, Color*& rpTxtColor, Color*& rpFldColor, XubString& rRet) const { @@ -597,7 +597,7 @@ bool SdrMeasureObj::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USH rpFldColor=NULL; } } - return TRUE; + return sal_True; } else { return SdrTextObj::CalcFieldValue(rField,nPara,nPos,bEdit,rpTxtColor,rpFldColor,rRet); } @@ -629,14 +629,14 @@ void SdrMeasureObj::UndirtyText() const rOutliner.SetText(*pOutlinerParaObject); } - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.UpdateFields(); Size aSiz(rOutliner.CalcTextSize()); rOutliner.Clear(); // 3x casting auf nonconst ((SdrMeasureObj*)this)->aTextSize=aSiz; - ((SdrMeasureObj*)this)->bTextSizeDirty=FALSE; - ((SdrMeasureObj*)this)->bTextDirty=FALSE; + ((SdrMeasureObj*)this)->bTextSizeDirty=sal_False; + ((SdrMeasureObj*)this)->bTextDirty=sal_False; } } @@ -978,7 +978,7 @@ bool SdrMeasureObj::BegCreate(SdrDragStat& rStat) aPt1=rStat.GetStart(); aPt2=rStat.GetNow(); SetTextDirty(); - return TRUE; + return sal_True; } bool SdrMeasureObj::MovCreate(SdrDragStat& rStat) @@ -992,8 +992,8 @@ bool SdrMeasureObj::MovCreate(SdrDragStat& rStat) } SetTextDirty(); SetBoundRectDirty(); - bSnapRectDirty=TRUE; - return TRUE; + bSnapRectDirty=sal_True; + return sal_True; } bool SdrMeasureObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) @@ -1159,7 +1159,7 @@ void SdrMeasureObj::RestGeoData(const SdrObjGeoData& rGeo) SetTextDirty(); } -SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrMeasureObj::DoConvertToPolyObj(sal_Bool bBezier) const { // get XOR Poly as base XPolyPolygon aTmpPolyPolygon(TakeXorPoly()); @@ -1175,8 +1175,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const // prepare parameters basegfx::B2DPolyPolygon aPolyPoly; SdrPathObj* pPath; - UINT16 nCount(aTmpPolyPolygon.Count()); - UINT16 nLoopStart(0); + sal_uInt16 nCount(aTmpPolyPolygon.Count()); + sal_uInt16 nLoopStart(0); if(nCount == 3) { @@ -1197,8 +1197,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const { // four lines, middle line with gap, so there are two lines used // which have one arrow each - //INT32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue(); - INT32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue(); + //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue(); + sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue(); aSet.Put(XLineEndWidthItem(0L)); aPolyPoly.clear(); @@ -1228,8 +1228,8 @@ SdrObject* SdrMeasureObj::DoConvertToPolyObj(BOOL bBezier) const else if(nCount == 5) { // five lines, first two are the outer ones - //INT32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue(); - INT32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue(); + //sal_Int32 nStartWidth = ((const XLineStartWidthItem&)(aSet.Get(XATTR_LINESTARTWIDTH))).GetValue(); + sal_Int32 nEndWidth = ((const XLineEndWidthItem&)(aSet.Get(XATTR_LINEENDWIDTH))).GetValue(); aSet.Put(XLineEndWidthItem(0L)); @@ -1300,7 +1300,7 @@ void SdrMeasureObj::NbcSetOutlinerParaObject(OutlinerParaObject* pTextObject) } void SdrMeasureObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, - Rectangle* pAnchorRect, BOOL bLineWidth ) const + Rectangle* pAnchorRect, sal_Bool bLineWidth ) const { if (bTextDirty) UndirtyText(); SdrTextObj::TakeTextRect( rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth ); @@ -1318,7 +1318,7 @@ void SdrMeasureObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle SdrTextObj::TakeTextEditArea(pPaperMin,pPaperMax,pViewInit,pViewMin); } -USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const +sal_uInt16 SdrMeasureObj::GetOutlinerViewAnchorMode() const { if (bTextDirty) UndirtyText(); ImpMeasureRec aRec; @@ -1331,7 +1331,6 @@ USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const SdrMeasureTextHPos eMH=aMPol.eUsedTextHPos; SdrMeasureTextVPos eMV=aMPol.eUsedTextVPos; bool bTextRota90=aRec.bTextRota90; - //bool bTextUpsideDown=aRec.bTextUpsideDown; bool bBelowRefEdge=aRec.bBelowRefEdge; // bTextUpsideDown muss hier noch ausgewertet werden!!!! @@ -1370,7 +1369,7 @@ USHORT SdrMeasureObj::GetOutlinerViewAnchorMode() const else if (eTV==SDRTEXTVERTADJUST_BOTTOM) eRet=ANCHOR_BOTTOM_HCENTER; else eRet=ANCHOR_VCENTER_HCENTER; } - return (USHORT)eRet; + return (sal_uInt16)eRet; } ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index a7f3e5bff9..c5f61c9d62 100644..100755 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -32,8 +32,8 @@ #include <vcl/svapp.hxx> #include <svx/svdomedia.hxx> -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> #include <avmedia/mediawindow.hxx> @@ -104,9 +104,9 @@ void SdrMediaObj::TakeObjInfo( SdrObjTransformInfoRec& rInfo ) const // ------------------------------------------------------------------------------ -UINT16 SdrMediaObj::GetObjIdentifier() const +sal_uInt16 SdrMediaObj::GetObjIdentifier() const { - return UINT16( OBJ_MEDIA ); + return sal_uInt16( OBJ_MEDIA ); } // ------------------------------------------------------------------------------ diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 177de34f70..2e629d7f0e 100644..100755 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -78,8 +78,8 @@ #include <svx/svdpagv.hxx> #include <svx/svdmodel.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdetc.hxx> #include <svx/svdview.hxx> #include "unomlstr.hxx" @@ -394,7 +394,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::activatingUI() xParentFrame->setActiveFrame( xOwnFrame ); OLEObjCache& rObjCache = GetSdrGlobalData().GetOLEObjCache(); - const ULONG nCount = rObjCache.Count(); + const sal_uIntPtr nCount = rObjCache.Count(); for(sal_Int32 i = nCount-1 ; i >= 0;--i) { SdrOle2Obj* pObj = reinterpret_cast<SdrOle2Obj*>(rObjCache.GetObject(i)); @@ -624,7 +624,7 @@ SdrEmbedObjectLink::SdrEmbedObjectLink(SdrOle2Obj* pObject): ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB ), pObj(pObject) { - SetSynchron( FALSE ); + SetSynchron( sal_False ); } // ----------------------------------------------------------------------------- @@ -754,7 +754,7 @@ SdrOle2Obj::SdrOle2Obj(bool bFrame_) : m_bTypeAsked(false) ,m_bChart(false) { DBG_CTOR( SdrOle2Obj,NULL); - bInDestruction = FALSE; + bInDestruction = sal_False; Init(); bFrame=bFrame_; } @@ -766,13 +766,13 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, bool bFrame_) , m_bChart(false) { DBG_CTOR( SdrOle2Obj,NULL); - bInDestruction = FALSE; + bInDestruction = sal_False; Init(); bFrame=bFrame_; if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) - SetResizeProtect(TRUE); + SetResizeProtect(sal_True); // #108759# For math objects, set closed state to transparent if( ImplIsMathObj( xObjRef.GetObject() ) ) @@ -787,14 +787,14 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStrin , m_bChart(false) { DBG_CTOR( SdrOle2Obj,NULL); - bInDestruction = FALSE; + bInDestruction = sal_False; Init(); mpImpl->aPersistName = rNewObjName; bFrame=bFrame_; if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) - SetResizeProtect(TRUE); + SetResizeProtect(sal_True); // #108759# For math objects, set closed state to transparent if( ImplIsMathObj( xObjRef.GetObject() ) ) @@ -810,14 +810,14 @@ SdrOle2Obj::SdrOle2Obj( const svt::EmbeddedObjectRef& rNewObjRef, const XubStri , m_bChart(false) { DBG_CTOR( SdrOle2Obj,NULL); - bInDestruction = FALSE; + bInDestruction = sal_False; Init(); mpImpl->aPersistName = rNewObjName; bFrame=bFrame_; if ( xObjRef.is() && (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) - SetResizeProtect(TRUE); + SetResizeProtect(sal_True); // #108759# For math objects, set closed state to transparent if( ImplIsMathObj( xObjRef.GetObject() ) ) @@ -834,7 +834,7 @@ void SdrOle2Obj::Init() mpImpl->pGraphicObject=NULL; mpImpl->pLightClient = 0; - xObjRef.Lock( TRUE ); + xObjRef.Lock( sal_True ); } // ----------------------------------------------------------------------------- @@ -842,7 +842,7 @@ void SdrOle2Obj::Init() SdrOle2Obj::~SdrOle2Obj() { DBG_DTOR( SdrOle2Obj,NULL); - bInDestruction = TRUE; + bInDestruction = sal_True; if ( mpImpl->mbConnected ) Disconnect(); @@ -1121,7 +1121,7 @@ void SdrOle2Obj::Connect_Impl() { xObjRef.AssignToContainer( &rContainer, mpImpl->aPersistName ); mpImpl->mbConnected = true; - xObjRef.Lock( TRUE ); + xObjRef.Lock( sal_True ); } } @@ -1172,7 +1172,7 @@ void SdrOle2Obj::Connect_Impl() pModel->GetRefDevice()->GetOutDevType() == OUTDEV_PRINTER) { // Kein RefDevice oder RefDevice kein Printer - BOOL bModified = (*ppObjRef)->IsModified(); + sal_Bool bModified = (*ppObjRef)->IsModified(); Printer* pPrinter = (Printer*) pModel->GetRefDevice(); (*ppObjRef)->OnDocumentPrinterChanged( pPrinter ); (*ppObjRef)->SetModified( bModified ); @@ -1440,7 +1440,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta // MBA: the caller of the method is responsible to control the old object, it will not be closed here // Otherwise WW8 import crashes because it tranfers control to OLENode by this method if ( xObjRef.GetObject().is() ) - xObjRef.Lock( FALSE ); + xObjRef.Lock( sal_False ); // MBA: avoid removal of object in Disconnect! It is definitely a HACK to call SetObjRef(0)! // This call will try to close the objects; so if anybody else wants to keep it, it must be locked by a CloseListener @@ -1457,7 +1457,7 @@ void SdrOle2Obj::SetObjRef( const com::sun::star::uno::Reference < com::sun::sta DELETEZ( pGraphic ); if ( (xObjRef->getStatus( GetAspect() ) & embed::EmbedMisc::EMBED_NEVERRESIZE ) ) - SetResizeProtect(TRUE); + SetResizeProtect(sal_True); // #108759# For math objects, set closed state to transparent if( ImplIsMathObj( rNewObjRef ) ) @@ -1550,28 +1550,28 @@ String SdrOle2Obj::GetPersistName() const void SdrOle2Obj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bRotateFreeAllowed=FALSE; - rInfo.bRotate90Allowed =FALSE; - rInfo.bMirrorFreeAllowed=FALSE; - rInfo.bMirror45Allowed =FALSE; - rInfo.bMirror90Allowed =FALSE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bNoOrthoDesired =FALSE; - rInfo.bCanConvToPath =FALSE; - rInfo.bCanConvToPoly =FALSE; - rInfo.bCanConvToPathLineToArea=FALSE; - rInfo.bCanConvToPolyLineToArea=FALSE; - rInfo.bCanConvToContour = FALSE; + rInfo.bRotateFreeAllowed=sal_False; + rInfo.bRotate90Allowed =sal_False; + rInfo.bMirrorFreeAllowed=sal_False; + rInfo.bMirror45Allowed =sal_False; + rInfo.bMirror90Allowed =sal_False; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bNoOrthoDesired =sal_False; + rInfo.bCanConvToPath =sal_False; + rInfo.bCanConvToPoly =sal_False; + rInfo.bCanConvToPathLineToArea=sal_False; + rInfo.bCanConvToPolyLineToArea=sal_False; + rInfo.bCanConvToContour = sal_False; } // ----------------------------------------------------------------------------- -UINT16 SdrOle2Obj::GetObjIdentifier() const +sal_uInt16 SdrOle2Obj::GetObjIdentifier() const { - return bFrame ? UINT16(OBJ_FRAME) : UINT16(OBJ_OLE2); + return bFrame ? sal_uInt16(OBJ_FRAME) : sal_uInt16(OBJ_OLE2); } // ----------------------------------------------------------------------------- @@ -1973,23 +1973,23 @@ sal_Bool SdrOle2Obj::Unload( const uno::Reference< embed::XEmbeddedObject >& xOb // ----------------------------------------------------------------------------- -BOOL SdrOle2Obj::Unload() +sal_Bool SdrOle2Obj::Unload() { - BOOL bUnloaded = FALSE; + sal_Bool bUnloaded = sal_False; if( xObjRef.is() ) { //TODO/LATER: no refcounting tricks anymore! //"customers" must register as state change listeners //Nicht notwendig im Doc DTor (MM) - //ULONG nRefCount = (*ppObjRef)->GetRefCount(); + //sal_uIntPtr nRefCount = (*ppObjRef)->GetRefCount(); // prevent Unload if there are external references //if( nRefCount > 2 ) - // return FALSE; + // return sal_False; //DBG_ASSERT( nRefCount == 2, "Wrong RefCount for unload" ); } else - bUnloaded = TRUE; + bUnloaded = sal_True; if ( pModel && xObjRef.is() ) { diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index 81ffba500f..06ae40cae9 100644..100755 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -30,8 +30,8 @@ #include "precompiled_svx.hxx" #include <svx/svdopage.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> #include <svx/svdmodel.hxx> @@ -145,27 +145,27 @@ void SdrPageObj::SetBoundRectDirty() // not re-creatable view data } -UINT16 SdrPageObj::GetObjIdentifier() const +sal_uInt16 SdrPageObj::GetObjIdentifier() const { - return UINT16(OBJ_PAGE); + return sal_uInt16(OBJ_PAGE); } void SdrPageObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bRotateFreeAllowed=FALSE; - rInfo.bRotate90Allowed =FALSE; - rInfo.bMirrorFreeAllowed=FALSE; - rInfo.bMirror45Allowed =FALSE; - rInfo.bMirror90Allowed =FALSE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed =FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bNoOrthoDesired =FALSE; - rInfo.bCanConvToPath =FALSE; - rInfo.bCanConvToPoly =FALSE; - rInfo.bCanConvToPathLineToArea=FALSE; - rInfo.bCanConvToPolyLineToArea=FALSE; + rInfo.bRotateFreeAllowed=sal_False; + rInfo.bRotate90Allowed =sal_False; + rInfo.bMirrorFreeAllowed=sal_False; + rInfo.bMirror45Allowed =sal_False; + rInfo.bMirror90Allowed =sal_False; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed =sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bNoOrthoDesired =sal_False; + rInfo.bCanConvToPath =sal_False; + rInfo.bCanConvToPoly =sal_False; + rInfo.bCanConvToPathLineToArea=sal_False; + rInfo.bCanConvToPolyLineToArea=sal_False; } void SdrPageObj::operator=(const SdrObject& rObj) diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 0a39ec7478..84f2a6ab65 100644..100755 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -42,8 +42,8 @@ #include <svx/svdpage.hxx> #include <svx/svdhdl.hxx> #include <svx/svdview.hxx> // fuer MovCreate bei Freihandlinien -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #ifdef _MSC_VER #pragma optimize ("",off) @@ -81,7 +81,7 @@ inline double ImplMMToTwips(double fVal) { return (fVal * (72.0 / 127.0)); } using namespace sdr; -inline USHORT GetPrevPnt(USHORT nPnt, USHORT nPntMax, bool bClosed) +inline sal_uInt16 GetPrevPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed) { if (nPnt>0) { nPnt--; @@ -92,7 +92,7 @@ inline USHORT GetPrevPnt(USHORT nPnt, USHORT nPntMax, bool bClosed) return nPnt; } -inline USHORT GetNextPnt(USHORT nPnt, USHORT nPntMax, bool bClosed) +inline sal_uInt16 GetNextPnt(sal_uInt16 nPnt, sal_uInt16 nPntMax, bool bClosed) { nPnt++; if (nPnt>nPntMax || (bClosed && nPnt>=nPntMax)) nPnt=0; @@ -104,43 +104,43 @@ struct ImpSdrPathDragData : public SdrDragStatUserData XPolygon aXP; // Ausschnitt aud dem Originalpolygon bool bValid; // FALSE = zu wenig Punkte bool bClosed; // geschlossenes Objekt? - USHORT nPoly; // Nummer des Polygons im PolyPolygon - USHORT nPnt; // Punktnummer innerhalb des obigen Polygons - USHORT nPntAnz; // Punktanzahl des Polygons - USHORT nPntMax; // Maximaler Index + sal_uInt16 nPoly; // Nummer des Polygons im PolyPolygon + sal_uInt16 nPnt; // Punktnummer innerhalb des obigen Polygons + sal_uInt16 nPntAnz; // Punktanzahl des Polygons + sal_uInt16 nPntMax; // Maximaler Index bool bBegPnt; // Gedraggter Punkt ist der Anfangspunkt einer Polyline bool bEndPnt; // Gedraggter Punkt ist der Endpunkt einer Polyline - USHORT nPrevPnt; // Index des vorherigen Punkts - USHORT nNextPnt; // Index des naechsten Punkts + sal_uInt16 nPrevPnt; // Index des vorherigen Punkts + sal_uInt16 nNextPnt; // Index des naechsten Punkts bool bPrevIsBegPnt; // Vorheriger Punkt ist Anfangspunkt einer Polyline bool bNextIsEndPnt; // Folgepunkt ist Endpunkt einer Polyline - USHORT nPrevPrevPnt; // Index des vorvorherigen Punkts - USHORT nNextNextPnt; // Index des uebernaechsten Punkts + sal_uInt16 nPrevPrevPnt; // Index des vorvorherigen Punkts + sal_uInt16 nNextNextPnt; // Index des uebernaechsten Punkts bool bControl; // Punkt ist ein Kontrollpunkt bool bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt bool bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt bool bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt bool bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt - USHORT nPrevPrevPnt0; - USHORT nPrevPnt0; - USHORT nPnt0; - USHORT nNextPnt0; - USHORT nNextNextPnt0; + sal_uInt16 nPrevPrevPnt0; + sal_uInt16 nPrevPnt0; + sal_uInt16 nPnt0; + sal_uInt16 nNextPnt0; + sal_uInt16 nNextNextPnt0; bool bEliminate; // Punkt loeschen? (wird von MovDrag gesetzt) // ## - BOOL mbMultiPointDrag; + sal_Bool mbMultiPointDrag; const XPolyPolygon maOrig; XPolyPolygon maMove; Container maHandles; public: - ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, BOOL bMuPoDr, const SdrDragStat& rDrag); + ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, sal_Bool bMuPoDr, const SdrDragStat& rDrag); void ResetPoly(const SdrPathObj& rPO); - BOOL IsMultiPointDrag() const { return mbMultiPointDrag; } + sal_Bool IsMultiPointDrag() const { return mbMultiPointDrag; } }; -ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, BOOL bMuPoDr, const SdrDragStat& rDrag) +ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, sal_Bool bMuPoDr, const SdrDragStat& rDrag) : aXP(5), mbMultiPointDrag(bMuPoDr), maOrig(rPO.GetPathPoly()), @@ -164,11 +164,11 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl } maMove = maOrig; - bValid = TRUE; + bValid = sal_True; } else { - bValid=FALSE; + bValid=sal_False; bClosed=rPO.IsClosed(); // geschlossenes Objekt? nPoly=(sal_uInt16)rHdl.GetPolyNum(); // Nummer des Polygons im PolyPolygon nPnt=(sal_uInt16)rHdl.GetPointNum(); // Punktnummer innerhalb des obigen Polygons @@ -193,10 +193,10 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl if (!bPrevIsBegPnt) nPrevPrevPnt=GetPrevPnt(nPrevPnt,nPntMax,bClosed); if (!bNextIsEndPnt) nNextNextPnt=GetNextPnt(nNextPnt,nPntMax,bClosed); bControl=rHdl.IsPlusHdl(); // Punkt ist ein Kontrollpunkt - bIsPrevControl=FALSE; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt - bIsNextControl=FALSE; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt - bPrevIsControl=FALSE; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt - bNextIsControl=FALSE; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt + bIsPrevControl=sal_False; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt + bIsNextControl=sal_False; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt + bPrevIsControl=sal_False; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt + bNextIsControl=sal_False; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt if (bControl) { bIsPrevControl=aTmpXP.IsControl(nPrevPnt); bIsNextControl=!bIsPrevControl; @@ -214,9 +214,9 @@ ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl nPnt=2; nNextPnt=3; nNextNextPnt=4; - bEliminate=FALSE; + bEliminate=sal_False; ResetPoly(rPO); - bValid=TRUE; + bValid=sal_True; } } @@ -259,21 +259,20 @@ struct ImpPathCreateUser : public SdrDragStatUserData bool bLine90; bool bRect; bool bMixedCreate; - USHORT nBezierStartPoint; + sal_uInt16 nBezierStartPoint; SdrObjKind eStartKind; SdrObjKind eAktKind; public: ImpPathCreateUser(): nCircRadius(0),nCircStWink(0),nCircRelWink(0), - bBezier(FALSE),bBezHasCtrl0(FALSE),bCurve(FALSE),bCircle(FALSE),bAngleSnap(FALSE),bLine(FALSE),bLine90(FALSE),bRect(FALSE), - bMixedCreate(FALSE),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { } + bBezier(sal_False),bBezHasCtrl0(sal_False),bCurve(sal_False),bCircle(sal_False),bAngleSnap(sal_False),bLine(sal_False),bLine90(sal_False),bRect(sal_False), + bMixedCreate(sal_False),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { } - void ResetFormFlags() { bBezier=FALSE; bCurve=FALSE; bCircle=FALSE; bLine=FALSE; bRect=FALSE; } + void ResetFormFlags() { bBezier=sal_False; bCurve=sal_False; bCircle=sal_False; bLine=sal_False; bRect=sal_False; } bool IsFormFlag() const { return bBezier || bCurve || bCircle || bLine || bRect; } XPolygon GetFormPoly() const; bool CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, bool bMouseDown); XPolygon GetBezierPoly() const; - //bool CalcCurve(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView) { return FALSE; } XPolygon GetCurvePoly() const { return XPolygon(); } bool CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); XPolygon GetCirclePoly() const; @@ -362,7 +361,7 @@ bool ImpPathCreateUser::CalcCircle(const Point& rP1, const Point& rP2, const Poi } } nCircRadius=nRad; - if (nRad==0 || Abs(nCircRelWink)<5) bRet=FALSE; + if (nRad==0 || Abs(nCircRelWink)<5) bRet=sal_False; bCircle=bRet; return bRet; } @@ -371,17 +370,17 @@ XPolygon ImpPathCreateUser::GetCirclePoly() const { if (nCircRelWink>=0) { XPolygon aXP(aCircCenter,nCircRadius,nCircRadius, - USHORT((nCircStWink+5)/10),USHORT((nCircStWink+nCircRelWink+5)/10),FALSE); + sal_uInt16((nCircStWink+5)/10),sal_uInt16((nCircStWink+nCircRelWink+5)/10),sal_False); aXP[0]=aCircStart; aXP.SetFlags(0,XPOLY_SMOOTH); if (!bAngleSnap) aXP[aXP.GetPointCount()-1]=aCircEnd; return aXP; } else { XPolygon aXP(aCircCenter,nCircRadius,nCircRadius, - USHORT(NormAngle360(nCircStWink+nCircRelWink+5)/10),USHORT((nCircStWink+5)/10),FALSE); - USHORT nAnz=aXP.GetPointCount(); - for (USHORT nNum=nAnz/2; nNum>0;) { + sal_uInt16(NormAngle360(nCircStWink+nCircRelWink+5)/10),sal_uInt16((nCircStWink+5)/10),sal_False); + sal_uInt16 nAnz=aXP.GetPointCount(); + for (sal_uInt16 nNum=nAnz/2; nNum>0;) { nNum--; // XPoly Punktreihenfolge umkehren - USHORT n2=nAnz-nNum-1; + sal_uInt16 n2=nAnz-nNum-1; Point aPt(aXP[nNum]); aXP[nNum]=aXP[n2]; aXP[n2]=aPt; @@ -418,8 +417,8 @@ bool ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point { aLineStart=rP1; aLineEnd=rP2; - bLine90=FALSE; - if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bLine=FALSE; return FALSE; } + bLine90=sal_False; + if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bLine=sal_False; return sal_False; } Point aTmpPt(rP2-rP1); long nDirX=rDir.X(); long nDirY=rDir.Y(); @@ -432,8 +431,8 @@ bool ImpPathCreateUser::CalcLine(const Point& rP1, const Point& rP2, const Point } else { // rechtwinkliger Uebergang aLineEnd+=aP2; } - bLine=TRUE; - return TRUE; + bLine=sal_True; + return sal_True; } XPolygon ImpPathCreateUser::GetLinePoly() const @@ -449,7 +448,7 @@ bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point aRectP1=rP1; aRectP2=rP1; aRectP3=rP2; - if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bRect=FALSE; return FALSE; } + if (rP1==rP2 || (rDir.X()==0 && rDir.Y()==0)) { bRect=sal_False; return sal_False; } Point aTmpPt(rP2-rP1); long nDirX=rDir.X(); long nDirY=rDir.Y(); @@ -493,8 +492,8 @@ bool ImpPathCreateUser::CalcRect(const Point& rP1, const Point& rP2, const Point aRectP3.Y()+=ytemp; } } - bRect=TRUE; - return TRUE; + bRect=sal_True; + return sal_True; } XPolygon ImpPathCreateUser::GetRectPoly() const @@ -569,12 +568,12 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const { const SdrHdl* pHdl=rDrag.GetHdl(); if(!pHdl) - return FALSE; + return sal_False; - BOOL bMultiPointDrag(TRUE); + sal_Bool bMultiPointDrag(sal_True); if(aPathPolygon[(sal_uInt16)pHdl->GetPolyNum()].IsControl((sal_uInt16)pHdl->GetPointNum())) - bMultiPointDrag = FALSE; + bMultiPointDrag = sal_False; if(bMultiPointDrag) { @@ -595,7 +594,7 @@ bool ImpPathForDragAndCreate::beginPathDrag( SdrDragStat& rDrag ) const } if(nSelectedPoints <= 1) - bMultiPointDrag = FALSE; + bMultiPointDrag = sal_False; } ((ImpPathForDragAndCreate*)this)->mpSdrPathDragData = new ImpSdrPathDragData(mrSdrPathObject,*pHdl,bMultiPointDrag,rDrag); @@ -633,7 +632,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const const XPolygon& rOrig = mpSdrPathDragData->maOrig[nPolyIndex]; XPolygon& rMove = mpSdrPathDragData->maMove[nPolyIndex]; const sal_uInt16 nPointCount(rOrig.GetPointCount()); - BOOL bClosed(rOrig[0] == rOrig[nPointCount-1]); + sal_Bool bClosed(rOrig[0] == rOrig[nPointCount-1]); // move point itself rMove[nPointIndex] = rOrig[nPointIndex] + aDelta; @@ -671,17 +670,16 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const // Div. Daten lokal Kopieren fuer weniger Code und schnelleren Zugriff bool bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt? - USHORT nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des obigen Polygons + sal_uInt16 nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des obigen Polygons bool bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline bool bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline - USHORT nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts - USHORT nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts + sal_uInt16 nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts + sal_uInt16 nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts bool bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline bool bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline - USHORT nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts - USHORT nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts + sal_uInt16 nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts + sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts bool bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt - //bool bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt bool bIsNextControl =mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt bool bPrevIsControl =mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt bool bNextIsControl =mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt @@ -691,7 +689,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const bool bBigOrtho=rDrag.GetView()->IsBigOrtho(); Point aPos(rDrag.GetNow()); // die aktuelle Position Point aPnt(mpSdrPathDragData->aXP[nPnt]); // der gedraggte Punkt - USHORT nPnt1=0xFFFF,nPnt2=0xFFFF; // seine Nachbarpunkte + sal_uInt16 nPnt1=0xFFFF,nPnt2=0xFFFF; // seine Nachbarpunkte Point aNeuPos1,aNeuPos2; // die neuen Alternativen fuer aPos bool bPnt1 = false, bPnt2 = false; // die neuen Alternativen gueltig? if (!bClosed && mpSdrPathDragData->nPntAnz>=2) { // Mind. 2 Pt bei Linien @@ -711,7 +709,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const if (!bHLin || !bVLin) { long ndx=aPos.X()-aPnt1.X(); long ndy=aPos.Y()-aPnt1.Y(); - bPnt1=TRUE; + bPnt1=sal_True; double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0; double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0; bool bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); @@ -732,7 +730,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const if (!bHLin || !bVLin) { long ndx=aPos.X()-aPnt2.X(); long ndy=aPos.Y()-aPnt2.Y(); - bPnt2=TRUE; + bPnt2=sal_True; double nXFact=0; if (!bVLin) nXFact=(double)ndx/(double)ndx0; double nYFact=0; if (!bHLin) nYFact=(double)ndy/(double)ndy0; bool bHor=bHLin || (!bVLin && (nXFact>nYFact) ==bBigOrtho); @@ -752,7 +750,7 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const nX1+=nY1; // Korrekturabstand zum Quadrat nX2+=nY2; // Korrekturabstand zum Quadrat // Die Alternative mit dem geringeren Korrekturbedarf gewinnt - if (nX1<nX2) bPnt2=FALSE; else bPnt1=FALSE; + if (nX1<nX2) bPnt2=sal_False; else bPnt1=sal_False; } if (bPnt1) rDrag.Now()=aNeuPos1; if (bPnt2) rDrag.Now()=aNeuPos2; @@ -801,8 +799,8 @@ bool ImpPathForDragAndCreate::movePathDrag( SdrDragStat& rDrag ) const // Nun symmetrische PlusHandles etc. checken if (bControl) { // Faelle 5,6,7,8 - USHORT nSt=nPnt; // der zugehoerige Stuetzpunkt - USHORT nFix=nPnt; // der gegenueberliegende Kontrollpunkt + sal_uInt16 nSt=nPnt; // der zugehoerige Stuetzpunkt + sal_uInt16 nFix=nPnt; // der gegenueberliegende Kontrollpunkt if (bIsNextControl) { // Wenn der naechste ein Kontrollpunkt ist, muss der vorh. der Stuetzpunkt sein nSt=nPrevPnt; nFix=nPrevPrevPnt; @@ -977,26 +975,26 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) mrSdrPathObject.GetModel()->TakeWinkStr(Abs(pU->nCircRelWink), aMetr); aStr += aMetr; aStr.AppendAscii(" r="); - mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, sal_True); aStr += aMetr; } aStr.AppendAscii("dx="); - mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X(), aMetr, sal_True); aStr += aMetr; aStr.AppendAscii(" dy="); - mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y(), aMetr, sal_True); aStr += aMetr; if(!IsFreeHand(meObjectKind)) { - INT32 nLen(GetLen(aNow)); + sal_Int32 nLen(GetLen(aNow)); aStr.AppendAscii(" l="); - mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True); aStr += aMetr; - INT32 nWink(GetAngle(aNow)); + sal_Int32 nWink(GetAngle(aNow)); aStr += sal_Unicode(' '); mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr); aStr += aMetr; @@ -1043,27 +1041,27 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) } // dx=0.00 dy=0.00 // Beide Seiten Bezier - // dx=0.00 dy=0.00 l=0.00 0.00ø // Anfang oder Ende oder eine Seite Bezier bzw. Hebel - // dx=0.00 dy=0.00 l=0.00 0.00ø / l=0.00 0.00ø // Mittendrin + // dx=0.00 dy=0.00 l=0.00 0.00� // Anfang oder Ende oder eine Seite Bezier bzw. Hebel + // dx=0.00 dy=0.00 l=0.00 0.00� / l=0.00 0.00� // Mittendrin XubString aMetr; Point aBeg(rDrag.GetStart()); Point aNow(rDrag.GetNow()); aStr = String(); aStr.AppendAscii("dx="); - mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(), aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(aNow.X() - aBeg.X(), aMetr, sal_True); aStr += aMetr; aStr.AppendAscii(" dy="); - mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(), aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(aNow.Y() - aBeg.Y(), aMetr, sal_True); aStr += aMetr; if(!pDragData->IsMultiPointDrag()) { - UINT16 nPntNum((sal_uInt16)pHdl->GetPointNum()); + sal_uInt16 nPntNum((sal_uInt16)pHdl->GetPointNum()); const XPolygon& rXPoly = aPathPolygon[(sal_uInt16)rDrag.GetHdl()->GetPolyNum()]; - UINT16 nPntAnz((sal_uInt16)rXPoly.GetPointCount()); - BOOL bClose(IsClosed(meObjectKind)); + sal_uInt16 nPntAnz((sal_uInt16)rXPoly.GetPointCount()); + sal_Bool bClose(IsClosed(meObjectKind)); if(bClose) nPntAnz--; @@ -1071,7 +1069,7 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) if(pHdl->IsPlusHdl()) { // Hebel - UINT16 nRef(nPntNum); + sal_uInt16 nRef(nPntNum); if(rXPoly.IsControl(nPntNum + 1)) nRef--; @@ -1080,31 +1078,31 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) aNow -= rXPoly[nRef]; - INT32 nLen(GetLen(aNow)); + sal_Int32 nLen(GetLen(aNow)); aStr.AppendAscii(" l="); - mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True); aStr += aMetr; - INT32 nWink(GetAngle(aNow)); + sal_Int32 nWink(GetAngle(aNow)); aStr += sal_Unicode(' '); mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr); aStr += aMetr; } else if(nPntAnz > 1) { - UINT16 nPntMax(nPntAnz - 1); + sal_uInt16 nPntMax(nPntAnz - 1); Point aPt1,aPt2; - BOOL bIsClosed(IsClosed(meObjectKind)); - BOOL bPt1(nPntNum > 0); - BOOL bPt2(nPntNum < nPntMax); + sal_Bool bIsClosed(IsClosed(meObjectKind)); + sal_Bool bPt1(nPntNum > 0); + sal_Bool bPt2(nPntNum < nPntMax); if(bIsClosed && nPntAnz > 2) { - bPt1 = TRUE; - bPt2 = TRUE; + bPt1 = sal_True; + bPt2 = sal_True; } - UINT16 nPt1,nPt2; + sal_uInt16 nPt1,nPt2; if(nPntNum > 0) nPt1 = nPntNum - 1; @@ -1117,22 +1115,22 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) nPt2 = 0; if(bPt1 && rXPoly.IsControl(nPt1)) - bPt1 = FALSE; // Keine Anzeige + bPt1 = sal_False; // Keine Anzeige if(bPt2 && rXPoly.IsControl(nPt2)) - bPt2 = FALSE; // von Bezierdaten + bPt2 = sal_False; // von Bezierdaten if(bPt1) { Point aPt(aNow); aPt -= rXPoly[nPt1]; - INT32 nLen(GetLen(aPt)); + sal_Int32 nLen(GetLen(aPt)); aStr.AppendAscii(" l="); - mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True); aStr += aMetr; - INT32 nWink(GetAngle(aPt)); + sal_Int32 nWink(GetAngle(aPt)); aStr += sal_Unicode(' '); mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr); aStr += aMetr; @@ -1148,12 +1146,12 @@ String ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag) Point aPt(aNow); aPt -= rXPoly[nPt2]; - INT32 nLen(GetLen(aPt)); + sal_Int32 nLen(GetLen(aPt)); aStr.AppendAscii("l="); - mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, TRUE); + mrSdrPathObject.GetModel()->TakeMetricStr(nLen, aMetr, sal_True); aStr += aMetr; - INT32 nWink(GetAngle(aPt)); + sal_Int32 nWink(GetAngle(aPt)); aStr += sal_Unicode(' '); mrSdrPathObject.GetModel()->TakeWinkStr(nWink, aMetr); aStr += aMetr; @@ -1190,18 +1188,17 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra } // Div. Daten lokal Kopieren fuer weniger Code und schnelleren Zugriff bool bClosed =mpSdrPathDragData->bClosed ; // geschlossenes Objekt? - USHORT nPntAnz =mpSdrPathDragData->nPntAnz ; // Punktanzahl - USHORT nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des Polygons + sal_uInt16 nPntAnz =mpSdrPathDragData->nPntAnz ; // Punktanzahl + sal_uInt16 nPnt =mpSdrPathDragData->nPnt ; // Punktnummer innerhalb des Polygons bool bBegPnt =mpSdrPathDragData->bBegPnt ; // Gedraggter Punkt ist der Anfangspunkt einer Polyline bool bEndPnt =mpSdrPathDragData->bEndPnt ; // Gedraggter Punkt ist der Endpunkt einer Polyline - USHORT nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts - USHORT nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts + sal_uInt16 nPrevPnt =mpSdrPathDragData->nPrevPnt ; // Index des vorherigen Punkts + sal_uInt16 nNextPnt =mpSdrPathDragData->nNextPnt ; // Index des naechsten Punkts bool bPrevIsBegPnt =mpSdrPathDragData->bPrevIsBegPnt ; // Vorheriger Punkt ist Anfangspunkt einer Polyline bool bNextIsEndPnt =mpSdrPathDragData->bNextIsEndPnt ; // Folgepunkt ist Endpunkt einer Polyline - USHORT nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts - USHORT nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts + sal_uInt16 nPrevPrevPnt =mpSdrPathDragData->nPrevPrevPnt ; // Index des vorvorherigen Punkts + sal_uInt16 nNextNextPnt =mpSdrPathDragData->nNextNextPnt ; // Index des uebernaechsten Punkts bool bControl =mpSdrPathDragData->bControl ; // Punkt ist ein Kontrollpunkt - //bool bIsPrevControl=mpSdrPathDragData->bIsPrevControl; // Punkt ist Kontrollpunkt vor einem Stuetzpunkt bool bIsNextControl =mpSdrPathDragData->bIsNextControl; // Punkt ist Kontrollpunkt hinter einem Stuetzpunkt bool bPrevIsControl =mpSdrPathDragData->bPrevIsControl; // Falls nPnt ein StPnt: Davor ist ein Kontrollpunkt bool bNextIsControl =mpSdrPathDragData->bNextIsControl; // Falls nPnt ein StPnt: Dahinter ist ein Kontrollpunkt @@ -1265,7 +1262,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::getSpecialDragPoly(const SdrDra } if (bClosed) { // "Birnenproblem": 2 Linien, 1 Kurve, alles Smooth, Punkt zw. beiden Linien wird gedraggt if (aXPoly.GetPointCount()>nPntAnz && aXPoly.IsControl(1)) { - USHORT a=aXPoly.GetPointCount(); + sal_uInt16 a=aXPoly.GetPointCount(); aXPoly[a-2]=aXPoly[2]; aXPoly.SetFlags(a-2,aXPoly.GetFlags(2)); aXPoly[a-1]=aXPoly[3]; aXPoly.SetFlags(a-1,aXPoly.GetFlags(3)); aXPoly.Remove(0,3); @@ -1288,7 +1285,7 @@ bool ImpPathForDragAndCreate::BegCreate(SdrDragStat& rStat) rStat.SetNoSnap(bFreeHand); rStat.SetOrtho8Possible(); aPathPolygon.Clear(); - mbCreating=TRUE; + mbCreating=sal_True; bool bMakeStartPoint = true; SdrView* pView=rStat.GetView(); if (pView!=NULL && pView->IsUseIncompatiblePathCreateInterface() && @@ -1314,8 +1311,8 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1]; if (pView!=NULL && pView->IsCreateMode()) { // ggf. auf anderes CreateTool umschalten - UINT16 nIdent; - UINT32 nInvent; + sal_uInt16 nIdent; + sal_uInt32 nInvent; pView->TakeCurrentObj(nIdent,nInvent); if (nInvent==SdrInventor && pU->eAktKind!=(SdrObjKind)nIdent) { SdrObjKind eNewKind=(SdrObjKind)nIdent; @@ -1327,7 +1324,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) case OBJ_FREELINE: case OBJ_FREEFILL: case OBJ_SPLNLINE: case OBJ_SPLNFILL: { pU->eAktKind=eNewKind; - pU->bMixedCreate=TRUE; + pU->bMixedCreate=sal_True; pU->nBezierStartPoint=rXPoly.GetPointCount(); if (pU->nBezierStartPoint>0) pU->nBezierStartPoint--; } break; @@ -1335,7 +1332,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) } // switch } } - USHORT nActPoint=rXPoly.GetPointCount(); + sal_uInt16 nActPoint=rXPoly.GetPointCount(); if (aPathPolygon.Count()>1 && rStat.IsMouseDown() && nActPoint<2) { rXPoly[0]=rStat.GetPos0(); rXPoly[1]=rStat.GetNow(); @@ -1371,7 +1368,7 @@ bool ImpPathForDragAndCreate::MovCreate(SdrDragStat& rStat) Point aPt1(rStat.Now()); long dx=aPt0.X()-aPt1.X(); if (dx<0) dx=-dx; long dy=aPt0.Y()-aPt1.Y(); if (dy<0) dy=-dy; - if (dx<nMinDist && dy<nMinDist) return FALSE; + if (dx<nMinDist && dy<nMinDist) return sal_False; // folgendes ist aus EndCreate kopiert (nur kleine Modifikationen) // und sollte dann mal in eine Methode zusammengefasst werden: @@ -1421,14 +1418,14 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) SdrView* pView=rStat.GetView(); bool bIncomp=pView!=NULL && pView->IsUseIncompatiblePathCreateInterface(); XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1]; - USHORT nActPoint=rXPoly.GetPointCount()-1; + sal_uInt16 nActPoint=rXPoly.GetPointCount()-1; Point aAktMerk(rXPoly[nActPoint]); rXPoly[nActPoint]=rStat.Now(); if (!pU->bMixedCreate && pU->eStartKind==OBJ_LINE) { if (rStat.GetPointAnz()>=2) eCmd=SDRCREATE_FORCEEND; bRet = eCmd==SDRCREATE_FORCEEND; if (bRet) { - mbCreating = FALSE; + mbCreating = sal_False; delete pU; rStat.SetUser(NULL); } @@ -1439,7 +1436,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) if (rStat.GetPointAnz()>=2) eCmd=SDRCREATE_FORCEEND; bRet=eCmd==SDRCREATE_FORCEEND; if (bRet) { - mbCreating=FALSE; + mbCreating=sal_False; delete pU; rStat.SetUser(NULL); } @@ -1463,15 +1460,15 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } else { if (nActPoint==1 && IsBezier(pU->eAktKind) && !pU->bBezHasCtrl0) { pU->aBezControl0=rStat.GetNow();; - pU->bBezHasCtrl0=TRUE; + pU->bBezHasCtrl0=sal_True; nActPoint--; } if (pU->IsFormFlag()) { - USHORT nPtAnz0=rXPoly.GetPointCount(); + sal_uInt16 nPtAnz0=rXPoly.GetPointCount(); rXPoly.Remove(nActPoint-1,2); // die letzten beiden Punkte entfernen und durch die Form ersetzen rXPoly.Insert(XPOLY_APPEND,pU->GetFormPoly()); - USHORT nPtAnz1=rXPoly.GetPointCount(); - for (USHORT i=nPtAnz0+1; i<nPtAnz1-1; i++) { // Damit BckAction richtig funktioniert + sal_uInt16 nPtAnz1=rXPoly.GetPointCount(); + for (sal_uInt16 i=nPtAnz0+1; i<nPtAnz1-1; i++) { // Damit BckAction richtig funktioniert if (!rXPoly.IsControl(i)) rStat.NextPoint(); } nActPoint=rXPoly.GetPointCount()-1; @@ -1482,7 +1479,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } if (eCmd==SDRCREATE_NEXTOBJECT) { if (rXPoly.GetPointCount()>=2) { - pU->bBezHasCtrl0=FALSE; + pU->bBezHasCtrl0=sal_False; // nur einzelnes Polygon kann offen sein, deshalb schliessen rXPoly[nActPoint]=rXPoly[0]; XPolygon aXP; @@ -1492,12 +1489,12 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } } - USHORT nPolyAnz=aPathPolygon.Count(); + sal_uInt16 nPolyAnz=aPathPolygon.Count(); if (nPolyAnz!=0) { // den letzten Punkt ggf. wieder loeschen if (eCmd==SDRCREATE_FORCEEND) { XPolygon& rXP=aPathPolygon[nPolyAnz-1]; - USHORT nPtAnz=rXP.GetPointCount(); + sal_uInt16 nPtAnz=rXP.GetPointCount(); if (nPtAnz>=2) { if (!rXP.IsControl(nPtAnz-2)) { if (rXP[nPtAnz-1]==rXP[nPtAnz-2]) { @@ -1510,10 +1507,10 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) } } } - for (USHORT nPolyNum=nPolyAnz; nPolyNum>0;) { + for (sal_uInt16 nPolyNum=nPolyAnz; nPolyNum>0;) { nPolyNum--; XPolygon& rXP=aPathPolygon[nPolyNum]; - USHORT nPtAnz=rXP.GetPointCount(); + sal_uInt16 nPtAnz=rXP.GetPointCount(); // Polygone mit zu wenig Punkten werden geloescht if (nPolyNum<nPolyAnz-1 || eCmd==SDRCREATE_FORCEEND) { if (nPtAnz<2) aPathPolygon.Remove(nPolyNum); @@ -1523,7 +1520,7 @@ bool ImpPathForDragAndCreate::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd) pU->ResetFormFlags(); bRet=eCmd==SDRCREATE_FORCEEND; if (bRet) { - mbCreating=FALSE; + mbCreating=sal_False; delete pU; rStat.SetUser(NULL); } @@ -1535,7 +1532,7 @@ bool ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat) ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser(); if (aPathPolygon.Count()>0) { XPolygon& rXPoly=aPathPolygon[aPathPolygon.Count()-1]; - USHORT nActPoint=rXPoly.GetPointCount(); + sal_uInt16 nActPoint=rXPoly.GetPointCount(); if (nActPoint>0) { nActPoint--; // Das letzte Stueck einer Bezierkurve wird erstmal zu 'ner Linie @@ -1559,7 +1556,7 @@ bool ImpPathForDragAndCreate::BckCreate(SdrDragStat& rStat) } if (aPathPolygon.Count()>0) { XPolygon& rLocalXPoly=aPathPolygon[aPathPolygon.Count()-1]; - USHORT nLocalActPoint=rLocalXPoly.GetPointCount(); + sal_uInt16 nLocalActPoint=rLocalXPoly.GetPointCount(); if (nLocalActPoint>0) { nLocalActPoint--; rLocalXPoly[nLocalActPoint]=rStat.Now(); @@ -1574,7 +1571,7 @@ void ImpPathForDragAndCreate::BrkCreate(SdrDragStat& rStat) { ImpPathCreateUser* pU=(ImpPathCreateUser*)rStat.GetUser(); aPathPolygon.Clear(); - mbCreating=FALSE; + mbCreating=sal_False; delete pU; rStat.SetUser(NULL); } @@ -1845,7 +1842,7 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose) default: break; } - bClosedObj = TRUE; + bClosedObj = sal_True; } else { @@ -1858,7 +1855,7 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose) default: break; } - bClosedObj = FALSE; + bClosedObj = sal_False; } ImpForceKind(); @@ -1866,20 +1863,20 @@ void SdrPathObj::ImpSetClosed(sal_Bool bClose) void SdrPathObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bNoContortion=FALSE; + rInfo.bNoContortion=sal_False; bool bCanConv = !HasText() || ImpCanConvTextToCurve(); bool bIsPath = IsBezier() || IsSpline(); - rInfo.bEdgeRadiusAllowed = FALSE; + rInfo.bEdgeRadiusAllowed = sal_False; rInfo.bCanConvToPath = bCanConv && !bIsPath; rInfo.bCanConvToPoly = bCanConv && bIsPath; rInfo.bCanConvToContour = !IsFontwork() && (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -UINT16 SdrPathObj::GetObjIdentifier() const +sal_uInt16 SdrPathObj::GetObjIdentifier() const { - return USHORT(meKind); + return sal_uInt16(meKind); } void SdrPathObj::operator=(const SdrObject& rObj) @@ -2061,16 +2058,16 @@ void SdrPathObj::AddToHdlList(SdrHdlList& rHdlList) const { // keep old stuff to be able to keep old SdrHdl stuff, too const XPolyPolygon aOldPathPolygon(GetPathPoly()); - USHORT nPolyCnt=aOldPathPolygon.Count(); + sal_uInt16 nPolyCnt=aOldPathPolygon.Count(); bool bClosed=IsClosed(); - USHORT nIdx=0; + sal_uInt16 nIdx=0; - for (USHORT i=0; i<nPolyCnt; i++) { + for (sal_uInt16 i=0; i<nPolyCnt; i++) { const XPolygon& rXPoly=aOldPathPolygon.GetObject(i); - USHORT nPntCnt=rXPoly.GetPointCount(); + sal_uInt16 nPntCnt=rXPoly.GetPointCount(); if (bClosed && nPntCnt>1) nPntCnt--; - for (USHORT j=0; j<nPntCnt; j++) { + for (sal_uInt16 j=0; j<nPntCnt; j++) { if (rXPoly.GetFlags(j)!=XPOLY_CONTROL) { const Point& rPnt=rXPoly[j]; SdrHdl* pHdl=new SdrHdl(rPnt,HDL_POLY); @@ -2154,7 +2151,7 @@ SdrHdl* SdrPathObj::GetPlusHdl(const SdrHdl& rHdl, sal_uInt32 nPlusNum) const } pHdl->SetSourceHdlNum(rHdl.GetSourceHdlNum()); - pHdl->SetPlusHdl(TRUE); + pHdl->SetPlusHdl(sal_True); } } } @@ -2480,7 +2477,7 @@ Point SdrPathObj::GetSnapPoint(sal_uInt32 nSnapPnt) const sal_uInt32 nPoly,nPnt; if(!PolyPolygonEditor::GetRelativePolyPoint(GetPathPoly(), nSnapPnt, nPoly, nPnt)) { - DBG_ASSERT(FALSE,"SdrPathObj::GetSnapPoint: Punkt nSnapPnt nicht vorhanden!"); + DBG_ASSERT(sal_False,"SdrPathObj::GetSnapPoint: Punkt nSnapPnt nicht vorhanden!"); } const basegfx::B2DPoint aB2DPoint(GetPathPoly().getB2DPolygon(nPoly).getB2DPoint(nPnt)); @@ -2740,7 +2737,7 @@ SdrObject* SdrPathObj::RipPoint(sal_uInt32 nHdlNum, sal_uInt32& rNewPt0Index) return pNewObj; } -SdrObject* SdrPathObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrPathObj::DoConvertToPolyObj(sal_Bool bBezier) const { // #i89784# check for FontWork with activated HideContour const drawinglayer::attribute::SdrTextAttribute aText( diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index cdce360858..9d320925e6 100644..100755 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -46,8 +46,8 @@ #include <svx/svdview.hxx> // das #include <svx/svdundo.hxx> // Macro-Beispiel #include <svx/svdopath.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/xflclit.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> @@ -80,14 +80,14 @@ TYPEINIT1(SdrRectObj,SdrTextObj); SdrRectObj::SdrRectObj() : mpXPoly(0L) { - bClosedObj=TRUE; + bClosedObj=sal_True; } SdrRectObj::SdrRectObj(const Rectangle& rRect) : SdrTextObj(rRect), mpXPoly(NULL) { - bClosedObj=TRUE; + bClosedObj=sal_True; } SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind) @@ -97,7 +97,7 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind) DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT || eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT, "SdrRectObj::SdrRectObj(SdrObjKind) ist nur fuer Textrahmen gedacht"); - bClosedObj=TRUE; + bClosedObj=sal_True; } SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect) @@ -107,17 +107,17 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect) DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT || eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT, "SdrRectObj::SdrRectObj(SdrObjKind,...) ist nur fuer Textrahmen gedacht"); - bClosedObj=TRUE; + bClosedObj=sal_True; } -SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat) +SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat) : SdrTextObj(eNewTextKind,rNewRect,rInput,rBaseURL,eFormat), mpXPoly(NULL) { DBG_ASSERT(eTextKind==OBJ_TEXT || eTextKind==OBJ_TEXTEXT || eTextKind==OBJ_OUTLINETEXT || eTextKind==OBJ_TITLETEXT, "SdrRectObj::SdrRectObj(SdrObjKind,...) ist nur fuer Textrahmen gedacht"); - bClosedObj=TRUE; + bClosedObj=sal_True; } SdrRectObj::~SdrRectObj() @@ -186,22 +186,22 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { bool bNoTextFrame=!IsTextFrame(); rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0; - rInfo.bResizePropAllowed=TRUE; - rInfo.bRotateFreeAllowed=TRUE; - rInfo.bRotate90Allowed =TRUE; + rInfo.bResizePropAllowed=sal_True; + rInfo.bRotateFreeAllowed=sal_True; + rInfo.bRotate90Allowed =sal_True; rInfo.bMirrorFreeAllowed=bNoTextFrame; rInfo.bMirror45Allowed =bNoTextFrame; rInfo.bMirror90Allowed =bNoTextFrame; // allow transparence - rInfo.bTransparenceAllowed = TRUE; + rInfo.bTransparenceAllowed = sal_True; // gradient depends on fillstyle XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue(); rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT); rInfo.bShearAllowed =bNoTextFrame; - rInfo.bEdgeRadiusAllowed=TRUE; + rInfo.bEdgeRadiusAllowed=sal_True; bool bCanConv=!HasText() || ImpCanConvTextToCurve(); if (bCanConv && !bNoTextFrame && !HasText()) { @@ -212,10 +212,10 @@ void SdrRectObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -UINT16 SdrRectObj::GetObjIdentifier() const +sal_uInt16 SdrRectObj::GetObjIdentifier() const { - if (IsTextFrame()) return UINT16(eTextKind); - else return UINT16(OBJ_RECT); + if (IsTextFrame()) return sal_uInt16(eTextKind); + else return sal_uInt16(OBJ_RECT); } void SdrRectObj::TakeUnrotatedSnapRect(Rectangle& rRect) const @@ -244,7 +244,7 @@ void SdrRectObj::TakeObjNameSingul(XubString& rName) const } else { - USHORT nResId=STR_ObjNameSingulRECT; + sal_uInt16 nResId=STR_ObjNameSingulRECT; if (aGeo.nShearWink!=0) { nResId+=4; // Parallelogramm oder Raute // Raute ist nicht, weil Shear die vertikalen Kanten verlaengert! @@ -270,7 +270,7 @@ void SdrRectObj::TakeObjNamePlural(XubString& rName) const { if (IsTextFrame()) SdrTextObj::TakeObjNamePlural(rName); else { - USHORT nResId=STR_ObjNamePluralRECT; + sal_uInt16 nResId=STR_ObjNamePluralRECT; if (aGeo.nShearWink!=0) { nResId+=4; // Parallelogramm oder Raute } else { @@ -532,9 +532,9 @@ XubString SdrRectObj::GetMacroPopupComment(const SdrObjMacroHitRec& rRec) const return SdrTextObj::GetMacroPopupComment(rRec); } -SdrGluePoint SdrRectObj::GetVertexGluePoint(USHORT nPosNum) const +SdrGluePoint SdrRectObj::GetVertexGluePoint(sal_uInt16 nPosNum) const { - INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue(); + sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue(); // #i25616# if(!LineIsOutsideGeometry()) @@ -554,13 +554,13 @@ SdrGluePoint SdrRectObj::GetVertexGluePoint(USHORT nPosNum) const if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos); aPt-=GetSnapRect().Center(); SdrGluePoint aGP(aPt); - aGP.SetPercent(FALSE); + aGP.SetPercent(sal_False); return aGP; } -SdrGluePoint SdrRectObj::GetCornerGluePoint(USHORT nPosNum) const +SdrGluePoint SdrRectObj::GetCornerGluePoint(sal_uInt16 nPosNum) const { - INT32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue(); + sal_Int32 nWdt = ImpGetLineWdt(); // #i25616# ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue(); // #i25616# if(!LineIsOutsideGeometry()) @@ -580,11 +580,11 @@ SdrGluePoint SdrRectObj::GetCornerGluePoint(USHORT nPosNum) const if (aGeo.nDrehWink!=0) RotatePoint(aPt,aRect.TopLeft(),aGeo.nSin,aGeo.nCos); aPt-=GetSnapRect().Center(); SdrGluePoint aGP(aPt); - aGP.SetPercent(FALSE); + aGP.SetPercent(sal_False); return aGP; } -SdrObject* SdrRectObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrRectObj::DoConvertToPolyObj(sal_Bool bBezier) const { XPolygon aXP(ImpCalcXPoly(aRect,GetEckenradius())); { // #40608# Nur Uebergangsweise bis zum neuen TakeContour() diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 06bb02a233..304c713d69 100644..100755 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -30,15 +30,15 @@ #include "precompiled_svx.hxx" #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdpagv.hxx> // fuer Abfrage im Paint, ob das #include <svx/svdview.hxx> // Objekt gerade editiert wird #include <svx/svdpage.hxx> // und fuer AnimationHandler (Laufschrift) #include <svx/svdetc.hxx> #include <svx/svdoutl.hxx> #include <svx/svdmodel.hxx> // OutlinerDefaults -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <editeng/writingmodeitem.hxx> #include <svx/sdtfchim.hxx> #include <svtools/colorcfg.hxx> @@ -117,15 +117,15 @@ SdrTextObj::SdrTextObj() pFormTextBoundRect(NULL), eTextKind(OBJ_TEXT) { - bTextSizeDirty=FALSE; - bTextFrame=FALSE; - bNoShear=FALSE; - bNoRotate=FALSE; - bNoMirror=FALSE; - bDisableAutoWidthOnDragging=FALSE; + bTextSizeDirty=sal_False; + bTextFrame=sal_False; + bNoShear=sal_False; + bNoRotate=sal_False; + bNoMirror=sal_False; + bDisableAutoWidthOnDragging=sal_False; // #101684# - mbInEditMode = FALSE; + mbInEditMode = sal_False; // #111096# mbTextHidden = sal_False; @@ -148,16 +148,16 @@ SdrTextObj::SdrTextObj(const Rectangle& rNewRect) pEdtOutl(NULL), pFormTextBoundRect(NULL) { - bTextSizeDirty=FALSE; - bTextFrame=FALSE; - bNoShear=FALSE; - bNoRotate=FALSE; - bNoMirror=FALSE; - bDisableAutoWidthOnDragging=FALSE; + bTextSizeDirty=sal_False; + bTextFrame=sal_False; + bNoShear=sal_False; + bNoRotate=sal_False; + bNoMirror=sal_False; + bDisableAutoWidthOnDragging=sal_False; ImpJustifyRect(aRect); // #101684# - mbInEditMode = FALSE; + mbInEditMode = sal_False; // #111096# mbTextHidden = sal_False; @@ -180,15 +180,15 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind) pFormTextBoundRect(NULL), eTextKind(eNewTextKind) { - bTextSizeDirty=FALSE; - bTextFrame=TRUE; - bNoShear=TRUE; - bNoRotate=FALSE; - bNoMirror=TRUE; - bDisableAutoWidthOnDragging=FALSE; + bTextSizeDirty=sal_False; + bTextFrame=sal_True; + bNoShear=sal_True; + bNoRotate=sal_False; + bNoMirror=sal_True; + bDisableAutoWidthOnDragging=sal_False; // #101684# - mbInEditMode = FALSE; + mbInEditMode = sal_False; // #111096# mbTextHidden = sal_False; @@ -212,16 +212,16 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect) pFormTextBoundRect(NULL), eTextKind(eNewTextKind) { - bTextSizeDirty=FALSE; - bTextFrame=TRUE; - bNoShear=TRUE; - bNoRotate=FALSE; - bNoMirror=TRUE; - bDisableAutoWidthOnDragging=FALSE; + bTextSizeDirty=sal_False; + bTextFrame=sal_True; + bNoShear=sal_True; + bNoRotate=sal_False; + bNoMirror=sal_True; + bDisableAutoWidthOnDragging=sal_False; ImpJustifyRect(aRect); // #101684# - mbInEditMode = FALSE; + mbInEditMode = sal_False; // #111096# mbTextHidden = sal_False; @@ -237,7 +237,7 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect) mbSupportTextIndentingOnLineWidthChange = sal_True; } -SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, USHORT eFormat) +SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat) : SdrAttrObj(), aRect(rNewRect), mpText(NULL), @@ -245,18 +245,18 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStr pFormTextBoundRect(NULL), eTextKind(eNewTextKind) { - bTextSizeDirty=FALSE; - bTextFrame=TRUE; - bNoShear=TRUE; - bNoRotate=FALSE; - bNoMirror=TRUE; - bDisableAutoWidthOnDragging=FALSE; + bTextSizeDirty=sal_False; + bTextFrame=sal_True; + bNoShear=sal_True; + bNoRotate=sal_False; + bNoMirror=sal_True; + bDisableAutoWidthOnDragging=sal_False; ImpJustifyRect(aRect); NbcSetText(rInput, rBaseURL, eFormat); // #101684# - mbInEditMode = FALSE; + mbInEditMode = sal_False; // #111096# mbTextHidden = sal_False; @@ -300,7 +300,7 @@ void SdrTextObj::FitFrameToTextSize() { SdrOutliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetPaperSize(Size(aRect.Right()-aRect.Left(),aRect.Bottom()-aRect.Top())); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetText(*pText->GetOutlinerParaObject()); Rectangle aTextRect; Size aNewSize(rOutliner.CalcTextSize()); @@ -322,7 +322,7 @@ void SdrTextObj::NbcSetText(const XubString& rStr) SdrOutliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetStyleSheet( 0, GetStyleSheet()); //OutputDevice* pRef1=rOutliner.GetRefDevice(); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetText(rStr,rOutliner.GetParagraph( 0 )); OutlinerParaObject* pNewText=rOutliner.CreateParaObject(); Size aSiz(rOutliner.CalcTextSize()); @@ -330,7 +330,7 @@ void SdrTextObj::NbcSetText(const XubString& rStr) rOutliner.Clear(); NbcSetOutlinerParaObject(pNewText); aTextSize=aSiz; - bTextSizeDirty=FALSE; + bTextSizeDirty=sal_False; } void SdrTextObj::SetText(const XubString& rStr) @@ -346,21 +346,21 @@ void SdrTextObj::SetText(const XubString& rStr) //} } -void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat) +void SdrTextObj::NbcSetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat) { SdrOutliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetStyleSheet( 0, GetStyleSheet()); rOutliner.Read(rInput,rBaseURL,eFormat); OutlinerParaObject* pNewText=rOutliner.CreateParaObject(); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); Size aSiz(rOutliner.CalcTextSize()); rOutliner.Clear(); NbcSetOutlinerParaObject(pNewText); aTextSize=aSiz; - bTextSizeDirty=FALSE; + bTextSizeDirty=sal_False; } -void SdrTextObj::SetText(SvStream& rInput, const String& rBaseURL, USHORT eFormat) +void SdrTextObj::SetText(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat) { Rectangle aBoundRect0; if (pUserCall!=NULL) aBoundRect0=GetLastBoundRect(); // #110094#-14 SendRepaintBroadcast(); @@ -380,13 +380,13 @@ const Size& SdrTextObj::GetTextSize() const { SdrOutliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetText(*pText->GetOutlinerParaObject()); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); aSiz=rOutliner.CalcTextSize(); rOutliner.Clear(); } // 2x casting auf nonconst ((SdrTextObj*)this)->aTextSize=aSiz; - ((SdrTextObj*)this)->bTextSizeDirty=FALSE; + ((SdrTextObj*)this)->bTextSizeDirty=sal_False; } return aTextSize; } @@ -394,10 +394,10 @@ const Size& SdrTextObj::GetTextSize() const bool SdrTextObj::IsAutoGrowHeight() const { if(!bTextFrame) - return FALSE; // AutoGrow nur bei TextFrames + return sal_False; // AutoGrow nur bei TextFrames const SfxItemSet& rSet = GetObjectItemSet(); - BOOL bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); + sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWHEIGHT))).GetValue(); if(bRet) { @@ -409,7 +409,7 @@ bool SdrTextObj::IsAutoGrowHeight() const if(eDirection == SDRTEXTANI_UP || eDirection == SDRTEXTANI_DOWN) { - bRet = FALSE; + bRet = sal_False; } } } @@ -419,13 +419,13 @@ bool SdrTextObj::IsAutoGrowHeight() const bool SdrTextObj::IsAutoGrowWidth() const { if(!bTextFrame) - return FALSE; // AutoGrow nur bei TextFrames + return sal_False; // AutoGrow nur bei TextFrames const SfxItemSet& rSet = GetObjectItemSet(); - BOOL bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue(); + sal_Bool bRet = ((SdrTextAutoGrowHeightItem&)(rSet.Get(SDRATTR_TEXT_AUTOGROWWIDTH))).GetValue(); // #101684# - BOOL bInEditMOde = IsInEditMode(); + sal_Bool bInEditMOde = IsInEditMode(); if(!bInEditMOde && bRet) { @@ -437,7 +437,7 @@ bool SdrTextObj::IsAutoGrowWidth() const if(eDirection == SDRTEXTANI_LEFT || eDirection == SDRTEXTANI_RIGHT) { - bRet = FALSE; + bRet = sal_False; } } } @@ -457,7 +457,7 @@ SdrTextHorzAdjust SdrTextObj::GetTextHorizontalAdjust(const SfxItemSet& rSet) co SdrTextHorzAdjust eRet = ((SdrTextHorzAdjustItem&)(rSet.Get(SDRATTR_TEXT_HORZADJUST))).GetValue(); // #101684# - BOOL bInEditMode = IsInEditMode(); + sal_Bool bInEditMode = IsInEditMode(); if(!bInEditMode && eRet == SDRTEXTHORZADJUST_BLOCK) { @@ -489,7 +489,7 @@ SdrTextVertAdjust SdrTextObj::GetTextVerticalAdjust(const SfxItemSet& rSet) cons // #103516# Take care for vertical text animation here SdrTextVertAdjust eRet = ((SdrTextVertAdjustItem&)(rSet.Get(SDRATTR_TEXT_VERTADJUST))).GetValue(); - BOOL bInEditMode = IsInEditMode(); + sal_Bool bInEditMode = IsInEditMode(); // #103516# Take care for vertical text animation here if(!bInEditMode && eRet == SDRTEXTVERTADJUST_BLOCK) @@ -531,21 +531,21 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { bool bNoTextFrame=!IsTextFrame(); rInfo.bResizeFreeAllowed=bNoTextFrame || aGeo.nDrehWink%9000==0; - rInfo.bResizePropAllowed=TRUE; - rInfo.bRotateFreeAllowed=TRUE; - rInfo.bRotate90Allowed =TRUE; + rInfo.bResizePropAllowed=sal_True; + rInfo.bRotateFreeAllowed=sal_True; + rInfo.bRotate90Allowed =sal_True; rInfo.bMirrorFreeAllowed=bNoTextFrame; rInfo.bMirror45Allowed =bNoTextFrame; rInfo.bMirror90Allowed =bNoTextFrame; // allow transparence - rInfo.bTransparenceAllowed = TRUE; + rInfo.bTransparenceAllowed = sal_True; // gradient depends on fillstyle XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue(); rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT); rInfo.bShearAllowed =bNoTextFrame; - rInfo.bEdgeRadiusAllowed=TRUE; + rInfo.bEdgeRadiusAllowed=sal_True; bool bCanConv=ImpCanConvTextToCurve(); rInfo.bCanConvToPath =bCanConv; rInfo.bCanConvToPoly =bCanConv; @@ -554,9 +554,9 @@ void SdrTextObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rInfo.bCanConvToContour = (rInfo.bCanConvToPoly || LineGeometryUsageIsNecessary()); } -UINT16 SdrTextObj::GetObjIdentifier() const +sal_uInt16 SdrTextObj::GetObjIdentifier() const { - return USHORT(eTextKind); + return sal_uInt16(eTextKind); } bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner ) @@ -565,7 +565,7 @@ bool SdrTextObj::HasTextImpl( SdrOutliner* pOutliner ) if(pOutliner) { Paragraph* p1stPara=pOutliner->GetParagraph( 0 ); - ULONG nParaAnz=pOutliner->GetParagraphCount(); + sal_uIntPtr nParaAnz=pOutliner->GetParagraphCount(); if(p1stPara==NULL) nParaAnz=0; @@ -664,8 +664,8 @@ bool SdrTextObj::NbcSetMinTextFrameHeight(long nHgt) // bDisableAutoHeightOnDragging if vertical. if(IsVerticalWriting() && bDisableAutoWidthOnDragging) { - bDisableAutoWidthOnDragging = FALSE; - SetObjectItem(SdrTextAutoGrowHeightItem(FALSE)); + bDisableAutoWidthOnDragging = sal_False; + SetObjectItem(SdrTextAutoGrowHeightItem(sal_False)); } return true; @@ -703,8 +703,8 @@ bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt) // when not vertical. if(!IsVerticalWriting() && bDisableAutoWidthOnDragging) { - bDisableAutoWidthOnDragging = FALSE; - SetObjectItem(SdrTextAutoGrowWidthItem(FALSE)); + bDisableAutoWidthOnDragging = sal_False; + SetObjectItem(SdrTextAutoGrowWidthItem(sal_False)); } return true; @@ -732,7 +732,7 @@ bool SdrTextObj::NbcSetFitToSize(SdrFitToSizeType eFit) return false; } -void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, BOOL bLineWidth ) const +void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAnchorRect, sal_Bool bLineWidth ) const { basegfx::B2DPolyPolygon aXorPolyPolygon(TakeXorPoly()); basegfx::B2DPolyPolygon* pContourPolyPolygon = 0L; @@ -767,7 +767,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho { // #86258# force shadow off SdrObject* pCopy = Clone(); - pCopy->SetMergedItem(SdrShadowItem(FALSE)); + pCopy->SetMergedItem(SdrShadowItem(sal_False)); *pContourPolyPolygon = pCopy->TakeContour(); SdrObject::Free( pCopy ); } @@ -831,7 +831,7 @@ void SdrTextObj::TakeTextAnchorRect(Rectangle& rAnchorRect) const } void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, - Rectangle* pAnchorRect, BOOL bLineWidth ) const + Rectangle* pAnchorRect, sal_Bool bLineWidth ) const { Rectangle aAnkRect; // Rect innerhalb dem geankert wird TakeTextAnchorRect(aAnkRect); @@ -844,7 +844,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo bool bContourFrame=IsContourTextFrame(); bool bFrame=IsTextFrame(); - ULONG nStat0=rOutliner.GetControlWord(); + sal_uIntPtr nStat0=rOutliner.GetControlWord(); Size aNullSize; if (!bContourFrame) { @@ -863,7 +863,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo long nHgt=nAnkHgt; // #101684# - BOOL bInEditMode = IsInEditMode(); + sal_Bool bInEditMode = IsInEditMode(); if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE)) { @@ -898,7 +898,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo if (pPara) { - BOOL bHitTest = FALSE; + sal_Bool bHitTest = sal_False; if( pModel ) bHitTest = &pModel->GetHitTestOutliner() == &rOutliner; @@ -912,7 +912,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue()); } - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetText(*pPara); } } @@ -924,7 +924,7 @@ void SdrTextObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, boo if (pEdtOutl && !bNoEditText && pPara) delete pPara; - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetControlWord(nStat0); if( pText ) @@ -1004,7 +1004,7 @@ OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) const { OutputDevice* pOut = rOutliner.GetRefDevice(); - BOOL bNoStretching(FALSE); + sal_Bool bNoStretching(sal_False); if(pOut && pOut->GetOutDevType() == OUTDEV_PRINTER) { @@ -1016,7 +1016,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS pMtf = NULL; if(pMtf) - pMtf->Pause(TRUE); + pMtf->Pause(sal_True); Font aFontMerk(pOut->GetFont()); Font aTmpFont( OutputDevice::GetDefaultFont( DEFAULTFONT_SERIF, LANGUAGE_SYSTEM, DEFAULTFONT_FLAGS_ONLYONE ) ); @@ -1030,7 +1030,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS pOut->SetFont(aFontMerk); if(pMtf) - pMtf->Pause(FALSE); + pMtf->Pause(sal_False); bNoStretching = (aSize1 == aSize2); @@ -1039,7 +1039,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS // Und das finden wir nicht so schoen. if(aSize2.Height() >= aSize1.Height() * 2) { - bNoStretching = TRUE; + bNoStretching = sal_True; } #endif } @@ -1062,7 +1062,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS long nY=(nWantHgt*100) /nIsHgt; // Y-Stretching berechnen bool bChkX = true; if (bNoStretching) { // #35762# evtl. nur proportional moeglich - if (nX>nY) { nX=nY; bChkX=FALSE; } + if (nX>nY) { nX=nY; bChkX=sal_False; } else { nY=nX; } } @@ -1089,7 +1089,7 @@ void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextS bNoMoreLoop = true; } - rOutliner.SetGlobalCharStretching((USHORT)nX,(USHORT)nY); + rOutliner.SetGlobalCharStretching((sal_uInt16)nX,(sal_uInt16)nY); nLoopCount++; Size aSiz(rOutliner.CalcTextSize()); long nXDiff=aSiz.Width()-nWantWdt; @@ -1276,7 +1276,7 @@ basegfx::B2DPolyPolygon SdrTextObj::TakeContour() const Rectangle aAnchor2; Rectangle aR; - TakeTextRect(rOutliner,aR,FALSE,&aAnchor2); + TakeTextRect(rOutliner,aR,sal_False,&aAnchor2); rOutliner.Clear(); bool bFitToSize(IsFitToSize()); if (bFitToSize) aR=aAnchor2; @@ -1323,7 +1323,7 @@ Point SdrTextObj::GetSnapPoint(sal_uInt32 i) const void SdrTextObj::ImpCheckMasterCachable() { - bNotMasterCachable=FALSE; + bNotMasterCachable=sal_False; OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); @@ -1349,14 +1349,14 @@ void SdrTextObj::ImpCheckMasterCachable() // #101029#: Extracted from ImpGetDrawOutliner() void SdrTextObj::ImpInitDrawOutliner( SdrOutliner& rOutl ) const { - rOutl.SetUpdateMode(FALSE); - USHORT nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT; + rOutl.SetUpdateMode(sal_False); + sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT; if ( !IsOutlText() ) nOutlinerMode = OUTLINERMODE_TEXTOBJECT; rOutl.Init( nOutlinerMode ); rOutl.SetGlobalCharStretching(100,100); - ULONG nStat=rOutl.GetControlWord(); + sal_uIntPtr nStat=rOutl.GetControlWord(); nStat&=~(EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE); rOutl.SetControlWord(nStat); Size aNullSize; @@ -1397,13 +1397,13 @@ void SdrTextObj::ImpSetupDrawOutlinerForPaint( bool bContourFrame, // FitToSize erstmal nicht mit ContourFrame if (IsFitToSize() || IsAutoFit()) { - ULONG nStat=rOutliner.GetControlWord(); + sal_uIntPtr nStat=rOutliner.GetControlWord(); nStat|=EE_CNTRL_STRETCHING|EE_CNTRL_AUTOPAGESIZE; rOutliner.SetControlWord(nStat); } } rOutliner.SetFixedCellHeight(((const SdrTextFixedCellHeightItem&)GetMergedItem(SDRATTR_TEXT_USEFIXEDCELLHEIGHT)).GetValue()); - TakeTextRect(rOutliner, rTextRect, FALSE, &rAnchorRect); + TakeTextRect(rOutliner, rTextRect, sal_False, &rAnchorRect); rPaintRect = rTextRect; if (!bContourFrame) @@ -1436,8 +1436,8 @@ void SdrTextObj::ImpAutoFitText( SdrOutliner& rOutliner, const Size& rTextSize, // line-breaking text that we need some more samples // loop early-exits if we detect an already attained value - USHORT nMinStretchX=0, nMinStretchY=0; - USHORT aOldStretchXVals[]={0,0,0,0,0,0,0,0,0,0}; + sal_uInt16 nMinStretchX=0, nMinStretchY=0; + sal_uInt16 aOldStretchXVals[]={0,0,0,0,0,0,0,0,0,0}; const size_t aStretchArySize=sizeof(aOldStretchXVals)/sizeof(*aOldStretchXVals); for(unsigned int i=0; i<aStretchArySize; ++i) { @@ -1448,7 +1448,7 @@ void SdrTextObj::ImpAutoFitText( SdrOutliner& rOutliner, const Size& rTextSize, else fFactor = double(rTextSize.Height())/aCurrTextSize.Height(); - USHORT nCurrStretchX, nCurrStretchY; + sal_uInt16 nCurrStretchX, nCurrStretchY; rOutliner.GetGlobalCharStretching(nCurrStretchX, nCurrStretchY); if (fFactor >= 1.0 ) @@ -1465,17 +1465,17 @@ void SdrTextObj::ImpAutoFitText( SdrOutliner& rOutliner, const Size& rTextSize, if (fFactor < 1.0 || (fFactor >= 1.0 && nCurrStretchX != 100)) { - nCurrStretchX = sal::static_int_cast<USHORT>(nCurrStretchX*fFactor); - nCurrStretchY = sal::static_int_cast<USHORT>(nCurrStretchY*fFactor); - rOutliner.SetGlobalCharStretching(std::min(USHORT(100),nCurrStretchX), - std::min(USHORT(100),nCurrStretchY)); + nCurrStretchX = sal::static_int_cast<sal_uInt16>(nCurrStretchX*fFactor); + nCurrStretchY = sal::static_int_cast<sal_uInt16>(nCurrStretchY*fFactor); + rOutliner.SetGlobalCharStretching(std::min(sal_uInt16(100),nCurrStretchX), + std::min(sal_uInt16(100),nCurrStretchY)); OSL_TRACE("SdrTextObj::onEditOutlinerStatusEvent(): zoom is %d", nCurrStretchX); } } OSL_TRACE("---- SdrTextObj::onEditOutlinerStatusEvent(): final zoom is %d ----", nMinStretchX); - rOutliner.SetGlobalCharStretching(std::min(USHORT(100),nMinStretchX), - std::min(USHORT(100),nMinStretchY)); + rOutliner.SetGlobalCharStretching(std::min(sal_uInt16(100),nMinStretchX), + std::min(sal_uInt16(100),nMinStretchY)); } void SdrTextObj::SetupOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaintRect ) const @@ -1492,8 +1492,6 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint bool bContourFrame=IsContourTextFrame(); - ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXKorreg ); - if( GetModel() ) { MapMode aMapMode(GetModel()->GetScaleUnit(), Point(0,0), @@ -1501,6 +1499,8 @@ void SdrTextObj::UpdateOutlinerFormatting( SdrOutliner& rOutl, Rectangle& rPaint GetModel()->GetScaleFraction()); rOutl.SetRefMapMode(aMapMode); } + + ImpSetupDrawOutlinerForPaint( bContourFrame, rOutl, aTextRect, aAnchorRect, rPaintRect, aFitXKorreg ); } //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1640,7 +1640,7 @@ void SdrTextObj::ForceOutlinerParaObject() SdrText* pText = getActiveText(); if( pText && (pText->GetOutlinerParaObject() == 0) ) { - USHORT nOutlMode = OUTLINERMODE_TEXTOBJECT; + sal_uInt16 nOutlMode = OUTLINERMODE_TEXTOBJECT; if( IsTextFrame() && eTextKind == OBJ_OUTLINETEXT ) nOutlMode = OUTLINERMODE_OUTLINEOBJECT; @@ -1872,7 +1872,7 @@ void SdrTextObj::TRSetBaseGeometry(const basegfx::B2DHomMatrix& rMatrix, const b GeoStat aGeoStat; aGeoStat.nShearWink = FRound((atan(fShearX) / F_PI180) * 100.0); aGeoStat.RecalcTan(); - Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, FALSE); + Shear(Point(), aGeoStat.nShearWink, aGeoStat.nTan, sal_False); } // rotation? @@ -2151,20 +2151,20 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) // Konzept des TextObjekts: // ~~~~~~~~~~~~~~~~~~~~~~~~ // Attribute/Varianten: -// - BOOL Textrahmen / beschriftetes Zeichenobjekt -// - BOOL FontWork (wenn nicht Textrahmen und nicht ContourTextFrame) -// - BOOL ContourTextFrame (wenn nicht Textrahmen und nicht Fontwork) +// - sal_Bool Textrahmen / beschriftetes Zeichenobjekt +// - sal_Bool FontWork (wenn nicht Textrahmen und nicht ContourTextFrame) +// - sal_Bool ContourTextFrame (wenn nicht Textrahmen und nicht Fontwork) // - long Drehwinkel (wenn nicht FontWork) // - long Textrahmenabstaende (wenn nicht FontWork) -// - BOOL FitToSize (wenn nicht FontWork) -// - BOOL AutoGrowingWidth/Height (wenn nicht FitToSize und nicht FontWork) +// - sal_Bool FitToSize (wenn nicht FontWork) +// - sal_Bool AutoGrowingWidth/Height (wenn nicht FitToSize und nicht FontWork) // - long Min/MaxFrameWidth/Height (wenn AutoGrowingWidth/Height) // - enum Horizontale Textverankerung Links,Mitte,Rechts,Block,Stretch(ni) // - enum Vertikale Textverankerung Oben,Mitte,Unten,Block,Stretch(ni) // - enum Laufschrift (wenn nicht FontWork) // -// Jedes abgeleitete Objekt ist entweder ein Textrahmen (bTextFrame=TRUE) -// oder ein beschriftetes Zeichenobjekt (bTextFrame=FALSE). +// Jedes abgeleitete Objekt ist entweder ein Textrahmen (bTextFrame=sal_True) +// oder ein beschriftetes Zeichenobjekt (bTextFrame=sal_False). // // Defaultverankerung von Textrahmen: // SDRTEXTHORZADJUST_BLOCK, SDRTEXTVERTADJUST_TOP @@ -2192,8 +2192,8 @@ void SdrTextObj::SetObjectItemNoBroadcast(const SfxPoolItem& rItem) // ContourTextFrame: // - long Drehwinkel // - long Textrahmenabstaende spaeter vielleicht -// - BOOL FitToSize spaeter vielleicht -// - BOOL AutoGrowingWidth/Height viel spaeter vielleicht +// - sal_Bool FitToSize spaeter vielleicht +// - sal_Bool AutoGrowingWidth/Height viel spaeter vielleicht // - long Min/MaxFrameWidth/Height viel spaeter vielleicht // - enum Horizontale Textverankerung spaeter vielleicht, erstmal Links, Absatz zentr. // - enum Vertikale Textverankerung spaeter vielleicht, erstmal oben diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 60a6903517..621e2591e8 100644..100755 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -54,7 +54,7 @@ #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx> #include <drawinglayer/primitive2d/graphicprimitive2d.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <editeng/outlobj.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index b419403d0d..4698277e69 100644..100755 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -65,7 +65,7 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <editeng/editstat.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <svx/sdr/attribute/sdrformtextoutlineattribute.hxx> @@ -569,7 +569,7 @@ namespace } } - // consume from portion // no += here, xub_StrLen is USHORT and the compiler will gererate a warning here + // consume from portion // no += here, xub_StrLen is sal_uInt16 and the compiler will gererate a warning here nUsedTextLength = nUsedTextLength + nNextGlyphLen; // consume from polygon diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 12f47689bd..d4b5945d5b 100644..100755 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -31,7 +31,7 @@ #include <svl/style.hxx> #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // fuer GetMaxObjSize und GetStyleSheetPool #include <svx/svdoutl.hxx> #include <svx/svdorect.hxx> // fuer SetDirty bei NbcAdjustTextFrameWidthAndHeight @@ -122,7 +122,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW if (aSiz.Height()<2) aSiz.Height()=2; // Mindestgroesse 2 // #101684# - BOOL bInEditMode = IsInEditMode(); + sal_Bool bInEditMode = IsInEditMode(); if(!bInEditMode) { @@ -143,7 +143,7 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW } else { Outliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetPaperSize(aSiz); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); // !!! hier sollte ich wohl auch noch mal die Optimierung mit // bPortionInfoChecked usw einbauen OutlinerParaObject* pOutlinerParaObject = GetOutlinerParaObject(); @@ -172,8 +172,8 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW if (nHgt<1) nHgt=1; // nVDist kann auch negativ sein long nWdtGrow=nWdt-(rR.Right()-rR.Left()); long nHgtGrow=nHgt-(rR.Bottom()-rR.Top()); - if (nWdtGrow==0) bWdtGrow=FALSE; - if (nHgtGrow==0) bHgtGrow=FALSE; + if (nWdtGrow==0) bWdtGrow=sal_False; + if (nHgtGrow==0) bHgtGrow=sal_False; if (bWdtGrow || bHgtGrow) { if (bWdtGrow) { SdrTextHorzAdjust eHAdj=GetTextHorizontalAdjust(); @@ -203,11 +203,11 @@ bool SdrTextObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHgt, bool bW aD2-=aD1; rR.Move(aD2.X(),aD2.Y()); } - return TRUE; + return sal_True; } } } - return FALSE; + return sal_False; } bool SdrTextObj::NbcAdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) @@ -262,22 +262,22 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() const EditTextObject& rTextObj=pOutlinerParaObject->GetTextObject(); XubString aStyleName; SfxStyleFamily eStyleFam; - USHORT nParaAnz=rTextObj.GetParagraphCount(); + sal_uInt16 nParaAnz=rTextObj.GetParagraphCount(); - for(UINT16 nParaNum(0); nParaNum < nParaAnz; nParaNum++) + for(sal_uInt16 nParaNum(0); nParaNum < nParaAnz; nParaNum++) { rTextObj.GetStyleSheet(nParaNum, aStyleName, eStyleFam); if(aStyleName.Len()) { - XubString aFam = UniString::CreateFromInt32((UINT16)eStyleFam); + XubString aFam = UniString::CreateFromInt32((sal_uInt16)eStyleFam); aFam.Expand(5); aStyleName += sal_Unicode('|'); aStyleName += aFam; - BOOL bFnd(FALSE); - UINT32 nNum(aStyles.Count()); + sal_Bool bFnd(sal_False); + sal_uInt32 nNum(aStyles.Count()); while(!bFnd && nNum > 0) { @@ -295,7 +295,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() } // nun die Strings im Container durch StyleSheet* ersetzten - ULONG nNum=aStyles.Count(); + sal_uIntPtr nNum=aStyles.Count(); while (nNum>0) { nNum--; XubString* pName=(XubString*)aStyles.GetObject(nNum); @@ -306,8 +306,8 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() aFam.Erase(0,1); aFam.EraseTrailingChars(); - // UNICODE: USHORT nFam=USHORT(aFam); - UINT16 nFam = (UINT16)aFam.ToInt32(); + // UNICODE: sal_uInt16 nFam=sal_uInt16(aFam); + sal_uInt16 nFam = (sal_uInt16)aFam.ToInt32(); SfxStyleFamily eFam=(SfxStyleFamily)nFam; SfxStyleSheetBase* pStyleBase=pStylePool->Find(*pName,eFam); @@ -323,7 +323,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() nNum=GetBroadcasterCount(); while (nNum>0) { nNum--; - SfxBroadcaster* pBroadcast=GetBroadcasterJOE((USHORT)nNum); + SfxBroadcaster* pBroadcast=GetBroadcasterJOE((sal_uInt16)nNum); SfxStyleSheet* pStyle=PTR_CAST(SfxStyleSheet,pBroadcast); if (pStyle!=NULL && pStyle!=GetStyleSheet()) { // Sonderbehandlung fuer den StyleSheet des Objekts if (aStyles.GetPos(pStyle)==CONTAINER_ENTRY_NOTFOUND) { @@ -337,7 +337,7 @@ void SdrTextObj::ImpSetTextStyleSheetListeners() nNum--; SfxStyleSheet* pStyle=(SfxStyleSheet*)aStyles.GetObject(nNum); // StartListening soll selbst nachsehen, ob hier nicht evtl. schon gehorcht wird - StartListening(*pStyle,TRUE); + StartListening(*pStyle,sal_True); } } } @@ -383,13 +383,13 @@ void SdrTextObj::NbcResizeTextAttributes(const Fraction& xFact, const Fraction& if (nAbsHgt>0xFFFF) nAbsHgt=0xFFFF; // und nun attributieren - SetObjectItem(SvxCharScaleWidthItem( (USHORT) nRelWdt, EE_CHAR_FONTWIDTH)); - SetObjectItem(SvxFontHeightItem(nAbsHgt,(USHORT)nRelHgt, EE_CHAR_FONTHEIGHT)); + SetObjectItem(SvxCharScaleWidthItem( (sal_uInt16) nRelWdt, EE_CHAR_FONTWIDTH)); + SetObjectItem(SvxFontHeightItem(nAbsHgt,(sal_uInt16)nRelHgt, EE_CHAR_FONTHEIGHT)); // Zeichen- und Absatzattribute innerhalb des OutlinerParaObjects Outliner& rOutliner=ImpGetDrawOutliner(); rOutliner.SetPaperSize(Size(LONG_MAX,LONG_MAX)); rOutliner.SetText(*pOutlinerParaObject); - rOutliner.DoStretchChars((USHORT)nX,(USHORT)nY); + rOutliner.DoStretchChars((sal_uInt16)nX,(sal_uInt16)nY); OutlinerParaObject* pNewPara=rOutliner.CreateParaObject(); NbcSetOutlinerParaObject(pNewPara); rOutliner.Clear(); @@ -452,7 +452,7 @@ bool SdrTextObj::HasText() const if( pOPO ) { const EditTextObject& rETO = pOPO->GetTextObject(); - USHORT nParaCount = rETO.GetParagraphCount(); + sal_uInt16 nParaCount = rETO.GetParagraphCount(); if( nParaCount > 0 ) bHasText = (nParaCount > 1) || (rETO.GetText( 0 ).Len() != 0); diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 76ebf0c19e..05e2bdbf89 100644..100755 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -34,8 +34,8 @@ #include <svx/svddrag.hxx> #include <svx/svdview.hxx> #include <svx/svdorect.hxx> // fuer SetXPolyDirty in MovCreate bei SolidDragging -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdoashp.hxx> #include <tools/bigint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -223,7 +223,7 @@ bool SdrTextObj::MovCreate(SdrDragStat& rStat) rStat.SetActionRect(aRect1); aRect=aRect1; // fuer ObjName SetBoundRectDirty(); - bSnapRectDirty=TRUE; + bSnapRectDirty=sal_True; if (HAS_BASE(SdrRectObj,this)) { ((SdrRectObj*)this)->SetXPolyDirty(); } diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index e679d76bca..b337cb6a36 100644..100755 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // fuer GetMaxObjSize #include <svx/svdoutl.hxx> #include <editeng/outliner.hxx> @@ -66,9 +66,9 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) pEdtOutl=&rOutl; // #101684# - mbInEditMode = TRUE; + mbInEditMode = sal_True; - USHORT nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT; + sal_uInt16 nOutlinerMode = OUTLINERMODE_OUTLINEOBJECT; if ( !IsOutlText() ) nOutlinerMode = OUTLINERMODE_TEXTOBJECT; rOutl.Init( nOutlinerMode ); @@ -79,7 +79,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) ImpSetTextEditParams(); if (!bContourFrame) { - ULONG nStat=rOutl.GetControlWord(); + sal_uIntPtr nStat=rOutl.GetControlWord(); nStat|=EE_CNTRL_AUTOPAGESIZE; if (bFitToSize || IsAutoFit()) nStat|=EE_CNTRL_STRETCHING; @@ -119,8 +119,8 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) { Rectangle aAnchorRect; Rectangle aTextRect; - TakeTextRect(rOutl, aTextRect, FALSE, - &aAnchorRect/* #97097# give TRUE here, not FALSE */); + TakeTextRect(rOutl, aTextRect, sal_False, + &aAnchorRect/* #97097# give sal_True here, not sal_False */); Fraction aFitXKorreg(1,1); ImpSetCharStretching(rOutl,aTextRect.GetSize(),aAnchorRect.GetSize(),aFitXKorreg); } @@ -134,7 +134,7 @@ sal_Bool SdrTextObj::BegTextEdit(SdrOutliner& rOutl) // #78476# also repaint when animated text is put to edit mode // to not make appear the text double // #111096# should now repaint automatically. - // BOOL bIsAnimated(pPlusData && pPlusData->pAnimator); + // sal_Bool bIsAnimated(pPlusData && pPlusData->pAnimator); if(aGeo.nDrehWink || IsFontwork() /*|| bIsAnimated*/) { @@ -196,7 +196,7 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p SdrTextAniDirection eAniDirection=GetTextAniDirection(); // #101684# - BOOL bInEditMode = IsInEditMode(); + sal_Bool bInEditMode = IsInEditMode(); if (!bInEditMode && (eAniKind==SDRTEXTANI_SCROLL || eAniKind==SDRTEXTANI_ALTERNATE || eAniKind==SDRTEXTANI_SLIDE)) { @@ -280,26 +280,26 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl) // need to end edit mode early since SetOutlinerParaObject already // uses GetCurrentBoundRect() which needs to take the text into account // to work correct - mbInEditMode = FALSE; + mbInEditMode = sal_False; SetOutlinerParaObject(pNewText); } pEdtOutl = NULL; rOutl.Clear(); - UINT32 nStat = rOutl.GetControlWord(); + sal_uInt32 nStat = rOutl.GetControlWord(); nStat &= ~EE_CNTRL_AUTOPAGESIZE; rOutl.SetControlWord(nStat); // #101684# - mbInEditMode = FALSE; + mbInEditMode = sal_False; } -USHORT SdrTextObj::GetOutlinerViewAnchorMode() const +sal_uInt16 SdrTextObj::GetOutlinerViewAnchorMode() const { SdrTextHorzAdjust eH=GetTextHorizontalAdjust(); SdrTextVertAdjust eV=GetTextVerticalAdjust(); EVAnchorMode eRet=ANCHOR_TOP_LEFT; - if (IsContourTextFrame()) return (USHORT)eRet; + if (IsContourTextFrame()) return (sal_uInt16)eRet; if (eH==SDRTEXTHORZADJUST_LEFT) { if (eV==SDRTEXTVERTADJUST_TOP) { eRet=ANCHOR_TOP_LEFT; @@ -325,14 +325,14 @@ USHORT SdrTextObj::GetOutlinerViewAnchorMode() const eRet=ANCHOR_VCENTER_HCENTER; } } - return (USHORT)eRet; + return (sal_uInt16)eRet; } void SdrTextObj::ImpSetTextEditParams() const { if (pEdtOutl!=NULL) { bool bUpdMerk=pEdtOutl->GetUpdateMode(); - if (bUpdMerk) pEdtOutl->SetUpdateMode(FALSE); + if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_False); Size aPaperMin; Size aPaperMax; Rectangle aEditArea; @@ -341,16 +341,16 @@ void SdrTextObj::ImpSetTextEditParams() const //bool bFitToSize=(eFit==SDRTEXTFIT_PROPORTIONAL || eFit==SDRTEXTFIT_ALLLINES); bool bContourFrame=IsContourTextFrame(); //EVAnchorMode eAM=(EVAnchorMode)GetOutlinerViewAnchorMode(); - //ULONG nViewAnz=pEdtOutl->GetViewCount(); + //sal_uIntPtr nViewAnz=pEdtOutl->GetViewCount(); pEdtOutl->SetMinAutoPaperSize(aPaperMin); pEdtOutl->SetMaxAutoPaperSize(aPaperMax); pEdtOutl->SetPaperSize(Size()); if (bContourFrame) { Rectangle aAnchorRect; TakeTextAnchorRect(aAnchorRect); - ImpSetContourPolygon(*pEdtOutl,aAnchorRect, TRUE); + ImpSetContourPolygon(*pEdtOutl,aAnchorRect, sal_True); } - if (bUpdMerk) pEdtOutl->SetUpdateMode(TRUE); + if (bUpdMerk) pEdtOutl->SetUpdateMode(sal_True); } } diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx index 2cba5d849d..b5a7d90d2e 100644..100755 --- a/svx/source/svdraw/svdotxfl.cxx +++ b/svx/source/svdraw/svdotxfl.cxx @@ -34,7 +34,7 @@ #include <svx/svdotext.hxx> #include <svx/svdfield.hxx> -static BOOL bInit = FALSE; +static sal_Bool bInit = sal_False; // Do not remove this, it is still used in src536a! void SdrRegisterFieldClasses() @@ -45,16 +45,16 @@ void SdrRegisterFieldClasses() SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxHeaderField); SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxFooterField); SvxFieldItem::GetClassManager().SV_CLASS_REGISTER(SvxDateTimeField); - bInit = TRUE; + bInit = sal_True; } } ///////////////////////////////////////////////////////////////////////////////////////////////// */ -bool SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, USHORT /*nPara*/, USHORT /*nPos*/, +bool SdrTextObj::CalcFieldValue(const SvxFieldItem& /*rField*/, sal_uInt16 /*nPara*/, sal_uInt16 /*nPos*/, bool /*bEdit*/, Color*& /*rpTxtColor*/, Color*& /*rpFldColor*/, XubString& /*rRet*/) const { - return FALSE; + return sal_False; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 79b33da98c..b3ceec9f9d 100644..100755 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -35,7 +35,7 @@ #include <ucbhelper/contentbroker.hxx> #include <unotools/datetime.hxx> #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <editeng/editdata.hxx> #include <sfx2/lnkbase.hxx> @@ -78,7 +78,7 @@ public: virtual void DataChanged( const String& rMimeType, const ::com::sun::star::uno::Any & rValue ); - BOOL Connect() { return 0 != SvBaseLink::GetRealObject(); } + sal_Bool Connect() { return 0 != SvBaseLink::GetRealObject(); } }; ImpSdrObjTextLink::~ImpSdrObjTextLink() @@ -195,8 +195,8 @@ void SdrTextObj::SetTextLink(const String& rFileName, const String& rFilterName, void SdrTextObj::ReleaseTextLink() { ImpLinkAbmeldung(); - USHORT nAnz=GetUserDataCount(); - for (USHORT nNum=nAnz; nNum>0;) { + sal_uInt16 nAnz=GetUserDataCount(); + for (sal_uInt16 nNum=nAnz; nNum>0;) { nNum--; SdrObjUserData* pData=GetUserData(nNum); if (pData->GetInventor()==SdrInventor && pData->GetId()==SDRUSERDATA_OBJTEXTLINK) { @@ -214,11 +214,11 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad) { ::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get(); DateTime aFileDT; - BOOL bExists = FALSE, bLoad = FALSE; + sal_Bool bExists = sal_False, bLoad = sal_False; if( pBroker ) { - bExists = TRUE; + bExists = sal_True; try { @@ -234,14 +234,14 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad) } catch( ... ) { - bExists = FALSE; + bExists = sal_False; } } if( bExists ) { if( bForceLoad ) - bLoad = TRUE; + bLoad = sal_True; else bLoad = ( aFileDT > pData->aFileDate0 ); @@ -260,7 +260,7 @@ bool SdrTextObj::ReloadLinkedText( bool bForceLoad) bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/, rtl_TextEncoding eCharSet) { INetURLObject aFileURL( rFileName ); - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( aFileURL.GetProtocol() == INET_PROT_NOT_VALID ) { @@ -285,14 +285,14 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/ cRTF[4] = 0; pIStm->Read(cRTF, 5); - BOOL bRTF = cRTF[0] == '{' && cRTF[1] == '\\' && cRTF[2] == 'r' && cRTF[3] == 't' && cRTF[4] == 'f'; + sal_Bool bRTF = cRTF[0] == '{' && cRTF[1] == '\\' && cRTF[2] == 'r' && cRTF[3] == 't' && cRTF[4] == 'f'; pIStm->Seek(0); if( !pIStm->GetError() ) { - SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::NO_DECODE ), sal::static_int_cast< USHORT >( bRTF ? EE_FORMAT_RTF : EE_FORMAT_TEXT ) ); - bRet = TRUE; + SetText( *pIStm, aFileURL.GetMainURL( INetURLObject::NO_DECODE ), sal::static_int_cast< sal_uInt16 >( bRTF ? EE_FORMAT_RTF : EE_FORMAT_TEXT ) ); + bRet = sal_True; } delete pIStm; @@ -304,8 +304,8 @@ bool SdrTextObj::LoadText(const String& rFileName, const String& /*rFilterName*/ ImpSdrObjTextLinkUserData* SdrTextObj::GetLinkUserData() const { ImpSdrObjTextLinkUserData* pData=NULL; - USHORT nAnz=GetUserDataCount(); - for (USHORT nNum=nAnz; nNum>0 && pData==NULL;) { + sal_uInt16 nAnz=GetUserDataCount(); + for (sal_uInt16 nNum=nAnz; nNum>0 && pData==NULL;) { nNum--; pData=(ImpSdrObjTextLinkUserData*)GetUserData(nNum); if (pData->GetInventor()!=SdrInventor || pData->GetId()!=SDRUSERDATA_OBJTEXTLINK) { diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 2896dbf359..90033c0a6f 100644..100755 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdtrans.hxx> #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> @@ -42,7 +42,7 @@ #include <svx/sdr/properties/properties.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svl/itemset.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <drawinglayer/processor2d/textaspolygonextractor2d.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/xflclit.hxx> @@ -231,7 +231,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); long dx=aRect.Right()-aRect.Left(); long dy=aRect.Bottom()-aRect.Top(); Point aP(aRect.TopLeft()); @@ -250,18 +250,18 @@ void SdrTextObj::NbcRotate(const Point& rRef, long nWink, double sn, double cs) } SetRectsDirty(); NbcRotateGluePoints(rRef,nWink,sn,cs); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); // #75889# when this is a SdrPathObj aRect maybe not initialized Polygon aPol(Rect2Poly(aRect.IsEmpty() ? GetSnapRect() : aRect, aGeo)); - USHORT nPointCount=aPol.GetSize(); - for (USHORT i=0; i<nPointCount; i++) { + sal_uInt16 nPointCount=aPol.GetSize(); + for (sal_uInt16 i=0; i<nPointCount; i++) { ShearPoint(aPol[i],rRef,tn,bVShear); } Poly2Rect(aPol,aRect,aGeo); @@ -272,12 +272,12 @@ void SdrTextObj::NbcShear(const Point& rRef, long nWink, double tn, bool bVShear ImpCheckShear(); SetRectsDirty(); NbcShearGluePoints(rRef,nWink,tn,bVShear); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) { - SetGlueReallyAbsolute(TRUE); + SetGlueReallyAbsolute(sal_True); bool bNoShearMerk=aGeo.nShearWink==0; bool bRota90Merk = false; if (bNoShearMerk && @@ -286,8 +286,8 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) bRota90Merk=aGeo.nDrehWink % 9000 ==0; } Polygon aPol(Rect2Poly(aRect,aGeo)); - USHORT i; - USHORT nPntAnz=aPol.GetSize(); + sal_uInt16 i; + sal_uInt16 nPntAnz=aPol.GetSize(); for (i=0; i<nPntAnz; i++) { MirrorPoint(aPol[i],rRef1,rRef2); } @@ -325,7 +325,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2) ImpCheckShear(); SetRectsDirty(); NbcMirrorGluePoints(rRef1,rRef2); - SetGlueReallyAbsolute(FALSE); + SetGlueReallyAbsolute(sal_False); } ////////////////////////////////////////////////////////////////////////////// @@ -346,7 +346,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const if(xSequence.hasElements()) { // create an extractor with neutral ViewInformation - const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0); + const drawinglayer::geometry::ViewInformation2D aViewInformation2D; drawinglayer::processor2d::TextAsPolygonExtractor2D aExtractor(aViewInformation2D); // extract text as polygons @@ -453,7 +453,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const ////////////////////////////////////////////////////////////////////////////// -SdrObject* SdrTextObj::DoConvertToPolyObj(BOOL bBezier) const +SdrObject* SdrTextObj::DoConvertToPolyObj(sal_Bool bBezier) const { return ImpConvertContainedTextToSdrPathObjs(!bBezier); } diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index 5586987e79..b112f80efc 100644..100755 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -48,17 +48,17 @@ #include <svx/svdouno.hxx> #include <svx/svdpagv.hxx> #include <svx/svdmodel.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdetc.hxx> #include <svx/svdview.hxx> #include <svx/svdorect.hxx> -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <rtl/ref.hxx> #include <set> #include <memory> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <tools/diagnose_ex.h> #include <svx/svdograf.hxx> @@ -165,11 +165,11 @@ namespace TYPEINIT1(SdrUnoObj, SdrRectObj); -SdrUnoObj::SdrUnoObj(const String& rModelName, BOOL _bOwnUnoControlModel) +SdrUnoObj::SdrUnoObj(const String& rModelName, sal_Bool _bOwnUnoControlModel) : m_pImpl( new SdrUnoObjDataHolder ), bOwnUnoControlModel( _bOwnUnoControlModel ) { - bIsUnoObj = TRUE; + bIsUnoObj = sal_True; m_pImpl->pEventListener = new SdrControlEventListenerImpl(this); @@ -180,11 +180,11 @@ SdrUnoObj::SdrUnoObj(const String& rModelName, BOOL _bOwnUnoControlModel) SdrUnoObj::SdrUnoObj(const String& rModelName, const uno::Reference< lang::XMultiServiceFactory >& rxSFac, - BOOL _bOwnUnoControlModel) + sal_Bool _bOwnUnoControlModel) : m_pImpl( new SdrUnoObjDataHolder ), bOwnUnoControlModel( _bOwnUnoControlModel ) { - bIsUnoObj = TRUE; + bIsUnoObj = sal_True; m_pImpl->pEventListener = new SdrControlEventListenerImpl(this); @@ -228,26 +228,26 @@ void SdrUnoObj::SetPage(SdrPage* pNewPage) void SdrUnoObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bRotateFreeAllowed = FALSE; - rInfo.bRotate90Allowed = FALSE; - rInfo.bMirrorFreeAllowed = FALSE; - rInfo.bMirror45Allowed = FALSE; - rInfo.bMirror90Allowed = FALSE; - rInfo.bTransparenceAllowed = FALSE; - rInfo.bGradientAllowed = FALSE; - rInfo.bShearAllowed = FALSE; - rInfo.bEdgeRadiusAllowed = FALSE; - rInfo.bNoOrthoDesired = FALSE; - rInfo.bCanConvToPath = FALSE; - rInfo.bCanConvToPoly = FALSE; - rInfo.bCanConvToPathLineToArea = FALSE; - rInfo.bCanConvToPolyLineToArea = FALSE; - rInfo.bCanConvToContour = FALSE; + rInfo.bRotateFreeAllowed = sal_False; + rInfo.bRotate90Allowed = sal_False; + rInfo.bMirrorFreeAllowed = sal_False; + rInfo.bMirror45Allowed = sal_False; + rInfo.bMirror90Allowed = sal_False; + rInfo.bTransparenceAllowed = sal_False; + rInfo.bGradientAllowed = sal_False; + rInfo.bShearAllowed = sal_False; + rInfo.bEdgeRadiusAllowed = sal_False; + rInfo.bNoOrthoDesired = sal_False; + rInfo.bCanConvToPath = sal_False; + rInfo.bCanConvToPoly = sal_False; + rInfo.bCanConvToPathLineToArea = sal_False; + rInfo.bCanConvToPolyLineToArea = sal_False; + rInfo.bCanConvToContour = sal_False; } -UINT16 SdrUnoObj::GetObjIdentifier() const +sal_uInt16 SdrUnoObj::GetObjIdentifier() const { - return UINT16(OBJ_UNO); + return sal_uInt16(OBJ_UNO); } void SdrUnoObj::SetContextWritingMode( const sal_Int16 _nContextWritingMode ) diff --git a/svx/source/svdraw/svdoutl.cxx b/svx/source/svdraw/svdoutl.cxx index 506f4272e2..f8d8aff55e 100644..100755 --- a/svx/source/svdraw/svdoutl.cxx +++ b/svx/source/svdraw/svdoutl.cxx @@ -42,7 +42,7 @@ DBG_NAME(SdrOutliner) |* Ctor |* \************************************************************************/ -SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, USHORT nMode ) +SdrOutliner::SdrOutliner( SfxItemPool* pItemPool, sal_uInt16 nMode ) : Outliner( pItemPool, nMode ), //mpPaintInfoRec( NULL ) mpVisualizedPage(0) @@ -71,15 +71,15 @@ void SdrOutliner::SetTextObj( const SdrTextObj* pObj ) { if( pObj && pObj != mpTextObj.get() ) { - SetUpdateMode(FALSE); - USHORT nOutlinerMode2 = OUTLINERMODE_OUTLINEOBJECT; + SetUpdateMode(sal_False); + sal_uInt16 nOutlinerMode2 = OUTLINERMODE_OUTLINEOBJECT; if ( !pObj->IsOutlText() ) nOutlinerMode2 = OUTLINERMODE_TEXTOBJECT; Init( nOutlinerMode2 ); SetGlobalCharStretching(100,100); - ULONG nStat = GetControlWord(); + sal_uIntPtr nStat = GetControlWord(); nStat &= ~( EE_CNTRL_STRETCHING | EE_CNTRL_AUTOPAGESIZE ); SetControlWord(nStat); @@ -109,14 +109,14 @@ void SdrOutliner::SetTextObjNoInit( const SdrTextObj* pObj ) |* |* \************************************************************************/ -XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, USHORT nPara, USHORT nPos, +XubString SdrOutliner::CalcFieldValue(const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor) { bool bOk = false; XubString aRet; if(mpTextObj.is()) - bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, FALSE, rpTxtColor, rpFldColor, aRet); + bOk = static_cast< SdrTextObj* >( mpTextObj.get())->CalcFieldValue(rField, nPara, nPos, sal_False, rpTxtColor, rpFldColor, aRet); if (!bOk) aRet = Outliner::CalcFieldValue(rField, nPara, nPos, rpTxtColor, rpFldColor); diff --git a/svx/source/svdraw/svdoutlinercache.cxx b/svx/source/svdraw/svdoutlinercache.cxx index 9d96e2a5ad..1bcdb16f0f 100644..100755 --- a/svx/source/svdraw/svdoutlinercache.cxx +++ b/svx/source/svdraw/svdoutlinercache.cxx @@ -34,7 +34,7 @@ #include <svx/svdoutl.hxx> #include <svx/svdmodel.hxx> -extern SdrOutliner* SdrMakeOutliner( USHORT nOutlinerMode, SdrModel* pModel ); +extern SdrOutliner* SdrMakeOutliner( sal_uInt16 nOutlinerMode, SdrModel* pModel ); SdrOutlinerCache::SdrOutlinerCache( SdrModel* pModel ) : mpModel( pModel ), @@ -86,7 +86,7 @@ void SdrOutlinerCache::disposeOutliner( SdrOutliner* pOutliner ) { if( pOutliner ) { - USHORT nOutlMode = pOutliner->GetOutlinerMode(); + sal_uInt16 nOutlMode = pOutliner->GetOutlinerMode(); if( (OUTLINERMODE_OUTLINEOBJECT == nOutlMode) && (NULL == mpModeOutline) ) { diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx index cc72b2ff30..8d32538408 100644..100755 --- a/svx/source/svdraw/svdovirt.cxx +++ b/svx/source/svdraw/svdovirt.cxx @@ -61,7 +61,7 @@ TYPEINIT1(SdrVirtObj,SdrObject); SdrVirtObj::SdrVirtObj(SdrObject& rNewObj): rRefObj(rNewObj) { - bVirtObj=TRUE; // Ja, ich bin ein virtuelles Objekt + bVirtObj=sal_True; // Ja, ich bin ein virtuelles Objekt rRefObj.AddReference(*this); bClosedObj=rRefObj.IsClosedObj(); } @@ -70,7 +70,7 @@ SdrVirtObj::SdrVirtObj(SdrObject& rNewObj, const Point& rAnchorPos): rRefObj(rNewObj) { aAnchor=rAnchorPos; - bVirtObj=TRUE; // Ja, ich bin ein virtuelles Objekt + bVirtObj=sal_True; // Ja, ich bin ein virtuelles Objekt rRefObj.AddReference(*this); bClosedObj=rRefObj.IsClosedObj(); } @@ -120,12 +120,12 @@ void SdrVirtObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const rRefObj.TakeObjInfo(rInfo); } -UINT32 SdrVirtObj::GetObjInventor() const +sal_uInt32 SdrVirtObj::GetObjInventor() const { return rRefObj.GetObjInventor(); } -UINT16 SdrVirtObj::GetObjIdentifier() const +sal_uInt16 SdrVirtObj::GetObjIdentifier() const { return rRefObj.GetObjIdentifier(); } @@ -198,7 +198,7 @@ void SdrVirtObj::TakeObjNamePlural(XubString& rName) const void operator +=(PolyPolygon& rPoly, const Point& rOfs) { if (rOfs.X()!=0 || rOfs.Y()!=0) { - USHORT i,j; + sal_uInt16 i,j; for (j=0; j<rPoly.Count(); j++) { Polygon aP1(rPoly.GetObject(j)); for (i=0; i<aP1.GetSize(); i++) { diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 69a9931ebc..d16822984b 100644..100755 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -50,7 +50,7 @@ #include <svx/svdograf.hxx> // fuer SwapInAll() #include <svx/svdoedge.hxx> // Zum kopieren der Konnektoren #include <svx/svdoole2.hxx> // Sonderbehandlung OLE beim SdrExchangeFormat -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdmodel.hxx> #include <svx/svdlayer.hxx> #include <svx/svdotext.hxx> @@ -112,8 +112,8 @@ SdrObjList::SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewU pModel=pNewModel; pPage=pNewPage; pUpList=pNewUpList; - bObjOrdNumsDirty=FALSE; - bRectsDirty=FALSE; + bObjOrdNumsDirty=sal_False; + bRectsDirty=sal_False; pOwnerObj=NULL; eListKind=SDROBJLIST_UNKNOWN; } @@ -128,8 +128,8 @@ SdrObjList::SdrObjList(const SdrObjList& rSrcList): pModel=NULL; pPage=NULL; pUpList=NULL; - bObjOrdNumsDirty=FALSE; - bRectsDirty=FALSE; + bObjOrdNumsDirty=sal_False; + bRectsDirty=sal_False; pOwnerObj=NULL; eListKind=SDROBJLIST_UNKNOWN; *this=rSrcList; @@ -158,12 +158,12 @@ void SdrObjList::operator=(const SdrObjList& rSrcList) void SdrObjList::CopyObjects(const SdrObjList& rSrcList) { Clear(); - bObjOrdNumsDirty=FALSE; - bRectsDirty =FALSE; - ULONG nCloneErrCnt=0; - ULONG nAnz=rSrcList.GetObjCount(); + bObjOrdNumsDirty=sal_False; + bRectsDirty =sal_False; + sal_uIntPtr nCloneErrCnt=0; + sal_uIntPtr nAnz=rSrcList.GetObjCount(); SdrInsertReason aReason(SDRREASON_COPY); - ULONG no; + sal_uIntPtr no; for (no=0; no<nAnz; no++) { SdrObject* pSO=rSrcList.GetObj(no); @@ -193,8 +193,8 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) const SdrObject* pSrcOb=rSrcList.GetObj(no); SdrEdgeObj* pSrcEdge=PTR_CAST(SdrEdgeObj,pSrcOb); if (pSrcEdge!=NULL) { - SdrObject* pSrcNode1=pSrcEdge->GetConnectedNode(TRUE); - SdrObject* pSrcNode2=pSrcEdge->GetConnectedNode(FALSE); + SdrObject* pSrcNode1=pSrcEdge->GetConnectedNode(sal_True); + SdrObject* pSrcNode2=pSrcEdge->GetConnectedNode(sal_False); if (pSrcNode1!=NULL && pSrcNode1->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode1=NULL; // Listenuebergreifend if (pSrcNode2!=NULL && pSrcNode2->GetObjList()!=pSrcEdge->GetObjList()) pSrcNode2=NULL; // ist (noch) nicht if (pSrcNode1!=NULL || pSrcNode2!=NULL) { @@ -202,19 +202,19 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList) SdrEdgeObj* pDstEdge=PTR_CAST(SdrEdgeObj,pEdgeObjTmp); if (pDstEdge!=NULL) { if (pSrcNode1!=NULL) { - ULONG nDstNode1=pSrcNode1->GetOrdNum(); + sal_uIntPtr nDstNode1=pSrcNode1->GetOrdNum(); SdrObject* pDstNode1=GetObj(nDstNode1); if (pDstNode1!=NULL) { // Sonst grober Fehler! - pDstEdge->ConnectToNode(TRUE,pDstNode1); + pDstEdge->ConnectToNode(sal_True,pDstNode1); } else { OSL_FAIL("SdrObjList::operator=(): pDstNode1==NULL!"); } } if (pSrcNode2!=NULL) { - ULONG nDstNode2=pSrcNode2->GetOrdNum(); + sal_uIntPtr nDstNode2=pSrcNode2->GetOrdNum(); SdrObject* pDstNode2=GetObj(nDstNode2); if (pDstNode2!=NULL) { // Node war sonst wohl nicht markiert - pDstEdge->ConnectToNode(FALSE,pDstNode2); + pDstEdge->ConnectToNode(sal_False,pDstNode2); } else { OSL_FAIL("SdrObjList::operator=(): pDstNode2==NULL!"); } @@ -291,8 +291,8 @@ void SdrObjList::SetPage(SdrPage* pNewPage) { if (pPage!=pNewPage) { pPage=pNewPage; - ULONG nAnz=GetObjCount(); - for (ULONG no=0; no<nAnz; no++) { + sal_uIntPtr nAnz=GetObjCount(); + for (sal_uIntPtr no=0; no<nAnz; no++) { SdrObject* pObj=GetObj(no); pObj->SetPage(pPage); } @@ -308,8 +308,8 @@ void SdrObjList::SetModel(SdrModel* pNewModel) { if (pModel!=pNewModel) { pModel=pNewModel; - ULONG nAnz=GetObjCount(); - for (ULONG i=0; i<nAnz; i++) { + sal_uIntPtr nAnz=GetObjCount(); + for (sal_uIntPtr i=0; i<nAnz; i++) { SdrObject* pObj=GetObj(i); pObj->SetModel(pModel); } @@ -318,20 +318,20 @@ void SdrObjList::SetModel(SdrModel* pNewModel) void SdrObjList::RecalcObjOrdNums() { - ULONG nAnz=GetObjCount(); - for (ULONG no=0; no<nAnz; no++) { + sal_uIntPtr nAnz=GetObjCount(); + for (sal_uIntPtr no=0; no<nAnz; no++) { SdrObject* pObj=GetObj(no); pObj->SetOrdNum(no); } - bObjOrdNumsDirty=FALSE; + bObjOrdNumsDirty=sal_False; } void SdrObjList::RecalcRects() { aOutRect=Rectangle(); aSnapRect=aOutRect; - ULONG nAnz=GetObjCount(); - ULONG i; + sal_uIntPtr nAnz=GetObjCount(); + sal_uIntPtr i; for (i=0; i<nAnz; i++) { SdrObject* pObj=GetObj(i); if (i==0) { @@ -346,7 +346,7 @@ void SdrObjList::RecalcRects() void SdrObjList::SetRectsDirty() { - bRectsDirty=TRUE; + bRectsDirty=sal_True; if (pUpList!=NULL) pUpList->SetRectsDirty(); } @@ -360,16 +360,16 @@ void SdrObjList::impChildInserted(SdrObject& rChild) const } } -void SdrObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* /*pReason*/) +void SdrObjList::NbcInsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* /*pReason*/) { DBG_ASSERT(pObj!=NULL,"SdrObjList::NbcInsertObject(NULL)"); if (pObj!=NULL) { DBG_ASSERT(!pObj->IsInserted(),"ZObjekt hat bereits Inserted-Status"); - ULONG nAnz=GetObjCount(); + sal_uIntPtr nAnz=GetObjCount(); if (nPos>nAnz) nPos=nAnz; InsertObjectIntoContainer(*pObj,nPos); - if (nPos<nAnz) bObjOrdNumsDirty=TRUE; + if (nPos<nAnz) bObjOrdNumsDirty=sal_True; pObj->SetOrdNum(nPos); pObj->SetObjList(this); pObj->SetPage(pPage); @@ -382,11 +382,11 @@ void SdrObjList::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRea aOutRect.Union(pObj->GetCurrentBoundRect()); aSnapRect.Union(pObj->GetSnapRect()); } - pObj->SetInserted(TRUE); // Ruft u.a. den UserCall + pObj->SetInserted(sal_True); // Ruft u.a. den UserCall } } -void SdrObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason) +void SdrObjList::InsertObject(SdrObject* pObj, sal_uIntPtr nPos, const SdrInsertReason* pReason) { DBG_ASSERT(pObj!=NULL,"SdrObjList::InsertObject(NULL)"); @@ -429,7 +429,7 @@ void SdrObjList::InsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason } } -SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum) +SdrObject* SdrObjList::NbcRemoveObject(sal_uIntPtr nObjNum) { if (nObjNum >= maList.size()) { @@ -437,7 +437,7 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum) return NULL; } - ULONG nAnz=GetObjCount(); + sal_uIntPtr nAnz=GetObjCount(); SdrObject* pObj=maList[nObjNum]; RemoveObjectFromContainer(nObjNum); @@ -447,12 +447,12 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum) DBG_ASSERT(pObj!=NULL,"Object zum Removen nicht gefunden"); if (pObj!=NULL) { DBG_ASSERT(pObj->IsInserted(),"ZObjekt hat keinen Inserted-Status"); - pObj->SetInserted(FALSE); // Ruft u.a. den UserCall + pObj->SetInserted(sal_False); // Ruft u.a. den UserCall pObj->SetObjList(NULL); pObj->SetPage(NULL); if (!bObjOrdNumsDirty) { // Optimierung fuer den Fall, dass das letzte Obj rausgenommen wird - if (nObjNum!=ULONG(nAnz-1)) { - bObjOrdNumsDirty=TRUE; + if (nObjNum!=sal_uIntPtr(nAnz-1)) { + bObjOrdNumsDirty=sal_True; } } SetRectsDirty(); @@ -460,7 +460,7 @@ SdrObject* SdrObjList::NbcRemoveObject(ULONG nObjNum) return pObj; } -SdrObject* SdrObjList::RemoveObject(ULONG nObjNum) +SdrObject* SdrObjList::RemoveObject(sal_uIntPtr nObjNum) { if (nObjNum >= maList.size()) { @@ -468,7 +468,7 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum) return NULL; } - ULONG nAnz=GetObjCount(); + sal_uIntPtr nAnz=GetObjCount(); SdrObject* pObj=maList[nObjNum]; RemoveObjectFromContainer(nObjNum); @@ -488,12 +488,12 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum) } pModel->SetChanged(); } - pObj->SetInserted(FALSE); // Ruft u.a. den UserCall + pObj->SetInserted(sal_False); // Ruft u.a. den UserCall pObj->SetObjList(NULL); pObj->SetPage(NULL); if (!bObjOrdNumsDirty) { // Optimierung fuer den Fall, dass das letzte Obj rausgenommen wird - if (nObjNum!=ULONG(nAnz-1)) { - bObjOrdNumsDirty=TRUE; + if (nObjNum!=sal_uIntPtr(nAnz-1)) { + bObjOrdNumsDirty=sal_True; } } SetRectsDirty(); @@ -508,7 +508,7 @@ SdrObject* SdrObjList::RemoveObject(ULONG nObjNum) return pObj; } -SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum) +SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum) { if (nObjNum >= maList.size() || pNewObj == NULL) { @@ -521,7 +521,7 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum) DBG_ASSERT(pObj!=NULL,"SdrObjList::ReplaceObject: Object zum Removen nicht gefunden"); if (pObj!=NULL) { DBG_ASSERT(pObj->IsInserted(),"SdrObjList::ReplaceObject: ZObjekt hat keinen Inserted-Status"); - pObj->SetInserted(FALSE); + pObj->SetInserted(sal_False); pObj->SetObjList(NULL); pObj->SetPage(NULL); ReplaceObjectInContainer(*pNewObj,nObjNum); @@ -537,13 +537,13 @@ SdrObject* SdrObjList::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum) // evtl. existing parent visualisations impChildInserted(*pNewObj); - pNewObj->SetInserted(TRUE); + pNewObj->SetInserted(sal_True); SetRectsDirty(); } return pObj; } -SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum) +SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, sal_uIntPtr nObjNum) { if (nObjNum >= maList.size()) { @@ -568,7 +568,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum) pModel->Broadcast(aHint); } } - pObj->SetInserted(FALSE); + pObj->SetInserted(sal_False); pObj->SetObjList(NULL); pObj->SetPage(NULL); ReplaceObjectInContainer(*pNewObj,nObjNum); @@ -584,7 +584,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum) // evtl. existing parent visualisations impChildInserted(*pNewObj); - pNewObj->SetInserted(TRUE); + pNewObj->SetInserted(sal_True); if (pModel!=NULL) { // Hier muss ein anderer Broadcast her! if (pNewObj->GetPage()!=NULL) { @@ -599,7 +599,7 @@ SdrObject* SdrObjList::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum) return pObj; } -SdrObject* SdrObjList::NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum) +SdrObject* SdrObjList::NbcSetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum) { if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size()) { @@ -622,12 +622,12 @@ SdrObject* SdrObjList::NbcSetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum) pObj->ActionChanged(); pObj->SetOrdNum(nNewObjNum); - bObjOrdNumsDirty=TRUE; + bObjOrdNumsDirty=sal_True; } return pObj; } -SdrObject* SdrObjList::SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum) +SdrObject* SdrObjList::SetObjectOrdNum(sal_uIntPtr nOldObjNum, sal_uIntPtr nNewObjNum) { if (nOldObjNum >= maList.size() || nNewObjNum >= maList.size()) { @@ -649,7 +649,7 @@ SdrObject* SdrObjList::SetObjectOrdNum(ULONG nOldObjNum, ULONG nNewObjNum) pObj->ActionChanged(); pObj->SetOrdNum(nNewObjNum); - bObjOrdNumsDirty=TRUE; + bObjOrdNumsDirty=sal_True; if (pModel!=NULL) { // Hier muss ein anderer Broadcast her! @@ -664,7 +664,7 @@ const Rectangle& SdrObjList::GetAllObjSnapRect() const { if (bRectsDirty) { ((SdrObjList*)this)->RecalcRects(); - ((SdrObjList*)this)->bRectsDirty=FALSE; + ((SdrObjList*)this)->bRectsDirty=sal_False; } return aSnapRect; } @@ -679,15 +679,15 @@ const Rectangle& SdrObjList::GetAllObjBoundRect() const if (bRectsDirty || aOutRect.IsEmpty()) { ((SdrObjList*)this)->RecalcRects(); - ((SdrObjList*)this)->bRectsDirty=FALSE; + ((SdrObjList*)this)->bRectsDirty=sal_False; } return aOutRect; } void SdrObjList::NbcReformatAllTextObjects() { - ULONG nAnz=GetObjCount(); - ULONG nNum=0; + sal_uIntPtr nAnz=GetObjCount(); + sal_uIntPtr nNum=0; Printer* pPrinter = NULL; @@ -752,7 +752,7 @@ void SdrObjList::BurnInStyleSheetAttributes() } } -ULONG SdrObjList::GetObjCount() const +sal_uIntPtr SdrObjList::GetObjCount() const { return maList.size(); } @@ -760,7 +760,7 @@ ULONG SdrObjList::GetObjCount() const -SdrObject* SdrObjList::GetObj(ULONG nNum) const +SdrObject* SdrObjList::GetObj(sal_uIntPtr nNum) const { if (nNum >= maList.size()) { @@ -781,11 +781,11 @@ bool SdrObjList::IsReadOnly() const return bRet; } -ULONG SdrObjList::CountAllObjects() const +sal_uIntPtr SdrObjList::CountAllObjects() const { - ULONG nCnt=GetObjCount(); - ULONG nAnz=nCnt; - for (USHORT nNum=0; nNum<nAnz; nNum++) { + sal_uIntPtr nCnt=GetObjCount(); + sal_uIntPtr nAnz=nCnt; + for (sal_uInt16 nNum=0; nNum<nAnz; nNum++) { SdrObjList* pSubOL=GetObj(nNum)->GetSubList(); if (pSubOL!=NULL) { nCnt+=pSubOL->CountAllObjects(); @@ -796,8 +796,8 @@ ULONG SdrObjList::CountAllObjects() const void SdrObjList::ForceSwapInObjects() const { - ULONG nObjAnz=GetObjCount(); - for (ULONG nObjNum=nObjAnz; nObjNum>0;) { + sal_uIntPtr nObjAnz=GetObjCount(); + for (sal_uIntPtr nObjNum=nObjAnz; nObjNum>0;) { SdrObject* pObj=GetObj(--nObjNum); SdrGrafObj* pGrafObj=PTR_CAST(SdrGrafObj,pObj); if (pGrafObj!=NULL) { @@ -812,8 +812,8 @@ void SdrObjList::ForceSwapInObjects() const void SdrObjList::ForceSwapOutObjects() const { - ULONG nObjAnz=GetObjCount(); - for (ULONG nObjNum=nObjAnz; nObjNum>0;) { + sal_uIntPtr nObjAnz=GetObjCount(); + for (sal_uIntPtr nObjNum=nObjAnz; nObjNum>0;) { SdrObject* pObj=GetObj(--nObjNum); SdrGrafObj* pGrafObj=PTR_CAST(SdrGrafObj,pObj); if (pGrafObj!=NULL) { @@ -834,7 +834,7 @@ void SdrObjList::FlattenGroups() UnGroupObj(i); } -void SdrObjList::UnGroupObj( ULONG nObjNum ) +void SdrObjList::UnGroupObj( sal_uIntPtr nObjNum ) { // if the given object is no group, this method is a noop SdrObject* pUngroupObj = GetObj( nObjNum ); @@ -1052,7 +1052,7 @@ void SdrObjList::InsertObjectIntoContainer ( maList.push_back(&rObject); else maList.insert(maList.begin()+nInsertPosition, &rObject); - bObjOrdNumsDirty=TRUE; + bObjOrdNumsDirty=sal_True; } @@ -1089,7 +1089,7 @@ void SdrObjList::ReplaceObjectInContainer ( } maList[nObjectPosition] = &rNewObject; - bObjOrdNumsDirty=TRUE; + bObjOrdNumsDirty=sal_True; } @@ -1118,7 +1118,7 @@ void SdrObjList::RemoveObjectFromContainer ( } maList.erase(maList.begin()+nObjectPosition); - bObjOrdNumsDirty=TRUE; + bObjOrdNumsDirty=sal_True; } @@ -1128,8 +1128,8 @@ void SdrObjList::RemoveObjectFromContainer ( void SdrPageGridFrameList::Clear() { - USHORT nAnz=GetCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=GetCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { delete GetObject(i); } aList.Clear(); @@ -1532,7 +1532,7 @@ Size SdrPage::GetSize() const return Size(nWdt,nHgt); } -INT32 SdrPage::GetWdt() const +sal_Int32 SdrPage::GetWdt() const { return nWdt; } @@ -1557,12 +1557,12 @@ Orientation SdrPage::GetOrientation() const return eRet; } -INT32 SdrPage::GetHgt() const +sal_Int32 SdrPage::GetHgt() const { return nHgt; } -void SdrPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr) +void SdrPage::SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 nLwr) { bool bChanged(false); @@ -1596,7 +1596,7 @@ void SdrPage::SetBorder(INT32 nLft, INT32 nUpp, INT32 nRgt, INT32 nLwr) } } -void SdrPage::SetLftBorder(INT32 nBorder) +void SdrPage::SetLftBorder(sal_Int32 nBorder) { if(nBordLft != nBorder) { @@ -1605,7 +1605,7 @@ void SdrPage::SetLftBorder(INT32 nBorder) } } -void SdrPage::SetUppBorder(INT32 nBorder) +void SdrPage::SetUppBorder(sal_Int32 nBorder) { if(nBordUpp != nBorder) { @@ -1614,7 +1614,7 @@ void SdrPage::SetUppBorder(INT32 nBorder) } } -void SdrPage::SetRgtBorder(INT32 nBorder) +void SdrPage::SetRgtBorder(sal_Int32 nBorder) { if(nBordRgt != nBorder) { @@ -1623,7 +1623,7 @@ void SdrPage::SetRgtBorder(INT32 nBorder) } } -void SdrPage::SetLwrBorder(INT32 nBorder) +void SdrPage::SetLwrBorder(sal_Int32 nBorder) { if(nBordLwr != nBorder) { @@ -1632,22 +1632,22 @@ void SdrPage::SetLwrBorder(INT32 nBorder) } } -INT32 SdrPage::GetLftBorder() const +sal_Int32 SdrPage::GetLftBorder() const { return nBordLft; } -INT32 SdrPage::GetUppBorder() const +sal_Int32 SdrPage::GetUppBorder() const { return nBordUpp; } -INT32 SdrPage::GetRgtBorder() const +sal_Int32 SdrPage::GetRgtBorder() const { return nBordRgt; } -INT32 SdrPage::GetLwrBorder() const +sal_Int32 SdrPage::GetLwrBorder() const { return nBordLwr; } @@ -1707,17 +1707,17 @@ void SdrPage::SetPageNum(sal_uInt16 nNew) } } -USHORT SdrPage::GetPageNum() const +sal_uInt16 SdrPage::GetPageNum() const { if (!mbInserted) return 0; if (mbMaster) { if (pModel && pModel->IsMPgNumsDirty()) - ((SdrModel*)pModel)->RecalcPageNums(TRUE); + ((SdrModel*)pModel)->RecalcPageNums(sal_True); } else { if (pModel && pModel->IsPagNumsDirty()) - ((SdrModel*)pModel)->RecalcPageNums(FALSE); + ((SdrModel*)pModel)->RecalcPageNums(sal_False); } return nPageNum; } @@ -1857,11 +1857,11 @@ SfxStyleSheet* SdrPage::GetTextStyleSheetForObject( SdrObject* pObj ) const return pObj->GetStyleSheet(); } -bool SdrPage::HasTransparentObjects( BOOL bCheckForAlphaChannel ) const +bool SdrPage::HasTransparentObjects( bool bCheckForAlphaChannel ) const { bool bRet = false; - for( ULONG n = 0, nCount = GetObjCount(); ( n < nCount ) && !bRet; n++ ) + for( sal_uIntPtr n = 0, nCount = GetObjCount(); ( n < nCount ) && !bRet; n++ ) if( GetObj( n )->IsTransparent( bCheckForAlphaChannel ) ) bRet = true; diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 36f6dad839..07024360e9 100644..100755 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -48,7 +48,7 @@ #include <svx/svdouno.hxx> #include <svx/svdpage.hxx> #include <svx/svdview.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdogrp.hxx> #include <svx/svdtypes.hxx> @@ -67,7 +67,7 @@ using namespace ::rtl; using namespace ::com::sun::star; #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> TYPEINIT1(SdrPageView, SfxListener); DBG_NAME(SdrPageView); @@ -332,8 +332,8 @@ void SdrPageView::PaintOutlinerView(OutputDevice* pOut, const Rectangle& rRect) //const SdrObject* pTextObjTmp=GetView().GetTextEditObject(); //const SdrTextObj* pText=PTR_CAST(SdrTextObj,pTextObjTmp); //bool bTextFrame=pText!=NULL && pText->IsTextFrame(); - ULONG nViewAnz=GetView().pTextEditOutliner->GetViewCount(); - for (ULONG i=0; i<nViewAnz; i++) { + sal_uIntPtr nViewAnz=GetView().pTextEditOutliner->GetViewCount(); + for (sal_uIntPtr i=0; i<nViewAnz; i++) { OutlinerView* pOLV=GetView().pTextEditOutliner->GetView(i); if (pOLV->GetWindow()==pOut) { GetView().ImpPaintOutlinerView(*pOLV, rRect); @@ -359,6 +359,21 @@ void SdrPageView::PrePaint() } } +void SdrPageView::PostPaint() +{ + const sal_uInt32 nCount(PageWindowCount()); + + for(sal_uInt32 a(0); a < nCount; a++) + { + SdrPageWindow* pCandidate = GetPageWindow(a); + + if(pCandidate) + { + pCandidate->PostPaint(); + } + } +} + void SdrPageView::CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) const { if(GetPage()) @@ -483,7 +498,7 @@ void SdrPageView::SetDesignMode( bool _bDesignMode ) const //////////////////////////////////////////////////////////////////////////////////////////////////// #ifdef OS2 -#define RGBCOLOR(r,g,b) ((ULONG)(((BYTE)(b) | ((USHORT)(g)<<8)) | (((ULONG)(BYTE)(r))<<16))) +#define RGBCOLOR(r,g,b) ((sal_uIntPtr)(((sal_uInt8)(b) | ((sal_uInt16)(g)<<8)) | (((sal_uIntPtr)(sal_uInt8)(r))<<16))) #endif void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, Color aColor) @@ -581,10 +596,6 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C rOut.SetLineColor( aColor ); bool bMap0=rOut.IsMapModeEnabled(); -#ifdef WIN // SetPixel-Profiling fuer Windows - COLORREF aWinColRef=PALETTERGB(aColor.GetRed()>>8,aColor.GetGreen()>>8,aColor.GetBlue()>>8); - HDC aWinhDC=Sysdepen::GethDC(rOut); -#endif long nWrX=0;//aWriterPageOffset.X(); long nWrY=0;//aWriterPageOffset.Y(); @@ -594,11 +605,11 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C long y1=GetPage()->GetUppBorder()+1+nWrX; long y2=GetPage()->GetHgt()-GetPage()->GetLwrBorder()-1+nWrY; const SdrPageGridFrameList* pFrames=GetPage()->GetGridFrameList(this,NULL); - //USHORT nBufSiz=1024; // 4k Buffer = max. 512 Punkte + //sal_uInt16 nBufSiz=1024; // 4k Buffer = max. 512 Punkte // #90353# long* pBuf = NULL; - USHORT nGridPaintAnz=1; + sal_uInt16 nGridPaintAnz=1; if (pFrames!=NULL) nGridPaintAnz=pFrames->GetCount(); - for (USHORT nGridPaintNum=0; nGridPaintNum<nGridPaintAnz; nGridPaintNum++) { + for (sal_uInt16 nGridPaintNum=0; nGridPaintNum<nGridPaintAnz; nGridPaintNum++) { if (pFrames!=NULL) { const SdrPageGridFrame& rGF=(*pFrames)[nGridPaintNum]; nWrX=rGF.GetPaperRect().Left(); @@ -639,13 +650,13 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C { if( bHoriLines ) { - ULONG nGridFlags = ( bHoriSolid ? GRID_HORZLINES : GRID_DOTS ); - UINT16 nSteps = sal_uInt16(nx1 / nx2); - UINT32 nRestPerStepMul1000 = nSteps ? ( ((nx1 * 1000L)/ nSteps) - (nx2 * 1000L) ) : 0; - UINT32 nStepOffset = 0; - UINT16 nPointOffset = 0; + sal_uIntPtr nGridFlags = ( bHoriSolid ? GRID_HORZLINES : GRID_DOTS ); + sal_uInt16 nSteps = sal_uInt16(nx1 / nx2); + sal_uInt32 nRestPerStepMul1000 = nSteps ? ( ((nx1 * 1000L)/ nSteps) - (nx2 * 1000L) ) : 0; + sal_uInt32 nStepOffset = 0; + sal_uInt16 nPointOffset = 0; - for(UINT16 a=0;a<nSteps;a++) + for(sal_uInt16 a=0;a<nSteps;a++) { // Zeichnen rOut.DrawGrid( @@ -664,13 +675,13 @@ void SdrPageView::DrawPageViewGrid(OutputDevice& rOut, const Rectangle& rRect, C if( bVertLines ) { - ULONG nGridFlags = ( bVertSolid ? GRID_VERTLINES : GRID_DOTS ); - UINT16 nSteps = sal_uInt16(ny1 / ny2); - UINT32 nRestPerStepMul1000 = nSteps ? ( ((ny1 * 1000L)/ nSteps) - (ny2 * 1000L) ) : 0; - UINT32 nStepOffset = 0; - UINT16 nPointOffset = 0; + sal_uIntPtr nGridFlags = ( bVertSolid ? GRID_VERTLINES : GRID_DOTS ); + sal_uInt16 nSteps = sal_uInt16(ny1 / ny2); + sal_uInt32 nRestPerStepMul1000 = nSteps ? ( ((ny1 * 1000L)/ nSteps) - (ny2 * 1000L) ) : 0; + sal_uInt32 nStepOffset = 0; + sal_uInt16 nPointOffset = 0; - for(UINT16 a=0;a<nSteps;a++) + for(sal_uInt16 a=0;a<nSteps;a++) { // Zeichnen rOut.DrawGrid( @@ -796,7 +807,7 @@ sal_Bool SdrPageView::IsObjMarkable(SdrObject* pObj) const { // Der Layer muss sichtbar und darf nicht gesperrt sein SdrLayerID nL = pObj->GetLayer(); - return (aLayerVisi.IsSet(BYTE(nL)) && !aLayerLock.IsSet(BYTE(nL))); + return (aLayerVisi.IsSet(sal_uInt8(nL)) && !aLayerLock.IsSet(sal_uInt8(nL))); } } @@ -813,7 +824,7 @@ void SdrPageView::SetPageOrigin(const Point& rOrg) } } -void SdrPageView::ImpInvalidateHelpLineArea(USHORT nNum) const +void SdrPageView::ImpInvalidateHelpLineArea(sal_uInt16 nNum) const { if (GetView().IsHlplVisible() && nNum<aHelpLines.GetCount()) { const SdrHelpLine& rHL=aHelpLines[nNum]; @@ -843,7 +854,7 @@ void SdrPageView::SetHelpLines(const SdrHelpLineList& rHLL) InvalidateAllWin(); } -void SdrPageView::SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine) +void SdrPageView::SetHelpLine(sal_uInt16 nNum, const SdrHelpLine& rNewHelpLine) { if (nNum<aHelpLines.GetCount() && aHelpLines[nNum]!=rNewHelpLine) { bool bNeedRedraw = true; @@ -860,7 +871,7 @@ void SdrPageView::SetHelpLine(USHORT nNum, const SdrHelpLine& rNewHelpLine) } } -void SdrPageView::DeleteHelpLine(USHORT nNum) +void SdrPageView::DeleteHelpLine(sal_uInt16 nNum) { if (nNum<aHelpLines.GetCount()) { ImpInvalidateHelpLineArea(nNum); @@ -868,7 +879,7 @@ void SdrPageView::DeleteHelpLine(USHORT nNum) } } -void SdrPageView::InsertHelpLine(const SdrHelpLine& rHL, USHORT nNum) +void SdrPageView::InsertHelpLine(const SdrHelpLine& rHL, sal_uInt16 nNum) { if (nNum>aHelpLines.GetCount()) nNum=aHelpLines.GetCount(); aHelpLines.Insert(rHL,nNum); @@ -951,7 +962,7 @@ void SdrPageView::LeaveOneGroup() { if(GetAktGroup()) { - BOOL bGlueInvalidate = (GetView().ImpIsGlueVisible()); + sal_Bool bGlueInvalidate = (GetView().ImpIsGlueVisible()); if(bGlueInvalidate) GetView().GlueInvalidate(); @@ -989,7 +1000,7 @@ void SdrPageView::LeaveAllGroup() { if(GetAktGroup()) { - BOOL bGlueInvalidate = (GetView().ImpIsGlueVisible()); + sal_Bool bGlueInvalidate = (GetView().ImpIsGlueVisible()); if(bGlueInvalidate) GetView().GlueInvalidate(); @@ -1023,9 +1034,9 @@ void SdrPageView::LeaveAllGroup() } } -USHORT SdrPageView::GetEnteredLevel() const +sal_uInt16 SdrPageView::GetEnteredLevel() const { - USHORT nAnz=0; + sal_uInt16 nAnz=0; SdrObject* pGrp=GetAktGroup(); while (pGrp!=NULL) { nAnz++; @@ -1052,7 +1063,7 @@ XubString SdrPageView::GetActualGroupName() const XubString SdrPageView::GetActualPathName(sal_Unicode cSep) const { XubString aStr; - BOOL bNamFnd(FALSE); + sal_Bool bNamFnd(sal_False); SdrObject* pGrp = GetAktGroup(); while(pGrp) @@ -1062,7 +1073,7 @@ XubString SdrPageView::GetActualPathName(sal_Unicode cSep) const if(!aStr1.Len()) aStr1 += sal_Unicode('?'); else - bNamFnd = TRUE; + bNamFnd = sal_True; aStr += aStr1; pGrp = pGrp->GetUpGroup(); diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index e55e4adc50..cbbd76874b 100644..100755 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/awt/XWindow.hpp> #include <svx/svdpntv.hxx> #include <vcl/msgbox.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svtools/grfmgr.hxx> #include <svx/svdmodel.hxx> @@ -55,7 +55,7 @@ #include <svx/svdograf.hxx> #include <svx/svdattrx.hxx> #include "svdibrow.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdouno.hxx> #include <svx/sdr/overlay/overlayobjectlist.hxx> #include <svx/sdr/overlay/overlayrollingrectangle.hxx> @@ -223,23 +223,23 @@ void SdrPaintView::ImpClearVars() #ifdef DBG_UTIL pItemBrowser=NULL; #endif - bPageVisible=TRUE; - bPageBorderVisible=TRUE; - bBordVisible=TRUE; - bGridVisible=TRUE; - bGridFront =FALSE; - bHlplVisible=TRUE; - bHlplFront =TRUE; - bGlueVisible=FALSE; - bGlueVisible2=FALSE; - bGlueVisible3=FALSE; - bGlueVisible4=FALSE; - bSwapAsynchron=FALSE; - bPrintPreview=FALSE; - mbPreviewRenderer=FALSE; + bPageVisible=sal_True; + bPageBorderVisible=sal_True; + bBordVisible=sal_True; + bGridVisible=sal_True; + bGridFront =sal_False; + bHlplVisible=sal_True; + bHlplFront =sal_True; + bGlueVisible=sal_False; + bGlueVisible2=sal_False; + bGlueVisible3=sal_False; + bGlueVisible4=sal_False; + bSwapAsynchron=sal_False; + bPrintPreview=sal_False; + mbPreviewRenderer=sal_False; eAnimationMode = SDR_ANIMATION_ANIMATE; - bAnimationPause = FALSE; + bAnimationPause = sal_False; nHitTolPix=2; nMinMovPix=3; @@ -247,16 +247,16 @@ void SdrPaintView::ImpClearVars() nMinMovLog=0; pActualOutDev=NULL; pDragWin=NULL; - bRestoreColors=TRUE; + bRestoreColors=sal_True; pDefaultStyleSheet=NULL; - bSomeObjChgdFlag=FALSE; + bSomeObjChgdFlag=sal_False; nGraphicManagerDrawMode = GRFMGR_DRAW_STANDARD; aComeBackTimer.SetTimeout(1); aComeBackTimer.SetTimeoutHdl(LINK(this,SdrPaintView,ImpComeBackHdl)); String aNam; // System::GetUserName() just return an empty string if (pMod) - SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), TRUE); + SetDefaultStyleSheet(pMod->GetDefaultStyleSheet(), sal_True); aNam.ToUpperAscii(); @@ -286,7 +286,7 @@ SdrPaintView::SdrPaintView(SdrModel* pModel1, OutputDevice* pOut) } // Flag zur Visualisierung von Gruppen - bVisualizeEnteredGroup = TRUE; + bVisualizeEnteredGroup = sal_True; maColorConfig.AddListener(this); onChangeColorConfig(); @@ -331,14 +331,14 @@ void SdrPaintView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint) return; } - BOOL bObjChg=!bSomeObjChgdFlag; // TRUE= auswerten fuer ComeBack-Timer + sal_Bool bObjChg=!bSomeObjChgdFlag; // sal_True= auswerten fuer ComeBack-Timer if (bObjChg) { SdrHint* pSdrHint=PTR_CAST(SdrHint,&rHint); if (pSdrHint!=NULL) { SdrHintKind eKind=pSdrHint->GetKind(); if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) { if (bObjChg) { - bSomeObjChgdFlag=TRUE; + bSomeObjChgdFlag=sal_True; aComeBackTimer.Start(); } } @@ -368,7 +368,7 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_ IMPL_LINK_INLINE_START(SdrPaintView,ImpComeBackHdl,Timer*,EMPTYARG) { if (bSomeObjChgdFlag) { - bSomeObjChgdFlag=FALSE; + bSomeObjChgdFlag=sal_False; ModelHasChanged(); } return 0; @@ -408,7 +408,7 @@ void SdrPaintView::ModelHasChanged() //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrPaintView::IsAction() const +sal_Bool SdrPaintView::IsAction() const { return IsEncirclement(); } @@ -462,9 +462,9 @@ SdrPageView* SdrPaintView::GetTextEditPageView() const //////////////////////////////////////////////////////////////////////////////////////////////////// -USHORT SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const +sal_uInt16 SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) const { - if (nMinMov>=0) return USHORT(nMinMov); + if (nMinMov>=0) return sal_uInt16(nMinMov); if (pOut==NULL) { pOut = GetFirstOutputDevice(); @@ -476,9 +476,9 @@ USHORT SdrPaintView::ImpGetMinMovLogic(short nMinMov, const OutputDevice* pOut) } } -USHORT SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const +sal_uInt16 SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) const { - if (nHitTol>=0) return USHORT(nHitTol); + if (nHitTol>=0) return sal_uInt16(nHitTol); if (pOut==NULL) { pOut = GetFirstOutputDevice(); @@ -493,8 +493,8 @@ USHORT SdrPaintView::ImpGetHitTolLogic(short nHitTol, const OutputDevice* pOut) void SdrPaintView::TheresNewMapMode() { if (pActualOutDev!=NULL) { - nHitTolLog=(USHORT)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nHitTolPix,0)).Width(); - nMinMovLog=(USHORT)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nMinMovPix,0)).Width(); + nHitTolLog=(sal_uInt16)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nHitTolPix,0)).Width(); + nMinMovLog=(sal_uInt16)((OutputDevice*)pActualOutDev)->PixelToLogic(Size(nMinMovPix,0)).Width(); } } @@ -644,7 +644,7 @@ void SdrPaintView::DeleteWindowFromPaintView(OutputDevice* pOldWin) #endif } -void SdrPaintView::SetLayerVisible(const XubString& rName, BOOL bShow) +void SdrPaintView::SetLayerVisible(const XubString& rName, sal_Bool bShow) { if(mpPageView) { @@ -664,7 +664,7 @@ bool SdrPaintView::IsLayerVisible(const XubString& rName) const return false; } -void SdrPaintView::SetAllLayersVisible(BOOL bShow) +void SdrPaintView::SetAllLayersVisible(sal_Bool bShow) { if(mpPageView) { @@ -674,7 +674,7 @@ void SdrPaintView::SetAllLayersVisible(BOOL bShow) InvalidateAllWin(); } -void SdrPaintView::SetLayerLocked(const XubString& rName, BOOL bLock) +void SdrPaintView::SetLayerLocked(const XubString& rName, sal_Bool bLock) { if(mpPageView) { @@ -688,11 +688,11 @@ bool SdrPaintView::IsLayerLocked(const XubString& rName) const { return mpPageView->IsLayerLocked(rName); } - + return false; } -void SdrPaintView::SetAllLayersLocked(BOOL bLock) +void SdrPaintView::SetAllLayersLocked(sal_Bool bLock) { if(mpPageView) { @@ -700,7 +700,7 @@ void SdrPaintView::SetAllLayersLocked(BOOL bLock) } } -void SdrPaintView::SetLayerPrintable(const XubString& rName, BOOL bPrn) +void SdrPaintView::SetLayerPrintable(const XubString& rName, sal_Bool bPrn) { if(mpPageView) { @@ -718,7 +718,7 @@ bool SdrPaintView::IsLayerPrintable(const XubString& rName) const return false; } -void SdrPaintView::SetAllLayersPrintable(BOOL bPrn) +void SdrPaintView::SetAllLayersPrintable(sal_Bool bPrn) { if(mpPageView) { @@ -734,6 +734,14 @@ void SdrPaintView::PrePaint() } } +void SdrPaintView::PostPaint() +{ + if(mpPageView) + { + mpPageView->PostPaint(); + } +} + //////////////////////////////////////////////////////////////////////////////////////////////////// // #define SVX_REPAINT_TIMER_TEST @@ -781,7 +789,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::c { RegionHandle aRegionHandle(aOptimizedRepaintRegion.BeginEnumRects()); Rectangle aRegionRectangle; - + while(aOptimizedRepaintRegion.GetEnumRects(aRegionHandle, aRegionRectangle)) { pWindow->SetLineColor(COL_LIGHTGREEN); @@ -983,7 +991,7 @@ SdrPaintWindow* SdrPaintView::BeginDrawLayers(OutputDevice* pOut, const Region& { RegionHandle aRegionHandle(aOptimizedRepaintRegion.BeginEnumRects()); Rectangle aRegionRectangle; - + while(aOptimizedRepaintRegion.GetEnumRects(aRegionHandle, aRegionRectangle)) { pWindow->SetLineColor(COL_LIGHTGREEN); @@ -1063,9 +1071,9 @@ void SdrPaintView::ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/) +sal_Bool SdrPaintView::KeyInput(const KeyEvent& /*rKEvt*/, Window* /*pWin*/) { - return FALSE; + return sal_False; } void SdrPaintView::GlueInvalidate() const @@ -1083,8 +1091,8 @@ void SdrPaintView::GlueInvalidate() const if(mpPageView) { const SdrObjList* pOL=mpPageView->GetObjList(); - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) { const SdrObject* pObj=pOL->GetObj(nObjNum); const SdrGluePointList* pGPL=pObj->GetGluePointList(); if (pGPL!=NULL && pGPL->GetCount()!=0) { @@ -1111,7 +1119,7 @@ void SdrPaintView::InvalidateAllWin() } } -void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, BOOL bPlus1Pix) +void SdrPaintView::InvalidateAllWin(const Rectangle& rRect, sal_Bool bPlus1Pix) { const sal_uInt32 nWindowCount(PaintWindowCount()); @@ -1186,12 +1194,12 @@ bool SdrPaintView::IsGroupEntered() const return false; } -void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL /*bReplaceAll*/) +void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, sal_Bool /*bReplaceAll*/) { // bReplaceAll hat hier keinerlei Wirkung - BOOL bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool(); + sal_Bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool(); const SfxPoolItem *pPoolItem=NULL; - if (rAttr.GetItemState(SDRATTR_LAYERID,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LAYERID,sal_True,&pPoolItem)==SFX_ITEM_SET) { SdrLayerID nLayerId=((const SdrLayerIdItem*)pPoolItem)->GetValue(); const SdrLayer* pLayer=pMod->GetLayerAdmin().GetLayerPerID(nLayerId); if (pLayer!=NULL) { @@ -1199,35 +1207,35 @@ void SdrPaintView::SetNotPersistDefaultAttr(const SfxItemSet& rAttr, BOOL /*bRep else aAktLayer=pLayer->GetName(); } } - if (rAttr.GetItemState(SDRATTR_LAYERNAME,TRUE,&pPoolItem)==SFX_ITEM_SET) { + if (rAttr.GetItemState(SDRATTR_LAYERNAME,sal_True,&pPoolItem)==SFX_ITEM_SET) { if (bMeasure) aMeasureLayer=((const SdrLayerNameItem*)pPoolItem)->GetValue(); else aAktLayer=((const SdrLayerNameItem*)pPoolItem)->GetValue(); } } -void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, BOOL /*bOnlyHardAttr*/) const +void SdrPaintView::MergeNotPersistDefaultAttr(SfxItemSet& rAttr, sal_Bool /*bOnlyHardAttr*/) const { // bOnlyHardAttr hat hier keinerlei Wirkung - BOOL bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool(); + sal_Bool bMeasure=ISA(SdrView) && ((SdrView*)this)->IsMeasureTool(); const XubString& aNam=bMeasure?aMeasureLayer:aAktLayer; rAttr.Put(SdrLayerNameItem(aNam)); - SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,TRUE); + SdrLayerID nLayer=pMod->GetLayerAdmin().GetLayerID(aNam,sal_True); if (nLayer!=SDRLAYER_NOTFOUND) { rAttr.Put(SdrLayerIdItem(nLayer)); } } -void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll) +void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, sal_Bool bReplaceAll) { #ifdef DBG_UTIL { - BOOL bHasEEFeatureItems=FALSE; + sal_Bool bHasEEFeatureItems=sal_False; SfxItemIter aIter(rAttr); const SfxPoolItem* pItem=aIter.FirstItem(); while (!bHasEEFeatureItems && pItem!=NULL) { if (!IsInvalidItem(pItem)) { - USHORT nW=pItem->Which(); - if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=TRUE; + sal_uInt16 nW=pItem->Which(); + if (nW>=EE_FEATURE_START && nW<=EE_FEATURE_END) bHasEEFeatureItems=sal_True; } pItem=aIter.NextItem(); } @@ -1241,14 +1249,14 @@ void SdrPaintView::SetDefaultAttr(const SfxItemSet& rAttr, BOOL bReplaceAll) } #endif if (bReplaceAll) aDefaultAttr.Set(rAttr); - else aDefaultAttr.Put(rAttr,FALSE); // FALSE= InvalidItems nicht als Default, sondern als "Loecher" betrachten + else aDefaultAttr.Put(rAttr,sal_False); // FALSE= InvalidItems nicht als Default, sondern als "Loecher" betrachten SetNotPersistDefaultAttr(rAttr,bReplaceAll); #ifdef DBG_UTIL if (pItemBrowser!=NULL) pItemBrowser->SetDirty(); #endif } -void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) +void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) { if (pDefaultStyleSheet) EndListening(*pDefaultStyleSheet); @@ -1258,9 +1266,9 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRe if (pStyleSheet!=NULL && !bDontRemoveHardAttr) { SfxWhichIter aIter(pStyleSheet->GetItemSet()); - USHORT nWhich=aIter.FirstWhich(); + sal_uInt16 nWhich=aIter.FirstWhich(); while (nWhich!=0) { - if (pStyleSheet->GetItemSet().GetItemState(nWhich,TRUE)==SFX_ITEM_SET) { + if (pStyleSheet->GetItemSet().GetItemState(nWhich,sal_True)==SFX_ITEM_SET) { aDefaultAttr.ClearItem(nWhich); } nWhich=aIter.NextWhich(); @@ -1272,49 +1280,49 @@ void SdrPaintView::SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRe } /* new interface src537 */ -BOOL SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const +sal_Bool SdrPaintView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const { if(bOnlyHardAttr || !pDefaultStyleSheet) { - rTargetSet.Put(aDefaultAttr, FALSE); + rTargetSet.Put(aDefaultAttr, sal_False); } else { // sonst DefStyleSheet dazumergen - rTargetSet.Put(pDefaultStyleSheet->GetItemSet(), FALSE); - rTargetSet.Put(aDefaultAttr, FALSE); + rTargetSet.Put(pDefaultStyleSheet->GetItemSet(), sal_False); + rTargetSet.Put(aDefaultAttr, sal_False); } MergeNotPersistDefaultAttr(rTargetSet, bOnlyHardAttr); - return TRUE; + return sal_True; } -BOOL SdrPaintView::SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll) +sal_Bool SdrPaintView::SetAttributes(const SfxItemSet& rSet, sal_Bool bReplaceAll) { SetDefaultAttr(rSet,bReplaceAll); - return TRUE; + return sal_True; } -SfxStyleSheet* SdrPaintView::GetStyleSheet() const // SfxStyleSheet* SdrPaintView::GetStyleSheet(BOOL& rOk) const +SfxStyleSheet* SdrPaintView::GetStyleSheet() const // SfxStyleSheet* SdrPaintView::GetStyleSheet(sal_Bool& rOk) const { - //rOk=TRUE; + //rOk=sal_True; return GetDefaultStyleSheet(); } -BOOL SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr) +sal_Bool SdrPaintView::SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr) { SetDefaultStyleSheet(pStyleSheet,bDontRemoveHardAttr); - return TRUE; + return sal_True; } //////////////////////////////////////////////////////////////////////////////////////////////////// #ifdef DBG_UTIL -void SdrPaintView::ShowItemBrowser(BOOL bShow) +void SdrPaintView::ShowItemBrowser(sal_Bool bShow) { if (bShow) { if (pItemBrowser==NULL) { pItemBrowser=new SdrItemBrowser(*(SdrView*)this); - pItemBrowser->SetFloatingMode(TRUE); + pItemBrowser->SetFloatingMode(sal_True); } pItemBrowser->Show(); pItemBrowser->GrabFocus(); @@ -1336,12 +1344,12 @@ void SdrPaintView::MakeVisible(const Rectangle& rRect, Window& rWin) if( aActualSize.Height() > 0 && aActualSize.Width() > 0 ) { Size aNewSize(rRect.GetSize()); - BOOL bNewScale=FALSE; - BOOL bNeedMoreX=aNewSize.Width()>aActualSize.Width(); - BOOL bNeedMoreY=aNewSize.Height()>aActualSize.Height(); + sal_Bool bNewScale=sal_False; + sal_Bool bNeedMoreX=aNewSize.Width()>aActualSize.Width(); + sal_Bool bNeedMoreY=aNewSize.Height()>aActualSize.Height(); if (bNeedMoreX || bNeedMoreY) { - bNewScale=TRUE; + bNewScale=sal_True; // Neuen MapMode (Size+Org) setzen und dabei alles invalidieren Fraction aXFact(aNewSize.Width(),aActualSize.Width()); Fraction aYFact(aNewSize.Height(),aActualSize.Height()); @@ -1381,7 +1389,7 @@ void SdrPaintView::DoConnect(SdrOle2Obj* /*pOleObj*/) { } -void SdrPaintView::SetAnimationEnabled( BOOL bEnable ) +void SdrPaintView::SetAnimationEnabled( sal_Bool bEnable ) { SetAnimationMode( bEnable ? SDR_ANIMATION_ANIMATE : SDR_ANIMATION_DISABLE ); } diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index 13bd3956ed..dbcc5a7fd2 100644..100755 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -35,8 +35,8 @@ #include <svx/svdpage.hxx> #include <svx/svdopath.hxx> #include <svx/svdundo.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svdtrans.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> @@ -52,8 +52,8 @@ void SdrPolyEditView::ImpResetPolyPossibilityFlags() { eMarkedPointsSmooth=SDRPATHSMOOTH_DONTCARE; eMarkedSegmentsKind=SDRPATHSEGMENT_DONTCARE; - bSetMarkedPointsSmoothPossible=FALSE; - bSetMarkedSegmentsKindPossible=FALSE; + bSetMarkedPointsSmoothPossible=sal_False; + bSetMarkedSegmentsKindPossible=sal_False; } void SdrPolyEditView::ImpClearVars() @@ -74,7 +74,7 @@ SdrPolyEditView::~SdrPolyEditView() void SdrPolyEditView::ImpCheckPolyPossibilities() { ImpResetPolyPossibilityFlags(); - const ULONG nMarkAnz(GetMarkedObjectCount()); + const sal_uIntPtr nMarkAnz(GetMarkedObjectCount()); if(nMarkAnz && !ImpIsFrameHandles()) { @@ -85,7 +85,7 @@ void SdrPolyEditView::ImpCheckPolyPossibilities() bool bSegmFuz(false); basegfx::B2VectorContinuity eSmooth = basegfx::CONTINUITY_NONE; - for(ULONG nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++) + for(sal_uIntPtr nMarkNum(0L); nMarkNum < nMarkAnz; nMarkNum++) { SdrMark* pM = GetSdrMarkByIndex(nMarkNum); CheckPolyPossibilitiesHelper( pM, b1stSmooth, b1stSegm, bCurve, bSmoothFuz, bSegmFuz, eSmooth ); @@ -215,9 +215,9 @@ void SdrPolyEditView::SetMarkedPointsSmooth(SdrPathSmoothKind eKind) const bool bUndo = IsUndoEnabled(); if( bUndo ) BegUndo(ImpGetResStr(STR_EditSetPointsSmooth), GetDescriptionOfMarkedPoints()); - ULONG nMarkAnz(GetMarkedObjectCount()); + sal_uIntPtr nMarkAnz(GetMarkedObjectCount()); - for(ULONG nMarkNum(nMarkAnz); nMarkNum > 0L;) + for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;) { nMarkNum--; SdrMark* pM = GetSdrMarkByIndex(nMarkNum); @@ -250,9 +250,9 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind) const bool bUndo = IsUndoEnabled(); if( bUndo ) BegUndo(ImpGetResStr(STR_EditSetSegmentsKind), GetDescriptionOfMarkedPoints()); - ULONG nMarkAnz(GetMarkedObjectCount()); + sal_uIntPtr nMarkAnz(GetMarkedObjectCount()); - for(ULONG nMarkNum(nMarkAnz); nMarkNum > 0L;) + for(sal_uIntPtr nMarkNum(nMarkAnz); nMarkNum > 0L;) { nMarkNum--; SdrMark* pM = GetSdrMarkByIndex(nMarkNum); @@ -276,7 +276,7 @@ void SdrPolyEditView::SetMarkedSegmentsKind(SdrPathSegmentKind eKind) } } -BOOL SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const +sal_Bool SdrPolyEditView::IsSetMarkedPointsSmoothPossible() const { ForcePossibilities(); return bSetMarkedPointsSmoothPossible; @@ -288,7 +288,7 @@ SdrPathSmoothKind SdrPolyEditView::GetMarkedPointsSmooth() const return eMarkedPointsSmooth; } -BOOL SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const +sal_Bool SdrPolyEditView::IsSetMarkedSegmentsKindPossible() const { ForcePossibilities(); return bSetMarkedSegmentsKindPossible; @@ -300,7 +300,7 @@ SdrPathSegmentKind SdrPolyEditView::GetMarkedSegmentsKind() const return eMarkedSegmentsKind; } -BOOL SdrPolyEditView::IsDeleteMarkedPointsPossible() const +sal_Bool SdrPolyEditView::IsDeleteMarkedPointsPossible() const { return HasMarkedPoints(); } @@ -311,7 +311,7 @@ void SdrPolyEditView::DeleteMarkedPoints() { BrkAction(); SortMarkedObjects(); - ULONG nMarkAnz=GetMarkedObjectCount(); + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); const bool bUndo = IsUndoEnabled(); if( bUndo ) @@ -320,7 +320,7 @@ void SdrPolyEditView::DeleteMarkedPoints() BegUndo(ImpGetResStr(STR_EditDelete),GetDescriptionOfMarkedPoints(),SDRREPFUNC_OBJ_DELETE); } - for (ULONG nMarkNum=nMarkAnz; nMarkNum>0;) + for (sal_uIntPtr nMarkNum=nMarkAnz; nMarkNum>0;) { nMarkNum--; SdrMark* pM=GetSdrMarkByIndex(nMarkNum); @@ -399,13 +399,13 @@ void SdrPolyEditView::RipUpAtMarkedPoints() pM->GetPageView()->GetObjList()->InsertObject(pNeuObj, pObj->GetOrdNum() + 1, &aReason); if( bUndo ) AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pNeuObj)); - MarkObj(pNeuObj, pM->GetPageView(), FALSE, TRUE); + MarkObj(pNeuObj, pM->GetPageView(), sal_False, sal_True); } if(nNewPt0Idx) { // Korrektur notwendig? - DBG_ASSERT(bKorregFlag==FALSE,"Mehrfache Indexkorrektur bei SdrPolyEditView::RipUp()"); + DBG_ASSERT(bKorregFlag==sal_False,"Mehrfache Indexkorrektur bei SdrPolyEditView::RipUp()"); if(!bKorregFlag) { bKorregFlag = sal_True; @@ -554,7 +554,7 @@ void SdrPolyEditView::ShutMarkedObjects() CloseMarkedObjects(); } -void SdrPolyEditView::CloseMarkedObjects(BOOL bToggle, BOOL bOpen) // , long nOpenDistance) +void SdrPolyEditView::CloseMarkedObjects(sal_Bool bToggle, sal_Bool bOpen) // , long nOpenDistance) { if (AreObjectsMarked()) { @@ -563,12 +563,12 @@ void SdrPolyEditView::CloseMarkedObjects(BOOL bToggle, BOOL bOpen) // , long nOp BegUndo(ImpGetResStr(STR_EditShut),GetDescriptionOfMarkedPoints()); bool bChg=false; - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pO=pM->GetMarkedSdrObj(); - BOOL bClosed=pO->IsClosedObj(); + sal_Bool bClosed=pO->IsClosedObj(); if ((pO->IsPolyObj() && (bClosed==bOpen)) || bToggle) { if( bUndo ) @@ -604,13 +604,13 @@ void SdrPolyEditView::ImpTransformMarkedPoints(PPolyTrFunc pTrFunc, const void* { const bool bUndo = IsUndoEnabled(); - ULONG nMarkAnz=GetMarkedObjectCount(); - for (ULONG nm=0; nm<nMarkAnz; nm++) + sal_uIntPtr nMarkAnz=GetMarkedObjectCount(); + for (sal_uIntPtr nm=0; nm<nMarkAnz; nm++) { SdrMark* pM=GetSdrMarkByIndex(nm); SdrObject* pObj=pM->GetMarkedSdrObj(); const SdrUShortCont* pPts=pM->GetMarkedPoints(); - ULONG nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); + sal_uIntPtr nPtAnz=pPts==NULL ? 0 : pPts->GetCount(); SdrPathObj* pPath=PTR_CAST(SdrPathObj,pObj); if (nPtAnz!=0 && pPath!=NULL) { @@ -684,7 +684,7 @@ static void ImpMove(Point& rPt, Point* pC1, Point* pC2, const void* p1, const vo void SdrPolyEditView::MoveMarkedPoints(const Size& rSiz, bool bCopy) { - bCopy=FALSE; // noch nicht implementiert + bCopy=sal_False; // noch nicht implementiert ForceUndirtyMrkPnt(); XubString aStr(ImpGetResStr(STR_EditMove)); if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy); @@ -706,7 +706,7 @@ static void ImpResize(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void SdrPolyEditView::ResizeMarkedPoints(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bCopy) { - bCopy=FALSE; // noch nicht implementiert + bCopy=sal_False; // noch nicht implementiert ForceUndirtyMrkPnt(); XubString aStr(ImpGetResStr(STR_EditResize)); if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy); @@ -728,7 +728,7 @@ static void ImpRotate(Point& rPt, Point* pC1, Point* pC2, const void* p1, const void SdrPolyEditView::RotateMarkedPoints(const Point& rRef, long nWink, bool bCopy) { - bCopy=FALSE; // noch nicht implementiert + bCopy=sal_False; // noch nicht implementiert ForceUndirtyMrkPnt(); XubString aStr(ImpGetResStr(STR_EditResize)); if (bCopy) aStr+=ImpGetResStr(STR_EditWithCopy); diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index e67e36402d..2641c30913 100644..100755 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -36,13 +36,13 @@ #include <svx/svdobj.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/sdr/overlay/overlayobjectlist.hxx> #include <svx/sdr/overlay/overlaycrosshair.hxx> #include <svx/sdr/overlay/overlayhelpline.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// // #114409#-1 Migrate PageOrigin @@ -204,29 +204,29 @@ void ImplHelpLineOverlay::SetPosition(const basegfx::B2DPoint& rNewPosition) void SdrSnapView::ClearVars() { nMagnSizPix=4; - bSnapEnab=TRUE; - bGridSnap=TRUE; - bSnapTo1Pix=TRUE; - bBordSnap=TRUE; - bHlplSnap=TRUE; - bOFrmSnap=TRUE; - bOPntSnap=FALSE; - bOConSnap=TRUE; - bMoveMFrmSnap=TRUE; - bMoveOFrmSnap=TRUE; - bMoveOPntSnap=TRUE; - bMoveOConSnap=TRUE; - bMoveSnapOnlyTopLeft=FALSE; - bOrtho=FALSE; - bBigOrtho=TRUE; + bSnapEnab=sal_True; + bGridSnap=sal_True; + bSnapTo1Pix=sal_True; + bBordSnap=sal_True; + bHlplSnap=sal_True; + bOFrmSnap=sal_True; + bOPntSnap=sal_False; + bOConSnap=sal_True; + bMoveMFrmSnap=sal_True; + bMoveOFrmSnap=sal_True; + bMoveOPntSnap=sal_True; + bMoveOConSnap=sal_True; + bMoveSnapOnlyTopLeft=sal_False; + bOrtho=sal_False; + bBigOrtho=sal_True; nSnapAngle=1500; - bAngleSnapEnab=FALSE; - bMoveOnlyDragging=FALSE; - bSlantButShear=FALSE; - bCrookNoContortion=FALSE; + bAngleSnapEnab=sal_False; + bMoveOnlyDragging=sal_False; + bSlantButShear=sal_False; + bCrookNoContortion=sal_False; eCrookMode=SDRCROOK_ROTATE; - bHlplFixed=FALSE; - bEliminatePolyPoints=FALSE; + bHlplFixed=sal_False; + bEliminatePolyPoints=sal_False; nEliminatePolyPointLimitAngle=0; // #114409#-1 Migrate PageOrigin @@ -258,7 +258,7 @@ SdrSnapView::~SdrSnapView() //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrSnapView::IsAction() const +sal_Bool SdrSnapView::IsAction() const { return IsSetPageOrg() || IsDragHelpLine() || SdrPaintView::IsAction(); } @@ -318,7 +318,7 @@ Point SdrSnapView::GetSnapPos(const Point& rPnt, const SdrPageView* pPV) const } #define NOT_SNAPPED 0x7FFFFFFF -USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const +sal_uInt16 SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const { if (!bSnapEnab) return SDRSNAP_NOTSNAPPED; long x=rPnt.X(); @@ -336,8 +336,8 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const if (bHlplVisible && bHlplSnap && !IsDragHelpLine()) { const SdrHelpLineList& rHLL=pPV->GetHelpLines(); - USHORT nAnz=rHLL.GetCount(); - for (USHORT i=nAnz; i>0;) { + sal_uInt16 nAnz=rHLL.GetCount(); + for (sal_uInt16 i=nAnz; i>0;) { i--; const SdrHelpLine& rHL=rHLL[i]; const Point& rPos=rHL.GetPos(); @@ -380,11 +380,11 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const a=y- ys ; if (Abs(a)<=my) { dy1=-a; if (Abs(dy1)<Abs(dy)) dy=dy1; } // rechte Papierkante } if (bOFrmSnap || bOPntSnap /*|| (bConnVisible && bOConSnap)*/) { - ULONG nMaxPointSnapCount=200; - ULONG nMaxFrameSnapCount=200; + sal_uIntPtr nMaxPointSnapCount=200; + sal_uIntPtr nMaxFrameSnapCount=200; // #97981# go back to IM_DEEPNOGROUPS runthrough for snap to object comparisons - SdrObjListIter aIter(*pPV->GetPage(),/*IM_FLAT*/IM_DEEPNOGROUPS,TRUE); + SdrObjListIter aIter(*pPV->GetPage(),/*IM_FLAT*/IM_DEEPNOGROUPS,sal_True); while (aIter.IsMore() && (nMaxPointSnapCount>0 || nMaxFrameSnapCount>0)) { SdrObject* pO=aIter.Next(); @@ -460,7 +460,7 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const dy = 0; } } - BOOL bRet=SDRSNAP_NOTSNAPPED; + sal_Bool bRet=SDRSNAP_NOTSNAPPED; if (dx==NOT_SNAPPED) dx=0; else bRet|=SDRSNAP_XSNAPPED; if (dy==NOT_SNAPPED) dy=0; else bRet|=SDRSNAP_YSNAPPED; rPnt.X()=x+dx; @@ -471,7 +471,7 @@ USHORT SdrSnapView::SnapPos(Point& rPnt, const SdrPageView* pPV) const void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBestXSnap, long& nBestYSnap, bool& bXSnapped, bool& bYSnapped) const { Point aPt(rPt); - USHORT nRet=SnapPos(aPt,pPV); + sal_uInt16 nRet=SnapPos(aPt,pPV); aPt-=rPt; if ((nRet & SDRSNAP_XSNAPPED) !=0) { if (bXSnapped) { @@ -480,7 +480,7 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes } } else { nBestXSnap=aPt.X(); - bXSnapped=TRUE; + bXSnapped=sal_True; } } if ((nRet & SDRSNAP_YSNAPPED) !=0) { @@ -490,17 +490,17 @@ void SdrSnapView::CheckSnap(const Point& rPt, const SdrPageView* pPV, long& nBes } } else { nBestYSnap=aPt.Y(); - bYSnapped=TRUE; + bYSnapped=sal_True; } } } -USHORT SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const +sal_uInt16 SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, long& rDX, long& rDY) const { long nBestXSnap=0; long nBestYSnap=0; - bool bXSnapped=FALSE; - bool bYSnapped=FALSE; + bool bXSnapped=sal_False; + bool bYSnapped=sal_False; CheckSnap(rRect.TopLeft() ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped); if (!bMoveSnapOnlyTopLeft) { CheckSnap(rRect.TopRight() ,pPV,nBestXSnap,nBestYSnap,bXSnapped,bYSnapped); @@ -509,7 +509,7 @@ USHORT SdrSnapView::SnapRect(const Rectangle& rRect, const SdrPageView* pPV, lon } rDX=nBestXSnap; rDY=nBestYSnap; - USHORT nRet=0; + sal_uInt16 nRet=0; if (bXSnapped) nRet+=SDRSNAP_XSNAPPED; if (bYSnapped) nRet+=SDRSNAP_YSNAPPED; return nRet; @@ -574,7 +574,7 @@ void SdrSnapView::BrkSetPageOrg() //////////////////////////////////////////////////////////////////////////////////////////////////// -sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, USHORT& rnHelpLineNum, SdrPageView*& rpPV) const +sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDevice& rOut, sal_uInt16& rnHelpLineNum, SdrPageView*& rpPV) const { rpPV=NULL; nTol=ImpGetHitTolLogic(nTol,&rOut); @@ -583,7 +583,7 @@ sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDe if(pPV) { Point aPnt(rPnt); - USHORT nIndex=pPV->GetHelpLines().HitTest(aPnt,USHORT(nTol),rOut); + sal_uInt16 nIndex=pPV->GetHelpLines().HitTest(aPnt,sal_uInt16(nTol),rOut); if (nIndex!=SDRHELPLINE_NOTFOUND) { rpPV=pPV; rnHelpLineNum=nIndex; @@ -594,7 +594,7 @@ sal_Bool SdrSnapView::PickHelpLine(const Point& rPnt, short nTol, const OutputDe } // start HelpLine drag for new HelpLine -sal_Bool SdrSnapView::BegDragHelpLine(USHORT nHelpLineNum, SdrPageView* pPV) +sal_Bool SdrSnapView::BegDragHelpLine(sal_uInt16 nHelpLineNum, SdrPageView* pPV) { sal_Bool bRet(sal_False); diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src index 05f00c9f3f..2616ec516d 100644..100755 --- a/svx/source/svdraw/svdstr.src +++ b/svx/source/svdraw/svdstr.src @@ -26,7 +26,7 @@ ************************************************************************/ /* StarView resource file */ -#include "svdstr.hrc" +#include "svx/svdstr.hrc" // Ab hier gecachte Strings String STR_ObjNameSingulNONE { @@ -2745,6 +2745,11 @@ String SIP_SA_GRAFRESERVE4 { Text = "" ; }; String SIP_SA_GRAFRESERVE5 { Text = "" ; }; String SIP_SA_GRAFRESERVE6 { Text = "" ; }; +Bitmap SIP_SA_PAGESHADOW35X35 +{ + File = "pageshadow35x35.png"; +}; + Bitmap SIP_SA_MARKERS { File = "markers.png"; @@ -2848,4 +2853,12 @@ Bitmap SIP_SA_CROP_FINE_MARKERS File = "cropmarkers2.png"; }; -// ******************************************************************* EOF +String STR_ObjNameSingulFONTWORK +{ + Text [ en-US ] = "font work" ; +}; +String STR_ObjNamePluralFONTWORK +{ + Text [ en-US ] = "font works" ; +}; + diff --git a/svx/source/svdraw/svdtext.cxx b/svx/source/svdraw/svdtext.cxx index 1e270a8239..6252bdd5ab 100644..100755 --- a/svx/source/svdraw/svdtext.cxx +++ b/svx/source/svdraw/svdtext.cxx @@ -77,7 +77,7 @@ void SdrText::CheckPortionInfo( SdrOutliner& rOutliner ) void SdrText::ReformatText() { - mbPortionInfoChecked=FALSE; + mbPortionInfoChecked=sal_False; mpOutlinerParaObject->ClearPortionInfo(); } @@ -141,7 +141,7 @@ void SdrText::SetModel( SdrModel* pNewModel ) if( mpOutlinerParaObject && pOldModel!=NULL && pNewModel!=NULL) { - bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, TRUE) == SFX_ITEM_SET; + bool bHgtSet = GetObjectItemSet().GetItemState(EE_CHAR_FONTHEIGHT, sal_True) == SFX_ITEM_SET; MapUnit aOldUnit(pOldModel->GetScaleUnit()); MapUnit aNewUnit(pNewModel->GetScaleUnit()); @@ -150,10 +150,10 @@ void SdrText::SetModel( SdrModel* pNewModel ) // !!! Hier muss noch DefTab und RefDevice der beiden Models // !!! verglichen werden und dann ggf. AutoGrow zuschlagen !!! // !!! fehlende Implementation !!! - ULONG nOldFontHgt=pOldModel->GetDefaultFontHeight(); - ULONG nNewFontHgt=pNewModel->GetDefaultFontHeight(); - BOOL bDefHgtChanged=nNewFontHgt!=nOldFontHgt; - BOOL bSetHgtItem=bDefHgtChanged && !bHgtSet; + sal_uIntPtr nOldFontHgt=pOldModel->GetDefaultFontHeight(); + sal_uIntPtr nNewFontHgt=pNewModel->GetDefaultFontHeight(); + sal_Bool bDefHgtChanged=nNewFontHgt!=nOldFontHgt; + sal_Bool bSetHgtItem=bDefHgtChanged && !bHgtSet; if (bSetHgtItem) { // #32665# // zunaechst das HeightItem festklopfen, damit @@ -173,7 +173,7 @@ void SdrText::SetModel( SdrModel* pNewModel ) // Funktioniert nicht richtig: // Geht am Outliner leider nur in % // double nPercFloat=double(aMetricFactor)*100+0.5; - // USHORT nPerc=(USHORT)nPercFloat; + // sal_uInt16 nPerc=(sal_uInt16)nPercFloat; // rOutliner.DoStretchChars(100,nPerc); if (bSetHgtItem) @@ -185,12 +185,12 @@ void SdrText::SetModel( SdrModel* pNewModel ) } SetOutlinerParaObject(rOutliner.CreateParaObject()); // #34494# mpOutlinerParaObject->ClearPortionInfo(); - mbPortionInfoChecked=FALSE; + mbPortionInfoChecked=sal_False; rOutliner.Clear(); } } -void SdrText::ForceOutlinerParaObject( USHORT nOutlMode ) +void SdrText::ForceOutlinerParaObject( sal_uInt16 nOutlMode ) { if( mpModel && !mpOutlinerParaObject ) { diff --git a/svx/source/svdraw/svdtrans.cxx b/svx/source/svdraw/svdtrans.cxx index 6b8935662c..1a0fd40052 100644..100755 --- a/svx/source/svdraw/svdtrans.cxx +++ b/svx/source/svdraw/svdtrans.cxx @@ -93,32 +93,32 @@ void ResizeRect(Rectangle& rRect, const Point& rRef, const Fraction& rxFact, con void ResizePoly(Polygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - USHORT nAnz=rPoly.GetSize(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetSize(); + for (sal_uInt16 i=0; i<nAnz; i++) { ResizePoint(rPoly[i],rRef,xFact,yFact); } } void ResizeXPoly(XPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - USHORT nAnz=rPoly.GetPointCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetPointCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { ResizePoint(rPoly[i],rRef,xFact,yFact); } } void ResizePoly(PolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { ResizePoly(rPoly[i],rRef,xFact,yFact); } } void ResizeXPoly(XPolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, const Fraction& yFact) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { ResizeXPoly(rPoly[i],rRef,xFact,yFact); } } @@ -127,32 +127,32 @@ void ResizeXPoly(XPolyPolygon& rPoly, const Point& rRef, const Fraction& xFact, void RotatePoly(Polygon& rPoly, const Point& rRef, double sn, double cs) { - USHORT nAnz=rPoly.GetSize(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetSize(); + for (sal_uInt16 i=0; i<nAnz; i++) { RotatePoint(rPoly[i],rRef,sn,cs); } } void RotateXPoly(XPolygon& rPoly, const Point& rRef, double sn, double cs) { - USHORT nAnz=rPoly.GetPointCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetPointCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { RotatePoint(rPoly[i],rRef,sn,cs); } } void RotatePoly(PolyPolygon& rPoly, const Point& rRef, double sn, double cs) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { RotatePoly(rPoly[i],rRef,sn,cs); } } void RotateXPoly(XPolyPolygon& rPoly, const Point& rRef, double sn, double cs) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { RotateXPoly(rPoly[i],rRef,sn,cs); } } @@ -202,32 +202,32 @@ void MirrorPoint(Point& rPnt, const Point& rRef1, const Point& rRef2) void MirrorPoly(Polygon& rPoly, const Point& rRef1, const Point& rRef2) { - USHORT nAnz=rPoly.GetSize(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetSize(); + for (sal_uInt16 i=0; i<nAnz; i++) { MirrorPoint(rPoly[i],rRef1,rRef2); } } void MirrorXPoly(XPolygon& rPoly, const Point& rRef1, const Point& rRef2) { - USHORT nAnz=rPoly.GetPointCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetPointCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { MirrorPoint(rPoly[i],rRef1,rRef2); } } void MirrorPoly(PolyPolygon& rPoly, const Point& rRef1, const Point& rRef2) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { MirrorPoly(rPoly[i],rRef1,rRef2); } } void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { MirrorXPoly(rPoly[i],rRef1,rRef2); } } @@ -236,32 +236,32 @@ void MirrorXPoly(XPolyPolygon& rPoly, const Point& rRef1, const Point& rRef2) void ShearPoly(Polygon& rPoly, const Point& rRef, double tn, bool bVShear) { - USHORT nAnz=rPoly.GetSize(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetSize(); + for (sal_uInt16 i=0; i<nAnz; i++) { ShearPoint(rPoly[i],rRef,tn,bVShear); } } void ShearXPoly(XPolygon& rPoly, const Point& rRef, double tn, bool bVShear) { - USHORT nAnz=rPoly.GetPointCount(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.GetPointCount(); + for (sal_uInt16 i=0; i<nAnz; i++) { ShearPoint(rPoly[i],rRef,tn,bVShear); } } void ShearPoly(PolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { ShearPoly(rPoly[i],rRef,tn,bVShear); } } void ShearXPoly(XPolyPolygon& rPoly, const Point& rRef, double tn, bool bVShear) { - USHORT nAnz=rPoly.Count(); - for (USHORT i=0; i<nAnz; i++) { + sal_uInt16 nAnz=rPoly.Count(); + for (sal_uInt16 i=0; i<nAnz; i++) { ShearXPoly(rPoly[i],rRef,tn,bVShear); } } @@ -400,8 +400,8 @@ double CrookStretchXPoint(Point& rPnt, Point* pC1, Point* pC2, const Point& rCen void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { double nSin,nCos; - USHORT nPointAnz=rPoly.GetPointCount(); - USHORT i=0; + sal_uInt16 nPointAnz=rPoly.GetPointCount(); + sal_uInt16 i=0; while (i<nPointAnz) { Point* pPnt=&rPoly[i]; Point* pC1=NULL; @@ -423,8 +423,8 @@ void CrookRotatePoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, b void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { double nSin,nCos; - USHORT nPointAnz=rPoly.GetPointCount(); - USHORT i=0; + sal_uInt16 nPointAnz=rPoly.GetPointCount(); + sal_uInt16 i=0; while (i<nPointAnz) { Point* pPnt=&rPoly[i]; Point* pC1=NULL; @@ -446,8 +446,8 @@ void CrookSlantPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bo void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle rRefRect) { double nSin,nCos; - USHORT nPointAnz=rPoly.GetPointCount(); - USHORT i=0; + sal_uInt16 nPointAnz=rPoly.GetPointCount(); + sal_uInt16 i=0; while (i<nPointAnz) { Point* pPnt=&rPoly[i]; Point* pC1=NULL; @@ -470,24 +470,24 @@ void CrookStretchPoly(XPolygon& rPoly, const Point& rCenter, const Point& rRad, void CrookRotatePoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { - USHORT nPolyAnz=rPoly.Count(); - for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { + sal_uInt16 nPolyAnz=rPoly.Count(); + for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { CrookRotatePoly(rPoly[nPolyNum],rCenter,rRad,bVert); } } void CrookSlantPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert) { - USHORT nPolyAnz=rPoly.Count(); - for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { + sal_uInt16 nPolyAnz=rPoly.Count(); + for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { CrookSlantPoly(rPoly[nPolyNum],rCenter,rRad,bVert); } } void CrookStretchPoly(XPolyPolygon& rPoly, const Point& rCenter, const Point& rRad, bool bVert, const Rectangle rRefRect) { - USHORT nPolyAnz=rPoly.Count(); - for (USHORT nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { + sal_uInt16 nPolyAnz=rPoly.Count(); + for (sal_uInt16 nPolyNum=0; nPolyNum<nPolyAnz; nPolyNum++) { CrookStretchPoly(rPoly[nPolyNum],rCenter,rRad,bVert,rRefRect); } } @@ -522,7 +522,7 @@ long NormAngle360(long a) return a; } -USHORT GetAngleSector(long nWink) +sal_uInt16 GetAngleSector(long nWink) { while (nWink<0) nWink+=36000; while (nWink>=36000) nWink-=36000; @@ -701,17 +701,17 @@ long BigMulDiv(long nVal, long nMul, long nDiv) void Kuerzen(Fraction& rF, unsigned nDigits) { - INT32 nMul=rF.GetNumerator(); - INT32 nDiv=rF.GetDenominator(); + sal_Int32 nMul=rF.GetNumerator(); + sal_Int32 nDiv=rF.GetDenominator(); bool bNeg = false; if (nMul<0) { nMul=-nMul; bNeg=!bNeg; } if (nDiv<0) { nDiv=-nDiv; bNeg=!bNeg; } if (nMul==0 || nDiv==0) return; - UINT32 a; - a=UINT32(nMul); unsigned nMulZ=0; // Fuehrende Nullen zaehlen + sal_uInt32 a; + a=sal_uInt32(nMul); unsigned nMulZ=0; // Fuehrende Nullen zaehlen while (a<0x00800000) { nMulZ+=8; a<<=8; } while (a<0x80000000) { nMulZ++; a<<=1; } - a=UINT32(nDiv); unsigned nDivZ=0; // Fuehrende Nullen zaehlen + a=sal_uInt32(nDiv); unsigned nDivZ=0; // Fuehrende Nullen zaehlen while (a<0x00800000) { nDivZ+=8; a<<=8; } while (a<0x80000000) { nDivZ++; a<<=1; } // Anzahl der verwendeten Digits bestimmen @@ -948,7 +948,7 @@ void SdrFormatter::Undirty() nMul_=nMul1; nDiv_=nDiv1; nKomma_=nKomma1; - bDirty=FALSE; + bDirty=sal_False; } @@ -964,7 +964,7 @@ void SdrFormatter::TakeStr(long nVal, XubString& rStr) const } // Hier fallen trotzdem evtl. Nachkommastellen weg, wg. MulDiv statt Real - BOOL bNeg(nVal < 0); + sal_Bool bNeg(nVal < 0); SvtSysLocale aSysLoc; const LocaleDataWrapper& rLoc = aSysLoc.GetLocaleData(); diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 2121e02df3..50c22eb2e3 100644..100755 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -30,15 +30,15 @@ #include "precompiled_svx.hxx" #include <svx/svdundo.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdotext.hxx> #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> #include <svx/svdlayer.hxx> #include <svx/svdmodel.hxx> #include <svx/svdview.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/scene3d.hxx> #include <editeng/outlobj.hxx> #include <svx/svdogrp.hxx> @@ -48,7 +48,7 @@ #include <svl/whiter.hxx> #include <svx/e3dsceneupdater.hxx> -#include "svdviter.hxx" +#include "svx/svdviter.hxx" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -58,7 +58,7 @@ static void ImplUnmarkObject( SdrObject* pObj ) SdrViewIter aIter( pObj ); for ( SdrView* pView = aIter.FirstView(); pView; pView = aIter.NextView() ) { - pView->MarkObj( pObj, pView->GetSdrPageView(), TRUE ); + pView->MarkObj( pObj, pView->GetSdrPageView(), sal_True ); } } @@ -66,11 +66,11 @@ static void ImplUnmarkObject( SdrObject* pObj ) TYPEINIT1(SdrUndoAction,SfxUndoAction); -BOOL SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const +sal_Bool SdrUndoAction::CanRepeat(SfxRepeatTarget& rView) const { SdrView* pV=PTR_CAST(SdrView,&rView); if (pV!=NULL) return CanSdrRepeat(*pV); - return FALSE; + return sal_False; } void SdrUndoAction::Repeat(SfxRepeatTarget& rView) @@ -89,7 +89,7 @@ XubString SdrUndoAction::GetRepeatComment(SfxRepeatTarget& rView) const bool SdrUndoAction::CanSdrRepeat(SdrView& /*rView*/) const { - return FALSE; + return sal_False; } void SdrUndoAction::SdrRepeat(SdrView& /*rView*/) @@ -123,7 +123,7 @@ SdrUndoGroup::~SdrUndoGroup() void SdrUndoGroup::Clear() { - for (ULONG nu=0; nu<GetActionCount(); nu++) { + for (sal_uIntPtr nu=0; nu<GetActionCount(); nu++) { SdrUndoAction* pAct=GetAction(nu); delete pAct; } @@ -137,12 +137,12 @@ void SdrUndoGroup::AddAction(SdrUndoAction* pAct) void SdrUndoGroup::push_front( SdrUndoAction* pAct ) { - aBuf.Insert(pAct, (ULONG)0 ); + aBuf.Insert(pAct, (sal_uIntPtr)0 ); } void SdrUndoGroup::Undo() { - for (ULONG nu=GetActionCount(); nu>0;) { + for (sal_uIntPtr nu=GetActionCount(); nu>0;) { nu--; SdrUndoAction* pAct=GetAction(nu); pAct->Undo(); @@ -151,7 +151,7 @@ void SdrUndoGroup::Undo() void SdrUndoGroup::Redo() { - for (ULONG nu=0; nu<GetActionCount(); nu++) { + for (sal_uIntPtr nu=0; nu<GetActionCount(); nu++) { SdrUndoAction* pAct=GetAction(nu); pAct->Redo(); } @@ -171,14 +171,14 @@ XubString SdrUndoGroup::GetComment() const bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const { switch (eFunction) { - case SDRREPFUNC_OBJ_NONE : return FALSE; + case SDRREPFUNC_OBJ_NONE : return sal_False; case SDRREPFUNC_OBJ_DELETE : return rView.AreObjectsMarked(); - case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: return rView.IsCombinePossible(FALSE); - case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : return rView.IsCombinePossible(TRUE); - case SDRREPFUNC_OBJ_DISMANTLE_POLYS : return rView.IsDismantlePossible(FALSE); - case SDRREPFUNC_OBJ_DISMANTLE_LINES : return rView.IsDismantlePossible(TRUE); - case SDRREPFUNC_OBJ_CONVERTTOPOLY : return rView.IsConvertToPolyObjPossible(FALSE); - case SDRREPFUNC_OBJ_CONVERTTOPATH : return rView.IsConvertToPathObjPossible(FALSE); + case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: return rView.IsCombinePossible(sal_False); + case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : return rView.IsCombinePossible(sal_True); + case SDRREPFUNC_OBJ_DISMANTLE_POLYS : return rView.IsDismantlePossible(sal_False); + case SDRREPFUNC_OBJ_DISMANTLE_LINES : return rView.IsDismantlePossible(sal_True); + case SDRREPFUNC_OBJ_CONVERTTOPOLY : return rView.IsConvertToPolyObjPossible(sal_False); + case SDRREPFUNC_OBJ_CONVERTTOPATH : return rView.IsConvertToPathObjPossible(sal_False); case SDRREPFUNC_OBJ_GROUP : return rView.IsGroupPossible(); case SDRREPFUNC_OBJ_UNGROUP : return rView.IsUnGroupPossible(); case SDRREPFUNC_OBJ_PUTTOTOP : return rView.IsToTopPossible(); @@ -189,7 +189,7 @@ bool SdrUndoGroup::CanSdrRepeat(SdrView& rView) const case SDRREPFUNC_OBJ_IMPORTMTF : return rView.IsImportMtfPossible(); default: break; } // switch - return FALSE; + return sal_False; } void SdrUndoGroup::SdrRepeat(SdrView& rView) @@ -199,10 +199,10 @@ void SdrUndoGroup::SdrRepeat(SdrView& rView) case SDRREPFUNC_OBJ_DELETE : rView.DeleteMarked(); break; case SDRREPFUNC_OBJ_COMBINE_POLYPOLY: rView.CombineMarkedObjects(sal_False); break; case SDRREPFUNC_OBJ_COMBINE_ONEPOLY : rView.CombineMarkedObjects(sal_True); break; - case SDRREPFUNC_OBJ_DISMANTLE_POLYS : rView.DismantleMarkedObjects(FALSE); break; - case SDRREPFUNC_OBJ_DISMANTLE_LINES : rView.DismantleMarkedObjects(TRUE); break; - case SDRREPFUNC_OBJ_CONVERTTOPOLY : rView.ConvertMarkedToPolyObj(FALSE); break; - case SDRREPFUNC_OBJ_CONVERTTOPATH : rView.ConvertMarkedToPathObj(FALSE); break; + case SDRREPFUNC_OBJ_DISMANTLE_POLYS : rView.DismantleMarkedObjects(sal_False); break; + case SDRREPFUNC_OBJ_DISMANTLE_LINES : rView.DismantleMarkedObjects(sal_True); break; + case SDRREPFUNC_OBJ_CONVERTTOPOLY : rView.ConvertMarkedToPolyObj(sal_False); break; + case SDRREPFUNC_OBJ_CONVERTTOPATH : rView.ConvertMarkedToPathObj(sal_False); break; case SDRREPFUNC_OBJ_GROUP : rView.GroupMarked(); break; case SDRREPFUNC_OBJ_UNGROUP : rView.UnGroupMarked(); break; case SDRREPFUNC_OBJ_PUTTOTOP : rView.PutMarkedToTop(); break; @@ -246,7 +246,7 @@ SdrUndoObj::SdrUndoObj(SdrObject& rNewObj): { } -void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, USHORT nStrCacheID, String& rStr, bool bRepeat ) +void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, sal_uInt16 nStrCacheID, String& rStr, bool bRepeat ) { rStr = ImpGetResStr(nStrCacheID); @@ -272,7 +272,7 @@ void SdrUndoObj::GetDescriptionStringForObject( const SdrObject& _rForObject, US } } -void SdrUndoObj::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, bool bRepeat) const +void SdrUndoObj::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, bool bRepeat) const { if ( pObj ) GetDescriptionStringForObject( *pObj, nStrCacheID, rStr, bRepeat ); @@ -303,7 +303,7 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSave pUndoStyleSheet(NULL), pRedoStyleSheet(NULL), pRepeatStyleSheet(NULL), - bHaveToTakeRedoSet(TRUE), + bHaveToTakeRedoSet(sal_True), pTextUndo(NULL), // #i8508# @@ -314,8 +314,8 @@ SdrUndoAttrObj::SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1, bool bSave bStyleSheet = bStyleSheet1; SdrObjList* pOL = rNewObj.GetSubList(); - BOOL bIsGroup(pOL!=NULL && pOL->GetObjCount()); - BOOL bIs3DScene(bIsGroup && pObj->ISA(E3dScene)); + sal_Bool bIsGroup(pOL!=NULL && pOL->GetObjCount()); + sal_Bool bIs3DScene(bIsGroup && pObj->ISA(E3dScene)); if(bIsGroup) { @@ -380,7 +380,7 @@ void SdrUndoAttrObj::SetRepeatAttr(const SfxItemSet& rSet) void SdrUndoAttrObj::Undo() { E3DModifySceneSnapRectUpdater aUpdater(pObj); - BOOL bIs3DScene(pObj && pObj->ISA(E3dScene)); + sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene)); // #94278# Trigger PageChangeCall ImpShowPageOfThisObject(); @@ -389,7 +389,7 @@ void SdrUndoAttrObj::Undo() { if(bHaveToTakeRedoSet) { - bHaveToTakeRedoSet = FALSE; + bHaveToTakeRedoSet = sal_False; if(pRedoSet) { @@ -414,7 +414,7 @@ void SdrUndoAttrObj::Undo() if(bStyleSheet) { pRedoStyleSheet = pObj->GetStyleSheet(); - pObj->SetStyleSheet(pUndoStyleSheet, TRUE); + pObj->SetStyleSheet(pUndoStyleSheet, sal_True); } sdr::properties::ItemChangeBroadcaster aItemChange(*pObj); @@ -481,14 +481,14 @@ void SdrUndoAttrObj::Undo() void SdrUndoAttrObj::Redo() { E3DModifySceneSnapRectUpdater aUpdater(pObj); - BOOL bIs3DScene(pObj && pObj->ISA(E3dScene)); + sal_Bool bIs3DScene(pObj && pObj->ISA(E3dScene)); if(!pUndoGroup || bIs3DScene) { if(bStyleSheet) { pUndoStyleSheet = pObj->GetStyleSheet(); - pObj->SetStyleSheet(pRedoStyleSheet, TRUE); + pObj->SetStyleSheet(pRedoStyleSheet, sal_True); } sdr::properties::ItemChangeBroadcaster aItemChange(*pObj); @@ -571,7 +571,7 @@ void SdrUndoAttrObj::SdrRepeat(SdrView& rView) { if(pRepeatSet) { - rView.SetAttrToMarked(*pRepeatSet, FALSE); + rView.SetAttrToMarked(*pRepeatSet, sal_False); } } @@ -586,11 +586,11 @@ XubString SdrUndoAttrObj::GetSdrRepeatComment(SdrView& /*rView*/) const if(bStyleSheet) { - ImpTakeDescriptionStr(STR_EditSetStylesheet, aStr, TRUE); + ImpTakeDescriptionStr(STR_EditSetStylesheet, aStr, sal_True); } else { - ImpTakeDescriptionStr(STR_EditSetAttributes, aStr, TRUE); + ImpTakeDescriptionStr(STR_EditSetAttributes, aStr, sal_True); } return aStr; @@ -634,7 +634,7 @@ bool SdrUndoMoveObj::CanSdrRepeat(SdrView& rView) const XubString SdrUndoMoveObj::GetSdrRepeatComment(SdrView& /*rView*/) const { XubString aStr; - ImpTakeDescriptionStr(STR_EditMove,aStr,TRUE); + ImpTakeDescriptionStr(STR_EditMove,aStr,sal_True); return aStr; } @@ -652,8 +652,8 @@ SdrUndoGeoObj::SdrUndoGeoObj(SdrObject& rNewObj): // Aha, Gruppenobjekt // AW: Aber keine 3D-Szene, dann nur fuer die Szene selbst den Undo anlegen pUndoGroup=new SdrUndoGroup(*pObj->GetModel()); - ULONG nObjAnz=pOL->GetObjCount(); - for (ULONG nObjNum=0; nObjNum<nObjAnz; nObjNum++) { + sal_uIntPtr nObjAnz=pOL->GetObjCount(); + for (sal_uIntPtr nObjNum=0; nObjNum<nObjAnz; nObjNum++) { pUndoGroup->AddAction(new SdrUndoGeoObj(*pOL->GetObj(nObjNum))); } } else { @@ -721,7 +721,7 @@ XubString SdrUndoGeoObj::GetComment() const SdrUndoObjList::SdrUndoObjList(SdrObject& rNewObj, bool bOrdNumDirect) : SdrUndoObj(rNewObj), - bOwner(FALSE), + bOwner(sal_False), pView(NULL), pPageView(NULL) { @@ -738,7 +738,7 @@ SdrUndoObjList::~SdrUndoObjList() if (pObj!=NULL && IsOwner()) { // Attribute muessen wieder in den regulaeren Pool - SetOwner(FALSE); + SetOwner(sal_False); // nun loeschen SdrObject::Free( pObj ); @@ -854,14 +854,14 @@ void SdrUndoDelObj::Undo() { SdrUndoRemoveObj::Undo(); DBG_ASSERT(IsOwner(),"UndoDeleteObj: pObj gehoert nicht der UndoAction"); - SetOwner(FALSE); + SetOwner(sal_False); } void SdrUndoDelObj::Redo() { SdrUndoRemoveObj::Redo(); DBG_ASSERT(!IsOwner(),"RedoDeleteObj: pObj gehoert bereits der UndoAction"); - SetOwner(TRUE); + SetOwner(sal_True); } XubString SdrUndoDelObj::GetComment() const @@ -884,7 +884,7 @@ bool SdrUndoDelObj::CanSdrRepeat(SdrView& rView) const XubString SdrUndoDelObj::GetSdrRepeatComment(SdrView& /*rView*/) const { XubString aStr; - ImpTakeDescriptionStr(STR_EditDelete,aStr,TRUE); + ImpTakeDescriptionStr(STR_EditDelete,aStr,sal_True); return aStr; } @@ -894,14 +894,14 @@ void SdrUndoNewObj::Undo() { SdrUndoInsertObj::Undo(); DBG_ASSERT(!IsOwner(),"RedoNewObj: pObj gehoert bereits der UndoAction"); - SetOwner(TRUE); + SetOwner(sal_True); } void SdrUndoNewObj::Redo() { SdrUndoInsertObj::Redo(); DBG_ASSERT(IsOwner(),"RedoNewObj: pObj gehoert nicht der UndoAction"); - SetOwner(FALSE); + SetOwner(sal_False); } String SdrUndoNewObj::GetComment( const SdrObject& _rForObject ) @@ -920,11 +920,11 @@ XubString SdrUndoNewObj::GetComment() const SdrUndoReplaceObj::SdrUndoReplaceObj(SdrObject& rOldObj1, SdrObject& rNewObj1, bool bOrdNumDirect) : SdrUndoObj(rOldObj1), - bOldOwner(FALSE), - bNewOwner(FALSE), + bOldOwner(sal_False), + bNewOwner(sal_False), pNewObj(&rNewObj1) { - SetOldOwner(TRUE); + SetOldOwner(sal_True); pObjList=pObj->GetObjList(); if (bOrdNumDirect) { @@ -939,7 +939,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj() if (pObj!=NULL && IsOldOwner()) { // Attribute muessen wieder in den regulaeren Pool - SetOldOwner(FALSE); + SetOldOwner(sal_False); // nun loeschen SdrObject::Free( pObj ); @@ -947,7 +947,7 @@ SdrUndoReplaceObj::~SdrUndoReplaceObj() if (pNewObj!=NULL && IsNewOwner()) { // Attribute muessen wieder in den regulaeren Pool - SetNewOwner(FALSE); + SetNewOwner(sal_False); // nun loeschen SdrObject::Free( pNewObj ); @@ -963,8 +963,8 @@ void SdrUndoReplaceObj::Undo() { DBG_ASSERT(!pObj->IsInserted(),"SdrUndoReplaceObj::Undo(): Altes Objekt ist bereits inserted!"); DBG_ASSERT(pNewObj->IsInserted(),"SdrUndoReplaceObj::Undo(): Neues Objekt ist nicht inserted!"); - SetOldOwner(FALSE); - SetNewOwner(TRUE); + SetOldOwner(sal_False); + SetNewOwner(sal_True); ImplUnmarkObject( pNewObj ); pObjList->ReplaceObject(pObj,nOrdNum); @@ -981,8 +981,8 @@ void SdrUndoReplaceObj::Redo() { DBG_ASSERT(!pNewObj->IsInserted(),"SdrUndoReplaceObj::Redo(): Neues Objekt ist bereits inserted!"); DBG_ASSERT(pObj->IsInserted(),"SdrUndoReplaceObj::Redo(): Altes Objekt ist nicht inserted!"); - SetOldOwner(TRUE); - SetNewOwner(FALSE); + SetOldOwner(sal_True); + SetNewOwner(sal_False); ImplUnmarkObject( pObj ); pObjList->ReplaceObject(pNewObj,nOrdNum); @@ -1040,7 +1040,7 @@ void SdrUndoObjectLayerChange::Redo() //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, UINT32 nOldOrdNum1, UINT32 nNewOrdNum1): +SdrUndoObjOrdNum::SdrUndoObjOrdNum(SdrObject& rNewObj, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1): SdrUndoObj(rNewObj), nOldOrdNum(nOldOrdNum1), nNewOrdNum(nNewOrdNum1) @@ -1086,8 +1086,8 @@ SdrUndoObjSetText::SdrUndoObjSetText(SdrObject& rNewObj, sal_Int32 nText) : SdrUndoObj(rNewObj) , pOldText(NULL) , pNewText(NULL) -, bNewTextAvailable(FALSE) -, bEmptyPresObj(FALSE) +, bNewTextAvailable(sal_False) +, bEmptyPresObj(sal_False) , mnText(nText) { SdrText* pText = static_cast< SdrTextObj*>( &rNewObj )->getText(mnText); @@ -1112,7 +1112,7 @@ void SdrUndoObjSetText::AfterSetText() SdrText* pText = static_cast< SdrTextObj*>( pObj )->getText(mnText); if( pText && pText->GetOutlinerParaObject() ) pNewText = new OutlinerParaObject(*pText->GetOutlinerParaObject()); - bNewTextAvailable=TRUE; + bNewTextAvailable=sal_True; } } @@ -1184,8 +1184,8 @@ void SdrUndoObjSetText::SdrRepeat(SdrView& rView) rView.BegUndo(aStr); } - ULONG nAnz=rML.GetMarkCount(); - for (ULONG nm=0; nm<nAnz; nm++) + sal_uIntPtr nAnz=rML.GetMarkCount(); + for (sal_uIntPtr nm=0; nm<nAnz; nm++) { SdrObject* pObj2=rML.GetMark(nm)->GetMarkedSdrObj(); SdrTextObj* pTextObj=PTR_CAST(SdrTextObj,pObj2); @@ -1210,7 +1210,7 @@ bool SdrUndoObjSetText::CanSdrRepeat(SdrView& rView) const { bool bOk = false; if (bNewTextAvailable && rView.AreObjectsMarked()) { - bOk=TRUE; + bOk=sal_True; } return bOk; } @@ -1318,12 +1318,12 @@ String SdrUndoObjStrAttr::GetComment() const //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// -SdrUndoLayer::SdrUndoLayer(USHORT nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel): +SdrUndoLayer::SdrUndoLayer(sal_uInt16 nLayerNum, SdrLayerAdmin& rNewLayerAdmin, SdrModel& rNewModel): SdrUndoAction(rNewModel), pLayer(rNewLayerAdmin.GetLayer(nLayerNum)), pLayerAdmin(&rNewLayerAdmin), nNum(nLayerNum), - bItsMine(FALSE) + bItsMine(sal_False) { } @@ -1339,7 +1339,7 @@ SdrUndoLayer::~SdrUndoLayer() void SdrUndoNewLayer::Undo() { DBG_ASSERT(!bItsMine,"SdrUndoNewLayer::Undo(): Layer gehoert bereits der UndoAction"); - bItsMine=TRUE; + bItsMine=sal_True; #ifdef DBG_UTIL SdrLayer* pCmpLayer= #endif @@ -1350,7 +1350,7 @@ void SdrUndoNewLayer::Undo() void SdrUndoNewLayer::Redo() { DBG_ASSERT(bItsMine,"SdrUndoNewLayer::Undo(): Layer gehoert nicht der UndoAction"); - bItsMine=FALSE; + bItsMine=sal_False; pLayerAdmin->InsertLayer(pLayer,nNum); } @@ -1364,14 +1364,14 @@ XubString SdrUndoNewLayer::GetComment() const void SdrUndoDelLayer::Undo() { DBG_ASSERT(bItsMine,"SdrUndoDelLayer::Undo(): Layer gehoert nicht der UndoAction"); - bItsMine=FALSE; + bItsMine=sal_False; pLayerAdmin->InsertLayer(pLayer,nNum); } void SdrUndoDelLayer::Redo() { DBG_ASSERT(!bItsMine,"SdrUndoDelLayer::Undo(): Layer gehoert bereits der UndoAction"); - bItsMine=TRUE; + bItsMine=sal_True; #ifdef DBG_UTIL SdrLayer* pCmpLayer= #endif @@ -1431,7 +1431,7 @@ SdrUndoPage::SdrUndoPage(SdrPage& rNewPg) { } -void SdrUndoPage::ImpInsertPage(USHORT nNum) +void SdrUndoPage::ImpInsertPage(sal_uInt16 nNum) { DBG_ASSERT(!mrPage.IsInserted(),"SdrUndoPage::ImpInsertPage(): mrPage ist bereits Inserted"); if (!mrPage.IsInserted()) { @@ -1443,7 +1443,7 @@ void SdrUndoPage::ImpInsertPage(USHORT nNum) } } -void SdrUndoPage::ImpRemovePage(USHORT nNum) +void SdrUndoPage::ImpRemovePage(sal_uInt16 nNum) { DBG_ASSERT(mrPage.IsInserted(),"SdrUndoPage::ImpRemovePage(): mrPage ist nicht Inserted"); if (mrPage.IsInserted()) { @@ -1458,7 +1458,7 @@ void SdrUndoPage::ImpRemovePage(USHORT nNum) } } -void SdrUndoPage::ImpMovePage(USHORT nOldNum, USHORT nNewNum) +void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum) { DBG_ASSERT(mrPage.IsInserted(),"SdrUndoPage::ImpMovePage(): mrPage ist nicht Inserted"); if (mrPage.IsInserted()) { @@ -1470,7 +1470,7 @@ void SdrUndoPage::ImpMovePage(USHORT nOldNum, USHORT nNewNum) } } -void SdrUndoPage::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USHORT /*n*/, bool /*bRepeat*/) const +void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, XubString& rStr, sal_uInt16 /*n*/, bool /*bRepeat*/) const { rStr=ImpGetResStr(nStrCacheID); } @@ -1479,7 +1479,7 @@ void SdrUndoPage::ImpTakeDescriptionStr(USHORT nStrCacheID, XubString& rStr, USH SdrUndoPageList::SdrUndoPageList(SdrPage& rNewPg): SdrUndoPage(rNewPg), - bItsMine(FALSE) + bItsMine(sal_False) { nPageNum=rNewPg.GetPageNum(); } @@ -1498,7 +1498,7 @@ SdrUndoDelPage::SdrUndoDelPage(SdrPage& rNewPg): SdrUndoPageList(rNewPg), pUndoGroup(NULL) { - bItsMine = TRUE; + bItsMine = sal_True; // Und nun ggf. die MasterPage-Beziehungen merken if(mrPage.IsMasterPage()) @@ -1541,7 +1541,7 @@ void SdrUndoDelPage::Undo() pUndoGroup->Undo(); } DBG_ASSERT(bItsMine,"UndoDeletePage: mrPage gehoert nicht der UndoAction"); - bItsMine=FALSE; + bItsMine=sal_False; } void SdrUndoDelPage::Redo() @@ -1549,20 +1549,20 @@ void SdrUndoDelPage::Redo() ImpRemovePage(nPageNum); // Die MasterPage-Beziehungen werden ggf. von selbst geloesst DBG_ASSERT(!bItsMine,"RedoDeletePage: mrPage gehoert bereits der UndoAction"); - bItsMine=TRUE; + bItsMine=sal_True; } XubString SdrUndoDelPage::GetComment() const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False); return aStr; } XubString SdrUndoDelPage::GetSdrRepeatComment(SdrView& /*rView*/) const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoDelPage,aStr,0,sal_False); return aStr; } @@ -1581,20 +1581,20 @@ void SdrUndoNewPage::Undo() { ImpRemovePage(nPageNum); DBG_ASSERT(!bItsMine,"UndoNewPage: mrPage gehoert bereits der UndoAction"); - bItsMine=TRUE; + bItsMine=sal_True; } void SdrUndoNewPage::Redo() { ImpInsertPage(nPageNum); DBG_ASSERT(bItsMine,"RedoNewPage: mrPage gehoert nicht der UndoAction"); - bItsMine=FALSE; + bItsMine=sal_False; } XubString SdrUndoNewPage::GetComment() const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoNewPage,aStr,0,sal_False); return aStr; } @@ -1603,14 +1603,14 @@ XubString SdrUndoNewPage::GetComment() const XubString SdrUndoCopyPage::GetComment() const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False); return aStr; } XubString SdrUndoCopyPage::GetSdrRepeatComment(SdrView& /*rView*/) const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoCopPage,aStr,0,sal_False); return aStr; } @@ -1639,7 +1639,7 @@ void SdrUndoSetPageNum::Redo() XubString SdrUndoSetPageNum::GetComment() const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoMovPage,aStr,0,sal_False); return aStr; } @@ -1695,7 +1695,7 @@ void SdrUndoPageRemoveMasterPage::Redo() XubString SdrUndoPageRemoveMasterPage::GetComment() const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoDelPageMasterDscr,aStr,0,sal_False); return aStr; } @@ -1740,7 +1740,7 @@ void SdrUndoPageChangeMasterPage::Redo() XubString SdrUndoPageChangeMasterPage::GetComment() const { XubString aStr; - ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0,FALSE); + ImpTakeDescriptionStr(STR_UndoChgPageMasterDscr,aStr,0,sal_False); return aStr; } @@ -1764,32 +1764,32 @@ SdrUndoAction* SdrUndoFactory::CreateUndoGeoObject( SdrObject& rObject ) SdrUndoAction* SdrUndoFactory::CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1, bool bSaveText ) { - return new SdrUndoAttrObj( rObject, bStyleSheet1 ? TRUE : FALSE, bSaveText ? TRUE : FALSE ); + return new SdrUndoAttrObj( rObject, bStyleSheet1 ? sal_True : sal_False, bSaveText ? sal_True : sal_False ); } SdrUndoAction* SdrUndoFactory::CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoRemoveObj( rObject, bOrdNumDirect ? TRUE : FALSE ); + return new SdrUndoRemoveObj( rObject, bOrdNumDirect ? sal_True : sal_False ); } SdrUndoAction* SdrUndoFactory::CreateUndoInsertObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoInsertObj( rObject, bOrdNumDirect ? TRUE : FALSE ); + return new SdrUndoInsertObj( rObject, bOrdNumDirect ? sal_True : sal_False ); } SdrUndoAction* SdrUndoFactory::CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoDelObj( rObject, bOrdNumDirect ? TRUE : FALSE ); + return new SdrUndoDelObj( rObject, bOrdNumDirect ? sal_True : sal_False ); } SdrUndoAction* SdrUndoFactory::CreateUndoNewObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoNewObj( rObject, bOrdNumDirect ? TRUE : FALSE ); + return new SdrUndoNewObj( rObject, bOrdNumDirect ? sal_True : sal_False ); } SdrUndoAction* SdrUndoFactory::CreateUndoCopyObject( SdrObject& rObject, bool bOrdNumDirect ) { - return new SdrUndoCopyObj( rObject, bOrdNumDirect ? TRUE : FALSE ); + return new SdrUndoCopyObj( rObject, bOrdNumDirect ? sal_True : sal_False ); } SdrUndoAction* SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_uInt32 nOldOrdNum1, sal_uInt32 nNewOrdNum1) @@ -1799,7 +1799,7 @@ SdrUndoAction* SdrUndoFactory::CreateUndoObjectOrdNum( SdrObject& rObject, sal_u SdrUndoAction* SdrUndoFactory::CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect ) { - return new SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ? TRUE : FALSE ); + return new SdrUndoReplaceObj( rOldObject, rNewObject, bOrdNumDirect ? sal_True : sal_False ); } SdrUndoAction* SdrUndoFactory::CreateUndoObjectLayerChange( SdrObject& rObject, SdrLayerID aOldLayer, SdrLayerID aNewLayer ) diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 435448745c..456967c17d 100644..100755 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -30,8 +30,8 @@ #include "precompiled_svx.hxx" #include <editeng/eeitem.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svdpagv.hxx> #include <svx/svdmrkv.hxx> #include <svx/svdedxv.hxx> @@ -56,7 +56,7 @@ #include <tools/tenccvt.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrhittesthelper.hxx> @@ -77,20 +77,20 @@ SdrViewEvent::SdrViewEvent() nMouseCode(0), nHlplIdx(0), nGlueId(0), - bMouseDown(FALSE), - bMouseUp(FALSE), - bDoubleHdlSize(FALSE), - bIsAction(FALSE), - bIsTextEdit(FALSE), - bTextEditHit(FALSE), - bAddMark(FALSE), - bUnmark(FALSE), - bPrevNextMark(FALSE), - bMarkPrev(FALSE), - bInsPointNewObj(FALSE), - bDragWithCopy(FALSE), - bCaptureMouse(FALSE), - bReleaseMouse(FALSE) + bMouseDown(sal_False), + bMouseUp(sal_False), + bDoubleHdlSize(sal_False), + bIsAction(sal_False), + bIsTextEdit(sal_False), + bTextEditHit(sal_False), + bAddMark(sal_False), + bUnmark(sal_False), + bPrevNextMark(sal_False), + bMarkPrev(sal_False), + bInsPointNewObj(sal_False), + bDragWithCopy(sal_False), + bCaptureMouse(sal_False), + bReleaseMouse(sal_False) { } @@ -176,12 +176,12 @@ TYPEINIT1(SdrView,SdrCreateView); SdrView::SdrView(SdrModel* pModel1, OutputDevice* pOut) : SdrCreateView(pModel1,pOut), - bNoExtendedMouseDispatcher(FALSE), - bNoExtendedKeyDispatcher(FALSE), - bNoExtendedCommandDispatcher(FALSE), + bNoExtendedMouseDispatcher(sal_False), + bNoExtendedKeyDispatcher(sal_False), + bNoExtendedCommandDispatcher(sal_False), mbMasterPagePaintCaching(sal_False) { - bTextEditOnObjectsWithoutTextIfTextTool=FALSE; + bTextEditOnObjectsWithoutTextIfTextTool=sal_False; maAccessibilityOptions.AddListener(this); @@ -193,12 +193,12 @@ SdrView::~SdrView() maAccessibilityOptions.RemoveListener(this); } -BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) +sal_Bool SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) { SetActualWin(pWin); - BOOL bRet=SdrCreateView::KeyInput(rKEvt,pWin); + sal_Bool bRet=SdrCreateView::KeyInput(rKEvt,pWin); if (!bRet && !IsExtendedKeyInputDispatcherEnabled()) { - bRet=TRUE; + bRet=sal_True; switch (rKEvt.GetKeyCode().GetFullFunction()) { case KEYFUNC_CUT : Cut(); break; case KEYFUNC_COPY : Yank(); break; @@ -222,7 +222,7 @@ BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) case KEY_BACKSPACE+KEY_MOD2+KEY_SHIFT: pMod->Redo(); break; case KEY_REPEAT: case KEY_BACKSPACE+KEY_MOD2+KEY_MOD1: pMod->Repeat(*this); break; case KEY_MOD1+KEY_A: MarkAll(); break; - default: bRet=FALSE; + default: bRet=sal_False; } // switch } } // switch @@ -236,11 +236,11 @@ BOOL SdrView::KeyInput(const KeyEvent& rKEvt, Window* pWin) return bRet; } -BOOL SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) { SetActualWin(pWin); - if (rMEvt.IsLeft()) aDragStat.SetMouseDown(TRUE); - BOOL bRet=SdrCreateView::MouseButtonDown(rMEvt,pWin); + if (rMEvt.IsLeft()) aDragStat.SetMouseDown(sal_True); + sal_Bool bRet=SdrCreateView::MouseButtonDown(rMEvt,pWin); if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) { SdrViewEvent aVEvt; PickAnything(rMEvt,SDRMOUSEBUTTONDOWN,aVEvt); @@ -249,12 +249,12 @@ BOOL SdrView::MouseButtonDown(const MouseEvent& rMEvt, Window* pWin) return bRet; } -BOOL SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) { SetActualWin(pWin); - if (rMEvt.IsLeft()) aDragStat.SetMouseDown(FALSE); - BOOL bAction=IsAction(); - BOOL bRet=!bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin); + if (rMEvt.IsLeft()) aDragStat.SetMouseDown(sal_False); + sal_Bool bAction=IsAction(); + sal_Bool bRet=!bAction && SdrCreateView::MouseButtonUp(rMEvt,pWin); if (!bRet && !IsExtendedMouseEventDispatcherEnabled()) { SdrViewEvent aVEvt; PickAnything(rMEvt,SDRMOUSEBUTTONUP,aVEvt); @@ -263,15 +263,15 @@ BOOL SdrView::MouseButtonUp(const MouseEvent& rMEvt, Window* pWin) return bRet; } -BOOL SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin) +sal_Bool SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin) { SetActualWin(pWin); aDragStat.SetMouseDown(rMEvt.IsLeft()); - BOOL bRet=SdrCreateView::MouseMove(rMEvt,pWin); + sal_Bool bRet=SdrCreateView::MouseMove(rMEvt,pWin); if (!IsExtendedMouseEventDispatcherEnabled() && !IsTextEditInSelectionMode()) { SdrViewEvent aVEvt; PickAnything(rMEvt,SDRMOUSEMOVE,aVEvt); - if (DoMouseEvent(aVEvt)) bRet=TRUE; + if (DoMouseEvent(aVEvt)) bRet=sal_True; } // #87792# Removed code which did let the mouse snap on object @@ -280,26 +280,26 @@ BOOL SdrView::MouseMove(const MouseEvent& rMEvt, Window* pWin) return bRet; } -BOOL SdrView::Command(const CommandEvent& rCEvt, Window* pWin) +sal_Bool SdrView::Command(const CommandEvent& rCEvt, Window* pWin) { SetActualWin(pWin); - BOOL bRet=SdrCreateView::Command(rCEvt,pWin); + sal_Bool bRet=SdrCreateView::Command(rCEvt,pWin); return bRet; } /* new interface src537 */ -BOOL SdrView::GetAttributes(SfxItemSet& rTargetSet, BOOL bOnlyHardAttr) const +sal_Bool SdrView::GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr) const { return SdrCreateView::GetAttributes(rTargetSet, bOnlyHardAttr); } SfxStyleSheet* SdrView::GetStyleSheet() const { - //BOOL bOk=FALSE; + //sal_Bool bOk=sal_False; return SdrCreateView::GetStyleSheet(); //bOk); } -SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, USHORT nEventKind, SdrViewEvent& rVEvt) const +SdrHitKind SdrView::PickAnything(const MouseEvent& rMEvt, sal_uInt16 nEventKind, SdrViewEvent& rVEvt) const { rVEvt.bMouseDown=nEventKind==SDRMOUSEBUTTONDOWN; rVEvt.bMouseUp=nEventKind==SDRMOUSEBUTTONUP; @@ -353,29 +353,29 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co // #i73628# Use a non-changeable copy of he logic pos const Point aLocalLogicPosition(rLogicPos); - BOOL bEditMode=IsEditMode(); - BOOL bPointMode=bEditMode && HasMarkablePoints(); - BOOL bGluePointMode=IsGluePointEditMode(); - BOOL bInsPolyPt=bPointMode && IsInsObjPointMode() && IsInsObjPointPossible(); - BOOL bInsGluePt=bGluePointMode && IsInsGluePointMode() && IsInsGluePointPossible(); - BOOL bIsTextEdit=IsTextEdit(); - BOOL bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/); - BOOL bTextEditSel=IsTextEditInSelectionMode(); - BOOL bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0; - BOOL bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0; - BOOL bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0; + sal_Bool bEditMode=IsEditMode(); + sal_Bool bPointMode=bEditMode && HasMarkablePoints(); + sal_Bool bGluePointMode=IsGluePointEditMode(); + sal_Bool bInsPolyPt=bPointMode && IsInsObjPointMode() && IsInsObjPointPossible(); + sal_Bool bInsGluePt=bGluePointMode && IsInsGluePointMode() && IsInsGluePointPossible(); + sal_Bool bIsTextEdit=IsTextEdit(); + sal_Bool bTextEditHit=IsTextEditHit(aLocalLogicPosition,0/*nHitTolLog*/); + sal_Bool bTextEditSel=IsTextEditInSelectionMode(); + sal_Bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0; + sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0; + sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0; SdrHitKind eHit=SDRHIT_NONE; SdrHdl* pHdl=pOut!=NULL && !bTextEditSel ? PickHandle(aLocalLogicPosition) : NULL; SdrPageView* pPV=NULL; SdrObject* pObj=NULL; SdrObject* pHitObj=NULL; - USHORT nHitPassNum=0; - USHORT nHlplIdx=0; - USHORT nGlueId=0; + sal_uInt16 nHitPassNum=0; + sal_uInt16 nHlplIdx=0; + sal_uInt16 nGlueId=0; if (bTextEditHit || bTextEditSel) { eHit=SDRHIT_TEXTEDIT; - bTextEditHit=TRUE; + bTextEditHit=sal_True; } else if (pHdl!=NULL) { @@ -437,8 +437,8 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co if (IsMacroMode() && eHit==SDRHIT_UNMARKEDOBJECT) { bool bRoot=pObj->HasMacro(); - BOOL bDeep=pObj!=pHitObj && pHitObj->HasMacro(); - BOOL bMid=FALSE; // Gruppierte Gruppe mit Macro getroffen? + sal_Bool bDeep=pObj!=pHitObj && pHitObj->HasMacro(); + sal_Bool bMid=sal_False; // Gruppierte Gruppe mit Macro getroffen? SdrObject* pMidObj=NULL; if (pObj!=pHitObj) { @@ -449,7 +449,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co { if (pObjTmp->HasMacro()) { - bMid=TRUE; + bMid=sal_True; pMidObj=pObjTmp; } pObjTmp=pObjTmp->GetUpGroup(); @@ -495,13 +495,13 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co if( pTextObj->GetModel() ) pOutliner = &pTextObj->GetModel()->GetHitTestOutliner(); - pTextObj->TakeTextRect( *pOutliner, aTextRect, FALSE, &aAnchor, FALSE ); + pTextObj->TakeTextRect( *pOutliner, aTextRect, sal_False, &aAnchor, sal_False ); // #i73628# Use a text-relative position for hit test in hit test outliner Point aTemporaryTextRelativePosition(aLocalLogicPosition - aTextRect.TopLeft()); // FitToSize berueksichtigen - BOOL bFitToSize(pTextObj->IsFitToSize()); + bool bFitToSize(pTextObj->IsFitToSize()); if (bFitToSize) { Fraction aX(aTextRect.GetWidth()-1,aAnchor.GetWidth()-1); Fraction aY(aTextRect.GetHeight()-1,aAnchor.GetHeight()-1); @@ -568,7 +568,7 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co // TextEdit an Objekten im gesperrten Layer if (pPV->GetLockedLayers().IsSet(pHitObj->GetLayer())) { - bTEHit=FALSE; + bTEHit=sal_False; } if (bTEHit) @@ -584,12 +584,12 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co pObj=NULL; pPV=NULL; } - BOOL bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0; - BOOL bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0; - BOOL bMouseDown=rVEvt.bMouseDown; - BOOL bMouseUp=rVEvt.bMouseUp; + sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0; + sal_Bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0; + sal_Bool bMouseDown=rVEvt.bMouseDown; + sal_Bool bMouseUp=rVEvt.bMouseUp; SdrEventKind eEvent=SDREVENT_NONE; - BOOL bIsAction=IsAction(); + sal_Bool bIsAction=IsAction(); if (bIsAction) { @@ -658,21 +658,21 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co else if (eHit==SDRHIT_HANDLE) { eEvent=SDREVENT_BEGDRAGOBJ; // Mark+Drag,AddMark+Drag,DeepMark+Drag,Unmark - BOOL bGlue=pHdl->GetKind()==HDL_GLUE; - BOOL bPoly=!bGlue && IsPointMarkable(*pHdl); - BOOL bMarked=bGlue || (bPoly && pHdl->IsSelected()); + sal_Bool bGlue=pHdl->GetKind()==HDL_GLUE; + sal_Bool bPoly=!bGlue && IsPointMarkable(*pHdl); + sal_Bool bMarked=bGlue || (bPoly && pHdl->IsSelected()); if (bGlue || bPoly) { eEvent=bGlue ? SDREVENT_MARKGLUEPOINT : SDREVENT_MARKPOINT; if (MODKEY_DeepMark) { - rVEvt.bAddMark=TRUE; - rVEvt.bPrevNextMark=TRUE; + rVEvt.bAddMark=sal_True; + rVEvt.bPrevNextMark=sal_True; rVEvt.bMarkPrev=MODKEY_DeepBackw; } else if (MODKEY_MultiMark) { - rVEvt.bAddMark=TRUE; + rVEvt.bAddMark=sal_True; rVEvt.bUnmark=bMarked; // Toggle if (bGlue) { @@ -778,23 +778,23 @@ SdrHitKind SdrView::PickAnything(const Point& rLogicPos, SdrViewEvent& rVEvt) co return eHit; } -BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) +sal_Bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; SdrHitKind eHit=rVEvt.eHit; Point aLogicPos(rVEvt.aLogicPos); - BOOL bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0; - BOOL bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0; - BOOL bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0; - BOOL bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0; - //BOOL bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0; - BOOL bMouseDown=rVEvt.bMouseDown; - BOOL bMouseUp=rVEvt.bMouseUp; + sal_Bool bShift=(rVEvt.nMouseCode & KEY_SHIFT) !=0; + sal_Bool bCtrl=(rVEvt.nMouseCode & KEY_MOD1) !=0; + sal_Bool bAlt=(rVEvt.nMouseCode & KEY_MOD2) !=0; + sal_Bool bMouseLeft=(rVEvt.nMouseCode&MOUSE_LEFT)!=0; + //sal_Bool bMouseRight=(rVEvt.nMouseCode&MOUSE_RIGHT)!=0; + sal_Bool bMouseDown=rVEvt.bMouseDown; + sal_Bool bMouseUp=rVEvt.bMouseUp; if (bMouseDown) { - if (bMouseLeft) aDragStat.SetMouseDown(TRUE); + if (bMouseLeft) aDragStat.SetMouseDown(sal_True); } else if (bMouseUp) { - if (bMouseLeft) aDragStat.SetMouseDown(FALSE); + if (bMouseLeft) aDragStat.SetMouseDown(sal_False); } else { // ansonsten MoueMove aDragStat.SetMouseDown(bMouseLeft); } @@ -825,13 +825,13 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) // sein muesste (wg. eHit). } switch (rVEvt.eEvent) { - case SDREVENT_NONE: bRet=FALSE; break; - case SDREVENT_TEXTEDIT: bRet=FALSE; break; // Events an die OutlinerView werden hier nicht beruecksichtigt - case SDREVENT_MOVACTION: MovAction(aLogicPos); bRet=TRUE; break; - case SDREVENT_ENDACTION: EndAction(); bRet=TRUE; break; - case SDREVENT_BCKACTION: BckAction(); bRet=TRUE; break; - case SDREVENT_BRKACTION: BrkAction(); bRet=TRUE; break; - case SDREVENT_ENDMARK : EndAction(); bRet=TRUE; break; + case SDREVENT_NONE: bRet=sal_False; break; + case SDREVENT_TEXTEDIT: bRet=sal_False; break; // Events an die OutlinerView werden hier nicht beruecksichtigt + case SDREVENT_MOVACTION: MovAction(aLogicPos); bRet=sal_True; break; + case SDREVENT_ENDACTION: EndAction(); bRet=sal_True; break; + case SDREVENT_BCKACTION: BckAction(); bRet=sal_True; break; + case SDREVENT_BRKACTION: BrkAction(); bRet=sal_True; break; + case SDREVENT_ENDMARK : EndAction(); bRet=sal_True; break; case SDREVENT_BRKMARK : { BrkAction(); if (!MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark)) { @@ -841,7 +841,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) // - und ansonsten Objekte if (!rVEvt.bAddMark) UnmarkAll(); } - bRet=TRUE; + bRet=sal_True; } break; case SDREVENT_ENDCREATE: { // ggf. MarkObj SdrCreateCmd eCmd=SDRCREATE_NEXTPOINT; @@ -852,7 +852,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) MarkObj(rVEvt.pRootObj,rVEvt.pPV); if (eHit==SDRHIT_TEXTEDIT) { - BOOL bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() && + sal_Bool bRet2(pActualOutDev && OUTDEV_WINDOW == pActualOutDev->GetOutDevType() && SdrBeginTextEdit(rVEvt.pObj, rVEvt.pPV, (Window*)pActualOutDev, sal_False, (SdrOutliner*)0L)); if(bRet2) @@ -867,9 +867,9 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } } } - bRet=TRUE; // Obj markiert und ggf. TextEdit gestartet - } else bRet=FALSE; // Create abgebrochen, sonst nix weiter. - } else bRet=TRUE; // EndCreate mit TRUE returniert + bRet=sal_True; // Obj markiert und ggf. TextEdit gestartet + } else bRet=sal_False; // Create abgebrochen, sonst nix weiter. + } else bRet=sal_True; // EndCreate mit sal_True returniert } break; case SDREVENT_ENDDRAG: { bRet=EndDragObj(IsDragWithCopy()); @@ -877,20 +877,20 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } break; case SDREVENT_MARKOBJ: { // + ggf. BegDrag if (!rVEvt.bAddMark) UnmarkAllObj(); - BOOL bUnmark=rVEvt.bUnmark; + sal_Bool bUnmark=rVEvt.bUnmark; if (rVEvt.bPrevNextMark) { bRet=MarkNextObj(aLogicPos,nHitTolLog,rVEvt.bMarkPrev); } else { SortMarkedObjects(); - ULONG nAnz0=GetMarkedObjectCount(); + sal_uIntPtr nAnz0=GetMarkedObjectCount(); bRet=MarkObj(aLogicPos,nHitTolLog,rVEvt.bAddMark); SortMarkedObjects(); - ULONG nAnz1=GetMarkedObjectCount(); + sal_uIntPtr nAnz1=GetMarkedObjectCount(); bUnmark=nAnz1<nAnz0; } if (!bUnmark) { BegDragObj(aLogicPos,NULL,(SdrHdl*)NULL,nMinMovLog); - bRet=TRUE; + bRet=sal_True; } } break; case SDREVENT_MARKPOINT: { // + ggf. BegDrag @@ -902,7 +902,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) { BegDragObj(aLogicPos,NULL,rVEvt.pHdl,nMinMovLog); - bRet=TRUE; + bRet=sal_True; } } break; case SDREVENT_MARKGLUEPOINT: { // + ggf. BegDrag @@ -915,7 +915,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) if (!rVEvt.bUnmark && !rVEvt.bPrevNextMark) { SdrHdl* pHdl=GetGluePointHdl(rVEvt.pObj,rVEvt.nGlueId); BegDragObj(aLogicPos,NULL,pHdl,nMinMovLog); - bRet=TRUE; + bRet=sal_True; } } break; case SDREVENT_BEGMARK: bRet=BegMark(aLogicPos,rVEvt.bAddMark,rVEvt.bUnmark); break; @@ -925,7 +925,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) if (MODKEY_PolyPoly) eCmd=SDRCREATE_NEXTOBJECT; if (rVEvt.nMouseClicks>1) eCmd=SDRCREATE_FORCEEND; EndInsObjPoint(eCmd); - bRet=TRUE; + bRet=sal_True; } break; case SDREVENT_BEGINSGLUEPOINT: bRet=BegInsGluePoint(aLogicPos); break; case SDREVENT_BEGDRAGHELPLINE: bRet=BegDragHelpLine(rVEvt.nHlplIdx,rVEvt.pPV); break; @@ -959,14 +959,14 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) if (bRet && pActualOutDev!=NULL && pActualOutDev->GetOutDevType()==OUTDEV_WINDOW) { Window* pWin=(Window*)pActualOutDev; // Maus links gedrueckt? - BOOL bLeftDown=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseDown; + sal_Bool bLeftDown=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseDown; // Maus links losgelassen? - BOOL bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp; + sal_Bool bLeftUp=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && rVEvt.bMouseUp; // Maus links gedrueckt oder gehalten? - BOOL bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp; + sal_Bool bLeftDown1=(rVEvt.nMouseCode&MOUSE_LEFT)!=0 && !rVEvt.bMouseUp; pWin->SetPointer(GetPreferedPointer(rVEvt.aLogicPos,pWin, rVEvt.nMouseCode & (KEY_SHIFT|KEY_MOD1|KEY_MOD2),bLeftDown1)); - BOOL bAction=IsAction(); + sal_Bool bAction=IsAction(); if (bLeftDown && bAction) pWin->CaptureMouse(); else if (bLeftUp || (rVEvt.bIsAction && !bAction)) pWin->ReleaseMouse(); } @@ -974,7 +974,7 @@ BOOL SdrView::DoMouseEvent(const SdrViewEvent& rVEvt) } #include <editeng/outlobj.hxx> -Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, USHORT nModifier, BOOL bLeftDown) const +Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* pOut, sal_uInt16 nModifier, sal_Bool bLeftDown) const { // Actions if (IsCreateObj()) @@ -986,8 +986,6 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* if ((IsDraggingPoints() || IsDraggingGluePoints()) && IsMouseHideWhileDraggingPoints()) return Pointer(POINTER_NULL); - OSL_TRACE("SdrView::GetPreferedPointer(%lx) %lx\n", this, mpCurrentSdrDragMethod); - return mpCurrentSdrDragMethod->GetSdrDragPointer(); } if (IsMarkObj() || IsMarkPoints() || IsMarkGluePoints() || IsEncirclement() || IsSetPageOrg()) return Pointer(POINTER_ARROW); @@ -1003,7 +1001,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* aHitRec.bDown=bMacroDown; return pMacroObj->GetMacroPointer(aHitRec); } - //USHORT nTol=nHitTolLog; + //sal_uInt16 nTol=nHitTolLog; // TextEdit, ObjEdit, Macro if (IsTextEdit() && (IsTextEditInSelectionMode() || IsTextEditHit(rMousePos,0/*nTol*/))) { @@ -1087,29 +1085,29 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* default: break; } - BOOL bMarkHit=eHit==SDRHIT_MARKEDOBJECT; + sal_Bool bMarkHit=eHit==SDRHIT_MARKEDOBJECT; SdrHdl* pHdl=aVEvt.pHdl; // Nun die Pointer fuer Dragging checken if (pHdl!=NULL || bMarkHit) { SdrHdlKind eHdl= pHdl!=NULL ? pHdl->GetKind() : HDL_MOVE; - BOOL bCorner=pHdl!=NULL && pHdl->IsCornerHdl(); - BOOL bVertex=pHdl!=NULL && pHdl->IsVertexHdl(); - BOOL bMov=eHdl==HDL_MOVE; + sal_Bool bCorner=pHdl!=NULL && pHdl->IsCornerHdl(); + sal_Bool bVertex=pHdl!=NULL && pHdl->IsVertexHdl(); + sal_Bool bMov=eHdl==HDL_MOVE; if (bMov && (eDragMode==SDRDRAG_MOVE || eDragMode==SDRDRAG_RESIZE || bMarkedHitMovesAlways)) { if (!IsMoveAllowed()) return Pointer(POINTER_ARROW); // weil Doppelklick oder Drag&Drop moeglich return Pointer(POINTER_MOVE); } switch (eDragMode) { case SDRDRAG_ROTATE: { - if ((bCorner || bMov) && !IsRotateAllowed(TRUE)) + if ((bCorner || bMov) && !IsRotateAllowed(sal_True)) return Pointer(POINTER_NOTALLOWED); // Sind 3D-Objekte selektiert? - BOOL b3DObjSelected = FALSE; - for (UINT32 a=0; !b3DObjSelected && a<GetMarkedObjectCount(); a++) { + sal_Bool b3DObjSelected = sal_False; + for (sal_uInt32 a=0; !b3DObjSelected && a<GetMarkedObjectCount(); a++) { SdrObject* pObj = GetMarkedObjectByIndex(a); if(pObj && pObj->ISA(E3dObject)) - b3DObjSelected = TRUE; + b3DObjSelected = sal_True; } // Falls es um ein 3D-Objekt geht, muss trotz !IsShearAllowed // weitergemacht werden, da es sich um eine Rotation statt um @@ -1121,7 +1119,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* } break; case SDRDRAG_SHEAR: case SDRDRAG_DISTORT: { if (bCorner) { - if (!IsDistortAllowed(TRUE) && !IsDistortAllowed(FALSE)) return Pointer(POINTER_NOTALLOWED); + if (!IsDistortAllowed(sal_True) && !IsDistortAllowed(sal_False)) return Pointer(POINTER_NOTALLOWED); else return Pointer(POINTER_REFHAND); } if (bVertex && !IsShearAllowed()) return Pointer(POINTER_NOTALLOWED); @@ -1134,18 +1132,18 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* if (bCorner || bVertex || bMov) { SdrHdl* pH1=aHdl.GetHdl(HDL_REF1); SdrHdl* pH2=aHdl.GetHdl(HDL_REF2); - BOOL b90=FALSE; - BOOL b45=FALSE; + sal_Bool b90=sal_False; + sal_Bool b45=sal_False; Point aDif; if (pH1!=NULL && pH2!=NULL) { aDif=pH2->GetPos()-pH1->GetPos(); b90=(aDif.X()==0) || aDif.Y()==0; b45=b90 || (Abs(aDif.X())==Abs(aDif.Y())); } - BOOL bNo=FALSE; - if (!IsMirrorAllowed(TRUE,TRUE)) bNo=TRUE; // Spiegeln ueberhaupt nicht erlaubt - if (!IsMirrorAllowed(FALSE,FALSE) && !b45) bNo=TRUE; // freies Spiegeln nicht erlaubt - if (!IsMirrorAllowed(TRUE,FALSE) && !b90) bNo=TRUE; // Spiegeln hor/ver erlaubt + sal_Bool bNo=sal_False; + if (!IsMirrorAllowed(sal_True,sal_True)) bNo=sal_True; // Spiegeln ueberhaupt nicht erlaubt + if (!IsMirrorAllowed(sal_False,sal_False) && !b45) bNo=sal_True; // freies Spiegeln nicht erlaubt + if (!IsMirrorAllowed(sal_True,sal_False) && !b90) bNo=sal_True; // Spiegeln hor/ver erlaubt if (bNo) return Pointer(POINTER_NOTALLOWED); if (b90) { return Pointer(POINTER_MIRROR); @@ -1172,7 +1170,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* case SDRDRAG_CROOK: { if (bCorner || bVertex || bMov) { - if (!IsCrookAllowed(TRUE) && !IsCrookAllowed(FALSE)) return Pointer(POINTER_NOTALLOWED); + if (!IsCrookAllowed(sal_True) && !IsCrookAllowed(sal_False)) return Pointer(POINTER_NOTALLOWED); return Pointer(POINTER_CROOK); } } @@ -1183,7 +1181,7 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice* } default: { - if ((bCorner || bVertex) && !IsResizeAllowed(TRUE)) return Pointer(POINTER_NOTALLOWED); + if ((bCorner || bVertex) && !IsResizeAllowed(sal_True)) return Pointer(POINTER_NOTALLOWED); } } if (pHdl!=NULL) return pHdl->GetPointer(); @@ -1265,7 +1263,7 @@ XubString SdrView::GetStatusText() ESelection aSel(pTextEditOutlinerView->GetSelection()); long nPar=aSel.nEndPara,nLin=0,nCol=aSel.nEndPos; if (aSel.nEndPara>0) { - for (USHORT nParaNum=0; nParaNum<aSel.nEndPara; nParaNum++) { + for (sal_uInt16 nParaNum=0; nParaNum<aSel.nEndPara; nParaNum++) { nLin+=pTextEditOutliner->GetLineCount(nParaNum); } } @@ -1273,18 +1271,18 @@ XubString SdrView::GetStatusText() // Am Ende einer Zeile eines mehrzeiligen Absatzes wird die Position // der naechsten Zeile des selben Absatzes angezeigt, so es eine solche // gibt. - USHORT nParaLine=0; - ULONG nParaLineAnz=pTextEditOutliner->GetLineCount(aSel.nEndPara); - BOOL bBrk=FALSE; + sal_uInt16 nParaLine=0; + sal_uIntPtr nParaLineAnz=pTextEditOutliner->GetLineCount(aSel.nEndPara); + sal_Bool bBrk=sal_False; while (!bBrk) { - USHORT nLen=pTextEditOutliner->GetLineLen(aSel.nEndPara,nParaLine); - BOOL bLastLine=(nParaLine==nParaLineAnz-1); + sal_uInt16 nLen=pTextEditOutliner->GetLineLen(aSel.nEndPara,nParaLine); + sal_Bool bLastLine=(nParaLine==nParaLineAnz-1); if (nCol>nLen || (!bLastLine && nCol==nLen)) { nCol-=nLen; nLin++; nParaLine++; - } else bBrk=TRUE; - if (nLen==0) bBrk=TRUE; // Sicherheitshalber + } else bBrk=sal_True; + if (nLen==0) bBrk=sal_True; // Sicherheitshalber } aStr.SearchAndReplaceAscii("%1", UniString::CreateFromInt32(nPar + 1)); @@ -1334,14 +1332,14 @@ SdrViewContext SdrView::GetContext() const if( IsGluePointEditMode() ) return SDRCONTEXT_GLUEPOINTEDIT; - const ULONG nMarkAnz = GetMarkedObjectCount(); + const sal_uIntPtr nMarkAnz = GetMarkedObjectCount(); if( HasMarkablePoints() && !IsFrameHandles() ) { - BOOL bPath=TRUE; - for( ULONG nMarkNum = 0; nMarkNum < nMarkAnz && bPath; nMarkNum++ ) + sal_Bool bPath=sal_True; + for( sal_uIntPtr nMarkNum = 0; nMarkNum < nMarkAnz && bPath; nMarkNum++ ) if (!GetMarkedObjectByIndex(nMarkNum)->ISA(SdrPathObj)) - bPath=FALSE; + bPath=sal_False; if( bPath ) return SDRCONTEXT_POINTEDIT; @@ -1349,9 +1347,9 @@ SdrViewContext SdrView::GetContext() const if( GetMarkedObjectCount() ) { - BOOL bGraf = TRUE, bMedia = TRUE, bTable = TRUE; + sal_Bool bGraf = sal_True, bMedia = sal_True, bTable = sal_True; - for( ULONG nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); nMarkNum++ ) + for( sal_uIntPtr nMarkNum = 0; nMarkNum < nMarkAnz && ( bGraf || bMedia ); nMarkNum++ ) { const SdrObject* pMarkObj = GetMarkedObjectByIndex( nMarkNum ); DBG_ASSERT( pMarkObj, "SdrView::GetContext(), null pointer in mark list!" ); @@ -1360,13 +1358,13 @@ SdrViewContext SdrView::GetContext() const continue; if( !pMarkObj->ISA( SdrGrafObj ) ) - bGraf = FALSE; + bGraf = sal_False; if( !pMarkObj->ISA( SdrMediaObj ) ) - bMedia = FALSE; + bMedia = sal_False; if( !pMarkObj->ISA( ::sdr::table::SdrTableObj ) ) - bTable = FALSE; + bTable = sal_False; } if( bGraf ) @@ -1407,24 +1405,24 @@ void SdrView::UnmarkAll() else UnmarkAllObj(); } -BOOL SdrView::IsAllMarked() const +sal_Bool SdrView::IsAllMarked() const { if (IsTextEdit()) { return ImpIsTextEditAllSelected(); } if (IsGluePointEditMode()) { - ULONG nAnz=GetMarkableGluePointCount(); + sal_uIntPtr nAnz=GetMarkableGluePointCount(); return nAnz!=0 && nAnz==GetMarkedGluePointCount(); } if (HasMarkedPoints()) { - ULONG nAnz=GetMarkablePointCount(); + sal_uIntPtr nAnz=GetMarkablePointCount(); return nAnz!=0 && nAnz==GetMarkedPointCount(); } - ULONG nAnz=GetMarkableObjCount(); + sal_uIntPtr nAnz=GetMarkableObjCount(); return nAnz!=0 && nAnz == GetMarkedObjectCount(); } -BOOL SdrView::IsMarkPossible() const +sal_Bool SdrView::IsMarkPossible() const { if(IsTextEdit()) { @@ -1444,10 +1442,10 @@ BOOL SdrView::IsMarkPossible() const return HasMarkableObj(); } -BOOL SdrView::IsAllMarkPrevNextPossible() const +sal_Bool SdrView::IsAllMarkPrevNextPossible() const { if (IsTextEdit()) { - return FALSE; + return sal_False; } if (IsGluePointEditMode()) { return HasMarkableGluePoints(); @@ -1458,10 +1456,10 @@ BOOL SdrView::IsAllMarkPrevNextPossible() const return HasMarkableObj(); } -BOOL SdrView::MarkNext(BOOL bPrev) +sal_Bool SdrView::MarkNext(sal_Bool bPrev) { if (IsTextEdit()) { - return FALSE; + return sal_False; } if (IsGluePointEditMode() && HasMarkedGluePoints()) { return MarkNextGluePoint(bPrev); @@ -1472,10 +1470,10 @@ BOOL SdrView::MarkNext(BOOL bPrev) return MarkNextObj(bPrev); } -BOOL SdrView::MarkNext(const Point& rPnt, BOOL bPrev) +sal_Bool SdrView::MarkNext(const Point& rPnt, sal_Bool bPrev) { if (IsTextEdit()) { - return FALSE; + return sal_False; } if (IsGluePointEditMode() && HasMarkedGluePoints()) { //return MarkNextGluePoint(rPnt,bPrev); fehlende Implementation !!! @@ -1533,9 +1531,9 @@ void SdrView::DeleteMarked() } } -BOOL SdrView::BegMark(const Point& rPnt, BOOL bAddMark, BOOL bUnmark) +sal_Bool SdrView::BegMark(const Point& rPnt, sal_Bool bAddMark, sal_Bool bUnmark) { - if (bUnmark) bAddMark=TRUE; + if (bUnmark) bAddMark=sal_True; if (IsGluePointEditMode()) { if (!bAddMark) UnmarkAllGluePoints(); return BegMarkGluePoints(rPnt,bUnmark); @@ -1548,12 +1546,12 @@ BOOL SdrView::BegMark(const Point& rPnt, BOOL bAddMark, BOOL bUnmark) } } -BOOL SdrView::IsDeleteMarkedPossible() const +sal_Bool SdrView::IsDeleteMarkedPossible() const { - if (IsReadOnly()) return FALSE; - if (IsTextEdit()) return TRUE; - if (IsGluePointEditMode() && HasMarkedGluePoints()) return TRUE; - if (HasMarkedPoints()) return TRUE; + if (IsReadOnly()) return sal_False; + if (IsTextEdit()) return sal_True; + if (IsGluePointEditMode() && HasMarkedGluePoints()) return sal_True; + if (HasMarkedPoints()) return sal_True; return IsDeleteMarkedObjPossible(); } diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index e23fbeb78d..4b9c63470d 100644..100755 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> @@ -37,7 +37,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdsob.hxx> #include <svl/brdcst.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -135,7 +135,7 @@ sal_Bool SdrViewIter::ImpCheckPageView(SdrPageView* pPV) const if(!aObjLay.IsEmpty()) { - return TRUE; + return sal_True; } // ansonsten die naechste MasterPage der Page ansehen... } else diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 76469f1b24..96329b3080 100644..100755 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -31,11 +31,11 @@ #include <vector> #include <editeng/editeng.hxx> -#include "xexch.hxx" +#include "svx/xexch.hxx" #include <svx/xflclit.hxx> #include <svx/svdxcgv.hxx> #include <svx/svdoutl.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdetc.hxx> #include <svx/svdundo.hxx> #include <svx/svdograf.hxx> @@ -46,9 +46,9 @@ #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> #include <svx/svdtrans.hxx> // Fuer GetMapFactor zum umskalieren bei PasteModel -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache -#include "xoutbmp.hxx" +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache +#include "svx/xoutbmp.hxx" #include <vcl/metaact.hxx> #include <svl/poolitem.hxx> #include <svl/itempool.hxx> @@ -105,34 +105,34 @@ Point SdrExchangeView::GetPastePos(SdrObjList* pLst, OutputDevice* pOut) return aP; } -BOOL SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const +sal_Bool SdrExchangeView::ImpLimitToWorkArea(Point& rPt) const { - BOOL bRet(FALSE); + sal_Bool bRet(sal_False); if(!aMaxWorkArea.IsEmpty()) { if(rPt.X()<aMaxWorkArea.Left()) { rPt.X() = aMaxWorkArea.Left(); - bRet = TRUE; + bRet = sal_True; } if(rPt.X()>aMaxWorkArea.Right()) { rPt.X() = aMaxWorkArea.Right(); - bRet = TRUE; + bRet = sal_True; } if(rPt.Y()<aMaxWorkArea.Top()) { rPt.Y() = aMaxWorkArea.Top(); - bRet = TRUE; + bRet = sal_True; } if(rPt.Y()>aMaxWorkArea.Bottom()) { rPt.Y() = aMaxWorkArea.Bottom(); - bRet = TRUE; + bRet = sal_True; } } return bRet; @@ -150,14 +150,14 @@ void SdrExchangeView::ImpGetPasteObjList(Point& /*rPos*/, SdrObjList*& rpLst) } } -BOOL SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const +sal_Bool SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& rLayer) const { - BOOL bRet=FALSE; + sal_Bool bRet=sal_False; rLayer=0; if (pObjList!=NULL) { const SdrPage* pPg=pObjList->GetPage(); if (pPg!=NULL) { - rLayer=pPg->GetLayerAdmin().GetLayerID(aAktLayer,TRUE); + rLayer=pPg->GetLayerAdmin().GetLayerID(aAktLayer,sal_True); if (rLayer==SDRLAYER_NOTFOUND) rLayer=0; SdrPageView* pPV = GetSdrPageView(); if (pPV!=NULL) { @@ -170,50 +170,50 @@ BOOL SdrExchangeView::ImpGetPasteLayer(const SdrObjList* pObjList, SdrLayerID& r //////////////////////////////////////////////////////////////////////////////////////////////////// -BOOL SdrExchangeView::Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst, UINT32 nOptions) +sal_Bool SdrExchangeView::Paste(const GDIMetaFile& rMtf, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); ImpLimitToWorkArea( aPos ); - if (pLst==NULL) return FALSE; + if (pLst==NULL) return sal_False; SdrLayerID nLayer; - if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE; - BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); + if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False; + sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); if (bUnmark) UnmarkAllObj(); SdrGrafObj* pObj=new SdrGrafObj(Graphic(rMtf)); pObj->SetLayer(nLayer); ImpPasteObject(pObj,*pLst,aPos,rMtf.GetPrefSize(),rMtf.GetPrefMapMode(),nOptions); - return TRUE; + return sal_True; } -BOOL SdrExchangeView::Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst, UINT32 nOptions) +sal_Bool SdrExchangeView::Paste(const Bitmap& rBmp, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); ImpLimitToWorkArea( aPos ); - if (pLst==NULL) return FALSE; + if (pLst==NULL) return sal_False; SdrLayerID nLayer; - if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE; - BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); + if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False; + sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); if (bUnmark) UnmarkAllObj(); SdrGrafObj* pObj=new SdrGrafObj(Graphic(rBmp)); pObj->SetLayer(nLayer); ImpPasteObject(pObj,*pLst,aPos,rBmp.GetSizePixel(),MapMode(MAP_PIXEL),nOptions); - return TRUE; + return sal_True; } -BOOL SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList* pLst, UINT32 nOptions) +sal_Bool SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { if(!rStr.Len()) - return FALSE; + return sal_False; Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); ImpLimitToWorkArea( aPos ); - if (pLst==NULL) return FALSE; + if (pLst==NULL) return sal_False; SdrLayerID nLayer; - if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE; - BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); + if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False; + sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); if (bUnmark) UnmarkAllObj(); Rectangle aTextRect(0,0,500,500); SdrPage* pPage=pLst->GetPage(); @@ -239,18 +239,18 @@ BOOL SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, SdrObjList MapUnit eMap=pMod->GetScaleUnit(); Fraction aMap=pMod->GetScaleFraction(); ImpPasteObject(pObj,*pLst,aPos,aSiz,MapMode(eMap,Point(0,0),aMap,aMap),nOptions); - return TRUE; + return sal_True; } -BOOL SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, USHORT eFormat, const Point& rPos, SdrObjList* pLst, UINT32 nOptions) +sal_Bool SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { Point aPos(rPos); ImpGetPasteObjList(aPos,pLst); ImpLimitToWorkArea( aPos ); - if (pLst==NULL) return FALSE; + if (pLst==NULL) return sal_False; SdrLayerID nLayer; - if (!ImpGetPasteLayer(pLst,nLayer)) return FALSE; - BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); + if (!ImpGetPasteLayer(pLst,nLayer)) return sal_False; + sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); if (bUnmark) UnmarkAllObj(); Rectangle aTextRect(0,0,500,500); SdrPage* pPage=pLst->GetPage(); @@ -297,14 +297,14 @@ BOOL SdrExchangeView::Paste(SvStream& rInput, const String& rBaseURL, USHORT eFo } } - return TRUE; + return sal_True; } -BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, UINT32 nOptions) +sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* pLst, sal_uInt32 nOptions) { const SdrModel* pSrcMod=&rMod; if (pSrcMod==pMod) - return FALSE; // na so geht's ja nun nicht + return sal_False; // na so geht's ja nun nicht const bool bUndo = IsUndoEnabled(); @@ -315,7 +315,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* { if( bUndo ) EndUndo(); - return TRUE; + return sal_True; } Point aPos(rPos); @@ -331,9 +331,9 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* ImpLimitToWorkArea( aPos ); if (pLst==NULL) - return FALSE; + return sal_False; - BOOL bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); + sal_Bool bUnmark=(nOptions&(SDRINSERT_DONTMARK|SDRINSERT_ADDMARK))==0 && !IsTextEdit(); if (bUnmark) UnmarkAllObj(); @@ -341,7 +341,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* // Dafuer erstmal die Faktoren berechnen MapUnit eSrcUnit=pSrcMod->GetScaleUnit(); MapUnit eDstUnit=pMod->GetScaleUnit(); - BOOL bResize=eSrcUnit!=eDstUnit; + sal_Bool bResize=eSrcUnit!=eDstUnit; Fraction xResize,yResize; Point aPt0; if (bResize) @@ -351,7 +351,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* yResize=aResize.Y(); } SdrObjList* pDstLst=pLst; - USHORT nPg,nPgAnz=pSrcMod->GetPageCount(); + sal_uInt16 nPg,nPgAnz=pSrcMod->GetPageCount(); for (nPg=0; nPg<nPgAnz; nPg++) { const SdrPage* pSrcPg=pSrcMod->GetPage(nPg); @@ -363,10 +363,10 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* ResizeRect(aR,aPt0,xResize,yResize); Point aDist(aPos-aR.Center()); Size aSiz(aDist.X(),aDist.Y()); - //ULONG nDstObjAnz0=pDstLst->GetObjCount(); - ULONG nCloneErrCnt=0; - ULONG nOb,nObAnz=pSrcPg->GetObjCount(); - BOOL bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0; + //sal_uIntPtr nDstObjAnz0=pDstLst->GetObjCount(); + sal_uIntPtr nCloneErrCnt=0; + sal_uIntPtr nOb,nObAnz=pSrcPg->GetObjCount(); + sal_Bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0; // #i13033# // New mechanism to re-create the connections of cloned connectors @@ -383,9 +383,9 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* { if(bResize) { - pNeuObj->GetModel()->SetPasteResize(TRUE); // #51139# + pNeuObj->GetModel()->SetPasteResize(sal_True); // #51139# pNeuObj->NbcResize(aPt0,xResize,yResize); - pNeuObj->GetModel()->SetPasteResize(FALSE); // #51139# + pNeuObj->GetModel()->SetPasteResize(sal_False); // #51139# } // #i39861# @@ -409,7 +409,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* } else { - nLayer = rAd.GetLayerID(aAktLayer, TRUE); + nLayer = rAd.GetLayerID(aAktLayer, sal_True); } if(SDRLAYER_NOTFOUND == nLayer) @@ -429,7 +429,7 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* if (bMark) { // Markhandles noch nicht sofort setzen! // Das erledigt das ModelHasChanged der MarkView. - MarkObj(pNeuObj,pMarkPV,FALSE,TRUE); + MarkObj(pNeuObj,pMarkPV,sal_False,sal_True); } // #i13033# @@ -471,10 +471,10 @@ BOOL SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjList* if( bUndo ) EndUndo(); - return TRUE; + return sal_True; } -BOOL SdrExchangeView::IsExchangeFormatSupported(ULONG nFormat) const +sal_Bool SdrExchangeView::IsExchangeFormatSupported(sal_uIntPtr nFormat) const { return( FORMAT_PRIVATE == nFormat || FORMAT_GDIMETAFILE == nFormat || @@ -485,7 +485,7 @@ BOOL SdrExchangeView::IsExchangeFormatSupported(ULONG nFormat) const SOT_FORMATSTR_ID_EDITENGINE == nFormat ); } -void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, UINT32 nOptions) +void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Point& rCenter, const Size& rSiz, const MapMode& rMap, sal_uInt32 nOptions) { BigInt nSizX(rSiz.Width()); BigInt nSizY(rSiz.Height()); @@ -525,7 +525,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po pMarkPV=pPV; } - BOOL bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0; + sal_Bool bMark=pMarkPV!=NULL && !IsTextEdit() && (nOptions&SDRINSERT_DONTMARK)==0; if (bMark) { // Obj in der ersten gefundenen PageView markieren MarkObj(pObj,pMarkPV); @@ -534,7 +534,7 @@ void SdrExchangeView::ImpPasteObject(SdrObject* pObj, SdrObjList& rLst, const Po //////////////////////////////////////////////////////////////////////////////////////////////////// -Bitmap SdrExchangeView::GetMarkedObjBitmap( BOOL bNoVDevIfOneBmpMarked ) const +Bitmap SdrExchangeView::GetMarkedObjBitmap( sal_Bool bNoVDevIfOneBmpMarked ) const { Bitmap aBmp; @@ -571,7 +571,7 @@ Bitmap SdrExchangeView::GetMarkedObjBitmap( BOOL bNoVDevIfOneBmpMarked ) const // ----------------------------------------------------------------------------- -GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( BOOL bNoVDevIfOneMtfMarked ) const +GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( sal_Bool bNoVDevIfOneMtfMarked ) const { GDIMetaFile aMtf; @@ -609,7 +609,7 @@ GDIMetaFile SdrExchangeView::GetMarkedObjMetaFile( BOOL bNoVDevIfOneMtfMarked ) Size aDummySize( 2, 2 ); aOut.SetOutputSizePixel( aDummySize ); - aOut.EnableOutput( FALSE ); + aOut.EnableOutput( sal_False ); aOut.SetMapMode( aMap ); aMtf.Clear(); @@ -650,7 +650,7 @@ Graphic SdrExchangeView::GetAllMarkedGraphic() const if( ( 1 == GetMarkedObjectCount() ) && GetSdrMarkByIndex( 0 ) ) aRet = SdrExchangeView::GetObjGraphic( pMod, GetMarkedObjectByIndex( 0 ) ); else - aRet = GetMarkedObjMetaFile( FALSE ); + aRet = GetMarkedObjMetaFile( sal_False ); } return aRet; @@ -692,7 +692,7 @@ Graphic SdrExchangeView::GetObjGraphic( const SdrModel* pModel, const SdrObject* pModel->GetScaleFraction(), pModel->GetScaleFraction() ); - aOut.EnableOutput( FALSE ); + aOut.EnableOutput( sal_False ); aOut.SetMapMode( aMap ); aMtf.Record( &aOut ); pObj->SingleObjectPainter( aOut ); // #110094#-17 @@ -726,7 +726,7 @@ void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const ::std::vector< SdrMark* >& rObjVector1 = aObjVectors[ 0 ]; ::std::vector< SdrMark* >& rObjVector2 = aObjVectors[ 1 ]; const SdrLayerAdmin& rLayerAdmin = pMod->GetLayerAdmin(); - const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), FALSE ); + const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False ); sal_uInt32 n, nCount; for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ ) @@ -760,7 +760,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const // werde ich sie mir wohl kopieren muessen. SortMarkedObjects(); SdrModel* pNeuMod=pMod->AllocModel(); - SdrPage* pNeuPag=pNeuMod->AllocPage(FALSE); + SdrPage* pNeuPag=pNeuMod->AllocPage(sal_False); pNeuMod->InsertPage(pNeuPag); if( !mxSelectionController.is() || !mxSelectionController->GetMarkedObjModel( pNeuPag ) ) @@ -769,7 +769,7 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const ::std::vector< SdrMark* >& rObjVector1 = aObjVectors[ 0 ]; ::std::vector< SdrMark* >& rObjVector2 = aObjVectors[ 1 ]; const SdrLayerAdmin& rLayerAdmin = pMod->GetLayerAdmin(); - const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), FALSE ); + const sal_uInt32 nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False ); sal_uInt32 n, nCount, nCloneErrCnt = 0; for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ ) @@ -858,40 +858,40 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const // ----------------------------------------------------------------------------- -BOOL SdrExchangeView::Cut( ULONG /*nFormat */) +sal_Bool SdrExchangeView::Cut( sal_uIntPtr /*nFormat */) { OSL_FAIL( "SdrExchangeView::Cut: Not supported anymore" ); - return FALSE; + return sal_False; } // ----------------------------------------------------------------------------- -void SdrExchangeView::CutMarked( ULONG /*nFormat */) +void SdrExchangeView::CutMarked( sal_uIntPtr /*nFormat */) { OSL_FAIL( "SdrExchangeView::CutMarked: Not supported anymore" ); } // ----------------------------------------------------------------------------- -BOOL SdrExchangeView::Yank(ULONG /*nFormat*/) +sal_Bool SdrExchangeView::Yank(sal_uIntPtr /*nFormat*/) { OSL_FAIL( "SdrExchangeView::Yank: Not supported anymore" ); - return FALSE; + return sal_False; } // ----------------------------------------------------------------------------- -void SdrExchangeView::YankMarked(ULONG /*nFormat*/) +void SdrExchangeView::YankMarked(sal_uIntPtr /*nFormat*/) { OSL_FAIL( "YankMarked: Not supported anymore" ); } // ----------------------------------------------------------------------------- -BOOL SdrExchangeView::Paste(Window* /*pWin*/, ULONG /*nFormat*/) +sal_Bool SdrExchangeView::Paste(Window* /*pWin*/, sal_uIntPtr /*nFormat*/) { OSL_FAIL( "SdrExchangeView::Paste: Not supported anymore" ); - return FALSE; + return sal_False; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 9c8b0edb85..bb73444cd6 100644..100755 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -31,7 +31,7 @@ #include <accessiblecell.hxx> -#include "DescriptionGenerator.hxx" +#include "svx/DescriptionGenerator.hxx" #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index 7d2fd221c1..7d2fd221c1 100644..100755 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index ac07c84873..ac07c84873 100644..100755 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 0f3095f7a2..9eb36e7db7 100644..100755 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -400,7 +400,7 @@ void Cell::mergeContent( const CellRef& xSourceCell ) if( xSourceCell->hasText() ) { SdrOutliner& rOutliner=rTableObj.ImpGetDrawOutliner(); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); if( hasText() ) { @@ -658,7 +658,7 @@ sal_Int32 Cell::getMinimumHeight() { Outliner& rOutliner=rTableObj.ImpGetDrawOutliner(); rOutliner.SetPaperSize(aSize); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); ForceOutlinerParaObject( OUTLINERMODE_TEXTOBJECT ); if( GetOutlinerParaObject() ) @@ -1418,7 +1418,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th case XATTR_FILLHATCH: case XATTR_LINEDASH: { - NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID); + NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID); if( ( pItem == NULL ) || ( pItem->GetName().Len() == 0) ) eState = PropertyState_DEFAULT_VALUE; } @@ -1433,7 +1433,7 @@ PropertyState SAL_CALL Cell::getPropertyState( const OUString& PropertyName ) th case XATTR_LINESTART: case XATTR_FILLFLOATTRANSPARENCE: { - NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID); + NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID); if( ( pItem == NULL ) ) eState = PropertyState_DEFAULT_VALUE; } diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx index 32ba7b388f..32ba7b388f 100644..100755 --- a/svx/source/table/cell.hxx +++ b/svx/source/table/cell.hxx diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index 40351db1bd..ef762a04c5 100644..100755 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -34,8 +34,8 @@ #include "tablelayouter.hxx" #include "cell.hxx" #include "svx/svdmodel.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" // ----------------------------------------------------------------------------- diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx index 8876abe7ea..8876abe7ea 100644..100755 --- a/svx/source/table/cellcursor.hxx +++ b/svx/source/table/cellcursor.hxx diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx index 3ee05610b9..9d30be2acf 100644..100755 --- a/svx/source/table/celleditsource.cxx +++ b/svx/source/table/celleditsource.cxx @@ -56,7 +56,7 @@ #include "svx/svdpage.hxx" #include "editeng/editeng.hxx" #include "editeng/unotext.hxx" -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" //------------------------------------------------------------------------ @@ -153,7 +153,7 @@ public: void lock(); void unlock(); - BOOL IsValid() const; + sal_Bool IsValid() const; Rectangle GetVisArea(); Point LogicToPixel( const Point&, const MapMode& rMapMode ); @@ -320,7 +320,7 @@ void CellEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint ) { case HINT_OBJCHG: { - mbDataValid = FALSE; // Text muss neu geholt werden + mbDataValid = sal_False; // Text muss neu geholt werden if( HasView() ) { @@ -353,7 +353,7 @@ void CellEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint ) mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this, CellEditSourceImpl, NotifyHdl) ); // #104157# Only now we're really in edit mode - mbShapeIsEditMode = TRUE; + mbShapeIsEditMode = sal_True; Broadcast( *pSdrHint ); } @@ -367,7 +367,7 @@ void CellEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint ) Broadcast( *pSdrHint ); // #104157# We're no longer in edit mode - mbShapeIsEditMode = FALSE; + mbShapeIsEditMode = sal_False; // remove as listener - outliner might outlive ourselves if( mpView && mpView->GetTextEditOutliner() ) @@ -800,9 +800,9 @@ void CellEditSourceImpl::unlock() } } -BOOL CellEditSourceImpl::IsValid() const +sal_Bool CellEditSourceImpl::IsValid() const { - return mpView && mpWindow ? TRUE : FALSE; + return mpView && mpWindow ? sal_True : sal_False; } Rectangle CellEditSourceImpl::GetVisArea() @@ -997,7 +997,7 @@ void CellEditSource::unlock() //------------------------------------------------------------------------ -BOOL CellEditSource::IsValid() const +sal_Bool CellEditSource::IsValid() const { return mpImpl->IsValid(); } diff --git a/svx/source/table/celleditsource.hxx b/svx/source/table/celleditsource.hxx index cc9249a5b1..e9d833f98a 100644..100755 --- a/svx/source/table/celleditsource.hxx +++ b/svx/source/table/celleditsource.hxx @@ -72,7 +72,7 @@ public: void unlock(); // the SvxViewForwarder interface - virtual BOOL IsValid() const; + virtual sal_Bool IsValid() const; virtual Rectangle GetVisArea() const; virtual Point LogicToPixel( const Point&, const MapMode& ) const; virtual Point PixelToLogic( const Point&, const MapMode& ) const; diff --git a/svx/source/table/cellrange.cxx b/svx/source/table/cellrange.cxx index 4adb71dd71..4adb71dd71 100644..100755 --- a/svx/source/table/cellrange.cxx +++ b/svx/source/table/cellrange.cxx diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx index 49725fa1c1..49725fa1c1 100644..100755 --- a/svx/source/table/cellrange.hxx +++ b/svx/source/table/cellrange.hxx diff --git a/svx/source/table/celltypes.hxx b/svx/source/table/celltypes.hxx index 9f28ebbb67..9f28ebbb67 100644..100755 --- a/svx/source/table/celltypes.hxx +++ b/svx/source/table/celltypes.hxx diff --git a/svx/source/table/makefile.mk b/svx/source/table/makefile.mk deleted file mode 100644 index 1eaaef12aa..0000000000 --- a/svx/source/table/makefile.mk +++ /dev/null @@ -1,80 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PROJECTPCH4DLL=TRUE -PROJECTPCH=svxpch -PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch - -PRJNAME=svx -TARGET=table -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE; - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/propertyset.obj\ - $(SLO)$/cell.obj\ - $(SLO)$/cellrange.obj\ - $(SLO)$/cellcursor.obj\ - $(SLO)$/tablerow.obj\ - $(SLO)$/tablerows.obj\ - $(SLO)$/tablecolumn.obj\ - $(SLO)$/tablecolumns.obj\ - $(SLO)$/tablemodel.obj\ - $(SLO)$/svdotable.obj\ - $(SLO)$/viewcontactoftableobj.obj\ - $(SLO)$/tablelayouter.obj\ - $(SLO)$/tablehandles.obj\ - $(SLO)$/tablecontroller.obj\ - $(SLO)$/tableundo.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/celleditsource.obj \ - $(SLO)$/tabledesign.obj \ - $(SLO)$/accessibletableshape.obj \ - $(SLO)$/accessiblecell.obj \ - $(SLO)$/tablertfexporter.obj \ - $(SLO)$/tablertfimporter.obj - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -SRS1NAME=table -SRC1FILES= table.src - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/table/propertyset.cxx b/svx/source/table/propertyset.cxx index c3f643b05e..c3f643b05e 100644..100755 --- a/svx/source/table/propertyset.cxx +++ b/svx/source/table/propertyset.cxx diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx index 213867aaf4..213867aaf4 100644..100755 --- a/svx/source/table/propertyset.hxx +++ b/svx/source/table/propertyset.hxx diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 23127da5a6..bb2a875379 100644..100755 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -64,8 +64,8 @@ #include "svx/framelink.hxx" #include "svx/sdr/table/tabledesign.hxx" #include "svx/svdundo.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include "editeng/writingmodeitem.hxx" #include "editeng/frmdiritem.hxx" #include "svx/xflhtit.hxx" @@ -758,7 +758,7 @@ SdrTableObj::SdrTableObj(SdrModel* _pModel, const ::Rectangle& rNewRect, sal_Int void SdrTableObj::init( sal_Int32 nColumns, sal_Int32 nRows ) { - bClosedObj = TRUE; + bClosedObj = sal_True; mpImpl = new SdrTableObjImpl; mpImpl->acquire(); @@ -1401,34 +1401,34 @@ void SdrTableObj::onEditOutlinerStatusEvent( EditStatus* pEditStatus ) void SdrTableObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const { - rInfo.bResizeFreeAllowed=TRUE; - rInfo.bResizePropAllowed=TRUE; - rInfo.bRotateFreeAllowed=FALSE; - rInfo.bRotate90Allowed =FALSE; - rInfo.bMirrorFreeAllowed=FALSE; - rInfo.bMirror45Allowed =FALSE; - rInfo.bMirror90Allowed =FALSE; + rInfo.bResizeFreeAllowed=sal_True; + rInfo.bResizePropAllowed=sal_True; + rInfo.bRotateFreeAllowed=sal_False; + rInfo.bRotate90Allowed =sal_False; + rInfo.bMirrorFreeAllowed=sal_False; + rInfo.bMirror45Allowed =sal_False; + rInfo.bMirror90Allowed =sal_False; // allow transparence - rInfo.bTransparenceAllowed = TRUE; + rInfo.bTransparenceAllowed = sal_True; // gradient depends on fillstyle XFillStyle eFillStyle = ((XFillStyleItem&)(GetObjectItem(XATTR_FILLSTYLE))).GetValue(); rInfo.bGradientAllowed = (eFillStyle == XFILL_GRADIENT); - rInfo.bShearAllowed =FALSE; - rInfo.bEdgeRadiusAllowed=FALSE; - rInfo.bCanConvToPath =FALSE; - rInfo.bCanConvToPoly =FALSE; - rInfo.bCanConvToPathLineToArea=FALSE; - rInfo.bCanConvToPolyLineToArea=FALSE; - rInfo.bCanConvToContour = FALSE; + rInfo.bShearAllowed =sal_False; + rInfo.bEdgeRadiusAllowed=sal_False; + rInfo.bCanConvToPath =sal_False; + rInfo.bCanConvToPoly =sal_False; + rInfo.bCanConvToPathLineToArea=sal_False; + rInfo.bCanConvToPolyLineToArea=sal_False; + rInfo.bCanConvToContour = sal_False; } // -------------------------------------------------------------------- -UINT16 SdrTableObj::GetObjIdentifier() const +sal_uInt16 SdrTableObj::GetObjIdentifier() const { - return static_cast<UINT16>(OBJ_TABLE); + return static_cast<sal_uInt16>(OBJ_TABLE); } // -------------------------------------------------------------------- @@ -1462,7 +1462,7 @@ void SdrTableObj::SetModel(SdrModel* pNewModel) // -------------------------------------------------------------------- -void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, BOOL bLineWidth ) const +void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool bLineWidth ) const { if( mpImpl ) TakeTextRect( mpImpl->maEditPos, rOutliner, rTextRect, bNoEditText, pAnchorRect, bLineWidth ); @@ -1470,7 +1470,7 @@ void SdrTableObj::TakeTextRect( SdrOutliner& rOutliner, Rectangle& rTextRect, bo // -------------------------------------------------------------------- -void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, BOOL /*bLineWidth*/ ) const +void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rectangle& rTextRect, bool bNoEditText, Rectangle* pAnchorRect, bool /*bLineWidth*/ ) const { if( !mpImpl ) return; @@ -1485,7 +1485,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec SdrTextVertAdjust eVAdj=xCell->GetTextVerticalAdjust(); // SdrTextHorzAdjust eHAdj=xCell->GetTextHorizontalAdjust(); - ULONG nStat0=rOutliner.GetControlWord(); + sal_uIntPtr nStat0=rOutliner.GetControlWord(); Size aNullSize; nStat0 |= EE_CNTRL_AUTOPAGESIZE; rOutliner.SetControlWord(nStat0); @@ -1521,7 +1521,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec if( bHitTest ) // #i33696# take back fix #i27510# rOutliner.SetTextObj( this ); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetText(*pPara); } } @@ -1533,7 +1533,7 @@ void SdrTableObj::TakeTextRect( const CellPos& rPos, SdrOutliner& rOutliner, Rec if (pEdtOutl && !bNoEditText && pPara && mpImpl->mxActiveCell == xCell ) delete pPara; - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetControlWord(nStat0); Point aTextPos(aAnkRect.TopLeft()); @@ -1752,7 +1752,7 @@ void SdrTableObj::TakeTextEditArea( const CellPos& rPos, Size* pPaperMin, Size* // -------------------------------------------------------------------- -USHORT SdrTableObj::GetOutlinerViewAnchorMode() const +sal_uInt16 SdrTableObj::GetOutlinerViewAnchorMode() const { EVAnchorMode eRet=ANCHOR_TOP_LEFT; CellRef xCell( getActiveCell() ); @@ -1809,7 +1809,7 @@ USHORT SdrTableObj::GetOutlinerViewAnchorMode() const } */ } - return (USHORT)eRet; + return (sal_uInt16)eRet; } // -------------------------------------------------------------------- @@ -2046,14 +2046,14 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) // ForceOutlinerParaObject(); - mbInEditMode = TRUE; + mbInEditMode = sal_True; rOutl.Init( OUTLINERMODE_TEXTOBJECT ); rOutl.SetRefDevice( pModel->GetRefDevice() ); // -- bool bUpdMerk=rOutl.GetUpdateMode(); - if (bUpdMerk) rOutl.SetUpdateMode(FALSE); + if (bUpdMerk) rOutl.SetUpdateMode(sal_False); Size aPaperMin; Size aPaperMax; Rectangle aEditArea; @@ -2063,10 +2063,10 @@ sal_Bool SdrTableObj::BegTextEdit(SdrOutliner& rOutl) rOutl.SetMaxAutoPaperSize(aPaperMax); rOutl.SetPaperSize(aPaperMax); - if (bUpdMerk) rOutl.SetUpdateMode(TRUE); + if (bUpdMerk) rOutl.SetUpdateMode(sal_True); //--- - ULONG nStat=rOutl.GetControlWord(); + sal_uIntPtr nStat=rOutl.GetControlWord(); // nStat &= ~EE_CNTRL_AUTOPAGESIZE; nStat |= EE_CNTRL_AUTOPAGESIZE; nStat &=~EE_CNTRL_STRETCHING; @@ -2095,7 +2095,7 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl) OutlinerParaObject* pNewText = 0; Paragraph* p1stPara = rOutl.GetParagraph( 0 ); - UINT32 nParaAnz = rOutl.GetParagraphCount(); + sal_uInt32 nParaAnz = rOutl.GetParagraphCount(); if(p1stPara) { @@ -2125,11 +2125,11 @@ void SdrTableObj::EndTextEdit(SdrOutliner& rOutl) pEdtOutl = 0; rOutl.Clear(); - UINT32 nStat = rOutl.GetControlWord(); + sal_uInt32 nStat = rOutl.GetControlWord(); nStat &= ~EE_CNTRL_AUTOPAGESIZE; rOutl.SetControlWord(nStat); - mbInEditMode = FALSE; + mbInEditMode = sal_False; } // -------------------------------------------------------------------- @@ -2237,7 +2237,7 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(bool bHgt, bool bWdt) bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, bool bWidth) const { if((pModel == NULL) || rR.IsEmpty() || !mpImpl || !mpImpl->mxTable.is() ) - return FALSE; + return sal_False; Rectangle aRectangle( rR ); mpImpl->LayoutTable( aRectangle, !bWidth, !bHeight ); @@ -2245,11 +2245,11 @@ bool SdrTableObj::AdjustTextFrameWidthAndHeight(Rectangle& rR, bool bHeight, boo if( aRectangle != rR ) { rR = aRectangle; - return TRUE; + return sal_True; } else { - return FALSE; + return sal_False; } } @@ -2441,8 +2441,8 @@ void SdrTableObj::AddToHdlList(SdrHdlList& rHdlList) const rHdlList.AddHdl( pH = new SdrHdl(aRect.BottomCenter(),HDL_LOWER) ); pH->SetMoveOutside( true ); rHdlList.AddHdl( pH = new SdrHdl(aRect.BottomRight(),HDL_LWRGT) ); pH->SetMoveOutside( true ); - ULONG nHdlCount = rHdlList.GetHdlCount(); - for( ULONG nHdl = 0; nHdl < nHdlCount; nHdl++ ) + sal_uIntPtr nHdlCount = rHdlList.GetHdlCount(); + for( sal_uIntPtr nHdl = 0; nHdl < nHdlCount; nHdl++ ) rHdlList.GetHdl(nHdl)->SetObj((SdrObject*)this); } @@ -2621,7 +2621,7 @@ bool SdrTableObj::MovCreate(SdrDragStat& rStat) rStat.SetActionRect(aRect1); aRect=aRect1; // fuer ObjName SetBoundRectDirty(); - bSnapRectDirty=TRUE; + bSnapRectDirty=sal_True; return true; } diff --git a/svx/source/table/table.src b/svx/source/table/table.src index 4a696f9e0c..4a696f9e0c 100644..100755 --- a/svx/source/table/table.src +++ b/svx/source/table/table.src diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index 62258ee8af..62258ee8af 100644..100755 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx index 37e041101b..37e041101b 100644..100755 --- a/svx/source/table/tablecolumn.hxx +++ b/svx/source/table/tablecolumn.hxx diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx index f05492061e..f05492061e 100644..100755 --- a/svx/source/table/tablecolumns.cxx +++ b/svx/source/table/tablecolumns.cxx diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx index 6fd9f21f72..6fd9f21f72 100644..100755 --- a/svx/source/table/tablecolumns.hxx +++ b/svx/source/table/tablecolumns.hxx diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 911d9beb8b..355072bcfe 100644..100755 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -60,15 +60,15 @@ #include "svx/sdrpagewindow.hxx" #include <svx/selectioncontroller.hxx> #include <svx/svdmodel.hxx> -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" #include <svx/svxdlg.hxx> #include <editeng/boxitem.hxx> #include "cell.hxx" #include <editeng/borderline.hxx> #include <editeng/colritem.hxx> #include "editeng/bolnitem.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include "svx/svdpage.hxx" #include "tableundo.hxx" #include "tablelayouter.hxx" @@ -401,7 +401,7 @@ void SvxTableController::GetState( SfxItemSet& rSet ) // Iterate over all requested items in the set. SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); while (nWhich) { switch (nWhich) @@ -419,7 +419,7 @@ void SvxTableController::GetState( SfxItemSet& rSet ) if( !pSet ) { pSet = new SfxItemSet( mxTableObj->GetModel()->GetItemPool() ); - MergeAttrFromSelectedCells(*pSet, FALSE); + MergeAttrFromSelectedCells(*pSet, sal_False); } SdrTextVertAdjust eAdj = SDRTEXTVERTADJUST_BLOCK; @@ -505,11 +505,11 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs ) if( pArgs ) { const SfxPoolItem* pItem = 0; - pArgs->GetItemState(nSId, FALSE, &pItem); + pArgs->GetItemState(nSId, sal_False, &pItem); if (pItem) { nCount = ((const SfxInt16Item* )pItem)->GetValue(); - if(SFX_ITEM_SET == pArgs->GetItemState(SID_TABLE_PARAM_INSERT_AFTER, TRUE, &pItem)) + if(SFX_ITEM_SET == pArgs->GetItemState(SID_TABLE_PARAM_INSERT_AFTER, sal_True, &pItem)) bInsertAfter = ((const SfxBoolItem* )pItem)->GetValue(); } } @@ -723,14 +723,14 @@ void SvxTableController::onFormatTable( SfxRequest& rReq ) if( !pArgs && pTableObj->GetModel() ) { SfxItemSet aNewAttr( pTableObj->GetModel()->GetItemPool() ); - MergeAttrFromSelectedCells(aNewAttr, FALSE); + MergeAttrFromSelectedCells(aNewAttr, sal_False); // merge drawing layer text distance items into SvxBoxItem used by the dialog SvxBoxItem aBoxItem( static_cast< const SvxBoxItem& >( aNewAttr.Get( SDRATTR_TABLE_BORDER ) ) ); - aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextLeftDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LEFTDIST))).GetValue()), BOX_LINE_LEFT ); - aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextRightDistItem&)(aNewAttr.Get(SDRATTR_TEXT_RIGHTDIST))).GetValue()), BOX_LINE_RIGHT ); - aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextUpperDistItem&)(aNewAttr.Get(SDRATTR_TEXT_UPPERDIST))).GetValue()), BOX_LINE_TOP ); - aBoxItem.SetDistance( sal::static_int_cast< USHORT >( ((SdrTextLowerDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LOWERDIST))).GetValue()), BOX_LINE_BOTTOM ); + aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextLeftDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LEFTDIST))).GetValue()), BOX_LINE_LEFT ); + aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextRightDistItem&)(aNewAttr.Get(SDRATTR_TEXT_RIGHTDIST))).GetValue()), BOX_LINE_RIGHT ); + aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextUpperDistItem&)(aNewAttr.Get(SDRATTR_TEXT_UPPERDIST))).GetValue()), BOX_LINE_TOP ); + aBoxItem.SetDistance( sal::static_int_cast< sal_uInt16 >( ((SdrTextLowerDistItem&)(aNewAttr.Get(SDRATTR_TEXT_LOWERDIST))).GetValue()), BOX_LINE_BOTTOM ); aNewAttr.Put( aBoxItem ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -753,7 +753,7 @@ void SvxTableController::onFormatTable( SfxRequest& rReq ) if( aNewBoxItem.GetDistance( BOX_LINE_BOTTOM ) != aBoxItem.GetDistance( BOX_LINE_BOTTOM ) ) aNewSet.Put(SdrTextLowerDistItem( aNewBoxItem.GetDistance( BOX_LINE_BOTTOM ) ) ); - SetAttrToSelectedCells(aNewSet, FALSE); + SetAttrToSelectedCells(aNewSet, sal_False); } UpdateTableShape(); } @@ -844,7 +844,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0; - if( !pTableObj || !pModel || !pArgs || (SFX_ITEM_SET != pArgs->GetItemState(SID_TABLE_STYLE, FALSE)) ) + if( !pTableObj || !pModel || !pArgs || (SFX_ITEM_SET != pArgs->GetItemState(SID_TABLE_STYLE, sal_False)) ) return; const SfxStringItem* pArg = dynamic_cast< const SfxStringItem* >( &pArgs->Get( SID_TABLE_STYLE ) ); @@ -883,7 +883,7 @@ void SvxTableController::SetTableStyle( const SfxItemSet* pArgs ) bool bChanges = false; const SfxItemSet& rStyleAttribs = xCell->GetStyleSheet()->GetItemSet(); - for ( USHORT nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ ) + for ( sal_uInt16 nWhich = SDRATTR_START; nWhich <= SDRATTR_TABLE_LAST; nWhich++ ) { if( (rStyleAttribs.GetItemState( nWhich ) == SFX_ITEM_ON) && (aSet.GetItemState( nWhich ) == SFX_ITEM_ON) ) { @@ -931,22 +931,22 @@ void SvxTableController::SetTableStyleSettings( const SfxItemSet* pArgs ) const SfxPoolItem *pPoolItem=NULL; - if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTROWSTYLE, FALSE,&pPoolItem)) ) + if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTROWSTYLE, sal_False,&pPoolItem)) ) aSettings.mbUseFirstRow = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue(); - if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTROWSTYLE, FALSE,&pPoolItem)) ) + if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTROWSTYLE, sal_False,&pPoolItem)) ) aSettings.mbUseLastRow = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue(); - if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGROWSTYLE, FALSE,&pPoolItem)) ) + if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGROWSTYLE, sal_False,&pPoolItem)) ) aSettings.mbUseRowBanding = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue(); - if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTCOLUMNSTYLE, FALSE,&pPoolItem)) ) + if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEFIRSTCOLUMNSTYLE, sal_False,&pPoolItem)) ) aSettings.mbUseFirstColumn = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue(); - if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTCOLUMNSTYLE, FALSE,&pPoolItem)) ) + if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USELASTCOLUMNSTYLE, sal_False,&pPoolItem)) ) aSettings.mbUseLastColumn = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue(); - if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGCOLUMNSTYLE, FALSE,&pPoolItem)) ) + if( (SFX_ITEM_SET == pArgs->GetItemState(ID_VAL_USEBANDINGCOLUMNSTYLE, sal_False,&pPoolItem)) ) aSettings.mbUseColumnBanding = static_cast< const SfxBoolItem* >(pPoolItem)->GetValue(); if( aSettings == pTableObj->getTableStyleSettings() ) @@ -1678,7 +1678,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const if(!pTableObj->GetOutlinerParaObject() && mpView->GetTextEditOutliner()) { ::Outliner* pOutl = mpView->GetTextEditOutliner(); - ULONG nParaAnz = pOutl->GetParagraphCount(); + sal_uIntPtr nParaAnz = pOutl->GetParagraphCount(); Paragraph* p1stPara = pOutl->GetParagraph( 0 ); if(nParaAnz==1 && p1stPara) @@ -1704,7 +1704,7 @@ void SvxTableController::EditCell( const CellPos& rPos, ::Window* pWindow, const // create new outliner, owner will be the SdrObjEditView SdrOutliner* pOutl = SdrMakeOutliner( OUTLINERMODE_OUTLINEOBJECT, mpModel ); if( pTableObj->IsVerticalWriting() ) - pOutl->SetVertical( TRUE ); + pOutl->SetVertical( sal_True ); if(mpView->SdrBeginTextEdit(pTableObj, pPV, pWindow, sal_True, pOutl)) { @@ -2021,15 +2021,15 @@ void SvxTableController::MergeAttrFromSelectedCells(SfxItemSet& rAttr, bool bOnl { if(!bOnlyHardAttr) { - if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, FALSE)) + if(SFX_ITEM_DONTCARE == rSet.GetItemState(nWhich, sal_False)) rAttr.InvalidateItem(nWhich); else - rAttr.MergeValue(rSet.Get(nWhich), TRUE); + rAttr.MergeValue(rSet.Get(nWhich), sal_True); } - else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, FALSE)) + else if(SFX_ITEM_SET == rSet.GetItemState(nWhich, sal_False)) { const SfxPoolItem& rItem = rSet.Get(nWhich); - rAttr.MergeValue(rItem, TRUE); + rAttr.MergeValue(rItem, sal_True); } nWhich = aIter.NextWhich(); @@ -2058,7 +2058,7 @@ const sal_uInt16 CELL_LOWER = 0x0080; // -------------------------------------------------------------------- -static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine* pNew, USHORT nLine ) +static void ImplSetLinePreserveColor( SvxBoxItem& rNewFrame, const SvxBorderLine* pNew, sal_uInt16 nLine ) { if( pNew ) { @@ -2127,14 +2127,14 @@ static void ImplApplyBoxItem( sal_uInt16 nCellFlags, const SvxBoxItem* pBoxItem, // apply distance to borders if( pBoxInfoItem->IsValid( VALID_DISTANCE ) ) - for( USHORT nLine = 0; nLine < 4; ++nLine ) + for( sal_uInt16 nLine = 0; nLine < 4; ++nLine ) rNewFrame.SetDistance( pBoxItem->GetDistance( nLine ), nLine ); } } // -------------------------------------------------------------------- -static void ImplSetLineColor( SvxBoxItem& rNewFrame, USHORT nLine, const Color& rColor ) +static void ImplSetLineColor( SvxBoxItem& rNewFrame, sal_uInt16 nLine, const Color& rColor ) { const SvxBorderLine* pSourceLine = rNewFrame.GetLine( nLine ); if( pSourceLine ) @@ -2221,19 +2221,19 @@ void SvxTableController::ApplyBorderAttr( const SfxItemSet& rAttr ) if( nRowCount && nColCount ) { const SvxBoxItem* pBoxItem = 0; - if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER, FALSE) ) + if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER, sal_False) ) pBoxItem = dynamic_cast< const SvxBoxItem* >( &rAttr.Get( SDRATTR_TABLE_BORDER ) ); const SvxBoxInfoItem* pBoxInfoItem = 0; - if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER_INNER, FALSE) ) + if(SFX_ITEM_SET == rAttr.GetItemState(SDRATTR_TABLE_BORDER_INNER, sal_False) ) pBoxInfoItem = dynamic_cast< const SvxBoxInfoItem* >( &rAttr.Get( SDRATTR_TABLE_BORDER_INNER ) ); const SvxColorItem* pLineColorItem = 0; - if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINECOLOR, FALSE) ) + if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINECOLOR, sal_False) ) pLineColorItem = dynamic_cast< const SvxColorItem* >( &rAttr.Get( SID_FRAME_LINECOLOR ) ); const SvxBorderLine* pBorderLineItem = 0; - if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINESTYLE, FALSE) ) + if(SFX_ITEM_SET == rAttr.GetItemState(SID_FRAME_LINESTYLE, sal_False) ) pBorderLineItem = ((const SvxLineItem&)rAttr.Get( SID_FRAME_LINESTYLE )).GetLine(); if( pBoxInfoItem && !pBoxItem ) @@ -2328,7 +2328,7 @@ void SvxTableController::SetAttrToSelectedCells(const SfxItemSet& rAttr, bool bR getSelectedCells( aStart, aEnd ); SfxItemSet aAttr(*rAttr.GetPool(), rAttr.GetRanges()); - aAttr.Put(rAttr, TRUE); + aAttr.Put(rAttr, sal_True); const bool bFrame = (rAttr.GetItemState( SDRATTR_TABLE_BORDER ) == SFX_ITEM_SET) || (rAttr.GetItemState( SDRATTR_TABLE_BORDER_INNER ) == SFX_ITEM_SET); @@ -2382,8 +2382,8 @@ bool SvxTableController::GetAttributes(SfxItemSet& rTargetSet, bool bOnlyHardAtt if(pTextEditOutlinerView) { // FALSE= InvalidItems nicht al Default, sondern als "Loecher" betrachten - rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), FALSE); - rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), FALSE ); + rTargetSet.Put(pTextEditOutlinerView->GetAttribs(), sal_False); + rTargetSet.Put( SvxScriptTypeItem( pTextEditOutlinerView->GetSelectedScriptType() ), sal_False ); } } @@ -2535,7 +2535,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo getSelectedCells( aStart, aEnd ); SfxItemSet aAttr(*rFormatSet.GetPool(), rFormatSet.GetRanges()); - aAttr.Put(rFormatSet, TRUE); + aAttr.Put(rFormatSet, sal_True); const bool bFrame = (rFormatSet.GetItemState( SDRATTR_TABLE_BORDER ) == SFX_ITEM_SET) || (rFormatSet.GetItemState( SDRATTR_TABLE_BORDER_INNER ) == SFX_ITEM_SET); @@ -2545,7 +2545,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo aAttr.ClearItem( SDRATTR_TABLE_BORDER_INNER ); } - const USHORT* pRanges = rFormatSet.GetRanges(); + const sal_uInt16* pRanges = rFormatSet.GetRanges(); bool bTextOnly = true; while( *pRanges ) diff --git a/svx/source/table/tablecontroller.hxx b/svx/source/table/tablecontroller.hxx index b0e199e899..e659b551a5 100644..100755 --- a/svx/source/table/tablecontroller.hxx +++ b/svx/source/table/tablecontroller.hxx @@ -162,7 +162,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > mxModifyListener; - ULONG mnUpdateEvent; + sal_uLong mnUpdateEvent; }; } } diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx index 4eb084ee6e..4eb084ee6e 100644..100755 --- a/svx/source/table/tabledesign.cxx +++ b/svx/source/table/tabledesign.cxx diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 86a417f653..df548e9548 100644..100755 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -43,7 +43,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/svdmrkv.hxx> #include <svx/svdpagv.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> diff --git a/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx index b243e1d82a..b243e1d82a 100644..100755 --- a/svx/source/table/tablehandles.hxx +++ b/svx/source/table/tablehandles.hxx diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 0c2e34e7fc..8334a46961 100644..100755 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -45,8 +45,8 @@ #include "editeng/borderline.hxx" #include "editeng/boxitem.hxx" #include "svx/svdmodel.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" using ::rtl::OUString; using ::com::sun::star::awt::XLayoutConstrains; @@ -926,8 +926,8 @@ bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine if (!pOther || (pOther == &gEmptyBorder)) return true; - USHORT nThisSize = pThis->GetOutWidth() + pThis->GetDistance() + pThis->GetInWidth(); - USHORT nOtherSize = pOther->GetOutWidth() + pOther->GetDistance() + pOther->GetInWidth(); + sal_uInt16 nThisSize = pThis->GetOutWidth() + pThis->GetDistance() + pThis->GetInWidth(); + sal_uInt16 nOtherSize = pOther->GetOutWidth() + pOther->GetDistance() + pOther->GetInWidth(); if (nThisSize > nOtherSize) return true; diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx index 1bbe0c474d..1bbe0c474d 100644..100755 --- a/svx/source/table/tablelayouter.hxx +++ b/svx/source/table/tablelayouter.hxx diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 66e997af1b..b08cd40f40 100644..100755 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -47,8 +47,8 @@ #include "tableundo.hxx" #include "svx/svdotable.hxx" #include "svx/svdmodel.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" using ::rtl::OUString; using namespace ::osl; diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx index 518bf1caba..518bf1caba 100644..100755 --- a/svx/source/table/tablemodel.hxx +++ b/svx/source/table/tablemodel.hxx diff --git a/svx/source/table/tablerow.cxx b/svx/source/table/tablerow.cxx index 16764e2bc1..16764e2bc1 100644..100755 --- a/svx/source/table/tablerow.cxx +++ b/svx/source/table/tablerow.cxx diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index 9d7e506101..9d7e506101 100644..100755 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx diff --git a/svx/source/table/tablerows.cxx b/svx/source/table/tablerows.cxx index ed04a5d81c..ed04a5d81c 100644..100755 --- a/svx/source/table/tablerows.cxx +++ b/svx/source/table/tablerows.cxx diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx index e8e82281a2..e8e82281a2 100644..100755 --- a/svx/source/table/tablerows.hxx +++ b/svx/source/table/tablerows.hxx diff --git a/svx/source/table/tablertfexporter.cxx b/svx/source/table/tablertfexporter.cxx index ac9006433f..ec26cb06be 100644..100755 --- a/svx/source/table/tablertfexporter.cxx +++ b/svx/source/table/tablertfexporter.cxx @@ -64,7 +64,7 @@ class SdrTableRtfExporter { public: SdrTableRtfExporter( SvStream& rStrmP, SdrTableObj& rObj ); - ULONG Write(); + sal_uLong Write(); void WriteRow( const Reference< XPropertySet >& xRowSet, sal_Int32 nRow, const std::vector< sal_Int32 >& aColumnStart ); void WriteCell( sal_Int32 nCol, sal_Int32 nRow ); @@ -95,7 +95,7 @@ long HundMMToTwips( long nIn ) return nRet; } -ULONG SdrTableRtfExporter::Write() +sal_uLong SdrTableRtfExporter::Write() { mrStrm << '{' << OOO_STRING_SVTOOLS_RTF_RTF; mrStrm << OOO_STRING_SVTOOLS_RTF_ANSI << RTFOutFuncs::sNewLine; @@ -185,7 +185,7 @@ void SdrTableRtfExporter::WriteRow( const Reference< XPropertySet >& xRowSet, sa } mrStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << RTFOutFuncs::sNewLine; - ULONG nStrmPos = mrStrm.Tell(); + sal_uLong nStrmPos = mrStrm.Tell(); for( sal_Int32 nCol = 0; nCol < nColCount; nCol++ ) { WriteCell( nCol, nRow ); @@ -232,7 +232,7 @@ void SdrTableRtfExporter::WriteCell( sal_Int32 nCol, sal_Int32 nRow ) } bool bResetPar, bResetAttr; - bResetPar = bResetAttr = FALSE; + bResetPar = bResetAttr = sal_False; SdrTextHorzAdjust eHAdj = xCell->GetTextHorizontalAdjust(); diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index ccd258bbe4..f8a0fa1fd9 100644..100755 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -63,7 +63,7 @@ struct RTFCellDefault { SfxItemSet maItemSet; sal_Int32 mnCol; - USHORT mnTwips; // right border of the cell + sal_uInt16 mnTwips; // right border of the cell sal_Int32 mnColSpan; // MergeCell if >1, merged cells if 0 RTFCellDefault( SfxItemPool* pPool ) : maItemSet( *pPool ), mnCol(0), mnTwips(0 ), mnColSpan(1) {} @@ -120,7 +120,7 @@ private: sal_Int32 mnLastWidth; bool mbNewDef; - USHORT mnStartPara; + sal_uInt16 mnStartPara; sal_Int32 mnColCnt; sal_Int32 mnRowCnt; @@ -152,7 +152,7 @@ SdrTableRTFParser::SdrTableRTFParser( SdrTableObj& rTableObj ) , mpDefMerge( 0 ) , mxTable( rTableObj.getTable() ) { - mpOutliner->SetUpdateMode(TRUE); + mpOutliner->SetUpdateMode(sal_True); mpOutliner->SetStyleSheet( 0, mrTableObj.GetStyleSheet() ); mpInsDefault = new RTFCellDefault( &mrItemPool ); } @@ -283,16 +283,16 @@ void SdrTableRTFParser::FillTable() if( xCell.is() && xCellInfo.get() ) { const SfxPoolItem *pPoolItem = 0; - if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,FALSE,&pPoolItem)==SFX_ITEM_SET) + if( xCellInfo->maItemSet.GetItemState(SDRATTR_TABLE_BORDER,sal_False,&pPoolItem)==SFX_ITEM_SET) xCell->SetMergedItem( *pPoolItem ); String sDebug = mpOutliner->GetText( mpOutliner->GetParagraph( xCellInfo->mnStartPara ), xCellInfo->mnParaCount ); - OutlinerParaObject* pTextObject = mpOutliner->CreateParaObject( (USHORT)xCellInfo->mnStartPara, (USHORT)xCellInfo->mnParaCount ); + OutlinerParaObject* pTextObject = mpOutliner->CreateParaObject( (sal_uInt16)xCellInfo->mnStartPara, (sal_uInt16)xCellInfo->mnParaCount ); if( pTextObject ) { SdrOutliner& rOutliner=mrTableObj.ImpGetDrawOutliner(); - rOutliner.SetUpdateMode(TRUE); + rOutliner.SetUpdateMode(sal_True); rOutliner.SetText( *pTextObject ); mrTableObj.NbcSetOutlinerParaObjectForText( rOutliner.CreateParaObject(), xCell.get() ); delete pTextObject; @@ -317,7 +317,7 @@ void SdrTableRTFParser::NewCellRow() { if( mbNewDef ) { - mbNewDef = FALSE; + mbNewDef = sal_False; maRows.push_back( RTFColumnVectorPtr( new RTFColumnVector() ) ); } @@ -374,7 +374,7 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo ) break; case RTF_CELLX: // closes cell default { - mbNewDef = TRUE; + mbNewDef = sal_True; mpInsDefault->mnCol = mnColCnt; maDefaultList.push_back( boost::shared_ptr< RTFCellDefault >( mpInsDefault ) ); @@ -428,10 +428,10 @@ void SdrTableRTFParser::ProcToken( ImportInfo* pInfo ) switch ( pInfo->nToken & ~(0xff | RTF_TABLEDEF) ) { case RTF_SHADINGDEF: -// ((SvxRTFParser*)pInfo->pParser)->ReadBackgroundAttr(pInfo->nToken, mpInsDefault->maItemSet, TRUE ); +// ((SvxRTFParser*)pInfo->pParser)->ReadBackgroundAttr(pInfo->nToken, mpInsDefault->maItemSet, sal_True ); break; case RTF_BRDRDEF: - ((SvxRTFParser*)pInfo->pParser)->ReadBorderAttr(pInfo->nToken, mpInsDefault->maItemSet, TRUE ); + ((SvxRTFParser*)pInfo->pParser)->ReadBorderAttr(pInfo->nToken, mpInsDefault->maItemSet, sal_True ); break; } } diff --git a/svx/source/table/tableundo.cxx b/svx/source/table/tableundo.cxx index 67b36aaf0b..56b4a8bcac 100644..100755 --- a/svx/source/table/tableundo.cxx +++ b/svx/source/table/tableundo.cxx @@ -108,16 +108,16 @@ void CellUndo::Redo() } } -BOOL CellUndo::Merge( SfxUndoAction *pNextAction ) +sal_Bool CellUndo::Merge( SfxUndoAction *pNextAction ) { CellUndo* pNext = dynamic_cast< CellUndo* >( pNextAction ); if( pNext && pNext->mxCell.get() == mxCell.get() ) { - return TRUE; + return sal_True; } else { - return FALSE; + return sal_False; } } @@ -414,7 +414,7 @@ void TableColumnUndo::Redo() // ----------------------------------------------------------------------------- -BOOL TableColumnUndo::Merge( SfxUndoAction *pNextAction ) +sal_Bool TableColumnUndo::Merge( SfxUndoAction *pNextAction ) { TableColumnUndo* pNext = dynamic_cast< TableColumnUndo* >( pNextAction ); return pNext && pNext->mxCol == mxCol; @@ -483,7 +483,7 @@ void TableRowUndo::Redo() // ----------------------------------------------------------------------------- -BOOL TableRowUndo::Merge( SfxUndoAction *pNextAction ) +sal_Bool TableRowUndo::Merge( SfxUndoAction *pNextAction ) { TableRowUndo* pNext = dynamic_cast< TableRowUndo* >( pNextAction ); return pNext && pNext->mxRow == mxRow; diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx index 185a816c64..7223e4363f 100644..100755 --- a/svx/source/table/tableundo.hxx +++ b/svx/source/table/tableundo.hxx @@ -56,7 +56,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual BOOL Merge( SfxUndoAction *pNextAction ); + virtual sal_Bool Merge( SfxUndoAction *pNextAction ); void dispose(); virtual void ObjectInDestruction(const SdrObject& rObject); @@ -173,7 +173,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual BOOL Merge( SfxUndoAction *pNextAction ); + virtual sal_Bool Merge( SfxUndoAction *pNextAction ); private: struct Data @@ -205,7 +205,7 @@ public: virtual void Undo(); virtual void Redo(); - virtual BOOL Merge( SfxUndoAction *pNextAction ); + virtual sal_Bool Merge( SfxUndoAction *pNextAction ); private: struct Data diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx index b2e24ed4e8..b2e24ed4e8 100644..100755 --- a/svx/source/table/viewcontactoftableobj.cxx +++ b/svx/source/table/viewcontactoftableobj.cxx diff --git a/svx/source/table/viewcontactoftableobj.hxx b/svx/source/table/viewcontactoftableobj.hxx index 3a7b5e4c83..3a7b5e4c83 100644..100755 --- a/svx/source/table/viewcontactoftableobj.hxx +++ b/svx/source/table/viewcontactoftableobj.hxx diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index fc49d0577e..1e027b4ceb 100644..100755 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -19,7 +19,7 @@ class SvxColorWindow_Impl : public SfxPopupWindow using FloatingWindow::StateChanged; private: - const USHORT theSlotId; + const sal_uInt16 theSlotId; ValueSet aColorSet; rtl::OUString maCommand; const Color mLastColor; @@ -30,11 +30,11 @@ private: protected: virtual void Resize(); - virtual BOOL Close(); + virtual sal_Bool Close(); public: SvxColorWindow_Impl( const rtl::OUString& rCommand, - USHORT nSlotId, + sal_uInt16 nSlotId, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, const String& rWndTitle, Window* pParentWindow, @@ -43,7 +43,7 @@ public: void StartSelection(); virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindow* Clone() const; }; diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index e02741dec9..4d5bdb6f8a 100644..100755 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -39,12 +39,12 @@ #include <svx/colrctrl.hxx> #include <svx/svdview.hxx> -#include "drawitem.hxx" +#include "svx/drawitem.hxx" #include <editeng/colritem.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> -#include "xexch.hxx" +#include "svx/xexch.hxx" #include <vcl/svapp.hxx> SFX_IMPL_DOCKINGWINDOW( SvxColorChildWindow, SID_COLOR_CONTROL ) @@ -110,8 +110,9 @@ sal_Bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*, SvxColorValueSet::SvxColorValueSet( Window* _pParent, WinBits nWinStyle ) : ValueSet( _pParent, nWinStyle ), DragSourceHelper( this ), - bLeft (TRUE) + bLeft (sal_True) { + SetAccessibleName(String( SVX_RES( STR_COLORTABLE ) ) ); } /************************************************************************* @@ -123,8 +124,9 @@ SvxColorValueSet::SvxColorValueSet( Window* _pParent, WinBits nWinStyle ) : SvxColorValueSet::SvxColorValueSet( Window* _pParent, const ResId& rResId ) : ValueSet( _pParent, rResId ), DragSourceHelper( this ), - bLeft (TRUE) + bLeft (sal_True) { + SetAccessibleName(String( SVX_RES( STR_COLORTABLE ) )); } /************************************************************************* @@ -138,12 +140,12 @@ void SvxColorValueSet::MouseButtonDown( const MouseEvent& rMEvt ) // Fuer Mac noch anders handlen ! if( rMEvt.IsLeft() ) { - bLeft = TRUE; + bLeft = sal_True; ValueSet::MouseButtonDown( rMEvt ); } else { - bLeft = FALSE; + bLeft = sal_False; MouseEvent aMEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(), rMEvt.GetMode(), @@ -166,12 +168,12 @@ void SvxColorValueSet::MouseButtonUp( const MouseEvent& rMEvt ) // Fuer Mac noch anders handlen ! if( rMEvt.IsLeft() ) { - bLeft = TRUE; + bLeft = sal_True; ValueSet::MouseButtonUp( rMEvt ); } else { - bLeft = FALSE; + bLeft = sal_False; MouseEvent aMEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(), rMEvt.GetMode(), @@ -214,7 +216,7 @@ void SvxColorValueSet::StartDrag( sal_Int8 , const Point& ) void SvxColorValueSet::DoDrag() { SfxObjectShell* pDocSh = SfxObjectShell::Current(); - USHORT nItemId = GetItemId( aDragPosPixel ); + sal_uInt16 nItemId = GetItemId( aDragPosPixel ); if( pDocSh && nItemId ) { @@ -251,7 +253,7 @@ IMPL_STATIC_LINK(SvxColorValueSet, ExecDragHdl, void*, EMPTYARG) \************************************************************************/ SvxColorChildWindow::SvxColorChildWindow( Window* _pParent, - USHORT nId, + sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : SfxChildWindow( _pParent, nId ) @@ -332,7 +334,7 @@ SvxColorDockingWindow::SvxColorDockingWindow SetSize(); aColorSet.Show(); - StartListening( *_pBindings, TRUE ); + StartListening( *_pBindings, sal_True ); } @@ -389,7 +391,7 @@ void SvxColorDockingWindow::FillValueSet() Bitmap aBmp( aVD.GetBitmap( Point(), aColorSize ) ); - aColorSet.InsertItem( (USHORT)1, Image(aBmp), SVX_RESSTR( RID_SVXSTR_INVISIBLE ) ); + aColorSet.InsertItem( (sal_uInt16)1, Image(aBmp), SVX_RESSTR( RID_SVXSTR_INVISIBLE ) ); XColorEntry* pEntry; nCount = pColorTable->Count(); @@ -397,7 +399,7 @@ void SvxColorDockingWindow::FillValueSet() for( long i = 0; i < nCount; i++ ) { pEntry = pColorTable->GetColor( i ); - aColorSet.InsertItem( (USHORT)i+2, + aColorSet.InsertItem( (sal_uInt16)i+2, pEntry->GetColor(), pEntry->GetName() ); } } @@ -417,8 +419,8 @@ void SvxColorDockingWindow::SetSize() aSize.Height() -= 4; // Zeilen und Spalten berechnen - nCols = (USHORT) ( aSize.Width() / aItemSize.Width() ); - nLines = (USHORT) ( (float) aSize.Height() / (float) aItemSize.Height() /*+ 0.35*/ ); + nCols = (sal_uInt16) ( aSize.Width() / aItemSize.Width() ); + nLines = (sal_uInt16) ( (float) aSize.Height() / (float) aItemSize.Height() /*+ 0.35*/ ); if( nLines == 0 ) nLines++; @@ -435,7 +437,7 @@ void SvxColorDockingWindow::SetSize() if( nScrollWidth > 0 ) { // Spalten mit ScrollBar berechnen - nCols = (USHORT) ( ( aSize.Width() - nScrollWidth ) / aItemSize.Width() ); + nCols = (sal_uInt16) ( ( aSize.Width() - nScrollWidth ) / aItemSize.Width() ); } aColorSet.SetColCount( nCols ); @@ -456,13 +458,13 @@ void SvxColorDockingWindow::SetSize() |* \************************************************************************/ -BOOL SvxColorDockingWindow::Close() +sal_Bool SvxColorDockingWindow::Close() { - SfxBoolItem aItem( SID_COLOR_CONTROL, FALSE ); + SfxBoolItem aItem( SID_COLOR_CONTROL, sal_False ); GetBindings().GetDispatcher()->Execute( SID_COLOR_CONTROL, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L ); SfxDockingWindow::Close(); - return( TRUE ); + return( sal_True ); } /************************************************************************* @@ -474,7 +476,7 @@ BOOL SvxColorDockingWindow::Close() IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG ) { SfxDispatcher* pDispatcher = GetBindings().GetDispatcher(); - USHORT nPos = aColorSet.GetSelectItemId(); + sal_uInt16 nPos = aColorSet.GetSelectItemId(); Color aColor( aColorSet.GetItemColor( nPos ) ); String aStr( aColorSet.GetItemText( nPos ) ); @@ -489,7 +491,7 @@ IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG ) } else { - BOOL bDone = FALSE; + sal_Bool bDone = sal_False; // Wenn wir eine DrawView haben und uns im TextEdit-Modus befinden, // wird nicht die Flaechen-, sondern die Textfarbe zugewiesen @@ -502,7 +504,7 @@ IMPL_LINK( SvxColorDockingWindow, SelectHdl, void *, EMPTYARG ) SvxColorItem aTextColorItem( aColor, SID_ATTR_CHAR_COLOR ); pDispatcher->Execute( SID_ATTR_CHAR_COLOR, SFX_CALLMODE_RECORD, &aTextColorItem, 0L ); - bDone = TRUE; + bDone = sal_True; } } if ( !bDone ) @@ -580,8 +582,8 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize ) rNewSize.Height() -= 4; // Spalten und Reihen ermitteln - nCols = (USHORT) ( (float) rNewSize.Width() / (float) aItemSize.Width() + 0.5 ); - nLines = (USHORT) ( (float) rNewSize.Height() / (float) aItemSize.Height() + 0.5 ); + nCols = (sal_uInt16) ( (float) rNewSize.Width() / (float) aItemSize.Width() + 0.5 ); + nLines = (sal_uInt16) ( (float) rNewSize.Height() / (float) aItemSize.Height() + 0.5 ); if( nLines == 0 ) nLines = 1; @@ -598,7 +600,7 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize ) if( nScrollWidth > 0 ) { // Spalten mit ScrollBar berechnen - nCols = (USHORT) ( ( ( (float) rNewSize.Width() - (float) nScrollWidth ) ) + nCols = (sal_uInt16) ( ( ( (float) rNewSize.Width() - (float) nScrollWidth ) ) / (float) aItemSize.Width() + 0.5 ); } if( nCols <= 1 ) @@ -609,7 +611,7 @@ void SvxColorDockingWindow::Resizing( Size& rNewSize ) if( nCount % nCols ) nMaxLines++; - nLines = sal::static_int_cast< USHORT >( + nLines = sal::static_int_cast< sal_uInt16 >( std::min< long >( nLines, nMaxLines ) ); // Groesse des Windows setzen @@ -646,7 +648,7 @@ long SvxColorDockingWindow::Notify( NotifyEvent& rNEvt ) if( ( rNEvt.GetType() == EVENT_KEYINPUT ) ) { KeyEvent aKeyEvt = *rNEvt.GetKeyEvent(); - USHORT nKeyCode = aKeyEvt.GetKeyCode().GetCode(); + sal_uInt16 nKeyCode = aKeyEvt.GetKeyCode().GetCode(); switch( nKeyCode ) { case KEY_ESCAPE: diff --git a/svx/source/tbxctrls/colrctrl.src b/svx/source/tbxctrls/colrctrl.src index 151261ee15..0854c3f469 100644..100755 --- a/svx/source/tbxctrls/colrctrl.src +++ b/svx/source/tbxctrls/colrctrl.src @@ -52,32 +52,11 @@ DockingWindow RID_SVXCTRL_COLOR Border = FALSE ; }; }; - // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - - +// IAccessibility2 implementation 2009. ------ +String STR_COLORTABLE +{ + Text [ en-US ] = "Color Palette" ; +}; +// ------ IAccessibility2 implementation 2009. diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index cca72a16d9..30ac28e8aa 100644..100755 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -38,6 +38,7 @@ #include <osl/mutex.hxx> +#include <svtools/toolbarmenu.hxx> #include <vcl/toolbox.hxx> #include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> @@ -63,7 +64,7 @@ //////////// using ::rtl::OUString; -using ::svtools::ToolbarMenu; +//using ::svtools::ToolbarMenu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -97,7 +98,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( { SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); - USHORT i; + sal_uInt16 i; for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) { maImgDirection[i] = Image( SVX_RES( IMG_DIRECTION + i ) ); @@ -109,7 +110,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) ); mpDirectionSet->SetColCount( 3 ); - mpDirectionSet->EnableFullItemMode( FALSE ); + mpDirectionSet->EnableFullItemMode( sal_False ); for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) { @@ -138,7 +139,7 @@ void ExtrusionDirectionWindow::DataChanged( const DataChangedEvent& rDCEvt ) if( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) { - for( USHORT i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) + for( sal_uInt16 i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) { mpDirectionSet->SetItemImage( i+1, maImgDirection[ i ] ); } @@ -154,7 +155,7 @@ void ExtrusionDirectionWindow::implSetDirection( sal_Int32 nSkew, bool bEnabled { if( mpDirectionSet ) { - USHORT nItemId; + sal_uInt16 nItemId; for( nItemId = DIRECTION_NW; nItemId <= DIRECTION_SE; nItemId++ ) { if( gSkewList[nItemId] == nSkew ) @@ -403,7 +404,7 @@ void ExtrusionDepthWindow::implSetDepth( double fDepth ) void ExtrusionDepthWindow::implFillStrings( FieldUnit eUnit ) { meUnit = eUnit; - USHORT nResource = IsMetric( eUnit ) ? RID_SVXSTR_DEPTH_0 : RID_SVXSTR_DEPTH_0_INCH; + sal_uInt16 nResource = IsMetric( eUnit ) ? RID_SVXSTR_DEPTH_0 : RID_SVXSTR_DEPTH_0_INCH; for( int i = 0; i < 5; i++ ) { @@ -477,7 +478,7 @@ IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG ) EndPopupMode(); const rtl::OUString aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionDepthDialog" )); - + Any a; Sequence< PropertyValue > aArgs( 2 ); aArgs[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Depth" )); @@ -499,7 +500,7 @@ IMPL_LINK( ExtrusionDepthWindow, SelectHdl, void *, EMPTYARG ) { fDepth = IsMetric( meUnit ) ? aDepthListMM[nSelected] : aDepthListInch[nSelected]; } - + Sequence< PropertyValue > aArgs( 1 ); aArgs[0].Name = msExtrusionDepth.copy(5); aArgs[0].Value <<= fDepth; @@ -593,7 +594,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr , msExtrusionLightingDirection( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingDirection" )) , msExtrusionLightingIntensity( RTL_CONSTASCII_USTRINGPARAM( ".uno:ExtrusionLightingIntensity" )) { - USHORT i; + sal_uInt16 i; for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ ) { if( i != FROM_FRONT ) @@ -612,7 +613,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( svt::ToolboxController& rContr mpLightingSet->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) ); mpLightingSet->SetColCount( 3 ); - mpLightingSet->EnableFullItemMode( FALSE ); + mpLightingSet->EnableFullItemMode( sal_False ); for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ ) { @@ -665,7 +666,7 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) if( !bEnabled ) nDirection = FROM_FRONT; - USHORT nItemId; + sal_uInt16 nItemId; for( nItemId = FROM_TOP_LEFT; nItemId <= FROM_BOTTOM_RIGHT; nItemId++ ) { if( nItemId == FROM_FRONT ) @@ -676,7 +677,7 @@ void ExtrusionLightingWindow::implSetDirection( int nDirection, bool bEnabled ) { mpLightingSet->SetItemImage( nItemId + 1, - (USHORT)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId] + (sal_uInt16)nDirection == nItemId ? maImgLightingOn[nItemId] : maImgLightingOff[nItemId] ); } } @@ -988,7 +989,7 @@ Sequence< OUString > SAL_CALL ExtrusionSurfaceControl::getSupportedServiceNames( SFX_IMPL_TOOLBOX_CONTROL( ExtrusionColorControl, SvxColorItem ); ExtrusionColorControl::ExtrusionColorControl( - USHORT nSlotId, USHORT nId, ToolBox& rTbx ) + sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl ( nSlotId, nId, rTbx ), mLastColor( COL_AUTO ) { @@ -1029,9 +1030,9 @@ SfxPopupWindow* ExtrusionColorControl::CreatePopupWindow() // ----------------------------------------------------------------------- -void ExtrusionColorControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +void ExtrusionColorControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - USHORT nId = GetId(); + sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); if( nSID == SID_EXTRUSION_3D_COLOR ) diff --git a/svx/source/tbxctrls/extrusioncontrols.hrc b/svx/source/tbxctrls/extrusioncontrols.hrc index 0ff7e0ddc2..0ff7e0ddc2 100644..100755 --- a/svx/source/tbxctrls/extrusioncontrols.hrc +++ b/svx/source/tbxctrls/extrusioncontrols.hrc diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 2279095aa9..2279095aa9 100644..100755 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src index 4d3d1f5d4f..457b27be21 100644..100755 --- a/svx/source/tbxctrls/extrusioncontrols.src +++ b/svx/source/tbxctrls/extrusioncontrols.src @@ -32,6 +32,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_DIRECTION"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -144,9 +145,10 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION Text [ en-US ] = "Extrusion South-East"; }; }; - + DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_DEPTH"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -156,12 +158,12 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH Zoomable = TRUE ; Text [ en-US ] = "Extrusion Depth" ; - + String STR_CUSTOM { Text [ en-US ] = "~Custom..."; }; - + String STR_INFINITY { Text [ en-US ] = "~Infinity"; @@ -207,6 +209,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_LIGHTING"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -216,7 +219,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING Zoomable = TRUE ; Text [ en-US ] = "Extrusion Lighting" ; - + Image IMG_LIGHT_OFF + FROM_TOP_LEFT { ImageBitmap = Bitmap { File = "lightofffromtopleft_22.bmp"; }; @@ -379,6 +382,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_SURFACE"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -388,7 +392,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE Zoomable = TRUE ; Text [ en-US ] = "Extrusion Surface" ; - + String STR_WIREFRAME { Text [ en-US ] = "~Wire Frame"; @@ -439,6 +443,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH { + HelpID = "svx:ModalDialog:RID_SVX_MDLG_EXTRUSION_DEPTH"; OutputSize = TRUE; SVLook = TRUE ; Moveable = TRUE; diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index dd8cc62706..dc82353ac7 100644..100755 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -45,8 +45,8 @@ #define TMP_STR_BEGIN '[' #define TMP_STR_END ']' -#include "drawitem.hxx" -#include "xattr.hxx" +#include "svx/drawitem.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/fillctrl.hxx> #include <svx/itemwin.hxx> @@ -67,7 +67,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxFillToolBoxControl, XFillStyleItem ); |* \************************************************************************/ -SvxFillToolBoxControl::SvxFillToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxFillToolBoxControl::SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), pStyleItem ( NULL ), @@ -78,8 +78,8 @@ SvxFillToolBoxControl::SvxFillToolBoxControl( USHORT nSlotId, USHORT nId, ToolBo pFillControl ( NULL ), pFillTypeLB ( NULL ), pFillAttrLB ( NULL ), - bUpdate ( FALSE ), - bIgnoreStatusUpdate( FALSE ), + bUpdate ( sal_False ), + bIgnoreStatusUpdate( sal_False ), eLastXFS ( XFILL_NONE ) { addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillColor" ))); @@ -107,7 +107,7 @@ SvxFillToolBoxControl::~SvxFillToolBoxControl() void SvxFillToolBoxControl::StateChanged( - USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { bool bEnableControls = false; @@ -136,11 +136,11 @@ void SvxFillToolBoxControl::StateChanged( pFillTypeLB->Enable(); eLastXFS = pFillTypeLB->GetSelectEntryPos(); - bUpdate = TRUE; + bUpdate = sal_True; XFillStyle eXFS = (XFillStyle)pStyleItem->GetValue(); pFillTypeLB->SelectEntryPos( - sal::static_int_cast< USHORT >( eXFS ) ); + sal::static_int_cast< sal_uInt16 >( eXFS ) ); pFillAttrLB->Enable(); } else if( pStyleItem ) @@ -185,9 +185,9 @@ void SvxFillToolBoxControl::StateChanged( //pFillTypeLB->Enable(); pFillAttrLB->Enable(); - bUpdate = TRUE; + bUpdate = sal_True; } - + Update( pState ); } else @@ -198,7 +198,7 @@ void SvxFillToolBoxControl::StateChanged( pFillTypeLB->SetNoSelection(); pFillAttrLB->Disable(); pFillAttrLB->SetNoSelection(); - bUpdate = FALSE; + bUpdate = sal_False; } else { @@ -212,7 +212,7 @@ void SvxFillToolBoxControl::StateChanged( ( nSID == SID_ATTR_FILL_BITMAP && eXFS == XFILL_BITMAP ) ) { pFillAttrLB->SetNoSelection(); - //bUpdate = FALSE; + //bUpdate = sal_False; } } } @@ -232,7 +232,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) { if ( pStyleItem && pState && bUpdate ) { - bUpdate = FALSE; + bUpdate = sal_False; XFillStyle eXFS = (XFillStyle)pStyleItem->GetValue(); @@ -266,7 +266,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) LISTBOX_ENTRY_NOTFOUND || pFillAttrLB->GetSelectEntryColor() != aColor ) { - USHORT nCount = pFillAttrLB->GetEntryCount(); + sal_uInt16 nCount = pFillAttrLB->GetEntryCount(); String aTmpStr; if( nCount > 0 ) { @@ -282,9 +282,9 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) aTmpStr += aString; aTmpStr += TMP_STR_END; - //pFillAttrLB->SetUpdateMode( FALSE ); - USHORT nPos = pFillAttrLB->InsertEntry( aColor, aTmpStr ); - //pFillAttrLB->SetUpdateMode( TRUE ); + //pFillAttrLB->SetUpdateMode( sal_False ); + sal_uInt16 nPos = pFillAttrLB->InsertEntry( aColor, aTmpStr ); + //pFillAttrLB->SetUpdateMode( sal_True ); pFillAttrLB->SelectEntryPos( nPos ); } // NEU @@ -304,7 +304,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) // Pruefen, ob Eintrag nicht in der Liste ist if( pFillAttrLB->GetSelectEntry() != aString ) { - USHORT nCount = pFillAttrLB->GetEntryCount(); + sal_uInt16 nCount = pFillAttrLB->GetEntryCount(); String aTmpStr; if( nCount > 0 ) { @@ -324,7 +324,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) String aEmptyString = String(); XGradientList aGradientList( aEmptyString ); aGradientList.Insert( pEntry ); - aGradientList.SetDirty( FALSE ); + aGradientList.SetDirty( sal_False ); Bitmap* pBmp = aGradientList.CreateBitmapForUI( 0 ); if( pBmp ) @@ -354,7 +354,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) // Pruefen, ob Eintrag nicht in der Liste ist if( pFillAttrLB->GetSelectEntry() != aString ) { - USHORT nCount = pFillAttrLB->GetEntryCount(); + sal_uInt16 nCount = pFillAttrLB->GetEntryCount(); String aTmpStr; if( nCount > 0 ) { @@ -374,7 +374,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) String aEmptyString = String(); XHatchList aHatchList( aEmptyString ); aHatchList.Insert( pEntry ); - aHatchList.SetDirty( FALSE ); + aHatchList.SetDirty( sal_False ); Bitmap* pBmp = aHatchList.CreateBitmapForUI( 0 ); if( pBmp ) @@ -411,7 +411,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) // Pruefen, ob Eintrag nicht in der Liste ist if( pFillAttrLB->GetSelectEntry() != aString ) { - USHORT nCount = pFillAttrLB->GetEntryCount(); + sal_uInt16 nCount = pFillAttrLB->GetEntryCount(); String aTmpStr; if( nCount > 0 ) { @@ -430,7 +430,7 @@ void SvxFillToolBoxControl::Update( const SfxPoolItem* pState ) XBitmapEntry* pEntry = new XBitmapEntry( pBitmapItem->GetBitmapValue(), aTmpStr ); XBitmapList aBitmapList( String::CreateFromAscii("TmpList") ); aBitmapList.Insert( pEntry ); - aBitmapList.SetDirty( FALSE ); + aBitmapList.SetDirty( sal_False ); //Bitmap* pBmp = aBitmapList.GetBitmap( 0 ); //( (ListBox*)pFillAttrLB )->InsertEntry( pEntry->GetName(), *pBmp ); pFillAttrLB->Fill( &aBitmapList ); @@ -678,7 +678,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) { XFillStyle eXFS = (XFillStyle)pLbFillType->GetSelectEntryPos(); XFillStyleItem aXFillStyleItem( eXFS ); - BOOL bAction = pBox && !pLbFillAttr->IsTravelSelect(); + sal_Bool bAction = pBox && !pLbFillAttr->IsTravelSelect(); SfxObjectShell* pSh = SfxObjectShell::Current(); if ( bAction ) @@ -690,10 +690,10 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) aArgs[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" )); aXFillStyleItem.QueryValue( a ); aArgs[0].Value = a; - ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( TRUE ); + ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_True ); ((SvxFillToolBoxControl*)GetData())->Dispatch( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FillStyle" )), aArgs ); - ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( FALSE ); + ( (SvxFillToolBoxControl*)GetData() )->IgnoreStatusUpdate( sal_False ); switch( eXFS ) { @@ -724,7 +724,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) break; case XFILL_GRADIENT: { - USHORT nPos = pLbFillAttr->GetSelectEntryPos(); + sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_GRADIENT_LIST ) ) { @@ -748,7 +748,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) case XFILL_HATCH: { - USHORT nPos = pLbFillAttr->GetSelectEntryPos(); + sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_HATCH_LIST ) ) { @@ -771,7 +771,7 @@ IMPL_LINK( FillControl, SelectFillAttrHdl, ListBox *, pBox ) case XFILL_BITMAP: { - USHORT nPos = pLbFillAttr->GetSelectEntryPos(); + sal_uInt16 nPos = pLbFillAttr->GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND && pSh && pSh->GetItem( SID_BITMAP_LIST ) ) { diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 6962ba54ab..06f3e992ca 100644..100755 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -54,10 +54,10 @@ #include <svx/svdview.hxx> #include <svx/svdoutl.hxx> -#include "gallery.hxx" -#include <dlgutil.hxx> +#include "svx/gallery.hxx" +#include <svx/dlgutil.hxx> -#include "fontworkgallery.hxx" +#include <svx/fontworkgallery.hxx> #include "fontworkgallery.hrc" #include <algorithm> @@ -84,8 +84,8 @@ const int nLineCount = 4; \************************************************************************/ FontWorkGalleryDialog::FontWorkGalleryDialog( SdrView* pSdrView, Window* pParent, sal_uInt16 /*nSID*/ ) : ModalDialog( pParent, SVX_RES( RID_SVX_MDLG_FONTWORK_GALLERY ) ), - maCtlFavorites ( this, SVX_RES( CTL_FAVORITES ) ), maFLFavorites ( this, SVX_RES( FL_FAVORITES ) ), + maCtlFavorites ( this, SVX_RES( CTL_FAVORITES ) ), maOKButton ( this, SVX_RES( BTN_OK ) ), maCancelButton ( this, SVX_RES( BTN_CANCEL ) ), maHelpButton ( this, SVX_RES( BTN_HELP ) ), @@ -122,7 +122,7 @@ FontWorkGalleryDialog::~FontWorkGalleryDialog() void FontWorkGalleryDialog::initfavorites(sal_uInt16 nThemeId, std::vector< Bitmap * >& rFavorites) { // Ueber die Gallery werden die Favoriten eingelesen - ULONG nFavCount = GalleryExplorer::GetSdrObjCount( nThemeId ); + sal_uIntPtr nFavCount = GalleryExplorer::GetSdrObjCount( nThemeId ); // Gallery thema locken GalleryExplorer::BeginLocking(nThemeId); @@ -198,10 +198,10 @@ void FontWorkGalleryDialog::changeText( SdrTextObj* pObj ) { SdrOutliner& rOutl = mpModel->GetDrawOutliner(pObj); - USHORT nOutlMode = rOutl.GetMode(); + sal_uInt16 nOutlMode = rOutl.GetMode(); Size aPaperSize = rOutl.GetPaperSize(); - BOOL bUpdateMode = rOutl.GetUpdateMode(); - rOutl.SetUpdateMode(FALSE); + sal_Bool bUpdateMode = rOutl.GetUpdateMode(); + rOutl.SetUpdateMode(sal_False); rOutl.SetParaAttribs( 0, rOutl.GetEmptyItemSet() ); // #95114# Always set the object's StyleSheet at the Outliner to @@ -233,7 +233,7 @@ void FontWorkGalleryDialog::SetSdrObjectRef( SdrObject** ppSdrObject, SdrModel* void FontWorkGalleryDialog::insertSelectedFontwork() { - USHORT nItemId = maCtlFavorites.GetSelectItemId(); + sal_uInt16 nItemId = maCtlFavorites.GetSelectItemId(); if( nItemId > 0 ) { @@ -308,7 +308,7 @@ IMPL_LINK( FontWorkGalleryDialog, DoubleClickFavoriteHdl, void*, EMPTYARG ) //------------------------------------------------------------------------ SFX_IMPL_TOOLBOX_CONTROL( FontWorkShapeTypeControl, SfxStringItem ); -FontWorkShapeTypeControl::FontWorkShapeTypeControl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) +FontWorkShapeTypeControl::FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); @@ -339,7 +339,7 @@ SfxPopupWindow* FontWorkShapeTypeControl::CreatePopupWindow() // ----------------------------------------------------------------------- -void FontWorkShapeTypeControl::Select( BOOL ) +void FontWorkShapeTypeControl::Select( sal_Bool ) { } @@ -684,7 +684,7 @@ IMPL_LINK( FontWorkCharacterSpacingWindow, SelectHdl, void *, EMPTYARG ) else if ( nSelection == 6 ) // KernCharacterPairs { rtl::OUString aCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:FontworkKernCharacterPairs" )); - + Sequence< PropertyValue > aArgs( 1 ); aArgs[0].Name = msFontworkKernCharacterPairs.copy(5); aArgs[0].Value <<= (sal_Bool) sal_True; diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src index 34164876e1..ea09e3e8d7 100644..100755 --- a/svx/source/tbxctrls/fontworkgallery.src +++ b/svx/source/tbxctrls/fontworkgallery.src @@ -37,6 +37,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY { + HelpID = "svx:ModalDialog:RID_SVX_MDLG_FONTWORK_GALLERY"; OutputSize = TRUE; SVLook = TRUE ; Moveable = TRUE; @@ -94,6 +95,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_ALIGNMENT"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -103,7 +105,7 @@ DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT Zoomable = TRUE ; Text [ en-US ] = "Fontwork Alignment" ; - + String STR_ALIGN_LEFT { Text [ en-US ] = "~Left Align"; @@ -179,6 +181,7 @@ DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_CHARSPACING"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -188,7 +191,7 @@ DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING Zoomable = TRUE ; Text [ en-US ] = "Fontwork Character Spacing" ; - + String STR_CHARS_SPACING_VERY_TIGHT { Text [ en-US ] = "~Very Tight"; @@ -221,6 +224,7 @@ DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING { + HelpID = "svx:ModalDialog:RID_SVX_MDLG_FONTWORK_CHARSPACING"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 139 , 64 ) ; @@ -256,6 +260,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING }; MetricField MF_VALUE { + HelpID = "svx:MetricField:RID_SVX_MDLG_FONTWORK_CHARSPACING:MF_VALUE"; Border = FALSE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 32 , 12 ) ; diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index a06289269d..9fbb5240f6 100644..100755 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "formatpaintbrushctrl.hxx" +#include "svx/formatpaintbrushctrl.hxx" // header for class SfxBoolItem #include <svl/eitem.hxx> @@ -50,12 +50,12 @@ using namespace ::com::sun::star::beans; SFX_IMPL_TOOLBOX_CONTROL( FormatPaintBrushToolBoxControl, SfxBoolItem ); -FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) +FormatPaintBrushToolBoxControl::FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) , m_bPersistentCopy(false) , m_aDoubleClickTimer() { - ULONG nDblClkTime = rTbx.GetSettings().GetMouseSettings().GetDoubleClickTime(); + sal_uIntPtr nDblClkTime = rTbx.GetSettings().GetMouseSettings().GetDoubleClickTime(); m_aDoubleClickTimer.SetTimeoutHdl( LINK(this, FormatPaintBrushToolBoxControl, WaitDoubleClickHdl) ); m_aDoubleClickTimer.SetTimeout(nDblClkTime); @@ -103,12 +103,12 @@ IMPL_LINK(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl, void*, EMPTYARG ) } // ----------------------------------------------------------------------- -void FormatPaintBrushToolBoxControl::Select( BOOL ) +void FormatPaintBrushToolBoxControl::Select( sal_Bool ) { } // ----------------------------------------------------------------------- -void FormatPaintBrushToolBoxControl::StateChanged( USHORT nSID, SfxItemState eState, +void FormatPaintBrushToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if( ( eState & SFX_ITEM_SET ) == 0 ) diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index fa836aa55b..ae5a158295 100644..100755 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -61,8 +61,8 @@ #include <svx/svdograf.hxx> #include <svx/svdundo.hxx> #include <svx/svdtrans.hxx> -#include "grafctrl.hxx" -#include "tbxcolor.hxx" +#include "svx/grafctrl.hxx" +#include "svx/tbxcolor.hxx" // namespaces using ::rtl::OUString; @@ -89,7 +89,7 @@ TYPEINIT1_AUTOFACTORY( TbxImageItem, SfxUInt16Item ); //--------------------------------------------------------- -TbxImageItem::TbxImageItem( USHORT _nWhich, UINT16 nImage ) : +TbxImageItem::TbxImageItem( sal_uInt16 _nWhich, sal_uInt16 nImage ) : SfxUInt16Item( _nWhich, nImage ) { } @@ -252,10 +252,10 @@ void ImplGrafMetricField::Update( const SfxPoolItem* pItem ) struct CommandToRID { const char* pCommand; - USHORT nResId; + sal_uInt16 nResId; }; -static USHORT ImplGetRID( const OUString& aCommand ) +static sal_uInt16 ImplGetRID( const OUString& aCommand ) { static const CommandToRID aImplCommandToResMap[] = { @@ -269,7 +269,7 @@ static USHORT ImplGetRID( const OUString& aCommand ) { 0, 0 } }; - USHORT nRID = 0; + sal_uInt16 nRID = 0; sal_Int32 i( 0 ); while ( aImplCommandToResMap[ i ].pCommand ) @@ -300,7 +300,7 @@ protected: public: - ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ); + ImplGrafControl( Window* pParent, sal_uInt16 nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ); ~ImplGrafControl(); void Update( const SfxPoolItem* pItem ) { maField.Update( pItem ); } @@ -311,7 +311,7 @@ public: ImplGrafControl::ImplGrafControl( Window* pParent, - USHORT nSlotId, + sal_uInt16 nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) : Control( pParent, WB_TABSTOP ) @@ -343,11 +343,10 @@ ImplGrafControl::ImplGrafControl( Max( aImgSize.Height(), aFldSize.Height() ) ) ); SetBackground( Wallpaper() ); // transparent background - + maImage.Show(); - maField.SetHelpId( nSlotId ); - maField.SetSmartHelpId( SmartId( rCmd )); + maField.SetHelpId( rtl::OUStringToOString( rCmd, RTL_TEXTENCODING_UTF8 ) ); maField.Show(); } @@ -372,7 +371,7 @@ class ImplGrafModeControl : public ListBox { using Window::Update; private: - USHORT mnCurPos; + sal_uInt16 mnCurPos; Reference< XFrame > mxFrame; virtual void Select(); @@ -437,7 +436,7 @@ void ImplGrafModeControl::Select() long ImplGrafModeControl::PreNotify( NotifyEvent& rNEvt ) { - USHORT nType = rNEvt.GetType(); + sal_uInt16 nType = rNEvt.GetType(); if( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType ) mnCurPos = GetSelectEntryPos(); @@ -508,7 +507,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafFilterToolBoxControl, TbxImageItem ); // ----------------------------------------------------------------------------- -SvxGrafFilterToolBoxControl::SvxGrafFilterToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxGrafFilterToolBoxControl::SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); @@ -523,7 +522,7 @@ SvxGrafFilterToolBoxControl::~SvxGrafFilterToolBoxControl() // ----------------------------------------------------------------------------- -void SvxGrafFilterToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* ) +void SvxGrafFilterToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* ) { GetToolBox().EnableItem( GetId(), ( eState != SFX_ITEM_DISABLED ) ); } @@ -554,7 +553,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafToolBoxControl, SfxVoidItem ); // ----------------------------------------------------------------------------- -SvxGrafToolBoxControl::SvxGrafToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx) : +SvxGrafToolBoxControl::SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx) : SfxToolBoxControl( nSlotId, nId, rTbx ) { rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); @@ -569,7 +568,7 @@ SvxGrafToolBoxControl::~SvxGrafToolBoxControl() // ----------------------------------------------------------------------------- -void SvxGrafToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState ) +void SvxGrafToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { ImplGrafControl* pCtrl = (ImplGrafControl*) GetToolBox().GetItemWindow( GetId() ); @@ -606,7 +605,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafRedToolBoxControl, SfxInt16Item ); // ----------------------------------------------------------------------------- -SvxGrafRedToolBoxControl::SvxGrafRedToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxGrafRedToolBoxControl::SvxGrafRedToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxGrafToolBoxControl( nSlotId, nId, rTbx ) { } @@ -619,7 +618,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafGreenToolBoxControl, SfxInt16Item ); // ----------------------------------------------------------------------------- -SvxGrafGreenToolBoxControl::SvxGrafGreenToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxGrafGreenToolBoxControl::SvxGrafGreenToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxGrafToolBoxControl( nSlotId, nId, rTbx ) { } @@ -632,7 +631,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafBlueToolBoxControl, SfxInt16Item ); // ----------------------------------------------------------------------------- -SvxGrafBlueToolBoxControl::SvxGrafBlueToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxGrafBlueToolBoxControl::SvxGrafBlueToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxGrafToolBoxControl( nSlotId, nId, rTbx ) { } @@ -645,7 +644,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafLuminanceToolBoxControl, SfxInt16Item ); // ----------------------------------------------------------------------------- -SvxGrafLuminanceToolBoxControl::SvxGrafLuminanceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxGrafLuminanceToolBoxControl::SvxGrafLuminanceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxGrafToolBoxControl( nSlotId, nId, rTbx ) { } @@ -658,7 +657,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafContrastToolBoxControl, SfxInt16Item ); // ----------------------------------------------------------------------------- -SvxGrafContrastToolBoxControl::SvxGrafContrastToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxGrafContrastToolBoxControl::SvxGrafContrastToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxGrafToolBoxControl( nSlotId, nId, rTbx ) { } @@ -671,7 +670,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafGammaToolBoxControl, SfxUInt32Item ); // ----------------------------------------------------------------------------- -SvxGrafGammaToolBoxControl::SvxGrafGammaToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxGrafGammaToolBoxControl::SvxGrafGammaToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxGrafToolBoxControl( nSlotId, nId, rTbx ) { } @@ -684,7 +683,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafTransparenceToolBoxControl, SfxUInt16Item ); // ----------------------------------------------------------------------------- -SvxGrafTransparenceToolBoxControl::SvxGrafTransparenceToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxGrafTransparenceToolBoxControl::SvxGrafTransparenceToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxGrafToolBoxControl( nSlotId, nId, rTbx ) { } @@ -697,7 +696,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxGrafModeToolBoxControl, SfxUInt16Item ); // ----------------------------------------------------------------------------- -SvxGrafModeToolBoxControl::SvxGrafModeToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxGrafModeToolBoxControl::SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { } @@ -710,7 +709,7 @@ SvxGrafModeToolBoxControl::~SvxGrafModeToolBoxControl() // ----------------------------------------------------------------------------- -void SvxGrafModeToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState ) +void SvxGrafModeToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { ImplGrafModeControl* pCtrl = (ImplGrafModeControl*) GetToolBox().GetItemWindow( GetId() ); @@ -751,7 +750,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) const bool bUndo = rView.IsUndoEnabled(); String aUndoStr; - + if( bUndo ) { aUndoStr = rView.GetDescriptionOfMarkedObjects(); @@ -760,11 +759,11 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; - USHORT nSlot = rReq.GetSlot(); + sal_uInt16 nSlot = rReq.GetSlot(); - if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot, FALSE, &pItem )) + if( !pArgs || SFX_ITEM_SET != pArgs->GetItemState( nSlot, sal_False, &pItem )) pItem = 0; - + switch( nSlot ) { case SID_ATTR_GRAF_RED: @@ -862,7 +861,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) if( 0 < rMarkList.GetMarkCount() ) { SdrGrafObj* pObj = (SdrGrafObj*) rMarkList.GetMark( 0 )->GetMarkedSdrObj(); - + if( pObj && pObj->ISA( SdrGrafObj ) && ( pObj->GetGraphicType() != GRAPHIC_NONE ) && ( pObj->GetGraphicType() != GRAPHIC_DEFAULT ) ) @@ -871,33 +870,33 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) const SfxMapUnit eOldMetric = rPool.GetMetric( 0 ); const MapMode aMap100( MAP_100TH_MM ); const MapMode aMapTwip( MAP_TWIP ); - + aGrfAttr.Put(pObj->GetMergedItemSet()); rPool.SetDefaultMetric( SFX_MAPUNIT_TWIP ); - + SfxItemSet aCropDlgAttr( rPool, SDRATTR_GRAFCROP, SDRATTR_GRAFCROP, SID_ATTR_GRAF_GRAPHIC, SID_ATTR_GRAF_GRAPHIC, SID_ATTR_PAGE_SIZE, SID_ATTR_PAGE_SIZE, SID_ATTR_GRAF_FRMSIZE, SID_ATTR_GRAF_FRMSIZE, SID_ATTR_GRAF_CROP, SID_ATTR_GRAF_CROP, 0 ); - + aCropDlgAttr.Put( SvxBrushItem( pObj->GetGraphic(), GPOS_MM, SID_ATTR_GRAF_GRAPHIC ) ); aCropDlgAttr.Put( SvxSizeItem( SID_ATTR_PAGE_SIZE, Size( OutputDevice::LogicToLogic( Size( 200000, 200000 ), aMap100, aMapTwip ) ) ) ); aCropDlgAttr.Put( SvxSizeItem( SID_ATTR_GRAF_FRMSIZE, OutputDevice::LogicToLogic( pObj->GetLogicRect().GetSize(), aMap100, aMapTwip ) ) ); - + const SdrGrafCropItem& rCrop = (const SdrGrafCropItem&) aGrfAttr.Get( SDRATTR_GRAFCROP ); Size aLTSize( OutputDevice::LogicToLogic( Size( rCrop.GetLeft(), rCrop.GetTop() ), aMap100, aMapTwip ) ); Size aRBSize( OutputDevice::LogicToLogic( Size( rCrop.GetRight(), rCrop.GetBottom() ), aMap100, aMapTwip ) ); - + aCropDlgAttr.Put( SdrGrafCropItem( aLTSize.Width(), aLTSize.Height(), aRBSize.Width(), aRBSize.Height() ) ); - + SfxSingleTabDialog aCropDialog( SfxViewShell::Current() ? SfxViewShell::Current()->GetWindow() : NULL, aCropDlgAttr, 950 ); const String aCropStr = SVX_RESSTR( RID_SVXSTR_GRAFCROP ); @@ -910,25 +909,25 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) pTabPage->SetText( aCropStr ); aCropDialog.SetTabPage( pTabPage ); - + if( aCropDialog.Execute() == RET_OK ) { const SfxItemSet* pOutAttr = aCropDialog.GetOutputItemSet(); - + if( pOutAttr ) { aUndoStr.Append( String( SVX_RESSTR( RID_SVXSTR_UNDO_GRAFCROP ) ) ); - + // set crop attributes if( SFX_ITEM_SET <= pOutAttr->GetItemState( SDRATTR_GRAFCROP ) ) { const SdrGrafCropItem& rNewCrop = (const SdrGrafCropItem&) pOutAttr->Get( SDRATTR_GRAFCROP ); - + aLTSize = OutputDevice::LogicToLogic( Size( rNewCrop.GetLeft(), rNewCrop.GetTop() ), aMapTwip, aMap100 ); aRBSize = OutputDevice::LogicToLogic( Size( rNewCrop.GetRight(), rNewCrop.GetBottom() ), aMapTwip, aMap100 ); aSet.Put( SdrGrafCropItem( aLTSize.Width(), aLTSize.Height(), aRBSize.Width(), aRBSize.Height() ) ); } - + // set new logic rect if( SFX_ITEM_SET <= pOutAttr->GetItemState( SID_ATTR_GRAF_FRMSIZE ) ) { @@ -936,18 +935,18 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) const Size& rGrfSize = ( (const SvxSizeItem&) pOutAttr->Get( SID_ATTR_GRAF_FRMSIZE ) ).GetSize(); Size aNewGrfSize( OutputDevice::LogicToLogic( rGrfSize, aMapTwip, aMap100 ) ); Size aOldGrfSize( pObj->GetLogicRect().GetSize() ); - + Rectangle aNewRect( aNewOrigin, aNewGrfSize ); Point aOffset( (aNewGrfSize.Width() - aOldGrfSize.Width()) >> 1, (aNewGrfSize.Height() - aOldGrfSize.Height()) >> 1 ); - + // #106181# rotate snap rect before setting it const GeoStat& aGeo = pObj->GetGeoStat(); - + if (aGeo.nDrehWink!=0 || aGeo.nShearWink!=0) { Polygon aPol(aNewRect); - + // also transform origin offset if (aGeo.nShearWink!=0) { @@ -963,7 +962,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) aGeo.nSin,aGeo.nCos); RotatePoint(aOffset, Point(0,0), aGeo.nSin,aGeo.nCos); } - + // apply offset aPol.Move( -aOffset.X(), -aOffset.Y() ); aNewRect=aPol.GetBoundRect(); @@ -972,7 +971,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) { aNewRect.Move( -aOffset.X(), -aOffset.Y() ); } - + if( !aSet.Count() ) rView.SetMarkedObjRect( aNewRect ); else @@ -992,7 +991,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView ) } } } - + rPool.SetDefaultMetric( eOldMetric ); } } @@ -1030,13 +1029,13 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) SfxItemPool& rPool = rView.GetModel()->GetItemPool(); SfxItemSet aAttrSet( rPool ); SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); rView.GetAttributes( aAttrSet ); while( nWhich ) { - USHORT nSlotId = SfxItemPool::IsWhich( nWhich ) ? rPool.GetSlotId( nWhich ) : nWhich; + sal_uInt16 nSlotId = SfxItemPool::IsWhich( nWhich ) ? rPool.GetSlotId( nWhich ) : nWhich; switch( nSlotId ) { @@ -1045,7 +1044,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) if( SFX_ITEM_AVAILABLE <= aAttrSet.GetItemState( SDRATTR_GRAFMODE ) ) { rSet.Put( SfxUInt16Item( nSlotId, - sal::static_int_cast< UINT16 >( ITEMVALUE( aAttrSet, SDRATTR_GRAFMODE, SdrGrafModeItem ) ) ) ); + sal::static_int_cast< sal_uInt16 >( ITEMVALUE( aAttrSet, SDRATTR_GRAFMODE, SdrGrafModeItem ) ) ) ); } } break; @@ -1115,9 +1114,9 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) if( SFX_ITEM_AVAILABLE <= aAttrSet.GetItemState( SDRATTR_GRAFTRANSPARENCE ) ) { const SdrMarkList& rMarkList = rView.GetMarkedObjectList(); - BOOL bEnable = TRUE; + sal_Bool bEnable = sal_True; - for( USHORT i = 0, nCount = (USHORT) rMarkList.GetMarkCount(); + for( sal_uInt16 i = 0, nCount = (sal_uInt16) rMarkList.GetMarkCount(); ( i < nCount ) && bEnable; i++ ) { SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj(); @@ -1126,7 +1125,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) ( (SdrGrafObj*) pObj )->HasGDIMetaFile() || ( (SdrGrafObj*) pObj )->IsAnimated() ) { - bEnable = FALSE; + bEnable = sal_False; } } @@ -1142,7 +1141,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) case( SID_ATTR_GRAF_CROP ): { const SdrMarkList& rMarkList = rView.GetMarkedObjectList(); - BOOL bDisable = TRUE; + sal_Bool bDisable = sal_True; if( 1 == rMarkList.GetMarkCount() ) { @@ -1155,7 +1154,7 @@ void SvxGrafAttrHelper::GetGrafAttrState( SfxItemSet& rSet, SdrView& rView ) if( ( pGrafObj->GetGraphicType() != GRAPHIC_NONE ) && ( pGrafObj->GetGraphicType() != GRAPHIC_DEFAULT ) ) { - bDisable = FALSE; + bDisable = sal_False; } } } diff --git a/svx/source/tbxctrls/grafctrl.hrc b/svx/source/tbxctrls/grafctrl.hrc index 10eafae0a6..10eafae0a6 100644..100755 --- a/svx/source/tbxctrls/grafctrl.hrc +++ b/svx/source/tbxctrls/grafctrl.hrc diff --git a/svx/source/tbxctrls/grafctrl.src b/svx/source/tbxctrls/grafctrl.src index a0d437ff9c..a0d437ff9c 100644..100755 --- a/svx/source/tbxctrls/grafctrl.src +++ b/svx/source/tbxctrls/grafctrl.src diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index addec7eb18..9852f9ac79 100644..100755 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -50,11 +50,11 @@ #include <svx/xlineit0.hxx> #include <svx/xlndsit.hxx> #include <svx/xtable.hxx> -#include "drawitem.hxx" +#include "svx/drawitem.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/itemwin.hxx> -#include "linectrl.hxx" +#include "svx/linectrl.hxx" #include <svtools/colorcfg.hxx> #include "linectrl.hrc" @@ -74,7 +74,7 @@ SvxLineBox::SvxLineBox( Window* pParent, const Reference< XFrame >& rFrame, WinB LineLB( pParent, nBits ), nCurPos ( 0 ), aLogicalSize(40,140), - bRelease ( TRUE ), + bRelease ( sal_True ), mpSh ( NULL ), mxFrame ( rFrame ) { @@ -114,7 +114,7 @@ void SvxLineBox::Select() if ( !IsTravelSelect() ) { XLineStyle eXLS; - USHORT nPos = GetSelectEntryPos(); + sal_uInt16 nPos = GetSelectEntryPos(); switch ( nPos ) { @@ -173,7 +173,7 @@ void SvxLineBox::Select() long SvxLineBox::PreNotify( NotifyEvent& rNEvt ) { - USHORT nType = rNEvt.GetType(); + sal_uInt16 nType = rNEvt.GetType(); switch(nType) { @@ -189,7 +189,7 @@ long SvxLineBox::PreNotify( NotifyEvent& rNEvt ) const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); if( pKEvt->GetKeyCode().GetCode() == KEY_TAB) { - bRelease = FALSE; + bRelease = sal_False; Select(); } } @@ -231,7 +231,7 @@ void SvxLineBox::ReleaseFocus_Impl() { if(!bRelease) { - bRelease = TRUE; + bRelease = sal_True; return; } @@ -283,7 +283,7 @@ SvxColorBox::SvxColorBox( ColorLB( pParent, nBits ), nCurPos ( 0 ), aLogicalSize(45,80), - bRelease ( TRUE ), + bRelease ( sal_True ), maCommand ( rCommand ), mxFrame ( rFrame ) { @@ -362,7 +362,7 @@ void SvxColorBox::Select() long SvxColorBox::PreNotify( NotifyEvent& rNEvt ) { - USHORT nType = rNEvt.GetType(); + sal_uInt16 nType = rNEvt.GetType(); switch(nType) { @@ -379,7 +379,7 @@ long SvxColorBox::PreNotify( NotifyEvent& rNEvt ) if( pKEvt->GetKeyCode().GetCode() == KEY_TAB) { - bRelease = FALSE; + bRelease = sal_False; Select(); } } @@ -433,7 +433,7 @@ void SvxColorBox::ReleaseFocus_Impl() { if(!bRelease) { - bRelease = TRUE; + bRelease = sal_True; return; } @@ -469,7 +469,7 @@ SvxMetricField::SvxMetricField( SetFirst( 0 ); eDlgUnit = SfxModule::GetCurrentFieldUnit(); - SetFieldUnit( *this, eDlgUnit, FALSE ); + SetFieldUnit( *this, eDlgUnit, sal_False ); Show(); } @@ -556,7 +556,7 @@ void SvxMetricField::RefreshDlgUnit() if ( eDlgUnit != eTmpUnit ) { eDlgUnit = eTmpUnit; - SetFieldUnit( *this, eDlgUnit, FALSE ); + SetFieldUnit( *this, eDlgUnit, sal_False ); } } @@ -564,7 +564,7 @@ void SvxMetricField::RefreshDlgUnit() long SvxMetricField::PreNotify( NotifyEvent& rNEvt ) { - USHORT nType = rNEvt.GetType(); + sal_uInt16 nType = rNEvt.GetType(); if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType ) aCurTxt = GetText(); @@ -632,8 +632,8 @@ void SvxMetricField::DataChanged( const DataChangedEvent& rDCEvt ) SvxFillTypeBox::SvxFillTypeBox( Window* pParent, WinBits nBits ) : FillTypeLB( pParent, nBits | WB_TABSTOP ), nCurPos ( 0 ), - bSelect ( FALSE ), - bRelease(TRUE) + bSelect ( sal_False ), + bRelease(sal_True) { SetSizePixel( LogicToPixel( Size(40, 40 ),MAP_APPFONT )); Fill(); @@ -651,18 +651,18 @@ SvxFillTypeBox::~SvxFillTypeBox() long SvxFillTypeBox::PreNotify( NotifyEvent& rNEvt ) { - USHORT nType = rNEvt.GetType(); + sal_uInt16 nType = rNEvt.GetType(); if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType ) nCurPos = GetSelectEntryPos(); else if ( EVENT_LOSEFOCUS == nType && Application::GetFocusWindow() - && !IsWindowOrChild( Application::GetFocusWindow(), TRUE ) ) + && !IsWindowOrChild( Application::GetFocusWindow(), sal_True ) ) { if ( !bSelect ) SelectEntryPos( nCurPos ); else - bSelect = FALSE; + bSelect = sal_False; } return FillTypeLB::PreNotify( rNEvt ); @@ -684,9 +684,9 @@ long SvxFillTypeBox::Notify( NotifyEvent& rNEvt ) ( (Link&)GetSelectHdl() ).Call( this ); break; case KEY_TAB: - bRelease = FALSE; + bRelease = sal_False; ( (Link&)GetSelectHdl() ).Call( this ); - bRelease = TRUE; + bRelease = sal_True; break; case KEY_ESCAPE: @@ -721,7 +721,7 @@ SvxFillAttrBox::SvxFillAttrBox( Window* pParent, WinBits nBits ) : FillAttrLB( pParent, nBits | WB_TABSTOP ), nCurPos( 0 ), - bRelease( TRUE ) + bRelease( sal_True ) { SetPosPixel( Point( 90, 0 ) ); @@ -739,7 +739,7 @@ SvxFillAttrBox::~SvxFillAttrBox() long SvxFillAttrBox::PreNotify( NotifyEvent& rNEvt ) { - USHORT nType = rNEvt.GetType(); + sal_uInt16 nType = rNEvt.GetType(); if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType ) nCurPos = GetSelectEntryPos(); @@ -764,9 +764,9 @@ long SvxFillAttrBox::Notify( NotifyEvent& rNEvt ) nHandled = 1; break; case KEY_TAB: - bRelease = FALSE; + bRelease = sal_False; GetSelectHdl().Call( this ); - bRelease = TRUE; + bRelease = sal_True; break; case KEY_ESCAPE: SelectEntryPos( nCurPos ); diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index c88d9059f5..48e7747a3b 100644..100755 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -39,7 +39,7 @@ #include <sfx2/app.hxx> #include <svx/dialogs.hrc> -#include "layctrl.hxx" +#include "svx/layctrl.hxx" #include <svx/dialmgr.hxx> #include <comphelper/processfactory.hxx> #include <svtools/colorcfg.hxx> @@ -77,8 +77,8 @@ private: ::Color aBackgroundColor; long nCol; long nLine; - BOOL bInitialKeyInput; - BOOL m_bMod1; + sal_Bool bInitialKeyInput; + sal_Bool m_bMod1; ToolBox& rTbx; Reference< XFrame > mxFrame; rtl::OUString maCommand; @@ -86,7 +86,7 @@ private: DECL_LINK( SelectHdl, void * ); public: - TableWindow( USHORT nSlotId, + TableWindow( sal_uInt16 nSlotId, const rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, @@ -116,13 +116,11 @@ IMPL_LINK( TableWindow, SelectHdl, void *, EMPTYARG ) // ----------------------------------------------------------------------- -TableWindow::TableWindow( USHORT nSlotId, const rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : +TableWindow::TableWindow( sal_uInt16 nSlotId, const rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : SfxPopupWindow( nSlotId, rFrame, WinBits( WB_STDPOPUP ) ), aTableButton( this ), nCol( 0 ), nLine( 0 ), - bInitialKeyInput(TRUE), - m_bMod1(FALSE), rTbx(rParentTbx), mxFrame( rFrame ), maCommand( rCmd ) @@ -139,7 +137,7 @@ TableWindow::TableWindow( USHORT nSlotId, const rtl::OUString& rCmd, const Strin Font aFont = GetFont(); aFont.SetColor( ::Color( aColorConfig.GetColorValue( svtools::FONTCOLOR ).nColor ) ); aFont.SetFillColor( aBackgroundColor ); - aFont.SetTransparent( FALSE ); + aFont.SetTransparent( sal_False ); SetFont( aFont ); SetText( rText ); @@ -185,8 +183,8 @@ void TableWindow::MouseMove( const MouseEvent& rMEvt ) void TableWindow::KeyInput( const KeyEvent& rKEvt ) { bool bHandled = false; - USHORT nModifier = rKEvt.GetKeyCode().GetModifier(); - USHORT nKey = rKEvt.GetKeyCode().GetCode(); + sal_uInt16 nModifier = rKEvt.GetKeyCode().GetModifier(); + sal_uInt16 nKey = rKEvt.GetKeyCode().GetCode(); if ( !nModifier ) { bHandled = true; @@ -235,7 +233,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt ) //make sure that a table can initially be created if(bInitialKeyInput) { - bInitialKeyInput = FALSE; + bInitialKeyInput = sal_False; if(!nNewLine) nNewLine = 1; if(!nNewCol) @@ -246,7 +244,7 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt ) } else if(KEY_MOD1 == nModifier && KEY_RETURN == nKey) { - m_bMod1 = TRUE; + m_bMod1 = sal_True; EndPopupMode( FLOATWIN_POPUPMODEEND_CLOSEALL ); } @@ -373,7 +371,7 @@ void TableWindow::Update( long nNewCol, long nNewLine ) void TableWindow::TableDialog( const Sequence< PropertyValue >& rArgs ) { Window* pParent = rTbx.GetParent(); - USHORT nId = GetId(); + sal_uInt16 nId = GetId(); pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId)); Reference< XDispatchProvider > xDispatchProvider( mxFrame, UNO_QUERY ); @@ -417,15 +415,15 @@ private: long nWidth; long nMX; long nTextHeight; - BOOL bInitialKeyInput; - BOOL m_bMod1; + sal_Bool bInitialKeyInput; + sal_Bool m_bMod1; ToolBox& rTbx; Reference< XFrame > mxFrame; ::rtl::OUString maCommand; void UpdateSize_Impl( long nNewCol ); public: - ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ); + ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, const String &rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ); void KeyInput( const KeyEvent& rKEvt ); virtual void MouseMove( const MouseEvent& rMEvt ); @@ -435,15 +433,15 @@ public: virtual void PopupModeEnd(); virtual SfxPopupWindow* Clone() const; - USHORT GetColCount() const { return (USHORT)nCol; } + sal_uInt16 GetColCount() const { return (sal_uInt16)nCol; } }; // ----------------------------------------------------------------------- -ColumnsWindow::ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : +ColumnsWindow::ColumnsWindow( sal_uInt16 nId, const ::rtl::OUString& rCmd, const String& rText, ToolBox& rParentTbx, const Reference< XFrame >& rFrame ) : SfxPopupWindow( nId, rFrame, WB_STDPOPUP ), - bInitialKeyInput(TRUE), - m_bMod1(FALSE), + bInitialKeyInput(sal_True), + m_bMod1(sal_False), rTbx(rParentTbx), mxFrame(rFrame), maCommand( rCmd ) @@ -461,7 +459,7 @@ ColumnsWindow::ColumnsWindow( USHORT nId, const ::rtl::OUString& rCmd, const Str Font aFont( GetFont() ); aFont.SetColor( aLineColor ); aFont.SetFillColor( aFaceColor ); - aFont.SetTransparent( FALSE ); + aFont.SetTransparent( sal_False ); SetFont( aFont ); nCol = 0; @@ -572,16 +570,16 @@ void ColumnsWindow::MouseButtonDown( const MouseEvent& rMEvt ) void ColumnsWindow::KeyInput( const KeyEvent& rKEvt ) { - BOOL bHandled = FALSE; - USHORT nModifier = rKEvt.GetKeyCode().GetModifier(); - USHORT nKey = rKEvt.GetKeyCode().GetCode(); + sal_Bool bHandled = sal_False; + sal_uInt16 nModifier = rKEvt.GetKeyCode().GetModifier(); + sal_uInt16 nKey = rKEvt.GetKeyCode().GetCode(); if(!nModifier) { if( KEY_LEFT == nKey || KEY_RIGHT == nKey || KEY_RETURN == nKey ||KEY_ESCAPE == nKey || KEY_UP == nKey) { - bHandled = TRUE; + bHandled = sal_True; long nNewCol = nCol; switch(nKey) { @@ -605,7 +603,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt ) //make sure that a table can initially be created if(bInitialKeyInput) { - bInitialKeyInput = FALSE; + bInitialKeyInput = sal_False; if(!nNewCol) nNewCol = 1; } @@ -614,7 +612,7 @@ void ColumnsWindow::KeyInput( const KeyEvent& rKEvt ) } else if(KEY_MOD1 == nModifier && KEY_RETURN == nKey) { - m_bMod1 = TRUE; + m_bMod1 = sal_True; if(IsMouseCaptured()) ReleaseMouse(); EndPopupMode(FLOATWIN_POPUPMODEEND_CLOSEALL ); @@ -696,7 +694,7 @@ void ColumnsWindow::PopupModeEnd() { if ( !IsPopupModeCanceled() && nCol ) { - USHORT nId = GetId(); + sal_uInt16 nId = GetId(); Window* pParent = rTbx.GetParent(); pParent->UserEvent(SVX_EVENT_COLUM_WINDOW_EXECUTE, reinterpret_cast<void*>(nId)); @@ -717,9 +715,9 @@ void ColumnsWindow::PopupModeEnd() // class SvxTableToolBoxControl ------------------------------------------ -SvxTableToolBoxControl::SvxTableToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxTableToolBoxControl::SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), - bEnabled( TRUE ) + bEnabled( sal_True ) { rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); rTbx.Invalidate(); @@ -764,17 +762,17 @@ SfxPopupWindow* SvxTableToolBoxControl::CreatePopupWindowCascading() // ----------------------------------------------------------------------- -void SvxTableToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState ) +void SvxTableToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { if ( pState && pState->ISA(SfxUInt16Item) ) { - INT16 nValue = static_cast< const SfxUInt16Item* >( pState )->GetValue(); + sal_Int16 nValue = static_cast< const SfxUInt16Item* >( pState )->GetValue(); bEnabled = ( nValue != 0 ); } else bEnabled = SFX_ITEM_DISABLED != eState; - USHORT nId = GetId(); + sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); @@ -784,7 +782,7 @@ void SvxTableToolBoxControl::StateChanged( USHORT, SfxItemState eState, const Sf // class SvxColumnsToolBoxControl ------------------------------------------ -SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxColumnsToolBoxControl::SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); @@ -831,7 +829,7 @@ SfxPopupWindow* SvxColumnsToolBoxControl::CreatePopupWindowCascading() return pWin; } -void SvxColumnsToolBoxControl::StateChanged( USHORT nSID, +void SvxColumnsToolBoxControl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 6dff1e0653..434d318398 100644..100755 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -47,7 +47,7 @@ #include <svl/slstitm.hxx> #include <svl/stritem.hxx> #include <svx/dialmgr.hxx> -#include <lboxctrl.hxx> +#include <svx/lboxctrl.hxx> #include <vcl/mnemonic.hxx> #include <tools/urlobj.hxx> @@ -71,47 +71,47 @@ class SvxPopupWindowListBox : public SfxPopupWindow ListBox * pListBox; ToolBox & rToolBox; - BOOL bUserSel; - USHORT nTbxId; + sal_Bool bUserSel; + sal_uInt16 nTbxId; rtl::OUString maCommandURL; // disallow copy-constructor and assignment-operator SvxPopupWindowListBox(const int& ); SvxPopupWindowListBox & operator = (const int& ); -// SvxPopupWindowListBox( USHORT nSlotId, ToolBox& rTbx, USHORT nTbxItemId ); +// SvxPopupWindowListBox( sal_uInt16 nSlotId, ToolBox& rTbx, sal_uInt16 nTbxItemId ); public: - SvxPopupWindowListBox( USHORT nSlotId, const rtl::OUString& rCommandURL, USHORT nTbxId, ToolBox& rTbx ); + SvxPopupWindowListBox( sal_uInt16 nSlotId, const rtl::OUString& rCommandURL, sal_uInt16 nTbxId, ToolBox& rTbx ); virtual ~SvxPopupWindowListBox(); // SfxPopupWindow virtual SfxPopupWindow * Clone() const; virtual void PopupModeEnd(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); void StartSelection(); inline ListBox & GetListBox() { return *pListBox; } - BOOL IsUserSelected() const { return bUserSel; } - void SetUserSelected( BOOL bVal ) { bUserSel = bVal; } + sal_Bool IsUserSelected() const { return bUserSel; } + void SetUserSelected( sal_Bool bVal ) { bUserSel = bVal; } /*virtual*/Window* GetPreferredKeyInputWindow(); }; ///////////////////////////////////////////////////////////////// -SvxPopupWindowListBox::SvxPopupWindowListBox( USHORT nSlotId, const rtl::OUString& rCommandURL, USHORT nId, ToolBox& rTbx ) : +SvxPopupWindowListBox::SvxPopupWindowListBox( sal_uInt16 nSlotId, const rtl::OUString& rCommandURL, sal_uInt16 nId, ToolBox& rTbx ) : SfxPopupWindow( nSlotId, Reference< XFrame >(), SVX_RES( RID_SVXTBX_UNDO_REDO_CTRL ) ), rToolBox ( rTbx ), - bUserSel ( FALSE ), + bUserSel ( sal_False ), nTbxId ( nId ), maCommandURL( rCommandURL ) { DBG_ASSERT( nSlotId == GetId(), "id mismatch" ); pListBox = new ListBox( this, SVX_RES( LB_SVXTBX_UNDO_REDO_CTRL ) ); FreeResource(); - pListBox->EnableMultiSelection( TRUE, TRUE ); + pListBox->EnableMultiSelection( sal_True, sal_True ); SetBackground( GetSettings().GetStyleSettings().GetDialogColor() ); AddStatusListener( rCommandURL ); } @@ -145,7 +145,7 @@ void SvxPopupWindowListBox::PopupModeEnd() void SvxPopupWindowListBox::StateChanged( - USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { rToolBox.EnableItem( nTbxId, ( SfxToolBoxControl::GetItemState( pState ) != SFX_ITEM_DISABLED) ); SfxPopupWindow::StateChanged( nSID, eState, pState ); @@ -169,7 +169,7 @@ Window* SvxPopupWindowListBox::GetPreferredKeyInputWindow() SFX_IMPL_TOOLBOX_CONTROL( SvxListBoxControl, SfxStringItem ); -SvxListBoxControl::SvxListBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) +SvxListBoxControl::SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ), pPopupWin ( 0 ) { @@ -197,7 +197,7 @@ SfxPopupWindowType SvxListBoxControl::GetPopupWindowType() const void SvxListBoxControl::StateChanged( - USHORT, SfxItemState, const SfxPoolItem* pState ) + sal_uInt16, SfxItemState, const SfxPoolItem* pState ) { GetToolBox().EnableItem( GetId(), SFX_ITEM_DISABLED != GetItemState(pState) ); @@ -209,7 +209,7 @@ IMPL_LINK( SvxListBoxControl, PopupModeEndHdl, void *, EMPTYARG ) if( pPopupWin && 0 == pPopupWin->GetPopupModeFlags() && pPopupWin->IsUserSelected() ) { - USHORT nCount = pPopupWin->GetListBox().GetSelectEntryCount(); + sal_uInt16 nCount = pPopupWin->GetListBox().GetSelectEntryCount(); INetURLObject aObj( m_aCommandURL ); @@ -222,13 +222,13 @@ IMPL_LINK( SvxListBoxControl, PopupModeEndHdl, void *, EMPTYARG ) } -void SvxListBoxControl::Impl_SetInfo( USHORT nCount ) +void SvxListBoxControl::Impl_SetInfo( sal_uInt16 nCount ) { DBG_ASSERT( pPopupWin, "NULL pointer, PopupWindow missing" ); // ListBox &rListBox = pPopupWin->GetListBox(); - USHORT nId; + sal_uInt16 nId; if (nCount == 1) nId = SID_UNDO == GetSlotId() ? RID_SVXSTR_NUM_UNDO_ACTION : RID_SVXSTR_NUM_REDO_ACTION; else @@ -246,14 +246,14 @@ IMPL_LINK( SvxListBoxControl, SelectHdl, void *, EMPTYARG ) { if (pPopupWin) { - //pPopupWin->SetUserSelected( FALSE ); + //pPopupWin->SetUserSelected( sal_False ); ListBox &rListBox = pPopupWin->GetListBox(); if (rListBox.IsTravelSelect()) Impl_SetInfo( rListBox.GetSelectEntryCount() ); else { - pPopupWin->SetUserSelected( TRUE ); + pPopupWin->SetUserSelected( sal_True ); pPopupWin->EndPopupMode( 0 ); } } @@ -264,7 +264,7 @@ IMPL_LINK( SvxListBoxControl, SelectHdl, void *, EMPTYARG ) SFX_IMPL_TOOLBOX_CONTROL( SvxUndoRedoControl, SfxStringItem ); -SvxUndoRedoControl::SvxUndoRedoControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) +SvxUndoRedoControl::SvxUndoRedoControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxListBoxControl( nSlotId, nId, rTbx ) { rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) ); @@ -277,7 +277,7 @@ SvxUndoRedoControl::~SvxUndoRedoControl() } void SvxUndoRedoControl::StateChanged( - USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if ( nSID == SID_UNDO || nSID == SID_REDO ) { diff --git a/svx/source/tbxctrls/lboxctrl.hrc b/svx/source/tbxctrls/lboxctrl.hrc index 6f744ae1c2..6f744ae1c2 100644..100755 --- a/svx/source/tbxctrls/lboxctrl.hrc +++ b/svx/source/tbxctrls/lboxctrl.hrc diff --git a/svx/source/tbxctrls/lboxctrl.src b/svx/source/tbxctrls/lboxctrl.src index 149627ef16..b82be11fb5 100644..100755 --- a/svx/source/tbxctrls/lboxctrl.src +++ b/svx/source/tbxctrls/lboxctrl.src @@ -40,6 +40,7 @@ FloatingWindow RID_SVXTBX_UNDO_REDO_CTRL ListBox LB_SVXTBX_UNDO_REDO_CTRL { + HelpID = "svx:ListBox:RID_SVXTBX_UNDO_REDO_CTRL:LB_SVXTBX_UNDO_REDO_CTRL"; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( 100 , 85 ) ; Border = TRUE ; diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 8f74252f35..79e4abefab 100644..100755 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -41,10 +41,10 @@ #include <svx/dialogs.hrc> #include "helpid.hrc" -#include "drawitem.hxx" -#include "xattr.hxx" +#include "svx/drawitem.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> -#include "linectrl.hxx" +#include "svx/linectrl.hxx" #include <svx/itemwin.hxx> #include <svx/dialmgr.hxx> @@ -87,13 +87,13 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxLineEndToolBoxControl, SfxBoolItem ); |* \************************************************************************/ -SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( USHORT nSlotId, - USHORT nId, +SvxLineStyleToolBoxControl::SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, + sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), pStyleItem ( NULL ), pDashItem ( NULL ), - bUpdate ( FALSE ) + bUpdate ( sal_False ) { addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineDash" ))); addStatusListener( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:DashListState" ))); @@ -111,7 +111,7 @@ SvxLineStyleToolBoxControl::~SvxLineStyleToolBoxControl() void SvxLineStyleToolBoxControl::StateChanged ( - USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { SvxLineBox* pBox = (SvxLineBox*)GetToolBox().GetItemWindow( GetId() ); @@ -139,7 +139,7 @@ void SvxLineStyleToolBoxControl::StateChanged ( pDashItem = (XLineDashItem*)pState->Clone(); } - bUpdate = TRUE; + bUpdate = sal_True; Update( pState ); } else if ( nSID != SID_DASH_LIST ) @@ -156,7 +156,7 @@ void SvxLineStyleToolBoxControl::Update( const SfxPoolItem* pState ) { if ( pState && bUpdate ) { - bUpdate = FALSE; + bUpdate = sal_False; SvxLineBox* pBox = (SvxLineBox*)GetToolBox().GetItemWindow( GetId() ); DBG_ASSERT( pBox, "Window not found!" ); @@ -231,7 +231,7 @@ Window* SvxLineStyleToolBoxControl::CreateItemWindow( Window *pParent ) \************************************************************************/ SvxLineWidthToolBoxControl::SvxLineWidthToolBoxControl( - USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : + sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:MetricUnit" ))); @@ -246,7 +246,7 @@ SvxLineWidthToolBoxControl::~SvxLineWidthToolBoxControl() //======================================================================== void SvxLineWidthToolBoxControl::StateChanged( - USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { SvxMetricField* pFld = (SvxMetricField*) GetToolBox().GetItemWindow( GetId() ); @@ -298,7 +298,7 @@ Window* SvxLineWidthToolBoxControl::CreateItemWindow( Window *pParent ) \************************************************************************/ SvxLineColorToolBoxControl::SvxLineColorToolBoxControl( - USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : + sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColorTableState" ))); @@ -314,7 +314,7 @@ SvxLineColorToolBoxControl::~SvxLineColorToolBoxControl() void SvxLineColorToolBoxControl::StateChanged( - USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { SvxColorBox* pBox = (SvxColorBox*)GetToolBox().GetItemWindow( GetId() ); @@ -376,7 +376,7 @@ Window* SvxLineColorToolBoxControl::CreateItemWindow( Window *pParent ) \************************************************************************/ SvxLineEndWindow::SvxLineEndWindow( - USHORT nSlotId, + sal_uInt16 nSlotId, const Reference< XFrame >& rFrame, const String& rWndTitle ) : SfxPopupWindow( nSlotId, @@ -387,7 +387,7 @@ SvxLineEndWindow::SvxLineEndWindow( nCols ( 2 ), nLines ( 12 ), nLineEndWidth ( 400 ), - bPopupMode ( TRUE ), + bPopupMode ( sal_True ), mbInResize ( false ), mxFrame ( rFrame ) { @@ -396,7 +396,7 @@ SvxLineEndWindow::SvxLineEndWindow( } SvxLineEndWindow::SvxLineEndWindow( - USHORT nSlotId, + sal_uInt16 nSlotId, const Reference< XFrame >& rFrame, Window* pParentWindow, const String& rWndTitle ) : @@ -409,7 +409,7 @@ SvxLineEndWindow::SvxLineEndWindow( nCols ( 2 ), nLines ( 12 ), nLineEndWidth ( 400 ), - bPopupMode ( TRUE ), + bPopupMode ( sal_True ), mbInResize ( false ), mxFrame ( rFrame ) { @@ -466,7 +466,7 @@ IMPL_LINK( SvxLineEndWindow, SelectHdl, void *, EMPTYARG ) { XLineEndItem* pLineEndItem = NULL; XLineStartItem* pLineStartItem = NULL; - USHORT nId = aLineEndSet.GetSelectItemId(); + sal_uInt16 nId = aLineEndSet.GetSelectItemId(); if( nId == 1 ) { @@ -542,7 +542,7 @@ void SvxLineEndWindow::FillValueSet() DBG_ASSERT( pBmp, "UI-Bitmap wurde nicht erzeugt" ); aBmpSize = pBmp->GetSizePixel(); - aVD.SetOutputSizePixel( aBmpSize, FALSE ); + aVD.SetOutputSizePixel( aBmpSize, sal_False ); aBmpSize.Width() = aBmpSize.Width() / 2; Point aPt0( 0, 0 ); Point aPt1( aBmpSize.Width(), 0 ); @@ -561,10 +561,10 @@ void SvxLineEndWindow::FillValueSet() DBG_ASSERT( pBmp, "UI-Bitmap wurde nicht erzeugt" ); aVD.DrawBitmap( aPt0, *pBmp ); - aLineEndSet.InsertItem( (USHORT)((i+1L)*2L+1L), aVD.GetBitmap( aPt0, aBmpSize ), pEntry->GetName() ); - aLineEndSet.InsertItem( (USHORT)((i+2L)*2L), aVD.GetBitmap( aPt1, aBmpSize ), pEntry->GetName() ); + aLineEndSet.InsertItem( (sal_uInt16)((i+1L)*2L+1L), aVD.GetBitmap( aPt0, aBmpSize ), pEntry->GetName() ); + aLineEndSet.InsertItem( (sal_uInt16)((i+2L)*2L), aVD.GetBitmap( aPt1, aBmpSize ), pEntry->GetName() ); } - nLines = Min( (USHORT)(nCount + 1), (USHORT) MAX_LINES ); + nLines = Min( (sal_uInt16)(nCount + 1), (sal_uInt16) MAX_LINES ); aLineEndSet.SetLineCount( nLines ); SetSize(); @@ -608,21 +608,21 @@ void SvxLineEndWindow::Resizing( Size& rNewSize ) Size aItemSize = aLineEndSet.CalcItemSizePixel( aBitmapSize ); // -> Member //Size aOldSize = GetOutputSizePixel(); // fuer Breite - USHORT nItemCount = aLineEndSet.GetItemCount(); // -> Member + sal_uInt16 nItemCount = aLineEndSet.GetItemCount(); // -> Member // Spalten ermitteln long nItemW = aItemSize.Width(); long nW = rNewSize.Width(); - nCols = (USHORT) Max( ( (ULONG)(( nW + nItemW ) / ( nItemW * 2 ) )), - (ULONG) 1L ); + nCols = (sal_uInt16) Max( ( (sal_uIntPtr)(( nW + nItemW ) / ( nItemW * 2 ) )), + (sal_uIntPtr) 1L ); nCols *= 2; // Reihen ermitteln long nItemH = aItemSize.Height(); long nH = rNewSize.Height(); - nLines = (USHORT) Max( ( ( nH + nItemH / 2 ) / nItemH ), 1L ); + nLines = (sal_uInt16) Max( ( ( nH + nItemH / 2 ) / nItemH ), 1L ); - USHORT nMaxCols = nItemCount / nLines; + sal_uInt16 nMaxCols = nItemCount / nLines; if( nItemCount % nLines ) nMaxCols++; if( nCols > nMaxCols ) @@ -632,9 +632,9 @@ void SvxLineEndWindow::Resizing( Size& rNewSize ) // Keine ungerade Anzahl von Spalten if( nCols % 2 ) nCols--; - nCols = Max( nCols, (USHORT) 2 ); + nCols = Max( nCols, (sal_uInt16) 2 ); - USHORT nMaxLines = nItemCount / nCols; + sal_uInt16 nMaxLines = nItemCount / nCols; if( nItemCount % nCols ) nMaxLines++; if( nLines > nMaxLines ) @@ -653,7 +653,7 @@ void SvxLineEndWindow::StartSelection() // ----------------------------------------------------------------------- -BOOL SvxLineEndWindow::Close() +sal_Bool SvxLineEndWindow::Close() { return SfxPopupWindow::Close(); } @@ -661,7 +661,7 @@ BOOL SvxLineEndWindow::Close() // ----------------------------------------------------------------------- void SvxLineEndWindow::StateChanged( - USHORT nSID, SfxItemState, const SfxPoolItem* pState ) + sal_uInt16 nSID, SfxItemState, const SfxPoolItem* pState ) { if ( nSID == SID_LINEEND_LIST ) { @@ -687,7 +687,7 @@ void SvxLineEndWindow::PopupModeEnd() { if ( IsVisible() ) { - bPopupMode = FALSE; + bPopupMode = sal_False; SetSize(); } SfxPopupWindow::PopupModeEnd(); @@ -700,8 +700,8 @@ void SvxLineEndWindow::SetSize() //if( !bPopupMode ) if( !IsInPopupMode() ) { - USHORT nItemCount = aLineEndSet.GetItemCount(); // -> Member - USHORT nMaxLines = nItemCount / nCols; // -> Member ? + sal_uInt16 nItemCount = aLineEndSet.GetItemCount(); // -> Member + sal_uInt16 nMaxLines = nItemCount / nCols; // -> Member ? if( nItemCount % nCols ) nMaxLines++; @@ -739,7 +739,7 @@ void SvxLineEndWindow::GetFocus (void) |* \************************************************************************/ -SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox &rTbx ) : +SvxLineEndToolBoxControl::SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox &rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); @@ -773,9 +773,9 @@ SfxPopupWindow* SvxLineEndToolBoxControl::CreatePopupWindow() // ----------------------------------------------------------------------- -void SvxLineEndToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* ) +void SvxLineEndToolBoxControl::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* ) { - USHORT nId = GetId(); + sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); diff --git a/svx/source/tbxctrls/linectrl.src b/svx/source/tbxctrls/linectrl.src index 6ed613bb20..6ed613bb20 100644..100755 --- a/svx/source/tbxctrls/linectrl.src +++ b/svx/source/tbxctrls/linectrl.src diff --git a/svx/source/tbxctrls/makefile.mk b/svx/source/tbxctrls/makefile.mk deleted file mode 100644 index a9ea745f3c..0000000000 --- a/svx/source/tbxctrls/makefile.mk +++ /dev/null @@ -1,84 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=tbxctrls -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/fontworkgallery.obj\ - $(SLO)$/extrusioncontrols.obj \ - $(SLO)$/tbcontrl.obj \ - $(SLO)$/tbxcolorupdate.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/formatpaintbrushctrl.obj\ - $(SLO)$/colrctrl.obj \ - $(SLO)$/fillctrl.obj \ - $(SLO)$/grafctrl.obj \ - $(SLO)$/itemwin.obj \ - $(SLO)$/layctrl.obj \ - $(SLO)$/lboxctrl.obj \ - $(SLO)$/linectrl.obj \ - $(SLO)$/tbxalign.obj \ - $(SLO)$/tbxdrctl.obj \ - $(SLO)$/verttexttbxctrl.obj \ - $(SLO)$/subtoolboxcontrol.obj \ - $(SLO)$/tbxcolor.obj \ - $(SLO)$/tbunocontroller.obj \ - $(SLO)$/tbunosearchcontrollers.obj - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -SRS1NAME=$(TARGET) -SRC1FILES = \ - fontworkgallery.src \ - extrusioncontrols.src \ - colrctrl.src \ - lboxctrl.src \ - linectrl.src \ - tbcontrl.src \ - tbunosearchcontrollers.src \ - tbxdraw.src \ - grafctrl.src - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/tbxctrls/subtoolboxcontrol.cxx b/svx/source/tbxctrls/subtoolboxcontrol.cxx index 96d98ebc67..cfc084c93f 100644..100755 --- a/svx/source/tbxctrls/subtoolboxcontrol.cxx +++ b/svx/source/tbxctrls/subtoolboxcontrol.cxx @@ -42,7 +42,7 @@ SFX_IMPL_TOOLBOX_CONTROL( SvxSubToolBoxControl, SfxUInt16Item ); **********************************************************************/ -SvxSubToolBoxControl::SvxSubToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) +SvxSubToolBoxControl::SvxSubToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) { rTbx.SetItemBits( nId, TIB_DROPDOWNONLY | rTbx.GetItemBits( nId ) ); diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 14c45e4d1c..5c1f7979f1 100644..100755 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -74,7 +74,7 @@ #include <svx/dialogs.hrc> #include <svx/svxitems.hrc> #include "helpid.hrc" -#include "htmlmode.hxx" +#include "svx/htmlmode.hxx" #include <svx/xtable.hxx> #include "editeng/fontitem.hxx" #include <editeng/fhgtitem.hxx> @@ -83,9 +83,9 @@ #include <editeng/colritem.hxx> #include "editeng/flstitem.hxx" #include "editeng/bolnitem.hxx" -#include "drawitem.hxx" +#include "svx/drawitem.hxx" #include <svx/tbcontrl.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> #include "colorwindow.hxx" #include <memory> @@ -106,11 +106,11 @@ #define DELETEZ(p) (delete (p), (p)=NULL) #endif // don't make more than 15 entries visible at once -#define MAX_STYLES_ENTRIES static_cast< USHORT >( 15 ) +#define MAX_STYLES_ENTRIES static_cast< sal_uInt16 >( 15 ) void lcl_ResizeValueSet( Window &rWin, ValueSet &rValueSet ); void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemSize ); -BOOL lcl_FontChangedHint( const SfxHint &rHint ); +sal_Bool lcl_FontChangedHint( const SfxHint &rHint ); // namespaces using ::rtl::OUString; @@ -141,12 +141,12 @@ class SvxStyleBox_Impl : public ComboBox { using Window::IsVisible; public: - SvxStyleBox_Impl( Window* pParent, USHORT nSlot, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, - const Reference< XFrame >& _xFrame,const String& rClearFormatKey, const String& rMoreKey, BOOL bInSpecialMode ); + SvxStyleBox_Impl( Window* pParent, sal_uInt16 nSlot, const OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, + const Reference< XFrame >& _xFrame,const String& rClearFormatKey, const String& rMoreKey, sal_Bool bInSpecialMode ); ~SvxStyleBox_Impl(); void SetFamily( SfxStyleFamily eNewFamily ); - inline BOOL IsVisible() { return bVisible; } + inline sal_Bool IsVisible() { return bVisible; } virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); @@ -163,20 +163,20 @@ protected: virtual void Select(); private: - USHORT nSlotId; + sal_uInt16 nSlotId; SfxStyleFamily eStyleFamily; - USHORT nCurSel; - BOOL bRelease; + sal_uInt16 nCurSel; + sal_Bool bRelease; Size aLogicalSize; Link aVisibilityListener; - BOOL bVisible; + sal_Bool bVisible; Reference< XDispatchProvider > m_xDispatchProvider; Reference< XFrame > m_xFrame; OUString m_aCommand; String aClearFormatKey; String aMoreKey; String sDefaultStyle; - BOOL bInSpecialMode; + sal_Bool bInSpecialMode; void ReleaseFocus(); }; @@ -194,8 +194,8 @@ private: Font aCurFont; Size aLogicalSize; String aCurText; - USHORT nFtCount; - BOOL bRelease; + sal_uInt16 nFtCount; + sal_Bool bRelease; Reference< XDispatchProvider > m_xDispatchProvider; Reference< XFrame > m_xFrame; @@ -213,7 +213,7 @@ public: void FillList(); void Update( const SvxFontItem* pFontItem ); - USHORT GetListCount() { return nFtCount; } + sal_uInt16 GetListCount() { return nFtCount; } void Clear() { FontNameBox::Clear(); nFtCount = 0; } void Fill( const FontList* pList ) { FontNameBox::Fill( pList ); @@ -233,12 +233,12 @@ public: class SvxFrmValueSet_Impl : public ValueSet { - USHORT nModifier; + sal_uInt16 nModifier; virtual void MouseButtonUp( const MouseEvent& rMEvt ); public: SvxFrmValueSet_Impl(Window* pParent, WinBits nWinStyle) : ValueSet(pParent, nWinStyle), nModifier(0) {} - USHORT GetModifier() const {return nModifier;} + sal_uInt16 GetModifier() const {return nModifier;} }; @@ -263,16 +263,16 @@ private: protected: virtual void Resize(); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual Window* GetPreferredKeyInputWindow(); virtual void GetFocus(); public: - SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ); + SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ); ~SvxFrameWindow_Impl(); void StartSelection(); - virtual void StateChanged( USHORT nSID, SfxItemState eState, + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); virtual SfxPopupWindow* Clone() const; virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -288,20 +288,20 @@ private: bool m_bIsWriter; #if _SOLAR__PRIVATE - void MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& rSize, String& rStr, + void MakeLineBitmap( sal_uInt16 nNo, Bitmap& rBmp, const Size& rSize, String& rStr, const ::Color& rLine, const ::Color& rBack ); DECL_LINK( SelectHdl, void * ); #endif protected: virtual void Resize(); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual Window* GetPreferredKeyInputWindow(); virtual void GetFocus(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); void CreateBitmaps( void ); public: - SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ); + SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ); void StartSelection(); virtual SfxPopupWindow* Clone() const; @@ -318,12 +318,12 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener { public: SfxStyleControllerItem_Impl( const Reference< XDispatchProvider >& rDispatchProvider, - USHORT nSlotId, + sal_uInt16 nSlotId, const rtl::OUString& rCommand, SvxStyleToolBoxControl& rTbxCtl ); protected: - virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ); + virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); private: SvxStyleToolBoxControl& rControl; @@ -335,21 +335,21 @@ class SfxStyleControllerItem_Impl : public SfxStatusListener SvxStyleBox_Impl::SvxStyleBox_Impl( Window* pParent, - USHORT nSlot, + sal_uInt16 nSlot, const rtl::OUString& rCommand, SfxStyleFamily eFamily, const Reference< XDispatchProvider >& rDispatchProvider, const Reference< XFrame >& _xFrame, const String& rClearFormatKey, const String& rMoreKey, - BOOL bInSpec) : + sal_Bool bInSpec) : ComboBox( pParent, SVX_RES( RID_SVXTBX_STYLE ) ), nSlotId ( nSlot ), eStyleFamily( eFamily ), - bRelease ( TRUE ), - bVisible(FALSE), + bRelease ( sal_True ), + bVisible(sal_False), m_xDispatchProvider( rDispatchProvider ), m_xFrame(_xFrame), m_aCommand ( rCommand ), @@ -358,7 +358,7 @@ SvxStyleBox_Impl::SvxStyleBox_Impl( bInSpecialMode ( bInSpec ) { aLogicalSize = PixelToLogic( GetSizePixel(), MAP_APPFONT ); - EnableAutocomplete( TRUE ); + EnableAutocomplete( sal_True ); } SvxStyleBox_Impl::~SvxStyleBox_Impl() @@ -371,7 +371,7 @@ void SvxStyleBox_Impl::ReleaseFocus() { if ( !bRelease ) { - bRelease = TRUE; + bRelease = sal_True; return; } if ( m_xFrame.is() && m_xFrame->getContainerWindow().is() ) @@ -459,7 +459,7 @@ void SvxStyleBox_Impl::SetFamily( SfxStyleFamily eNewFamily ) long SvxStyleBox_Impl::PreNotify( NotifyEvent& rNEvt ) { - USHORT nType = rNEvt.GetType(); + sal_uInt16 nType = rNEvt.GetType(); if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType ) nCurSel = GetSelectEntryPos(); @@ -480,7 +480,7 @@ long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == EVENT_KEYINPUT ) { - USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode(); + sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode(); switch ( nCode ) { @@ -488,7 +488,7 @@ long SvxStyleBox_Impl::Notify( NotifyEvent& rNEvt ) case KEY_TAB: { if ( KEY_TAB == nCode ) - bRelease = FALSE; + bRelease = sal_False; else nHandled = 1; Select(); @@ -530,7 +530,7 @@ void SvxStyleBox_Impl::StateChanged( StateChangedType nStateChange ) } else if ( nStateChange == STATE_CHANGE_INITSHOW ) { - bVisible = TRUE; + bVisible = sal_True; if ( aVisibilityListener.IsSet() ) aVisibilityListener.Call( this ); } @@ -548,9 +548,9 @@ IMPL_STATIC_LINK( SvxStyleBox_Impl, FocusHdl_Impl, Control*, _pCtrl ) // ----------------------------------------------------------------------- -BOOL GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox ) +sal_Bool GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox ) { - BOOL bChanged = FALSE; + sal_Bool bChanged = sal_False; const SfxObjectShell* pDocSh = SfxObjectShell::Current(); SvxFontListItem* pFontListItem = NULL; @@ -562,7 +562,7 @@ BOOL GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox ::std::auto_ptr<FontList> aFontList(new FontList( pBox )); *ppFontList = aFontList.get(); pBox->SetOwnFontList(aFontList); - bChanged = TRUE; + bChanged = sal_True; } if ( pFontListItem ) @@ -575,7 +575,7 @@ BOOL GetDocFontList_Impl( const FontList** ppFontList, SvxFontNameBox_Impl* pBox { // => "ubernehmen *ppFontList = pNewFontList; - bChanged = TRUE; + bChanged = sal_True; } else { @@ -628,7 +628,7 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( Window* pParent, const Reference< XDis pFontList ( NULL ), aLogicalSize ( 75,160 ), nFtCount ( 0 ), - bRelease ( TRUE ), + bRelease ( sal_True ), m_xDispatchProvider( rDispatchProvider ), m_xFrame (_xFrame) { @@ -668,7 +668,7 @@ void SvxFontNameBox_Impl::Update( const SvxFontItem* pFontItem ) long SvxFontNameBox_Impl::PreNotify( NotifyEvent& rNEvt ) { - USHORT nType = rNEvt.GetType(); + sal_uInt16 nType = rNEvt.GetType(); if ( EVENT_MOUSEBUTTONDOWN == nType || EVENT_GETFOCUS == nType ) { @@ -686,7 +686,7 @@ long SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == EVENT_KEYINPUT ) { - USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode(); + sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode(); switch ( nCode ) { @@ -694,7 +694,7 @@ long SvxFontNameBox_Impl::Notify( NotifyEvent& rNEvt ) case KEY_TAB: { if ( KEY_TAB == nCode ) - bRelease = FALSE; + bRelease = sal_False; else nHandled = 1; Select(); @@ -737,7 +737,7 @@ void SvxFontNameBox_Impl::ReleaseFocus_Impl() { if ( !bRelease ) { - bRelease = TRUE; + bRelease = sal_True; return; } if ( m_xFrame.is() && m_xFrame->getContainerWindow().is() ) @@ -749,8 +749,8 @@ void SvxFontNameBox_Impl::ReleaseFocus_Impl() void SvxFontNameBox_Impl::EnableControls_Impl() { SvtFontOptions aFontOpt; - BOOL bEnable = aFontOpt.IsFontHistoryEnabled(); - USHORT nEntries = bEnable ? MAX_MRU_FONTNAME_ENTRIES : 0; + sal_Bool bEnable = aFontOpt.IsFontHistoryEnabled(); + sal_uInt16 nEntries = bEnable ? MAX_MRU_FONTNAME_ENTRIES : 0; if ( GetMaxMRUCount() != nEntries ) { // refill in the next GetFocus-Handler @@ -818,7 +818,7 @@ void SvxFontNameBox_Impl::Select() #define PALETTE_SIZE (PALETTE_X * PALETTE_Y) SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, - USHORT nSlotId, + sal_uInt16 nSlotId, const Reference< XFrame >& rFrame, const String& rWndTitle, Window* pParentWindow, @@ -835,7 +835,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem = NULL; XColorTable* pColorTable = NULL; - BOOL bKillTable = FALSE; + sal_Bool bKillTable = sal_False; const Size aSize12( 13, 13 ); if ( pDocSh ) @@ -845,13 +845,14 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, if ( !pColorTable ) { pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() ); - bKillTable = TRUE; + bKillTable = sal_True; } if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId ) { aColorSet.SetStyle( aColorSet.GetStyle() | WB_NONEFIELD ); aColorSet.SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) ); + aColorSet.SetAccessibleName( SVX_RESSTR( RID_SVXSTR_BACKGROUND ) ); } else if ( SID_ATTR_CHAR_COLOR == theSlotId || SID_ATTR_CHAR_COLOR2 == theSlotId || SID_EXTRUSION_3D_COLOR == theSlotId ) { @@ -866,8 +867,13 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, { aColorSet.SetStyle( aColorSet.GetStyle() | WB_NONEFIELD ); aColorSet.SetText( SVX_RESSTR( RID_SVXSTR_AUTOMATIC ) ); + aColorSet.SetAccessibleName( SVX_RESSTR( RID_SVXSTR_TEXTCOLOR ) ); } } + else + { + aColorSet.SetAccessibleName( SVX_RESSTR( RID_SVXSTR_FRAME_COLOR ) ); + } if ( pColorTable ) { @@ -932,7 +938,7 @@ SfxPopupWindow* SvxColorWindow_Impl::Clone() const IMPL_LINK( SvxColorWindow_Impl, SelectHdl, void *, EMPTYARG ) { - USHORT nItemId = aColorSet.GetSelectItemId(); + sal_uInt16 nItemId = aColorSet.GetSelectItemId(); SvxColorItem aColorItem( aColorSet.GetItemColor( nItemId ), theSlotId ); /* #i33380# DR 2004-09-03 Moved the following line above the Dispatch() calls. This instance may be deleted in the meantime (i.e. when a dialog is opened @@ -996,14 +1002,14 @@ void SvxColorWindow_Impl::StartSelection() // ----------------------------------------------------------------------- -BOOL SvxColorWindow_Impl::Close() +sal_Bool SvxColorWindow_Impl::Close() { return SfxPopupWindow::Close(); } // ----------------------------------------------------------------------- -void SvxColorWindow_Impl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +void SvxColorWindow_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if (( SFX_ITEM_DISABLED != eState ) && pState ) { @@ -1050,7 +1056,7 @@ void SvxColorWindow_Impl::StateChanged( USHORT nSID, SfxItemState eState, const // class SvxFrameWindow_Impl -------------------------------------------------- //======================================================================== -SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : +SvxFrameWindow_Impl::SvxFrameWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ), aFrameSet ( this, WinBits( WB_ITEMBORDER | WB_DOUBLEBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT ) ), @@ -1072,7 +1078,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& * abgeschaltet werden */ - USHORT i = 0; + sal_uInt16 i = 0; for ( i=1; i<9; i++ ) aFrameSet.InsertItem( i, aImgList.GetImage(i) ); @@ -1089,6 +1095,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& SetHelpId( HID_POPUP_FRAME ); SetText( SVX_RESSTR(RID_SVXSTR_FRAME) ); + aFrameSet.SetAccessibleName( SVX_RESSTR(RID_SVXSTR_FRAME) ); aFrameSet.Show(); } @@ -1121,9 +1128,9 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) { aImgList = ImageList( SVX_RES( RID_SVXIL_FRAME ) ); - USHORT nNumOfItems = aFrameSet.GetItemCount(); + sal_uInt16 nNumOfItems = aFrameSet.GetItemCount(); - for( USHORT i = 1 ; i <= nNumOfItems ; ++i ) + for( sal_uInt16 i = 1 ; i <= nNumOfItems ; ++i ) aFrameSet.SetItemImage( i, aImgList.GetImage( i ) ); } } @@ -1152,9 +1159,9 @@ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG ) *pRight = 0, *pTop = 0, *pBottom = 0; - USHORT nSel = aFrameSet.GetSelectItemId(); - USHORT nModifier = aFrameSet.GetModifier(); - BYTE nValidFlags = 0; + sal_uInt16 nSel = aFrameSet.GetSelectItemId(); + sal_uInt16 nModifier = aFrameSet.GetModifier(); + sal_uInt8 nValidFlags = 0; theDefLine.SetOutWidth( DEF_LINE_WIDTH_0 ); switch ( nSel ) @@ -1228,8 +1235,8 @@ IMPL_LINK( SvxFrameWindow_Impl, SelectHdl, void *, EMPTYARG ) aBorderInner.SetValid( VALID_RIGHT, 0 != (nValidFlags&FRM_VALID_RIGHT )); aBorderInner.SetValid( VALID_HORI, 0 != (nValidFlags&FRM_VALID_HINNER )); aBorderInner.SetValid( VALID_VERT, 0 != (nValidFlags&FRM_VALID_VINNER)); - aBorderInner.SetValid( VALID_DISTANCE, TRUE ); - aBorderInner.SetValid( VALID_DISABLE, FALSE ); + aBorderInner.SetValid( VALID_DISTANCE, sal_True ); + aBorderInner.SetValid( VALID_DISABLE, sal_False ); if ( IsInPopupMode() ) EndPopupMode(); @@ -1265,7 +1272,7 @@ void SvxFrameWindow_Impl::Resize() void SvxFrameWindow_Impl::StateChanged( - USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { if ( pState && nSID == SID_BORDER_REDUCED_MODE) @@ -1274,24 +1281,24 @@ void SvxFrameWindow_Impl::StateChanged( if ( pItem ) { - bParagraphMode = (BOOL)pItem->GetValue(); + bParagraphMode = (sal_Bool)pItem->GetValue(); //initial calls mustn't insert or remove elements if(aFrameSet.GetItemCount()) { - BOOL bTableMode = ( aFrameSet.GetItemCount() == 12 ); - BOOL bResize = FALSE; + sal_Bool bTableMode = ( aFrameSet.GetItemCount() == 12 ); + sal_Bool bResize = sal_False; if ( bTableMode && bParagraphMode ) { - for ( USHORT i = 9; i < 13; i++ ) + for ( sal_uInt16 i = 9; i < 13; i++ ) aFrameSet.RemoveItem(i); - bResize = TRUE; + bResize = sal_True; } else if ( !bTableMode && !bParagraphMode ) { - for ( USHORT i = 9; i < 13; i++ ) + for ( sal_uInt16 i = 9; i < 13; i++ ) aFrameSet.InsertItem( i, aImgList.GetImage(i) ); - bResize = TRUE; + bResize = sal_True; } if ( bResize ) @@ -1313,7 +1320,7 @@ void SvxFrameWindow_Impl::StartSelection() // ----------------------------------------------------------------------- -BOOL SvxFrameWindow_Impl::Close() +sal_Bool SvxFrameWindow_Impl::Close() { return SfxPopupWindow::Close(); } @@ -1322,7 +1329,7 @@ BOOL SvxFrameWindow_Impl::Close() // class SvxLineWindow_Impl -------------------------------------------------- //======================================================================== -SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : +SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame >& rFrame, Window* pParentWindow ) : SfxPopupWindow( nId, rFrame, pParentWindow, WinBits( WB_STDPOPUP ) ), @@ -1343,6 +1350,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r aLineSet.SetSelectHdl( LINK( this, SvxLineWindow_Impl, SelectHdl ) ); aLineSet.SetText( SVX_RESSTR(STR_NONE) ); + aLineSet.SetAccessibleName( SVX_RESSTR(RID_SVXSTR_FRAME_STYLE) ); lcl_CalcSizeValueSet( *this, aLineSet, aBmpSize ); SetHelpId( HID_POPUP_LINE ); @@ -1357,7 +1365,7 @@ SfxPopupWindow* SvxLineWindow_Impl::Clone() const // ----------------------------------------------------------------------- -void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& rSize, String& rStr, +void SvxLineWindow_Impl::MakeLineBitmap( sal_uInt16 nNo, Bitmap& rBmp, const Size& rSize, String& rStr, const ::Color& rLineCol, const ::Color& rBackCol ) { VirtualDevice aVirDev( *this ); @@ -1383,14 +1391,14 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r aRect.Top() = 5; aRect.Bottom() = 6; aVirDev.DrawRect( aRect ); - nLineWidth = (USHORT) DEF_LINE_WIDTH_1/20; + nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_1/20; break; case 3: // DEF_LINE_WIDTH_2 aRect.Top() = 5; aRect.Bottom() = 7; aVirDev.DrawRect( aRect ); - nLineWidth = (USHORT) DEF_LINE_WIDTH_2/20; + nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_2/20; break; case 4: // DEF_LINE_WIDTH_3 @@ -1398,14 +1406,14 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r aRect.Bottom() = 7; aVirDev.DrawRect( aRect ); aVirDev.DrawRect( Rectangle( Point(2,4), Point(37,7) ) ); - nLineWidth = (USHORT) DEF_LINE_WIDTH_3/20; + nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_3/20; break; case 5: // DEF_LINE_WIDTH_4 aRect.Top() = 4; aRect.Bottom() = 8; aVirDev.DrawRect( aRect ); - nLineWidth = (USHORT) DEF_LINE_WIDTH_4/20; + nLineWidth = (sal_uInt16) DEF_LINE_WIDTH_4/20; break; case 6: // DEF_DOUBLE_LINE0 @@ -1415,7 +1423,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r aRect.Top() = 7; aRect.Bottom() = 7; aVirDev.DrawRect( aRect ); - nLineWidth = (USHORT) (DEF_DOUBLE_LINE0_OUT+DEF_DOUBLE_LINE0_IN+DEF_DOUBLE_LINE0_DIST)/20; + nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE0_OUT+DEF_DOUBLE_LINE0_IN+DEF_DOUBLE_LINE0_DIST)/20; break; case 7: // DEF_DOUBLE_LINE7 @@ -1425,7 +1433,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r aRect.Top() = 7; aRect.Bottom() = 7; aVirDev.DrawRect( aRect ); - nLineWidth = (USHORT) (DEF_DOUBLE_LINE7_OUT+DEF_DOUBLE_LINE7_IN+DEF_DOUBLE_LINE7_DIST)/20; + nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE7_OUT+DEF_DOUBLE_LINE7_IN+DEF_DOUBLE_LINE7_DIST)/20; break; case 8: // DEF_DOUBLE_LINE1 @@ -1435,7 +1443,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r aRect.Top() = 7; aRect.Bottom() = 8; aVirDev.DrawRect( aRect ); - nLineWidth = (USHORT) (DEF_DOUBLE_LINE1_OUT+DEF_DOUBLE_LINE1_IN+DEF_DOUBLE_LINE1_DIST)/20; + nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE1_OUT+DEF_DOUBLE_LINE1_IN+DEF_DOUBLE_LINE1_DIST)/20; break; case 9: // DEF_DOUBLE_LINE2 @@ -1445,7 +1453,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r aRect.Top() = 8; aRect.Bottom() = 10; aVirDev.DrawRect( aRect ); - nLineWidth = (USHORT) (DEF_DOUBLE_LINE2_OUT+DEF_DOUBLE_LINE2_IN+DEF_DOUBLE_LINE2_DIST)/20; + nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE2_OUT+DEF_DOUBLE_LINE2_IN+DEF_DOUBLE_LINE2_DIST)/20; break; case 10: // DEF_DOUBLE_LINE8 @@ -1455,7 +1463,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r aRect.Top() = 7; aRect.Bottom() = 7; aVirDev.DrawRect( aRect ); - nLineWidth = (USHORT) (DEF_DOUBLE_LINE8_OUT+DEF_DOUBLE_LINE8_IN+DEF_DOUBLE_LINE8_DIST)/20; + nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE8_OUT+DEF_DOUBLE_LINE8_IN+DEF_DOUBLE_LINE8_DIST)/20; break; case 11: // DEF_DOUBLE_LINE9 @@ -1465,7 +1473,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r aRect.Top() = 8; aRect.Bottom() = 8; aVirDev.DrawRect( aRect ); - nLineWidth = (USHORT) (DEF_DOUBLE_LINE9_OUT+DEF_DOUBLE_LINE9_IN+DEF_DOUBLE_LINE9_DIST)/20; + nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE9_OUT+DEF_DOUBLE_LINE9_IN+DEF_DOUBLE_LINE9_DIST)/20; break; case 12: // DEF_DOUBLE_LINE10 @@ -1475,7 +1483,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r aRect.Top() = 8; aRect.Bottom() = 8; aVirDev.DrawRect( aRect ); - nLineWidth = (USHORT) (DEF_DOUBLE_LINE10_OUT+DEF_DOUBLE_LINE10_IN+DEF_DOUBLE_LINE10_DIST)/20; + nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE10_OUT+DEF_DOUBLE_LINE10_IN+DEF_DOUBLE_LINE10_DIST)/20; break; case 13: // DEF_DOUBLE_LINE3 @@ -1485,7 +1493,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r aRect.Top() = 7; aRect.Bottom() = 7; aVirDev.DrawRect( aRect ); - nLineWidth = (USHORT) (DEF_DOUBLE_LINE3_OUT+DEF_DOUBLE_LINE3_IN+DEF_DOUBLE_LINE3_DIST)/20; + nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE3_OUT+DEF_DOUBLE_LINE3_IN+DEF_DOUBLE_LINE3_DIST)/20; break; case 14: // DEF_DOUBLE_LINE4 @@ -1495,7 +1503,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r aRect.Top() = 6; aRect.Bottom() = 7; aVirDev.DrawRect( aRect ); - nLineWidth = (USHORT) (DEF_DOUBLE_LINE4_OUT+DEF_DOUBLE_LINE4_IN+DEF_DOUBLE_LINE4_DIST)/20; + nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE4_OUT+DEF_DOUBLE_LINE4_IN+DEF_DOUBLE_LINE4_DIST)/20; break; case 15: // DEF_DOUBLE_LINE5 @@ -1505,7 +1513,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r aRect.Top() = 8; aRect.Bottom() = 9; aVirDev.DrawRect( aRect ); - nLineWidth = (USHORT) (DEF_DOUBLE_LINE5_OUT+DEF_DOUBLE_LINE5_IN+DEF_DOUBLE_LINE5_DIST)/20; + nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE5_OUT+DEF_DOUBLE_LINE5_IN+DEF_DOUBLE_LINE5_DIST)/20; break; case 16: // DEF_DOUBLE_LINE6 @@ -1515,7 +1523,7 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r aRect.Top() = 7; aRect.Bottom() = 9; aVirDev.DrawRect( aRect ); - nLineWidth = (USHORT) (DEF_DOUBLE_LINE6_OUT+DEF_DOUBLE_LINE6_IN+DEF_DOUBLE_LINE6_DIST)/20; + nLineWidth = (sal_uInt16) (DEF_DOUBLE_LINE6_OUT+DEF_DOUBLE_LINE6_IN+DEF_DOUBLE_LINE6_DIST)/20; break; case 17: // Dotted line aRect.Top() = 6; @@ -1549,11 +1557,11 @@ void SvxLineWindow_Impl::MakeLineBitmap( USHORT nNo, Bitmap& rBmp, const Size& r IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG ) { SvxLineItem aLineItem( SID_FRAME_LINESTYLE ); - USHORT n1 = 0, + sal_uInt16 n1 = 0, n2 = 0, n3 = 0; SvxBorderStyle nStyle = SOLID; - BOOL bSetLine = TRUE; + sal_Bool bSetLine = sal_True; switch ( aLineSet.GetSelectItemId() ) { @@ -1606,7 +1614,7 @@ IMPL_LINK( SvxLineWindow_Impl, SelectHdl, void *, EMPTYARG ) break; case 0: default: - bSetLine = FALSE; + bSetLine = sal_False; break; } if ( bSetLine ) @@ -1653,7 +1661,7 @@ void SvxLineWindow_Impl::StartSelection() // ----------------------------------------------------------------------- -BOOL SvxLineWindow_Impl::Close() +sal_Bool SvxLineWindow_Impl::Close() { return SfxPopupWindow::Close(); } @@ -1695,7 +1703,7 @@ void SvxLineWindow_Impl::CreateBitmaps( void ) ::Color aBackCol( rStyleSettings.GetWindowColor() ); aLineSet.Clear(); - for( USHORT i = 1 ; i < 19 ; ++i ) + for( sal_uInt16 i = 1 ; i < 19 ; ++i ) { MakeLineBitmap( i, aBmp, aBmpSize, aStr, aLineCol, aBackCol ); aLineSet.InsertItem( i, aBmp, aStr ); @@ -1713,7 +1721,7 @@ void SvxLineWindow_Impl::CreateBitmaps( void ) SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl( const Reference< XDispatchProvider >& rDispatchProvider, - USHORT nSlotId, // Family-ID + sal_uInt16 nSlotId, // Family-ID const rtl::OUString& rCommand, // .uno: command bound to this item SvxStyleToolBoxControl& rTbxCtl ) // Controller-Instanz, dem dieses Item zugeordnet ist. : SfxStatusListener( rDispatchProvider, nSlotId, rCommand ), @@ -1724,7 +1732,7 @@ SfxStyleControllerItem_Impl::SfxStyleControllerItem_Impl( // ----------------------------------------------------------------------- void SfxStyleControllerItem_Impl::StateChanged( - USHORT, SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { switch ( GetId() ) { @@ -1734,7 +1742,7 @@ void SfxStyleControllerItem_Impl::StateChanged( case SID_STYLE_FAMILY4: case SID_STYLE_FAMILY5: { - const USHORT nIdx = GetId() - SID_STYLE_FAMILY_START; + const sal_uInt16 nIdx = GetId() - SID_STYLE_FAMILY_START; if ( SFX_ITEM_AVAILABLE == eState ) { @@ -1761,16 +1769,16 @@ struct SvxStyleToolBoxControl::Impl String aClearForm; String aMore; ::std::vector< ::rtl::OUString > aDefaultStyles; - BOOL bListening; - BOOL bSpecModeWriter; - BOOL bSpecModeCalc; + sal_Bool bListening; + sal_Bool bSpecModeWriter; + sal_Bool bSpecModeCalc; inline Impl( void ) :aClearForm ( SVX_RESSTR( RID_SVXSTR_CLEARFORM ) ) ,aMore ( SVX_RESSTR( RID_SVXSTR_MORE ) ) - ,bListening ( FALSE ) - ,bSpecModeWriter ( FALSE ) - ,bSpecModeCalc ( FALSE ) + ,bListening ( sal_False ) + ,bSpecModeWriter ( sal_False ) + ,bSpecModeCalc ( sal_False ) { @@ -1819,8 +1827,7 @@ struct SvxStyleToolBoxControl::Impl static const sal_Char* aCalcStyles[] = { "Default", - "Heading 1", - "Heading 2", + "Heading1", "Result", "Result2" }; @@ -1832,12 +1839,15 @@ struct SvxStyleToolBoxControl::Impl { try { - Reference< beans::XPropertySet > xStyle; - xCellStyles->getByName( rtl::OUString::createFromAscii( aCalcStyles[nStyle] )) >>= xStyle; - ::rtl::OUString sName; - xStyle->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName")))>>= sName; - if( sName.getLength() ) - aDefaultStyles.push_back(sName); + const rtl::OUString sStyleName( rtl::OUString::createFromAscii( aCalcStyles[nStyle] ) ); + if( xCellStyles->hasByName( sStyleName ) ) + { + Reference< beans::XPropertySet > xStyle( xCellStyles->getByName( sStyleName), UNO_QUERY_THROW ); + ::rtl::OUString sName; + xStyle->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName"))) >>= sName; + if( sName.getLength() ) + aDefaultStyles.push_back(sName); + } } catch( const uno::Exception& ) {} @@ -1865,14 +1875,14 @@ static const char* StyleSlotToStyleCommand[MAX_FAMILIES] = }; SvxStyleToolBoxControl::SvxStyleToolBoxControl( - USHORT nSlotId, USHORT nId, ToolBox& rTbx ) + sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl ( nSlotId, nId, rTbx ), pStyleSheetPool ( NULL ), nActFamily ( 0xffff ), - bListening ( FALSE ), + bListening ( sal_False ), pImpl ( new Impl ) { - for ( USHORT i=0; i<MAX_FAMILIES; i++ ) + for ( sal_uInt16 i=0; i<MAX_FAMILIES; i++ ) { pBoundItems[i] = 0; m_xBoundItems[i] = Reference< XComponent >(); @@ -1897,7 +1907,7 @@ throw ( Exception, RuntimeException) { pImpl->InitializeStyles(m_xFrame->getController()->getModel()); Reference< XDispatchProvider > xDispatchProvider( m_xFrame->getController(), UNO_QUERY ); - for ( USHORT i=0; i<MAX_FAMILIES; i++ ) + for ( sal_uInt16 i=0; i<MAX_FAMILIES; i++ ) { pBoundItems[i] = new SfxStyleControllerItem_Impl( xDispatchProvider, SID_STYLE_FAMILY_START + i, @@ -1915,7 +1925,7 @@ throw (::com::sun::star::uno::RuntimeException) { SfxToolBoxControl::dispose(); - for( USHORT i=0; i<MAX_FAMILIES; i++ ) + for( sal_uInt16 i=0; i<MAX_FAMILIES; i++ ) { if ( m_xBoundItems[i].is() ) { @@ -1981,9 +1991,9 @@ void SvxStyleToolBoxControl::FillStyleBox() if ( pStyleSheetPool && pBox && nActFamily!=0xffff ) { const SfxStyleFamily eFamily = GetActFamily(); - USHORT nCount = pStyleSheetPool->Count(); + sal_uInt16 nCount = pStyleSheetPool->Count(); SfxStyleSheetBase* pStyle = NULL; - BOOL bDoFill = FALSE; + sal_Bool bDoFill = sal_False; pStyleSheetPool->SetSearchMask( eFamily, SFXSTYLEBIT_USED ); @@ -1996,11 +2006,11 @@ void SvxStyleToolBoxControl::FillStyleBox() //!!! so the list doesn't show the count if ( nCount != pBox->GetEntryCount() ) { - bDoFill = TRUE; + bDoFill = sal_True; } else { - USHORT i= 0; + sal_uInt16 i= 0; while ( pStyle && !bDoFill ) { bDoFill = ( pBox->GetEntry(i) != pStyle->GetName() ); @@ -2011,11 +2021,11 @@ void SvxStyleToolBoxControl::FillStyleBox() if ( bDoFill ) { - pBox->SetUpdateMode( FALSE ); + pBox->SetUpdateMode( sal_False ); pBox->Clear(); { - USHORT _i; + sal_uInt16 _i; sal_uInt32 nCnt = pImpl->aDefaultStyles.size(); pStyle = pStyleSheetPool->First(); @@ -2055,9 +2065,9 @@ void SvxStyleToolBoxControl::FillStyleBox() if( pImpl->bSpecModeWriter || pImpl->bSpecModeCalc ) { // insert default styles - USHORT _i; + sal_uInt16 _i; sal_uInt32 nCnt = pImpl->aDefaultStyles.size(); - USHORT nPos = 1; + sal_uInt16 nPos = 1; for( _i = 0 ; _i < nCnt ; ++_i ) { pBox->InsertEntry( pImpl->aDefaultStyles[_i], nPos ); @@ -2079,10 +2089,10 @@ void SvxStyleToolBoxControl::FillStyleBox() pBox->SetStyle( nWinBits ); } - pBox->SetUpdateMode( TRUE ); + pBox->SetUpdateMode( sal_True ); pBox->SetFamily( eFamily ); - USHORT nLines = Min( pBox->GetEntryCount(), MAX_STYLES_ENTRIES ); + sal_uInt16 nLines = Min( pBox->GetEntryCount(), MAX_STYLES_ENTRIES ); pBox->SetDropDownLineCount( nLines ); } } @@ -2122,7 +2132,7 @@ void SvxStyleToolBoxControl::Update() if ( pDocShell ) pPool = pDocShell->GetStyleSheetPool(); - USHORT i; + sal_uInt16 i; for ( i=0; i<MAX_FAMILIES; i++ ) if( pFamilyState[i] ) break; @@ -2166,7 +2176,7 @@ void SvxStyleToolBoxControl::Update() // ----------------------------------------------------------------------- -void SvxStyleToolBoxControl::SetFamilyState( USHORT nIdx, +void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx, const SfxTemplateItem* pItem ) { DELETEZ( pFamilyState[nIdx] ); @@ -2182,7 +2192,7 @@ void SvxStyleToolBoxControl::SetFamilyState( USHORT nIdx, IMPL_LINK( SvxStyleToolBoxControl, VisibilityNotification, void*, EMPTYARG ) { - USHORT i; + sal_uInt16 i; // Call ReBind() && UnBind() according to visibility SvxStyleBox_Impl* pBox = (SvxStyleBox_Impl*)( GetToolBox().GetItemWindow( GetId() )); @@ -2207,10 +2217,10 @@ IMPL_LINK( SvxStyleToolBoxControl, VisibilityNotification, void*, EMPTYARG ) void SvxStyleToolBoxControl::StateChanged( - USHORT , SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) { - USHORT nId = GetId(); + sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); SvxStyleBox_Impl* pBox = (SvxStyleBox_Impl*)(rTbx.GetItemWindow( nId )); TriState eTri = STATE_NOCHECK; @@ -2269,8 +2279,8 @@ Window* SvxStyleToolBoxControl::CreateItemWindow( Window *pParent ) //======================================================================== SvxFontNameToolBoxControl::SvxFontNameToolBoxControl( - USHORT nSlotId, - USHORT nId, + sal_uInt16 nSlotId, + sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) @@ -2281,10 +2291,10 @@ SvxFontNameToolBoxControl::SvxFontNameToolBoxControl( void SvxFontNameToolBoxControl::StateChanged( - USHORT , SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) { - USHORT nId = GetId(); + sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); SvxFontNameBox_Impl* pBox = (SvxFontNameBox_Impl*)(rTbx.GetItemWindow( nId )); @@ -2330,8 +2340,8 @@ Window* SvxFontNameToolBoxControl::CreateItemWindow( Window *pParent ) //======================================================================== SvxFontColorToolBoxControl::SvxFontColorToolBoxControl( - USHORT nSlotId, - USHORT nId, + sal_uInt16 nSlotId, + sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), @@ -2380,10 +2390,10 @@ SfxPopupWindow* SvxFontColorToolBoxControl::CreatePopupWindow() void SvxFontColorToolBoxControl::StateChanged( - USHORT , SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) { - USHORT nId = GetId(); + sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); const SvxColorItem* pItem = 0; @@ -2404,7 +2414,7 @@ void SvxFontColorToolBoxControl::StateChanged( // class SvxColorToolBoxControl -------------------------------- //======================================================================== -SvxColorToolBoxControl::SvxColorToolBoxControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxColorToolBoxControl::SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), mLastColor( COL_AUTO ) @@ -2435,7 +2445,7 @@ SfxPopupWindowType SvxColorToolBoxControl::GetPopupWindowType() const SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow() { - USHORT nResId = GetSlotId() == SID_BACKGROUND_COLOR ? + sal_uInt16 nResId = GetSlotId() == SID_BACKGROUND_COLOR ? RID_SVXSTR_BACKGROUND : RID_SVXSTR_COLOR; SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BackgroundColor" )), @@ -2455,7 +2465,7 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow() // ----------------------------------------------------------------------- void SvxColorToolBoxControl::StateChanged( - USHORT , SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) { const SvxColorItem* pItem = 0; if ( SFX_ITEM_DONTCARE != eState ) @@ -2466,7 +2476,7 @@ void SvxColorToolBoxControl::StateChanged( mLastColor= pItem->GetValue(); } - USHORT nId = GetId(); + sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK ); @@ -2477,8 +2487,8 @@ void SvxColorToolBoxControl::StateChanged( //======================================================================== SvxFontColorExtToolBoxControl::SvxFontColorExtToolBoxControl( - USHORT nSlotId, - USHORT nId, + sal_uInt16 nSlotId, + sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), @@ -2492,7 +2502,7 @@ SvxFontColorExtToolBoxControl::SvxFontColorExtToolBoxControl( else addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharBackgroundExt" ))); - USHORT nMode = SID_ATTR_CHAR_COLOR2 == nSlotId + sal_uInt16 nMode = SID_ATTR_CHAR_COLOR2 == nSlotId ? TBX_UPDATER_MODE_CHAR_COLOR_NEW : TBX_UPDATER_MODE_CHAR_COLOR_NEW; pBtnUpdater = new ::svx::ToolboxButtonColorUpdater( nSlotId, nId, &GetToolBox(), nMode ); } @@ -2538,10 +2548,10 @@ SfxPopupWindow* SvxFontColorExtToolBoxControl::CreatePopupWindow() void SvxFontColorExtToolBoxControl::StateChanged( - USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { - USHORT nId = GetId(); + sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); const SvxColorItem* pItem = 0; @@ -2570,7 +2580,7 @@ void SvxFontColorExtToolBoxControl::StateChanged( // ----------------------------------------------------------------------- -void SvxFontColorExtToolBoxControl::Select( BOOL ) +void SvxFontColorExtToolBoxControl::Select( sal_Bool ) { OUString aCommand; OUString aParamName; @@ -2596,8 +2606,8 @@ void SvxFontColorExtToolBoxControl::Select( BOOL ) //======================================================================== SvxFrameToolBoxControl::SvxFrameToolBoxControl( - USHORT nSlotId, - USHORT nId, + sal_uInt16 nSlotId, + sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) @@ -2630,10 +2640,10 @@ SfxPopupWindow* SvxFrameToolBoxControl::CreatePopupWindow() void SvxFrameToolBoxControl::StateChanged( - USHORT, SfxItemState eState, const SfxPoolItem* ) + sal_uInt16, SfxItemState eState, const SfxPoolItem* ) { - USHORT nId = GetId(); + sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); @@ -2647,8 +2657,8 @@ void SvxFrameToolBoxControl::StateChanged( //======================================================================== SvxFrameLineStyleToolBoxControl::SvxFrameLineStyleToolBoxControl( - USHORT nSlotId, - USHORT nId, + sal_uInt16 nSlotId, + sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) @@ -2679,9 +2689,9 @@ SfxPopupWindow* SvxFrameLineStyleToolBoxControl::CreatePopupWindow() void SvxFrameLineStyleToolBoxControl::StateChanged( - USHORT , SfxItemState eState, const SfxPoolItem* ) + sal_uInt16 , SfxItemState eState, const SfxPoolItem* ) { - USHORT nId = GetId(); + sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); @@ -2695,8 +2705,8 @@ void SvxFrameLineStyleToolBoxControl::StateChanged( //======================================================================== SvxFrameLineColorToolBoxControl::SvxFrameLineColorToolBoxControl( - USHORT nSlotId, - USHORT nId, + sal_uInt16 nSlotId, + sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), @@ -2743,9 +2753,9 @@ SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow() // ----------------------------------------------------------------------- void SvxFrameLineColorToolBoxControl::StateChanged( - USHORT , SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) { - USHORT nId = GetId(); + sal_uInt16 nId = GetId(); ToolBox& rTbx = GetToolBox(); rTbx.EnableItem( nId, SFX_ITEM_DISABLED != eState ); rTbx.SetItemState( nId, ( SFX_ITEM_DONTCARE == eState ) ? STATE_DONTKNOW : STATE_NOCHECK ); @@ -2785,7 +2795,7 @@ public: // ----------------------------------------------------------------------- -SvxReloadControllerItem::SvxReloadControllerItem( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) +SvxReloadControllerItem::SvxReloadControllerItem( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) , pImpl( new SvxReloadControllerItem_Impl ) { @@ -2802,7 +2812,7 @@ SvxReloadControllerItem::~SvxReloadControllerItem() // ----------------------------------------------------------------------- void SvxReloadControllerItem::StateChanged( - USHORT , SfxItemState eState, const SfxPoolItem* pState ) + sal_uInt16 , SfxItemState eState, const SfxPoolItem* pState ) { SfxBoolItem* pItem = PTR_CAST( SfxBoolItem, pState ); ToolBox& rBox = GetToolBox(); @@ -2819,7 +2829,7 @@ void SvxReloadControllerItem::StateChanged( // class SvxSimpleUndoRedoController ------------------------------------- //======================================================================== -SvxSimpleUndoRedoController::SvxSimpleUndoRedoController( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) +SvxSimpleUndoRedoController::SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) :SfxToolBoxControl( nSlotId, nId, rTbx ) { aDefaultText = rTbx.GetItemText( nId ); @@ -2833,7 +2843,7 @@ SvxSimpleUndoRedoController::~SvxSimpleUndoRedoController() // ----------------------------------------------------------------------- -void SvxSimpleUndoRedoController::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState ) +void SvxSimpleUndoRedoController::StateChanged( sal_uInt16, SfxItemState eState, const SfxPoolItem* pState ) { SfxStringItem* pItem = PTR_CAST( SfxStringItem, pState ); ToolBox& rBox = GetToolBox(); @@ -2869,7 +2879,7 @@ void lcl_CalcSizeValueSet( Window &rWin, ValueSet &rValueSet, const Size &aItemS // ----------------------------------------------------------------------- -BOOL lcl_FontChangedHint( const SfxHint &rHint ) +sal_Bool lcl_FontChangedHint( const SfxHint &rHint ) { SfxPoolItemHint *pItemHint = PTR_CAST(SfxPoolItemHint, &rHint); if ( pItemHint ) diff --git a/svx/source/tbxctrls/tbcontrl.src b/svx/source/tbxctrls/tbcontrl.src index c0f8874a3b..46cf9adaeb 100644..100755 --- a/svx/source/tbxctrls/tbcontrl.src +++ b/svx/source/tbxctrls/tbcontrl.src @@ -158,5 +158,11 @@ String RID_SVXSTR_MORE Text [ en-US ] = "More..."; }; +//IAccessibility2 Implementation 2009----- +String RID_SVXSTR_TEXTCOLOR +{ + Text [ en-US ] = "Font color"; +}; +//-----IAccessibility2 Implementation 2009 // ********************************************************************** EOF diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index b4cd3375e6..4bcee1be70 100644..100755 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -73,7 +73,7 @@ private: FontHeightToolBoxControl* m_pCtrl; String m_aCurText; Size m_aLogicalSize; - BOOL m_bRelease; + sal_Bool m_bRelease; uno::Reference< frame::XDispatchProvider > m_xDispatchProvider; uno::Reference< frame::XFrame > m_xFrame; uno::Reference< awt::XWindow > m_xOldFocusWindow; @@ -95,7 +95,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl( m_pCtrl ( &_rCtrl ), m_aLogicalSize ( 30,100 ), - m_bRelease ( TRUE ), + m_bRelease ( sal_True ), m_xDispatchProvider ( _rDispatchProvider ), m_xFrame ( _xFrame ) { @@ -110,7 +110,7 @@ void SvxFontSizeBox_Impl::ReleaseFocus_Impl() { if ( !m_bRelease ) { - m_bRelease = TRUE; + m_bRelease = sal_True; return; } @@ -198,7 +198,7 @@ long SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) if ( rNEvt.GetType() == EVENT_KEYINPUT ) { - USHORT nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode(); + sal_uInt16 nCode = rNEvt.GetKeyEvent()->GetKeyCode().GetCode(); switch ( nCode ) { @@ -206,7 +206,7 @@ long SvxFontSizeBox_Impl::Notify( NotifyEvent& rNEvt ) case KEY_TAB: { if ( KEY_TAB == nCode ) - m_bRelease = FALSE; + m_bRelease = sal_False; else nHandled = 1; Select(); diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 3b468489f0..b25415ab2e 100644..100755 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -97,14 +97,14 @@ void FindTextFieldControl::InitControls_Impl() SetText( SVX_RESSTR( RID_SVXSTR_FINDBAR_FIND ) ); SetControlForeground(GetSettings().GetStyleSettings().GetDisableColor()); - EnableAutocomplete(TRUE, TRUE); + EnableAutocomplete(sal_True, sal_True); } void FindTextFieldControl::Remember_Impl(const String& rStr) { - USHORT nCount = GetEntryCount(); + sal_uInt16 nCount = GetEntryCount(); - for (USHORT i=0; i<nCount; ++i) + for (sal_uInt16 i=0; i<nCount; ++i) { if ( rStr == GetEntry(i)) return; @@ -371,8 +371,8 @@ void SAL_CALL FindTextToolbarController::initialize( const css::uno::Sequence< : ToolBox* pToolBox = (ToolBox*)pWindow; if ( pToolBox ) { - USHORT nItemCount = pToolBox->GetItemCount(); - for ( USHORT i=0; i<nItemCount; ++i ) + sal_uInt16 nItemCount = pToolBox->GetItemCount(); + for ( sal_uInt16 i=0; i<nItemCount; ++i ) { ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand.equals( COMMAND_DOWNSEARCH ) ) @@ -542,8 +542,8 @@ void SAL_CALL DownSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) ToolBox* pToolBox = (ToolBox*)pWindow; if ( pToolBox ) { - USHORT nItemCount = pToolBox->GetItemCount(); - for ( USHORT i=0; i<nItemCount; ++i ) + sal_uInt16 nItemCount = pToolBox->GetItemCount(); + for ( sal_uInt16 i=0; i<nItemCount; ++i ) { ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand.equals( COMMAND_FINDTEXT ) ) @@ -671,8 +671,8 @@ void SAL_CALL UpSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ ) th ToolBox* pToolBox = (ToolBox*)pWindow; if ( pToolBox ) { - USHORT nItemCount = pToolBox->GetItemCount(); - for ( USHORT i=0; i<nItemCount; ++i ) + sal_uInt16 nItemCount = pToolBox->GetItemCount(); + for ( sal_uInt16 i=0; i<nItemCount; ++i ) { ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand.equals( COMMAND_FINDTEXT ) ) @@ -836,8 +836,8 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css ToolBox* pToolBox = (ToolBox*)pWindow; if ( pToolBox ) { - USHORT nItemCount = pToolBox->GetItemCount(); - for ( USHORT i=0; i<nItemCount; ++i ) + sal_uInt16 nItemCount = pToolBox->GetItemCount(); + for ( sal_uInt16 i=0; i<nItemCount; ++i ) { ::rtl::OUString sItemCommand = pToolBox->GetItemCommand(i); if ( sItemCommand.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:FindText")) ) diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.src b/svx/source/tbxctrls/tbunosearchcontrollers.src index ff1565e2d2..ff1565e2d2 100644..100755 --- a/svx/source/tbxctrls/tbunosearchcontrollers.src +++ b/svx/source/tbxctrls/tbunosearchcontrollers.src diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index bf1d01592c..b11badfa70 100644..100755 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -33,8 +33,8 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include "tbxalign.hxx" -#include "tbxdraw.hxx" +#include "svx/tbxalign.hxx" +#include "svx/tbxdraw.hxx" #include "tbxdraw.hrc" #include <tools/shl.hxx> #include <sfx2/imagemgr.hxx> @@ -52,7 +52,7 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlAlign, SfxAllEnumItem); |* \************************************************************************/ -SvxTbxCtlAlign::SvxTbxCtlAlign( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxTbxCtlAlign::SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ) , m_aSubTbName( RTL_CONSTASCII_USTRINGPARAM( "alignmentbar" )) , m_aSubTbResName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/alignmentbar" )) diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx index 24008a9384..206903d080 100644..100755 --- a/svx/source/tbxctrls/tbxcolor.cxx +++ b/svx/source/tbxctrls/tbxcolor.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "tbxcolor.hxx" +#include "svx/tbxcolor.hxx" #include <sfx2/viewfrm.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx b/svx/source/tbxctrls/tbxcolorupdate.cxx index 705542a9bc..60f920fe84 100644..100755 --- a/svx/source/tbxctrls/tbxcolorupdate.cxx +++ b/svx/source/tbxctrls/tbxcolorupdate.cxx @@ -48,10 +48,10 @@ namespace svx //==================================================================== ToolboxButtonColorUpdater::ToolboxButtonColorUpdater( - USHORT nId, - USHORT nTbxBtnId, + sal_uInt16 nId, + sal_uInt16 nTbxBtnId, ToolBox* ptrTbx, - USHORT nMode ) : + sal_uInt16 nMode ) : mnDrawMode ( nMode ), mnBtnId ( nTbxBtnId ), mnSlotId ( nId ), @@ -61,7 +61,7 @@ namespace svx if (mnSlotId == SID_BACKGROUND_COLOR) mnDrawMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW; DBG_ASSERT( ptrTbx, "ToolBox not found :-(" ); - mbWasHiContrastMode = ptrTbx ? ( ptrTbx->GetSettings().GetStyleSettings().GetHighContrastMode() ) : FALSE; + mbWasHiContrastMode = ptrTbx ? ( ptrTbx->GetSettings().GetStyleSettings().GetHighContrastMode() ) : sal_False; Update(mnSlotId == SID_ATTR_CHAR_COLOR2 ? COL_BLACK : COL_GRAY); } diff --git a/svx/source/tbxctrls/tbxdraw.hrc b/svx/source/tbxctrls/tbxdraw.hrc index 3dd9eafd91..3dd9eafd91 100644..100755 --- a/svx/source/tbxctrls/tbxdraw.hrc +++ b/svx/source/tbxctrls/tbxdraw.hrc diff --git a/svx/source/tbxctrls/tbxdraw.src b/svx/source/tbxctrls/tbxdraw.src deleted file mode 100644 index e4c7c1d296..0000000000 --- a/svx/source/tbxctrls/tbxdraw.src +++ /dev/null @@ -1,265 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - // include --------------------------------------------------------------- -#include "tbxdraw.hrc" -#include <svx/dialogs.hrc> -#include "helpid.hrc" -#include <svx/svxids.hrc> - // pragma ---------------------------------------------------------------- - - // ----------------------------------------------------------------------- -#define IMAGE_STDBTN_COLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; } -FloatingWindow RID_SVXTBX_DRAW -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - HelpID = HID_DRAWTOOL_TBX ; - ToolBox TBX_DRAW - { - HelpId = HID_SVXTBX_DRAW ; - SVLook = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_OBJECT_SELECT ; - HelpID = SID_OBJECT_SELECT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Selection" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_LINE ; - HelpID = SID_DRAW_LINE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Line" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_RECT ; - HelpID = SID_DRAW_RECT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Rectangle" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_ELLIPSE ; - HelpID = SID_DRAW_ELLIPSE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Ellipse" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_POLYGON_NOFILL ; - HelpID = SID_DRAW_POLYGON_NOFILL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Polygon" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_BEZIER_NOFILL ; - HelpID = SID_DRAW_BEZIER_NOFILL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Curve"; - }; - ToolBoxItem - { - Identifier = SID_DRAW_FREELINE_NOFILL ; - HelpID = SID_DRAW_FREELINE_NOFILL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Freeform Line"; - }; - ToolBoxItem - { - Identifier = SID_DRAW_ARC ; - HelpID = SID_DRAW_ARC ; - RadioCheck = TRUE ; - Text [ en-US ] = "Arc" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_PIE ; - HelpID = SID_DRAW_PIE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Ellipse Pie" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CIRCLECUT ; - HelpID = SID_DRAW_CIRCLECUT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Circle Segment" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_TEXT ; - HelpID = SID_DRAW_TEXT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Text" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_TEXT_VERTICAL ; - HelpID = SID_DRAW_TEXT_VERTICAL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Vertical Text"; - }; - ToolBoxItem - { - Identifier = SID_DRAW_TEXT_MARQUEE ; - HelpID = SID_DRAW_TEXT_MARQUEE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Text Animation" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CAPTION ; - HelpID = SID_DRAW_CAPTION ; - RadioCheck = TRUE ; - Text [ en-US ] = "Callouts" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CAPTION_VERTICAL ; - HelpID = SID_DRAW_CAPTION_VERTICAL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Vertical Callout"; - }; - }; - }; - Text [ en-US ] = "Draw Functions" ; -}; -FloatingWindow RID_SVXTBX_ALIGNMENT -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - HelpID = HID_ALIGN_TBX ; - SVLook = TRUE ; - Text [ en-US ] = "Alignment" ; - ToolBox TBX_ALIGNMENT - { - HelpId = HID_SVXTBX_ALIGNMENT ; - SVLook = TRUE ; - HelpID = SID_OBJECT_ALIGN ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_LEFT ; - HelpID = SID_OBJECT_ALIGN_LEFT ; - Text [ en-US ] = "Left" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_CENTER ; - HelpID = SID_OBJECT_ALIGN_CENTER ; - Text [ en-US ] = "Center" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_RIGHT ; - HelpID = SID_OBJECT_ALIGN_RIGHT ; - Text [ en-US ] = "Right" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_UP ; - HelpID = SID_OBJECT_ALIGN_UP ; - Text [ en-US ] = "Top" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_MIDDLE ; - HelpID = SID_OBJECT_ALIGN_MIDDLE ; - Text [ en-US ] = "Centered" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_DOWN ; - HelpID = SID_OBJECT_ALIGN_DOWN ; - Text [ en-US ] = "Bottom" ; - }; - }; - }; -}; - // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index cff4b1bc9f..036a0f1ac6 100644..100755 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -43,9 +43,9 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include "tbxctl.hxx" -#include "tbxdraw.hxx" -#include "tbxcolor.hxx" +#include "svx/tbxctl.hxx" +#include "svx/tbxdraw.hxx" +#include "svx/tbxcolor.hxx" #include "tbxdraw.hrc" #include <com/sun/star/frame/XLayoutManager.hpp> @@ -56,7 +56,7 @@ using namespace ::com::sun::star::frame; // ----------------------------------------------------------------------- -SvxTbxCtlDraw::SvxTbxCtlDraw( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxTbxCtlDraw::SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), @@ -69,7 +69,7 @@ SvxTbxCtlDraw::SvxTbxCtlDraw( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : // ----------------------------------------------------------------------- -void SvxTbxCtlDraw::StateChanged( USHORT nSID, SfxItemState eState, +void SvxTbxCtlDraw::StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { GetToolBox().EnableItem( GetId(), ( eState != SFX_ITEM_DISABLED ) ); @@ -95,7 +95,7 @@ void SvxTbxCtlDraw::toggleToolbox() Reference< XLayoutManager > xLayoutMgr = getLayoutManager(); if ( xLayoutMgr.is() ) { - BOOL bCheck = FALSE; + sal_Bool bCheck = sal_False; if ( xLayoutMgr->isElementVisible( m_sToolboxName ) ) { xLayoutMgr->hideElement( m_sToolboxName ); @@ -103,7 +103,7 @@ void SvxTbxCtlDraw::toggleToolbox() } else { - bCheck = TRUE; + bCheck = sal_True; xLayoutMgr->createElement( m_sToolboxName ); xLayoutMgr->showElement( m_sToolboxName ); } @@ -114,7 +114,7 @@ void SvxTbxCtlDraw::toggleToolbox() // ----------------------------------------------------------------------- -void SvxTbxCtlDraw::Select( BOOL ) +void SvxTbxCtlDraw::Select( sal_Bool ) { toggleToolbox(); } diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index e6846ea62a..422f89a331 100644..100755 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -31,7 +31,7 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include <verttexttbxctrl.hxx> +#include <svx/verttexttbxctrl.hxx> #include <svl/languageoptions.hxx> #include <sfx2/app.hxx> #include <svl/eitem.hxx> @@ -41,22 +41,22 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxCTLTextTbxCtrl, SfxBoolItem); SFX_IMPL_TOOLBOX_CONTROL(SvxVertTextTbxCtrl, SfxBoolItem); -SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxCTLTextTbxCtrl::SvxCTLTextTbxCtrl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { - SetVert(FALSE); + SetVert(sal_False); addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CTLFontState" ))); } -SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxVertTextTbxCtrl::SvxVertTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SvxVertCTLTextTbxCtrl( nSlotId, nId, rTbx ) { - SetVert(TRUE); + SetVert(sal_True); addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:VerticalTextState" ))); } /* ---------------------------------------------------------------------------*/ -SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( USHORT nSlotId, USHORT nId, ToolBox& rTbx ) : +SvxVertCTLTextTbxCtrl::SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), bCheckVertical(sal_True) { @@ -67,13 +67,13 @@ SvxVertCTLTextTbxCtrl::~SvxVertCTLTextTbxCtrl( ) } void SvxVertCTLTextTbxCtrl::StateChanged( - USHORT nSID, + sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) { SvtLanguageOptions aLangOptions; - BOOL bCalc = sal_False; - BOOL bVisible = GetToolBox().IsItemVisible(GetId()); + sal_Bool bCalc = sal_False; + sal_Bool bVisible = GetToolBox().IsItemVisible(GetId()); sal_Bool bEnabled = sal_False; if ( nSID == SID_VERTICALTEXT_STATE ) bEnabled = aLangOptions.IsVerticalTextEnabled(); @@ -89,7 +89,7 @@ void SvxVertCTLTextTbxCtrl::StateChanged( { if(!bVisible) { - GetToolBox().ShowItem( GetId(), TRUE ); + GetToolBox().ShowItem( GetId(), sal_True ); bCalc = sal_True; } } diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index 06296ac02f..0666bc9d13 100644..100755 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -47,7 +47,7 @@ #include <svx/dialogs.hrc> #include <svx/svdview.hxx> #include <editeng/colritem.hxx> -#include "chrtitem.hxx" +#include "svx/chrtitem.hxx" #include <svx/extrusionbar.hxx> #include "extrusiondepthdialog.hxx" @@ -575,7 +575,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB nStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_LIGHTING; const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; for(i=0; i<nCount; i++) { @@ -613,7 +613,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB FieldUnit eUnit = (FieldUnit)((const SfxUInt16Item*)rReq.GetArgs()->GetItem(SID_ATTR_METRIC))->GetValue(); ExtrusionDepthDialog aDlg( 0L, fDepth, eUnit ); - USHORT nRet = aDlg.Execute(); + sal_uInt16 nRet = aDlg.Execute(); if( nRet != 0 ) { fDepth = aDlg.getDepth(); @@ -628,7 +628,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB if( nSID == SID_EXTRUSION_TOOGLE ) { - static USHORT SidArray[] = { + static sal_uInt16 SidArray[] = { SID_EXTRUSION_TILT_DOWN, SID_EXTRUSION_TILT_UP, SID_EXTRUSION_TILT_LEFT, @@ -653,7 +653,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rB void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); static const rtl::OUString sViewPoint( RTL_CONSTASCII_USTRINGPARAM ( "ViewPoint" ) ); @@ -804,7 +804,7 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); static const rtl::OUString sProjectionMode( RTL_CONSTASCII_USTRINGPARAM ( "ProjectionMode" ) ); @@ -860,7 +860,7 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet ) void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); static const rtl::OUString sShadeMode( RTL_CONSTASCII_USTRINGPARAM ( "ShadeMode" ) ); @@ -949,7 +949,7 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet ) void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); static const rtl::OUString sDepth( RTL_CONSTASCII_USTRINGPARAM ( "Depth" ) ); @@ -1001,7 +1001,7 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet ) if( pSdrView->GetModel() ) { FieldUnit eUnit = pSdrView->GetModel()->GetUIUnit(); - rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, (USHORT)eUnit ) ); + rSet.Put( SfxUInt16Item( SID_ATTR_METRIC, (sal_uInt16)eUnit ) ); } if( bHasCustomShape ) @@ -1029,7 +1029,7 @@ static bool compare_direction( const Direction3D& d1, const Direction3D& d2 ) void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); static const rtl::OUString sFirstLightDirection( RTL_CONSTASCII_USTRINGPARAM ( "FirstLightDirection" ) ); @@ -1110,7 +1110,7 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet ) void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); static const rtl::OUString sBrightness( RTL_CONSTASCII_USTRINGPARAM ( "Brightness" ) ); @@ -1178,7 +1178,7 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet ) void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); static const rtl::OUString sExtrusionColor( RTL_CONSTASCII_USTRINGPARAM ( "Color" ) ); @@ -1253,7 +1253,7 @@ bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded ) static const rtl::OUString sExtrusion( RTL_CONSTASCII_USTRINGPARAM ( "Extrusion" ) ); const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; bool bFound = false; for(i=0;(i<nCount) && !bFound ; i++) diff --git a/svx/source/toolbars/extrusionbar.src b/svx/source/toolbars/extrusionbar.src index 3e6c6ad7e5..dd6f3066a5 100644..100755 --- a/svx/source/toolbars/extrusionbar.src +++ b/svx/source/toolbars/extrusionbar.src @@ -1,65 +1,6 @@ #include <svx/svxids.hrc> #include <svx/dialogs.hrc> -ToolBox RID_SVX_EXTRUSION_BAR -{ - HelpId = RID_SVX_EXTRUSION_BAR ; - Align = BOXALIGN_BOTTOM ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_EXTRUSION_TOOGLE ; - HelpID = SID_EXTRUSION_TOOGLE ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_DOWN ; - HelpID = SID_EXTRUSION_TILT_DOWN ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_UP ; - HelpID = SID_EXTRUSION_TILT_UP ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_LEFT ; - HelpID = SID_EXTRUSION_TILT_LEFT ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_RIGHT ; - HelpID = SID_EXTRUSION_TILT_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_DEPTH_FLOATER ; - HelpID = SID_EXTRUSION_DEPTH_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_DIRECTION_FLOATER ; - HelpID = SID_EXTRUSION_DIRECTION_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_LIGHTING_FLOATER ; - HelpID = SID_EXTRUSION_LIGHTING_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_SURFACE_FLOATER ; - HelpID = SID_EXTRUSION_SURFACE_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_3D_COLOR ; - HelpID = SID_EXTRUSION_3D_COLOR ; - }; - }; -}; - String RID_SVX_EXTRUSION_BAR { Text [ en-US ] = "Extrusion"; diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 719e8ebf5d..838964371f 100644..100755 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -33,7 +33,7 @@ #include <sfx2/request.hxx> #include <sfx2/objface.hxx> #include <sfx2/viewsh.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> #include <svx/dialmgr.hxx> @@ -47,11 +47,11 @@ #include <editeng/eeitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/kernitem.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/svxids.hrc> #include <svx/fontworkbar.hxx> -#include "fontworkgallery.hxx" +#include "svx/fontworkgallery.hxx" using ::rtl::OUString; @@ -64,7 +64,7 @@ using namespace ::com::sun::star::uno; void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; sal_Int32 nAlignment = -1; for( i = 0; i < nCount; i++ ) @@ -101,7 +101,7 @@ void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet ) void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; sal_Int32 nCharacterSpacing = -1; for( i = 0; i < nCount; i++ ) @@ -126,7 +126,7 @@ void SetCharacterSpacingState( SdrView* pSdrView, SfxItemSet& rSet ) void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; sal_Bool bChecked = sal_False; for( i = 0; i < nCount; i++ ) @@ -145,7 +145,7 @@ void SetKernCharacterPairsState( SdrView* pSdrView, SfxItemSet& rSet ) void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet ) { const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; rtl::OUString aFontWorkShapeType; @@ -257,7 +257,7 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus ) static const rtl::OUString sTextPath( RTL_CONSTASCII_USTRINGPARAM ( "TextPath" ) ); const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; sal_Bool bFound = sal_False; for(i=0;(i<nCount) && !bFound ; i++) { @@ -348,7 +348,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem } } -#include "gallery.hxx" +#include "svx/gallery.hxx" #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <svl/itempool.hxx> @@ -525,7 +525,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi { sal_Int32 nCharSpacing = ((const SfxInt32Item*)rReq.GetArgs()->GetItem(SID_FONTWORK_CHARACTER_SPACING))->GetValue(); FontworkCharacterSpacingDialog aDlg( 0L, nCharSpacing ); - USHORT nRet = aDlg.Execute(); + sal_uInt16 nRet = aDlg.Execute(); if( nRet != 0 ) { SfxInt32Item aItem( SID_FONTWORK_CHARACTER_SPACING, aDlg.getScale() ); @@ -558,7 +558,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi nStrResId = RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT; const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList(); - ULONG nCount = rMarkList.GetMarkCount(), i; + sal_uIntPtr nCount = rMarkList.GetMarkCount(), i; for( i = 0; i < nCount; i++ ) { SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj(); diff --git a/svx/source/toolbars/fontworkbar.src b/svx/source/toolbars/fontworkbar.src index ed9b152fe4..a3a686b51a 100644..100755 --- a/svx/source/toolbars/fontworkbar.src +++ b/svx/source/toolbars/fontworkbar.src @@ -27,40 +27,6 @@ #include <svx/dialogs.hrc> -ToolBox RID_SVX_FONTWORK_BAR -{ - HelpId = RID_SVX_FONTWORK_BAR ; - Align = BOXALIGN_BOTTOM ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_FONTWORK_GALLERY_FLOATER ; - HelpID = SID_FONTWORK_GALLERY_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_SHAPE_TYPE ; - HelpID = SID_FONTWORK_SHAPE_TYPE ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_SAME_LETTER_HEIGHTS ; - HelpID = SID_FONTWORK_SAME_LETTER_HEIGHTS ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_ALIGNMENT_FLOATER ; - HelpID = SID_FONTWORK_ALIGNMENT_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_CHARACTER_SPACING_FLOATER ; - HelpID = SID_FONTWORK_CHARACTER_SPACING_FLOATER ; - }; - }; -}; - String RID_SVX_FONTWORK_BAR { Text [ en-US ] = "Fontwork"; diff --git a/svx/source/toolbars/makefile.mk b/svx/source/toolbars/makefile.mk deleted file mode 100644 index 40c7f2ccb7..0000000000 --- a/svx/source/toolbars/makefile.mk +++ /dev/null @@ -1,56 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/.. - -PROJECTPCH4DLL=TRUE -PROJECTPCH=svxpch -PROJECTPCHSOURCE=$(PRJ)$/util$/svxpch - -PRJNAME=svx -TARGET=toolbars -ENABLE_EXCEPTIONS=TRUE; - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME=toolbars -SRC1FILES = \ - extrusionbar.src \ - fontworkbar.src - -SLOFILES= \ - $(SLO)$/extrusionbar.obj \ - $(SLO)$/fontworkbar.obj - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/unodialogs/inc/buttongroup.hrc b/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc index 8385627295..8385627295 100644..100755 --- a/svx/source/unodialogs/inc/buttongroup.hrc +++ b/svx/source/unodialogs/textconversiondlgs/buttongroup.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src new file mode 100755 index 0000000000..1b0b227712 --- /dev/null +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dialogs.src @@ -0,0 +1,293 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "chinese_dictionarydialog.hrc" +#include "chinese_translationdialog.hrc" + +#include <svtools/controldims.hrc> + +#define DIRECTION_RADIOBUTTONS( D_XPOS, D_YPOS, D_FULLWIDTH ) \ +RadioButton RB_TO_SIMPLIFIED \ +{ \ + Pos = MAP_APPFONT( D_XPOS, D_YPOS ); \ + Size = MAP_APPFONT ( D_FULLWIDTH, RSC_CD_RADIOBUTTON_HEIGHT ) ; \ + Text [ en-US ] = "~Traditional Chinese to simplified Chinese"; \ +}; \ +RadioButton RB_TO_TRADITIONAL \ +{ \ + Pos = MAP_APPFONT( D_XPOS, D_YPOS + RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y ); \ + Size = MAP_APPFONT ( D_FULLWIDTH, RSC_CD_RADIOBUTTON_HEIGHT ) ; \ + Text [ en-US ] = "~Simplified Chinese to traditional Chinese"; \ +}; + +//----------------------------------------------------------------------------- +//defines for positions and sizes: + +#define FULL_WIDTH (245) +#define FULL_HEIGHT (165) + +#define ROW_1 (RSC_SP_DLG_INNERBORDER_TOP) +#define ROW_2 (ROW_1+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y) +#define ROW_3 (ROW_2+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y) +#define ROW_4 (ROW_3+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_GROUP_Y) +#define ROW_5 (ROW_4+RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y) +#define ROW_6 (ROW_5+RSC_CD_TEXTBOX_HEIGHT+RSC_SP_CTRL_DESC_Y) + +#define ROW_5a (ROW_5+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y) +#define ROW_5b (ROW_5a+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y) + +#define ROW_8 (FULL_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM-RSC_CD_PUSHBUTTON_HEIGHT) +#define ROW_7 (ROW_8-RSC_CD_FIXEDLINE_HEIGHT-2) + +#define LIST_HEIGHT (ROW_7-RSC_SP_CTRL_Y-ROW_6) + +#define COL_WIDTH 60 +#define BUTTONCOL_WIDTH 40 +#define COL_1 (RSC_SP_DLG_INNERBORDER_LEFT+RSC_SP_FLGR_SPACE_X) +#define COL_2 (COL_1+COL_WIDTH+1) +#define COL_3 (COL_2+COL_WIDTH+1) +#define COL_4 (FULL_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-BUTTONCOL_WIDTH) + +#define REST_COL_WIDTH (COL_4-COL_3-RSC_SP_CTRL_GROUP_X) + +//----------------------------------------------------------------------------- + +ModalDialog DLG_CHINESEDICTIONARY +{ + HelpID = "svx:ModalDialog:DLG_CHINESEDICTIONARY"; + //HelpId = ; + Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT ); + OutputSize = TRUE; + Closeable = TRUE ; + Moveable = TRUE ; + SVLook = TRUE; + + Text [ en-US ] = "Edit Dictionary"; + + DIRECTION_RADIOBUTTONS( COL_1, ROW_1, FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT ) + + CheckBox CB_REVERSE + { + HelpID = "svx:CheckBox:DLG_CHINESEDICTIONARY:CB_REVERSE"; + Pos = MAP_APPFONT ( COL_1, ROW_3 ) ; + Size = MAP_APPFONT ( FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT , RSC_CD_CHECKBOX_HEIGHT ) ; + + Text [ en-US ] = "Reverse mapping"; + }; + + FixedText FT_TERM + { + Pos = MAP_APPFONT ( COL_1 , ROW_4 ) ; + Size = MAP_APPFONT ( COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ; + Text [ en-US ] = "Term"; + }; + Edit ED_TERM + { + HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_TERM"; + Border = TRUE ; + Pos = MAP_APPFONT ( COL_1 , ROW_5 ) ; + Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; + }; + + + FixedText FT_MAPPING + { + Pos = MAP_APPFONT ( COL_2 , ROW_4 ) ; + Size = MAP_APPFONT ( COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ; + Text [ en-US ] = "Mapping"; + }; + Edit ED_MAPPING + { + HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_MAPPING"; + Border = TRUE ; + Pos = MAP_APPFONT ( COL_2 , ROW_5 ) ; + Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; + }; + + FixedText FT_PROPERTY + { + Pos = MAP_APPFONT ( COL_3 , ROW_4 ) ; + Size = MAP_APPFONT ( REST_COL_WIDTH, RSC_CD_FIXEDTEXT_HEIGHT ) ; + Text [ en-US ] = "Property"; + }; + ListBox LB_PROPERTY + { + HelpID = "svx:ListBox:DLG_CHINESEDICTIONARY:LB_PROPERTY"; + Border = TRUE ; + Pos = MAP_APPFONT ( COL_3 , ROW_5 ) ; + Size = MAP_APPFONT ( REST_COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; + DropDown = TRUE ; + + stringlist [ en-US ] = + { + < "Other" ; Default ; > ; + < "Foreign" ; > ; + < "First name" ; > ; + < "Last name" ; > ; + < "Title" ; > ; + < "Status" ; > ; + < "Place name" ; > ; + < "Business" ; > ; + < "Adjective" ; > ; + < "Idiom" ; > ; + < "Abbreviation" ; > ; + < "Numerical" ; > ; + < "Noun" ; > ; + < "Verb" ; > ; + < "Brand name" ; > ; + }; + }; + + Control CT_MAPPINGLIST + { + Pos = MAP_APPFONT ( COL_1, ROW_6 ) ; + Size = MAP_APPFONT ( COL_4 - COL_1 - RSC_SP_CTRL_GROUP_X, LIST_HEIGHT ) ; + TabStop = TRUE ; + }; + + PushButton PB_ADD + { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_ADD"; + Pos = MAP_APPFONT( COL_4, ROW_5 ); + Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); + + Text [ en-US ] = "~Add"; + }; + PushButton PB_MODIFY + { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_MODIFY"; + Pos = MAP_APPFONT( COL_4, ROW_5a ); + Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); + + Text [ en-US ] = "~Modify"; + }; + PushButton PB_DELETE + { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_DELETE"; + Pos = MAP_APPFONT( COL_4, ROW_5b ); + Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); + + Text [ en-US ] = "~Delete"; + }; + + FixedLine FL_BOTTOMLINE + { + Pos = MAP_APPFONT ( 0 , ROW_7 ) ; + Size = MAP_APPFONT ( FULL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ; + }; + + BUTTONS_OK_CANCEL_HELP_ABREAST( FULL_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT, ROW_8 ) +}; + +//----------------------------------------------------------------------------- +//defines for positions and sizes: + +#define T_FULL_WIDTH (220) +#define T_FULL_HEIGHT (120) +#define T_EDITBUTTON_WIDTH (75) + +#define T_COL_1 (RSC_SP_DLG_INNERBORDER_LEFT) +#define T_COL_2 (T_COL_1+RSC_SP_FLGR_SPACE_X) +#define T_COL_3 (T_COL_2+RSC_SP_CHK_TEXTINDENT) +#define T_COL_4 (T_FULL_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-T_EDITBUTTON_WIDTH) + +#define T_ROW_1 (RSC_SP_DLG_INNERBORDER_TOP) +#define T_ROW_2 (T_ROW_1+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_GROUP_Y) +#define T_ROW_3 (T_ROW_2+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_GROUP_Y) +#define T_ROW_4 (T_ROW_3+RSC_CD_RADIOBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y) +#define T_ROW_5 (T_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y) +#define T_ROW_6 (T_ROW_5+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_GROUP_Y) + +#define T_ROW_8 (T_FULL_HEIGHT-RSC_SP_DLG_INNERBORDER_BOTTOM-RSC_CD_PUSHBUTTON_HEIGHT) +#define T_ROW_7 (T_ROW_8-RSC_CD_FIXEDLINE_HEIGHT-2) + +//----------------------------------------------------------------------------- + +ModalDialog DLG_CHINESETRANSLATION +{ + HelpID = "svx:ModalDialog:DLG_CHINESETRANSLATION"; + //HelpId = ; + Size = MAP_APPFONT( T_FULL_WIDTH, T_FULL_HEIGHT ); + OutputSize = TRUE; + Closeable = TRUE ; + Moveable = TRUE ; + SVLook = TRUE; + + Text [ en-US ] = "Chinese Conversion"; + + FixedLine FL_DIRECTION + { + Pos = MAP_APPFONT ( T_COL_1 , T_ROW_1 ) ; + Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ; + Text [ en-US ] = "Conversion direction"; + }; + + DIRECTION_RADIOBUTTONS( T_COL_2, T_ROW_2, (T_FULL_WIDTH - T_COL_2 - RSC_SP_DLG_INNERBORDER_RIGHT) ) + + CheckBox CB_USE_VARIANTS + { + HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_USE_VARIANTS"; + Pos = MAP_APPFONT( T_COL_3, T_ROW_4 ); + Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_3 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT ) ; + + Text [ en-US ] = "~Use Taiwan, Hong Kong SAR, and Macao SAR character variants"; + }; + + FixedLine FL_COMMONTERMS + { + Pos = MAP_APPFONT ( T_COL_1 , T_ROW_5 ) ; + Size = MAP_APPFONT ( T_FULL_WIDTH - T_COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_FIXEDLINE_HEIGHT ) ; + Text [ en-US ] = "Common terms"; + }; + + CheckBox CB_TRANSLATE_COMMONTERMS + { + HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_TRANSLATE_COMMONTERMS"; + Pos = MAP_APPFONT( T_COL_2, T_ROW_6 ); + Size = MAP_APPFONT ( T_COL_4 - T_COL_2, RSC_CD_CHECKBOX_HEIGHT ) ; + + Text [ en-US ] = "Translate ~common terms"; + }; + + PushButton PB_EDITTERMS + { + HelpID = "svx:PushButton:DLG_CHINESETRANSLATION:PB_EDITTERMS"; + Pos = MAP_APPFONT( T_COL_4, T_ROW_6-(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_CHECKBOX_HEIGHT)/2 ); + Size = MAP_APPFONT( T_EDITBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); + + Text [ en-US ] = "~Edit Terms..."; + }; + + FixedLine T_FL_BOTTOMLINE + { + Pos = MAP_APPFONT ( 0 , T_ROW_7 ) ; + Size = MAP_APPFONT ( T_FULL_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ) ; + }; + + BUTTONS_OK_CANCEL_HELP_ABREAST( T_FULL_WIDTH - RSC_SP_DLG_INNERBORDER_RIGHT, T_ROW_8 ) +}; + diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 7b46be498c..009a1b89ca 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -94,7 +94,7 @@ String DictionaryList::getPropertyTypeName( sal_Int16 nConversionPropertyType ) if(!m_pPropertyTypeNameListBox || !m_pPropertyTypeNameListBox->GetEntryCount()) return String(); - USHORT nPos = static_cast<USHORT>( nConversionPropertyType )-1; + sal_uInt16 nPos = static_cast<sal_uInt16>( nConversionPropertyType )-1; if(nPos<m_pPropertyTypeNameListBox->GetEntryCount()) return m_pPropertyTypeNameListBox->GetEntry(nPos); return m_pPropertyTypeNameListBox->GetEntry(0); @@ -113,7 +113,7 @@ String DictionaryList::makeTabString( const DictionaryEntry& rEntry ) const void DictionaryList::initDictionaryControl( const Reference< linguistic2::XConversionDictionary>& xDictionary , ListBox* pPropertyTypeNameListBox ) { - SetWindowBits( WB_VSCROLL ); + SetStyle( WB_VSCROLL | WB_TABSTOP ); SetSelectionMode( SINGLE_SELECTION ); SetBorderStyle( WINDOW_BORDER_MONO ); SetHighlightRange(); @@ -257,7 +257,7 @@ bool DictionaryList::hasTerm( const rtl::OUString& rTerm ) const } void DictionaryList::addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping - , sal_Int16 nConversionPropertyType, ULONG nPos ) + , sal_Int16 nConversionPropertyType, sal_uIntPtr nPos ) { if( hasTerm( rTerm ) ) return; @@ -283,9 +283,9 @@ void DictionaryList::deleteEntryOnPos( sal_Int32 nPos ) } } -ULONG DictionaryList::deleteEntries( const rtl::OUString& rTerm ) +sal_uIntPtr DictionaryList::deleteEntries( const rtl::OUString& rTerm ) { - ULONG nPos = LIST_APPEND; + sal_uIntPtr nPos = LIST_APPEND; for( sal_Int32 nN=GetRowCount(); nN--; ) { DictionaryEntry* pCurEntry = getEntryOnPos( nN ); @@ -352,7 +352,7 @@ void DictionaryList::Resize() m_pHeaderBar->SetSizePixel( aBarSize ); } -void DictionaryList::sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ ) +void DictionaryList::sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ ) { m_nSortColumnIndex=nSortColumnIndex; if( nSortColumnIndex<3 ) @@ -369,7 +369,7 @@ void DictionaryList::sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ ) GetModel()->SetSortMode(SortNone); } -USHORT DictionaryList::getSortColumn() const +sal_uInt16 DictionaryList::getSortColumn() const { return m_nSortColumnIndex; } @@ -390,8 +390,8 @@ StringCompare DictionaryList::ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pR if(pLeftItem != NULL && pRightItem != NULL) { - USHORT nLeftKind=pLeftItem->IsA(); - USHORT nRightKind=pRightItem->IsA(); + sal_uInt16 nLeftKind=pLeftItem->IsA(); + sal_uInt16 nRightKind=pRightItem->IsA(); if(nRightKind == SV_ITEM_ID_LBOXSTRING && nLeftKind == SV_ITEM_ID_LBOXSTRING ) @@ -409,12 +409,12 @@ StringCompare DictionaryList::ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pR return eCompare; } -SvLBoxItem* DictionaryList::getItemAtColumn( SvLBoxEntry* pEntry, USHORT nColumn ) const +SvLBoxItem* DictionaryList::getItemAtColumn( SvLBoxEntry* pEntry, sal_uInt16 nColumn ) const { SvLBoxItem* pItem = NULL; if( pEntry ) { - USHORT nCount = pEntry->ItemCount(); + sal_uInt16 nCount = pEntry->ItemCount(); nColumn++; if( nTreeFlags & TREEFLAG_CHKBTN ) nColumn++; @@ -788,12 +788,12 @@ IMPL_LINK( ChineseDictionaryDialog, ModifyHdl, void*, EMPTYARG ) { if( m_aCB_Reverse.IsChecked() ) { - ULONG nPos = rReverse.deleteEntries( pE->m_aMapping ); + sal_uIntPtr nPos = rReverse.deleteEntries( pE->m_aMapping ); nPos = rReverse.deleteEntries( aMapping ); rReverse.addEntry( aMapping, aTerm, nConversionPropertyType, nPos ); } - ULONG nPos = rActive.deleteEntries( aTerm ); + sal_uIntPtr nPos = rActive.deleteEntries( aTerm ); rActive.addEntry( aTerm, aMapping, nConversionPropertyType, nPos ); } } @@ -866,7 +866,7 @@ IMPL_LINK( ChineseDictionaryDialog, HeaderBarClick, void*, EMPTYARG ) { if(m_pHeaderBar) { - USHORT nId = m_pHeaderBar->GetCurItemId(); + sal_uInt16 nId = m_pHeaderBar->GetCurItemId(); HeaderBarItemBits nBits = m_pHeaderBar->GetItemBits(nId); if( nBits & HIB_CLICKABLE ) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc index 6ba634335f..6ba634335f 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 3f97c1df8a..73a170954f 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -93,14 +93,14 @@ public: bool hasTerm( const rtl::OUString& rTerm ) const; void addEntry( const rtl::OUString& rTerm, const rtl::OUString& rMapping - , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, ULONG nPos = LIST_APPEND ); - ULONG deleteEntries( const rtl::OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted + , sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/, sal_uIntPtr nPos = LIST_APPEND ); + sal_uIntPtr deleteEntries( const rtl::OUString& rTerm ); //return lowest position of deleted entries or LIST_APPEND if no entry was deleted void deleteEntryOnPos( sal_Int32 nPos ); DictionaryEntry* getEntryOnPos( sal_Int32 nPos ) const; DictionaryEntry* getFirstSelectedEntry() const; - void sortByColumn( USHORT nSortColumnIndex, bool bSortAtoZ ); - USHORT getSortColumn() const; + void sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ ); + sal_uInt16 getSortColumn() const; virtual void Resize(); @@ -110,7 +110,7 @@ private: DECL_LINK( CompareHdl, SvSortData* ); StringCompare ColumnCompare( SvLBoxEntry* pLeft, SvLBoxEntry* pRight ); - SvLBoxItem* getItemAtColumn( SvLBoxEntry* pEntry, USHORT nColumn ) const; + SvLBoxItem* getItemAtColumn( SvLBoxEntry* pEntry, sal_uInt16 nColumn ) const; public: ::com::sun::star::uno::Reference< @@ -122,7 +122,7 @@ private: std::vector< DictionaryEntry* > m_aToBeDeleted; - USHORT m_nSortColumnIndex; + sal_uInt16 m_nSortColumnIndex; }; class ChineseDictionaryDialog : public ModalDialog diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src index 2a0c9b2f28..4c6b76c2ae 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src @@ -66,6 +66,7 @@ ModalDialog DLG_CHINESEDICTIONARY { + HelpID = "svx:ModalDialog:DLG_CHINESEDICTIONARY"; //HelpId = ; Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT ); OutputSize = TRUE; @@ -79,6 +80,7 @@ ModalDialog DLG_CHINESEDICTIONARY CheckBox CB_REVERSE { + HelpID = "svx:CheckBox:DLG_CHINESEDICTIONARY:CB_REVERSE"; Pos = MAP_APPFONT ( COL_1, ROW_3 ) ; Size = MAP_APPFONT ( FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT , RSC_CD_CHECKBOX_HEIGHT ) ; @@ -93,6 +95,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; Edit ED_TERM { + HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_TERM"; Border = TRUE ; Pos = MAP_APPFONT ( COL_1 , ROW_5 ) ; Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -107,6 +110,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; Edit ED_MAPPING { + HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_MAPPING"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , ROW_5 ) ; Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -120,6 +124,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; ListBox LB_PROPERTY { + HelpID = "svx:ListBox:DLG_CHINESEDICTIONARY:LB_PROPERTY"; Border = TRUE ; Pos = MAP_APPFONT ( COL_3 , ROW_5 ) ; Size = MAP_APPFONT ( REST_COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -154,6 +159,7 @@ ModalDialog DLG_CHINESEDICTIONARY PushButton PB_ADD { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_ADD"; Pos = MAP_APPFONT( COL_4, ROW_5 ); Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); @@ -161,6 +167,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; PushButton PB_MODIFY { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_MODIFY"; Pos = MAP_APPFONT( COL_4, ROW_5a ); Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); @@ -168,6 +175,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; PushButton PB_DELETE { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_DELETE"; Pos = MAP_APPFONT( COL_4, ROW_5b ); Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc index 161add1e73..161add1e73 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_ids.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc index 956f6232a4..956f6232a4 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_direction_tmpl.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx index b0706e5af7..b0706e5af7 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index 9a2924c8ef..9a2924c8ef 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index f7878d4a78..29c1325c1f 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -63,7 +63,7 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) , m_aFL_Commonterms( this, TextConversionDlgs_ResId( FL_COMMONTERMS ) ) , m_aCB_Translate_Commonterms( this, TextConversionDlgs_ResId( CB_TRANSLATE_COMMONTERMS ) ) , m_aPB_Editterms( this, TextConversionDlgs_ResId( PB_EDITTERMS ) ) - , m_aFL_Bottomline( this, TextConversionDlgs_ResId( FL_BOTTOMLINE ) ) + , m_aFL_Bottomline( this, TextConversionDlgs_ResId( T_FL_BOTTOMLINE ) ) , m_aBP_OK( this, TextConversionDlgs_ResId( PB_OK ) ) , m_aBP_Cancel( this, TextConversionDlgs_ResId( PB_CANCEL ) ) , m_aBP_Help( this, TextConversionDlgs_ResId( PB_HELP ) ) diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc index bc35405016..f3ab26ee45 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hrc @@ -35,10 +35,9 @@ #define CB_USE_VARIANTS 1 #define CB_TRANSLATE_COMMONTERMS 2 -#define CB_REVERSE 3 #define FL_DIRECTION 1 #define FL_COMMONTERMS 2 -#define FL_BOTTOMLINE 3 +#define T_FL_BOTTOMLINE 3 #endif diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx index 2805217c77..2805217c77 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src index 52dfd00909..714e0a407e 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src @@ -58,6 +58,7 @@ ModalDialog DLG_CHINESETRANSLATION { + HelpID = "svx:ModalDialog:DLG_CHINESETRANSLATION"; //HelpId = ; Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT ); OutputSize = TRUE; @@ -78,6 +79,7 @@ ModalDialog DLG_CHINESETRANSLATION CheckBox CB_USE_VARIANTS { + HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_USE_VARIANTS"; Pos = MAP_APPFONT( COL_3, ROW_4 ); Size = MAP_APPFONT ( FULL_WIDTH - COL_3 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT ) ; @@ -93,6 +95,7 @@ ModalDialog DLG_CHINESETRANSLATION CheckBox CB_TRANSLATE_COMMONTERMS { + HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_TRANSLATE_COMMONTERMS"; Pos = MAP_APPFONT( COL_2, ROW_6 ); Size = MAP_APPFONT ( COL_4 - COL_2, RSC_CD_CHECKBOX_HEIGHT ) ; @@ -101,6 +104,7 @@ ModalDialog DLG_CHINESETRANSLATION PushButton PB_EDITTERMS { + HelpID = "svx:PushButton:DLG_CHINESETRANSLATION:PB_EDITTERMS"; Pos = MAP_APPFONT( COL_4, ROW_6-(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_CHECKBOX_HEIGHT)/2 ); Size = MAP_APPFONT( EDITBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); diff --git a/svx/source/unodialogs/textconversiondlgs/makefile.mk b/svx/source/unodialogs/textconversiondlgs/makefile.mk deleted file mode 100644 index b5013ca9d1..0000000000 --- a/svx/source/unodialogs/textconversiondlgs/makefile.mk +++ /dev/null @@ -1,90 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=..$/..$/.. - -PRJNAME=svx -TARGET=textconversiondlgs -ENABLE_EXCEPTIONS=TRUE -USE_DEFFILE=TRUE - -LOCALIZE_ME=chinese_direction_tmpl.hrc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/services.obj\ - $(SLO)$/resid.obj\ - $(SLO)$/chinese_dictionarydialog.obj\ - $(SLO)$/chinese_translationdialog.obj\ - $(SLO)$/chinese_translation_unodialog.obj - -SRS1NAME=$(TARGET) -SRC1FILES= \ - chinese_translationdialog.src\ - chinese_dictionarydialog.src - -RESLIB1NAME=$(TARGET) -RESLIB1SRSFILES= $(SRS)$/$(TARGET).srs - -.IF "$(GUI)" == "OS2" -SHL1TARGET= txcnvdlg -.ELSE -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -.ENDIF -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(SALLIB) \ - $(CPPUHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(TOOLSLIB) \ - $(TKLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(VCLLIB) - -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1IMPLIB= i$(TARGET) -SHL1DEPN= $(SHL1LIBS) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) - - -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk - -$(SRS)$/$(TARGET).srs: $(INCCOM)$/chinese_direction.hrc -$(SLO)$/chinese_dictionarydialog.obj: $(INCCOM)$/chinese_direction.hrc -$(SLO)$/chinese_translationdialog.obj: $(INCCOM)$/chinese_direction.hrc - diff --git a/svx/source/unodialogs/textconversiondlgs/resid.cxx b/svx/source/unodialogs/textconversiondlgs/resid.cxx index bb0a62be9e..9ea569ed88 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/resid.cxx +++ b/svx/source/unodialogs/textconversiondlgs/resid.cxx @@ -43,7 +43,7 @@ static ResMgr* getTextConversionResMgr() pMgr = ResMgr::CreateResMgr( "textconversiondlgs" ); return pMgr; } -TextConversionDlgs_ResId::TextConversionDlgs_ResId(USHORT nId) +TextConversionDlgs_ResId::TextConversionDlgs_ResId(sal_uInt16 nId) : ResId( nId, *getTextConversionResMgr() ) { } diff --git a/svx/source/unodialogs/textconversiondlgs/resid.hxx b/svx/source/unodialogs/textconversiondlgs/resid.hxx index f920fd3a90..9d6c5710df 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/resid.hxx +++ b/svx/source/unodialogs/textconversiondlgs/resid.hxx @@ -42,7 +42,7 @@ namespace textconversiondlgs class TextConversionDlgs_ResId : public ResId { public: - TextConversionDlgs_ResId(USHORT nId); + TextConversionDlgs_ResId(sal_uInt16 nId); }; //............................................................................. diff --git a/svx/source/unodialogs/textconversiondlgs/resids.hrc b/svx/source/unodialogs/textconversiondlgs/resids.hrc index 8581baed1d..8581baed1d 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/resids.hrc +++ b/svx/source/unodialogs/textconversiondlgs/resids.hrc diff --git a/svx/source/unodialogs/textconversiondlgs/services.cxx b/svx/source/unodialogs/textconversiondlgs/services.cxx index 1035c41d1a..59ec79e5ab 100644..100755 --- a/svx/source/unodialogs/textconversiondlgs/services.cxx +++ b/svx/source/unodialogs/textconversiondlgs/services.cxx @@ -48,20 +48,13 @@ static struct ::cppu::ImplementationEntry g_entries_unodialogs_chinesetranslatio extern "C" { //================================================================================================== -void SAL_CALL component_getImplementationEnvironment( +SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } //================================================================================================== -sal_Bool SAL_CALL component_writeInfo( - void * pServiceManager, void * pRegistryKey ) -{ - return ::cppu::component_writeInfoHelper( - pServiceManager, pRegistryKey, g_entries_unodialogs_chinesetranslation ); -} -//================================================================================================== -void * SAL_CALL component_getFactory( +SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index b8a996d0a6..ff67870eac 100644..100755 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -47,6 +47,7 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XInteractionContinuation.hpp> +#include <comphelper/interaction.hxx> #include <framework/interaction.hxx> #include <com/sun/star/drawing/GraphicFilterRequest.hpp> #include <com/sun/star/util/URL.hpp> @@ -66,9 +67,9 @@ #include <editeng/numitem.hxx> #include <svx/svdpagv.hxx> #include <svx/svdograf.hxx> -#include "xoutbmp.hxx" +#include "svx/xoutbmp.hxx" #include "svtools/filter.hxx" -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> #include <svx/fmview.hxx> @@ -178,7 +179,7 @@ namespace svx virtual sal_Bool SAL_CALL supportsMimeType( const ::rtl::OUString& MimeTypeName ) throw (RuntimeException); virtual Sequence< OUString > SAL_CALL getSupportedMimeTypeNames( ) throw (RuntimeException); - VirtualDevice* CreatePageVDev( SdrPage* pPage, ULONG nWidthPixel, ULONG nHeightPixel ) const; + VirtualDevice* CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const; DECL_LINK( CalcFieldValueHdl, EditFieldInfo* ); @@ -220,7 +221,7 @@ namespace svx /** creates a bitmap that is optionaly transparent from a metafile */ - BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, BOOL bTransparent, const Size* pSize ) + BitmapEx GetBitmapFromMetaFile( const GDIMetaFile& rMtf, sal_Bool bTransparent, const Size* pSize ) { Graphic aGraphic( rMtf ); BitmapEx aBmpEx; @@ -348,7 +349,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo) if( pField && pField->ISA( SvxPageField ) ) { String aPageNumValue; - BOOL bUpper = FALSE; + sal_Bool bUpper = sal_False; switch(mpDoc->GetPageNumType()) { @@ -359,7 +360,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo) aPageNumValue += (sal_Unicode)(char)((mnPageNumber - 1) % 26 + 'a'); break; case SVX_ROMAN_UPPER: - bUpper = TRUE; + bUpper = sal_True; case SVX_ROMAN_LOWER: aPageNumValue += SvxNumberFormat::CreateRomanString(mnPageNumber, bUpper); break; @@ -390,7 +391,7 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo) @return the returned VirtualDevice is owned by the caller */ -VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, ULONG nWidthPixel, ULONG nHeightPixel ) const +VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const { VirtualDevice* pVDev = new VirtualDevice(); MapMode aMM( MAP_100TH_MM ); @@ -421,17 +422,17 @@ VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, ULONG nWidthPixe pVDev->SetMapMode( aMM ); #ifdef DBG_UTIL - BOOL bAbort = ! + sal_Bool bAbort = ! #endif pVDev->SetOutputSize(aPageSize); DBG_ASSERT(!bAbort, "virt. Device nicht korrekt erzeugt"); SdrView* pView = new SdrView(mpDoc, pVDev); - pView->SetPageVisible( FALSE ); - pView->SetBordVisible( FALSE ); - pView->SetGridVisible( FALSE ); - pView->SetHlplVisible( FALSE ); - pView->SetGlueVisible( FALSE ); + pView->SetPageVisible( sal_False ); + pView->SetBordVisible( sal_False ); + pView->SetGridVisible( sal_False ); + pView->SetHlplVisible( sal_False ); + pView->SetGlueVisible( sal_False ); pView->ShowSdrPage(pPage); Region aRegion (Rectangle( aPoint, aPageSize ) ); @@ -718,7 +719,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, aVDev.SetMapMode( aMap ); if( rSettings.mbUseHighContrast ) aVDev.SetDrawMode( aVDev.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ); - aVDev.EnableOutput( FALSE ); + aVDev.EnableOutput( sal_False ); aMtf.Record( &aVDev ); Size aNewSize; @@ -734,14 +735,14 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, pView = new SdrView( mpDoc, &aVDev ); } - pView->SetBordVisible( FALSE ); - pView->SetPageVisible( FALSE ); + pView->SetBordVisible( sal_False ); + pView->SetPageVisible( sal_False ); pView->ShowSdrPage( pPage ); if ( pView && pPage ) { - pView->SetBordVisible( FALSE ); - pView->SetPageVisible( FALSE ); + pView->SetBordVisible( sal_False ); + pView->SetPageVisible( sal_False ); pView->ShowSdrPage( pPage ); const Point aNewOrg( pPage->GetLftBorder(), pPage->GetUppBorder() ); @@ -787,7 +788,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, if( rSettings.mbTranslucent ) { Size aOutSize; - aGraphic = GetBitmapFromMetaFile( aGraphic.GetGDIMetaFile(), TRUE, CalcSize( rSettings.mnWidth, rSettings.mnHeight, aNewSize, aOutSize ) ); + aGraphic = GetBitmapFromMetaFile( aGraphic.GetGDIMetaFile(), sal_True, CalcSize( rSettings.mnWidth, rSettings.mnHeight, aNewSize, aOutSize ) ); } } } @@ -886,11 +887,11 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, pMtf->AddAction( new MetaCommentAction( "XTEXT_SCROLLRECT", 0, - reinterpret_cast<BYTE const*>(&aScrollRectangle), + reinterpret_cast<sal_uInt8 const*>(&aScrollRectangle), sizeof( Rectangle ) ) ); pMtf->AddAction( new MetaCommentAction( "XTEXT_PAINTRECT", 0, - reinterpret_cast<BYTE const*>(&aPaintRectangle), + reinterpret_cast<sal_uInt8 const*>(&aPaintRectangle), sizeof( Rectangle ) ) ); aGraphic = Graphic( *pMtf ); @@ -923,7 +924,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, } } - aOut.EnableOutput( FALSE ); + aOut.EnableOutput( sal_False ); aOut.SetMapMode( aMap ); if( rSettings.mbUseHighContrast ) aOut.SetDrawMode( aVDev.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ); @@ -1021,7 +1022,7 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes // create the output stuff Graphic aGraphic; - USHORT nStatus = GetGraphic( aSettings, aGraphic, bVectorType ) ? GRFILTER_OK : GRFILTER_FILTERERROR; + sal_uInt16 nStatus = GetGraphic( aSettings, aGraphic, bVectorType ) ? GRFILTER_OK : GRFILTER_FILTERERROR; if( nStatus == GRFILTER_OK ) { @@ -1066,15 +1067,13 @@ sal_Bool SAL_CALL GraphicExporter::filter( const Sequence< PropertyValue >& aDes { Any aInteraction; Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionContinuation > > lContinuations(1); - ::framework::ContinuationApprove* pApprove = new ::framework::ContinuationApprove(); + ::comphelper::OInteractionApprove* pApprove = new ::comphelper::OInteractionApprove(); lContinuations[0] = Reference< XInteractionContinuation >(static_cast< XInteractionContinuation* >(pApprove), UNO_QUERY); GraphicFilterRequest aErrorCode; aErrorCode.ErrCode = nStatus; aInteraction <<= aErrorCode; - framework::InteractionRequest* pRequest = new framework::InteractionRequest( aInteraction, lContinuations ); - Reference< XInteractionRequest >xRequest( static_cast< XInteractionRequest* >(pRequest), UNO_QUERY ); - aSettings.mxInteractionHandler->handle( xRequest ); + aSettings.mxInteractionHandler->handle( framework::InteractionRequest::CreateRequest( aInteraction, lContinuations ) ); } return nStatus == GRFILTER_OK; } diff --git a/svx/source/unodraw/UnoGraphicExporter.hxx b/svx/source/unodraw/UnoGraphicExporter.hxx index 775e6acaa3..775e6acaa3 100644..100755 --- a/svx/source/unodraw/UnoGraphicExporter.hxx +++ b/svx/source/unodraw/UnoGraphicExporter.hxx diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index 1b5009e138..7fbc341d0f 100644..100755 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -40,13 +40,13 @@ #include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" using namespace ::com::sun::star; using namespace ::rtl; using namespace ::cppu; -SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, USHORT nWhich, BYTE nMemberId ) throw() +SvxUnoNameItemTable::SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw() : mpModel( pModel ), mpModelPool( pModel ? &pModel->GetItemPool() : NULL ), mnWhich( nWhich ), mnMemberId( nMemberId ) @@ -93,11 +93,11 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::supportsService( const OUString& Service uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); const OUString * pArray = aSNL.getConstArray(); - for( INT32 i = 0; i < aSNL.getLength(); i++ ) + for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) - return TRUE; + return sal_True; - return FALSE; + return sal_False; } void SAL_CALL SvxUnoNameItemTable::ImplInsertByName( const OUString& aName, const uno::Any& aElement ) @@ -201,11 +201,11 @@ void SAL_CALL SvxUnoNameItemTable::replaceByName( const OUString& aApiName, cons // if it is not in our own sets, modify the pool! sal_Bool bFound = sal_False; - USHORT nSurrogate; - USHORT nCount = mpModelPool ? mpModelPool->GetItemCount( mnWhich ) : 0; + sal_uInt32 nSurrogate; + sal_uInt32 nCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0; for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, nSurrogate); + pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate); if( pItem && pItem->GetName() == aSearchName ) { pItem->PutValue( aElement, mnMemberId ); @@ -238,12 +238,12 @@ uno::Any SAL_CALL SvxUnoNameItemTable::getByName( const OUString& aApiName ) { const String aSearchName( aName ); NameOrIndex *pItem; - sal_Int32 nSurrogate; + sal_uInt32 nSurrogate; - sal_Int32 nSurrogateCount = mpModelPool ? (sal_Int32)mpModelPool->GetItemCount( mnWhich ) : 0; + sal_uInt32 nSurrogateCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0; for( nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, (USHORT)nSurrogate ); + pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate ); if( isValid( pItem ) && (pItem->GetName() == aSearchName) ) { @@ -266,11 +266,11 @@ uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames( ) NameOrIndex *pItem; OUString aApiName; - const sal_Int32 nSurrogateCount = mpModelPool ? (sal_Int32)mpModelPool->GetItemCount( mnWhich ) : 0; - sal_Int32 nSurrogate; + const sal_uInt32 nSurrogateCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0; + sal_uInt32 nSurrogate; for( nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, (USHORT)nSurrogate ); + pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate ); if( !isValid( pItem ) ) continue; @@ -305,14 +305,14 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName ) return sal_False; const String aSearchName( aName ); - USHORT nSurrogate; + sal_uInt32 nSurrogate; const NameOrIndex *pItem; - USHORT nCount = mpModelPool ? mpModelPool->GetItemCount( mnWhich ) : 0; + sal_uInt32 nCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0; for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, nSurrogate ); + pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate ); if( isValid( pItem ) && (pItem->GetName() == aSearchName) ) return sal_True; } @@ -327,11 +327,11 @@ sal_Bool SAL_CALL SvxUnoNameItemTable::hasElements( ) const NameOrIndex *pItem; - sal_Int32 nSurrogate; - const sal_Int32 nSurrogateCount = mpModelPool ? (sal_Int32)mpModelPool->GetItemCount( mnWhich ) : 0; + sal_uInt32 nSurrogate; + const sal_uInt32 nSurrogateCount = mpModelPool ? mpModelPool->GetItemCount2( mnWhich ) : 0; for( nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( mnWhich, (USHORT)nSurrogate ); + pItem = (NameOrIndex*)mpModelPool->GetItem2( mnWhich, nSurrogate ); if( isValid( pItem ) ) return sal_True; diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx index fe919c2a97..cd5f149ea6 100644..100755 --- a/svx/source/unodraw/UnoNameItemTable.hxx +++ b/svx/source/unodraw/UnoNameItemTable.hxx @@ -51,15 +51,15 @@ class SvxUnoNameItemTable : public cppu::WeakImplHelper2< com::sun::star::contai private: SdrModel* mpModel; SfxItemPool* mpModelPool; - USHORT mnWhich; - BYTE mnMemberId; + sal_uInt16 mnWhich; + sal_uInt8 mnMemberId; ItemPoolVector maItemSetVector; void SAL_CALL ImplInsertByName( const rtl::OUString& aName, const com::sun::star::uno::Any& aElement ); public: - SvxUnoNameItemTable( SdrModel* pModel, USHORT nWhich, BYTE nMemberId ) throw(); + SvxUnoNameItemTable( SdrModel* pModel, sal_uInt16 nWhich, sal_uInt8 nMemberId ) throw(); virtual ~SvxUnoNameItemTable() throw(); virtual NameOrIndex* createItem() const throw() = 0; diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index ff12910777..ccab088399 100644..100755 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -31,7 +31,7 @@ #include <set> -#include "UnoNamespaceMap.hxx" +#include "svx/UnoNamespaceMap.hxx" #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -40,7 +40,7 @@ #include <osl/mutex.hxx> #include <comphelper/stl_types.hxx> #include <svl/itempool.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include "editeng/xmlcnitm.hxx" @@ -117,8 +117,8 @@ namespace svx sal_uInt16* mpWhichId; - sal_uInt16 mnItemCount; - sal_uInt16 mnItem; + sal_uInt32 mnItemCount; + sal_uInt32 mnItem; const SvXMLAttrContainerItem* mpCurrentAttr; sal_uInt16 mnCurrentAttr; @@ -144,7 +144,7 @@ NamespaceIteratorImpl::NamespaceIteratorImpl( sal_uInt16* pWhichIds, SfxItemPool mpWhichId = pWhichIds; mnItem = 0; - mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount( *mpWhichId ) : 0; + mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount2( *mpWhichId ) : 0; } sal_Bool NamespaceIteratorImpl::next( ::rtl::OUString& rPrefix, ::rtl::OUString& rURL ) @@ -164,7 +164,7 @@ sal_Bool NamespaceIteratorImpl::next( ::rtl::OUString& rPrefix, ::rtl::OUString& const SfxPoolItem* pItem = 0; // look for the next available item in the current pool - while( (mnItem < mnItemCount) && ( NULL == (pItem = mpPool->GetItem( *mpWhichId, mnItem ) ) ) ) + while( (mnItem < mnItemCount) && ( NULL == (pItem = mpPool->GetItem2( *mpWhichId, mnItem ) ) ) ) mnItem++; // are we finished with the current whichid? @@ -176,7 +176,7 @@ sal_Bool NamespaceIteratorImpl::next( ::rtl::OUString& rPrefix, ::rtl::OUString& if( 0 != *mpWhichId ) { mnItem = 0; - mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount( *mpWhichId ) : 0; + mnItemCount = (mpWhichId && (0 != *mpWhichId) && mpPool) ? mpPool->GetItemCount2( *mpWhichId ) : 0; return next( rPrefix, rURL ); } diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index e2f63cce8b..b09b2444db 100644..100755 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> #include <com/sun/star/drawing/LineDash.hpp> #include <com/sun/star/awt/Gradient.hpp> @@ -43,7 +43,7 @@ #include "unopolyhelper.hxx" #include <svx/xdef.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <editeng/unoprnms.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -457,7 +457,7 @@ uno::Any SvxUnoXDashTable::getAny( const XPropertyEntry* pEntry ) const throw() drawing::LineDash aLineDash; - aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle()); + aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle()); aLineDash.Dots = rXD.GetDots(); aLineDash.DotLen = rXD.GetDotLen(); aLineDash.Dashes = rXD.GetDashes(); @@ -477,7 +477,7 @@ XPropertyEntry* SvxUnoXDashTable::getEntry( const OUString& rName, const uno::An XDash aXDash; - aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style))); + aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style))); aXDash.SetDots(aLineDash.Dots); aXDash.SetDotLen(aLineDash.DotLen); aXDash.SetDashes(aLineDash.Dashes); @@ -616,8 +616,8 @@ uno::Any SvxUnoXGradientTable::getAny( const XPropertyEntry* pEntry ) const thro awt::Gradient aGradient; aGradient.Style = (awt::GradientStyle) aXGradient.GetGradientStyle(); - aGradient.StartColor = (INT32)aXGradient.GetStartColor().GetColor(); - aGradient.EndColor = (INT32)aXGradient.GetEndColor().GetColor(); + aGradient.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor(); + aGradient.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor(); aGradient.Angle = (short)aXGradient.GetAngle(); aGradient.Border = aXGradient.GetBorder(); aGradient.XOffset = aXGradient.GetXOffset(); diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index 79675e8511..f5b10ac850 100644..100755 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; using namespace ::rtl; using namespace ::cppu; -const USHORT NON_USER_DEFINED_GLUE_POINTS = 4; +const sal_uInt16 NON_USER_DEFINED_GLUE_POINTS = 4; class SvxUnoGluePointAccess : public WeakImplHelper2< container::XIndexContainer, container::XIdentifierContainer > { @@ -236,7 +236,7 @@ sal_Int32 SAL_CALL SvxUnoGluePointAccess::insert( const uno::Any& aElement ) thr { SdrGluePoint aSdrGlue; convert( aUnoGlue, aSdrGlue ); - USHORT nId = pList->Insert( aSdrGlue ); + sal_uInt16 nId = pList->Insert( aSdrGlue ); // only repaint, no objectchange mpObject->ActionChanged(); @@ -256,11 +256,11 @@ void SAL_CALL SvxUnoGluePointAccess::removeByIdentifier( sal_Int32 Identifier ) { if( mpObject.is() && ( Identifier >= NON_USER_DEFINED_GLUE_POINTS )) { - const USHORT nId = (USHORT)(Identifier - NON_USER_DEFINED_GLUE_POINTS) + 1; + const sal_uInt16 nId = (sal_uInt16)(Identifier - NON_USER_DEFINED_GLUE_POINTS) + 1; SdrGluePointList* pList = const_cast<SdrGluePointList*>(mpObject->GetGluePointList()); - const USHORT nCount = pList ? pList->GetCount() : 0; - USHORT i; + const sal_uInt16 nCount = pList ? pList->GetCount() : 0; + sal_uInt16 i; for( i = 0; i < nCount; i++ ) { @@ -289,11 +289,11 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIdentifer( sal_Int32 Identifier, c if( (Identifier < NON_USER_DEFINED_GLUE_POINTS) || !(aElement >>= aGluePoint)) throw lang::IllegalArgumentException(); - const USHORT nId = (USHORT)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1; + const sal_uInt16 nId = (sal_uInt16)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1; SdrGluePointList* pList = const_cast< SdrGluePointList* >( mpObject->GetGluePointList() ); - const USHORT nCount = pList ? pList->GetCount() : 0; - USHORT i; + const sal_uInt16 nCount = pList ? pList->GetCount() : 0; + sal_uInt16 i; for( i = 0; i < nCount; i++ ) { if( (*pList)[i].GetId() == nId ) @@ -323,18 +323,18 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIdentifier( sal_Int32 Identifier ) if( Identifier < NON_USER_DEFINED_GLUE_POINTS ) // default glue point? { - SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (USHORT)Identifier ); + SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (sal_uInt16)Identifier ); aGluePoint.IsUserDefined = sal_False; convert( aTempPoint, aGluePoint ); return uno::makeAny( aGluePoint ); } else { - const USHORT nId = (USHORT)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1; + const sal_uInt16 nId = (sal_uInt16)( Identifier - NON_USER_DEFINED_GLUE_POINTS ) + 1; const SdrGluePointList* pList = mpObject->GetGluePointList(); - const USHORT nCount = pList ? pList->GetCount() : 0; - for( USHORT i = 0; i < nCount; i++ ) + const sal_uInt16 nCount = pList ? pList->GetCount() : 0; + for( sal_uInt16 i = 0; i < nCount; i++ ) { const SdrGluePoint& rTempPoint = (*pList)[i]; if( rTempPoint.GetId() == nId ) @@ -360,9 +360,9 @@ uno::Sequence< sal_Int32 > SAL_CALL SvxUnoGluePointAccess::getIdentifiers() thro if( mpObject.is() ) { const SdrGluePointList* pList = mpObject->GetGluePointList(); - const USHORT nCount = pList ? pList->GetCount() : 0; + const sal_uInt16 nCount = pList ? pList->GetCount() : 0; - USHORT i; + sal_uInt16 i; uno::Sequence< sal_Int32 > aIdSequence( nCount + NON_USER_DEFINED_GLUE_POINTS ); sal_Int32 *pIdentifier = aIdSequence.getArray(); @@ -427,7 +427,7 @@ void SAL_CALL SvxUnoGluePointAccess::removeByIndex( sal_Int32 Index ) Index -= 4; if( Index >= 0 && Index < pList->GetCount() ) { - pList->Delete( (USHORT)Index ); + pList->Delete( (sal_uInt16)Index ); // only repaint, no objectchange mpObject->ActionChanged(); @@ -456,7 +456,7 @@ void SAL_CALL SvxUnoGluePointAccess::replaceByIndex( sal_Int32 Index, const uno: SdrGluePointList* pList = const_cast< SdrGluePointList* >( mpObject->GetGluePointList() ); if( pList && Index < pList->GetCount() ) { - SdrGluePoint& rGlue = (*pList)[(USHORT)Index]; + SdrGluePoint& rGlue = (*pList)[(sal_uInt16)Index]; convert( aUnoGlue, rGlue ); // only repaint, no objectchange @@ -499,7 +499,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index ) if( Index < 4 ) // default glue point? { - SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (USHORT)Index ); + SdrGluePoint aTempPoint = mpObject->GetVertexGluePoint( (sal_uInt16)Index ); aGluePoint.IsUserDefined = sal_False; convert( aTempPoint, aGluePoint ); uno::Any aAny; @@ -512,7 +512,7 @@ uno::Any SAL_CALL SvxUnoGluePointAccess::getByIndex( sal_Int32 Index ) const SdrGluePointList* pList = mpObject->GetGluePointList(); if( pList && Index < pList->GetCount() ) { - const SdrGluePoint& rTempPoint = (*pList)[(USHORT)Index]; + const SdrGluePoint& rTempPoint = (*pList)[(sal_uInt16)Index]; aGluePoint.IsUserDefined = sal_True; convert( rTempPoint, aGluePoint ); uno::Any aAny; diff --git a/svx/source/unodraw/makefile.mk b/svx/source/unodraw/makefile.mk deleted file mode 100644 index 6815f28f4c..0000000000 --- a/svx/source/unodraw/makefile.mk +++ /dev/null @@ -1,83 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=unodraw -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -LIB1TARGET= $(SLB)$/$(TARGET)-core.lib -LIB1OBJFILES= \ - $(SLO)$/UnoGraphicExporter.obj \ - $(SLO)$/XPropertyTable.obj \ - $(SLO)$/UnoNameItemTable.obj \ - $(SLO)$/unoshape.obj \ - $(SLO)$/unoshap2.obj \ - $(SLO)$/unoshap3.obj \ - $(SLO)$/unoshap4.obj \ - $(SLO)$/unopage.obj \ - $(SLO)$/unoshtxt.obj \ - $(SLO)$/unoprov.obj \ - $(SLO)$/unomod.obj \ - $(SLO)$/unomlstr.obj \ - $(SLO)$/unogtabl.obj \ - $(SLO)$/unohtabl.obj \ - $(SLO)$/unobtabl.obj \ - $(SLO)$/unottabl.obj \ - $(SLO)$/unomtabl.obj \ - $(SLO)$/unodtabl.obj \ - $(SLO)$/gluepts.obj \ - $(SLO)$/tableshape.obj \ - $(SLO)$/shapepropertynotifier.obj - -LIB2TARGET= $(SLB)$/$(TARGET).lib -LIB2OBJFILES= \ - $(SLO)$/UnoNamespaceMap.obj \ - $(SLO)$/unopool.obj \ - $(SLO)$/unoctabl.obj \ - $(SLO)$/unoshcol.obj \ - $(SLO)$/recoveryui.obj - -SLOFILES = $(LIB1OBJFILES) $(LIB2OBJFILES) - -SRS1NAME=unodraw -SRC1FILES = \ - unodraw.src - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index e131ffc5ad..e131ffc5ad 100644..100755 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx index f1b460c427..f1b460c427 100644..100755 --- a/svx/source/unodraw/shapeimpl.hxx +++ b/svx/source/unodraw/shapeimpl.hxx diff --git a/svx/source/unodraw/shapepropertynotifier.cxx b/svx/source/unodraw/shapepropertynotifier.cxx index 1e2f91e00e..1e2f91e00e 100644..100755 --- a/svx/source/unodraw/shapepropertynotifier.cxx +++ b/svx/source/unodraw/shapepropertynotifier.cxx diff --git a/svx/source/unodraw/tableshape.cxx b/svx/source/unodraw/tableshape.cxx index 1f9c93c13a..1f9c93c13a 100644..100755 --- a/svx/source/unodraw/tableshape.cxx +++ b/svx/source/unodraw/tableshape.cxx diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index d5512ebe61..d6f99cbf93 100644..100755 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -37,10 +37,10 @@ #include <svx/xbtmpit.hxx> #include <svx/svdmodel.hxx> #include <svx/xflhtit.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/unomid.hxx> #include <editeng/unoprnms.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" #include <editeng/memberids.hrc> using namespace ::com::sun::star; diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index e9ac802095..064b007fee 100644..100755 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -36,9 +36,9 @@ #include "../customshapes/EnhancedCustomShapeEngine.hxx" #include <svx/xtable.hxx> -#include "unoshcol.hxx" +#include "svx/unoshcol.hxx" #include "recoveryui.hxx" -#include "xmlgrhlp.hxx" +#include "svx/xmlgrhlp.hxx" #include "tbunocontroller.hxx" #include "tbunosearchcontrollers.hxx" @@ -101,11 +101,11 @@ sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const OUString& ServiceNam uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); const OUString * pArray = aSNL.getConstArray(); - for( INT32 i = 0; i < aSNL.getLength(); i++ ) + for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) - return TRUE; + return sal_True; - return FALSE; + return sal_False; } OUString SAL_CALL SvxUnoColorTable::getImplementationName() throw( uno::RuntimeException ) @@ -133,7 +133,7 @@ void SAL_CALL SvxUnoColorTable::insertByName( const OUString& aName, const uno:: if( hasByName( aName ) ) throw container::ElementExistException(); - INT32 nColor = 0; + sal_Int32 nColor = 0; if( !(aElement >>= nColor) ) throw lang::IllegalArgumentException(); @@ -158,7 +158,7 @@ void SAL_CALL SvxUnoColorTable::removeByName( const OUString& Name ) void SAL_CALL SvxUnoColorTable::replaceByName( const OUString& aName, const uno::Any& aElement ) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { - INT32 nColor = 0; + sal_Int32 nColor = 0; if( !(aElement >>= nColor) ) throw lang::IllegalArgumentException(); @@ -262,60 +262,6 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } -static void writeInfo ( - registry::XRegistryKey * pRegistryKey, - const OUString& rImplementationName, - const uno::Sequence< OUString >& rServices) -{ - uno::Reference< registry::XRegistryKey > xNewKey( - pRegistryKey->createKey( - OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) + rImplementationName + OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) ) ); - - for( sal_Int32 i = 0; i < rServices.getLength(); i++ ) - xNewKey->createKey( rServices.getConstArray()[i]); -} - -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( - void * , void * pRegistryKey) -{ - if( pRegistryKey ) - { - try - { - registry::XRegistryKey *pKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey ); - - writeInfo( pKey, SvxShapeCollection::getImplementationName_Static(), SvxShapeCollection::getSupportedServiceNames_Static() ); - writeInfo( pKey, SvxUnoColorTable::getImplementationName_Static(), SvxUnoColorTable::getSupportedServiceNames_Static() ); - writeInfo( pKey, EnhancedCustomShapeEngine_getImplementationName(), EnhancedCustomShapeEngine_getSupportedServiceNames() ); - writeInfo( pKey, svx::RecoveryUI::st_getImplementationName(), svx::RecoveryUI::st_getSupportedServiceNames() ); - writeInfo( pKey, svx::GraphicExporter_getImplementationName(), svx::GraphicExporter_getSupportedServiceNames() ); - writeInfo( pKey, svx::FontHeightToolBoxControl::getImplementationName_Static(), svx::FontHeightToolBoxControl::getSupportedServiceNames_Static() ); - - writeInfo( pKey, svx::FindTextToolbarController::getImplementationName_Static(), svx::FindTextToolbarController::getSupportedServiceNames_Static() ); - writeInfo( pKey, svx::DownSearchToolboxController::getImplementationName_Static(), svx::DownSearchToolboxController::getSupportedServiceNames_Static() ); - writeInfo( pKey, svx::UpSearchToolboxController::getImplementationName_Static(), svx::UpSearchToolboxController::getSupportedServiceNames_Static() ); - writeInfo( pKey, svx::FindbarDispatcher::getImplementationName_Static(), svx::FindbarDispatcher::getSupportedServiceNames_Static() ); - - writeInfo( pKey, ::unogallery::GalleryThemeProvider_getImplementationName(),::unogallery::GalleryThemeProvider_getSupportedServiceNames() ); - - // XPrimitiveFactory2D - writeInfo( pKey, - drawinglayer::primitive2d::PrimitiveFactory2D::getImplementationName_Static(), - drawinglayer::primitive2d::PrimitiveFactory2D::getSupportedServiceNames_Static() ); - - writeInfo( pKey, ::svx::SvXMLGraphicImportHelper_getImplementationName(),::svx::SvXMLGraphicImportHelper_getSupportedServiceNames() ); - writeInfo( pKey, ::svx::SvXMLGraphicExportHelper_getImplementationName(),::svx::SvXMLGraphicExportHelper_getSupportedServiceNames() ); -// writeInfo( pKey, ::svx::ExtrusionDepthController_getImplementationName(),::svx::ExtrusionDepthController_getSupportedServiceNames() ); - } - catch (registry::InvalidRegistryException &) - { - OSL_ENSURE( sal_False, "### InvalidRegistryException!" ); - } - } - - return sal_True; -} - SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( const sal_Char * pImplName, void * pServiceManager, void * ) { diff --git a/svx/source/unodraw/unodraw.src b/svx/source/unodraw/unodraw.src index f905e651cf..f905e651cf 100644..100755 --- a/svx/source/unodraw/unodraw.src +++ b/svx/source/unodraw/unodraw.src diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index 8fe41f3836..31bc9c28a9 100644..100755 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -39,7 +39,7 @@ #include <svx/xdash.hxx> #include <svx/svdmodel.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" using namespace ::com::sun::star; using namespace ::rtl; diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index 243b6bc445..a6f7562138 100644..100755 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -37,7 +37,7 @@ #include <svx/svdmodel.hxx> #include <svx/xdef.hxx> #include <svx/xflgrit.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" #include <svx/unomid.hxx> using namespace ::com::sun::star; diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index 17a03e652e..971f9c7d69 100644..100755 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -38,7 +38,7 @@ #include <svx/xdef.hxx> #include <svx/xflhtit.hxx> #include <svx/unomid.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" using namespace ::com::sun::star; using namespace ::rtl; diff --git a/svx/source/unodraw/unomlstr.cxx b/svx/source/unodraw/unomlstr.cxx index 925d447e96..925d447e96 100644..100755 --- a/svx/source/unodraw/unomlstr.cxx +++ b/svx/source/unodraw/unomlstr.cxx diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index d617142b5c..7945934a7f 100644..100755 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -41,17 +41,17 @@ #include <comphelper/serviceinfohelper.hxx> #include <cppuhelper/implbase2.hxx> -#include <unofill.hxx> +#include <svx/unofill.hxx> #include <editeng/unonrule.hxx> #include <svtools/unoimap.hxx> #include <svx/fmdpage.hxx> #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <sfx2/sfx.hrc> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <svx/svdmodel.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/svdtypes.hxx> #include <svx/unoprov.hxx> #include <svx/unopage.hxx> @@ -187,8 +187,8 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawMSFactory::createInstance( sal_uInt32 nType = UHashMap::getId( rServiceSpecifier ); if( nType != UHASHMAP_NOTFOUND ) { - UINT16 nT = (UINT16)(nType & ~E3D_INVENTOR_FLAG); - UINT32 nI = (nType & E3D_INVENTOR_FLAG)?E3dInventor:SdrInventor; + sal_uInt16 nT = (sal_uInt16)(nType & ~E3D_INVENTOR_FLAG); + sal_uInt32 nI = (nType & E3D_INVENTOR_FLAG)?E3dInventor:SdrInventor; return uno::Reference< uno::XInterface >( (drawing::XShape*) SvxDrawPage::CreateShapeByTypeAndInventor( nT, nI ) ); } diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index c675dd56cf..8ea424ab94 100644..100755 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -51,9 +51,9 @@ #include <vcl/svapp.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" -#include "unoapi.hxx" +#include "svx/unoapi.hxx" using namespace ::com::sun::star; using namespace ::rtl; @@ -145,11 +145,11 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const OUString& ServiceNa uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); const OUString * pArray = aSNL.getConstArray(); - for( INT32 i = 0; i < aSNL.getLength(); i++ ) + for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) - return TRUE; + return sal_True; - return FALSE; + return sal_False; } OUString SAL_CALL SvxUnoMarkerTable::getImplementationName() throw( uno::RuntimeException ) @@ -276,11 +276,11 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const // if it is not in our own sets, modify the pool! sal_Bool bFound = sal_False; - USHORT nSurrogate; - const USHORT nStartCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINESTART ) : 0; + sal_uInt32 nSurrogate; + const sal_uInt32 nStartCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINESTART ) : 0; for( nSurrogate = 0; nSurrogate < nStartCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINESTART, nSurrogate); + pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINESTART, nSurrogate); if( pItem && pItem->GetName() == aSearchName ) { pItem->PutValue( aElement ); @@ -289,10 +289,10 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const } } - const USHORT nEndCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINEEND ) : 0; + const sal_uInt32 nEndCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINEEND ) : 0; for( nSurrogate = 0; nSurrogate < nEndCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINEEND, nSurrogate); + pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINEEND, nSurrogate); if( pItem && pItem->GetName() == aSearchName ) { pItem->PutValue( aElement ); @@ -307,13 +307,13 @@ void SAL_CALL SvxUnoMarkerTable::replaceByName( const OUString& aApiName, const throw container::NoSuchElementException(); } -static sal_Bool getByNameFromPool( const String& rSearchName, SfxItemPool* pPool, USHORT nWhich, uno::Any& rAny ) +static sal_Bool getByNameFromPool( const String& rSearchName, SfxItemPool* pPool, sal_uInt16 nWhich, uno::Any& rAny ) { NameOrIndex *pItem; - const sal_Int32 nSurrogateCount = pPool ? (sal_Int32)pPool->GetItemCount( nWhich ) : 0; - for( sal_Int32 nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ ) + const sal_uInt32 nSurrogateCount = pPool ? pPool->GetItemCount2( nWhich ) : 0; + for( sal_uInt32 nSurrogate = 0; nSurrogate < nSurrogateCount; nSurrogate++ ) { - pItem = (NameOrIndex*)pPool->GetItem( nWhich, (USHORT)nSurrogate ); + pItem = (NameOrIndex*)pPool->GetItem2( nWhich, nSurrogate ); if( pItem && pItem->GetName() == rSearchName ) { @@ -355,17 +355,17 @@ uno::Any SAL_CALL SvxUnoMarkerTable::getByName( const OUString& aApiName ) return aAny; } -static void createNamesForPool( SfxItemPool* pPool, USHORT nWhich, std::set< OUString, comphelper::UStringLess >& rNameSet ) +static void createNamesForPool( SfxItemPool* pPool, sal_uInt16 nWhich, std::set< OUString, comphelper::UStringLess >& rNameSet ) { - const sal_Int32 nSuroCount = pPool->GetItemCount( nWhich ); - sal_Int32 nSurrogate; + const sal_uInt32 nSuroCount = pPool->GetItemCount2( nWhich ); + sal_uInt32 nSurrogate; - NameOrIndex *pItem; + NameOrIndex* pItem; OUString aName; for( nSurrogate = 0; nSurrogate < nSuroCount; nSurrogate++ ) { - pItem = (NameOrIndex*)pPool->GetItem( nWhich, (USHORT)nSurrogate ); + pItem = (NameOrIndex*)pPool->GetItem2( nWhich, nSurrogate ); if( pItem == NULL || pItem->GetName().Len() == 0 ) continue; @@ -415,20 +415,20 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName ) NameOrIndex *pItem; SvxUnogetInternalNameForItem( XATTR_LINESTART, aName, aSearchName ); - USHORT nStartCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINESTART ) : 0; - USHORT nSurrogate; + sal_uInt32 nStartCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINESTART ) : 0; + sal_uInt32 nSurrogate; for( nSurrogate = 0; nSurrogate < nStartCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINESTART, nSurrogate); + pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINESTART, nSurrogate); if( pItem && pItem->GetName() == aSearchName ) return sal_True; } SvxUnogetInternalNameForItem( XATTR_LINEEND, aName, aSearchName ); - USHORT nEndCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINEEND ) : 0; + sal_uInt32 nEndCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINEEND ) : 0; for( nSurrogate = 0; nSurrogate < nEndCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINEEND, nSurrogate); + pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINEEND, nSurrogate); if( pItem && pItem->GetName() == aSearchName ) return sal_True; } @@ -450,19 +450,19 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::hasElements( ) NameOrIndex *pItem; - const USHORT nStartCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINESTART ) : 0; - USHORT nSurrogate; + const sal_uInt32 nStartCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINESTART ) : 0; + sal_uInt32 nSurrogate; for( nSurrogate = 0; nSurrogate < nStartCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINESTART, nSurrogate); + pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINESTART, nSurrogate); if( pItem && pItem->GetName().Len() != 0 ) return sal_True; } - const USHORT nEndCount = mpModelPool ? mpModelPool->GetItemCount( XATTR_LINEEND ) : 0; + const sal_uInt32 nEndCount = mpModelPool ? mpModelPool->GetItemCount2( XATTR_LINEEND ) : 0; for( nSurrogate = 0; nSurrogate < nEndCount; nSurrogate++ ) { - pItem = (NameOrIndex*)mpModelPool->GetItem( XATTR_LINEEND, nSurrogate); + pItem = (NameOrIndex*)mpModelPool->GetItem2( XATTR_LINEEND, nSurrogate); if( pItem && pItem->GetName().Len() != 0 ) return sal_True; } diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 150ff94822..d9f52bed9a 100644..100755 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -50,15 +50,16 @@ #include <svx/svdpagv.hxx> #include <svx/unopage.hxx> #include "shapeimpl.hxx" -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/polysc3d.hxx> #include <svx/unoprov.hxx> #include <svx/svdopath.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/svdomeas.hxx> #include <svx/extrud3d.hxx> #include <svx/lathe3d.hxx> #include <vcl/svapp.hxx> +#include <tools/diagnose_ex.h> using ::rtl::OUString; using namespace ::cppu; @@ -299,7 +300,7 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape { SolarMutexGuard aGuard; - if( (mpModel == 0) || (mpPage == 0) ) + if ( ( mpModel == NULL ) || ( mpPage == NULL ) ) throw lang::DisposedException(); SvxShape* pShape = SvxShape::getImplementation( xShape ); @@ -312,6 +313,7 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape if(!pObj) { pObj = CreateSdrObject( xShape ); + ENSURE_OR_RETURN_VOID( pObj != NULL, "SvxDrawPage::add: no SdrObject was created!" ); } else if ( !pObj->IsInserted() ) { @@ -319,13 +321,10 @@ void SAL_CALL SvxDrawPage::add( const uno::Reference< drawing::XShape >& xShape mpPage->InsertObject( pObj ); } - if(pObj == NULL) - return; - pShape->Create( pObj, this ); + OSL_ENSURE( pShape->GetSdrObject() == pObj, "SvxDrawPage::add: shape does not know about its newly created SdrObject!" ); - if( mpModel ) - mpModel->SetChanged(); + mpModel->SetChanged(); } //---------------------------------------------------------------------- @@ -438,7 +437,7 @@ namespace //---------------------------------------------------------------------- // ACHTUNG: _SelectObjectsInView selektiert die ::com::sun::star::drawing::Shapes nur in der angegebennen -// SdrPageView. Dies muß nicht die sichtbare SdrPageView sein. +// SdrPageView. Dies mu� nicht die sichtbare SdrPageView sein. //---------------------------------------------------------------------- void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aShapes, SdrPageView* pPageView ) throw () { @@ -462,7 +461,7 @@ void SvxDrawPage::_SelectObjectsInView( const Reference< drawing::XShapes > & aS //---------------------------------------------------------------------- // ACHTUNG: _SelectObjectInView selektiert das Shape *nur* in der angegebennen -// SdrPageView. Dies muß nicht die sichtbare SdrPageView sein. +// SdrPageView. Dies mu� nicht die sichtbare SdrPageView sein. //---------------------------------------------------------------------- void SvxDrawPage::_SelectObjectInView( const Reference< drawing::XShape > & xShape, SdrPageView* pPageView ) throw() { @@ -617,7 +616,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x aNewPolygon.setClosed(true); pObj->SetExtrudePolygon(basegfx::B2DPolyPolygon(aNewPolygon)); - // #107245# pObj->SetExtrudeCharacterMode(TRUE); + // #107245# pObj->SetExtrudeCharacterMode(sal_True); pObj->SetMergedItem(Svx3DCharacterModeItem(sal_True)); } else if(pNewObj->ISA(E3dLatheObj)) @@ -630,7 +629,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject( const Reference< drawing::XShape > & x aNewPolygon.setClosed(true); pObj->SetPolyPoly2D(basegfx::B2DPolyPolygon(aNewPolygon)); - // #107245# pObj->SetLatheCharacterMode(TRUE); + // #107245# pObj->SetLatheCharacterMode(sal_True); pObj->SetMergedItem(Svx3DCharacterModeItem(sal_True)); } } @@ -987,7 +986,7 @@ SdrPage* GetSdrPageFromXDrawPage( uno::Reference< drawing::XDrawPage > xDrawPage if(xDrawPage.is()) { SvxDrawPage* pDrawPage = SvxDrawPage::getImplementation( xDrawPage ); - + if(pDrawPage) { return pDrawPage->GetSdrPage(); diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index bcfc40c055..da4a6ba2e4 100644..100755 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -35,7 +35,7 @@ #include <rtl/uuid.h> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> -#include "unopool.hxx" +#include "svx/unopool.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpool.hxx> #include <svx/unoprov.hxx> @@ -47,7 +47,7 @@ #include <svx/svdetc.hxx> #include <editeng/editeng.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <memory> using namespace ::com::sun::star; @@ -123,22 +123,22 @@ void SvxUnoDrawPool::getAny( SfxItemPool* pPool, const comphelper::PropertyMapEn } default: { - const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((USHORT)pEntry->mnHandle) : SFX_MAPUNIT_100TH_MM; + const SfxMapUnit eMapUnit = pPool ? pPool->GetMetric((sal_uInt16)pEntry->mnHandle) : SFX_MAPUNIT_100TH_MM; - BYTE nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM); + sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM); if( eMapUnit == SFX_MAPUNIT_100TH_MM ) nMemberId &= (~CONVERT_TWIPS); // DVO, OD 10.10.2003 #i18732# // Assure, that ID is a Which-ID (it could be a Slot-ID.) // Thus, convert handle to Which-ID. - pPool->GetDefaultItem( pPool->GetWhich( (USHORT)pEntry->mnHandle ) ).QueryValue( rValue, nMemberId ); + pPool->GetDefaultItem( pPool->GetWhich( (sal_uInt16)pEntry->mnHandle ) ).QueryValue( rValue, nMemberId ); } } // check for needed metric translation - const SfxMapUnit eMapUnit = pPool->GetMetric((USHORT)pEntry->mnHandle); + const SfxMapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle); if(pEntry->mnMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM) { SvxUnoConvertToMM( eMapUnit, rValue ); @@ -158,7 +158,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn { uno::Any aValue( rValue ); - const SfxMapUnit eMapUnit = pPool->GetMetric((USHORT)pEntry->mnHandle); + const SfxMapUnit eMapUnit = pPool->GetMetric((sal_uInt16)pEntry->mnHandle); if(pEntry->mnMemberId & SFX_METRIC_ITEM && eMapUnit != SFX_MAPUNIT_100TH_MM) { SvxUnoConvertFromMM( eMapUnit, aValue ); @@ -192,7 +192,7 @@ void SvxUnoDrawPool::putAny( SfxItemPool* pPool, const comphelper::PropertyMapEn default: { ::std::auto_ptr<SfxPoolItem> pNewItem( pPool->GetDefaultItem( nWhich ).Clone() ); - BYTE nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM); + sal_uInt8 nMemberId = pEntry->mnMemberId & (~SFX_METRIC_ITEM); if( !pPool || (pPool->GetMetric(nWhich) == SFX_MAPUNIT_100TH_MM) ) nMemberId &= (~CONVERT_TWIPS); @@ -307,7 +307,7 @@ void SvxUnoDrawPool::_setPropertyToDefault( const comphelper::PropertyMapEntry* // OD 10.10.2003 #i18732# // Assure, that ID is a Which-ID (it could be a Slot-ID.) // Thus, convert handle to Which-ID. - const sal_uInt16 nWhich = pPool->GetWhich( (USHORT)pEntry->mnHandle ); + const sal_uInt16 nWhich = pPool->GetWhich( (sal_uInt16)pEntry->mnHandle ); if ( pPool && pPool != mpDefaultsPool ) { // OD 13.10.2003 #i18732# - use method <ResetPoolDefaultItem(..)> @@ -325,7 +325,7 @@ uno::Any SvxUnoDrawPool::_getPropertyDefault( const comphelper::PropertyMapEntry // using probably incompatible item pool <mpDefaultsPool> uno::Any aAny; SfxItemPool* pPool = getModelPool( sal_True ); - const sal_uInt16 nWhich = pPool->GetWhich( (USHORT)pEntry->mnHandle ); + const sal_uInt16 nWhich = pPool->GetWhich( (sal_uInt16)pEntry->mnHandle ); const SfxPoolItem *pItem = pPool->GetPoolDefaultItem ( nWhich ); pItem->QueryValue( aAny, pEntry->mnMemberId ); @@ -408,11 +408,11 @@ sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const OUString& ServiceName uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); const OUString * pArray = aSNL.getConstArray(); - for( INT32 i = 0; i < aSNL.getLength(); i++ ) + for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) - return TRUE; + return sal_True; - return FALSE; + return sal_False; } OUString SAL_CALL SvxUnoDrawPool::getImplementationName() throw( uno::RuntimeException ) diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 22f614c4d7..f2c61a564d 100644..100755 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -43,17 +43,17 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <boost/unordered_map.hpp> -#include <vcl/fldunit.hxx> +#include <tools/fldunit.hxx> #include <tools/shl.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <comphelper/propertysetinfo.hxx> #include <svx/dialmgr.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <editeng/unotext.hxx> #include <svx/unoshprp.hxx> #include <editeng/editeng.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/dialogs.hrc> #include <svx/svdpool.hxx> #include <svx/svdobj.hxx> @@ -652,7 +652,6 @@ SfxItemPropertyMapEntry* ImplGetSvxControlShapePropertyMap() { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_PRINTABLE), SDRATTR_OBJPRINTABLE , &::getBooleanCppuType(), 0, 0}, \ { MAP_CHAR_LEN("Visible"), SDRATTR_OBJVISIBLE , &::getBooleanCppuType(), 0, 0}, \ {0,0,0,0,0,0} - }; return aControlPropertyMap_Impl; @@ -917,7 +916,7 @@ uno::Sequence< OUString > UHashMap::getServiceNames() return aSeq; } -UINT32 UHashMap::getId( const OUString& rCompareString ) +sal_uInt32 UHashMap::getId( const OUString& rCompareString ) { const UHashMapImpl &rMap = GetUHashImpl(); UHashMapImpl::const_iterator it = rMap.find( rCompareString ); @@ -954,7 +953,7 @@ Svx_CompareMap(const void* pSmaller, const void* pBigger ) SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider() { - for(UINT16 i=0;i<SVXMAP_END; i++) + for(sal_uInt16 i=0;i<SVXMAP_END; i++) { aSetArr[i] = 0; aMapArr[i] = 0; @@ -963,23 +962,23 @@ SvxUnoPropertyMapProvider::SvxUnoPropertyMapProvider() SvxUnoPropertyMapProvider::~SvxUnoPropertyMapProvider() { - for(UINT16 i=0;i<SVXMAP_END; i++) + for(sal_uInt16 i=0;i<SVXMAP_END; i++) delete aSetArr[i]; } // --------------------------------------------------------------------- -/*void SvxUnoPropertyMapProvider::Sort(USHORT nId) +/*void SvxUnoPropertyMapProvider::Sort(sal_uInt16 nId) { SfxItemPropertyMapEntry* pTemp = aMapArr[nId]; - UINT16 i = 0; + sal_uInt16 i = 0; while(pTemp[i].pName) { i++; } qsort(aMapArr[nId], i, sizeof(SfxItemPropertyMapEntry), Svx_CompareMap); }*/ // --------------------------------------------------------------------- -const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(UINT16 nPropertyId) +const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(sal_uInt16 nPropertyId) { DBG_ASSERT(nPropertyId < SVXMAP_END, "Id ?" ); if(!aMapArr[nPropertyId]) { @@ -1018,7 +1017,7 @@ const SfxItemPropertyMapEntry* SvxUnoPropertyMapProvider::GetMap(UINT16 nPropert } return aMapArr[nPropertyId]; } -const SvxItemPropertySet* SvxUnoPropertyMapProvider::GetPropertySet(UINT16 nPropertyId, SfxItemPool& rPool) +const SvxItemPropertySet* SvxUnoPropertyMapProvider::GetPropertySet(sal_uInt16 nPropertyId, SfxItemPool& rPool) { if( !aSetArr[nPropertyId] ) aSetArr[nPropertyId] = new SvxItemPropertySet( GetMap( nPropertyId ), rPool ); @@ -1175,10 +1174,10 @@ bool SvxUnoGetResourceRanges( const short nWhich, int& nApiResIds, int& nIntResI break; default: - return FALSE; + return sal_False; } - return TRUE; + return sal_True; } /*sal_Int16 SvxUnoGetWhichIdForNamedProperty( const ::rtl::OUString & rPropName ) @@ -1227,29 +1226,29 @@ bool SvxUnoConvertResourceString( int nSourceResIds, int nDestResIds, int nCount int i; for( i = 0; i < nCount; i++ ) { - USHORT nResId = (USHORT)(nSourceResIds + i); + sal_uInt16 nResId = (sal_uInt16)(nSourceResIds + i); const ResId aRes( SVX_RES(nResId)); const String aCompare( aRes ); if( aShortString == aCompare ) { - USHORT nNewResId = (USHORT)(nDestResIds + i); + sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i); ResId aNewRes( SVX_RES( nNewResId )); rString.Replace( 0, aShortString.Len(), String( aNewRes ) ); - return TRUE; + return sal_True; } else if( rString == aCompare ) { - USHORT nNewResId = (USHORT)(nDestResIds + i); + sal_uInt16 nNewResId = (sal_uInt16)(nDestResIds + i); ResId aNewRes( SVX_RES( nNewResId )); rString = String( aNewRes ); - return TRUE; + return sal_True; } } - return FALSE; + return sal_False; } -static USHORT const SvxUnoColorNameDefResId[] = +static sal_uInt16 SvxUnoColorNameDefResId[] = { RID_SVXSTR_BLUEGREY_DEF, RID_SVXSTR_BLACK_DEF, @@ -1287,7 +1286,7 @@ static USHORT const SvxUnoColorNameDefResId[] = RID_SVXSTR_LIBRE_YELLOW_ACCENT_DEF }; -static USHORT const SvxUnoColorNameResId[] = +static sal_uInt16 SvxUnoColorNameResId[] = { RID_SVXSTR_BLUEGREY, RID_SVXSTR_BLACK, @@ -1325,7 +1324,7 @@ static USHORT const SvxUnoColorNameResId[] = RID_SVXSTR_LIBRE_YELLOW_ACCENT }; -bool SvxUnoConvertResourceString( USHORT* pSourceResIds, USHORT* pDestResIds, int nCount, String& rString ) throw() +bool SvxUnoConvertResourceString( sal_uInt16* pSourceResIds, sal_uInt16* pDestResIds, int nCount, String& rString ) throw() { //We replace e.g. "Gray 10%" with the translation of Gray, but we shouldn't //replace "Red Hat 1" with the translation of Red :-) @@ -1364,7 +1363,7 @@ void SvxUnogetApiNameForItem( const sal_Int16 nWhich, const String& rInternalNam if( nWhich == XATTR_LINECOLOR ) { - if( SvxUnoConvertResourceString( (USHORT*)SvxUnoColorNameResId, (USHORT*)SvxUnoColorNameDefResId, sizeof( SvxUnoColorNameResId ) / sizeof( USHORT ), aNew ) ) + if( SvxUnoConvertResourceString( (sal_uInt16*)SvxUnoColorNameResId, (sal_uInt16*)SvxUnoColorNameDefResId, sizeof( SvxUnoColorNameResId ) / sizeof( sal_uInt16 ), aNew ) ) { rApiName = aNew; return; @@ -1399,7 +1398,7 @@ void SvxUnogetInternalNameForItem( const sal_Int16 nWhich, const rtl::OUString& if( nWhich == XATTR_LINECOLOR ) { - if( SvxUnoConvertResourceString( (USHORT*)SvxUnoColorNameDefResId, (USHORT*)SvxUnoColorNameResId, sizeof( SvxUnoColorNameResId ) / sizeof( USHORT ), aNew ) ) + if( SvxUnoConvertResourceString( (sal_uInt16*)SvxUnoColorNameDefResId, (sal_uInt16*)SvxUnoColorNameResId, sizeof( SvxUnoColorNameResId ) / sizeof( sal_uInt16 ), aNew ) ) { rInternalName = aNew; return; diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 94b0c2270b..186f918adb 100644..100755 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -66,7 +66,7 @@ #include "unopolyhelper.hxx" // #i29181# -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <svx/svdview.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygon.hxx> @@ -1712,7 +1712,7 @@ bool SvxGraphicObject::setPropertyValueImpl( const ::rtl::OUString& rName, const // normal link String aFilterName; const SfxFilter* pSfxFilter = NULL; - SfxMedium aSfxMedium( aURL, STREAM_READ | STREAM_SHARE_DENYNONE, FALSE ); + SfxMedium aSfxMedium( aURL, STREAM_READ | STREAM_SHARE_DENYNONE, sal_False ); SFX_APP()->GetFilterMatcher().GuessFilter( aSfxMedium, &pSfxFilter, SFX_FILTER_IMPORT, SFX_FILTER_NOTINSTALLED | SFX_FILTER_EXECUTABLE ); @@ -1799,6 +1799,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const { case OWN_ATTR_VALUE_FILLBITMAP: { + sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut(); const Graphic& rGraphic = static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphic(); if(rGraphic.GetType() != GRAPHIC_GDIMETAFILE) @@ -1817,6 +1818,8 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const aDestStrm.GetEndOfData()); rValue <<= aSeq; } + if ( bSwapped ) + static_cast< SdrGrafObj* >( mpObj.get() )->ForceSwapOut(); break; } @@ -1828,10 +1831,13 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const } else { + sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut(); const GraphicObject& rGrafObj = static_cast< SdrGrafObj*>( mpObj.get() )->GetGraphicObject(true); OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX)); aURL += OUString::createFromAscii( rGrafObj.GetUniqueID().GetBuffer() ); rValue <<= aURL; + if ( bSwapped ) + static_cast< SdrGrafObj* >( mpObj.get() )->ForceSwapOut(); } break; } @@ -1846,8 +1852,11 @@ bool SvxGraphicObject::getPropertyValueImpl( const ::rtl::OUString& rName, const case OWN_ATTR_VALUE_GRAPHIC: { + sal_Bool bSwapped = static_cast< SdrGrafObj* >( mpObj.get() )->IsSwappedOut(); Reference< graphic::XGraphic > xGraphic( static_cast< SdrGrafObj* >( mpObj.get() )->GetGraphic().GetXGraphic() ); rValue <<= xGraphic; + if ( bSwapped ) + static_cast< SdrGrafObj* >( mpObj.get() )->ForceSwapOut(); break; } @@ -1983,8 +1992,8 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException) Point aRef1( ( aBoundRect.Left() + aBoundRect.Right() ) >> 1, aBoundRect.Top() ); Point aRef2( aRef1.X(), aRef1.Y() + 1000 ); - USHORT i; - USHORT nPntAnz=aPol.GetSize(); + sal_uInt16 i; + sal_uInt16 nPntAnz=aPol.GetSize(); for (i=0; i<nPntAnz; i++) { MirrorPoint(aPol[i],aRef1,aRef2); @@ -2005,8 +2014,8 @@ awt::Point SAL_CALL SvxCustomShape::getPosition() throw(uno::RuntimeException) Point aRef1( aBoundRect.Left(), ( aBoundRect.Top() + aBoundRect.Bottom() ) >> 1 ); Point aRef2( aRef1.X() + 1000, aRef1.Y() ); - USHORT i; - USHORT nPntAnz=aPol.GetSize(); + sal_uInt16 i; + sal_uInt16 nPntAnz=aPol.GetSize(); for (i=0; i<nPntAnz; i++) { MirrorPoint(aPol[i],aRef1,aRef2); diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index a9be7f6cc6..ae9b9389f2 100644..100755 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -46,7 +46,7 @@ #include <svx/unopage.hxx> #include <editeng/unoprnms.hxx> #include <svx/polysc3d.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/cube3d.hxx> #include <svx/sphere3d.hxx> #include <svx/lathe3d.hxx> @@ -324,7 +324,7 @@ static void ConvertObjectToHomogenMatric( E3dObject* pObject, Any& rValue ) } //---------------------------------------------------------------------- -#include <svditer.hxx> +#include <svx/svditer.hxx> struct ImpRememberTransAndRect { @@ -394,7 +394,7 @@ bool Svx3DSceneObject::setPropertyValueImpl( const ::rtl::OUString& rName, const double fCamFocal = (double)((const SfxUInt32Item&)rSceneSet.Get(SDRATTR_3DSCENE_FOCAL_LENGTH)).GetValue(); - aCam.SetAutoAdjustProjection(FALSE); + aCam.SetAutoAdjustProjection(sal_False); aCam.SetViewWindow(- fW / 2, - fH / 2, fW, fH); basegfx::B3DPoint aLookAt; basegfx::B3DPoint aCamPos(0.0, 0.0, fCamPosZ); diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index dc6e67611c..3971324dbc 100644..100755 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -57,11 +57,11 @@ #include <svx/unoshprp.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include "svx/svdpagv.hxx" #include "svx/svdview.hxx" -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" /////////////////////////////////////////////////////////////////////// @@ -281,13 +281,13 @@ bool SvxOle2Shape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sfx Graphic* pGraphic = pObj->GetGraphic(); if( pGraphic ) { - BOOL bIsWMF = FALSE; + sal_Bool bIsWMF = sal_False; if ( pGraphic->IsLink() ) { GfxLink aLnk = pGraphic->GetLink(); if ( aLnk.GetType() == GFX_LINK_TYPE_NATIVE_WMF ) { - bIsWMF = TRUE; + bIsWMF = sal_True; uno::Sequence<sal_Int8> aSeq((sal_Int8*)aLnk.GetData(), (sal_Int32) aLnk.GetDataSize()); rValue <<= aSeq; } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index cca4ffba3f..5bfc8e1c58 100644..100755 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -62,7 +62,7 @@ #include "svx/svdogrp.hxx" #include "svx/scene3d.hxx" #include "svx/svdmodel.hxx" -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include "svx/fmglob.hxx" #include "svx/unopage.hxx" #include "svx/view3d.hxx" @@ -73,7 +73,7 @@ #include "svx/unoshprp.hxx" #include "svx/sxciaitm.hxx" // todo: remove #include "svx/svdograf.hxx" -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include "svx/svdomeas.hxx" #include "svx/svdpagv.hxx" #include "svx/svdpool.hxx" @@ -91,9 +91,9 @@ #include "svx/xlnedit.hxx" #include "svx/xlnstit.hxx" #include "svx/xlndsit.hxx" -#include "svdglob.hxx" -#include "svdstr.hrc" -#include "unomaster.hxx" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/unomaster.hxx" #include <editeng/outlobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> @@ -147,7 +147,7 @@ struct SvxShapeImpl * SdrObject so a multiple call to SvxShape::Create() with same SdrObject * is prohibited. */ - SdrObject* mpCreatedObj; + ::tools::WeakReference< SdrObject > mpCreatedObj; // for xComponent ::cppu::OInterfaceContainerHelper maDisposeListeners; @@ -160,7 +160,7 @@ struct SvxShapeImpl ,mpMaster( NULL ) ,mbHasSdrObjectOwnership( false ) ,mbDisposing( false ) - ,mpCreatedObj( NULL ) + ,mpCreatedObj() ,maDisposeListeners( _rMutex ) ,maPropertyNotifier( _rAntiImpl, _rMutex ) { @@ -468,11 +468,12 @@ void SvxShape::Create( SdrObject* pNewObj, SvxDrawPage* /*pNewPage*/ ) if ( !pNewObj ) return; - OSL_ENSURE( ( mpImpl->mpCreatedObj == NULL ) || ( mpImpl->mpCreatedObj == pNewObj ), + SdrObject* pCreatedObj = mpImpl->mpCreatedObj.get(); + OSL_ENSURE( ( pCreatedObj == NULL ) || ( pCreatedObj == pNewObj ), "SvxShape::Create: the same shape used for two different objects?! Strange ..." ); // Correct condition (#i52126#) - if ( mpImpl->mpCreatedObj != pNewObj ) + if ( pCreatedObj != pNewObj ) { DBG_ASSERT( pNewObj->GetModel(), "no model for SdrObject?" ); // Correct condition (#i52126#) @@ -1501,7 +1502,7 @@ void SAL_CALL SvxShape::removeVetoableChangeListener( const OUString& , const Re sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rName ) { - SfxItemSet aSet( mpModel->GetItemPool(), (USHORT)nWID, (USHORT)nWID ); + SfxItemSet aSet( mpModel->GetItemPool(), (sal_uInt16)nWID, (sal_uInt16)nWID ); if( SetFillAttribute( nWID, rName, aSet, mpModel ) ) { @@ -1686,12 +1687,12 @@ sal_Bool SAL_CALL SvxShape::SetFillAttribute( sal_Int32 nWID, const OUString& rN const SfxItemPool* pPool = rSet.GetPool(); const String aSearchName( aName ); - const USHORT nCount = pPool->GetItemCount((USHORT)nWID); - const NameOrIndex *pItem; + const sal_uInt32 nCount = pPool->GetItemCount2((sal_uInt16)nWID); + const NameOrIndex* pItem; - for( USHORT nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) + for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - pItem = (NameOrIndex*)pPool->GetItem((USHORT)nWID, nSurrogate); + pItem = (NameOrIndex*)pPool->GetItem2((sal_uInt16)nWID, nSurrogate); if( pItem && ( pItem->GetName() == aSearchName ) ) { rSet.Put( *pItem ); @@ -2169,7 +2170,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope case XATTR_FILLHATCH: case XATTR_LINEDASH: { - NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID); + NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID); if( ( pItem == NULL ) || ( pItem->GetName().Len() == 0) ) eState = beans::PropertyState_DEFAULT_VALUE; } @@ -2184,7 +2185,7 @@ beans::PropertyState SAL_CALL SvxShape::_getPropertyState( const OUString& Prope case XATTR_LINESTART: case XATTR_FILLFLOATTRANSPARENCE: { - NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((USHORT)pMap->nWID); + NameOrIndex* pItem = (NameOrIndex*)rSet.GetItem((sal_uInt16)pMap->nWID); if( ( pItem == NULL ) ) eState = beans::PropertyState_DEFAULT_VALUE; } @@ -2268,7 +2269,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper #ifdef DBG_UTIL SdrObject* pCheck = #endif - pObjList->SetObjectOrdNum( mpObj->GetOrdNum(), (ULONG)nNewOrdNum ); + pObjList->SetObjectOrdNum( mpObj->GetOrdNum(), (sal_uIntPtr)nNewOrdNum ); DBG_ASSERT( pCheck == mpObj.get(), "GetOrdNum() failed!" ); } return true; @@ -2444,7 +2445,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper OUString aLayerName; if( rValue >>= aLayerName ) { - const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, TRUE); + const SdrLayer* pLayer=mpModel->GetLayerAdmin().GetLayer(aLayerName, sal_True); if( pLayer != NULL ) { mpObj->SetLayer( pLayer->GetID() ); @@ -2482,7 +2483,7 @@ bool SvxShape::setPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper { Point aRef1(mpObj->GetSnapRect().Center()); double nTan=tan(nShear*nPi180); - mpObj->Shear(aRef1,nShear,nTan,FALSE); + mpObj->Shear(aRef1,nShear,nTan,sal_False); return true; } } @@ -2968,13 +2969,13 @@ bool SvxShape::getPropertyValueImpl( const ::rtl::OUString&, const SfxItemProper Graphic* pGraphic = pObj->GetGraphic(); if( pGraphic ) { - BOOL bIsWMF = FALSE; + sal_Bool bIsWMF = sal_False; if ( pGraphic->IsLink() ) { GfxLink aLnk = pGraphic->GetLink(); if ( aLnk.GetType() == GFX_LINK_TYPE_NATIVE_WMF ) { - bIsWMF = TRUE; + bIsWMF = sal_True; uno::Sequence<sal_Int8> aSeq((sal_Int8*)aLnk.GetData(), (sal_Int32) aLnk.GetDataSize()); rValue <<= aSeq; } @@ -3185,7 +3186,7 @@ void SvxShape::setAllPropertiesToDefault() throw (uno::RuntimeException) } // #i68523# special handling for Svx3DCharacterModeItem, this is not saved - // but needs to be TRUE in svx, pool default (false) in sch. Since sch + // but needs to be sal_True in svx, pool default (false) in sch. Since sch // does not load lathe or extrude objects, it is possible to set the items // here. // For other solution possibilities, see task description. @@ -3295,7 +3296,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() if( mpObj.is() && mpObj->GetObjInventor() == SdrInventor) { - const UINT16 nIdent = mpObj->GetObjIdentifier(); + const sal_uInt16 nIdent = mpObj->GetObjIdentifier(); switch(nIdent) { @@ -3810,7 +3811,7 @@ uno::Sequence< OUString > SAL_CALL SvxShape::_getSupportedServiceNames() else if( mpObj.is() && mpObj->GetObjInventor() == FmFormInventor) { #if OSL_DEBUG_LEVEL > 0 - const UINT16 nIdent = mpObj->GetObjIdentifier(); + const sal_uInt16 nIdent = mpObj->GetObjIdentifier(); OSL_ENSURE( nIdent == OBJ_UNO, "SvxShape::_getSupportedServiceNames: FmFormInventor, but no UNO object?" ); #endif static uno::Sequence< OUString > *pSeq = 0; diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 14e32c0a09..6d82c989b0 100644..100755 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <com/sun/star/document/EventObject.hpp> -#include "unoshcol.hxx" +#include "svx/unoshcol.hxx" #include <svx/unoprov.hxx> #include <comphelper/serviceinfohelper.hxx> diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index ae97b5b6b4..80898cc32e 100644..100755 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -56,7 +56,7 @@ #include <com/sun/star/linguistic2/XLinguServiceManager.hpp> #include <comphelper/processfactory.hxx> #include <osl/mutex.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> using namespace ::osl; using namespace ::rtl; @@ -105,14 +105,14 @@ private: SvxDrawOutlinerViewForwarder* mpViewForwarder; // if non-NULL, use GetViewModeTextForwarder text forwarder css::uno::Reference< css::linguistic2::XLinguServiceManager > m_xLinguServiceManager; Point maTextOffset; - BOOL mbDataValid; - BOOL mbDestroyed; - BOOL mbIsLocked; - BOOL mbNeedsUpdate; - BOOL mbOldUndoMode; - BOOL mbForwarderIsEditMode; // have to reflect that, since ENDEDIT can happen more often - BOOL mbShapeIsEditMode; // #104157# only true, if HINT_BEGEDIT was received - BOOL mbNotificationsDisabled; // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder) + sal_Bool mbDataValid; + sal_Bool mbDestroyed; + sal_Bool mbIsLocked; + sal_Bool mbNeedsUpdate; + sal_Bool mbOldUndoMode; + sal_Bool mbForwarderIsEditMode; // have to reflect that, since ENDEDIT can happen more often + sal_Bool mbShapeIsEditMode; // #104157# only true, if HINT_BEGEDIT was received + sal_Bool mbNotificationsDisabled; // prevent EditEngine/Outliner notifications (e.g. when setting up forwarder) XInterface* mpOwner; SvxUnoTextRangeBaseList maTextRanges; @@ -122,7 +122,6 @@ private: SvxDrawOutlinerViewForwarder* CreateViewForwarder(); void SetupOutliner(); - void UpdateOutliner(); sal_Bool HasView() const { return mpView ? sal_True : sal_False; } sal_Bool IsEditMode() const @@ -157,7 +156,7 @@ public: void lock(); void unlock(); - BOOL IsValid() const; + sal_Bool IsValid() const; Rectangle GetVisArea(); Point LogicToPixel( const Point&, const MapMode& rMapMode ); @@ -168,6 +167,8 @@ public: virtual void ObjectInDestruction(const SdrObject& rObject); void ChangeModel( SdrModel* pNewModel ); + + void UpdateOutliner(); }; //------------------------------------------------------------------------ @@ -182,14 +183,14 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject* pObject, SdrText* pText mpOutliner ( NULL ), mpTextForwarder ( NULL ), mpViewForwarder ( NULL ), - mbDataValid ( FALSE ), - mbDestroyed ( FALSE ), - mbIsLocked ( FALSE ), - mbNeedsUpdate ( FALSE ), - mbOldUndoMode ( FALSE ), - mbForwarderIsEditMode ( FALSE ), - mbShapeIsEditMode ( FALSE ), - mbNotificationsDisabled ( FALSE ), + mbDataValid ( sal_False ), + mbDestroyed ( sal_False ), + mbIsLocked ( sal_False ), + mbNeedsUpdate ( sal_False ), + mbOldUndoMode ( sal_False ), + mbForwarderIsEditMode ( sal_False ), + mbShapeIsEditMode ( sal_False ), + mbNotificationsDisabled ( sal_False ), mpOwner( pOwner ) { DBG_ASSERT( mpObject, "invalid pObject!" ); @@ -220,14 +221,14 @@ SvxTextEditSourceImpl::SvxTextEditSourceImpl( SdrObject& rObject, SdrText* pText mpOutliner ( NULL ), mpTextForwarder ( NULL ), mpViewForwarder ( NULL ), - mbDataValid ( FALSE ), - mbDestroyed ( FALSE ), - mbIsLocked ( FALSE ), - mbNeedsUpdate ( FALSE ), - mbOldUndoMode ( FALSE ), - mbForwarderIsEditMode ( FALSE ), - mbShapeIsEditMode ( TRUE ), - mbNotificationsDisabled ( FALSE ), + mbDataValid ( sal_False ), + mbDestroyed ( sal_False ), + mbIsLocked ( sal_False ), + mbNeedsUpdate ( sal_False ), + mbOldUndoMode ( sal_False ), + mbForwarderIsEditMode ( sal_False ), + mbShapeIsEditMode ( sal_True ), + mbNotificationsDisabled ( sal_False ), mpOwner(0) { if( !mpText ) @@ -368,7 +369,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint ) { case HINT_OBJCHG: { - mbDataValid = FALSE; // Text muss neu geholt werden + mbDataValid = sal_False; // Text muss neu geholt werden if( HasView() ) { @@ -400,7 +401,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint ) mpView->GetTextEditOutliner()->SetNotifyHdl( LINK(this, SvxTextEditSourceImpl, NotifyHdl) ); // #104157# Only now we're really in edit mode - mbShapeIsEditMode = TRUE; + mbShapeIsEditMode = sal_True; Broadcast( *pSdrHint ); } @@ -412,7 +413,7 @@ void SvxTextEditSourceImpl::Notify( SfxBroadcaster&, const SfxHint& rHint ) Broadcast( *pSdrHint ); // #104157# We're no longer in edit mode - mbShapeIsEditMode = FALSE; + mbShapeIsEditMode = sal_False; // remove as listener - outliner might outlive ourselves if( mpView && mpView->GetTextEditOutliner() ) @@ -564,7 +565,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() if( mpOutliner == NULL ) { SdrTextObj* pTextObj = PTR_CAST( SdrTextObj, mpObject ); - USHORT nOutlMode = OUTLINERMODE_TEXTOBJECT; + sal_uInt16 nOutlMode = OUTLINERMODE_TEXTOBJECT; if( pTextObj && pTextObj->IsTextFrame() && pTextObj->GetTextKind() == OBJ_OUTLINETEXT ) nOutlMode = OUTLINERMODE_OUTLINEOBJECT; @@ -637,7 +638,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() // #91254# put text to object and set EmptyPresObj to FALSE if( mpText && bOwnParaObj && pOutlinerParaObject && mpObject->IsEmptyPresObj() && pTextObj->IsRealyEdited() ) { - mpObject->SetEmptyPresObj( FALSE ); + mpObject->SetEmptyPresObj( sal_False ); static_cast< SdrTextObj* >( mpObject)->NbcSetOutlinerParaObjectForText( pOutlinerParaObject, mpText ); // #i103982# Here, due to mpObject->NbcSetOutlinerParaObjectForText, we LOSE ownership of the @@ -678,7 +679,7 @@ SvxTextForwarder* SvxTextEditSourceImpl::GetBackgroundTextForwarder() } } - mbDataValid = TRUE; + mbDataValid = sal_True; if( bOwnParaObj ) delete pOutlinerParaObject; @@ -911,9 +912,9 @@ void SvxTextEditSourceImpl::unlock() } } -BOOL SvxTextEditSourceImpl::IsValid() const +sal_Bool SvxTextEditSourceImpl::IsValid() const { - return mpView && mpWindow ? TRUE : FALSE; + return mpView && mpWindow ? sal_True : sal_False; } Rectangle SvxTextEditSourceImpl::GetVisArea() @@ -1108,7 +1109,7 @@ void SvxTextEditSource::unlock() mpImpl->unlock(); } -BOOL SvxTextEditSource::IsValid() const +sal_Bool SvxTextEditSource::IsValid() const { return mpImpl->IsValid(); } @@ -1148,4 +1149,9 @@ void SvxTextEditSource::ChangeModel( SdrModel* pNewModel ) mpImpl->ChangeModel( pNewModel ); } +void SvxTextEditSource::UpdateOutliner() +{ + mpImpl->UpdateOutliner(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index e20263cf92..261432b244 100644..100755 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -36,7 +36,7 @@ #include <svx/svdmodel.hxx> #include <svx/xflhtit.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" #include <svx/unomid.hxx> #include "UnoNameItemTable.hxx" @@ -85,7 +85,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedService NameOrIndex* SvxUnoTransGradientTable::createItem() const throw() { XFillFloatTransparenceItem* pNewItem = new XFillFloatTransparenceItem(); - pNewItem->SetEnabled( TRUE ); + pNewItem->SetEnabled( sal_True ); return pNewItem; } diff --git a/svx/source/unogallery/makefile.mk b/svx/source/unogallery/makefile.mk deleted file mode 100755 index 113bd70db0..0000000000 --- a/svx/source/unogallery/makefile.mk +++ /dev/null @@ -1,48 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -TARGET=unogallery -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/unogalthemeprovider.obj \ - $(SLO)$/unogaltheme.obj \ - $(SLO)$/unogalitem.obj - -# --- Target ------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 015c3c1cf4..ad78ee4766 100644..100755 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -31,7 +31,7 @@ #include "unogalitem.hxx" #include "unogaltheme.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/galmisc.hxx" #include <svx/fmmodel.hxx> #include <rtl/uuid.h> diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index 71e6b6ea94..71e6b6ea94 100644..100755 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index 9e5a1e8bc2..a1ec703c82 100644..100755 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -33,7 +33,7 @@ #include "unogaltheme.hxx" #include "unogalitem.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/gallery1.hxx" #include "svx/galmisc.hxx" #include <svx/fmmodel.hxx> diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx index 8c9f1de670..8c9f1de670 100644..100755 --- a/svx/source/unogallery/unogaltheme.hxx +++ b/svx/source/unogallery/unogaltheme.hxx diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx index ac50cb36d0..ac50cb36d0 100644..100755 --- a/svx/source/unogallery/unogalthemeprovider.cxx +++ b/svx/source/unogallery/unogalthemeprovider.cxx diff --git a/svx/source/xml/makefile.mk b/svx/source/xml/makefile.mk deleted file mode 100644 index 02e6f3ae1f..0000000000 --- a/svx/source/xml/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=svx -TARGET=xml - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- -SLOFILES = \ - $(SLO)$/xmlexport.obj \ - $(SLO)$/xmlxtimp.obj \ - $(SLO)$/xmlxtexp.obj \ - $(SLO)$/xmlgrhlp.obj \ - $(SLO)$/xmleohlp.obj - -# --- Targets -------------------------------------------------------------- - -.INCLUDE : target.mk diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 29d5534cc3..e37305997a 100644..100755 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -53,7 +53,7 @@ #include <sot/clsids.hxx> #include <map> -#include "xmleohlp.hxx" +#include "svx/xmleohlp.hxx" // ----------- // - Defines - diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index 5a8a47948e..c2fa556bdc 100644..100755 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -45,8 +45,8 @@ #include <unotools/streamwrap.hxx> #include <sot/storage.hxx> #include <svx/svdmodel.hxx> -#include <xmleohlp.hxx> -#include <xmlgrhlp.hxx> +#include <svx/xmleohlp.hxx> +#include <svx/xmlgrhlp.hxx> #include <svx/unomodel.hxx> diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index 0c3b7a106b..cb18793049 100644..100755 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -47,7 +47,7 @@ #include <tools/zcodec.hxx> #include "svtools/filter.hxx" -#include "xmlgrhlp.hxx" +#include "svx/xmlgrhlp.hxx" #include <algorithm> @@ -329,8 +329,8 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() Graphic aGraphic; mpOStm->Seek( 0 ); - USHORT nFormat = GRFILTER_FORMAT_DONTKNOW; - USHORT pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW; + sal_uInt16 nFormat = GRFILTER_FORMAT_DONTKNOW; + sal_uInt16 pDeterminedFormat = GRFILTER_FORMAT_DONTKNOW; GraphicFilter::GetGraphicFilter()->ImportGraphic( aGraphic, String(), *mpOStm ,nFormat,&pDeterminedFormat ); if (pDeterminedFormat == GRFILTER_FORMAT_DONTKNOW) @@ -338,17 +338,17 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() //Read the first two byte to check whether it is a gzipped stream, is so it may be in wmz or emz format //unzip them and try again - BYTE sFirstBytes[ 2 ]; + sal_uInt8 sFirstBytes[ 2 ]; mpOStm->Seek( STREAM_SEEK_TO_END ); - ULONG nStreamLen = mpOStm->Tell(); + sal_uIntPtr nStreamLen = mpOStm->Tell(); mpOStm->Seek( 0 ); if ( !nStreamLen ) { SvLockBytes* pLockBytes = mpOStm->GetLockBytes(); if ( pLockBytes ) - pLockBytes->SetSynchronMode( TRUE ); + pLockBytes->SetSynchronMode( sal_True ); mpOStm->Seek( STREAM_SEEK_TO_END ); nStreamLen = mpOStm->Tell(); @@ -370,7 +370,7 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject() if (aZCodec.EndCompression() && pDest ) { pDest->Seek( STREAM_SEEK_TO_END ); - ULONG nStreamLen_ = pDest->Tell(); + sal_uIntPtr nStreamLen_ = pDest->Tell(); if (nStreamLen_) { pDest->Seek(0L); @@ -500,7 +500,7 @@ uno::Reference < embed::XStorage > SvXMLGraphicHelper::ImplGetGraphicStorage( co SvxGraphicHelperStream_Impl SvXMLGraphicHelper::ImplGetGraphicStream( const ::rtl::OUString& rPictureStorageName, const ::rtl::OUString& rPictureStreamName, - BOOL bTruncate ) + sal_Bool bTruncate ) { SvxGraphicHelperStream_Impl aRet; aRet.xStorage = ImplGetGraphicStorage( rPictureStorageName ); @@ -565,7 +565,7 @@ Graphic SvXMLGraphicHelper::ImplReadGraphic( const ::rtl::OUString& rPictureStor const ::rtl::OUString& rPictureStreamName ) { Graphic aGraphic; - SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, FALSE ) ); + SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, sal_False ) ); if( aStream.xStream.is() ) { SvStream* pStream = utl::UcbStreamHelper::CreateStream( aStream.xStream ); @@ -588,7 +588,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt if( aGrfObject.GetType() != GRAPHIC_NONE ) { - SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, FALSE ) ); + SvxGraphicHelperStream_Impl aStream( ImplGetGraphicStream( rPictureStorageName, rPictureStreamName, sal_False ) ); if( aStream.xStream.is() ) { Graphic aGraphic( (Graphic&) aGrfObject.GetGraphic() ); @@ -637,7 +637,7 @@ sal_Bool SvXMLGraphicHelper::ImplWriteGraphic( const ::rtl::OUString& rPictureSt if ( pComment ) { sal_uInt32 nSize = pComment->GetDataSize(); - const BYTE* pData = pComment->GetData(); + const sal_uInt8* pData = pComment->GetData(); if ( nSize && pData ) pStream->Write( pData, nSize ); @@ -706,8 +706,8 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s else { const String aGraphicObjectId( aPictureStreamName ); - const GraphicObject aGrfObject( ByteString( aGraphicObjectId, RTL_TEXTENCODING_ASCII_US ) ); - + const ByteString aAsciiObjectID( aGraphicObjectId, RTL_TEXTENCODING_ASCII_US ); + const GraphicObject aGrfObject( aAsciiObjectID ); if( aGrfObject.GetType() != GRAPHIC_NONE ) { String aStreamName( aGraphicObjectId ); @@ -781,6 +781,15 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s rURLPair.second = sPictures; rURLPair.second += aStreamName; } +#if OSL_DEBUG_LEVEL > 0 + else + { + ByteString sMessage = "graphic object with ID '"; + sMessage += aAsciiObjectID; + sMessage += "' has an unknown type"; + OSL_ENSURE( false, sMessage.GetBuffer() ); + } +#endif } maURLSet.insert( aURLString ); @@ -791,7 +800,7 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const ::rtl::OUString& rURLStr, s void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLStorage, SvXMLGraphicHelperMode eCreateMode, - BOOL bDirect ) + sal_Bool bDirect ) { mxRootStorage = rXMLStorage; meCreateMode = eCreateMode; @@ -802,7 +811,7 @@ void SvXMLGraphicHelper::Init( const uno::Reference < embed::XStorage >& rXMLSto SvXMLGraphicHelper* SvXMLGraphicHelper::Create( const uno::Reference < embed::XStorage >& rXMLStorage, SvXMLGraphicHelperMode eCreateMode, - BOOL bDirect ) + sal_Bool bDirect ) { SvXMLGraphicHelper* pThis = new SvXMLGraphicHelper; diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 39317880fd..0b035db2cf 100644..100755 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -55,7 +55,7 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> -#include "xmlgrhlp.hxx" +#include "svx/xmlgrhlp.hxx" #include "xmlxtexp.hxx" @@ -201,14 +201,14 @@ sal_Bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Ref if( !xServiceFactory.is() ) { OSL_FAIL( "got no service manager" ); - return FALSE; + return sal_False; } uno::Reference< uno::XInterface > xWriter( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ) ) ) ); if( !xWriter.is() ) { OSL_FAIL( "com.sun.star.xml.sax.Writer service missing" ); - return FALSE; + return sal_False; } uno::Reference<xml::sax::XDocumentHandler> xHandler( xWriter, uno::UNO_QUERY ); @@ -232,7 +232,7 @@ sal_Bool SvxXMLXTableExportComponent::save( const OUString& rURL, const uno::Ref } else { - pMedium = new SfxMedium( rURL, STREAM_WRITE | STREAM_TRUNC, TRUE ); + pMedium = new SfxMedium( rURL, STREAM_WRITE | STREAM_TRUNC, sal_True ); pMedium->IsRemote(); SvStream* pStream = pMedium->GetOutStream(); diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index ad5887ef15..88f4fe8b44 100644..100755 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -59,7 +59,7 @@ #include "xmloff/ImageStyle.hxx" #include "xmloff/MarkerStyle.hxx" #include <xmloff/xmlictxt.hxx> -#include "xmlgrhlp.hxx" +#include "svx/xmlgrhlp.hxx" #include "xmloff/attrlist.hxx" #include "xmlxtimp.hxx" @@ -91,21 +91,21 @@ enum SvxXMLTableImportContextEnum { stice_unknown, stice_color, stice_marker, st class SvxXMLTableImportContext : public SvXMLImportContext { public: - SvxXMLTableImportContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, + SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >& xAttrList, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, sal_Bool bOOoFormat ); virtual ~SvxXMLTableImportContext(); - virtual SvXMLImportContext *CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ); + virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList ); SvxXMLXTableImport& getImport() const { return *(SvxXMLXTableImport*)&GetImport(); } protected: - void importColor( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ); - void importMarker( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ); - void importDash( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ); - void importHatch( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ); - void importGradient( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ); - void importBitmap( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ); + void importColor( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ); + void importMarker( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ); + void importDash( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ); + void importHatch( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ); + void importGradient( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ); + void importBitmap( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ); private: uno::Reference< XNameContainer > mxTable; @@ -115,7 +115,7 @@ private: /////////////////////////////////////////////////////////////////////// -SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, USHORT nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, sal_Bool bOOoFormat ) +SvxXMLTableImportContext::SvxXMLTableImportContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference< XAttributeList >&, SvxXMLTableImportContextEnum eContext, const uno::Reference< XNameContainer >& xTable, sal_Bool bOOoFormat ) : SvXMLImportContext( rImport, nPrfx, rLName ), mxTable( xTable ), meContext( eContext ), mbOOoFormat( bOOoFormat ) { @@ -125,7 +125,7 @@ SvxXMLTableImportContext::~SvxXMLTableImportContext() { } -SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( USHORT nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& rAttrList ) +SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference< XAttributeList >& rAttrList ) { if( XML_NAMESPACE_DRAW == nPrefix ) { @@ -222,7 +222,7 @@ SvXMLImportContext *SvxXMLTableImportContext::CreateChildContext( USHORT nPrefix return new SvXMLImportContext( GetImport(), nPrefix, rLocalName ); } -void SvxXMLTableImportContext::importColor( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ) +void SvxXMLTableImportContext::importColor( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ) { (void)nPrfx; (void)rLocalName; @@ -251,7 +251,7 @@ void SvxXMLTableImportContext::importColor( USHORT nPrfx, const OUString& rLocal } } -void SvxXMLTableImportContext::importMarker( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ) +void SvxXMLTableImportContext::importMarker( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ) { (void)nPrfx; (void)rLocalName; @@ -267,7 +267,7 @@ void SvxXMLTableImportContext::importMarker( USHORT nPrfx, const OUString& rLoca } } -void SvxXMLTableImportContext::importDash( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ) +void SvxXMLTableImportContext::importDash( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ) { (void)nPrfx; (void)rLocalName; @@ -283,7 +283,7 @@ void SvxXMLTableImportContext::importDash( USHORT nPrfx, const OUString& rLocalN } } -void SvxXMLTableImportContext::importHatch( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ) +void SvxXMLTableImportContext::importHatch( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ) { (void)nPrfx; (void)rLocalName; @@ -299,7 +299,7 @@ void SvxXMLTableImportContext::importHatch( USHORT nPrfx, const OUString& rLocal } } -void SvxXMLTableImportContext::importGradient( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ) +void SvxXMLTableImportContext::importGradient( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ) { (void)nPrfx; (void)rLocalName; @@ -315,7 +315,7 @@ void SvxXMLTableImportContext::importGradient( USHORT nPrfx, const OUString& rLo } } -void SvxXMLTableImportContext::importBitmap( USHORT nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ) +void SvxXMLTableImportContext::importBitmap( sal_uInt16 nPrfx, const OUString& rLocalName, const uno::Reference< XAttributeList >& xAttrList, Any& rAny, OUString& rName ) { (void)nPrfx; (void)rLocalName; @@ -372,7 +372,7 @@ sal_Bool SvxXMLXTableImport::load( const OUString& rUrl, const uno::Reference< X { do { - SfxMedium aMedium( rUrl, STREAM_READ | STREAM_NOCREATE, TRUE ); + SfxMedium aMedium( rUrl, STREAM_READ | STREAM_NOCREATE, sal_True ); uno::Reference<lang::XMultiServiceFactory> xServiceFactory( ::comphelper::getProcessServiceFactory() ); if( !xServiceFactory.is() ) diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index a371addc95..365c7316b3 100644..100755 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -39,7 +39,7 @@ #include <svl/solar.hrc> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> -#include "xoutbmp.hxx" +#include "svx/xoutbmp.hxx" #include <svtools/FilterConfigItem.hxx> #include <svtools/filter.hxx> @@ -130,7 +130,7 @@ BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const Out // UNX has got problems with 1x1 bitmaps which are transparent (KA 02.11.1998) #ifdef UNX const Size aBmpSize( aBmp.GetSizePixel() ); - BOOL bFullTrans = FALSE; + sal_Bool bFullTrans = sal_False; if( aBmpSize.Width() == 1 && aBmpSize.Height() == 1 && rGraphic.IsTransparent() ) { @@ -140,7 +140,7 @@ BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const Out if( pMAcc ) { if( pMAcc->GetColor( 0, 0 ) == BitmapColor( Color( COL_WHITE ) ) ) - bFullTrans = TRUE; + bFullTrans = sal_True; aTrans.ReleaseAccess( pMAcc ); } @@ -208,7 +208,7 @@ void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev, const long nBottom = aPixRect.Bottom(); const long nRight = aPixRect.Right(); const long nLeft = nXPos; - const BOOL bNoSize = ( aPixSize == rBmpEx.GetSizePixel() ); + const sal_Bool bNoSize = ( aPixSize == rBmpEx.GetSizePixel() ); pOutDev->Push(); pOutDev->SetMapMode( MapMode() ); @@ -240,14 +240,14 @@ void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev, // ------------------------------------------------------------------------ -Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr, BOOL bVMirr ) +Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr ) { Animation aNewAnim( rAnimation ); if( bHMirr || bVMirr ) { const Size& rGlobalSize = aNewAnim.GetDisplaySizePixel(); - ULONG nMirrorFlags = 0L; + sal_uIntPtr nMirrorFlags = 0L; if( bHMirr ) nMirrorFlags |= BMP_MIRROR_HORZ; @@ -255,7 +255,7 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr, if( bVMirr ) nMirrorFlags |= BMP_MIRROR_VERT; - for( USHORT i = 0, nCount = aNewAnim.Count(); i < nCount; i++ ) + for( sal_uInt16 i = 0, nCount = aNewAnim.Count(); i < nCount; i++ ) { AnimationBitmap aAnimBmp( aNewAnim.Get( i ) ); @@ -281,7 +281,7 @@ Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, BOOL bHMirr, // ------------------------------------------------------------------------ -Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorFlags ) +Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags ) { Graphic aRetGraphic; @@ -319,8 +319,8 @@ Graphic XOutBitmap::MirrorGraphic( const Graphic& rGraphic, const ULONG nMirrorF // ------------------------------------------------------------------------ -USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, - const String& rFilterName, const ULONG nFlags, +sal_uInt16 XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, + const String& rFilterName, const sal_uIntPtr nFlags, const Size* pMtfSize_100TH_MM ) { if( rGraphic.GetType() != GRAPHIC_NONE ) @@ -329,8 +329,8 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, Graphic aGraphic; String aExt; GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); - USHORT nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND; - BOOL bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated(); + sal_uInt16 nErr = GRFILTER_FILTERERROR, nFilter = GRFILTER_FORMAT_NOTFOUND; + sal_Bool bTransparent = rGraphic.IsTransparent(), bAnimated = rGraphic.IsAnimated(); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::WriteGraphic(...): invalid URL" ); @@ -371,7 +371,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, aURL.setExtension( aExt ); rFileName = aURL.GetMainURL( INetURLObject::NO_DECODE ); - SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, TRUE ); + SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, sal_True ); SvStream* pOStm = aMedium.GetOutStream(); if( pOStm && aGfxLink.GetDataSize() && aGfxLink.GetData() ) @@ -388,7 +388,7 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, if( GRFILTER_OK != nErr ) { String aFilter( rFilterName ); - BOOL bWriteTransGrf = ( aFilter.EqualsIgnoreCaseAscii( "transgrf" ) ) || + sal_Bool bWriteTransGrf = ( aFilter.EqualsIgnoreCaseAscii( "transgrf" ) ) || ( aFilter.EqualsIgnoreCaseAscii( "gif" ) ) || ( nFlags & XOUTBMP_USE_GIF_IF_POSSIBLE ) || ( ( nFlags & XOUTBMP_USE_GIF_IF_SENSIBLE ) && ( bAnimated || bTransparent ) ); @@ -494,15 +494,15 @@ USHORT XOutBitmap::WriteGraphic( const Graphic& rGraphic, String& rFileName, #pragma optimize ( "", off ) #endif -USHORT XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL, - GraphicFilter& rFilter, const USHORT nFormat, +sal_uInt16 XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL, + GraphicFilter& rFilter, const sal_uInt16 nFormat, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >* pFilterData ) { DBG_ASSERT( rURL.GetProtocol() != INET_PROT_NOT_VALID, "XOutBitmap::ExportGraphic(...): invalid URL" ); - SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, TRUE ); + SfxMedium aMedium( rURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_SHARE_DENYNONE | STREAM_TRUNC, sal_True ); SvStream* pOStm = aMedium.GetOutStream(); - USHORT nRet = GRFILTER_IOERROR; + sal_uInt16 nRet = GRFILTER_IOERROR; if( pOStm ) { @@ -526,11 +526,11 @@ USHORT XOutBitmap::ExportGraphic( const Graphic& rGraphic, const INetURLObject& // ------------------------------------------------------------------------ -Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold ) +Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const sal_uInt8 cThreshold ) { const Size aSize( rBmp.GetSizePixel() ); Bitmap aRetBmp; - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( ( aSize.Width() > 2L ) && ( aSize.Height() > 2L ) ) { @@ -549,8 +549,8 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold ) const long nHeight = aSize.Height(); const long nHeight2 = nHeight - 2L; const long lThres2 = (long) cThreshold * cThreshold; - const BitmapColor aWhite = (BYTE) pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) ); - const BitmapColor aBlack = (BYTE) pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) ); + const BitmapColor aWhite = (sal_uInt8) pWriteAcc->GetBestMatchingColor( Color( COL_WHITE ) ); + const BitmapColor aBlack = (sal_uInt8) pWriteAcc->GetBestMatchingColor( Color( COL_BLACK ) ); long nSum1; long nSum2; long lGray; @@ -568,18 +568,18 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold ) { nXTmp = nX; - nSum1 = -( nSum2 = lGray = (BYTE) pReadAcc->GetPixel( nY, nXTmp++ ) ); - nSum2 += ( (long) (BYTE) pReadAcc->GetPixel( nY, nXTmp++ ) ) << 1; + nSum1 = -( nSum2 = lGray = (sal_uInt8) pReadAcc->GetPixel( nY, nXTmp++ ) ); + nSum2 += ( (long) (sal_uInt8) pReadAcc->GetPixel( nY, nXTmp++ ) ) << 1; nSum1 += ( lGray = pReadAcc->GetPixel( nY, nXTmp ) ); nSum2 += lGray; - nSum1 += ( (long) (BYTE) pReadAcc->GetPixel( nY1, nXTmp ) ) << 1; - nSum1 -= ( (long) (BYTE) pReadAcc->GetPixel( nY1, nXTmp -= 2 ) ) << 1; + nSum1 += ( (long) (sal_uInt8) pReadAcc->GetPixel( nY1, nXTmp ) ) << 1; + nSum1 -= ( (long) (sal_uInt8) pReadAcc->GetPixel( nY1, nXTmp -= 2 ) ) << 1; - nSum1 += ( lGray = -(long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp++ ) ); + nSum1 += ( lGray = -(long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp++ ) ); nSum2 += lGray; - nSum2 -= ( (long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp++ ) ) << 1; - nSum1 += ( lGray = (long) (BYTE) pReadAcc->GetPixel( nY2, nXTmp ) ); + nSum2 -= ( (long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp++ ) ) << 1; + nSum1 += ( lGray = (long) (sal_uInt8) pReadAcc->GetPixel( nY2, nXTmp ) ); nSum2 -= lGray; if( ( nSum1 * nSum1 + nSum2 * nSum2 ) < lThres2 ) @@ -589,7 +589,7 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold ) } } - bRet = TRUE; + bRet = sal_True; } aWorkBmp.ReleaseAccess( pReadAcc ); @@ -613,8 +613,8 @@ Bitmap XOutBitmap::DetectEdges( const Bitmap& rBmp, const BYTE cThreshold ) // ------------------------------------------------------------------------ -Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags, - const BYTE cEdgeDetectThreshold, const Rectangle* pWorkRectPixel ) +Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const sal_uIntPtr nFlags, + const sal_uInt8 cEdgeDetectThreshold, const Rectangle* pWorkRectPixel ) { Bitmap aWorkBmp; Polygon aRetPoly; @@ -654,7 +654,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags, Point* pPoints1 = NULL; Point* pPoints2 = NULL; long nX, nY; - USHORT nPolyPos = 0; + sal_uInt16 nPolyPos = 0; const BitmapColor aBlack = pAcc->GetBestMatchingColor( Color( COL_BLACK ) ); if( nFlags & XOUTBMP_CONTOUR_VERT ) @@ -675,7 +675,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags, nY = nStartY2; // diese Schleife wird immer gebreaked da hier ja min. ein Pixel ist - while( TRUE ) + while( sal_True ) { if( aBlack == pAcc->GetPixel( nY, nX ) ) { @@ -712,7 +712,7 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags, nX = nStartX2; // diese Schleife wird immer gebreaked da hier ja min. ein Pixel ist - while( TRUE ) + while( sal_True ) { if( aBlack == pAcc->GetPixel( nY, nX ) ) { @@ -732,13 +732,13 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags, } } - const USHORT nNewSize1 = nPolyPos << 1; + const sal_uInt16 nNewSize1 = nPolyPos << 1; aRetPoly = Polygon( nPolyPos, pPoints1 ); aRetPoly.SetSize( nNewSize1 + 1 ); aRetPoly[ nNewSize1 ] = aRetPoly[ 0 ]; - for( USHORT j = nPolyPos; nPolyPos < nNewSize1; ) + for( sal_uInt16 j = nPolyPos; nPolyPos < nNewSize1; ) aRetPoly[ nPolyPos++ ] = pPoints2[ --j ]; if( ( fFactorX != 0. ) && ( fFactorY != 0. ) ) @@ -756,14 +756,14 @@ Polygon XOutBitmap::GetCountour( const Bitmap& rBmp, const ULONG nFlags, // - DitherBitmap - // ---------------- -BOOL DitherBitmap( Bitmap& rBitmap ) +sal_Bool DitherBitmap( Bitmap& rBitmap ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( ( rBitmap.GetBitCount() >= 8 ) && ( Application::GetDefaultDevice()->GetColorCount() < 257 ) ) bRet = rBitmap.Dither( BMP_DITHER_FLOYD ); else - bRet = FALSE; + bRet = sal_False; return bRet; } diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx index 59f1ecc10f..671d382393 100644..100755 --- a/svx/source/xoutdev/_xpoly.cxx +++ b/svx/source/xoutdev/_xpoly.cxx @@ -54,11 +54,11 @@ DBG_NAME(XPolyPolygon); |* *************************************************************************/ -ImpXPolygon::ImpXPolygon( USHORT nInitSize, USHORT _nResize ) +ImpXPolygon::ImpXPolygon( sal_uInt16 nInitSize, sal_uInt16 _nResize ) { pPointAry = NULL; pFlagAry = NULL; - bDeleteOldPoints = FALSE; + bDeleteOldPoints = sal_False; nSize = 0; nResize = _nResize; nPoints = 0; @@ -79,7 +79,7 @@ ImpXPolygon::ImpXPolygon( const ImpXPolygon& rImpXPoly ) pPointAry = NULL; pFlagAry = NULL; - bDeleteOldPoints = FALSE; + bDeleteOldPoints = sal_False; nSize = 0; ImpXPolygon::nResize = rImpXPoly.nResize; nPoints = 0; @@ -126,7 +126,7 @@ bool ImpXPolygon::operator==(const ImpXPolygon& rImpXPoly) const |* |* ImpXPolygon::Resize() |* -|* !!! Polygongroesse aendern - wenn bDeletePoints FALSE, dann den +|* !!! Polygongroesse aendern - wenn bDeletePoints sal_False, dann den |* Point-Array nicht loeschen, sondern in pOldPointAry sichern und |* das Flag bDeleteOldPoints setzen. Beim naechsten Zugriff wird |* das Array dann geloescht. @@ -136,13 +136,13 @@ bool ImpXPolygon::operator==(const ImpXPolygon& rImpXPoly) const |* *************************************************************************/ -void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints ) +void ImpXPolygon::Resize( sal_uInt16 nNewSize, sal_Bool bDeletePoints ) { if( nNewSize == nSize ) return; - BYTE* pOldFlagAry = pFlagAry; - USHORT nOldSize = nSize; + sal_uInt8* pOldFlagAry = pFlagAry; + sal_uInt16 nOldSize = nSize; CheckPointDelete(); pOldPointAry = pPointAry; @@ -160,7 +160,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints ) memset( pPointAry, 0, nSize*sizeof( Point ) ); // Flag Array erzeugen - pFlagAry = new BYTE[ nSize ]; + pFlagAry = new sal_uInt8[ nSize ]; memset( pFlagAry, 0, nSize ); // Eventuell umkopieren @@ -181,7 +181,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints ) nPoints = nSize; } if ( bDeletePoints ) delete[] (char*) pOldPointAry; - else bDeleteOldPoints = TRUE; + else bDeleteOldPoints = sal_True; delete[] pOldFlagAry; } } @@ -193,7 +193,7 @@ void ImpXPolygon::Resize( USHORT nNewSize, BOOL bDeletePoints ) |* *************************************************************************/ -void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount ) +void ImpXPolygon::InsertSpace( sal_uInt16 nPos, sal_uInt16 nCount ) { CheckPointDelete(); @@ -208,7 +208,7 @@ void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount ) // den Rest nach hinten schieben if( nPos < nPoints ) { - USHORT nMove = nPoints - nPos; + sal_uInt16 nMove = nPoints - nPos; memmove( &pPointAry[nPos+nCount], &pPointAry[nPos], nMove * sizeof(Point) ); memmove( &pFlagAry[nPos+nCount], &pFlagAry[nPos], nMove ); @@ -226,13 +226,13 @@ void ImpXPolygon::InsertSpace( USHORT nPos, USHORT nCount ) |* *************************************************************************/ -void ImpXPolygon::Remove( USHORT nPos, USHORT nCount ) +void ImpXPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount ) { CheckPointDelete(); if( (nPos + nCount) <= nPoints ) { - USHORT nMove = nPoints - nPos - nCount; + sal_uInt16 nMove = nPoints - nPos - nCount; if( nMove ) { @@ -253,7 +253,7 @@ void ImpXPolygon::Remove( USHORT nPos, USHORT nCount ) |* *************************************************************************/ -XPolygon::XPolygon( USHORT nSize, USHORT nResize ) +XPolygon::XPolygon( sal_uInt16 nSize, sal_uInt16 nResize ) { DBG_CTOR(XPolygon,NULL); pImpXPolygon = new ImpXPolygon( nSize, nResize ); @@ -284,14 +284,14 @@ XPolygon::XPolygon( const Polygon& rPoly ) { DBG_CTOR(XPolygon,NULL); - USHORT nSize = rPoly.GetSize(); + sal_uInt16 nSize = rPoly.GetSize(); pImpXPolygon = new ImpXPolygon( nSize ); pImpXPolygon->nPoints = nSize; - for( USHORT i = 0; i < nSize; i++ ) + for( sal_uInt16 i = 0; i < nSize; i++ ) { pImpXPolygon->pPointAry[i] = rPoly[i]; - pImpXPolygon->pFlagAry[i] = (BYTE) rPoly.GetFlags( i ); + pImpXPolygon->pFlagAry[i] = (sal_uInt8) rPoly.GetFlags( i ); } } @@ -319,13 +319,13 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy) // Faktor fuer Kontrollpunkte der Bezierkurven: 8/3 * (sin(45g) - 0.5) long nXHdl = (long)(0.552284749 * nRx); long nYHdl = (long)(0.552284749 * nRy); - USHORT nPos = 0; + sal_uInt16 nPos = 0; if ( nRx && nRy ) { Point aCenter; - for (USHORT nQuad = 0; nQuad < 4; nQuad++) + for (sal_uInt16 nQuad = 0; nQuad < 4; nQuad++) { switch ( nQuad ) { @@ -347,8 +347,8 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy) break; } GenBezArc(aCenter, nRx, nRy, nXHdl, nYHdl, 0, 900, nQuad, nPos); - pImpXPolygon->pFlagAry[nPos ] = (BYTE) XPOLY_SMOOTH; - pImpXPolygon->pFlagAry[nPos+3] = (BYTE) XPOLY_SMOOTH; + pImpXPolygon->pFlagAry[nPos ] = (sal_uInt8) XPOLY_SMOOTH; + pImpXPolygon->pFlagAry[nPos+3] = (sal_uInt8) XPOLY_SMOOTH; nPos += 4; } } @@ -372,31 +372,31 @@ XPolygon::XPolygon(const Rectangle& rRect, long nRx, long nRy) *************************************************************************/ XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy, - USHORT nStartAngle, USHORT nEndAngle, BOOL bClose) + sal_uInt16 nStartAngle, sal_uInt16 nEndAngle, sal_Bool bClose) { DBG_CTOR(XPolygon,NULL); pImpXPolygon = new ImpXPolygon(17); nStartAngle %= 3600; if ( nEndAngle > 3600 ) nEndAngle %= 3600; - BOOL bFull = (nStartAngle == 0 && nEndAngle == 3600); + sal_Bool bFull = (nStartAngle == 0 && nEndAngle == 3600); // Faktor fuer Kontrollpunkte der Bezierkurven: 8/3 * (sin(45g) - 0.5) long nXHdl = (long)(0.552284749 * nRx); long nYHdl = (long)(0.552284749 * nRy); - USHORT nPos = 0; - BOOL bLoopEnd = FALSE; + sal_uInt16 nPos = 0; + sal_Bool bLoopEnd = sal_False; do { - USHORT nA1, nA2; - USHORT nQuad = nStartAngle / 900; + sal_uInt16 nA1, nA2; + sal_uInt16 nQuad = nStartAngle / 900; if ( nQuad == 4 ) nQuad = 0; bLoopEnd = CheckAngles(nStartAngle, nEndAngle, nA1, nA2); GenBezArc(rCenter, nRx, nRy, nXHdl, nYHdl, nA1, nA2, nQuad, nPos); nPos += 3; if ( !bLoopEnd ) - pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SMOOTH; + pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) XPOLY_SMOOTH; } while ( !bLoopEnd ); @@ -406,8 +406,8 @@ XPolygon::XPolygon(const Point& rCenter, long nRx, long nRy, if ( bFull ) { - pImpXPolygon->pFlagAry[0 ] = (BYTE) XPOLY_SMOOTH; - pImpXPolygon->pFlagAry[nPos] = (BYTE) XPOLY_SMOOTH; + pImpXPolygon->pFlagAry[0 ] = (sal_uInt8) XPOLY_SMOOTH; + pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) XPOLY_SMOOTH; } pImpXPolygon->nPoints = nPos + 1; } @@ -450,7 +450,7 @@ void XPolygon::CheckReference() |* *************************************************************************/ -void XPolygon::SetSize( USHORT nNewSize ) +void XPolygon::SetSize( sal_uInt16 nNewSize ) { CheckReference(); pImpXPolygon->Resize( nNewSize ); @@ -462,7 +462,7 @@ void XPolygon::SetSize( USHORT nNewSize ) |* *************************************************************************/ -USHORT XPolygon::GetSize() const +sal_uInt16 XPolygon::GetSize() const { pImpXPolygon->CheckPointDelete(); return pImpXPolygon->nSize; @@ -474,7 +474,7 @@ USHORT XPolygon::GetSize() const |* *************************************************************************/ -void XPolygon::SetPointCount( USHORT nPoints ) +void XPolygon::SetPointCount( sal_uInt16 nPoints ) { pImpXPolygon->CheckPointDelete(); CheckReference(); @@ -484,7 +484,7 @@ void XPolygon::SetPointCount( USHORT nPoints ) if ( nPoints < pImpXPolygon->nPoints ) { - USHORT nSize = pImpXPolygon->nPoints - nPoints; + sal_uInt16 nSize = pImpXPolygon->nPoints - nPoints; memset( &pImpXPolygon->pPointAry[nPoints], 0, nSize * sizeof( Point ) ); memset( &pImpXPolygon->pFlagAry [nPoints], 0, nSize ); } @@ -497,7 +497,7 @@ void XPolygon::SetPointCount( USHORT nPoints ) |* *************************************************************************/ -USHORT XPolygon::GetPointCount() const +sal_uInt16 XPolygon::GetPointCount() const { pImpXPolygon->CheckPointDelete(); return pImpXPolygon->nPoints; @@ -509,13 +509,13 @@ USHORT XPolygon::GetPointCount() const |* *************************************************************************/ -void XPolygon::Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags ) +void XPolygon::Insert( sal_uInt16 nPos, const Point& rPt, XPolyFlags eFlags ) { CheckReference(); if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints; pImpXPolygon->InsertSpace( nPos, 1 ); pImpXPolygon->pPointAry[nPos] = rPt; - pImpXPolygon->pFlagAry[nPos] = (BYTE)eFlags; + pImpXPolygon->pFlagAry[nPos] = (sal_uInt8)eFlags; } /************************************************************************* @@ -524,12 +524,12 @@ void XPolygon::Insert( USHORT nPos, const Point& rPt, XPolyFlags eFlags ) |* *************************************************************************/ -void XPolygon::Insert( USHORT nPos, const XPolygon& rXPoly ) +void XPolygon::Insert( sal_uInt16 nPos, const XPolygon& rXPoly ) { CheckReference(); if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints; - USHORT nPoints = rXPoly.GetPointCount(); + sal_uInt16 nPoints = rXPoly.GetPointCount(); pImpXPolygon->InsertSpace( nPos, nPoints ); @@ -547,16 +547,16 @@ void XPolygon::Insert( USHORT nPos, const XPolygon& rXPoly ) |* *************************************************************************/ -void XPolygon::Insert( USHORT nPos, const Polygon& rPoly ) +void XPolygon::Insert( sal_uInt16 nPos, const Polygon& rPoly ) { CheckReference(); if (nPos>pImpXPolygon->nPoints) nPos=pImpXPolygon->nPoints; - USHORT nPoints = rPoly.GetSize(); + sal_uInt16 nPoints = rPoly.GetSize(); pImpXPolygon->InsertSpace( nPos, nPoints ); - USHORT i; + sal_uInt16 i; for( i=0; i < nPoints; i++ ) pImpXPolygon->pPointAry[i] = rPoly[i]; @@ -569,7 +569,7 @@ void XPolygon::Insert( USHORT nPos, const Polygon& rPoly ) |* *************************************************************************/ -void XPolygon::Remove( USHORT nPos, USHORT nCount ) +void XPolygon::Remove( sal_uInt16 nPos, sal_uInt16 nCount ) { CheckReference(); pImpXPolygon->Remove( nPos, nCount ); @@ -589,8 +589,8 @@ void XPolygon::Move( long nHorzMove, long nVertMove ) CheckReference(); // Punkte verschieben - USHORT nCount = pImpXPolygon->nPoints; - for ( USHORT i = 0; i < nCount; i++ ) + sal_uInt16 nCount = pImpXPolygon->nPoints; + for ( sal_uInt16 i = 0; i < nCount; i++ ) { Point* pPt = &(pImpXPolygon->pPointAry[i]); pPt->X() += nHorzMove; @@ -632,7 +632,7 @@ Rectangle XPolygon::GetBoundRect() const |* *************************************************************************/ -const Point& XPolygon::operator[]( USHORT nPos ) const +const Point& XPolygon::operator[]( sal_uInt16 nPos ) const { DBG_ASSERT(nPos < pImpXPolygon->nPoints, "Ungueltiger Index bei const-Arrayzugriff auf XPolygon"); @@ -646,7 +646,7 @@ const Point& XPolygon::operator[]( USHORT nPos ) const |* *************************************************************************/ -Point& XPolygon::operator[]( USHORT nPos ) +Point& XPolygon::operator[]( sal_uInt16 nPos ) { pImpXPolygon->CheckPointDelete(); CheckReference(); @@ -654,7 +654,7 @@ Point& XPolygon::operator[]( USHORT nPos ) if( nPos >= pImpXPolygon->nSize ) { DBG_ASSERT(pImpXPolygon->nResize, "Ungueltiger Index bei Arrayzugriff auf XPolygon"); - pImpXPolygon->Resize(nPos + 1, FALSE); + pImpXPolygon->Resize(nPos + 1, sal_False); } if( nPos >= pImpXPolygon->nPoints ) pImpXPolygon->nPoints = nPos + 1; @@ -693,10 +693,10 @@ XPolygon& XPolygon::operator=( const XPolygon& rXPoly ) |* *************************************************************************/ -BOOL XPolygon::operator==( const XPolygon& rXPoly ) const +sal_Bool XPolygon::operator==( const XPolygon& rXPoly ) const { pImpXPolygon->CheckPointDelete(); - if (rXPoly.pImpXPolygon==pImpXPolygon) return TRUE; + if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_True; return *rXPoly.pImpXPolygon == *pImpXPolygon; } @@ -708,10 +708,10 @@ BOOL XPolygon::operator==( const XPolygon& rXPoly ) const |* *************************************************************************/ -BOOL XPolygon::operator!=( const XPolygon& rXPoly ) const +sal_Bool XPolygon::operator!=( const XPolygon& rXPoly ) const { pImpXPolygon->CheckPointDelete(); - if (rXPoly.pImpXPolygon==pImpXPolygon) return FALSE; + if (rXPoly.pImpXPolygon==pImpXPolygon) return sal_False; return *rXPoly.pImpXPolygon != *pImpXPolygon; } @@ -723,7 +723,7 @@ BOOL XPolygon::operator!=( const XPolygon& rXPoly ) const |* *************************************************************************/ -XPolyFlags XPolygon::GetFlags( USHORT nPos ) const +XPolyFlags XPolygon::GetFlags( sal_uInt16 nPos ) const { pImpXPolygon->CheckPointDelete(); return (XPolyFlags) pImpXPolygon->pFlagAry[nPos]; @@ -737,11 +737,11 @@ XPolyFlags XPolygon::GetFlags( USHORT nPos ) const |* *************************************************************************/ -void XPolygon::SetFlags( USHORT nPos, XPolyFlags eFlags ) +void XPolygon::SetFlags( sal_uInt16 nPos, XPolyFlags eFlags ) { pImpXPolygon->CheckPointDelete(); CheckReference(); - pImpXPolygon->pFlagAry[nPos] = (BYTE) eFlags; + pImpXPolygon->pFlagAry[nPos] = (sal_uInt8) eFlags; } /************************************************************************* @@ -752,7 +752,7 @@ void XPolygon::SetFlags( USHORT nPos, XPolyFlags eFlags ) |* *************************************************************************/ -BOOL XPolygon::IsControl(USHORT nPos) const +sal_Bool XPolygon::IsControl(sal_uInt16 nPos) const { return ( (XPolyFlags) pImpXPolygon->pFlagAry[nPos] == XPOLY_CONTROL ); } @@ -765,7 +765,7 @@ BOOL XPolygon::IsControl(USHORT nPos) const |* *************************************************************************/ -BOOL XPolygon::IsSmooth(USHORT nPos) const +sal_Bool XPolygon::IsSmooth(sal_uInt16 nPos) const { XPolyFlags eFlag = (XPolyFlags) pImpXPolygon->pFlagAry[nPos]; return ( eFlag == XPOLY_SMOOTH || eFlag == XPOLY_SYMMTR ); @@ -779,7 +779,7 @@ BOOL XPolygon::IsSmooth(USHORT nPos) const |* *************************************************************************/ -double XPolygon::CalcDistance(USHORT nP1, USHORT nP2) +double XPolygon::CalcDistance(sal_uInt16 nP1, sal_uInt16 nP2) { const Point& rP1 = pImpXPolygon->pPointAry[nP1]; const Point& rP2 = pImpXPolygon->pPointAry[nP2]; @@ -796,7 +796,7 @@ double XPolygon::CalcDistance(USHORT nP1, USHORT nP2) |* *************************************************************************/ -void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT) +void XPolygon::SubdivideBezier(sal_uInt16 nPos, sal_Bool bCalcFirst, double fT) { Point* pPoints = pImpXPolygon->pPointAry; double fT2 = fT * fT; @@ -804,7 +804,7 @@ void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT) double fU = 1.0 - fT; double fU2 = fU * fU; double fU3 = fU * fU2; - USHORT nIdx = nPos; + sal_uInt16 nIdx = nPos; short nPosInc, nIdxInc; if ( bCalcFirst ) @@ -845,8 +845,8 @@ void XPolygon::SubdivideBezier(USHORT nPos, BOOL bCalcFirst, double fT) /************************************************************************/ void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy, - long nXHdl, long nYHdl, USHORT nStart, USHORT nEnd, - USHORT nQuad, USHORT nFirst) + long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd, + sal_uInt16 nQuad, sal_uInt16 nFirst) { Point* pPoints = pImpXPolygon->pPointAry; pPoints[nFirst ] = rCenter; @@ -881,29 +881,29 @@ void XPolygon::GenBezArc(const Point& rCenter, long nRx, long nRy, pPoints[nFirst+1].X() += nXHdl; pPoints[nFirst+2].Y() += nYHdl; } if ( nStart > 0 ) - SubdivideBezier(nFirst, FALSE, (double)nStart / 900); + SubdivideBezier(nFirst, sal_False, (double)nStart / 900); if ( nEnd < 900 ) - SubdivideBezier(nFirst, TRUE, (double)(nEnd-nStart) / (900-nStart)); + SubdivideBezier(nFirst, sal_True, (double)(nEnd-nStart) / (900-nStart)); SetFlags(nFirst+1, XPOLY_CONTROL); SetFlags(nFirst+2, XPOLY_CONTROL); } /************************************************************************/ -BOOL XPolygon::CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2) +sal_Bool XPolygon::CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2) { if ( nStart == 3600 ) nStart = 0; if ( nEnd == 0 ) nEnd = 3600; - USHORT nStPrev = nStart; - USHORT nMax = (nStart / 900 + 1) * 900; - USHORT nMin = nMax - 900; + sal_uInt16 nStPrev = nStart; + sal_uInt16 nMax = (nStart / 900 + 1) * 900; + sal_uInt16 nMin = nMax - 900; if ( nEnd >= nMax || nEnd <= nStart ) nA2 = 900; else nA2 = nEnd - nMin; nA1 = nStart - nMin; nStart = nMax; - // TRUE zurueck, falls letztes Segment berechnet wurde + // sal_True zurueck, falls letztes Segment berechnet wurde return (nStPrev < nEnd && nStart >= nEnd); } @@ -922,11 +922,11 @@ BOOL XPolygon::CheckAngles(USHORT& nStart, USHORT nEnd, USHORT& nA1, USHORT& nA2 |* \************************************************************************/ -void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt) +void XPolygon::CalcSmoothJoin(sal_uInt16 nCenter, sal_uInt16 nDrag, sal_uInt16 nPnt) { CheckReference(); -// USHORT nMaxPnt = pImpXPolygon->nPoints - 1; +// sal_uInt16 nMaxPnt = pImpXPolygon->nPoints - 1; // if ( nCenter == nMaxPnt ) nPnt = 1; // else if ( nCenter == 0 ) nPnt = nMaxPnt - 1; @@ -935,7 +935,7 @@ void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt) // statt dessen nDrag auf der Achse nCenter-nPnt verschieben if ( !IsControl(nPnt) ) { - USHORT nTmp = nDrag; + sal_uInt16 nTmp = nDrag; nDrag = nPnt; nPnt = nTmp; } @@ -967,7 +967,7 @@ void XPolygon::CalcSmoothJoin(USHORT nCenter, USHORT nDrag, USHORT nPnt) |* \************************************************************************/ -void XPolygon::CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext) +void XPolygon::CalcTangent(sal_uInt16 nCenter, sal_uInt16 nPrev, sal_uInt16 nNext) { CheckReference(); @@ -1003,7 +1003,7 @@ void XPolygon::CalcTangent(USHORT nCenter, USHORT nPrev, USHORT nNext) |* \************************************************************************/ -void XPolygon::PointsToBezier(USHORT nFirst) +void XPolygon::PointsToBezier(sal_uInt16 nFirst) { double nFullLength, nPart1Length, nPart2Length; double fX0, fY0, fX1, fY1, fX2, fY2, fX3, fY3; @@ -1084,9 +1084,9 @@ void XPolygon::Translate(const Point& rTrans) pImpXPolygon->CheckPointDelete(); CheckReference(); - USHORT nPntCnt = pImpXPolygon->nPoints; + sal_uInt16 nPntCnt = pImpXPolygon->nPoints; - for (USHORT i = 0; i < nPntCnt; i++) + for (sal_uInt16 i = 0; i < nPntCnt; i++) pImpXPolygon->pPointAry[i] += rTrans; } @@ -1111,9 +1111,9 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos) long nCenterX = rCenter.X(); long nCenterY = rCenter.Y(); - USHORT nPntCnt = pImpXPolygon->nPoints; + sal_uInt16 nPntCnt = pImpXPolygon->nPoints; - for (USHORT i = 0; i < nPntCnt; i++) + for (sal_uInt16 i = 0; i < nPntCnt; i++) { Point *pPt = &(pImpXPolygon->pPointAry[i]); nX = pPt->X()-nCenterX; @@ -1125,9 +1125,9 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos) /* und so stand das in einem anderen File auf T: dass ich am 29-11-1995 gegettet habe. Joe M. - USHORT nPntCnt = pImpXPolygon->nPoints; + sal_uInt16 nPntCnt = pImpXPolygon->nPoints; - for (USHORT i = 0; i < nPntCnt; i++) + for (sal_uInt16 i = 0; i < nPntCnt; i++) { Point P = pImpXPolygon->pPointAry[i] - rCenter; long X = P.X(); @@ -1148,7 +1148,7 @@ void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos) |* *************************************************************************/ -void XPolygon::Rotate(const Point& rCenter, USHORT nAngle) +void XPolygon::Rotate(const Point& rCenter, sal_uInt16 nAngle) { nAngle %= 3600; @@ -1174,9 +1174,9 @@ void XPolygon::Scale(double fSx, double fSy) pImpXPolygon->CheckPointDelete(); CheckReference(); - USHORT nPntCnt = pImpXPolygon->nPoints; + sal_uInt16 nPntCnt = pImpXPolygon->nPoints; - for (USHORT i = 0; i < nPntCnt; i++) + for (sal_uInt16 i = 0; i < nPntCnt; i++) { Point& rPnt = pImpXPolygon->pPointAry[i]; rPnt.X() = (long)(fSx * rPnt.X()); @@ -1198,9 +1198,9 @@ void XPolygon::SlantX(long nYRef, double fSin, double fCos) pImpXPolygon->CheckPointDelete(); CheckReference(); - USHORT nPntCnt = pImpXPolygon->nPoints; + sal_uInt16 nPntCnt = pImpXPolygon->nPoints; - for (USHORT i = 0; i < nPntCnt; i++) + for (sal_uInt16 i = 0; i < nPntCnt; i++) { Point& rPnt = pImpXPolygon->pPointAry[i]; long nDy = rPnt.Y() - nYRef; @@ -1223,9 +1223,9 @@ void XPolygon::SlantY(long nXRef, double fSin, double fCos) pImpXPolygon->CheckPointDelete(); CheckReference(); - USHORT nPntCnt = pImpXPolygon->nPoints; + sal_uInt16 nPntCnt = pImpXPolygon->nPoints; - for (USHORT i = 0; i < nPntCnt; i++) + for (sal_uInt16 i = 0; i < nPntCnt; i++) { Point& rPnt = pImpXPolygon->pPointAry[i]; long nDx = rPnt.X() - nXRef; @@ -1278,9 +1278,9 @@ void XPolygon::Distort(const Rectangle& rRefRect, X4 = rDistortedRect[2].X(); Y4 = rDistortedRect[2].Y(); - USHORT nPntCnt = pImpXPolygon->nPoints; + sal_uInt16 nPntCnt = pImpXPolygon->nPoints; - for (USHORT i = 0; i < nPntCnt; i++) + for (sal_uInt16 i = 0; i < nPntCnt; i++) { double fTx, fTy, fUx, fUy; Point& rPnt = pImpXPolygon->pPointAry[i]; @@ -1344,7 +1344,7 @@ basegfx::B2DPolygon XPolygon::getB2DPolygon() const // the long run DBG_ASSERT(pImpXPolygon != 0, "XPolygon::getB2DPolygon(): XPolygon has no implementation incarnated (!)"); const Polygon aSource(GetPointCount(), pImpXPolygon->pPointAry, pImpXPolygon->pFlagAry); - + return aSource.getB2DPolygon(); } @@ -1356,14 +1356,14 @@ XPolygon::XPolygon(const basegfx::B2DPolygon& rPolygon) DBG_CTOR(XPolygon,NULL); const Polygon aSource(rPolygon); - USHORT nSize = aSource.GetSize(); + sal_uInt16 nSize = aSource.GetSize(); pImpXPolygon = new ImpXPolygon( nSize ); pImpXPolygon->nPoints = nSize; - for( USHORT i = 0; i < nSize; i++ ) + for( sal_uInt16 i = 0; i < nSize; i++ ) { pImpXPolygon->pPointAry[i] = aSource[i]; - pImpXPolygon->pFlagAry[i] = (BYTE) aSource.GetFlags( i ); + pImpXPolygon->pFlagAry[i] = (sal_uInt8) aSource.GetFlags( i ); } } @@ -1415,7 +1415,7 @@ bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const { size_t nAnz = aXPolyList.size(); const XPolygonList& rCmpList = rImpXPolyPoly.aXPolyList; - if ( nAnz != rCmpList.size() ) return FALSE; + if ( nAnz != rCmpList.size() ) return false; bool bEq=true; for ( size_t i = nAnz; i > 0 && bEq; ) { @@ -1431,7 +1431,7 @@ bool ImpXPolyPolygon::operator==(const ImpXPolyPolygon& rImpXPolyPoly) const |* *************************************************************************/ -XPolyPolygon::XPolyPolygon( USHORT /* nInitSize */, USHORT /* nResize */ ) +XPolyPolygon::XPolyPolygon( sal_uInt16 nInitSize, sal_uInt16 nResize ) { DBG_CTOR(XPolyPolygon,NULL); pImpXPolyPolygon = new ImpXPolyPolygon(); @@ -1477,7 +1477,7 @@ XPolyPolygon::XPolyPolygon( const PolyPolygon& rPolyPoly ) DBG_CTOR(XPolyPolygon,NULL); pImpXPolyPolygon = new ImpXPolyPolygon; - for (USHORT i = 0; i < rPolyPoly.Count(); i++) + for (sal_uInt16 i = 0; i < rPolyPoly.Count(); i++) pImpXPolyPolygon->aXPolyList.push_back( new XPolygon(rPolyPoly.GetObject(i)) ); } @@ -1520,7 +1520,7 @@ void XPolyPolygon::CheckReference() |* *************************************************************************/ -void XPolyPolygon::Insert( const XPolygon& rXPoly, USHORT nPos ) +void XPolyPolygon::Insert( const XPolygon& rXPoly, sal_uInt16 nPos ) { CheckReference(); XPolygon* pXPoly = new XPolygon( rXPoly ); @@ -1542,7 +1542,7 @@ void XPolyPolygon::Insert( const XPolygon& rXPoly, USHORT nPos ) |* *************************************************************************/ -void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, USHORT nPos ) +void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, sal_uInt16 nPos ) { CheckReference(); @@ -1568,7 +1568,7 @@ void XPolyPolygon::Insert( const XPolyPolygon& rXPolyPoly, USHORT nPos ) |* *************************************************************************/ -XPolygon XPolyPolygon::Remove( USHORT nPos ) +XPolygon XPolyPolygon::Remove( sal_uInt16 nPos ) { CheckReference(); XPolygonList::iterator it = pImpXPolyPolygon->aXPolyList.begin(); @@ -1587,7 +1587,7 @@ XPolygon XPolyPolygon::Remove( USHORT nPos ) |* *************************************************************************/ -XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, USHORT nPos ) +XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, sal_uInt16 nPos ) { CheckReference(); XPolygon* pXPoly = new XPolygon( rXPoly ); @@ -1605,7 +1605,7 @@ XPolygon XPolyPolygon::Replace( const XPolygon& rXPoly, USHORT nPos ) |* *************************************************************************/ -const XPolygon& XPolyPolygon::GetObject( USHORT nPos ) const +const XPolygon& XPolyPolygon::GetObject( sal_uInt16 nPos ) const { return *(pImpXPolyPolygon->aXPolyList[ nPos ]); } @@ -1639,9 +1639,9 @@ void XPolyPolygon::Clear() |* *************************************************************************/ -USHORT XPolyPolygon::Count() const +sal_uInt16 XPolyPolygon::Count() const { - return (USHORT)( pImpXPolyPolygon->aXPolyList.size() ); + return (sal_uInt16)(pImpXPolyPolygon->aXPolyList.size()); } @@ -1695,7 +1695,7 @@ Rectangle XPolyPolygon::GetBoundRect() const |* *************************************************************************/ -XPolygon& XPolyPolygon::operator[]( USHORT nPos ) +XPolygon& XPolyPolygon::operator[]( sal_uInt16 nPos ) { CheckReference(); return *( pImpXPolyPolygon->aXPolyList[ nPos ] ); @@ -1727,9 +1727,9 @@ XPolyPolygon& XPolyPolygon::operator=( const XPolyPolygon& rXPolyPoly ) |* *************************************************************************/ -BOOL XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const +sal_Bool XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const { - if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return TRUE; + if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_True; return *pImpXPolyPolygon == *rXPolyPoly.pImpXPolyPolygon; } @@ -1740,9 +1740,9 @@ BOOL XPolyPolygon::operator==( const XPolyPolygon& rXPolyPoly ) const |* *************************************************************************/ -BOOL XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const +sal_Bool XPolyPolygon::operator!=( const XPolyPolygon& rXPolyPoly ) const { - if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return FALSE; + if (pImpXPolyPolygon==rXPolyPoly.pImpXPolyPolygon) return sal_False; return *pImpXPolyPolygon != *rXPolyPoly.pImpXPolyPolygon; } @@ -1803,7 +1803,7 @@ void XPolyPolygon::Rotate20() |* *************************************************************************/ -void XPolyPolygon::Rotate(const Point& rCenter, USHORT nAngle) +void XPolyPolygon::Rotate(const Point& rCenter, sal_uInt16 nAngle) { nAngle %= 3600; diff --git a/svx/source/xoutdev/makefile.mk b/svx/source/xoutdev/makefile.mk deleted file mode 100644 index 1ed48bc71f..0000000000 --- a/svx/source/xoutdev/makefile.mk +++ /dev/null @@ -1,59 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. - -PRJNAME=svx -PROJECTPCH=xout -PROJECTPCHSOURCE=xoutpch -TARGET=xout -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES= \ - $(SLO)$/xattr.obj \ - $(SLO)$/xattr2.obj \ - $(SLO)$/xattrbmp.obj \ - $(SLO)$/xpool.obj \ - $(SLO)$/xtable.obj \ - $(SLO)$/xtabcolr.obj \ - $(SLO)$/xtablend.obj \ - $(SLO)$/xtabdash.obj \ - $(SLO)$/xtabhtch.obj \ - $(SLO)$/xtabgrdt.obj \ - $(SLO)$/xtabbtmp.obj \ - $(SLO)$/xexch.obj \ - $(SLO)$/_xpoly.obj \ - $(SLO)$/_xoutbmp.obj - -.INCLUDE : target.mk diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index 47ea7b0263..d87f26f226 100644..100755 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -45,15 +45,15 @@ #include <editeng/memberids.hrc> #include <tools/stream.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svl/style.hxx> #include "unopolyhelper.hxx" #include <tools/bigint.hxx> #include <svl/itemset.hxx> #include <svx/dialogs.hrc> -#include "svdstr.hrc" -#include "xattr.hxx" +#include "svx/svdstr.hrc" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> #include <editeng/itemtype.hxx> @@ -76,7 +76,7 @@ using namespace ::com::sun::star; /************************************************************************/ -#define VCLTOSVCOL( rCol ) (USHORT)((((USHORT)(rCol))<<8)|(rCol)) +#define VCLTOSVCOL( rCol ) (sal_uInt16)((((sal_uInt16)(rCol))<<8)|(rCol)) /************************************************************************/ @@ -108,11 +108,11 @@ long ScaleMetricValue( long nVal, long nMul, long nDiv ) /************************************************************************* |* -|* NameOrIndex::NameOrIndex(USHORT nWhich, INT32 nIndex) +|* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, sal_Int32 nIndex) |* *************************************************************************/ -NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) : +NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, sal_Int32 nIndex) : SfxStringItem(_nWhich, aNameOrIndexEmptyString), nPalIndex(nIndex) { @@ -120,11 +120,11 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, INT32 nIndex) : /************************************************************************* |* -|* NameOrIndex::NameOrIndex(USHORT nWhich, const String& rName) +|* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, const String& rName) |* *************************************************************************/ -NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) : +NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, const XubString& rName) : SfxStringItem(_nWhich, rName), nPalIndex(-1) { @@ -132,11 +132,11 @@ NameOrIndex::NameOrIndex(USHORT _nWhich, const XubString& rName) : /************************************************************************* |* -|* NameOrIndex::NameOrIndex(USHORT nWhich, SvStream& rIn) +|* NameOrIndex::NameOrIndex(sal_uInt16 nWhich, SvStream& rIn) |* *************************************************************************/ -NameOrIndex::NameOrIndex(USHORT _nWhich, SvStream& rIn) : +NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, SvStream& rIn) : SfxStringItem(_nWhich, rIn) { rIn >> nPalIndex; @@ -180,11 +180,11 @@ SfxPoolItem* NameOrIndex::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* NameOrIndex::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new NameOrIndex(Which(), rIn); } @@ -195,7 +195,7 @@ SfxPoolItem* NameOrIndex::Create(SvStream& rIn, USHORT /*nVer*/) const |* *************************************************************************/ -SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const +SvStream& NameOrIndex::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const { SfxStringItem::Store( rOut, nItemVersion ); rOut << nPalIndex; @@ -207,7 +207,7 @@ SvStream& NameOrIndex::Store( SvStream& rOut, USHORT nItemVersion ) const Argument pPool2 can be null. If returned string equals NameOrIndex->GetName(), the name was already unique. */ -String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, USHORT nPrefixResId, XPropertyList* pDefaults ) +String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uInt16 nWhich, const SfxItemPool* pPool1, const SfxItemPool* /*pPool2*/, SvxCompareValueFunc pCompareValueFunc, sal_uInt16 nPrefixResId, XPropertyList* pDefaults ) { sal_Bool bForceNew = sal_False; @@ -219,12 +219,12 @@ String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uIn if( aUniqueName.Len() && pPool1 ) { - const sal_uInt16 nCount = pPool1->GetItemCount( nWhich ); + const sal_uInt32 nCount = pPool1->GetItemCount2( nWhich ); const NameOrIndex *pItem; - for( sal_uInt16 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) + for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - pItem = (NameOrIndex*)pPool1->GetItem( nWhich, nSurrogate ); + pItem = (NameOrIndex*)pPool1->GetItem2( nWhich, nSurrogate ); if( pItem && ( pItem->GetName() == pCheckItem->GetName() ) ) { @@ -301,11 +301,11 @@ String NameOrIndex::CheckNamedItem( const NameOrIndex* pCheckItem, const sal_uIn if( (aUniqueName.Len() == 0) && pPool1 ) { - const sal_uInt16 nCount = pPool1->GetItemCount( nWhich ); + const sal_uInt32 nCount = pPool1->GetItemCount2( nWhich ); const NameOrIndex *pItem; - for( sal_uInt16 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) + for( sal_uInt32 nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - pItem = (NameOrIndex*)pPool1->GetItem( nWhich, nSurrogate ); + pItem = (NameOrIndex*)pPool1->GetItem2( nWhich, nSurrogate ); if( pItem && pItem->GetName().Len() ) { @@ -337,11 +337,11 @@ TYPEINIT1_AUTOFACTORY(XColorItem, NameOrIndex); /************************************************************************* |* -|* XColorItem::XColorItem(USHORT nWhich, INT32 nIndex, const Color& rTheColor) +|* XColorItem::XColorItem(sal_uInt16 nWhich, sal_Int32 nIndex, const Color& rTheColor) |* \************************************************************************/ -XColorItem::XColorItem(USHORT _nWhich, INT32 nIndex, const Color& rTheColor) : +XColorItem::XColorItem(sal_uInt16 _nWhich, sal_Int32 nIndex, const Color& rTheColor) : NameOrIndex(_nWhich, nIndex), aColor(rTheColor) { @@ -349,11 +349,11 @@ XColorItem::XColorItem(USHORT _nWhich, INT32 nIndex, const Color& rTheColor) : /************************************************************************* |* -|* XColorItem::XColorItem(USHORT nWhich, const String& rName, const Color& rTheColor) +|* XColorItem::XColorItem(sal_uInt16 nWhich, const String& rName, const Color& rTheColor) |* \************************************************************************/ -XColorItem::XColorItem(USHORT _nWhich, const XubString& rName, const Color& rTheColor) : +XColorItem::XColorItem(sal_uInt16 _nWhich, const XubString& rName, const Color& rTheColor) : NameOrIndex(_nWhich, rName), aColor(rTheColor) { @@ -373,11 +373,11 @@ XColorItem::XColorItem(const XColorItem& rItem) : /************************************************************************* |* -|* XColorItem::XColorItem(USHORT nWhich, SvStream& rIn) +|* XColorItem::XColorItem(sal_uInt16 nWhich, SvStream& rIn) |* \************************************************************************/ -XColorItem::XColorItem(USHORT _nWhich, SvStream& rIn) : +XColorItem::XColorItem(sal_uInt16 _nWhich, SvStream& rIn) : NameOrIndex(_nWhich, rIn) { if (!IsIndex()) @@ -411,11 +411,11 @@ int XColorItem::operator==(const SfxPoolItem& rItem) const /************************************************************************* |* -|* SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* \************************************************************************/ -SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XColorItem(Which(), rIn); } @@ -426,7 +426,7 @@ SfxPoolItem* XColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const |* \************************************************************************/ -SvStream& XColorItem::Store( SvStream& rOut, USHORT nItemVersion ) const +SvStream& XColorItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const { NameOrIndex::Store( rOut, nItemVersion ); @@ -453,13 +453,13 @@ const Color& XColorItem::GetColorValue(const XColorTable* pTable) const } -bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const +bool XColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetColorValue().GetRGBColor(); return true; } -bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) +bool XColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; @@ -485,7 +485,7 @@ TYPEINIT1_AUTOFACTORY(XLineStyleItem, SfxEnumItem); *************************************************************************/ XLineStyleItem::XLineStyleItem(XLineStyle eTheLineStyle) : - SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< USHORT >(eTheLineStyle)) + SfxEnumItem(XATTR_LINESTYLE, sal::static_int_cast< sal_uInt16 >(eTheLineStyle)) { } @@ -513,11 +513,11 @@ SfxPoolItem* XLineStyleItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XLineStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XLineStyleItem(rIn); } @@ -541,9 +541,9 @@ SfxItemPresentation XLineStyleItem::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: { - USHORT nId = 0; + sal_uInt16 nId = 0; - switch( (USHORT)GetValue() ) + switch( (sal_uInt16)GetValue() ) { case XLINE_NONE: nId = RID_SVXSTR_INVISIBLE; @@ -562,14 +562,14 @@ SfxItemPresentation XLineStyleItem::GetPresentation } } -bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const +bool XLineStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { ::com::sun::star::drawing::LineStyle eLS = (::com::sun::star::drawing::LineStyle)GetValue(); rVal <<= eLS; return true; } -bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) +bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { ::com::sun::star::drawing::LineStyle eLS; if(!(rVal >>= eLS )) @@ -581,13 +581,13 @@ bool XLineStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM eLS = (::com::sun::star::drawing::LineStyle)nLS; } - SetValue( sal::static_int_cast< USHORT >( eLS ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( eLS ) ); return true; } //------------------------------------------------------------------------ -USHORT XLineStyleItem::GetValueCount() const +sal_uInt16 XLineStyleItem::GetValueCount() const { return 3; } @@ -598,12 +598,12 @@ USHORT XLineStyleItem::GetValueCount() const // ------------ /************************************************************************* |* -|* XDash::XDash(XDashStyle, USHORT, ULONG, USHORT, ULONG, ULONG) +|* XDash::XDash(XDashStyle, sal_uInt16, sal_uIntPtr, sal_uInt16, sal_uIntPtr, sal_uIntPtr) |* *************************************************************************/ -XDash::XDash(XDashStyle eTheDash, USHORT nTheDots, ULONG nTheDotLen, - USHORT nTheDashes, ULONG nTheDashLen, ULONG nTheDistance) : +XDash::XDash(XDashStyle eTheDash, sal_uInt16 nTheDots, sal_uIntPtr nTheDotLen, + sal_uInt16 nTheDashes, sal_uIntPtr nTheDashLen, sal_uIntPtr nTheDistance) : eDash(eTheDash), nDots(nTheDots), nDotLen(nTheDotLen), @@ -828,11 +828,11 @@ TYPEINIT1_AUTOFACTORY(XLineDashItem, NameOrIndex); /************************************************************************* |* -|* XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash) +|* XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash) |* *************************************************************************/ -XLineDashItem::XLineDashItem(INT32 nIndex, const XDash& rTheDash) : +XLineDashItem::XLineDashItem(sal_Int32 nIndex, const XDash& rTheDash) : NameOrIndex(XATTR_LINEDASH, nIndex), aDash(rTheDash) { @@ -873,9 +873,9 @@ XLineDashItem::XLineDashItem(SvStream& rIn) : { if (!IsIndex()) { - USHORT nSTemp; - UINT32 nLTemp; - INT32 nITemp; + sal_uInt16 nSTemp; + sal_uInt32 nLTemp; + sal_Int32 nITemp; rIn >> nITemp; aDash.SetDashStyle((XDashStyle)nITemp); rIn >> nSTemp; aDash.SetDots(nSTemp); @@ -926,11 +926,11 @@ int XLineDashItem::operator==(const SfxPoolItem& rItem) const /************************************************************************* |* -|* SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XLineDashItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XLineDashItem(rIn); } @@ -941,18 +941,18 @@ SfxPoolItem* XLineDashItem::Create(SvStream& rIn, USHORT /*nVer*/) const |* *************************************************************************/ -SvStream& XLineDashItem::Store( SvStream& rOut, USHORT nItemVersion ) const +SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const { NameOrIndex::Store( rOut, nItemVersion ); if (!IsIndex()) { - rOut << (INT32) aDash.GetDashStyle(); + rOut << (sal_Int32) aDash.GetDashStyle(); rOut << aDash.GetDots(); - rOut << (UINT32) aDash.GetDotLen(); + rOut << (sal_uInt32) aDash.GetDotLen(); rOut << aDash.GetDashes(); - rOut << (UINT32) aDash.GetDashLen(); - rOut << (UINT32) aDash.GetDistance(); + rOut << (sal_uInt32) aDash.GetDashLen(); + rOut << (sal_uInt32) aDash.GetDistance(); } return rOut; @@ -1013,7 +1013,7 @@ bool XLineDashItem::ScaleMetrics(long nMul, long nDiv) return true; } -bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -1027,7 +1027,7 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ::com::sun::star::drawing::LineDash aLineDash; const XDash& rXD = GetDashValue(); - aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle()); + aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle()); aLineDash.Dots = rXD.GetDots(); aLineDash.DotLen = rXD.GetDotLen(); aLineDash.Dashes = rXD.GetDashes(); @@ -1058,7 +1058,7 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ::com::sun::star::drawing::LineDash aLineDash; - aLineDash.Style = (::com::sun::star::drawing::DashStyle)((UINT16)rXD.GetDashStyle()); + aLineDash.Style = (::com::sun::star::drawing::DashStyle)((sal_uInt16)rXD.GetDashStyle()); aLineDash.Dots = rXD.GetDots(); aLineDash.DotLen = rXD.GetDotLen(); aLineDash.Dashes = rXD.GetDashes(); @@ -1117,7 +1117,7 @@ bool XLineDashItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId return true; } -bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -1149,7 +1149,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemb { XDash aXDash; - aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style))); + aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style))); aXDash.SetDots(aLineDash.Dots); aXDash.SetDotLen(aLineDash.DotLen); aXDash.SetDashes(aLineDash.Dashes); @@ -1185,7 +1185,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemb XDash aXDash; - aXDash.SetDashStyle((XDashStyle)((UINT16)(aLineDash.Style))); + aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(aLineDash.Style))); aXDash.SetDots(aLineDash.Dots); aXDash.SetDotLen(aLineDash.DotLen); aXDash.SetDashes(aLineDash.Dashes); @@ -1206,7 +1206,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemb return false; XDash aXDash = GetDashValue(); - aXDash.SetDashStyle((XDashStyle)((UINT16)(nVal))); + aXDash.SetDashStyle((XDashStyle)((sal_uInt16)(nVal))); if((0 == aXDash.GetDots()) && (0 == aXDash.GetDashes())) aXDash.SetDots(1); @@ -1263,7 +1263,7 @@ bool XLineDashItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemb return true; } -BOOL XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) +sal_Bool XLineDashItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) { return ((XLineDashItem*)p1)->GetDashValue() == ((XLineDashItem*)p2)->GetDashValue(); } @@ -1330,11 +1330,11 @@ SfxPoolItem* XLineWidthItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XLineWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XLineWidthItem(rIn); } @@ -1365,7 +1365,7 @@ SfxItemPresentation XLineWidthItem::GetPresentation } } -bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { sal_Int32 nValue = GetValue(); if( 0 != (nMemberId&CONVERT_TWIPS) ) @@ -1375,7 +1375,7 @@ bool XLineWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberI return true; } -bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool XLineWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { sal_Int32 nValue = 0; rVal >>= nValue; @@ -1393,11 +1393,11 @@ TYPEINIT1_AUTOFACTORY(XLineColorItem, XColorItem); /************************************************************************* |* -|* XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor) +|* XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor) |* *************************************************************************/ -XLineColorItem::XLineColorItem(INT32 nIndex, const Color& rTheColor) : +XLineColorItem::XLineColorItem(sal_Int32 nIndex, const Color& rTheColor) : XColorItem(XATTR_LINECOLOR, nIndex, rTheColor) { } @@ -1437,11 +1437,11 @@ SfxPoolItem* XLineColorItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XLineColorItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XLineColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XLineColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XLineColorItem(rIn); } @@ -1470,13 +1470,13 @@ SfxItemPresentation XLineColorItem::GetPresentation } } -bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const +bool XLineColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetColorValue().GetRGBColor(); return true; } -bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) +bool XLineColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue)) @@ -1592,11 +1592,11 @@ TYPEINIT1_AUTOFACTORY(XLineStartItem, NameOrIndex); /************************************************************************* |* -|* XLineStartItem::XLineStartItem(INT32 nIndex) +|* XLineStartItem::XLineStartItem(sal_Int32 nIndex) |* *************************************************************************/ -XLineStartItem::XLineStartItem(INT32 nIndex) +XLineStartItem::XLineStartItem(sal_Int32 nIndex) : NameOrIndex(XATTR_LINESTART, nIndex) { } @@ -1680,11 +1680,11 @@ int XLineStartItem::operator==(const SfxPoolItem& rItem) const /************************************************************************* |* -|* SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XLineStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XLineStartItem(rIn); } @@ -1695,7 +1695,7 @@ SfxPoolItem* XLineStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const |* *************************************************************************/ -SvStream& XLineStartItem::Store( SvStream& rOut, USHORT nItemVersion ) const +SvStream& XLineStartItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const { NameOrIndex::Store( rOut, nItemVersion ); @@ -1750,7 +1750,7 @@ SfxItemPresentation XLineStartItem::GetPresentation } } -bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -1770,7 +1770,7 @@ bool XLineStartItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberI return true; } -bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool XLineStartItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -1840,16 +1840,16 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const // 2. if we have a name check if there is already an item with the // same name in the documents pool with a different line end or start - sal_uInt16 nCount, nSurrogate; + sal_uInt32 nCount, nSurrogate; const SfxItemPool* pPool1 = &pModel->GetItemPool(); if( aUniqueName.Len() && pPool1 ) { - nCount = pPool1->GetItemCount( XATTR_LINESTART ); + nCount = pPool1->GetItemCount2( XATTR_LINESTART ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate ); + const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate ); if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) ) { @@ -1867,11 +1867,11 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const if( !bForceNew ) { - nCount = pPool1->GetItemCount( XATTR_LINEEND ); + nCount = pPool1->GetItemCount2( XATTR_LINEEND ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate ); + const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate ); if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) ) { @@ -1892,10 +1892,10 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL; if( aUniqueName.Len() && pPool2) { - nCount = pPool2->GetItemCount( XATTR_LINESTART ); + nCount = pPool2->GetItemCount2( XATTR_LINESTART ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem( XATTR_LINESTART, nSurrogate ); + const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem2( XATTR_LINESTART, nSurrogate ); if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) ) { @@ -1913,10 +1913,10 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const if( !bForceNew ) { - nCount = pPool2->GetItemCount( XATTR_LINEEND ); + nCount = pPool2->GetItemCount2( XATTR_LINEEND ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem( XATTR_LINEEND, nSurrogate ); + const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem2( XATTR_LINEEND, nSurrogate ); if( pItem && ( pItem->GetName() == pLineStartItem->GetName() ) ) { @@ -1946,12 +1946,12 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const if( pPool1 ) { - nCount = pPool1->GetItemCount( XATTR_LINESTART ); - sal_uInt16 nSurrogate2; + nCount = pPool1->GetItemCount2( XATTR_LINESTART ); + sal_uInt32 nSurrogate2; for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate2 ); + const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate2 ); if( pItem && pItem->GetName().Len() ) { @@ -1971,10 +1971,10 @@ XLineStartItem* XLineStartItem::checkForUniqueItem( SdrModel* pModel ) const } } - nCount = pPool1->GetItemCount( XATTR_LINEEND ); + nCount = pPool1->GetItemCount2( XATTR_LINEEND ); for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate2 ); + const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate2 ); if( pItem && pItem->GetName().Len() ) { @@ -2028,11 +2028,11 @@ TYPEINIT1_AUTOFACTORY(XLineEndItem, NameOrIndex); /************************************************************************* |* -|* XLineEndItem::XLineEndItem(INT32 nIndex) +|* XLineEndItem::XLineEndItem(sal_Int32 nIndex) |* *************************************************************************/ -XLineEndItem::XLineEndItem(INT32 nIndex) +XLineEndItem::XLineEndItem(sal_Int32 nIndex) : NameOrIndex(XATTR_LINEEND, nIndex) { } @@ -2116,11 +2116,11 @@ int XLineEndItem::operator==(const SfxPoolItem& rItem) const /************************************************************************* |* -|* SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XLineEndItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XLineEndItem(rIn); } @@ -2131,7 +2131,7 @@ SfxPoolItem* XLineEndItem::Create(SvStream& rIn, USHORT /*nVer*/) const |* *************************************************************************/ -SvStream& XLineEndItem::Store( SvStream& rOut, USHORT nItemVersion ) const +SvStream& XLineEndItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const { NameOrIndex::Store( rOut, nItemVersion ); @@ -2207,11 +2207,11 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const const SfxItemPool* pPool1 = &pModel->GetItemPool(); if( aUniqueName.Len() && pPool1 ) { - nCount = pPool1->GetItemCount( XATTR_LINESTART ); + nCount = pPool1->GetItemCount2( XATTR_LINESTART ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate ); + const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate ); if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) ) { @@ -2229,11 +2229,11 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const if( !bForceNew ) { - nCount = pPool1->GetItemCount( XATTR_LINEEND ); + nCount = pPool1->GetItemCount2( XATTR_LINEEND ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate ); + const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate ); if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) ) { @@ -2254,10 +2254,10 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const const SfxItemPool* pPool2 = pModel->GetStyleSheetPool() ? &pModel->GetStyleSheetPool()->GetPool() : NULL; if( aUniqueName.Len() && pPool2) { - nCount = pPool2->GetItemCount( XATTR_LINESTART ); + nCount = pPool2->GetItemCount2( XATTR_LINESTART ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem( XATTR_LINESTART, nSurrogate ); + const XLineStartItem* pItem = (const XLineStartItem*)pPool2->GetItem2( XATTR_LINESTART, nSurrogate ); if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) ) { @@ -2275,10 +2275,10 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const if( !bForceNew ) { - nCount = pPool2->GetItemCount( XATTR_LINEEND ); + nCount = pPool2->GetItemCount2( XATTR_LINEEND ); for( nSurrogate = 0; nSurrogate < nCount; nSurrogate++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem( XATTR_LINEEND, nSurrogate ); + const XLineEndItem* pItem = (const XLineEndItem*)pPool2->GetItem2( XATTR_LINEEND, nSurrogate ); if( pItem && ( pItem->GetName() == pLineEndItem->GetName() ) ) { @@ -2308,12 +2308,12 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const if( pPool1 ) { - nCount = pPool1->GetItemCount( XATTR_LINESTART ); - sal_uInt16 nSurrogate2; + nCount = pPool1->GetItemCount2( XATTR_LINESTART ); + sal_uInt32 nSurrogate2; for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ ) { - const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem( XATTR_LINESTART, nSurrogate2 ); + const XLineStartItem* pItem = (const XLineStartItem*)pPool1->GetItem2( XATTR_LINESTART, nSurrogate2 ); if( pItem && pItem->GetName().Len() ) { @@ -2333,10 +2333,10 @@ XLineEndItem* XLineEndItem::checkForUniqueItem( SdrModel* pModel ) const } } - nCount = pPool1->GetItemCount( XATTR_LINEEND ); + nCount = pPool1->GetItemCount2( XATTR_LINEEND ); for( nSurrogate2 = 0; nSurrogate2 < nCount; nSurrogate2++ ) { - const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem( XATTR_LINEEND, nSurrogate2 ); + const XLineEndItem* pItem = (const XLineEndItem*)pPool1->GetItem2( XATTR_LINEEND, nSurrogate2 ); if( pItem && pItem->GetName().Len() ) { @@ -2408,7 +2408,7 @@ SfxItemPresentation XLineEndItem::GetPresentation } } -bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -2427,7 +2427,7 @@ bool XLineEndItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId return true; } -bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool XLineEndItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -2464,7 +2464,7 @@ TYPEINIT1_AUTOFACTORY(XLineStartWidthItem, SfxMetricItem); /************************************************************************* |* -|* XLineStartWidthItem::XLineStartWidthItem(INT32 nWidth) +|* XLineStartWidthItem::XLineStartWidthItem(sal_Int32 nWidth) |* *************************************************************************/ @@ -2497,12 +2497,12 @@ SfxPoolItem* XLineStartWidthItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, USHORT nVer) +|* SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) |* const |* *************************************************************************/ -SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XLineStartWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XLineStartWidthItem(rIn); } @@ -2533,13 +2533,13 @@ SfxItemPresentation XLineStartWidthItem::GetPresentation } } -bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const +bool XLineStartWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) +bool XLineStartWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; @@ -2589,11 +2589,11 @@ SfxPoolItem* XLineEndWidthItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XLineEndWidthItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XLineEndWidthItem(rIn); } @@ -2624,13 +2624,13 @@ SfxItemPresentation XLineEndWidthItem::GetPresentation } } -bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const +bool XLineEndWidthItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; } -bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) +bool XLineEndWidthItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; @@ -2646,11 +2646,11 @@ TYPEINIT1_AUTOFACTORY(XLineStartCenterItem, SfxBoolItem); /************************************************************************* |* -|* XLineStartCenterItem::XLineStartCenterItem(BOOL bStartCenter) +|* XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter) |* *************************************************************************/ -XLineStartCenterItem::XLineStartCenterItem(BOOL bStartCenter) : +XLineStartCenterItem::XLineStartCenterItem(sal_Bool bStartCenter) : SfxBoolItem(XATTR_LINESTARTCENTER, bStartCenter) { } @@ -2679,12 +2679,12 @@ SfxPoolItem* XLineStartCenterItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, USHORT nVer) +|* SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 nVer) |* const |* *************************************************************************/ -SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XLineStartCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XLineStartCenterItem(rIn); } @@ -2714,14 +2714,14 @@ SfxItemPresentation XLineStartCenterItem::GetPresentation } } -bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const +bool XLineStartCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { sal_Bool bValue = GetValue(); rVal.setValue( &bValue, ::getCppuBooleanType() ); return true; } -bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) +bool XLineStartCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() ) return false; @@ -2738,11 +2738,11 @@ TYPEINIT1_AUTOFACTORY(XLineEndCenterItem, SfxBoolItem); /************************************************************************* |* -|* XLineEndCenterItem::XLineEndCenterItem(BOOL bEndCenter) +|* XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter) |* *************************************************************************/ -XLineEndCenterItem::XLineEndCenterItem(BOOL bEndCenter) : +XLineEndCenterItem::XLineEndCenterItem(sal_Bool bEndCenter) : SfxBoolItem(XATTR_LINEENDCENTER, bEndCenter) { } @@ -2771,12 +2771,12 @@ SfxPoolItem* XLineEndCenterItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, USHORT nVer) +|* SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 nVer) |* const |* *************************************************************************/ -SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XLineEndCenterItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XLineEndCenterItem(rIn); } @@ -2806,14 +2806,14 @@ SfxItemPresentation XLineEndCenterItem::GetPresentation } } -bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const +bool XLineEndCenterItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { sal_Bool bValue = GetValue(); rVal.setValue( &bValue, ::getCppuBooleanType() ); return true; } -bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) +bool XLineEndCenterItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { if( !rVal.hasValue() || rVal.getValueType() != ::getCppuBooleanType() ) return false; @@ -2839,7 +2839,7 @@ TYPEINIT1_AUTOFACTORY(XFillStyleItem, SfxEnumItem); *************************************************************************/ XFillStyleItem::XFillStyleItem(XFillStyle eFillStyle) : - SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< USHORT >(eFillStyle)) + SfxEnumItem(XATTR_FILLSTYLE, sal::static_int_cast< sal_uInt16 >(eFillStyle)) { } @@ -2867,11 +2867,11 @@ SfxPoolItem* XFillStyleItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillStyleItem(rIn); } @@ -2896,9 +2896,9 @@ SfxItemPresentation XFillStyleItem::GetPresentation case SFX_ITEM_PRESENTATION_NAMELESS: case SFX_ITEM_PRESENTATION_COMPLETE: { - USHORT nId = 0; + sal_uInt16 nId = 0; - switch( (USHORT)GetValue() ) + switch( (sal_uInt16)GetValue() ) { case XFILL_NONE: nId = RID_SVXSTR_INVISIBLE; @@ -2928,13 +2928,13 @@ SfxItemPresentation XFillStyleItem::GetPresentation //------------------------------------------------------------------------ -USHORT XFillStyleItem::GetValueCount() const +sal_uInt16 XFillStyleItem::GetValueCount() const { return 5; } // ----------------------------------------------------------------------- -bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const +bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { ::com::sun::star::drawing::FillStyle eFS = (::com::sun::star::drawing::FillStyle)GetValue(); @@ -2944,7 +2944,7 @@ bool XFillStyleItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMembe } // ----------------------------------------------------------------------- -bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) +bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { ::com::sun::star::drawing::FillStyle eFS; if(!(rVal >>= eFS)) @@ -2956,7 +2956,7 @@ bool XFillStyleItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM eFS = (::com::sun::star::drawing::FillStyle)nFS; } - SetValue( sal::static_int_cast< USHORT >( eFS ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( eFS ) ); return true; } @@ -2969,11 +2969,11 @@ TYPEINIT1_AUTOFACTORY(XFillColorItem, XColorItem); /************************************************************************* |* -|* XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor) +|* XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) |* *************************************************************************/ -XFillColorItem::XFillColorItem(INT32 nIndex, const Color& rTheColor) : +XFillColorItem::XFillColorItem(sal_Int32 nIndex, const Color& rTheColor) : XColorItem(XATTR_FILLCOLOR, nIndex, rTheColor) { } @@ -3013,11 +3013,11 @@ SfxPoolItem* XFillColorItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFillColorItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFillColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillColorItem(rIn); } @@ -3048,7 +3048,7 @@ SfxItemPresentation XFillColorItem::GetPresentation // ----------------------------------------------------------------------- -bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const +bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetColorValue().GetRGBColor(); @@ -3057,7 +3057,7 @@ bool XFillColorItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMembe // ----------------------------------------------------------------------- -bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) +bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; if(!(rVal >>= nValue )) @@ -3072,7 +3072,7 @@ bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM // ----------------------------- TYPEINIT1_AUTOFACTORY(XSecondaryFillColorItem, XColorItem); -XSecondaryFillColorItem::XSecondaryFillColorItem(INT32 nIndex, const Color& rTheColor) : +XSecondaryFillColorItem::XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor) : XColorItem(XATTR_SECONDARYFILLCOLOR, nIndex, rTheColor) { } @@ -3092,14 +3092,14 @@ SfxPoolItem* XSecondaryFillColorItem::Clone(SfxItemPool* /*pPool*/) const return new XSecondaryFillColorItem(*this); } -SfxPoolItem* XSecondaryFillColorItem::Create( SvStream& rIn, USHORT nVer ) const +SfxPoolItem* XSecondaryFillColorItem::Create( SvStream& rIn, sal_uInt16 nVer ) const { if ( nVer >= 2 ) return new XSecondaryFillColorItem( rIn ); else return new XSecondaryFillColorItem( String(), Color(0,184,255) ); } -USHORT XSecondaryFillColorItem::GetVersion( USHORT /*nFileFormatVersion*/ ) const +sal_uInt16 XSecondaryFillColorItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const { return 2; } @@ -3152,15 +3152,15 @@ XGradient::XGradient() : /************************************************************************* |* |* XGradient::XGradient(XGradientStyle, const Color&, const Color&, -|* long, USHORT, USHORT, USHORT) +|* long, sal_uInt16, sal_uInt16, sal_uInt16) |* *************************************************************************/ XGradient::XGradient(const Color& rStart, const Color& rEnd, - XGradientStyle eTheStyle, long nTheAngle, USHORT nXOfs, - USHORT nYOfs, USHORT nTheBorder, - USHORT nStartIntens, USHORT nEndIntens, - USHORT nSteps) : + XGradientStyle eTheStyle, long nTheAngle, sal_uInt16 nXOfs, + sal_uInt16 nYOfs, sal_uInt16 nTheBorder, + sal_uInt16 nStartIntens, sal_uInt16 nEndIntens, + sal_uInt16 nSteps) : eStyle(eTheStyle), aStartColor(rStart), aEndColor(rEnd), @@ -3202,12 +3202,12 @@ TYPEINIT1_AUTOFACTORY(XFillGradientItem, NameOrIndex); /************************************************************************* |* -|* XFillGradientItem::XFillGradientItem(INT32 nIndex, +|* XFillGradientItem::XFillGradientItem(sal_Int32 nIndex, |* const XGradient& rTheGradient) |* *************************************************************************/ -XFillGradientItem::XFillGradientItem(INT32 nIndex, +XFillGradientItem::XFillGradientItem(sal_Int32 nIndex, const XGradient& rTheGradient) : NameOrIndex(XATTR_FILLGRADIENT, nIndex), aGradient(rTheGradient) @@ -3246,31 +3246,31 @@ XFillGradientItem::XFillGradientItem(const XFillGradientItem& rItem) : |* *************************************************************************/ -XFillGradientItem::XFillGradientItem(SvStream& rIn, USHORT nVer) : +XFillGradientItem::XFillGradientItem(SvStream& rIn, sal_uInt16 nVer) : NameOrIndex(XATTR_FILLGRADIENT, rIn), aGradient(COL_BLACK, COL_WHITE) { if (!IsIndex()) { - USHORT nUSTemp; - USHORT nRed; - USHORT nGreen; - USHORT nBlue; - INT16 nITemp; - INT32 nLTemp; + sal_uInt16 nUSTemp; + sal_uInt16 nRed; + sal_uInt16 nGreen; + sal_uInt16 nBlue; + sal_Int16 nITemp; + sal_Int32 nLTemp; rIn >> nITemp; aGradient.SetGradientStyle((XGradientStyle)nITemp); rIn >> nRed; rIn >> nGreen; rIn >> nBlue; Color aCol; - aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) ); + aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) ); aGradient.SetStartColor( aCol ); rIn >> nRed; rIn >> nGreen; rIn >> nBlue; - aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) ); + aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) ); aGradient.SetEndColor(aCol); rIn >> nLTemp; aGradient.SetAngle(nLTemp); rIn >> nUSTemp; aGradient.SetBorder(nUSTemp); @@ -3328,11 +3328,11 @@ int XFillGradientItem::operator==(const SfxPoolItem& rItem) const /************************************************************************* |* -|* SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const +SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, sal_uInt16 nVer) const { return new XFillGradientItem(rIn, nVer); } @@ -3343,15 +3343,15 @@ SfxPoolItem* XFillGradientItem::Create(SvStream& rIn, USHORT nVer) const |* *************************************************************************/ -SvStream& XFillGradientItem::Store( SvStream& rOut, USHORT nItemVersion ) const +SvStream& XFillGradientItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const { NameOrIndex::Store( rOut, nItemVersion ); if (!IsIndex()) { - rOut << (INT16)aGradient.GetGradientStyle(); + rOut << (sal_Int16)aGradient.GetGradientStyle(); - USHORT nTmp; + sal_uInt16 nTmp; nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetRed() ); rOut << nTmp; nTmp = VCLTOSVCOL( aGradient.GetStartColor().GetGreen() ); rOut << nTmp; @@ -3360,7 +3360,7 @@ SvStream& XFillGradientItem::Store( SvStream& rOut, USHORT nItemVersion ) const nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetGreen() ); rOut << nTmp; nTmp = VCLTOSVCOL( aGradient.GetEndColor().GetBlue() ); rOut << nTmp; - rOut << (INT32) aGradient.GetAngle(); + rOut << (sal_Int32) aGradient.GetAngle(); rOut << aGradient.GetBorder(); rOut << aGradient.GetXOffset(); rOut << aGradient.GetYOffset(); @@ -3390,11 +3390,11 @@ const XGradient& XFillGradientItem::GetGradientValue(const XGradientTable* pTabl /************************************************************************* |* -|* USHORT XFillGradientItem::GetVersion() const +|* sal_uInt16 XFillGradientItem::GetVersion() const |* *************************************************************************/ -USHORT XFillGradientItem::GetVersion( USHORT /*nFileFormatVersion*/) const +sal_uInt16 XFillGradientItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const { // !!! this version number also represents the version number of superclasses // !!! (e.g. XFillFloatTransparenceItem); if you make any changes here, @@ -3427,7 +3427,7 @@ SfxItemPresentation XFillGradientItem::GetPresentation } // ----------------------------------------------------------------------- -bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { //sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -3441,8 +3441,8 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb const XGradient& aXGradient = GetGradientValue(); aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle(); - aGradient2.StartColor = (INT32)aXGradient.GetStartColor().GetColor(); - aGradient2.EndColor = (INT32)aXGradient.GetEndColor().GetColor(); + aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor(); + aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor(); aGradient2.Angle = (short)aXGradient.GetAngle(); aGradient2.Border = aXGradient.GetBorder(); aGradient2.XOffset = aXGradient.GetXOffset(); @@ -3467,8 +3467,8 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb ::com::sun::star::awt::Gradient aGradient2; aGradient2.Style = (::com::sun::star::awt::GradientStyle) aXGradient.GetGradientStyle(); - aGradient2.StartColor = (INT32)aXGradient.GetStartColor().GetColor(); - aGradient2.EndColor = (INT32)aXGradient.GetEndColor().GetColor(); + aGradient2.StartColor = (sal_Int32)aXGradient.GetStartColor().GetColor(); + aGradient2.EndColor = (sal_Int32)aXGradient.GetEndColor().GetColor(); aGradient2.Angle = (short)aXGradient.GetAngle(); aGradient2.Border = aXGradient.GetBorder(); aGradient2.XOffset = aXGradient.GetXOffset(); @@ -3480,7 +3480,7 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb rVal <<= aGradient2; break; } - + case MID_NAME: { rtl::OUString aApiName; @@ -3488,7 +3488,7 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb rVal <<= aApiName; break; } - + case MID_GRADIENT_STYLE: rVal <<= (sal_Int16)GetGradientValue().GetGradientStyle(); break; case MID_GRADIENT_STARTCOLOR: rVal <<= (sal_Int32)GetGradientValue().GetStartColor().GetColor(); break; case MID_GRADIENT_ENDCOLOR: rVal <<= (sal_Int32)GetGradientValue().GetEndColor().GetColor(); break; @@ -3507,7 +3507,7 @@ bool XFillGradientItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemb } // ----------------------------------------------------------------------- -bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -3651,7 +3651,7 @@ bool XFillGradientItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE n return true; } -BOOL XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) +sal_Bool XFillGradientItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) { return ((XFillGradientItem*)p1)->GetGradientValue() == ((XFillGradientItem*)p2)->GetGradientValue(); } @@ -3687,14 +3687,14 @@ TYPEINIT1_AUTOFACTORY( XFillFloatTransparenceItem, XFillGradientItem ); // ----------------------------------------------------------------------------- XFillFloatTransparenceItem::XFillFloatTransparenceItem() : - bEnabled( FALSE ) + bEnabled( sal_False ) { SetWhich( XATTR_FILLFLOATTRANSPARENCE ); } //------------------------------------------------------------------------ -XFillFloatTransparenceItem::XFillFloatTransparenceItem( INT32 nIndex, const XGradient& rGradient, BOOL bEnable ) : +XFillFloatTransparenceItem::XFillFloatTransparenceItem( sal_Int32 nIndex, const XGradient& rGradient, sal_Bool bEnable ) : XFillGradientItem ( nIndex, rGradient ), bEnabled ( bEnable ) { @@ -3703,7 +3703,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( INT32 nIndex, const XGra //------------------------------------------------------------------------ -XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XubString& rName, const XGradient& rGradient, BOOL bEnable ) : +XFillFloatTransparenceItem::XFillFloatTransparenceItem(const XubString& rName, const XGradient& rGradient, sal_Bool bEnable ) : XFillGradientItem ( rName, rGradient ), bEnabled ( bEnable ) { @@ -3721,7 +3721,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar //------------------------------------------------------------------------ -//XFillFloatTransparenceItem::XFillFloatTransparenceItem( SvStream& rIn, USHORT nVer ) : +//XFillFloatTransparenceItem::XFillFloatTransparenceItem( SvStream& rIn, sal_uInt16 nVer ) : // XFillGradientItem ( rIn, nVer ) //{ // SetWhich( XATTR_FILLFLOATTRANSPARENCE ); @@ -3730,7 +3730,7 @@ XFillFloatTransparenceItem::XFillFloatTransparenceItem( const XFillFloatTranspar //************************************************************************* -XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, BOOL bEnable ) +XFillFloatTransparenceItem::XFillFloatTransparenceItem(SfxItemPool* /*pPool*/, const XGradient& rTheGradient, sal_Bool bEnable ) : XFillGradientItem ( -1, rTheGradient ), bEnabled ( bEnable ) { @@ -3762,14 +3762,14 @@ SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const //------------------------------------------------------------------------ -//SfxPoolItem* XFillFloatTransparenceItem::Create( SvStream& rIn, USHORT nVer ) const +//SfxPoolItem* XFillFloatTransparenceItem::Create( SvStream& rIn, sal_uInt16 nVer ) const //{ // return( ( 0 == nVer ) ? Clone( NULL ) : new XFillFloatTransparenceItem( rIn, nVer ) ); //} //------------------------------------------------------------------------ -//SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, USHORT nItemVersion ) const +//SvStream& XFillFloatTransparenceItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const //{ // XFillGradientItem::Store( rOut, nItemVersion ); // rOut << bEnabled; @@ -3778,7 +3778,7 @@ SfxPoolItem* XFillFloatTransparenceItem::Clone( SfxItemPool* /*pPool*/) const //------------------------------------------------------------------------ -USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const +sal_uInt16 XFillFloatTransparenceItem::GetVersion( sal_uInt16 nFileFormatVersion ) const { // !!! if version number of this object must be increased, please !!! // !!! increase version number of base class XFillGradientItem !!! @@ -3787,14 +3787,14 @@ USHORT XFillFloatTransparenceItem::GetVersion( USHORT nFileFormatVersion ) const //------------------------------------------------------------------------ -bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool XFillFloatTransparenceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { return XFillGradientItem::QueryValue( rVal, nMemberId ); } //------------------------------------------------------------------------ -bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool XFillFloatTransparenceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { return XFillGradientItem::PutValue( rVal, nMemberId ); } @@ -3809,7 +3809,7 @@ SfxItemPresentation XFillFloatTransparenceItem::GetPresentation( SfxItemPresenta return XFillGradientItem::GetPresentation( ePres, eCoreUnit, ePresUnit, rText, pIntlWrapper ); } -BOOL XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) +sal_Bool XFillFloatTransparenceItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) { return ((XFillFloatTransparenceItem*)p1)->IsEnabled() == ((XFillFloatTransparenceItem*)p2)->IsEnabled() && ((XFillFloatTransparenceItem*)p1)->GetGradientValue() == ((XFillFloatTransparenceItem*)p2)->GetGradientValue(); @@ -3833,7 +3833,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM // if the given name is not valid, replace it! if( aUniqueName != GetName() ) { - return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), TRUE ); + return new XFillFloatTransparenceItem( aUniqueName, GetGradientValue(), sal_True ); } } } @@ -3842,7 +3842,7 @@ XFillFloatTransparenceItem* XFillFloatTransparenceItem::checkForUniqueItem( SdrM // #85953# if disabled, force name to empty string if(GetName().Len()) { - return new XFillFloatTransparenceItem(String(), GetGradientValue(), FALSE); + return new XFillFloatTransparenceItem(String(), GetGradientValue(), sal_False); } } @@ -3890,12 +3890,12 @@ TYPEINIT1_AUTOFACTORY(XFillHatchItem, NameOrIndex); /************************************************************************* |* -|* XFillHatchItem::XFillHatchItem(INT32 nIndex, +|* XFillHatchItem::XFillHatchItem(sal_Int32 nIndex, |* const XHatch& rTheHatch) |* *************************************************************************/ -XFillHatchItem::XFillHatchItem(INT32 nIndex, +XFillHatchItem::XFillHatchItem(sal_Int32 nIndex, const XHatch& rTheHatch) : NameOrIndex(XATTR_FILLHATCH, nIndex), aHatch(rTheHatch) @@ -3940,11 +3940,11 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) : { if (!IsIndex()) { - USHORT nRed; - USHORT nGreen; - USHORT nBlue; - INT16 nITemp; - INT32 nLTemp; + sal_uInt16 nRed; + sal_uInt16 nGreen; + sal_uInt16 nBlue; + sal_Int16 nITemp; + sal_Int32 nLTemp; rIn >> nITemp; aHatch.SetHatchStyle((XHatchStyle)nITemp); rIn >> nRed; @@ -3952,7 +3952,7 @@ XFillHatchItem::XFillHatchItem(SvStream& rIn) : rIn >> nBlue; Color aCol; - aCol = Color( (BYTE)( nRed >> 8 ), (BYTE)( nGreen >> 8 ), (BYTE)( nBlue >> 8 ) ); + aCol = Color( (sal_uInt8)( nRed >> 8 ), (sal_uInt8)( nGreen >> 8 ), (sal_uInt8)( nBlue >> 8 ) ); aHatch.SetColor(aCol); rIn >> nLTemp; aHatch.SetDistance(nLTemp); rIn >> nLTemp; aHatch.SetAngle(nLTemp); @@ -3999,11 +3999,11 @@ int XFillHatchItem::operator==(const SfxPoolItem& rItem) const /************************************************************************* |* -|* SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillHatchItem(rIn); } @@ -4014,21 +4014,21 @@ SfxPoolItem* XFillHatchItem::Create(SvStream& rIn, USHORT /*nVer*/) const |* *************************************************************************/ -SvStream& XFillHatchItem::Store( SvStream& rOut, USHORT nItemVersion ) const +SvStream& XFillHatchItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const { NameOrIndex::Store( rOut, nItemVersion ); if (!IsIndex()) { - rOut << (INT16)aHatch.GetHatchStyle(); + rOut << (sal_Int16)aHatch.GetHatchStyle(); - USHORT nTmp; + sal_uInt16 nTmp; nTmp = VCLTOSVCOL( aHatch.GetColor().GetRed() ); rOut << nTmp; nTmp = VCLTOSVCOL( aHatch.GetColor().GetGreen() ); rOut << nTmp; nTmp = VCLTOSVCOL( aHatch.GetColor().GetBlue() ); rOut << nTmp; - rOut << (INT32) aHatch.GetDistance(); - rOut << (INT32) aHatch.GetAngle(); + rOut << (sal_Int32) aHatch.GetDistance(); + rOut << (sal_Int32) aHatch.GetAngle(); } return rOut; @@ -4088,7 +4088,7 @@ bool XFillHatchItem::ScaleMetrics(long nMul, long nDiv) } // ----------------------------------------------------------------------- -bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -4152,7 +4152,7 @@ bool XFillHatchItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberI } // ----------------------------------------------------------------------- -bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -4248,7 +4248,7 @@ bool XFillHatchItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMem return true; } -BOOL XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) +sal_Bool XFillHatchItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) { return ((XFillHatchItem*)p1)->GetHatchValue() == ((XFillHatchItem*)p2)->GetHatchValue(); } @@ -4291,7 +4291,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextStyleItem, SfxEnumItem); *************************************************************************/ XFormTextStyleItem::XFormTextStyleItem(XFormTextStyle eTheStyle) : - SfxEnumItem(XATTR_FORMTXTSTYLE, sal::static_int_cast< USHORT >(eTheStyle)) + SfxEnumItem(XATTR_FORMTXTSTYLE, sal::static_int_cast< sal_uInt16 >(eTheStyle)) { } @@ -4319,11 +4319,11 @@ SfxPoolItem* XFormTextStyleItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFormTextStyleItem(rIn); } @@ -4334,7 +4334,7 @@ SfxPoolItem* XFormTextStyleItem::Create(SvStream& rIn, USHORT /*nVer*/) const |* \*************************************************************************/ -USHORT XFormTextStyleItem::GetValueCount() const +sal_uInt16 XFormTextStyleItem::GetValueCount() const { return 5; } @@ -4346,7 +4346,7 @@ USHORT XFormTextStyleItem::GetValueCount() const \*************************************************************************/ // #FontWork# -bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool XFormTextStyleItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; @@ -4359,11 +4359,11 @@ bool XFormTextStyleItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const \*************************************************************************/ // #FontWork# -bool XFormTextStyleItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool XFormTextStyleItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; - SetValue(sal::static_int_cast< USHORT >(nValue)); + SetValue(sal::static_int_cast< sal_uInt16 >(nValue)); return true; } @@ -4380,7 +4380,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextAdjustItem, SfxEnumItem); *************************************************************************/ XFormTextAdjustItem::XFormTextAdjustItem(XFormTextAdjust eTheAdjust) : - SfxEnumItem(XATTR_FORMTXTADJUST, sal::static_int_cast< USHORT >(eTheAdjust)) + SfxEnumItem(XATTR_FORMTXTADJUST, sal::static_int_cast< sal_uInt16 >(eTheAdjust)) { } @@ -4408,11 +4408,11 @@ SfxPoolItem* XFormTextAdjustItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFormTextAdjustItem(rIn); } @@ -4423,7 +4423,7 @@ SfxPoolItem* XFormTextAdjustItem::Create(SvStream& rIn, USHORT /*nVer*/) const |* \*************************************************************************/ -USHORT XFormTextAdjustItem::GetValueCount() const +sal_uInt16 XFormTextAdjustItem::GetValueCount() const { return 4; } @@ -4435,7 +4435,7 @@ USHORT XFormTextAdjustItem::GetValueCount() const \*************************************************************************/ // #FontWork# -bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; @@ -4448,11 +4448,11 @@ bool XFormTextAdjustItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const \*************************************************************************/ // #FontWork# -bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool XFormTextAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; - SetValue(sal::static_int_cast< USHORT >(nValue)); + SetValue(sal::static_int_cast< sal_uInt16 >(nValue)); return true; } @@ -4497,11 +4497,11 @@ SfxPoolItem* XFormTextDistanceItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFormTextDistanceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFormTextDistanceItem(rIn); } @@ -4546,11 +4546,11 @@ SfxPoolItem* XFormTextStartItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFormTextStartItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFormTextStartItem(rIn); } @@ -4562,11 +4562,11 @@ TYPEINIT1_AUTOFACTORY(XFormTextMirrorItem, SfxBoolItem); /************************************************************************* |* -|* XFormTextMirrorItem::XFormTextMirrorItem(BOOL bMirror) +|* XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror) |* *************************************************************************/ -XFormTextMirrorItem::XFormTextMirrorItem(BOOL bMirror) : +XFormTextMirrorItem::XFormTextMirrorItem(sal_Bool bMirror) : SfxBoolItem(XATTR_FORMTXTMIRROR, bMirror) { } @@ -4595,12 +4595,12 @@ SfxPoolItem* XFormTextMirrorItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, USHORT nVer) +|* SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 nVer) |* const |* *************************************************************************/ -SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFormTextMirrorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFormTextMirrorItem(rIn); } @@ -4617,7 +4617,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextOutlineItem, SfxBoolItem); |* *************************************************************************/ -XFormTextOutlineItem::XFormTextOutlineItem(BOOL bOutline) : +XFormTextOutlineItem::XFormTextOutlineItem(sal_Bool bOutline) : SfxBoolItem(XATTR_FORMTXTOUTLINE, bOutline) { } @@ -4646,12 +4646,12 @@ SfxPoolItem* XFormTextOutlineItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, USHORT nVer) +|* SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 nVer) |* const |* *************************************************************************/ -SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFormTextOutlineItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFormTextOutlineItem(rIn); } @@ -4669,7 +4669,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowItem, SfxEnumItem); XFormTextShadowItem::XFormTextShadowItem(XFormTextShadow eFormTextShadow) : SfxEnumItem( - XATTR_FORMTXTSHADOW, sal::static_int_cast< USHORT >(eFormTextShadow)) + XATTR_FORMTXTSHADOW, sal::static_int_cast< sal_uInt16 >(eFormTextShadow)) { } @@ -4697,11 +4697,11 @@ SfxPoolItem* XFormTextShadowItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFormTextShadowItem(rIn); } @@ -4713,7 +4713,7 @@ SfxPoolItem* XFormTextShadowItem::Create(SvStream& rIn, USHORT /*nVer*/) const |* \*************************************************************************/ -USHORT XFormTextShadowItem::GetValueCount() const +sal_uInt16 XFormTextShadowItem::GetValueCount() const { return 3; } @@ -4725,7 +4725,7 @@ USHORT XFormTextShadowItem::GetValueCount() const \*************************************************************************/ // #FontWork# -bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool XFormTextShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; @@ -4738,11 +4738,11 @@ bool XFormTextShadowItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const \*************************************************************************/ // #FontWork# -bool XFormTextShadowItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool XFormTextShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; - SetValue(sal::static_int_cast< USHORT >(nValue)); + SetValue(sal::static_int_cast< sal_uInt16 >(nValue)); return true; } @@ -4758,7 +4758,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowColorItem, XColorItem); |* *************************************************************************/ -XFormTextShadowColorItem::XFormTextShadowColorItem(INT32 nIndex, +XFormTextShadowColorItem::XFormTextShadowColorItem(sal_Int32 nIndex, const Color& rTheColor) : XColorItem(XATTR_FORMTXTSHDWCOLOR, nIndex, rTheColor) { @@ -4800,11 +4800,11 @@ SfxPoolItem* XFormTextShadowColorItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFormTextShadowColorItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFormTextShadowColorItem(rIn); } @@ -4849,11 +4849,11 @@ SfxPoolItem* XFormTextShadowXValItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFormTextShadowXValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFormTextShadowXValItem(rIn); } @@ -4898,11 +4898,11 @@ SfxPoolItem* XFormTextShadowYValItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFormTextShadowYValItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFormTextShadowYValItem(rIn); } @@ -4920,7 +4920,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextStdFormItem, SfxEnumItem); XFormTextStdFormItem::XFormTextStdFormItem(XFormTextStdForm eFormTextStdForm) : SfxEnumItem( - XATTR_FORMTXTSTDFORM, sal::static_int_cast< USHORT >(eFormTextStdForm)) + XATTR_FORMTXTSTDFORM, sal::static_int_cast< sal_uInt16 >(eFormTextStdForm)) { } @@ -4948,11 +4948,11 @@ SfxPoolItem* XFormTextStdFormItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFormTextStdFormItem(rIn); } @@ -4964,7 +4964,7 @@ SfxPoolItem* XFormTextStdFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const |* \*************************************************************************/ -USHORT XFormTextStdFormItem::GetValueCount() const +sal_uInt16 XFormTextStdFormItem::GetValueCount() const { return 3; } @@ -4976,7 +4976,7 @@ USHORT XFormTextStdFormItem::GetValueCount() const \*************************************************************************/ // #FontWork# -bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const +bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { rVal <<= (sal_Int32)GetValue(); return true; @@ -4989,11 +4989,11 @@ bool XFormTextStdFormItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/) const \*************************************************************************/ // #FontWork# -bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/) +bool XFormTextStdFormItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/) { sal_Int32 nValue = 0; rVal >>= nValue; - SetValue(sal::static_int_cast< USHORT >(nValue)); + SetValue(sal::static_int_cast< sal_uInt16 >(nValue)); return true; } @@ -5009,7 +5009,7 @@ TYPEINIT1_AUTOFACTORY(XFormTextHideFormItem, SfxBoolItem); |* *************************************************************************/ -XFormTextHideFormItem::XFormTextHideFormItem(BOOL bHide) : +XFormTextHideFormItem::XFormTextHideFormItem(sal_Bool bHide) : SfxBoolItem(XATTR_FORMTXTHIDEFORM, bHide) { } @@ -5038,12 +5038,12 @@ SfxPoolItem* XFormTextHideFormItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, USHORT nVer) +|* SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 nVer) |* const |* *************************************************************************/ -SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFormTextHideFormItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFormTextHideFormItem(rIn); } @@ -5107,7 +5107,7 @@ SfxPoolItem* XLineAttrSetItem::Clone( SfxItemPool* pPool ) const |* \************************************************************************/ -SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) const +SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, sal_uInt16 /*nVersion*/) const { SfxItemSet *pSet2 = new SfxItemSet( *GetItemSet().GetPool(), XATTR_LINE_FIRST, XATTR_LINE_LAST); @@ -5121,7 +5121,7 @@ SfxPoolItem* XLineAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) c |* \************************************************************************/ -SvStream& XLineAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const +SvStream& XLineAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) const { return SfxSetItem::Store( rStream, nItemVersion ); } @@ -5180,7 +5180,7 @@ SfxPoolItem* XFillAttrSetItem::Clone( SfxItemPool* pPool ) const |* \************************************************************************/ -SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) const +SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, sal_uInt16 /*nVersion*/) const { SfxItemSet *pSet2 = new SfxItemSet( *GetItemSet().GetPool(), XATTR_FILL_FIRST, XATTR_FILL_LAST); @@ -5194,7 +5194,7 @@ SfxPoolItem* XFillAttrSetItem::Create( SvStream& rStream, USHORT /*nVersion*/) c |* \************************************************************************/ -SvStream& XFillAttrSetItem::Store( SvStream& rStream, USHORT nItemVersion ) const +SvStream& XFillAttrSetItem::Store( SvStream& rStream, sal_uInt16 nItemVersion ) const { return SfxSetItem::Store( rStream, nItemVersion ); } diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index c552d74ad3..b4a7805fad 100644..100755 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/uno/Any.hxx> #include <svx/dialogs.hrc> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> #include <editeng/itemtype.hxx> @@ -53,11 +53,11 @@ TYPEINIT1_AUTOFACTORY(XLineTransparenceItem, SfxUInt16Item); /************************************************************************* |* -|* XLineTransparenceItem::XLineTransparenceItem(USHORT) +|* XLineTransparenceItem::XLineTransparenceItem(sal_uInt16) |* *************************************************************************/ -XLineTransparenceItem::XLineTransparenceItem(USHORT nLineTransparence) : +XLineTransparenceItem::XLineTransparenceItem(sal_uInt16 nLineTransparence) : SfxUInt16Item(XATTR_LINETRANSPARENCE, nLineTransparence) { } @@ -86,11 +86,11 @@ SfxPoolItem* XLineTransparenceItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XLineTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XLineTransparenceItem(rIn); } @@ -115,7 +115,7 @@ SfxItemPresentation XLineTransparenceItem::GetPresentation rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ); rText.AppendAscii(": "); case SFX_ITEM_PRESENTATION_NAMELESS: - rText += XubString( UniString::CreateFromInt32((USHORT) GetValue()) ); + rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue()) ); rText += sal_Unicode('%'); return ePres; default: @@ -132,7 +132,7 @@ TYPEINIT1_AUTOFACTORY(XLineJointItem, SfxEnumItem); // ----------------------------------------------------------------------------- XLineJointItem::XLineJointItem( XLineJoint eLineJoint ) : - SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< USHORT >(eLineJoint)) + SfxEnumItem(XATTR_LINEJOINT, sal::static_int_cast< sal_uInt16 >(eLineJoint)) { } @@ -145,14 +145,14 @@ XLineJointItem::XLineJointItem( SvStream& rIn ) : // ----------------------------------------------------------------------------- -USHORT XLineJointItem::GetVersion( USHORT /*nFileFormatVersion*/) const +sal_uInt16 XLineJointItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const { return 1; } // ----------------------------------------------------------------------------- -SfxPoolItem* XLineJointItem::Create( SvStream& rIn, USHORT nVer ) const +SfxPoolItem* XLineJointItem::Create( SvStream& rIn, sal_uInt16 nVer ) const { XLineJointItem* pRet = new XLineJointItem( rIn ); @@ -183,7 +183,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres, case SFX_ITEM_PRESENTATION_COMPLETE: case SFX_ITEM_PRESENTATION_NAMELESS: { - USHORT nId = 0; + sal_uInt16 nId = 0; switch( GetValue() ) { @@ -223,7 +223,7 @@ SfxItemPresentation XLineJointItem::GetPresentation( SfxItemPresentation ePres, // ----------------------------------------------------------------------------- -bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) const +bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) const { ::com::sun::star::drawing::LineJoint eJoint = ::com::sun::star::drawing::LineJoint_NONE; @@ -253,7 +253,7 @@ bool XLineJointItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE /*nMembe // ----------------------------------------------------------------------------- -bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/) +bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/) { XLineJoint eJoint = XLINEJOINT_NONE; ::com::sun::star::drawing::LineJoint eUnoJoint; @@ -285,14 +285,14 @@ bool XLineJointItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE /*nM break; } - SetValue( sal::static_int_cast< USHORT >( eJoint ) ); + SetValue( sal::static_int_cast< sal_uInt16 >( eJoint ) ); return true; } // ----------------------------------------------------------------------------- -USHORT XLineJointItem::GetValueCount() const +sal_uInt16 XLineJointItem::GetValueCount() const { // don't forget to update the api interface also return 5; @@ -305,11 +305,11 @@ TYPEINIT1_AUTOFACTORY(XFillTransparenceItem, SfxUInt16Item); /************************************************************************* |* -|* XFillTransparenceItem::XFillTransparenceItem(USHORT) +|* XFillTransparenceItem::XFillTransparenceItem(sal_uInt16) |* *************************************************************************/ -XFillTransparenceItem::XFillTransparenceItem(USHORT nFillTransparence) : +XFillTransparenceItem::XFillTransparenceItem(sal_uInt16 nFillTransparence) : SfxUInt16Item(XATTR_FILLTRANSPARENCE, nFillTransparence) { } @@ -338,11 +338,11 @@ SfxPoolItem* XFillTransparenceItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillTransparenceItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillTransparenceItem(rIn); } @@ -367,7 +367,7 @@ SfxItemPresentation XFillTransparenceItem::GetPresentation rText = XubString( ResId( RID_SVXSTR_TRANSPARENCE, DIALOG_MGR() ) ); rText.AppendAscii(": "); case SFX_ITEM_PRESENTATION_NAMELESS: - rText += XubString( UniString::CreateFromInt32((USHORT) GetValue() )); + rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() )); rText += sal_Unicode('%'); return ePres; default: @@ -382,11 +382,11 @@ TYPEINIT1_AUTOFACTORY(XFormTextShadowTranspItem, SfxUInt16Item); /************************************************************************* |* -|* XFormTextShadowTranspItem::XFormTextShadowTranspItem(USHORT) +|* XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16) |* *************************************************************************/ -XFormTextShadowTranspItem::XFormTextShadowTranspItem(USHORT nShdwTransparence) : +XFormTextShadowTranspItem::XFormTextShadowTranspItem(sal_uInt16 nShdwTransparence) : SfxUInt16Item(XATTR_FORMTXTSHDWTRANSP, nShdwTransparence) { } @@ -415,11 +415,11 @@ SfxPoolItem* XFormTextShadowTranspItem::Clone(SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFormTextShadowTranspItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFormTextShadowTranspItem(rIn); } @@ -432,11 +432,11 @@ TYPEINIT1_AUTOFACTORY(XGradientStepCountItem, SfxUInt16Item); /************************************************************************* |* -|* XGradientStepCountItem::XGradientStepCountItem( USHORT ) +|* XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 ) |* *************************************************************************/ -XGradientStepCountItem::XGradientStepCountItem( USHORT nStepCount ) : +XGradientStepCountItem::XGradientStepCountItem( sal_uInt16 nStepCount ) : SfxUInt16Item( XATTR_GRADIENTSTEPCOUNT, nStepCount ) { } @@ -465,11 +465,11 @@ SfxPoolItem* XGradientStepCountItem::Clone( SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XGradientStepCountItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XGradientStepCountItem( rIn ); } @@ -494,7 +494,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation // rText = XubString( ResId( RID_SVXSTR_GRADIENTSTEPCOUNT, DIALOG_MGR() ) ); // rText += ": "; case SFX_ITEM_PRESENTATION_NAMELESS: - rText += XubString( UniString::CreateFromInt32((USHORT) GetValue() )); + rText += XubString( UniString::CreateFromInt32((sal_uInt16) GetValue() )); return ePres; default: return SFX_ITEM_PRESENTATION_NONE; @@ -507,7 +507,7 @@ SfxItemPresentation XGradientStepCountItem::GetPresentation //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpTileItem, SfxBoolItem ); -XFillBmpTileItem::XFillBmpTileItem( BOOL bTile ) : +XFillBmpTileItem::XFillBmpTileItem( sal_Bool bTile ) : SfxBoolItem( XATTR_FILLBMP_TILE, bTile ) { } @@ -522,7 +522,7 @@ SfxPoolItem* XFillBmpTileItem::Clone( SfxItemPool* /*pPool*/) const return new XFillBmpTileItem( *this ); } -SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillBmpTileItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpTileItem( rIn ); } @@ -556,7 +556,7 @@ SfxItemPresentation XFillBmpTileItem::GetPresentation TYPEINIT1_AUTOFACTORY( XFillBmpPosItem, SfxEnumItem ); XFillBmpPosItem::XFillBmpPosItem( RECT_POINT eRP ) : - SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< USHORT >( eRP ) ) + SfxEnumItem( XATTR_FILLBMP_POS, sal::static_int_cast< sal_uInt16 >( eRP ) ) { } @@ -570,7 +570,7 @@ SfxPoolItem* XFillBmpPosItem::Clone( SfxItemPool* /*pPool*/) const return new XFillBmpPosItem( *this ); } -SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillBmpPosItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpPosItem( rIn ); } @@ -597,7 +597,7 @@ SfxItemPresentation XFillBmpPosItem::GetPresentation } } -USHORT XFillBmpPosItem::GetValueCount() const +sal_uInt16 XFillBmpPosItem::GetValueCount() const { return 9; } @@ -623,7 +623,7 @@ SfxPoolItem* XFillBmpSizeXItem::Clone( SfxItemPool* /*pPool*/) const return new XFillBmpSizeXItem( *this ); } -SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillBmpSizeXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpSizeXItem( rIn ); } @@ -676,7 +676,7 @@ SfxPoolItem* XFillBmpSizeYItem::Clone( SfxItemPool* /*pPool*/) const return new XFillBmpSizeYItem( *this ); } -SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillBmpSizeYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpSizeYItem( rIn ); } @@ -719,7 +719,7 @@ bool XFillBmpSizeYItem::HasMetrics() const //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpSizeLogItem, SfxBoolItem ); -XFillBmpSizeLogItem::XFillBmpSizeLogItem( BOOL bLog ) : +XFillBmpSizeLogItem::XFillBmpSizeLogItem( sal_Bool bLog ) : SfxBoolItem( XATTR_FILLBMP_SIZELOG, bLog ) { } @@ -734,7 +734,7 @@ SfxPoolItem* XFillBmpSizeLogItem::Clone( SfxItemPool* /*pPool*/) const return new XFillBmpSizeLogItem( *this ); } -SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillBmpSizeLogItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpSizeLogItem( rIn ); } @@ -767,7 +767,7 @@ SfxItemPresentation XFillBmpSizeLogItem::GetPresentation //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetXItem, SfxUInt16Item ); -XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( USHORT nOffX ) : +XFillBmpTileOffsetXItem::XFillBmpTileOffsetXItem( sal_uInt16 nOffX ) : SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETX, nOffX ) { } @@ -782,7 +782,7 @@ SfxPoolItem* XFillBmpTileOffsetXItem::Clone( SfxItemPool* /*pPool*/) const return new XFillBmpTileOffsetXItem( *this ); } -SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillBmpTileOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpTileOffsetXItem( rIn ); } @@ -815,7 +815,7 @@ SfxItemPresentation XFillBmpTileOffsetXItem::GetPresentation //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpTileOffsetYItem, SfxUInt16Item ); -XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( USHORT nOffY ) : +XFillBmpTileOffsetYItem::XFillBmpTileOffsetYItem( sal_uInt16 nOffY ) : SfxUInt16Item( XATTR_FILLBMP_TILEOFFSETY, nOffY ) { } @@ -830,7 +830,7 @@ SfxPoolItem* XFillBmpTileOffsetYItem::Clone( SfxItemPool* /*pPool*/) const return new XFillBmpTileOffsetYItem( *this ); } -SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillBmpTileOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpTileOffsetYItem( rIn ); } @@ -863,7 +863,7 @@ SfxItemPresentation XFillBmpTileOffsetYItem::GetPresentation //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpStretchItem, SfxBoolItem ); -XFillBmpStretchItem::XFillBmpStretchItem( BOOL bStretch ) : +XFillBmpStretchItem::XFillBmpStretchItem( sal_Bool bStretch ) : SfxBoolItem( XATTR_FILLBMP_STRETCH, bStretch ) { } @@ -878,7 +878,7 @@ SfxPoolItem* XFillBmpStretchItem::Clone( SfxItemPool* /*pPool*/) const return new XFillBmpStretchItem( *this ); } -SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillBmpStretchItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpStretchItem( rIn ); } @@ -911,7 +911,7 @@ SfxItemPresentation XFillBmpStretchItem::GetPresentation //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetXItem, SfxUInt16Item ); -XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( USHORT nOffPosX ) : +XFillBmpPosOffsetXItem::XFillBmpPosOffsetXItem( sal_uInt16 nOffPosX ) : SfxUInt16Item( XATTR_FILLBMP_POSOFFSETX, nOffPosX ) { } @@ -926,7 +926,7 @@ SfxPoolItem* XFillBmpPosOffsetXItem::Clone( SfxItemPool* /*pPool*/) const return new XFillBmpPosOffsetXItem( *this ); } -SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillBmpPosOffsetXItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpPosOffsetXItem( rIn ); } @@ -959,7 +959,7 @@ SfxItemPresentation XFillBmpPosOffsetXItem::GetPresentation //------------------------------ TYPEINIT1_AUTOFACTORY( XFillBmpPosOffsetYItem, SfxUInt16Item ); -XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( USHORT nOffPosY ) : +XFillBmpPosOffsetYItem::XFillBmpPosOffsetYItem( sal_uInt16 nOffPosY ) : SfxUInt16Item( XATTR_FILLBMP_POSOFFSETY, nOffPosY ) { } @@ -974,7 +974,7 @@ SfxPoolItem* XFillBmpPosOffsetYItem::Clone( SfxItemPool* /*pPool*/) const return new XFillBmpPosOffsetYItem( *this ); } -SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillBmpPosOffsetYItem::Create( SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBmpPosOffsetYItem( rIn ); } @@ -1008,11 +1008,11 @@ TYPEINIT1_AUTOFACTORY(XFillBackgroundItem, SfxBoolItem); /************************************************************************* |* -|* XFillBackgroundItem::XFillBackgroundItem( BOOL ) +|* XFillBackgroundItem::XFillBackgroundItem( sal_Bool ) |* *************************************************************************/ -XFillBackgroundItem::XFillBackgroundItem( BOOL bFill ) : +XFillBackgroundItem::XFillBackgroundItem( sal_Bool bFill ) : SfxBoolItem( XATTR_FILLBACKGROUND, bFill ) { } @@ -1041,11 +1041,11 @@ SfxPoolItem* XFillBackgroundItem::Clone( SfxItemPool* /*pPool*/) const /************************************************************************* |* -|* SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, USHORT /*nVer*/) const +SfxPoolItem* XFillBackgroundItem::Create(SvStream& rIn, sal_uInt16 /*nVer*/) const { return new XFillBackgroundItem( rIn ); } diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index deb7e51a27..ec095f82eb 100644..100755 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -39,13 +39,13 @@ #include <editeng/memberids.hrc> #include <svx/dialogs.hrc> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/xdef.hxx> #include <svx/unomid.hxx> #include <editeng/unoprnms.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/svdmodel.hxx> #include <com/sun/star/beans/PropertyValue.hpp> @@ -67,7 +67,7 @@ XOBitmap::XOBitmap() : eType ( XBITMAP_NONE ), eStyle ( XBITMAP_STRETCH ), pPixelArray ( NULL ), - bGraphicDirty ( FALSE ) + bGraphicDirty ( sal_False ) { } @@ -82,7 +82,7 @@ XOBitmap::XOBitmap( const Bitmap& rBmp, XBitmapStyle eInStyle ) : eStyle ( eInStyle ), aGraphicObject ( rBmp ), pPixelArray ( NULL ), - bGraphicDirty ( FALSE ) + bGraphicDirty ( sal_False ) { } @@ -97,19 +97,19 @@ XOBitmap::XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eInStyle ) eStyle ( eInStyle ), aGraphicObject ( rGraphicObject ), pPixelArray ( NULL ), - bGraphicDirty ( FALSE ) + bGraphicDirty ( sal_False ) { } /************************************************************************* |* -|* XOBitmap::XOBitmap( USHORT* pArray, const Color& aPixelColor, +|* XOBitmap::XOBitmap( sal_uInt16* pArray, const Color& aPixelColor, |* const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ), |* XBitmapStyle eStyle = XBITMAP_TILE ) |* *************************************************************************/ -XOBitmap::XOBitmap( const USHORT* pArray, const Color& rPixelColor, +XOBitmap::XOBitmap( const sal_uInt16* pArray, const Color& rPixelColor, const Color& rBckgrColor, const Size& rSize, XBitmapStyle eInStyle ) : eStyle ( eInStyle ), @@ -117,15 +117,15 @@ XOBitmap::XOBitmap( const USHORT* pArray, const Color& rPixelColor, aArraySize ( rSize ), aPixelColor ( rPixelColor ), aBckgrColor ( rBckgrColor ), - bGraphicDirty ( TRUE ) + bGraphicDirty ( sal_True ) { if( aArraySize.Width() == 8 && aArraySize.Height() == 8 ) { eType = XBITMAP_8X8; - pPixelArray = new USHORT[ 64 ]; + pPixelArray = new sal_uInt16[ 64 ]; - for( USHORT i = 0; i < 64; i++ ) + for( sal_uInt16 i = 0; i < 64; i++ ) *( pPixelArray + i ) = *( pArray + i ); } else @@ -155,9 +155,9 @@ XOBitmap::XOBitmap( const XOBitmap& rXBmp ) : { if( eType == XBITMAP_8X8 ) { - pPixelArray = new USHORT[ 64 ]; + pPixelArray = new sal_uInt16[ 64 ]; - for( USHORT i = 0; i < 64; i++ ) + for( sal_uInt16 i = 0; i < 64; i++ ) *( pPixelArray + i ) = *( rXBmp.pPixelArray + i ); } } @@ -195,9 +195,9 @@ XOBitmap& XOBitmap::operator=( const XOBitmap& rXBmp ) { if( eType == XBITMAP_8X8 ) { - pPixelArray = new USHORT[ 64 ]; + pPixelArray = new sal_uInt16[ 64 ]; - for( USHORT i = 0; i < 64; i++ ) + for( sal_uInt16 i = 0; i < 64; i++ ) *( pPixelArray + i ) = *( rXBmp.pPixelArray + i ); } } @@ -220,40 +220,40 @@ int XOBitmap::operator==( const XOBitmap& rXOBitmap ) const aBckgrColor != rXOBitmap.aBckgrColor || bGraphicDirty != rXOBitmap.bGraphicDirty ) { - return( FALSE ); + return( sal_False ); } if( pPixelArray && rXOBitmap.pPixelArray ) { - USHORT nCount = (USHORT) ( aArraySize.Width() * aArraySize.Height() ); - for( USHORT i = 0; i < nCount; i++ ) + sal_uInt16 nCount = (sal_uInt16) ( aArraySize.Width() * aArraySize.Height() ); + for( sal_uInt16 i = 0; i < nCount; i++ ) { if( *( pPixelArray + i ) != *( rXOBitmap.pPixelArray + i ) ) - return( FALSE ); + return( sal_False ); } } - return( TRUE ); + return( sal_True ); } /************************************************************************* |* -|* void SetPixelArray( const USHORT* pArray ) +|* void SetPixelArray( const sal_uInt16* pArray ) |* *************************************************************************/ -void XOBitmap::SetPixelArray( const USHORT* pArray ) +void XOBitmap::SetPixelArray( const sal_uInt16* pArray ) { if( eType == XBITMAP_8X8 ) { if( pPixelArray ) delete []pPixelArray; - pPixelArray = new USHORT[ 64 ]; + pPixelArray = new sal_uInt16[ 64 ]; - for( USHORT i = 0; i < 64; i++ ) + for( sal_uInt16 i = 0; i < 64; i++ ) *( pPixelArray + i ) = *( pArray + i ); - bGraphicDirty = TRUE; + bGraphicDirty = sal_True; } else { @@ -298,12 +298,12 @@ const GraphicObject& XOBitmap::GetGraphicObject() const void XOBitmap::Bitmap2Array() { VirtualDevice aVD; - BOOL bPixelColor = FALSE; + sal_Bool bPixelColor = sal_False; const Bitmap aBitmap( GetBitmap() ); - const USHORT nLines = 8; // von Type abhaengig + const sal_uInt16 nLines = 8; // von Type abhaengig if( !pPixelArray ) - pPixelArray = new USHORT[ nLines * nLines ]; + pPixelArray = new sal_uInt16[ nLines * nLines ]; aVD.SetOutputSizePixel( aBitmap.GetSizePixel() ); aVD.DrawBitmap( Point(), aBitmap ); @@ -311,9 +311,9 @@ void XOBitmap::Bitmap2Array() // Aufbau des Arrays und Ermittlung der Vorder-, bzw. // Hintergrundfarbe - for( USHORT i = 0; i < nLines; i++ ) + for( sal_uInt16 i = 0; i < nLines; i++ ) { - for( USHORT j = 0; j < nLines; j++ ) + for( sal_uInt16 j = 0; j < nLines; j++ ) { if ( aVD.GetPixel( Point( j, i ) ) == aBckgrColor ) *( pPixelArray + j + i * nLines ) = 0; @@ -323,7 +323,7 @@ void XOBitmap::Bitmap2Array() if( !bPixelColor ) { aPixelColor = aVD.GetPixel( Point( j, i ) ); - bPixelColor = TRUE; + bPixelColor = sal_True; } } } @@ -342,7 +342,7 @@ void XOBitmap::Bitmap2Array() void XOBitmap::Array2Bitmap() { VirtualDevice aVD; - USHORT nLines = 8; // von Type abhaengig + sal_uInt16 nLines = 8; // von Type abhaengig if( !pPixelArray ) return; @@ -350,9 +350,9 @@ void XOBitmap::Array2Bitmap() aVD.SetOutputSizePixel( Size( nLines, nLines ) ); // Aufbau der Bitmap - for( USHORT i = 0; i < nLines; i++ ) + for( sal_uInt16 i = 0; i < nLines; i++ ) { - for( USHORT j = 0; j < nLines; j++ ) + for( sal_uInt16 j = 0; j < nLines; j++ ) { if( *( pPixelArray + j + i * nLines ) == 0 ) aVD.DrawPixel( Point( j, i ), aBckgrColor ); @@ -362,7 +362,7 @@ void XOBitmap::Array2Bitmap() } aGraphicObject = GraphicObject( aVD.GetBitmap( Point(), Size( nLines, nLines ) ) ); - bGraphicDirty = FALSE; + bGraphicDirty = sal_False; } // ----------------------- @@ -416,7 +416,7 @@ XFillBitmapItem::XFillBitmapItem(const XFillBitmapItem& rItem) : |* *************************************************************************/ -XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) : +XFillBitmapItem::XFillBitmapItem( SvStream& rIn, sal_uInt16 nVer ) : NameOrIndex( XATTR_FILLBITMAP, rIn ) { if( nVer == 0 ) @@ -445,7 +445,7 @@ XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) : { if (!IsIndex()) { - INT16 iTmp; + sal_Int16 iTmp; rIn >> iTmp; aXOBitmap.SetBitmapStyle( (XBitmapStyle) iTmp ); rIn >> iTmp; @@ -459,10 +459,10 @@ XFillBitmapItem::XFillBitmapItem( SvStream& rIn, USHORT nVer ) : } else if( aXOBitmap.GetBitmapType() == XBITMAP_8X8 ) { - USHORT* pArray = new USHORT[ 64 ]; + sal_uInt16* pArray = new sal_uInt16[ 64 ]; Color aColor; - for( USHORT i = 0; i < 64; i++ ) + for( sal_uInt16 i = 0; i < 64; i++ ) rIn >> *( pArray + i ); aXOBitmap.SetPixelArray( pArray ); @@ -520,11 +520,11 @@ int XFillBitmapItem::operator==(const SfxPoolItem& rItem) const /************************************************************************* |* -|* SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const +|* SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const |* *************************************************************************/ -SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const +SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, sal_uInt16 nVer) const { return new XFillBitmapItem( rIn, nVer ); } @@ -535,22 +535,22 @@ SfxPoolItem* XFillBitmapItem::Create(SvStream& rIn, USHORT nVer) const |* *************************************************************************/ -SvStream& XFillBitmapItem::Store( SvStream& rOut, USHORT nItemVersion ) const +SvStream& XFillBitmapItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const { NameOrIndex::Store( rOut, nItemVersion ); if (!IsIndex()) { - rOut << (INT16) aXOBitmap.GetBitmapStyle(); + rOut << (sal_Int16) aXOBitmap.GetBitmapStyle(); if( !aXOBitmap.GetBitmap() ) - rOut << (INT16) XBITMAP_NONE; + rOut << (sal_Int16) XBITMAP_NONE; else { - rOut << (INT16) aXOBitmap.GetBitmapType(); + rOut << (sal_Int16) aXOBitmap.GetBitmapType(); if( aXOBitmap.GetBitmapType() == XBITMAP_IMPORT ) { - const USHORT nOldComprMode = rOut.GetCompressMode(); - USHORT nNewComprMode = nOldComprMode; + const sal_uInt16 nOldComprMode = rOut.GetCompressMode(); + sal_uInt16 nNewComprMode = nOldComprMode; if( rOut.GetVersion() >= SOFFICE_FILEFORMAT_50 ) nNewComprMode |= COMPRESSMODE_ZBITMAP; @@ -563,9 +563,9 @@ SvStream& XFillBitmapItem::Store( SvStream& rOut, USHORT nItemVersion ) const } else if( aXOBitmap.GetBitmapType() == XBITMAP_8X8 ) { - USHORT* pArray = aXOBitmap.GetPixelArray(); - for( USHORT i = 0; i < 64; i++ ) - rOut << (USHORT) *( pArray + i ); + sal_uInt16* pArray = aXOBitmap.GetPixelArray(); + for( sal_uInt16 i = 0; i < 64; i++ ) + rOut << (sal_uInt16) *( pArray + i ); rOut << aXOBitmap.GetPixelColor(); rOut << aXOBitmap.GetBackgroundColor(); @@ -593,11 +593,11 @@ const XOBitmap& XFillBitmapItem::GetBitmapValue(const XBitmapTable* pTable) cons /************************************************************************* |* -|* USHORT XFillBitmapItem::GetVersion() const +|* sal_uInt16 XFillBitmapItem::GetVersion() const |* *************************************************************************/ -USHORT XFillBitmapItem::GetVersion( USHORT /*nFileFormatVersion*/) const +sal_uInt16 XFillBitmapItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/) const { // 2. Version return( 1 ); @@ -629,7 +629,7 @@ SfxItemPresentation XFillBitmapItem::GetPresentation //------------------------------------------------------------------------ -bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) const +bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -695,7 +695,7 @@ bool XFillBitmapItem::QueryValue( ::com::sun::star::uno::Any& rVal, BYTE nMember //------------------------------------------------------------------------ -bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMemberId ) +bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { // sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS); nMemberId &= ~CONVERT_TWIPS; @@ -778,7 +778,7 @@ bool XFillBitmapItem::PutValue( const ::com::sun::star::uno::Any& rVal, BYTE nMe return (bSetName || bSetURL || bSetBitmap); } -BOOL XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) +sal_Bool XFillBitmapItem::CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 ) { return ((XFillBitmapItem*)p1)->GetBitmapValue().GetGraphicObject().GetUniqueID() == ((XFillBitmapItem*)p2)->GetBitmapValue().GetGraphicObject().GetUniqueID(); diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx index 5335967f37..b7d3766a9e 100644..100755 --- a/svx/source/xoutdev/xexch.cxx +++ b/svx/source/xoutdev/xexch.cxx @@ -40,7 +40,7 @@ #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <svx/xdef.hxx> -#include "xexch.hxx" +#include "svx/xexch.hxx" TYPEINIT1_AUTOFACTORY( XFillExchangeData, SvDataCopyStream ); @@ -85,7 +85,7 @@ XFillExchangeData::~XFillExchangeData() |* |* *************************************************************************/ -ULONG XFillExchangeData::RegisterClipboardFormatName() +sal_uIntPtr XFillExchangeData::RegisterClipboardFormatName() { return( SOT_FORMATSTR_ID_XFA ); } @@ -101,7 +101,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData ) if( rData.pXFillAttrSetItem ) { SfxWhichIter aIter( rData.pXFillAttrSetItem->GetItemSet() ); - USHORT nWhich = aIter.FirstWhich(); + sal_uInt16 nWhich = aIter.FirstWhich(); const SfxPoolItem* pItem; sal_uInt32 nItemCount = 0; sal_Size nFirstPos = rOStm.Tell(); @@ -110,10 +110,10 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData ) while( nWhich ) { - if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, FALSE, &pItem ) ) + if( SFX_ITEM_SET == rData.pXFillAttrSetItem->GetItemSet().GetItemState( nWhich, sal_False, &pItem ) ) { VersionCompat aCompat( rOStm, STREAM_WRITE ); - const USHORT nItemVersion2 = pItem->GetVersion( (USHORT) rOStm.GetVersion() ); + const sal_uInt16 nItemVersion2 = pItem->GetVersion( (sal_uInt16) rOStm.GetVersion() ); rOStm << nWhich << nItemVersion2; pItem->Store( rOStm, nItemVersion2 ); @@ -124,7 +124,7 @@ SvStream& operator<<( SvStream& rOStm, const XFillExchangeData& rData ) nWhich = aIter.NextWhich(); } - const ULONG nLastPos = rOStm.Tell(); + const sal_uIntPtr nLastPos = rOStm.Tell(); rOStm.Seek( nFirstPos ); rOStm << nItemCount; rOStm.Seek( nLastPos ); @@ -147,7 +147,7 @@ SvStream& operator>>( SvStream& rIStm, XFillExchangeData& rData ) SfxItemSet* pSet = new SfxItemSet ( *rData.pPool, XATTR_FILL_FIRST, XATTR_FILL_LAST ); SfxPoolItem* pNewItem; sal_uInt32 nItemCount = 0; - USHORT nWhich, nItemVersion; + sal_uInt16 nWhich, nItemVersion; rIStm >> nItemCount; diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index 36abdb07cf..e46545ed46 100644..100755 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <svx/xtable.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xpool.hxx> #include <svx/svdattr.hxx> #include <svx/svxids.hrc> @@ -53,8 +53,8 @@ XOutdevItemPool::XOutdevItemPool( const XubString aNullStr; const Bitmap aNullBmp; const basegfx::B2DPolyPolygon aNullPol; - const Color aNullLineCol(RGB_Color(COL_BLACK)); - const Color aNullFillCol(RGB_Color(COL_DEFAULT_SHAPE_FILLING)); // "Blue 8" + const Color aNullLineCol(RGB_Color(COL_DEFAULT_SHAPE_STROKE)); + const Color aNullFillCol(RGB_Color(COL_DEFAULT_SHAPE_FILLING)); const Color aNullShadowCol(RGB_Color(COL_LIGHTGRAY)); const XDash aNullDash; const XGradient aNullGrad(aNullLineCol, RGB_Color(COL_WHITE)); @@ -109,7 +109,7 @@ XOutdevItemPool::XOutdevItemPool( mppLocalPoolDefaults[XATTR_FILLBMP_STRETCH -XATTR_START] = new XFillBmpStretchItem; mppLocalPoolDefaults[XATTR_FILLBMP_POSOFFSETX -XATTR_START] = new XFillBmpPosOffsetXItem; mppLocalPoolDefaults[XATTR_FILLBMP_POSOFFSETY -XATTR_START] = new XFillBmpPosOffsetYItem; - mppLocalPoolDefaults[XATTR_FILLFLOATTRANSPARENCE -XATTR_START] = new XFillFloatTransparenceItem( this, aNullGrad, FALSE ); + mppLocalPoolDefaults[XATTR_FILLFLOATTRANSPARENCE -XATTR_START] = new XFillFloatTransparenceItem( this, aNullGrad, sal_False ); mppLocalPoolDefaults[XATTR_SECONDARYFILLCOLOR -XATTR_START] = new XSecondaryFillColorItem(aNullStr, aNullFillCol); mppLocalPoolDefaults[XATTR_FILLBACKGROUND -XATTR_START] = new XFillBackgroundItem; mppLocalPoolDefaults[XATTR_FORMTXTSTYLE -XATTR_START] = new XFormTextStyleItem; @@ -179,12 +179,12 @@ XOutdevItemPool::XOutdevItemPool( /************************************************************************* |* |* copy ctor, sorgt dafuer, dass die static defaults gecloned werden -|* (Parameter 2 = TRUE) +|* (Parameter 2 = sal_True) |* \************************************************************************/ XOutdevItemPool::XOutdevItemPool(const XOutdevItemPool& rPool) -: SfxItemPool(rPool, TRUE), +: SfxItemPool(rPool, sal_True), mppLocalPoolDefaults(0L), mpLocalItemInfos(0L) { diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx index 74bfe67664..faa8387e38 100644..100755 --- a/svx/source/xoutdev/xtabbtmp.cxx +++ b/svx/source/xoutdev/xtabbtmp.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include "xmlxtexp.hxx" @@ -70,7 +70,7 @@ static char const aChckXML[] = { 'P', 'K', 0x03, 0x04 }; // = 6.0 XBitmapTable::XBitmapTable( const String& rPath, XOutdevItemPool* pInPool, - USHORT nInitSize, USHORT nReSize ) : + sal_uInt16 nInitSize, sal_uInt16 nReSize ) : XPropertyTable( rPath, pInPool, nInitSize, nReSize) { pBmpTable = new Table( nInitSize, nReSize ); @@ -105,35 +105,35 @@ XBitmapEntry* XBitmapTable::GetBitmap(long nIndex) const /************************************************************************/ -BOOL XBitmapTable::Load() +sal_Bool XBitmapTable::Load() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XBitmapTable::Save() +sal_Bool XBitmapTable::Save() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XBitmapTable::Create() +sal_Bool XBitmapTable::Create() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XBitmapTable::CreateBitmapsForUI() +sal_Bool XBitmapTable::CreateBitmapsForUI() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/) +Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/) { return( NULL ); } @@ -150,7 +150,7 @@ Bitmap* XBitmapTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/) XBitmapList::XBitmapList( const String& rPath, XOutdevItemPool* pInPool, - USHORT nInitSize, USHORT nReSize ) : + sal_uInt16 nInitSize, sal_uInt16 nReSize ) : XPropertyList( rPath, pInPool, nInitSize, nReSize) { // pBmpList = new List( nInitSize, nReSize ); @@ -185,18 +185,18 @@ XBitmapEntry* XBitmapList::GetBitmap(long nIndex) const /************************************************************************/ -BOOL XBitmapList::Load() +sal_Bool XBitmapList::Load() { if( bListDirty ) { - bListDirty = FALSE; + bListDirty = sal_False; INetURLObject aURL( aPath ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) { DBG_ASSERT( !aPath.Len(), "invalid URL" ); - return FALSE; + return sal_False; } aURL.Append( aName ); @@ -207,19 +207,19 @@ BOOL XBitmapList::Load() uno::Reference< container::XNameContainer > xTable( SvxUnoXBitmapTable_createInstance( this ), uno::UNO_QUERY ); return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable ); } - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XBitmapList::Save() +sal_Bool XBitmapList::Save() { INetURLObject aURL( aPath ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) { DBG_ASSERT( !aPath.Len(), "invalid URL" ); - return FALSE; + return sal_False; } aURL.Append( aName ); @@ -234,7 +234,7 @@ BOOL XBitmapList::Save() /************************************************************************/ // Umgestellt am 27.07.95 auf XBitmap -BOOL XBitmapList::Create() +sal_Bool XBitmapList::Create() { // Array der Bitmap //----------------------- @@ -250,7 +250,7 @@ BOOL XBitmapList::Create() String aStr( SVX_RES( RID_SVXSTR_BITMAP ) ); Color aColWhite( RGB_Color( COL_WHITE ) ); xub_StrLen nLen; - USHORT aArray[64]; + sal_uInt16 aArray[64]; memset( aArray, 0, sizeof( aArray ) ); aStr.AppendAscii(" 1"); @@ -272,19 +272,19 @@ BOOL XBitmapList::Create() aStr.SetChar(nLen, sal_Unicode('4')); Insert( new XBitmapEntry( XOBitmap( aArray, RGB_Color( COL_LIGHTBLUE ), aColWhite ), aStr ) ); - return( TRUE ); + return( sal_True ); } /************************************************************************/ -BOOL XBitmapList::CreateBitmapsForUI() +sal_Bool XBitmapList::CreateBitmapsForUI() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -Bitmap* XBitmapList::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/) +Bitmap* XBitmapList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/) { return( NULL ); } diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index 405537bfdc..4f3de11c1a 100644..100755 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include <unotools/pathoptions.hxx> @@ -71,7 +71,7 @@ static XColorTable* pTable=0; XColorTable::XColorTable( const String& rPath, XOutdevItemPool* pInPool, - USHORT nInitSize, USHORT nReSize ) : + sal_uInt16 nInitSize, sal_uInt16 nReSize ) : XPropertyTable( rPath, pInPool, nInitSize, nReSize) { // ColorTable braucht keine eigene BmpTable @@ -114,18 +114,18 @@ XColorEntry* XColorTable::GetColor(long nIndex) const /************************************************************************/ -BOOL XColorTable::Load() +sal_Bool XColorTable::Load() { if( bTableDirty ) { - bTableDirty = FALSE; + bTableDirty = sal_False; INetURLObject aURL( aPath ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) { DBG_ASSERT( !aPath.Len(), "invalid URL" ); - return FALSE; + return sal_False; } aURL.Append( aName ); @@ -136,19 +136,19 @@ BOOL XColorTable::Load() uno::Reference< container::XNameContainer > xTable( SvxUnoXColorTable_createInstance( this ), uno::UNO_QUERY ); return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable ); } - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XColorTable::Save() +sal_Bool XColorTable::Save() { INetURLObject aURL( aPath ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) { DBG_ASSERT( !aPath.Len(), "invalid URL" ); - return FALSE; + return sal_False; } aURL.Append( aName ); @@ -162,13 +162,13 @@ BOOL XColorTable::Save() /************************************************************************/ -BOOL XColorTable::Create() +sal_Bool XColorTable::Create() { XubString aStr; xub_StrLen nLen; ResMgr& rRes = DIALOG_MGR(); - static USHORT const aResId[] = + static sal_uInt16 aResId[] = { RID_SVXSTR_BLACK, RID_SVXSTR_BLUE, @@ -217,7 +217,7 @@ BOOL XColorTable::Create() COL_WHITE }; - for( USHORT n = 0; n < 16; ++n ) + for( sal_uInt16 n = 0; n < 16; ++n ) { Insert( n, new XColorEntry( Color( aColTab[n] ), String( ResId( aResId[ n ], rRes )) ) ); @@ -451,14 +451,14 @@ BOOL XColorTable::Create() /************************************************************************/ -BOOL XColorTable::CreateBitmapsForUI() +sal_Bool XColorTable::CreateBitmapsForUI() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/) +Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/) { return( NULL ); } @@ -475,7 +475,7 @@ Bitmap* XColorTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/) XColorList::XColorList( const String& rPath, XOutdevItemPool* pInPool, - USHORT nInitSize, USHORT nReSize ) : + sal_uInt16 nInitSize, sal_uInt16 nReSize ) : XPropertyList( rPath, pInPool, nInitSize, nReSize) { // pBmpList = new List( nInitSize, nReSize ); @@ -510,35 +510,35 @@ XColorEntry* XColorList::GetColor(long nIndex) const /************************************************************************/ -BOOL XColorList::Load() +sal_Bool XColorList::Load() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XColorList::Save() +sal_Bool XColorList::Save() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XColorList::Create() +sal_Bool XColorList::Create() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XColorList::CreateBitmapsForUI() +sal_Bool XColorList::CreateBitmapsForUI() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/) +Bitmap* XColorList::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/) { return( NULL ); } diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index ca49221221..4c3fc973b0 100644..100755 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include "xmlxtexp.hxx" @@ -85,7 +85,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0 XDashTable::XDashTable( const String& rPath, XOutdevItemPool* pInPool, - USHORT nInitSize, USHORT nReSize ) : + sal_uInt16 nInitSize, sal_uInt16 nReSize ) : XPropertyTable( rPath, pInPool, nInitSize, nReSize) { pBmpTable = new Table( nInitSize, nReSize ); @@ -120,35 +120,35 @@ XDashEntry* XDashTable::GetDash(long nIndex) const /************************************************************************/ -BOOL XDashTable::Load() +sal_Bool XDashTable::Load() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XDashTable::Save() +sal_Bool XDashTable::Save() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XDashTable::Create() +sal_Bool XDashTable::Create() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XDashTable::CreateBitmapsForUI() +sal_Bool XDashTable::CreateBitmapsForUI() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/) +Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/) { return( NULL ); } @@ -267,18 +267,18 @@ XDashEntry* XDashList::GetDash(long nIndex) const return (XDashEntry*) XPropertyList::Get(nIndex, 0); } -BOOL XDashList::Load() +sal_Bool XDashList::Load() { if( bListDirty ) { - bListDirty = FALSE; + bListDirty = sal_False; INetURLObject aURL( aPath ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) { DBG_ASSERT( !aPath.Len(), "invalid URL" ); - return FALSE; + return sal_False; } aURL.Append( aName ); @@ -289,17 +289,17 @@ BOOL XDashList::Load() uno::Reference< container::XNameContainer > xTable( SvxUnoXDashTable_createInstance( this ), uno::UNO_QUERY ); return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable ); } - return( FALSE ); + return( sal_False ); } -BOOL XDashList::Save() +sal_Bool XDashList::Save() { INetURLObject aURL( aPath ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) { DBG_ASSERT( !aPath.Len(), "invalid URL" ); - return FALSE; + return sal_False; } aURL.Append( aName ); @@ -311,7 +311,7 @@ BOOL XDashList::Save() return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable ); } -BOOL XDashList::Create() +sal_Bool XDashList::Create() { XubString aStr( SVX_RES( RID_SVXSTR_LINESTYLE ) ); xub_StrLen nLen; @@ -324,16 +324,16 @@ BOOL XDashList::Create() aStr.SetChar(nLen, sal_Unicode('3')); Insert(new XDashEntry(XDash(XDASH_RECT,2, 50,3,250,120),aStr)); - return( TRUE ); + return( sal_True ); } -BOOL XDashList::CreateBitmapsForUI() +sal_Bool XDashList::CreateBitmapsForUI() { impCreate(); for( long i = 0; i < Count(); i++) { - Bitmap* pBmp = CreateBitmapForUI( i, FALSE ); + Bitmap* pBmp = CreateBitmapForUI( i, sal_False ); DBG_ASSERT( pBmp, "XDashList: Bitmap(UI) konnte nicht erzeugt werden!" ); if( pBmp ) @@ -342,10 +342,10 @@ BOOL XDashList::CreateBitmapsForUI() impDestroy(); - return( TRUE ); + return( sal_True ); } -Bitmap* XDashList::CreateBitmapForUI( long nIndex, BOOL bDelete ) +Bitmap* XDashList::CreateBitmapForUI( long nIndex, sal_Bool bDelete ) { impCreate(); VirtualDevice* pVD = mpData->getVirtualDevice(); diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index 6b2e92ac12..030b17004c 100644..100755 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include "xmlxtexp.hxx" @@ -81,7 +81,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0 XGradientTable::XGradientTable( const String& rPath, XOutdevItemPool* pInPool, - USHORT nInitSize, USHORT nReSize ) : + sal_uInt16 nInitSize, sal_uInt16 nReSize ) : XPropertyTable( rPath, pInPool, nInitSize, nReSize) { pBmpTable = new Table( nInitSize, nReSize ); @@ -116,35 +116,35 @@ XGradientEntry* XGradientTable::GetGradient(long nIndex) const /************************************************************************/ -BOOL XGradientTable::Load() +sal_Bool XGradientTable::Load() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XGradientTable::Save() +sal_Bool XGradientTable::Save() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XGradientTable::Create() +sal_Bool XGradientTable::Create() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XGradientTable::CreateBitmapsForUI() +sal_Bool XGradientTable::CreateBitmapsForUI() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/) +Bitmap* XGradientTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/) { return( NULL ); } @@ -253,18 +253,18 @@ XGradientEntry* XGradientList::GetGradient(long nIndex) const return( (XGradientEntry*) XPropertyList::Get( nIndex, 0 ) ); } -BOOL XGradientList::Load() +sal_Bool XGradientList::Load() { if( bListDirty ) { - bListDirty = FALSE; + bListDirty = sal_False; INetURLObject aURL( aPath ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) { DBG_ASSERT( !aPath.Len(), "invalid URL" ); - return FALSE; + return sal_False; } aURL.Append( aName ); @@ -276,17 +276,17 @@ BOOL XGradientList::Load() return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable ); } - return( FALSE ); + return( sal_False ); } -BOOL XGradientList::Save() +sal_Bool XGradientList::Save() { INetURLObject aURL( aPath ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) { DBG_ASSERT( !aPath.Len(), "invalid URL" ); - return FALSE; + return sal_False; } aURL.Append( aName ); @@ -298,7 +298,7 @@ BOOL XGradientList::Save() return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable ); } -BOOL XGradientList::Create() +sal_Bool XGradientList::Create() { XubString aStr( SVX_RES( RID_SVXSTR_GRADIENT ) ); xub_StrLen nLen; @@ -317,16 +317,16 @@ BOOL XGradientList::Create() aStr.SetChar(nLen, sal_Unicode('6')); Insert(new XGradientEntry(XGradient(RGB_Color(COL_MAGENTA),RGB_Color(COL_YELLOW ),XGRAD_RECT , 1900,60,60,50,100,100),aStr)); - return( TRUE ); + return( sal_True ); } -BOOL XGradientList::CreateBitmapsForUI() +sal_Bool XGradientList::CreateBitmapsForUI() { impCreate(); for( long i = 0; i < Count(); i++) { - Bitmap* pBmp = CreateBitmapForUI( i, FALSE ); + Bitmap* pBmp = CreateBitmapForUI( i, sal_False ); DBG_ASSERT( pBmp, "XGradientList: Bitmap(UI) konnte nicht erzeugt werden!" ); if( pBmp ) @@ -335,10 +335,10 @@ BOOL XGradientList::CreateBitmapsForUI() impDestroy(); - return( FALSE ); + return( sal_False ); } -Bitmap* XGradientList::CreateBitmapForUI( long nIndex, BOOL bDelete ) +Bitmap* XGradientList::CreateBitmapForUI( long nIndex, sal_Bool bDelete ) { impCreate(); VirtualDevice* pVD = mpData->getVirtualDevice(); diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index ef3efea767..569d15972d 100644..100755 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include <vcl/svapp.hxx> @@ -47,7 +47,7 @@ #include <svx/dialmgr.hxx> #include <svx/xtable.hxx> #include <svx/xpool.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/xflhtit.hxx> #include <svx/xflclit.hxx> #include <svx/xfillit0.hxx> @@ -79,7 +79,7 @@ char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0 XHatchTable::XHatchTable( const String& rPath, XOutdevItemPool* pInPool, - USHORT nInitSize, USHORT nReSize ) : + sal_uInt16 nInitSize, sal_uInt16 nReSize ) : XPropertyTable( rPath, pInPool, nInitSize, nReSize) { pBmpTable = new Table( nInitSize, nReSize ); @@ -114,35 +114,35 @@ XHatchEntry* XHatchTable::GetHatch(long nIndex) const /************************************************************************/ -BOOL XHatchTable::Load() +sal_Bool XHatchTable::Load() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XHatchTable::Save() +sal_Bool XHatchTable::Save() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XHatchTable::Create() +sal_Bool XHatchTable::Create() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XHatchTable::CreateBitmapsForUI() +sal_Bool XHatchTable::CreateBitmapsForUI() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/) +Bitmap* XHatchTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/) { return( NULL ); } @@ -261,18 +261,18 @@ XHatchEntry* XHatchList::GetHatch(long nIndex) const return (XHatchEntry*) XPropertyList::Get(nIndex, 0); } -BOOL XHatchList::Load() +sal_Bool XHatchList::Load() { if( bListDirty ) { - bListDirty = FALSE; + bListDirty = sal_False; INetURLObject aURL( aPath ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) { DBG_ASSERT( !aPath.Len(), "invalid URL" ); - return FALSE; + return sal_False; } aURL.Append( aName ); @@ -283,17 +283,17 @@ BOOL XHatchList::Load() uno::Reference< container::XNameContainer > xTable( SvxUnoXHatchTable_createInstance( this ), uno::UNO_QUERY ); return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable ); } - return( FALSE ); + return( sal_False ); } -BOOL XHatchList::Save() +sal_Bool XHatchList::Save() { INetURLObject aURL( aPath ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) { DBG_ASSERT( !aPath.Len(), "invalid URL" ); - return FALSE; + return sal_False; } aURL.Append( aName ); @@ -305,7 +305,7 @@ BOOL XHatchList::Save() return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable ); } -BOOL XHatchList::Create() +sal_Bool XHatchList::Create() { XubString aStr( SVX_RES( RID_SVXSTR_HATCH ) ); xub_StrLen nLen; @@ -318,16 +318,16 @@ BOOL XHatchList::Create() aStr.SetChar(nLen, sal_Unicode('3')); Insert(new XHatchEntry(XHatch(RGB_Color(COL_BLUE ),XHATCH_TRIPLE,120, 0),aStr)); - return( TRUE ); + return( sal_True ); } -BOOL XHatchList::CreateBitmapsForUI() +sal_Bool XHatchList::CreateBitmapsForUI() { impCreate(); for( long i = 0; i < Count(); i++) { - Bitmap* pBmp = CreateBitmapForUI( i, FALSE ); + Bitmap* pBmp = CreateBitmapForUI( i, sal_False ); DBG_ASSERT( pBmp, "XHatchList: Bitmap(UI) konnte nicht erzeugt werden!" ); if( pBmp ) @@ -336,10 +336,10 @@ BOOL XHatchList::CreateBitmapsForUI() impDestroy(); - return( TRUE ); + return( sal_True ); } -Bitmap* XHatchList::CreateBitmapForUI( long nIndex, BOOL bDelete ) +Bitmap* XHatchList::CreateBitmapForUI( long nIndex, sal_Bool bDelete ) { impCreate(); VirtualDevice* pVD = mpData->getVirtualDevice(); diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx index 9feadc9e44..18b46663d4 100644..100755 --- a/svx/source/xoutdev/xtable.cxx +++ b/svx/source/xoutdev/xtable.cxx @@ -58,19 +58,19 @@ Color RGB_Color( ColorData nColorName ) XPropertyTable::XPropertyTable( const String& rPath, XOutdevItemPool* pInPool, - USHORT nInitSize, USHORT nReSize ) : + sal_uInt16 nInitSize, sal_uInt16 nReSize ) : aName ( pszStandard, 8 ), aPath ( rPath ), pXPool ( pInPool ), aTable ( nInitSize, nReSize ), pBmpTable ( NULL ), - bTableDirty ( TRUE ), - bBitmapsDirty ( TRUE ), - bOwnPool ( FALSE ) + bTableDirty ( sal_True ), + bBitmapsDirty ( sal_True ), + bOwnPool ( sal_False ) { if( !pXPool ) { - bOwnPool = TRUE; + bOwnPool = sal_True; pXPool = new XOutdevItemPool; DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" ); } @@ -97,7 +97,7 @@ XPropertyTable::~XPropertyTable() { XPropertyEntry* pEntry = (XPropertyEntry*)aTable.First(); Bitmap* pBitmap = NULL; - for (ULONG nIndex = 0; nIndex < aTable.Count(); nIndex++) + for (sal_uIntPtr nIndex = 0; nIndex < aTable.Count(); nIndex++) { delete pEntry; pEntry = (XPropertyEntry*)aTable.Next(); @@ -107,7 +107,7 @@ XPropertyTable::~XPropertyTable() { pBitmap = (Bitmap*) pBmpTable->First(); - for( ULONG nIndex = 0; nIndex < pBmpTable->Count(); nIndex++ ) + for( sal_uIntPtr nIndex = 0; nIndex < pBmpTable->Count(); nIndex++ ) { delete pBitmap; pBitmap = (Bitmap*) pBmpTable->Next(); @@ -141,7 +141,7 @@ long XPropertyTable::Count() const { if( bTableDirty ) { - // ( (XPropertyTable*) this )->bTableDirty = FALSE; <- im Load() + // ( (XPropertyTable*) this )->bTableDirty = sal_False; <- im Load() if( !( (XPropertyTable*) this )->Load() ) ( (XPropertyTable*) this )->Create(); } @@ -154,15 +154,15 @@ long XPropertyTable::Count() const |* *************************************************************************/ -XPropertyEntry* XPropertyTable::Get( long nIndex, USHORT /*nDummy*/) const +XPropertyEntry* XPropertyTable::Get( long nIndex, sal_uInt16 /*nDummy*/) const { if( bTableDirty ) { - // ( (XPropertyTable*) this )->bTableDirty = FALSE; <- im Load() + // ( (XPropertyTable*) this )->bTableDirty = sal_False; <- im Load() if( !( (XPropertyTable*) this )->Load() ) ( (XPropertyTable*) this )->Create(); } - return (XPropertyEntry*) aTable.GetObject( (ULONG) nIndex ); + return (XPropertyEntry*) aTable.GetObject( (sal_uIntPtr) nIndex ); } /************************************************************************* @@ -175,7 +175,7 @@ long XPropertyTable::Get(const XubString& rName) { if( bTableDirty ) { - // bTableDirty = FALSE; + // bTableDirty = sal_False; if( !Load() ) Create(); } @@ -202,12 +202,12 @@ Bitmap* XPropertyTable::GetBitmap( long nIndex ) const { if( bBitmapsDirty ) { - ( (XPropertyTable*) this )->bBitmapsDirty = FALSE; + ( (XPropertyTable*) this )->bBitmapsDirty = sal_False; ( (XPropertyTable*) this )->CreateBitmapsForUI(); } - if( pBmpTable->Count() >= (ULONG) nIndex ) - return (Bitmap*) pBmpTable->GetObject( (ULONG) nIndex ); + if( pBmpTable->Count() >= (sal_uIntPtr) nIndex ) + return (Bitmap*) pBmpTable->GetObject( (sal_uIntPtr) nIndex ); } return( NULL ); } @@ -218,14 +218,14 @@ Bitmap* XPropertyTable::GetBitmap( long nIndex ) const |* *************************************************************************/ -BOOL XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry ) +sal_Bool XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry ) { - BOOL bReturn = aTable.Insert( (ULONG) nIndex, pEntry ); + sal_Bool bReturn = aTable.Insert( (sal_uIntPtr) nIndex, pEntry ); if( pBmpTable && !bBitmapsDirty ) { - Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex ); - pBmpTable->Insert( (ULONG) nIndex, pBmp ); + Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex ); + pBmpTable->Insert( (sal_uIntPtr) nIndex, pBmp ); } return bReturn; } @@ -238,12 +238,12 @@ BOOL XPropertyTable::Insert( long nIndex, XPropertyEntry* pEntry ) XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry ) { - XPropertyEntry* pOldEntry = (XPropertyEntry*) aTable.Replace( (ULONG) nIndex, pEntry ); + XPropertyEntry* pOldEntry = (XPropertyEntry*) aTable.Replace( (sal_uIntPtr) nIndex, pEntry ); if( pBmpTable && !bBitmapsDirty ) { - Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex ); - Bitmap* pOldBmp = (Bitmap*) pBmpTable->Replace( (ULONG) nIndex, pBmp ); + Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex ); + Bitmap* pOldBmp = (Bitmap*) pBmpTable->Replace( (sal_uIntPtr) nIndex, pBmp ); if( pOldBmp ) delete pOldBmp; } @@ -256,15 +256,15 @@ XPropertyEntry* XPropertyTable::Replace( long nIndex, XPropertyEntry* pEntry ) |* *************************************************************************/ -XPropertyEntry* XPropertyTable::Remove( long nIndex, USHORT /*nDummy*/) +XPropertyEntry* XPropertyTable::Remove( long nIndex, sal_uInt16 /*nDummy*/) { if( pBmpTable && !bBitmapsDirty ) { - Bitmap* pOldBmp = (Bitmap*) pBmpTable->Remove( (ULONG) nIndex ); + Bitmap* pOldBmp = (Bitmap*) pBmpTable->Remove( (sal_uIntPtr) nIndex ); if( pOldBmp ) delete pOldBmp; } - return (XPropertyEntry*) aTable.Remove((ULONG)nIndex); + return (XPropertyEntry*) aTable.Remove((sal_uIntPtr)nIndex); } /************************************************************************/ @@ -290,19 +290,19 @@ void XPropertyTable::SetName( const String& rString ) XPropertyList::XPropertyList( const String& rPath, XOutdevItemPool* pInPool, - USHORT nInitSize, USHORT nReSize ) : + sal_uInt16 nInitSize, sal_uInt16 nReSize ) : aName ( pszStandard, 8 ), aPath ( rPath ), pXPool ( pInPool ), aList ( nInitSize, nReSize ), pBmpList ( NULL ), - bListDirty ( TRUE ), - bBitmapsDirty ( TRUE ), - bOwnPool ( FALSE ) + bListDirty ( sal_True ), + bBitmapsDirty ( sal_True ), + bOwnPool ( sal_False ) { if( !pXPool ) { - bOwnPool = TRUE; + bOwnPool = sal_True; pXPool = new XOutdevItemPool; DBG_ASSERT( pXPool, "XOutPool konnte nicht erzeugt werden!" ); } @@ -329,7 +329,7 @@ XPropertyList::~XPropertyList() { XPropertyEntry* pEntry = (XPropertyEntry*)aList.First(); Bitmap* pBitmap = NULL; - for( ULONG nIndex = 0; nIndex < aList.Count(); nIndex++ ) + for( sal_uIntPtr nIndex = 0; nIndex < aList.Count(); nIndex++ ) { delete pEntry; pEntry = (XPropertyEntry*)aList.Next(); @@ -339,7 +339,7 @@ XPropertyList::~XPropertyList() { pBitmap = (Bitmap*) pBmpList->First(); - for( ULONG nIndex = 0; nIndex < pBmpList->Count(); nIndex++ ) + for( sal_uIntPtr nIndex = 0; nIndex < pBmpList->Count(); nIndex++ ) { delete pBitmap; pBitmap = (Bitmap*) pBmpList->Next(); @@ -373,7 +373,7 @@ long XPropertyList::Count() const { if( bListDirty ) { - // ( (XPropertyList*) this )->bListDirty = FALSE; <- im Load() + // ( (XPropertyList*) this )->bListDirty = sal_False; <- im Load() if( !( (XPropertyList*) this )->Load() ) ( (XPropertyList*) this )->Create(); } @@ -386,15 +386,15 @@ long XPropertyList::Count() const |* *************************************************************************/ -XPropertyEntry* XPropertyList::Get( long nIndex, USHORT /*nDummy*/) const +XPropertyEntry* XPropertyList::Get( long nIndex, sal_uInt16 /*nDummy*/) const { if( bListDirty ) { - // ( (XPropertyList*) this )->bListDirty = FALSE; <- im Load() + // ( (XPropertyList*) this )->bListDirty = sal_False; <- im Load() if( !( (XPropertyList*) this )->Load() ) ( (XPropertyList*) this )->Create(); } - return (XPropertyEntry*) aList.GetObject( (ULONG) nIndex ); + return (XPropertyEntry*) aList.GetObject( (sal_uIntPtr) nIndex ); } /************************************************************************* @@ -407,7 +407,7 @@ long XPropertyList::Get(const XubString& rName) { if( bListDirty ) { - //bListDirty = FALSE; + //bListDirty = sal_False; if( !Load() ) Create(); } @@ -434,11 +434,11 @@ Bitmap* XPropertyList::GetBitmap( long nIndex ) const { if( bBitmapsDirty ) { - ( (XPropertyList*) this )->bBitmapsDirty = FALSE; + ( (XPropertyList*) this )->bBitmapsDirty = sal_False; ( (XPropertyList*) this )->CreateBitmapsForUI(); } - if( pBmpList->Count() >= (ULONG) nIndex ) - return (Bitmap*) pBmpList->GetObject( (ULONG) nIndex ); + if( pBmpList->Count() >= (sal_uIntPtr) nIndex ) + return (Bitmap*) pBmpList->GetObject( (sal_uIntPtr) nIndex ); } return( NULL ); } @@ -451,13 +451,13 @@ Bitmap* XPropertyList::GetBitmap( long nIndex ) const void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex ) { - aList.Insert( pEntry, (ULONG) nIndex ); + aList.Insert( pEntry, (sal_uIntPtr) nIndex ); if( pBmpList && !bBitmapsDirty ) { Bitmap* pBmp = CreateBitmapForUI( - (ULONG) nIndex < aList.Count() ? nIndex : aList.Count() - 1 ); - pBmpList->Insert( pBmp, (ULONG) nIndex ); + (sal_uIntPtr) nIndex < aList.Count() ? nIndex : aList.Count() - 1 ); + pBmpList->Insert( pBmp, (sal_uIntPtr) nIndex ); } } @@ -469,12 +469,12 @@ void XPropertyList::Insert( XPropertyEntry* pEntry, long nIndex ) XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex ) { - XPropertyEntry* pOldEntry = (XPropertyEntry*) aList.Replace( pEntry, (ULONG) nIndex ); + XPropertyEntry* pOldEntry = (XPropertyEntry*) aList.Replace( pEntry, (sal_uIntPtr) nIndex ); if( pBmpList && !bBitmapsDirty ) { - Bitmap* pBmp = CreateBitmapForUI( (ULONG) nIndex ); - Bitmap* pOldBmp = (Bitmap*) pBmpList->Replace( pBmp, (ULONG) nIndex ); + Bitmap* pBmp = CreateBitmapForUI( (sal_uIntPtr) nIndex ); + Bitmap* pOldBmp = (Bitmap*) pBmpList->Replace( pBmp, (sal_uIntPtr) nIndex ); if( pOldBmp ) delete pOldBmp; } @@ -487,15 +487,15 @@ XPropertyEntry* XPropertyList::Replace( XPropertyEntry* pEntry, long nIndex ) |* *************************************************************************/ -XPropertyEntry* XPropertyList::Remove( long nIndex, USHORT /*nDummy*/) +XPropertyEntry* XPropertyList::Remove( long nIndex, sal_uInt16 /*nDummy*/) { if( pBmpList && !bBitmapsDirty ) { - Bitmap* pOldBmp = (Bitmap*) pBmpList->Remove( (ULONG) nIndex ); + Bitmap* pOldBmp = (Bitmap*) pBmpList->Remove( (sal_uIntPtr) nIndex ); if( pOldBmp ) delete pOldBmp; } - return (XPropertyEntry*) aList.Remove( (ULONG) nIndex ); + return (XPropertyEntry*) aList.Remove( (sal_uIntPtr) nIndex ); } /************************************************************************/ diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index 7b3e4b365e..bdcd65ac86 100644..100755 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include "xmlxtexp.hxx" @@ -92,7 +92,7 @@ static char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0 XLineEndTable::XLineEndTable( const String& rPath, XOutdevItemPool* pInPool, - USHORT nInitSize, USHORT nReSize ) : + sal_uInt16 nInitSize, sal_uInt16 nReSize ) : XPropertyTable( rPath, pInPool, nInitSize, nReSize) { pBmpTable = new Table( nInitSize, nReSize ); @@ -127,37 +127,37 @@ XLineEndEntry* XLineEndTable::GetLineEnd(long nIndex) const /************************************************************************/ -BOOL XLineEndTable::Load() +sal_Bool XLineEndTable::Load() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XLineEndTable::Save() +sal_Bool XLineEndTable::Save() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -BOOL XLineEndTable::Create() +sal_Bool XLineEndTable::Create() { - return( FALSE ); + return( sal_False ); } /************************************************************************/ -Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, BOOL /*bDelete*/) +Bitmap* XLineEndTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/) { return( NULL ); } /************************************************************************/ -BOOL XLineEndTable::CreateBitmapsForUI() +sal_Bool XLineEndTable::CreateBitmapsForUI() { - return( FALSE ); + return( sal_False ); } // -------------------- @@ -274,18 +274,18 @@ XLineEndEntry* XLineEndList::GetLineEnd(long nIndex) const return (XLineEndEntry*) XPropertyList::Get(nIndex, 0); } -BOOL XLineEndList::Load() +sal_Bool XLineEndList::Load() { if( bListDirty ) { - bListDirty = FALSE; + bListDirty = sal_False; INetURLObject aURL( aPath ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) { DBG_ASSERT( !aPath.Len(), "invalid URL" ); - return FALSE; + return sal_False; } aURL.Append( aName ); @@ -296,17 +296,17 @@ BOOL XLineEndList::Load() uno::Reference< container::XNameContainer > xTable( SvxUnoXLineEndTable_createInstance( this ), uno::UNO_QUERY ); return SvxXMLXTableImport::load( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable ); } - return( FALSE ); + return( sal_False ); } -BOOL XLineEndList::Save() +sal_Bool XLineEndList::Save() { INetURLObject aURL( aPath ); if( INET_PROT_NOT_VALID == aURL.GetProtocol() ) { DBG_ASSERT( !aPath.Len(), "invalid URL" ); - return FALSE; + return sal_False; } aURL.Append( aName ); @@ -318,7 +318,7 @@ BOOL XLineEndList::Save() return SvxXMLXTableExportComponent::save( aURL.GetMainURL( INetURLObject::NO_DECODE ), xTable ); } -BOOL XLineEndList::Create() +sal_Bool XLineEndList::Create() { basegfx::B2DPolygon aTriangle; aTriangle.append(basegfx::B2DPoint(10.0, 0.0)); @@ -338,16 +338,16 @@ BOOL XLineEndList::Create() basegfx::B2DPolygon aCircle(basegfx::tools::createPolygonFromCircle(basegfx::B2DPoint(0.0, 0.0), 100.0)); Insert( new XLineEndEntry( basegfx::B2DPolyPolygon(aCircle), SVX_RESSTR( RID_SVXSTR_CIRCLE ) ) ); - return( TRUE ); + return( sal_True ); } -BOOL XLineEndList::CreateBitmapsForUI() +sal_Bool XLineEndList::CreateBitmapsForUI() { impCreate(); for( long i = 0; i < Count(); i++) { - Bitmap* pBmp = CreateBitmapForUI( i, FALSE ); + Bitmap* pBmp = CreateBitmapForUI( i, sal_False ); OSL_ENSURE(0 != pBmp, "XLineEndList: Bitmap(UI) could not be created!" ); if( pBmp ) @@ -356,10 +356,10 @@ BOOL XLineEndList::CreateBitmapsForUI() impDestroy(); - return( TRUE ); + return( sal_True ); } -Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, BOOL bDelete ) +Bitmap* XLineEndList::CreateBitmapForUI( long nIndex, sal_Bool bDelete ) { impCreate(); VirtualDevice* pVD = mpData->getVirtualDevice(); diff --git a/svx/uiconfig/layout/delzip b/svx/uiconfig/layout/delzip index 7b4d68d70f..7b4d68d70f 100644..100755 --- a/svx/uiconfig/layout/delzip +++ b/svx/uiconfig/layout/delzip diff --git a/svx/uiconfig/layout/layout.mk b/svx/uiconfig/layout/layout.mk index f6bea876d8..f6bea876d8 100644..100755 --- a/svx/uiconfig/layout/layout.mk +++ b/svx/uiconfig/layout/layout.mk diff --git a/svx/uiconfig/layout/makefile.mk b/svx/uiconfig/layout/makefile.mk index e75ae5e8d2..e75ae5e8d2 100644..100755 --- a/svx/uiconfig/layout/makefile.mk +++ b/svx/uiconfig/layout/makefile.mk diff --git a/svx/uiconfig/layout/zoom.xml b/svx/uiconfig/layout/zoom.xml index 78e30ee11d..78e30ee11d 100644..100755 --- a/svx/uiconfig/layout/zoom.xml +++ b/svx/uiconfig/layout/zoom.xml diff --git a/svx/util/cui.dxp b/svx/util/cui.dxp deleted file mode 100644 index cfee3729bf..0000000000 --- a/svx/util/cui.dxp +++ /dev/null @@ -1 +0,0 @@ -CreateDialogFactory diff --git a/svx/util/cui.flt b/svx/util/cui.flt deleted file mode 100644 index 8ab7afd3bf..0000000000 --- a/svx/util/cui.flt +++ /dev/null @@ -1,139 +0,0 @@ -lcl -+getImplementation -Impl -IMPL -START -CharAttribList -CharPosArray -ContentAttribs -ContentAttribsInfo -ContentInfo -ContentNode -DeletedNodeInfo -EditAttrib -EditCharAttrib -EditDbg -EditDoc -EditEngineItemPool -EditHTMLParser -EditLine -EditNodeIdx -EditPaM -EditPosition -EditRTFParser -EditSel -EditSpellWrapper -EditStyleSheet -EditUndoConnectParas -EditUndoDelContent -EditUndoInsertChars -EditUndoInsertFeature -EditUndoManager -EditUndoMoveParagraphs -EditUndoRemoveChars -EditUndoRemoveFeature -EditUndoSetAttribs -EditUndoSetParaAttribs -EditUndoSetStyleSheet -EditUndoSplitPara -GlobalEditData -IdleFormattter -ImpEditEngine -ImpEditView -InternalEditStatus -ParaPortion -ParagraphList -RTFPardAttrMapIds -RTFPlainAttrMapIds -SelRange -SortedPositions_SAR -SvxACorrChars -SvxColorList -SvxFontTable -SvxRTFStyleType -SvxTabStopArr_SAR -TextPortionList -XEditAttrib -XParaPortionList -BinTextObject -DialogsResMgr -E3dDragMethod -E3dTriangle -GetImp -ImpA -ImpB -ImpBrw -ImpC -ImpCheck -ImpColor -ImpD -ImpDrag -ImpEdCtrl -ImpEdit -ImpF -+ImpGetResStr -ImpGet -ImpH -ImpHide -ImpI -ImpItem -ImpJ -ImpL -ImpList -ImpM -ImpMulti -ImportInfo -ImpP -ImpPaint -ImpPast -ImpRecalc -ImpReset -ImpRemove -ImpRef -ImpReset -ImpS -ImpScroll -ImpSdrGDIMetaFileImport -ImpSet -ImpShow -ImpT -ImpX -OLUndoAttr -OLUndoDepth -OLUndoExpand -OLUndoHeight -OutlinerEditEng -SdrGraphicLink -SdrItemBrowser -SdrOleLink -SpellCache -SvFileObject -WrongList -WrongRanges -XIOCompat -_SdrItemBrowserControl -_SdrItemBrowserWindow -+FmXGridControl -+FmXGridPeer -FmX -FmExp -ODatabaseForm -WEP -LIBMAIN -LibMain -??_5 -??_7 -??_8 -??_9 -??_C -??_E -??_F -??_G -??_H -??_I -___CT -_alloc -_CT -exception::exception -_TI2 -___CT diff --git a/svx/util/dl.flt b/svx/util/dl.flt deleted file mode 100644 index 8ab7afd3bf..0000000000 --- a/svx/util/dl.flt +++ /dev/null @@ -1,139 +0,0 @@ -lcl -+getImplementation -Impl -IMPL -START -CharAttribList -CharPosArray -ContentAttribs -ContentAttribsInfo -ContentInfo -ContentNode -DeletedNodeInfo -EditAttrib -EditCharAttrib -EditDbg -EditDoc -EditEngineItemPool -EditHTMLParser -EditLine -EditNodeIdx -EditPaM -EditPosition -EditRTFParser -EditSel -EditSpellWrapper -EditStyleSheet -EditUndoConnectParas -EditUndoDelContent -EditUndoInsertChars -EditUndoInsertFeature -EditUndoManager -EditUndoMoveParagraphs -EditUndoRemoveChars -EditUndoRemoveFeature -EditUndoSetAttribs -EditUndoSetParaAttribs -EditUndoSetStyleSheet -EditUndoSplitPara -GlobalEditData -IdleFormattter -ImpEditEngine -ImpEditView -InternalEditStatus -ParaPortion -ParagraphList -RTFPardAttrMapIds -RTFPlainAttrMapIds -SelRange -SortedPositions_SAR -SvxACorrChars -SvxColorList -SvxFontTable -SvxRTFStyleType -SvxTabStopArr_SAR -TextPortionList -XEditAttrib -XParaPortionList -BinTextObject -DialogsResMgr -E3dDragMethod -E3dTriangle -GetImp -ImpA -ImpB -ImpBrw -ImpC -ImpCheck -ImpColor -ImpD -ImpDrag -ImpEdCtrl -ImpEdit -ImpF -+ImpGetResStr -ImpGet -ImpH -ImpHide -ImpI -ImpItem -ImpJ -ImpL -ImpList -ImpM -ImpMulti -ImportInfo -ImpP -ImpPaint -ImpPast -ImpRecalc -ImpReset -ImpRemove -ImpRef -ImpReset -ImpS -ImpScroll -ImpSdrGDIMetaFileImport -ImpSet -ImpShow -ImpT -ImpX -OLUndoAttr -OLUndoDepth -OLUndoExpand -OLUndoHeight -OutlinerEditEng -SdrGraphicLink -SdrItemBrowser -SdrOleLink -SpellCache -SvFileObject -WrongList -WrongRanges -XIOCompat -_SdrItemBrowserControl -_SdrItemBrowserWindow -+FmXGridControl -+FmXGridPeer -FmX -FmExp -ODatabaseForm -WEP -LIBMAIN -LibMain -??_5 -??_7 -??_8 -??_9 -??_C -??_E -??_F -??_G -??_H -??_I -___CT -_alloc -_CT -exception::exception -_TI2 -___CT diff --git a/svx/util/gal.dxp b/svx/util/gal.dxp index 227006cc4e..e8f2e0a948 100644..100755 --- a/svx/util/gal.dxp +++ b/svx/util/gal.dxp @@ -17,5 +17,4 @@ Gallery_InsertSdrObj Gallery_GetThemeNameFromId Gallery_BeginLocking Gallery_EndLocking -component_writeInfo component_getFactory diff --git a/svx/util/hidother.hrc b/svx/util/hidother.hrc index 209e5fe97c..209e5fe97c 100644..100755 --- a/svx/util/hidother.hrc +++ b/svx/util/hidother.hrc diff --git a/svx/util/hidother.src b/svx/util/hidother.src index f00cb22137..a0be09063f 100644..100755 --- a/svx/util/hidother.src +++ b/svx/util/hidother.src @@ -25,8 +25,6 @@ * ************************************************************************/ #include "../inc/helpid.hrc" // HID_XXX -#include "hidother.hrc" -#include <svx/svxids.hrc> #include "../inc/fmhelp.hrc" /* #define HID_AUTOCORR_HELP_CHGNONBRKSPACE HID_AUTOCORR_HELP_START+20 */ @@ -54,7 +52,6 @@ hidspecial HID_GRID_TRAVEL_LAST { HelpID = HID_GRID_TRAVEL_LAST ;}; hidspecial HID_GRID_TRAVEL_NEW { HelpID = HID_GRID_TRAVEL_NEW ;}; hidspecial HID_GRID_TRAVEL_NEXT { HelpID = HID_GRID_TRAVEL_NEXT ;}; hidspecial HID_GRID_TRAVEL_PREV { HelpID = HID_GRID_TRAVEL_PREV ;}; -hidspecial HID_INTERFACE_BASIDE_VIEWSH { HelpID = HID_INTERFACE_BASIDE_VIEWSH; }; hidspecial HID_POPUP_COLOR { HelpID = HID_POPUP_COLOR; }; hidspecial HID_POPUP_COLOR_CTRL { HelpID = HID_POPUP_COLOR_CTRL; }; hidspecial HID_POPUP_FRAME { HelpID = HID_POPUP_FRAME; }; @@ -74,6 +71,4 @@ hidspecial HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL { HelpId = HI hidspecial HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS { HelpId = HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS; }; hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED; }; hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL; }; -hidspecial SID_DSBROWSER_EXPLORER { HelpID = SID_DSBROWSER_EXPLORER ;}; -hidspecial SID_GALLERY_IMPORTTHEME { HelpID = SID_GALLERY_IMPORTTHEME; }; hidspecial UID_FORMPROPBROWSER_FRAME { HelpID = UID_FORMPROPBROWSER_FRAME ;}; diff --git a/svx/util/makefile.mk b/svx/util/makefile.mk index 2e756b5aa3..2e756b5aa3 100644..100755 --- a/svx/util/makefile.mk +++ b/svx/util/makefile.mk diff --git a/svx/util/svx.component b/svx/util/svx.component new file mode 100755 index 0000000000..5907d69fef --- /dev/null +++ b/svx/util/svx.component @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.Draw.GraphicExporter"> + <service name="com.sun.star.drawing.GraphicExportFilter"/> + </implementation> + <implementation name="com.sun.star.comp.Svx.GraphicExportHelper"> + <service name="com.sun.star.document.BinaryStreamResolver"/> + <service name="com.sun.star.document.GraphicObjectResolver"/> + </implementation> + <implementation name="com.sun.star.comp.Svx.GraphicImportHelper"> + <service name="com.sun.star.document.BinaryStreamResolver"/> + <service name="com.sun.star.document.GraphicObjectResolver"/> + </implementation> + <implementation name="com.sun.star.comp.gallery.GalleryThemeProvider"> + <service name="com.sun.star.gallery.GalleryThemeProvider"/> + </implementation> + <implementation name="com.sun.star.comp.graphic.PrimitiveFactory2D"> + <service name="com.sun.star.graphic.PrimitiveFactory2D"/> + </implementation> + <implementation name="com.sun.star.comp.svx.Impl.FindbarDispatcher"> + <service name="com.sun.star.comp.svx.FindbarDispatcher"/> + <service name="com.sun.star.frame.ProtocolHandler"/> + </implementation> + <implementation name="com.sun.star.comp.svx.RecoveryUI"> + <service name="com.sun.star.dialog.RecoveryUI"/> + </implementation> + <implementation name="com.sun.star.drawing.EnhancedCustomShapeEngine"> + <service name="com.sun.star.drawing.CustomShapeEngine"/> + </implementation> + <implementation name="com.sun.star.drawing.SvxShapeCollection"> + <service name="com.sun.star.drawing.ShapeCollection"/> + </implementation> + <implementation name="com.sun.star.drawing.SvxUnoColorTable"> + <service name="com.sun.star.drawing.ColorTable"/> + </implementation> + <implementation name="com.sun.star.svx.DownSearchToolboxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.svx.FindTextToolboxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.svx.FontHeightToolBoxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.svx.UpSearchToolboxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> +</component> diff --git a/svx/util/svx.dxp b/svx/util/svx.dxp index 9630d7e067..f0e1c69934 100644..100755 --- a/svx/util/svx.dxp +++ b/svx/util/svx.dxp @@ -1,3 +1,2 @@ component_getImplementationEnvironment -component_writeInfo component_getFactory diff --git a/svx/util/svx.flt b/svx/util/svx.flt deleted file mode 100644 index 26520493b8..0000000000 --- a/svx/util/svx.flt +++ /dev/null @@ -1,134 +0,0 @@ -lcl -+getImplementation -Impl -IMPL -START -CharAttribList -CharPosArray -ContentAttribs -ContentAttribsInfo -ContentInfo -ContentNode -DeletedNodeInfo -EditAttrib -EditCharAttrib -EditDbg -EditDoc -EditEngineItemPool -EditHTMLParser -EditLine -EditNodeIdx -EditPaM -EditPosition -EditRTFParser -EditSel -EditSpellWrapper -EditStyleSheet -EditUndoConnectParas -EditUndoDelContent -EditUndoInsertChars -EditUndoInsertFeature -EditUndoManager -EditUndoMoveParagraphs -EditUndoRemoveChars -EditUndoRemoveFeature -EditUndoSetAttribs -EditUndoSetParaAttribs -EditUndoSetStyleSheet -EditUndoSplitPara -GlobalEditData -IdleFormattter -ImpEditEngine -ImpEditView -InternalEditStatus -ParaPortion -ParagraphList -RTFPardAttrMapIds -RTFPlainAttrMapIds -SelRange -SortedPositions_SAR -SvxACorrChars -SvxColorList -SvxFontTable -SvxRTFStyleType -SvxTabStopArr_SAR -TextPortionList -XEditAttrib -XParaPortionList -BinTextObject -E3dDragMethod -E3dTriangle -GetImp -ImpA -ImpB -ImpBrw -ImpC -ImpCheck -ImpColor -ImpD -ImpDrag -ImpEdCtrl -ImpEdit -ImpF -ImpGet -ImpH -ImpHide -ImpI -ImpItem -ImpJ -ImpL -ImpList -ImpM -ImpMulti -ImportInfo -ImpP -ImpPaint -ImpPast -ImpRecalc -ImpReset -ImpRemove -ImpRef -ImpReset -ImpS -ImpScroll -ImpSdrGDIMetaFileImport -ImpSet -ImpShow -ImpT -ImpX -OLUndoAttr -OLUndoDepth -OLUndoExpand -OLUndoHeight -OutlinerEditEng -SdrGraphicLink -SdrItemBrowser -SdrOleLink -SpellCache -SvFileObject -WrongList -WrongRanges -XIOCompat -_SdrItemBrowserControl -_SdrItemBrowserWindow -+FmXGridPeer -+FmXGridControl -FmX -FmExp -ODatabaseForm -WEP -LIBMAIN -LibMain -??_5 -??_7 -??_8 -??_9 -??_C -??_E -??_F -??_G -??_H -??_I -__CT -union_impl -alternative diff --git a/svx/util/svxcore.component b/svx/util/svxcore.component new file mode 100755 index 0000000000..2f829cb52a --- /dev/null +++ b/svx/util/svxcore.component @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.svx.ExtrusionDepthController"> + <service name="com.sun.star.frame.PopupMenuController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.ExtrusionDirectionController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.ExtrusionLightingController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.ExtrusionSurfaceController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.FontWorkAlignmentController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.svx.FontWorkCharacterSpacingController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> +</component> diff --git a/svx/util/svxpch.cxx b/svx/util/svxpch.cxx index 3f1a898da8..11f80e4101 100644..100755 --- a/svx/util/svxpch.cxx +++ b/svx/util/svxpch.cxx @@ -30,7 +30,7 @@ #include "precompiled_svx.hxx" #include <thread.hxx> #include <sysdep.hxx> -#if defined(WNT) || defined (WIN) +#if defined(WNT) #include <svwin.h> #endif #include <tlintl.hxx> diff --git a/svx/util/textconversiondlgs.component b/svx/util/textconversiondlgs.component new file mode 100755 index 0000000000..1847435836 --- /dev/null +++ b/svx/util/textconversiondlgs.component @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--********************************************************************** +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +**********************************************************************--> + +<component loader="com.sun.star.loader.SharedLibrary" + xmlns="http://openoffice.org/2010/uno-components"> + <implementation name="com.sun.star.comp.linguistic2.ChineseTranslationDialog"> + <service name="com.sun.star.linguistic2.ChineseTranslationDialog"/> + </implementation> +</component> diff --git a/svx/workben/edittest.cxx b/svx/workben/edittest.cxx new file mode 100755 index 0000000000..f579ed46fa --- /dev/null +++ b/svx/workben/edittest.cxx @@ -0,0 +1,1795 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_svx.hxx" + +#include <editeng/editeng.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editview.hxx> +#include <editeng/editobj.hxx> +#include <editeng/editstat.hxx> +#include <eerdll.hxx> +#include <editeng/flditem.hxx> +#include <tools/urlobj.hxx> +#include <svx/svxacorr.hxx> +#include <tools/fsys.hxx> +#include <svx/xpoly.hxx> +#include <svtools/filedlg.hxx> + +#include <vcl/window.hxx> +#include <vcl/svapp.hxx> +#include <vcl/font.hxx> +#include <vcl/sound.hxx> +#include <vcl/print.hxx> +#include <vcl/toolbox.hxx> +#include <vcl/help.hxx> +#include <vcl/scrbar.hxx> +#include <vcl/wrkwin.hxx> +#include <vcl/msgbox.hxx> + +#include <dialdll.hxx> + + +#define SERVICE_SIMPLEREGISTRY "com.sun.star.registry.SimpleRegistry" +#include <comphelper/processfactory.hxx> +#include <comphelper/regpathhelper.hxx> +#include <cppuhelper/servicefactory.hxx> +#include <cppuhelper/bootstrap.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/registry/XSimpleRegistry.hpp> +#include <sfx2/sfxuno.hxx> + +// SVX +#include <editeng/lrspitem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/kernitem.hxx> +#include <editeng/akrnitem.hxx> +#include <editeng/wrlmitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/fontitem.hxx> +#include <fwdtitem.hxx> + +// SVTOOLS +#include <svl/undo.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/poolitem.hxx> +#include <svtools/printdlg.hxx> + +#include <osl/file.hxx> +#include <osl/process.h> +#include <rtl/bootstrap.hxx> + +#define TB_LEFT 1 +#define TB_RIGHT 2 +#define TB_CENTER 3 +#define TB_UNDO 4 +#define TB_REDO 5 +#define TB_FONT1 6 +#define TB_FONT2 7 +#define TB_ITALIC 8 +#define TB_BOLD 9 +#define TB_UNDERLINE 10 +#define TB_BLACK 11 +#define TB_GREEN 12 +#define TB_OPEN 13 +#define TB_SAVE 14 +#define TB_SBL 15 +#define TB_SBSA 16 +#define TB_LR 17 +#define TB_DRAW 18 +#define TB_DEFTAB 19 +#define TB_OPEN2 20 +#define TB_SAVE2 21 +#define TB_STDSEL 33 +#define TB_MOVE 34 +#define TB_PARATTR1 35 +#define TB_ROTATE 38 +#define TB_RED 43 +#define TB_FLAT 46 +#define TB_BINOBJ1 47 +#define TB_BINOBJ3 49 +#define TB_BINOBJ4 50 +#define TB_BINOBJ1b 51 +#define TB_BINOBJ2b 52 +#define TB_ATTRIBS 54 +#define TB_IDLE 55 +#define TB_BLOCK 56 +#define TB_CLONEBIN 57 +#define TB_INSERT 58 +#define TB_PKERN 59 +#define TB_KERN 60 +#define TB_SUPER 61 +#define TB_SUB 62 +#define TB_PRINT 63 +#define TB_FONT 64 +#define TB_COLORS 65 +#define TB_WLM 66 +#define TB_OUTL 67 +#define TB_INSFLD 68 +#define TB_UPDFLD 69 +#define TB_ONLINESPELL 70 +#define TB_REDLINES 71 +#define TB_AUTOCORRECT 72 +#define TB_POLY 73 +#define TB_HYPH 74 + +// VARS... +short nRotation = 0; +USHORT nZoom = 100; +sal_Bool bURLClicked = sal_False; + +using namespace ::com::sun::star::connection; +using namespace ::vos; +using namespace ::rtl; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::registry; +using namespace ::com::sun::star::lang; + + + +Reference< XMultiServiceFactory > createApplicationServiceManager() +{ + Reference< XMultiServiceFactory > xMS; + try + { + Reference< XComponentContext > xComponentContext = ::cppu::defaultBootstrap_InitialComponentContext(); + if ( xComponentContext.is() ) + xMS = xMS.query( xComponentContext->getServiceManager() ); + } + catch( ::com::sun::star::uno::Exception& ) + { + } + + return xMS; +} + +// --- class EditApp ------------------------------------------------- + +SV_DECL_PTRARR_DEL( StringList, String*, 0, 4 ); +SV_IMPL_PTRARR( StringList, String* ); +StringList aSimpleHistory; + +class EditApp : public Application +{ +public: + virtual void Main(); +}; + +class MyEditEngine : public EditEngine +{ +public: + MyEditEngine( SfxItemPool* pPool ) : EditEngine( pPool ) { ; } + virtual String CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor ); + virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos ); + virtual void FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos ); +}; + +XubString __EXPORT MyEditEngine::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor ) +{ + const SvxFieldData* pField = rField.GetField(); + if ( !pField ) + return String( RTL_CONSTASCII_USTRINGPARAM( "<Empty>" ) ); + + if ( pField->ISA( SvxDateField ) ) + return ((const SvxDateField*)pField)->GetFormatted( LANGUAGE_SYSTEM, LANGUAGE_SYSTEM ); + else if ( pField->ISA( SvxURLField ) ) + { + const SvxURLField* pURL = (const SvxURLField*)pField; + if ( !bURLClicked ) + { + delete rpTxtColor; + rpTxtColor = new Color( COL_BLUE ); + } + else + { + delete rpTxtColor; + rpTxtColor = new Color( COL_RED ); + delete rpFldColor; + rpFldColor = new Color( COL_YELLOW ); + } + if ( pURL->GetFormat() == SVXURLFORMAT_URL ) + return pURL->GetURL(); + return pURL->GetRepresentation(); + } + return String( RTL_CONSTASCII_USTRINGPARAM( "???" ) ); +} + +void __EXPORT MyEditEngine::FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos ) +{ + EditEngine::FieldClicked( rField, nPara, nPos ); // Falls URL + const SvxFieldData* pField = rField.GetField(); + if ( !pField ) + return; + + if ( pField->ISA( SvxURLField ) ) + { + bURLClicked = TRUE; + UpdateFields(); + } + else + Sound::Beep(); +} + +void __EXPORT MyEditEngine::FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos ) +{ + const SvxFieldData* pField = rField.GetField(); + if ( !pField ) + return; + + InfoBox( 0, String( RTL_CONSTASCII_USTRINGPARAM( "Feld selektiert!" ) ) ).Execute(); +} + + +class MyView : public WorkWindow +{ +private: + EditEngine* pEditEngine; + EditView* pEditView; + +public: + MyView( Window* pParent, EditEngine* pEditEngine ); + ~MyView(); + + virtual void Paint( const Rectangle& ); + virtual void Resize(); + virtual void KeyInput( const KeyEvent& rKeyEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + BOOL Drop( const DropEvent& rEvt ); + BOOL QueryDrop( DropEvent& rEvt ); +}; + +MyView::MyView( Window* pParent, EditEngine* pEE ) : WorkWindow( pParent, WinBits( WB_STDWORK ) ) +{ + pEditEngine = pEE; + pEditView = new EditView( pEditEngine, this ); + pEditEngine->InsertView( pEditView ); + SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Another View..." ) ) ); +// EnableDrop(); + SetBackgroundBrush( Brush( Color( COL_LIGHTBLUE ) ) ); + Show(); +} + +MyView::~MyView() +{ + pEditEngine->RemoveView( pEditView ); + delete pEditView; +} + +void __EXPORT MyView::Paint( const Rectangle& rRec ) +{ + pEditView->Paint( rRec ); +} + +void __EXPORT MyView::Resize() +{ + Size aPaperSz( GetOutputSize() ); +// aPaperSz.Width() /= 2; +// aPaperSz.Height() /= 2; + pEditView->SetOutputArea( Rectangle( Point( 0,0 ), aPaperSz ) ); + pEditView->SetVisArea( Rectangle( Point( 0,0 ), aPaperSz ) ); + Invalidate(); + pEditView->ShowCursor(); +} + + // --- MyView::KeyInput() -------------------------------------- +void __EXPORT MyView::KeyInput( const KeyEvent& rKEvt ) +{ + pEditView->PostKeyEvent( rKEvt ); +} + +void __EXPORT MyView::MouseMove( const MouseEvent& rMEvt ) +{ + Point aPos = PixelToLogic( rMEvt.GetPosPixel() ); + if ( pEditView->GetOutputArea().IsInside( aPos ) ) + SetPointer( pEditView->GetPointer() ); + else + SetPointer( Pointer() ); + + + pEditView->MouseMove( rMEvt ); +} + +void __EXPORT MyView::MouseButtonDown( const MouseEvent& rMEvt ) +{ + pEditView->MouseButtonDown( rMEvt ); +} + +void __EXPORT MyView::MouseButtonUp( const MouseEvent& rMEvt ) +{ + pEditView->MouseButtonUp( rMEvt ); +} + +void __EXPORT MyView::Command( const CommandEvent& rCEvt ) +{ + if ( rCEvt.GetCommand() == COMMAND_STARTDRAG ) + pEditView->Command(rCEvt); +} + +BOOL __EXPORT MyView::Drop( const DropEvent& rEvt ) +{ + return pEditView->Drop( rEvt ); +} + +BOOL __EXPORT MyView::QueryDrop( DropEvent& rEvt ) +{ + return pEditView->QueryDrop( rEvt ); +} + +// --- class EditMainWindow -------------------------------------------- +DECLARE_LIST( ViewList, MyView* ); + +class EditViewWindow : public Window +{ +private: + MyEditEngine* pEditEngine; + EditView* pEditView; + Pointer aStdPtr; + Pointer aURLPtr; + WorkWindow* pTmpWindow; + ViewList aViewList; + + XubString aTestStr; + + +public: + EditViewWindow( Window* pParent ); + ~EditViewWindow(); + + virtual void Paint( const Rectangle& ); + virtual void Resize(); + virtual void KeyInput( const KeyEvent& rKeyEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Command( const CommandEvent& rCEvt ); + void MarkOutputArea(); + BOOL Drop( const DropEvent& rEvt ); + BOOL QueryDrop( DropEvent& rEvt ); + + EditView* GetEditView() { return pEditView; } +}; + +class EditMainWindow : public WorkWindow +{ +private: + ToolBox aToolBox; + ScrollBar aHScrollBar; + ScrollBar aVScrollBar; + EditViewWindow aViewWin; + Printer* pPrinter; + + WorkWindow* pTmpWindow; + + EditTextObject* pRTFObj; + EditTextObject* pBinObj; + + FileDialog* pFileDialogBox; + FileDialog* pFileDialogBox2; + + +protected: + void SetScrollBars(); + void SetScrollBarRanges(); + void CreatePolygon(); + + virtual void GetFocus(); + +public: + EditMainWindow(); + ~EditMainWindow(); + + virtual void Resize(); + + DECL_LINK( TBSelect, ToolBox * ); + void UpdateToolBox(); + + DECL_LINK( HScrollHdl, ScrollBar * ); + DECL_LINK( VScrollHdl, ScrollBar * ); + DECL_LINK( ShowStatus, EditStatus * ); + void SetTitle(); +}; + + +EditMainWindow::~EditMainWindow() +{ + delete pRTFObj; + delete pBinObj; + delete pFileDialogBox; + delete pFileDialogBox2; + delete pTmpWindow; + delete pPrinter; +} + +EditMainWindow::EditMainWindow() : + WorkWindow( NULL, WB_APP | WB_STDWORK | WB_SVLOOK | WB_CLIPCHILDREN ) , + aViewWin( this ), + aToolBox( this, WinBits( WB_BORDER | WB_SVLOOK | WB_SCROLL | WB_LINESPACING ) ), + aHScrollBar( this, WinBits( WB_HSCROLL | WB_DRAG ) ), + aVScrollBar( this, WinBits( WB_VSCROLL | WB_DRAG ) ) +{ + pRTFObj = 0; + pBinObj = 0; + + pFileDialogBox = new FileDialog( this, WinBits( WB_OPEN | WB_SVLOOK ) ); + pFileDialogBox->SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Open" ) ) ); + pFileDialogBox->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Text" )), String( RTL_CONSTASCII_USTRINGPARAM( "*.txt" ) ) ); + pFileDialogBox->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Rich Text Format" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.rtf" ) ) ); + pFileDialogBox->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "HTML" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.htm;*.html" ) ) ); + pFileDialogBox->SetCurFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Rich Text Format" ) ) ); + + pFileDialogBox2 = new FileDialog( this, WinBits( WB_SAVEAS| WB_SVLOOK ) ); + pFileDialogBox2->SetText( String( RTL_CONSTASCII_USTRINGPARAM( "Save" ) ) ); + pFileDialogBox2->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Text" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.txt" ) ) ); + pFileDialogBox2->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Rich Text Format" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.rtf" ) ) ); + pFileDialogBox2->AddFilter( String( RTL_CONSTASCII_USTRINGPARAM( "HTML" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "*.htm" ) ) ); + pFileDialogBox2->SetCurFilter( String( RTL_CONSTASCII_USTRINGPARAM( "Rich Text Format" ) ) ); + + pPrinter = new Printer; + pPrinter->SetMapMode( MAP_100TH_MM ); + aViewWin.SetMapMode( pPrinter->GetMapMode() ); + aViewWin.GetEditView()->GetEditEngine()->SetRefDevice( pPrinter ); + + + + pTmpWindow = new WorkWindow( this, WB_STDWORK ); + + aToolBox.SetButtonType( BUTTON_TEXT ); + aToolBox.SetLineCount( 4 ); + + { + aToolBox.InsertItem( TB_OPEN, String( RTL_CONSTASCII_USTRINGPARAM( "Open" ) ) ); + aToolBox.InsertItem( TB_SAVE, String( RTL_CONSTASCII_USTRINGPARAM( "Save" ) ) ); + aToolBox.InsertItem( TB_PRINT, String( RTL_CONSTASCII_USTRINGPARAM( "Print" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_LEFT, String( RTL_CONSTASCII_USTRINGPARAM( "L" ) ) ); + aToolBox.InsertItem( TB_CENTER, String( RTL_CONSTASCII_USTRINGPARAM( "C" ) ) ); + aToolBox.InsertItem( TB_RIGHT, String( RTL_CONSTASCII_USTRINGPARAM( "R" ) ) ); + aToolBox.InsertItem( TB_BLOCK, String( RTL_CONSTASCII_USTRINGPARAM( "B" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_UNDO, String( RTL_CONSTASCII_USTRINGPARAM( "Undo" ) ) ); + aToolBox.InsertItem( TB_REDO, String( RTL_CONSTASCII_USTRINGPARAM( "Redo" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_FONT1, String( RTL_CONSTASCII_USTRINGPARAM( "Font1" ) ) ); + aToolBox.InsertItem( TB_FONT2, String( RTL_CONSTASCII_USTRINGPARAM( "Font2" ) ) ); + aToolBox.InsertItem( TB_DEFTAB, String( RTL_CONSTASCII_USTRINGPARAM( "DefTab" ) ) ); + aToolBox.InsertBreak(); + aToolBox.InsertItem( TB_OPEN2, String( RTL_CONSTASCII_USTRINGPARAM( "Read" ) ) ); + aToolBox.InsertItem( TB_SAVE2, String( RTL_CONSTASCII_USTRINGPARAM( "Write" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_FONT, String( RTL_CONSTASCII_USTRINGPARAM( "XXX" ) ) ); + aToolBox.InsertItem( TB_ITALIC, String( RTL_CONSTASCII_USTRINGPARAM( "K" ) ) ); + aToolBox.InsertItem( TB_BOLD, String( RTL_CONSTASCII_USTRINGPARAM( "F" ) ) ); + aToolBox.InsertItem( TB_UNDERLINE, String( RTL_CONSTASCII_USTRINGPARAM( "U" ) ) ); + aToolBox.InsertItem( TB_SUPER, String( RTL_CONSTASCII_USTRINGPARAM( "SP" ) ) ); + aToolBox.InsertItem( TB_SUB, String( RTL_CONSTASCII_USTRINGPARAM( "SB" ) ) ); + aToolBox.InsertItem( TB_PKERN, String( RTL_CONSTASCII_USTRINGPARAM( "PK" ) ) ); + aToolBox.InsertItem( TB_KERN, String( RTL_CONSTASCII_USTRINGPARAM( "TK" ) ) ); + aToolBox.InsertItem( TB_WLM, String( RTL_CONSTASCII_USTRINGPARAM( "W!" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_BLACK, String( RTL_CONSTASCII_USTRINGPARAM( "Black" ) ) ); + aToolBox.InsertItem( TB_GREEN, String( RTL_CONSTASCII_USTRINGPARAM( "Green" ) ) ); + aToolBox.InsertItem( TB_RED, String( RTL_CONSTASCII_USTRINGPARAM( "Red" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_SBL, String( RTL_CONSTASCII_USTRINGPARAM( "SBL" ) ) ); + aToolBox.InsertItem( TB_SBSA, String( RTL_CONSTASCII_USTRINGPARAM( "SBSA" ) ) ); + aToolBox.InsertItem( TB_LR, String( RTL_CONSTASCII_USTRINGPARAM( "LR" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_DRAW, String( RTL_CONSTASCII_USTRINGPARAM( "Draw!" ) ) ); + aToolBox.InsertItem( TB_ROTATE, String( RTL_CONSTASCII_USTRINGPARAM( "Rotate!" ) ) ); + aToolBox.InsertItem( TB_MOVE, String( RTL_CONSTASCII_USTRINGPARAM( "Move->2" ) ) ); + aToolBox.InsertItem( TB_PARATTR1, String( RTL_CONSTASCII_USTRINGPARAM( "ParaAttr0" ) ) ); + aToolBox.InsertItem( TB_ATTRIBS, String( RTL_CONSTASCII_USTRINGPARAM( "GetAttribs" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_INSFLD, String( RTL_CONSTASCII_USTRINGPARAM( "InsFld" ) ) ); + aToolBox.InsertItem( TB_UPDFLD, String( RTL_CONSTASCII_USTRINGPARAM( "UpdFld" ) ) ); + } + aToolBox.InsertBreak(); + { + aToolBox.InsertItem( TB_ONLINESPELL, String( RTL_CONSTASCII_USTRINGPARAM( "Spell" ) ) ); + aToolBox.InsertItem( TB_REDLINES, String( RTL_CONSTASCII_USTRINGPARAM( "RedLine" ) ) ); + aToolBox.InsertItem( TB_AUTOCORRECT, String( RTL_CONSTASCII_USTRINGPARAM( "Auto*" ) ) ); + aToolBox.InsertItem( TB_HYPH, String( RTL_CONSTASCII_USTRINGPARAM( "Hyph" ) ) ); + aToolBox.InsertItem( TB_STDSEL, String( RTL_CONSTASCII_USTRINGPARAM( "StdSel" ) ) ); + aToolBox.InsertItem( TB_FLAT, String( RTL_CONSTASCII_USTRINGPARAM( "FlatMode" ) ) ); + aToolBox.InsertItem( TB_OUTL, String( RTL_CONSTASCII_USTRINGPARAM( "Ocomphelper" ) ) ); + aToolBox.InsertItem( TB_POLY, String( RTL_CONSTASCII_USTRINGPARAM( "Poly" ) ) ); + aToolBox.InsertItem( TB_COLORS, String( RTL_CONSTASCII_USTRINGPARAM( "Colors" ) )); + aToolBox.InsertItem( TB_IDLE, String( RTL_CONSTASCII_USTRINGPARAM( "Idle!" ) ) ); + aToolBox.InsertItem( TB_INSERT, String( RTL_CONSTASCII_USTRINGPARAM( "Insert" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_BINOBJ1, String( RTL_CONSTASCII_USTRINGPARAM( ">BINObj" ) ) ); + aToolBox.InsertItem( TB_BINOBJ1b, String( RTL_CONSTASCII_USTRINGPARAM( ">>BINObj" ) ) ); + aToolBox.InsertItem( TB_BINOBJ2b, String( RTL_CONSTASCII_USTRINGPARAM( "<<BINObj" ) ) ); + aToolBox.InsertItem( TB_CLONEBIN, String( RTL_CONSTASCII_USTRINGPARAM( "Clone" ) ) ); + aToolBox.InsertSeparator(); + aToolBox.InsertItem( TB_BINOBJ3, String( RTL_CONSTASCII_USTRINGPARAM( "StoreBin" ) ) ); + aToolBox.InsertItem( TB_BINOBJ4, String( RTL_CONSTASCII_USTRINGPARAM( "CreatBin" ) ) ); + } + + aToolBox.SetPosPixel( Point( 0, 0 ) ); + aToolBox.SetSelectHdl( LINK( this, EditMainWindow, TBSelect ) ); + + SetBackgroundBrush( Brush( Color( COL_LIGHTGRAY ) ) ); + + SetPen( PEN_NULL ); + Show(); + + aVScrollBar.SetScrollHdl ( LINK( this, EditMainWindow, VScrollHdl ) ); + aVScrollBar.SetLineSize( 300 ); + aVScrollBar.SetPageSize( 2000 ); + aHScrollBar.SetScrollHdl ( LINK( this, EditMainWindow, HScrollHdl ) ); + aHScrollBar.SetLineSize( 300 ); + aHScrollBar.SetPageSize( 2000 ); + aHScrollBar.Enable(); + aVScrollBar.Enable(); + + aViewWin.GetEditView()->GetEditEngine()->SetStatusEventHdl( LINK( this, EditMainWindow, ShowStatus ) ); + + SetTitle(); + + UpdateToolBox(); + aToolBox.Show(); + aViewWin.Show(); +} + +void EditMainWindow::SetTitle() +{ + String aHeading( String( RTL_CONSTASCII_USTRINGPARAM( "SvEdit! - Zoom " ) ) ); + aHeading += String::CreateFromInt32(nZoom); + aHeading += '%'; + EditEngine* pEditEngine = aViewWin.GetEditView()->GetEditEngine(); + if ( pEditEngine->GetControlWord() & EE_CNTRL_STRETCHING ) + { + USHORT nX, nY; + pEditEngine->GetGlobalCharStretching( nX, nY ); + aHeading += String( RTL_CONSTASCII_USTRINGPARAM( ", Stretch=(" ) ); + aHeading += String::CreateFromInt32(nX); + aHeading += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) ); + aHeading += String::CreateFromInt32(nY); + aHeading += ')'; + } + SetText( aHeading ); +} + +void EditMainWindow::UpdateToolBox() +{ + EditView* pEditView = aViewWin.GetEditView(); + EditEngine* pEditEngine = pEditView->GetEditEngine(); + SfxItemSet aCurSet( pEditView->GetAttribs() ); + + ULONG nControl = pEditEngine->GetControlWord(); + aToolBox.EnableItem( TB_UNDO, (BOOL)pEditEngine->GetUndoManager().GetUndoActionCount() ); + aToolBox.EnableItem( TB_REDO, (BOOL)pEditEngine->GetUndoManager().GetRedoActionCount() ); + aToolBox.EnableItem( TB_BINOBJ2b, (BOOL)(long)pBinObj ); + aToolBox.EnableItem( TB_MOVE, pEditEngine->GetParagraphCount() > 3 ); + aToolBox.CheckItem( TB_ONLINESPELL, nControl & EE_CNTRL_ONLINESPELLING ? TRUE : FALSE ); + aToolBox.CheckItem( TB_AUTOCORRECT, nControl & EE_CNTRL_AUTOCORRECT ? TRUE : FALSE ); +// aToolBox.CheckItem( TB_HYPH, nControl & EE_CNTRL_HYPHENATE ? TRUE : FALSE ); + aToolBox.CheckItem( TB_REDLINES, nControl & EE_CNTRL_NOREDLINES ? FALSE : TRUE ); + aToolBox.CheckItem( TB_STDSEL, pEditView->GetSelectionMode() == EE_SELMODE_STD ); + aToolBox.CheckItem( TB_FLAT, pEditEngine->IsFlatMode() ); + aToolBox.CheckItem( TB_OUTL, ( nControl & EE_CNTRL_OUTLINER ) ? TRUE : FALSE ); + aToolBox.CheckItem( TB_POLY, pEditEngine->GetPolygon() ? TRUE : FALSE ); + aToolBox.CheckItem( TB_COLORS, ( nControl & EE_CNTRL_NOCOLORS ) ? FALSE : TRUE ); + aToolBox.CheckItem( TB_IDLE, pEditEngine->IsIdleFormatterEnabled() ); + aToolBox.CheckItem( TB_INSERT, pEditView->IsInsertMode() ); + + for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_ITEMS_END; nWhich++) + { +// if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF ) +// ; +// else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE ) +// ; +// else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_ON ) + { + const SfxPoolItem& rItem = aCurSet.Get( nWhich ); + switch ( nWhich ) + { + case EE_PARA_HYPHENATE: + aToolBox.CheckItem( TB_HYPH, ((SfxBoolItem&)rItem).GetValue() != 0 ); + break; + case EE_PARA_LRSPACE: + aToolBox.CheckItem( TB_LR, ((SvxLRSpaceItem&)rItem).GetTxtLeft() != 0 ); + break; + case EE_PARA_ULSPACE: + aToolBox.CheckItem( TB_SBSA, ((SvxULSpaceItem&)rItem).GetUpper() != 0 ); + break; + case EE_PARA_SBL: + aToolBox.CheckItem( TB_SBL, ((SvxLineSpacingItem&)rItem).GetPropLineSpace() != 100 ); + break; + case EE_PARA_JUST: + { + SvxAdjust e = ((SvxAdjustItem&)rItem).GetAdjust(); + aToolBox.CheckItem( TB_LEFT, e == SVX_ADJUST_LEFT ); + aToolBox.CheckItem( TB_RIGHT, e == SVX_ADJUST_RIGHT); + aToolBox.CheckItem( TB_CENTER, e == SVX_ADJUST_CENTER); + aToolBox.CheckItem( TB_BLOCK, e == SVX_ADJUST_BLOCK ); + } + break; + case EE_PARA_TABS: + break; + case EE_CHAR_COLOR: + { + Color aColor( ((SvxColorItem&)rItem).GetValue() ); + aToolBox.CheckItem( TB_BLACK, aColor == COL_BLACK ); + aToolBox.CheckItem( TB_GREEN, aColor == COL_GREEN ); + aToolBox.CheckItem( TB_RED, aColor == COL_RED ); + } + break; + case EE_CHAR_FONTINFO: + { + FontFamily e = ((SvxFontItem&)rItem).GetFamily(); + aToolBox.CheckItem( TB_FONT1, e == FAMILY_ROMAN ); + aToolBox.CheckItem( TB_FONT2, e == FAMILY_SWISS ); + } + break; + case EE_CHAR_FONTHEIGHT: + break; + case EE_CHAR_WEIGHT: + { + FontWeight e = ((SvxWeightItem&)rItem).GetWeight(); + aToolBox.CheckItem( TB_BOLD, e == WEIGHT_BOLD ); + } + break; + case EE_CHAR_UNDERLINE: + { + aToolBox.CheckItem( TB_UNDERLINE, ((SvxUnderlineItem&)rItem).GetLineStyle() ); + } + break; + case EE_CHAR_WLM: + { + aToolBox.CheckItem( TB_WLM, ((SvxWordLineModeItem&)rItem).GetValue() ); + } + break; + case EE_CHAR_PAIRKERNING: + { + aToolBox.CheckItem( TB_PKERN, ((SvxAutoKernItem&)rItem).GetValue() ); + } + break; + case EE_CHAR_KERNING: + { + aToolBox.CheckItem( TB_KERN, (BOOL)((SvxKerningItem&)rItem).GetValue() ); + } + break; + case EE_CHAR_ESCAPEMENT: + { + aToolBox.CheckItem( TB_SUPER, ((SvxEscapementItem&)rItem).GetEsc() > 0 ); + aToolBox.CheckItem( TB_SUB, ((SvxEscapementItem&)rItem).GetEsc() < 0 ); + } + break; + case EE_CHAR_STRIKEOUT: + break; + case EE_CHAR_ITALIC: + { + FontItalic e = ((SvxPostureItem&)rItem).GetPosture(); + aToolBox.CheckItem( TB_ITALIC, e == ITALIC_NORMAL ); + } + break; + case EE_CHAR_OUTLINE: + break; + case EE_CHAR_SHADOW: + break; + } + } + } +} + +IMPL_LINK( EditMainWindow, TBSelect, ToolBox *, p ) +{ + EditView* pEditView = aViewWin.GetEditView(); + EditEngine* pEditEngine = pEditView->GetEditEngine(); + USHORT nId = aToolBox.GetCurItemId(); + BOOL bChecked = aToolBox.IsItemChecked( nId ); + SfxPoolItem* pNewItem = 0; + switch ( nId ) + { + case TB_LEFT: pNewItem = new SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST ); + break; + case TB_RIGHT: pNewItem = new SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ); + break; + case TB_CENTER: pNewItem = new SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ); + break; + case TB_BLOCK: pNewItem = new SvxAdjustItem( SVX_ADJUST_BLOCK, EE_PARA_JUST ); + break; + case TB_HYPH: pNewItem = new SfxBoolItem( EE_PARA_HYPHENATE, !bChecked ); + break; + case TB_UNDO: pEditView->Undo(); + pEditView->ShowCursor(); + break; + case TB_REDO: pEditView->Redo(); + pEditView->ShowCursor(); + break; + case TB_ONLINESPELL: { + ULONG nControl = pEditView->GetEditEngine()->GetControlWord(); + if ( bChecked ) + nControl = nControl & ~EE_CNTRL_ONLINESPELLING; + else + nControl = nControl | EE_CNTRL_ONLINESPELLING; + pEditView->GetEditEngine()->SetControlWord( nControl ); + } + break; + case TB_REDLINES: { + ULONG nControl = pEditView->GetEditEngine()->GetControlWord(); + if ( !bChecked ) + nControl = nControl & ~EE_CNTRL_NOREDLINES; + else + nControl = nControl | EE_CNTRL_NOREDLINES; + pEditView->GetEditEngine()->SetControlWord( nControl ); + } + break; + case TB_AUTOCORRECT: { + ULONG nControl = pEditView->GetEditEngine()->GetControlWord(); + if ( bChecked ) + nControl = nControl & ~EE_CNTRL_AUTOCORRECT; + else + nControl = nControl | EE_CNTRL_AUTOCORRECT; + pEditView->GetEditEngine()->SetControlWord( nControl ); + } + break; + case TB_STDSEL: if ( bChecked ) + pEditView->SetSelectionMode( EE_SELMODE_TXTONLY ); + else + pEditView->SetSelectionMode( EE_SELMODE_STD ); + break; + case TB_FLAT: pEditEngine->SetFlatMode( !pEditEngine->IsFlatMode() ); + break; + case TB_COLORS: { + ULONG nControl = pEditView->GetEditEngine()->GetControlWord(); + if ( bChecked ) + nControl = nControl | EE_CNTRL_NOCOLORS; + else + nControl = nControl & ~EE_CNTRL_NOCOLORS; + pEditView->GetEditEngine()->SetControlWord( nControl ); + } +// aViewWin.Invalidate(); + pEditView->GetEditEngine()->Draw( pEditView->GetWindow(), pEditView->GetOutputArea(), pEditView->GetVisArea().TopLeft() ); + break; + case TB_OUTL: { + ULONG nControl = pEditView->GetEditEngine()->GetControlWord(); + if ( !bChecked ) + nControl = nControl | EE_CNTRL_OUTLINER; + else + nControl = nControl & ~EE_CNTRL_OUTLINER; + pEditView->GetEditEngine()->SetControlWord( nControl ); + } + break; + case TB_POLY: { + if ( !bChecked ) + CreatePolygon(); + else + pEditView->GetEditEngine()->ClearPolygon(); + } + break; + case TB_IDLE: pEditEngine->EnableIdleFormatter( !pEditEngine->IsIdleFormatterEnabled() ); + break; + case TB_INSFLD: { + static BYTE nFld = 0; + if ( nFld > 2 ) + nFld = 0; + if ( nFld == 0 ) + { + SvxFieldItem aFld( SvxURLField( String( RTL_CONSTASCII_USTRINGPARAM( "www.mopo.de" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "Bla" ) ), SVXURLFORMAT_REPR ), EE_FEATURE_FIELD ); + pEditView->InsertField( aFld ); + } + else if ( nFld == 1 ) + pEditView->InsertField( SvxFieldItem( SvxURLField( String( RTL_CONSTASCII_USTRINGPARAM( "www.mopo.de" ) ), String( RTL_CONSTASCII_USTRINGPARAM( "Morgenpost" ) ), SVXURLFORMAT_URL ), EE_FEATURE_FIELD ) ); + else if ( nFld == 2 ) + pEditView->InsertField( SvxFieldItem( SvxDateField( Date( 1,1,1995 ), SVXDATETYPE_FIX, SVXDATEFORMAT_D ), EE_FEATURE_FIELD ) ); + + nFld++; + } + break; + case TB_UPDFLD: pEditEngine->UpdateFields(); + break; + case TB_INSERT: pEditView->SetInsertMode( !pEditView->IsInsertMode() ); + break; + case TB_FONT1: pNewItem = new SvxFontItem( FAMILY_ROMAN, String( RTL_CONSTASCII_USTRINGPARAM( "Times New Roman" ) ), String(), PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO ); + break; + case TB_FONT2: pNewItem = new SvxFontItem( FAMILY_SWISS, String( RTL_CONSTASCII_USTRINGPARAM( "Helv" ) ), String(), PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO ); + break; +/* + case TB_FONT: + { + FontDialog* pDlg = new FontDialog( this, WB_SVLOOK ); + pDlg->SetPrinter( pPrinter ); + Font aFont = pEditEngine->CreateFontFromItemSet( pEditView->GetAttribs() ); + MapMode aPntMode( MAP_POINT ); + MapMode aCurrent( aViewWin.GetMapMode() ); + Size aSz( aViewWin.LogicToLogic( aFont.GetSize(), &aCurrent, &aPntMode ) ); + aSz.Width() *= 10; + aSz.Height() *= 10; + aFont.SetSize( aSz ); + pDlg->SetSelectFont( aFont ); + if ( pDlg->Execute() ) + { + Font aNewFont( pDlg->GetSelectFont() ); + aSz = aViewWin.LogicToLogic( aNewFont.GetSize(), &aPntMode, &aCurrent ); + aSz.Width() /= 10; + aSz.Height() /= 10; + aNewFont.SetSize( aSz ); + + SfxItemSet aSet( pEditEngine->GetEmptyItemSet() ); + + pEditEngine->SetFontInfoInItemSet( aSet, aNewFont ); + pEditView->SetAttribs( aSet ); + } + delete pDlg; + } + break; +*/ + case TB_BOLD: if ( bChecked ) + pNewItem = new SvxWeightItem( WEIGHT_NORMAL, EE_CHAR_WEIGHT); + else + pNewItem = new SvxWeightItem( WEIGHT_BOLD, EE_CHAR_WEIGHT); + break; + case TB_ITALIC: if ( bChecked ) + pNewItem = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC ); + else + pNewItem = new SvxPostureItem( ITALIC_NORMAL, EE_CHAR_ITALIC ); + break; + case TB_UNDERLINE: if ( bChecked ) + pNewItem = new SvxUnderlineItem( UNDERLINE_NONE, EE_CHAR_UNDERLINE ); + else + pNewItem = new SvxUnderlineItem( UNDERLINE_SINGLE, EE_CHAR_UNDERLINE ); + break; + case TB_WLM: pNewItem = new SvxWordLineModeItem( !bChecked, EE_CHAR_WLM ); + break; + case TB_PKERN: pNewItem = new SvxAutoKernItem( !bChecked, EE_CHAR_PAIRKERNING ); + break; + case TB_KERN: if ( bChecked ) + pNewItem = new SvxKerningItem( 0, EE_CHAR_KERNING ); + else + pNewItem = new SvxKerningItem( 100, EE_CHAR_KERNING); + break; + case TB_SUPER: if ( bChecked ) + pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_OFF, EE_CHAR_ESCAPEMENT); + else +// pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_SUPERSCRIPT, EE_CHAR_ESCAPEMENT); + pNewItem = new SvxEscapementItem( 50, 100, EE_CHAR_ESCAPEMENT ); + break; + case TB_SUB: if ( bChecked ) + pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_OFF, EE_CHAR_ESCAPEMENT); + else +// pNewItem = new SvxEscapementItem( SVX_ESCAPEMENT_SUBSCRIPT, EE_CHAR_ESCAPEMENT); + pNewItem = new SvxEscapementItem( -50, 100, EE_CHAR_ESCAPEMENT ); + break; + case TB_GREEN: pNewItem = new SvxColorItem( Color(COL_GREEN), EE_CHAR_COLOR); + break; + case TB_RED: pNewItem = new SvxColorItem( Color(COL_RED), EE_CHAR_COLOR); + break; + case TB_BLACK: pNewItem = new SvxColorItem( Color(COL_BLACK), EE_CHAR_COLOR); + break; + case TB_SBL: pNewItem = new SvxLineSpacingItem( 0, EE_PARA_SBL ); + if ( bChecked ) + { + ((SvxLineSpacingItem*)pNewItem)->SetInterLineSpace( 0 ); + } + else + { + ((SvxLineSpacingItem*)pNewItem)->SetPropLineSpace( 150 ); + } + break; + case TB_SBSA: pNewItem = new SvxULSpaceItem( EE_PARA_ULSPACE ); + if ( !bChecked ) + { + ((SvxULSpaceItem*)pNewItem)->SetUpper( 400 ); + ((SvxULSpaceItem*)pNewItem)->SetLower( 400 ); + } + break; + case TB_LR: pNewItem = new SvxLRSpaceItem( EE_PARA_LRSPACE ); + if ( !bChecked ) + { + ((SvxLRSpaceItem*)pNewItem)->SetTxtLeft( 1000 ); + ((SvxLRSpaceItem*)pNewItem)->SetTxtFirstLineOfst( -500 ); + ((SvxLRSpaceItem*)pNewItem)->SetRight( 500 ); + } + break; + case TB_DEFTAB: if ( bChecked ) + pEditEngine->SetDefTab( 2000 ); + else + pEditEngine->SetDefTab( 600 ); + pEditView->ShowCursor(); + aToolBox.CheckItem( nId, !bChecked ); + break; + case TB_DRAW: { + pTmpWindow->SetMapMode( aViewWin.GetMapMode() ); + pTmpWindow->SetBackgroundBrush( Brush( Color( COL_GRAY ) ) ); + pTmpWindow->SetFillInBrush( Brush( Color( COL_LIGHTGRAY ) ) ); + pTmpWindow->Show(); + pTmpWindow->Invalidate(); + pTmpWindow->Update(); + pTmpWindow->DrawText( Point( 20, 20 ), String( RTL_CONSTASCII_USTRINGPARAM( "It's a Test..." ) ) ); + Rectangle aRect( Point( 500, 500 ), Size( 10000, 4000 ) ); + pTmpWindow->DrawRect( aRect ); + pEditEngine->Draw( pTmpWindow, aRect, Point( 0, 0 ) ); + nRotation = 0; + } + break; + case TB_ROTATE: { + nRotation += 100; + if ( nRotation == 3600 ) + nRotation = 0; + pTmpWindow->SetMapMode( aViewWin.GetMapMode() ); + pTmpWindow->SetBackgroundBrush( Brush( Color( COL_LIGHTGRAY ) ) ); + pTmpWindow->SetFillInBrush( Brush( Color( COL_LIGHTGRAY ) ) ); + pTmpWindow->Show(); + pTmpWindow->Invalidate(); + pTmpWindow->Update(); + pTmpWindow->DrawText( Point( 20, 20 ), String( RTL_CONSTASCII_USTRINGPARAM( "It's a Test..." ) ) ); + Rectangle aRect( Point( 500, 500 ), Size( 10000, 4000 ) ); + pEditEngine->Draw( pTmpWindow, Point( 2000, 4000 ), nRotation ); + } + break; + + case TB_MOVE: + { + ESelection aESel = pEditView->GetSelection(); + USHORT nStartPara = Min( aESel.nStartPara, aESel.nEndPara ); + USHORT nEndPara = Max( aESel.nStartPara, aESel.nEndPara ); + pEditView->MoveParagraphs( Range(nStartPara,nEndPara), 2 ); + } + break; + case TB_PARATTR1: + { + pEditEngine->SetUpdateMode( FALSE ); + USHORT nPara = 0; + SfxItemSet aSet( pEditEngine->GetEmptyItemSet() ); + aSet.Put( SvxFontItem( FAMILY_DECORATIVE, String( RTL_CONSTASCII_USTRINGPARAM( "StarBats" ) ), String(),PITCH_DONTKNOW, RTL_TEXTENCODING_MS_1252, EE_CHAR_FONTINFO ) ); + aSet.Put( SvxColorItem( Color(COL_MAGENTA), EE_CHAR_COLOR ) ); + aSet.Put( SvxFontHeightItem(600, 100, EE_CHAR_FONTHEIGHT) ); + aSet.Put( SvxPostureItem( ITALIC_NORMAL, EE_CHAR_ITALIC ) ); + aSet.Put( SvxLRSpaceItem( 0, 0, 1000, 0, EE_PARA_LRSPACE ) ); + pEditView->SetParaAttribs( aSet, nPara ); + pEditEngine->SetUpdateMode( TRUE ); + pEditView->ShowCursor(); + } + break; + case TB_BINOBJ1: + { + delete pBinObj; + pBinObj = pEditEngine->CreateTextObject(); + } + break; + case TB_BINOBJ1b: + { + delete pBinObj; + pBinObj = pEditView->CreateTextObject(); + } + break; + case TB_CLONEBIN: + { + if ( pBinObj ) + { + EditTextObject* p = pBinObj->Clone(); + delete pBinObj; + pBinObj = p; + } + } + break; + case TB_BINOBJ2b: + { + if ( pBinObj ) + { + pEditView->InsertText( *pBinObj ); + } + } + break; + case TB_BINOBJ3: + { + if ( !pFileDialogBox2->Execute() ) + return FALSE; + DirEntry aDirEntry( pFileDialogBox2->GetPath() ); + SvFileStream aStrm( aDirEntry.GetFull(), STREAM_WRITE | STREAM_TRUNC ); + EditTextObject* pTmpObj = pEditEngine->CreateTextObject(); + pTmpObj->Store( aStrm ); + DBG_ASSERT( !aStrm.GetError(), "Store: Error!" ); + delete pTmpObj; + } + break; + case TB_BINOBJ4: + { + if ( !pFileDialogBox->Execute() ) + return FALSE; + DirEntry aDirEntry( pFileDialogBox->GetPath() ); + SvFileStream aStrm( aDirEntry.GetFull(), STREAM_READ ); + delete pBinObj; + pBinObj = EditTextObject::Create( aStrm ); +// EditTextObject* pTmpObj = pEditEngine->CreateTextObject( aStrm ); +// pEditEngine->SetText( *pTmpObj ); +// pEditView->ShowCursor(); +// delete pTmpObj; + } + break; + case TB_OPEN: + case TB_OPEN2: + { + if ( !pFileDialogBox->Execute() ) + return FALSE; + DirEntry aDirEntry( pFileDialogBox->GetPath() ); + aDirEntry.ToAbs(); + String aFileName( aDirEntry.GetFull() ); + SvFileStream aStrm( aFileName, STREAM_READ ); + if ( aStrm.GetError() ) + InfoBox( 0, String( RTL_CONSTASCII_USTRINGPARAM( "StreamError!" ) ) ).Execute(); + Application::EnterWait(); + if ( nId == TB_OPEN ) + { + if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "rtf" ) ) + pEditEngine->Read( aStrm, EE_FORMAT_RTF ); + if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "htm" ) ) + pEditEngine->Read( aStrm, EE_FORMAT_HTML ); + if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "html" ) ) + pEditEngine->Read( aStrm, EE_FORMAT_HTML ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "bin" ) ) + pEditEngine->Read( aStrm, EE_FORMAT_BIN ); + else + pEditEngine->Read( aStrm, EE_FORMAT_TEXT ); + + pEditView->ShowCursor(); + } + else + { + if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "rtf" ) ) + pEditView->Read( aStrm, EE_FORMAT_RTF ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "bin" ) ) + pEditView->Read( aStrm, EE_FORMAT_BIN ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "html" ) ) + pEditView->Read( aStrm, EE_FORMAT_HTML ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "htm" ) ) + pEditView->Read( aStrm, EE_FORMAT_HTML ); + else + pEditView->Read( aStrm, EE_FORMAT_TEXT ); + } + + Application::LeaveWait(); + + } + break; + case TB_PRINT: + { + pPrinter->SetPageQueueSize( 1 ); + PrintDialog aPrnDlg( this ); + aPrnDlg.SetPrinter( pPrinter ); + if ( aPrnDlg.Execute() ) + { + pPrinter->StartJob( String( RTL_CONSTASCII_USTRINGPARAM( "SvEdit - PrinterTest" ) ) ); + pPrinter->StartPage(); + Size aSz( pEditEngine->CalcTextWidth(), pEditEngine->GetTextHeight() ); + Pen aPen( PEN_SOLID ); + aPen.SetColor( Color( COL_BLACK ) ); + pPrinter->SetPen( aPen ); + Rectangle aR( Point( 2000, 4000 ), aSz ); + pPrinter->DrawRect( aR ); + // So folgt auf IIISi, 75DPI kein Ausdruck! +// pPrinter->SetClipRegion( Region( aR ) ); + pEditEngine->Draw( pPrinter, Point( 2000, 4000 ), nRotation ); +// pPrinter->SetClipRegion(); + pPrinter->EndPage(); + pPrinter->EndJob(); + } + } + break; + case TB_SAVE: + case TB_SAVE2: + { + if ( !pFileDialogBox2->Execute() ) + return FALSE; + DirEntry aDirEntry( pFileDialogBox2->GetPath() ); +// DirEntry aDirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "d:\\xxx.rtf" ) ) ); + SvFileStream aStrm( aDirEntry.GetFull(), STREAM_WRITE | STREAM_TRUNC ); + Application::EnterWait(); + if ( nId == TB_SAVE ) + { + if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "rtf") ) + pEditEngine->Write( aStrm, EE_FORMAT_RTF ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "bin" ) ) + pEditEngine->Write( aStrm, EE_FORMAT_BIN ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "html" ) ) + pEditEngine->Write( aStrm, EE_FORMAT_HTML ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "htm" ) ) + pEditEngine->Write( aStrm, EE_FORMAT_HTML ); + else + pEditEngine->Write( aStrm, EE_FORMAT_TEXT ); + } + else + { + if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "rtf" ) ) + pEditView->Write( aStrm, EE_FORMAT_RTF ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "bin" ) ) + pEditView->Write( aStrm, EE_FORMAT_BIN ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "html" ) ) + pEditView->Write( aStrm, EE_FORMAT_HTML ); + else if ( aDirEntry.GetExtension().EqualsIgnoreCaseAscii( "htm" ) ) + pEditView->Write( aStrm, EE_FORMAT_HTML ); + else + pEditView->Write( aStrm, EE_FORMAT_TEXT ); + } + Application::LeaveWait(); + } + break; + case TB_ATTRIBS: + { + SfxItemSet aCurSet = pEditView->GetAttribs(); + XubString aDebStr( String( RTL_CONSTASCII_USTRINGPARAM( "Attribute in Selektion:" ) ) ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "\nVorlage:" ) ); + XubString aStyle; +// pEditView->GetStyleSheet( aStyle, eFam ); + aDebStr += aStyle; + for ( USHORT nWhich = EE_ITEMS_START; nWhich <= EE_ITEMS_END; nWhich++) + { + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "\n" ) ); + aDebStr += String::CreateFromInt32( nWhich ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "\t" ) ); + if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_OFF ) + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "---" ) ); + else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_DONTCARE ) + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "XXX" ) ); + else if ( aCurSet.GetItemState( nWhich ) == SFX_ITEM_ON ) + { + const SfxPoolItem& rItem = aCurSet.Get( nWhich ); + switch ( nWhich ) + { + case EE_PARA_LRSPACE: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FI=" ) ); + aDebStr += String::CreateFromInt32( ((SvxLRSpaceItem&)rItem).GetTxtFirstLineOfst() ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", LI=" ) ); + aDebStr += String::CreateFromInt32( ((SvxLRSpaceItem&)rItem).GetTxtLeft() ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", RI=" ) ); + aDebStr += String::CreateFromInt32( ((SvxLRSpaceItem&)rItem).GetRight() ); + break; + case EE_PARA_ULSPACE: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "SB=" ) ); + aDebStr += String::CreateFromInt32( ((SvxULSpaceItem&)rItem).GetUpper() ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", SA=" ) ); + aDebStr += String::CreateFromInt32( ((SvxULSpaceItem&)rItem).GetLower() ); + break; + case EE_PARA_SBL: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "SBL=" ) ); + aDebStr += String::CreateFromInt32( ((SvxLineSpacingItem&)rItem).GetInterLineSpace() ); + break; + case EE_PARA_JUST: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "SvxAdust=" ) ); + aDebStr += String::CreateFromInt32( (USHORT)((SvxAdjustItem&)rItem).GetAdjust() ); + break; + case EE_PARA_TABS: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Tabs = ?" ) ); + break; + case EE_CHAR_COLOR: + { + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Color= " ) ); + Color aColor( ((SvxColorItem&)rItem).GetValue() ); + aDebStr += String::CreateFromInt32( aColor.GetRed() ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) ); + aDebStr += String::CreateFromInt32( aColor.GetGreen() ); + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( ", " ) ); + aDebStr += String::CreateFromInt32( aColor.GetBlue() ); + } + break; + case EE_CHAR_FONTINFO: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Font=" ) ); + aDebStr += ((SvxFontItem&)rItem).GetFamilyName(); + break; + case EE_CHAR_FONTHEIGHT: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "Groesse=" ) ); + aDebStr += String::CreateFromInt32( ((SvxFontHeightItem&)rItem).GetHeight() ); + break; + case EE_CHAR_WEIGHT: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontWeight=" ) ); + aDebStr += String::CreateFromInt32( ((SvxWeightItem&)rItem).GetWeight() ); + break; + case EE_CHAR_UNDERLINE: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontUnderline=" ) ); + aDebStr += String::CreateFromInt32( ((SvxUnderlineItem&)rItem).GetLineStyle() ); + break; + case EE_CHAR_WLM: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "WordLineMode=" ) ); + aDebStr += String::CreateFromInt32( ((SvxWordLineModeItem&)rItem).GetValue() ); + break; + case EE_CHAR_STRIKEOUT: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontStrikeout=" ) ); + aDebStr += String::CreateFromInt32( ((SvxCrossedOutItem&)rItem).GetStrikeout() ); + break; + case EE_CHAR_ITALIC: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontPosture=" ) ); + aDebStr += String::CreateFromInt32( ((SvxPostureItem&)rItem).GetPosture() ); + break; + case EE_CHAR_OUTLINE: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontOutline=" ) ); + aDebStr += String::CreateFromInt32( ((SvxContourItem&)rItem).GetValue() ); + break; + case EE_CHAR_SHADOW: + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "FontShadowed=" ) ); + aDebStr += String::CreateFromInt32( ((SvxShadowedItem&)rItem).GetValue() ); + break; + } + } + else + aDebStr += String( RTL_CONSTASCII_USTRINGPARAM( "?" ) ); + } + InfoBox( 0, aDebStr ).Execute(); + } + break; + } + + if ( pNewItem ) + { + SfxItemSet aSet = pEditView->GetEmptyItemSet(); + aSet.Put( *pNewItem ); + pEditView->SetAttribs( aSet ); + delete pNewItem; + } + UpdateToolBox(); + return 0; +} + +void EditMainWindow::CreatePolygon() +{ + EditView* pEditView = aViewWin.GetEditView(); + Size aSz = pEditView->GetWindow()->GetOutputSize(); + Point aOffset( aSz.Width()/8, aSz.Height()/8 ); + aSz.Width() *= 3; + aSz.Width() /= 4; + aSz.Height() *= 3; + aSz.Height() /= 4; + Polygon aPoly( 5 ); + aPoly.SetPoint( Point( aSz.Width()/2, 0 ), 0 ); + aPoly.SetPoint( Point( aSz.Width(), aSz.Height()/3 ), 1 ); + aPoly.SetPoint( Point( aSz.Width()/2, aSz.Height() ), 2 ); + aPoly.SetPoint( Point( 0, aSz.Height()/2 ), 3 ); + aPoly.SetPoint( Point( aSz.Width()/2, 0 ), 4 ); + PolyPolygon aPPoly( aPoly ); + pEditView->GetEditEngine()->SetPolygon( aPPoly ); + pEditView->SetOutputArea( Rectangle( aOffset, aSz ) ); + ULONG nWord = pEditView->GetControlWord(); + nWord &= ~(EV_CNTRL_AUTOSCROLL); + pEditView->SetControlWord( nWord ); + aViewWin.Invalidate(); +} + +void __EXPORT EditMainWindow::GetFocus() +{ + aViewWin.GrabFocus(); +} + +IMPL_LINK_INLINE_START( EditMainWindow, HScrollHdl, ScrollBar *, pScrl ) +{ + EditView* pEditView = aViewWin.GetEditView(); + pEditView->Scroll( -pScrl->GetDelta(), 0, RGCHK_PAPERSZ1 ); + return 0; +} +IMPL_LINK_INLINE_END( EditMainWindow, HScrollHdl, ScrollBar *, pScrl ) + +IMPL_LINK_INLINE_START( EditMainWindow, VScrollHdl, ScrollBar *, pScrl ) +{ + EditView* pEditView = aViewWin.GetEditView(); + pEditView->Scroll( 0, -pScrl->GetDelta(), RGCHK_PAPERSZ1 ); + return 0; +} +IMPL_LINK_INLINE_END( EditMainWindow, VScrollHdl, ScrollBar *, pScrl ) + +void EditMainWindow::SetScrollBarRanges() +{ + EditView* pEditView = aViewWin.GetEditView(); + long y = pEditView->GetEditEngine()->GetTextHeight(); + long x = pEditView->GetEditEngine()->GetPaperSize().Width(); + + aHScrollBar.SetRange( Range( 0, x ) ); + aVScrollBar.SetRange( Range( 0, y ) ); +} + +void EditMainWindow::SetScrollBars() +{ + EditView* pEditView = aViewWin.GetEditView(); + Size aSz = GetOutputSizePixel(); + Size aRealSz( aSz ); + long nScrollbarWidthPixel = aVScrollBar.GetSizePixel().Width(); + long nTBHeight = aToolBox.GetSizePixel().Height(); + aSz.Height() -= nTBHeight; + Size aOrgSz( aSz ); + + // VScroll... + aSz.Height() += 2; + Point aPoint( ( aSz.Width()- nScrollbarWidthPixel+1 ), -1+nTBHeight); + aSz.Width() = nScrollbarWidthPixel; + aVScrollBar.SetPosSizePixel( aPoint, aSz ); + + // HScroll... + aSz = aOrgSz; + Point aPoint2( 0, aRealSz.Height()-aHScrollBar.GetSizePixel().Height()+1 ); // TB-Height schon drin! + aSz.Width() -= aVScrollBar.GetSizePixel().Width(); + aSz.Width() += 2; + + aSz.Height() = nScrollbarWidthPixel; + aHScrollBar.SetPosSizePixel( aPoint2, aSz ); + + aHScrollBar.SetVisibleSize( pEditView->GetOutputArea().GetWidth() ); + aVScrollBar.SetVisibleSize( pEditView->GetOutputArea().GetHeight() ); + + SetScrollBarRanges(); + + aVScrollBar.Show(); + aHScrollBar.Show(); +} + +void __EXPORT EditMainWindow::Resize() +{ + long nBorder = aVScrollBar.GetSizePixel().Width(); + long nExtra = 10; + Size aTBSz = aToolBox.CalcWindowSizePixel(); + Size aOutSzPixel( GetOutputSizePixel() ); + aToolBox.SetSizePixel( Size( aOutSzPixel.Width(), aTBSz.Height()) ); + + aViewWin.SetSizePixel( Size( aOutSzPixel.Width()-nBorder-2*nExtra, aOutSzPixel.Height()-aTBSz.Height()-2*nExtra-nBorder) ); + + aViewWin.SetPosPixel( Point( nExtra, aTBSz.Height()+nExtra ) ); + + SetScrollBars(); + + EditView* pEditView = aViewWin.GetEditView(); + if ( pEditView && pEditView->GetEditEngine()->GetPolygon() ) + CreatePolygon(); +} + +IMPL_LINK( EditMainWindow, ShowStatus, EditStatus *, pStat ) +{ + EditView* pEditView = aViewWin.GetEditView(); + EditEngine* pEditEngine = pEditView->GetEditEngine(); + if ( ( pStat->GetStatusWord() & EE_STAT_TEXTWIDTHCHANGED ) || ( pStat->GetStatusWord() & EE_STAT_TEXTHEIGHTCHANGED ) ) + { + aViewWin.MarkOutputArea(); + if ( pEditEngine->GetTextHeight() < (ULONG)pEditView->GetOutputArea().GetHeight() ) + { + // Wird durch RGCHK_PAPERSZ1 'geklippt' + if ( !( pEditEngine->GetControlWord() & EE_CNTRL_AUTOPAGESIZE) ) + pEditView->Scroll( -(long)pEditEngine->CalcTextWidth(), -(long)pEditEngine->GetTextHeight(), RGCHK_PAPERSZ1 ); + } + SetScrollBarRanges(); + } + if ( pStat->GetStatusWord() & EE_STAT_HSCROLL ) + aHScrollBar.SetThumbPos( pEditView->GetVisArea().Left() ); + if ( pStat->GetStatusWord() & EE_STAT_VSCROLL ) + aVScrollBar.SetThumbPos( pEditView->GetVisArea().Top() ); + + return 0; +} + + +EditViewWindow::~EditViewWindow() +{ + // erst die angemeldeten Views zerstoeren + // (melden sich selbst ab) + MyView* pView = aViewList.First(); + while ( pView ) + { + delete pView; + pView = aViewList.Next(); + } + + pEditEngine->RemoveView( pEditView ); + delete pEditView; + // Beim Zerstoeren der Styles am Ende, EditEngine noch nicht kaputt, + // wird der Handler gerufen, ich zerstore hier aber schon die View! + pEditEngine->SetStatusEventHdl( Link() ); +// SvxAutoCorrect* pAutoCorrekt = pEditEngine->GetAutoCorrect(); +// pEditEngine->SetAutoCorrect( 0 ); +// delete pAutoCorrekt; + delete pEditEngine; +} + +EditViewWindow::EditViewWindow( Window* pParent ) : + Window( pParent ), aURLPtr( POINTER_HAND ) +{ + SetBackgroundBrush( Brush( Color( COL_WHITE ) ) ); + SetMapMode( MAP_100TH_MM ); +// EnableDrop(); + + SfxItemPool* pPool = EditEngine::CreatePool(); + Font aFont = GetSettings().GetStyleSettings().GetAppFont(); + MapMode aPntMode( MAP_POINT ); + MapMode aCurrent( GetMapMode() ); + Size aSz( LogicToLogic( Size( 12, 0 ), &aPntMode, &aCurrent ) ); + aFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Times New Roman" ) ) ); + pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetName(), String(),aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) ); + pPool->SetPoolDefaultItem( SvxFontHeightItem( aSz.Width(), 100, EE_CHAR_FONTHEIGHT ) ); + pEditEngine = new MyEditEngine( pPool ); + + Size aPaperSz( 10000,8000 ); + pEditEngine->SetPaperSize( aPaperSz ); + + pEditView = new EditView( pEditEngine, this ); + pEditView->SetBackgroundColor( Color( COL_WHITE ) ); + pEditView->SetOutputArea( Rectangle( Point( 100, 100 ), aPaperSz ) ); + pEditEngine->SetDefaultLanguage( LANGUAGE_ENGLISH ); + pEditEngine->InsertView( pEditView ); + + SetPosSizePixel( Point( 10, 10 ), Size( 600, 400 ) ); + SetPen( PEN_NULL ); + Show(); + + // Feldbefehle grau hinterlegen + ULONG n = pEditEngine->GetControlWord(); + n = n | (EE_CNTRL_MARKFIELDS|EE_CNTRL_AUTOCOMPLETE); + pEditEngine->SetControlWord( n ); + + // Test: Autozentrierung +// ULONG n = pEditEngine->GetControlWord(); +// n = n | EE_CNTRL_AUTOPAGESIZE; +// pEditEngine->SetControlWord( n ); + + // OneLineSpeling +#ifdef WNT +// pEditEngine->CreateSpeller( DirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "n:\\offenv\\wnti" ) ) ), +// DirEntry( String( RTL_CONSTASCII_USTRINGPARAM( "n:\\offenv\\wnti" ) ) ) ); +// pEditEngine->GetSpeller()->SetActualLanguage( LANGUAGE_GERMAN ); +// pEditEngine->GetSpeller()->SetDefaultLanguage( LANGUAGE_GERMAN ); +// pEditEngine->GetSpeller()->SetMinTrail( 2 ); + + // AutoCorrect wird nie zerstoert +// pEditEngine->SetAutoCorrect( new SvxAutoCorrect( String( RTL_CONSTASCII_USTRINGPARAM( "d:\\prj\\office\\autotext\\autocorr.dat" ) ) ) ); +#endif +} + +void __EXPORT EditViewWindow::Paint( const Rectangle& rRec ) +{ + if ( pEditView->GetEditEngine()->GetPolygon() ) + { + // Die Punkte des Polygons beziehen sich auf die View... + MapMode aMapMode( GetMapMode() ); + aMapMode.SetOrigin( pEditView->GetOutputArea().TopLeft() ); + SetMapMode( aMapMode ); + DrawPolyPolygon( *pEditView->GetEditEngine()->GetPolygon() ); + aMapMode.SetOrigin( Point() ); + SetMapMode( aMapMode ); + } + pEditView->Paint( rRec ); + MarkOutputArea(); +} + +void EditViewWindow::MarkOutputArea() +{ + static Rectangle aCurFrame; + Rectangle aOutArea( pEditView->GetOutputArea() ); + aOutArea = LogicToPixel( aOutArea ); + aOutArea.Left()--; + aOutArea.Right()++; + aOutArea.Top()--; + aOutArea.Bottom()++; + aOutArea = PixelToLogic( aOutArea ); + SetPen( Pen( Color( COL_RED ) ) ); + SetFillInBrush( Brush( BRUSH_NULL ) ); + DrawRect( aOutArea ); + if ( !aCurFrame.IsEmpty() ) + { + if ( aCurFrame.Left() < aOutArea.Left() ) + Invalidate( Rectangle( aCurFrame.TopLeft(), Size( aOutArea.Left()-aCurFrame.Left(), aCurFrame.GetHeight() ) ) ); + if ( aCurFrame.Right() > aOutArea.Right() ) + { + long nW = aCurFrame.Right() - aOutArea.Right(); + Point aPos( aCurFrame.TopRight() ); + aPos.X() -= nW; + Invalidate( Rectangle( aPos, Size( nW, aCurFrame.GetHeight() ) ) ); + } + if ( aCurFrame.Top() < aOutArea.Top() ) + Invalidate( Rectangle( aCurFrame.TopLeft(), Size( aCurFrame.GetWidth(), aOutArea.Top() - aCurFrame.Top() ) ) ); + if ( aCurFrame.Bottom() > aOutArea.Bottom() ) + { + long nH = aCurFrame.Bottom() - aOutArea.Bottom(); + Point aPos( aCurFrame.BottomLeft() ); + aPos.Y() -= nH; + Invalidate( Rectangle( aPos, Size( aCurFrame.GetWidth(), nH ) ) ); + } + } + aCurFrame = aOutArea; +} + +void __EXPORT EditViewWindow::Resize() +{ + Size aPaperSz( GetOutputSize() ); + pEditView->SetOutputArea( Rectangle( Point(0,0), aPaperSz ) ); + pEditEngine->SetPaperSize( Size( aPaperSz.Width()*1, aPaperSz.Height()*1 ) ); + pEditView->ShowCursor(); + Invalidate(); +} + +void __EXPORT EditViewWindow::KeyInput( const KeyEvent& rKEvt ) +{ + sal_Unicode nCharCode = rKEvt.GetCharCode(); + + USHORT nCode = rKEvt.GetKeyCode().GetCode(); + // Auswertung fuer besondere Einstellungen.... + if ( ( nCode == KEY_A) && rKEvt.GetKeyCode().IsMod1() ) + pEditView->SetSelection( ESelection( 0, 0, 0xFFFF, 0xFFFF ) ); + else if ( ( nCode == KEY_R ) && rKEvt.GetKeyCode().IsMod2() ) + Invalidate(); + else if ( ( nCode == KEY_L ) && rKEvt.GetKeyCode().IsMod2() ) + { + ULONG n = pEditEngine->GetControlWord(); + n = n | EE_CNTRL_ONECHARPERLINE; + pEditEngine->SetControlWord( n ); + pEditEngine->QuickFormatDoc(); + } + else if ( ( nCode == KEY_Z ) && rKEvt.GetKeyCode().IsMod2() ) + { + pEditView->RemoveAttribs(); + } + else if ( ( nCode == KEY_V ) && rKEvt.GetKeyCode().IsMod2() ) + { + pEditEngine->SetVertical( TRUE ); + Invalidate(); + } + else if ( ( ( nCode == KEY_ADD ) || ( nCode == KEY_SUBTRACT ) )&& rKEvt.GetKeyCode().IsMod2() ) + { + short nDiff = ( nCode == KEY_ADD ) ? (+5) : (-5); + if ( nZoom > 1000 ) + nDiff *= 20; + if ( nZoom <= 25 ) + nDiff /= 5; + if ( ( nZoom + nDiff ) > 0 ) + nZoom += nDiff; + MapMode aMapMode( MAP_100TH_MM, Point(0,0), Fraction(nZoom,100), Fraction(nZoom,100) ); + SetMapMode( aMapMode ); + ((EditMainWindow*)GetParent())->SetTitle(); + + if ( rKEvt.GetKeyCode().IsMod1() ) + { + InfoBox( 0, String( RTL_CONSTASCII_USTRINGPARAM( "ChangingRefMapMode..." ) ) ).Execute(); + pEditEngine->SetRefMapMode( aMapMode ); + } + Invalidate(); + } + else if ( rKEvt.GetKeyCode().IsMod2() && + ( ( nCode == KEY_UP) || ( nCode == KEY_DOWN ) || + ( nCode == KEY_LEFT ) || ( nCode == KEY_RIGHT ) ) ) + { + if( rKEvt.GetKeyCode().IsMod1() ) + { + ULONG nCtrl = pEditEngine->GetControlWord(); + if ( ! ( nCtrl & EE_CNTRL_STRETCHING ) ) + { + nCtrl |= EE_CNTRL_STRETCHING; + pEditEngine->SetControlWord( nCtrl ); + } + USHORT nX, nY; + pEditEngine->GetGlobalCharStretching( nX, nY ); + if ( ( nCode == KEY_DOWN ) && ( nY > 5 ) ) + nY += 5; + else if ( nCode == KEY_UP ) + nY -= 5; + else if ( nCode == KEY_RIGHT ) + nX += 5; + else if ( ( nCode == KEY_LEFT ) && ( nX > 5 ) ) + nX -= 5; + pEditEngine->SetGlobalCharStretching( nX, nY ); + ((EditMainWindow*)GetParent())->SetTitle(); + } + else // ZeichenAttr + { + SfxItemSet aAttrs( pEditView->GetAttribs() ); + SfxItemSet aNewAttrs( pEditEngine->GetEmptyItemSet() ); + const SvxFontWidthItem& rItem = (const SvxFontWidthItem&)aAttrs.Get( EE_CHAR_FONTWIDTH ); + USHORT nProp = rItem.GetProp(); + if ( nCode == KEY_RIGHT ) + nProp += 5; + else if ( ( nCode == KEY_LEFT ) && ( nProp > 5 ) ) + nProp -= 5; + aNewAttrs.Put( SvxFontWidthItem( 0, nProp, EE_CHAR_FONTWIDTH ) ); + pEditView->SetAttribs( aNewAttrs ); + } + } + else if ( ( nCode == KEY_O ) && rKEvt.GetKeyCode().IsMod2() ) + { + MapMode aMapMode( GetMapMode() ); + aMapMode.SetOrigin( Point( 41, 41 ) ); + SetMapMode( aMapMode ); + Invalidate(); + } + else if ( ( nCode == KEY_B ) && rKEvt.GetKeyCode().IsMod2() ) + { + SfxItemSet aSet = pEditView->GetEmptyItemSet(); + aSet.Put( SvxFontHeightItem(800, 100, EE_CHAR_FONTHEIGHT) ); + pEditView->SetAttribs( aSet ); + } + else if ( ( nCode == KEY_P ) && rKEvt.GetKeyCode().IsMod2() ) + { +// ESelection aSel = pEditView->GetSelection(); +// for ( ULONG n = aSel.nStartPara; n <= aSel.nEndPara; n++ ) +// { +// InfoBox( 0, pEditEngine->GetText( n ) ).Execute(); +// } + InfoBox( 0, pEditView->GetSelected() ).Execute(); + + } + else if ( rKEvt.GetKeyCode().IsMod2() && + ( nCode >= KEY_1 ) && ( nCode <= KEY_9 ) ) + { + ULONG nEECtrl = pEditEngine->GetControlWord(); + nEECtrl = nEECtrl | EE_CNTRL_AUTOPAGESIZE; + pEditEngine->SetControlWord( nEECtrl ); + + ULONG nEVCtrl = pEditView->GetControlWord(); + nEVCtrl |= EV_CNTRL_AUTOSIZE; + pEditView->SetControlWord( nEVCtrl ); + + pEditView->SetAnchorMode( (EVAnchorMode)(nCode-KEY_1) ); + pEditView->SetOutputArea( Rectangle( Point(0,0), GetOutputSize() ) ); + pEditEngine->SetMaxAutoPaperSize( GetOutputSize() ); + pEditEngine->SetPaperSize( Size( 0, 0 ) ); + } + else if ( rKEvt.GetKeyCode().IsMod2() && ( nCode == KEY_0 ) ) + { + ULONG nEVCtrl = pEditView->GetControlWord(); + nEVCtrl = nEVCtrl | EV_CNTRL_AUTOSIZE; + pEditView->SetControlWord( nEVCtrl ); + + Size aOutSz( GetOutputSize() ); + Size aPaperSz( aOutSz.Width() / 2, 0 ); + pEditView->SetOutputArea( Rectangle( Point(), aPaperSz ) ); + pEditEngine->SetPaperSize( aPaperSz ); + // Max-Height wird bei View verwendet, + // MinSize/MaxSize nur, wenn AUTOPAGESIZE ( KEY_1 - KEY_9 ) + pEditEngine->SetMaxAutoPaperSize( Size( aOutSz.Width() / 2, aOutSz.Height() / 2 ) ); + pEditEngine->SetMinAutoPaperSize( Size( aOutSz.Width() / 8, aOutSz.Height() / 8 ) ); + } + else if ( ( nCode == KEY_J ) && rKEvt.GetKeyCode().IsMod2() ) + { + Size aTextSz( pEditEngine->CalcTextWidth(), pEditEngine->GetTextHeight() ); + Rectangle aRect( pEditView->GetOutputArea().TopLeft(), aTextSz ); + Brush aTmpBrush( Color( COL_LIGHTBLUE ), BRUSH_25 ); + Brush aOldBrush( GetFillInBrush() ); + SetFillInBrush( aTmpBrush ); + DrawRect( aRect ); + SetFillInBrush( aOldBrush ); + pEditView->Paint( aRect ); + } + else if ( ( nCode == KEY_H ) && rKEvt.GetKeyCode().IsMod2() ) + { + Push(); + Size aSz( pEditEngine->CalcTextWidth(), pEditEngine->GetTextHeight() ); + Pen aPen( PEN_SOLID ); + Brush aBrush( Color( COL_GRAY ), BRUSH_SOLID ); + aPen.SetColor( Color( COL_BLACK ) ); + SetPen( aPen ); + SetFillInBrush( aBrush ); + Rectangle aR( pEditView->GetOutputArea().TopLeft(), aSz ); + DrawRect( aR ); + Pop(); + pEditEngine->Draw( this, pEditView->GetOutputArea() ); + pEditView->ShowCursor( TRUE, TRUE ); + } + + // Eingabe an EditEngine... + else + { + BOOL bDone = pEditView->PostKeyEvent( rKEvt ); + if ( !bDone ) + Window::KeyInput( rKEvt ); + } + + ((EditMainWindow*)GetParent())->UpdateToolBox(); +} + +void __EXPORT EditViewWindow::MouseMove( const MouseEvent& rMEvt ) +{ + Point aPos = PixelToLogic( rMEvt.GetPosPixel() ); + if ( pEditView->GetOutputArea().IsInside( aPos ) ) + { + const SvxFieldItem* pField = pEditView->GetFieldUnderMousePointer(); + if ( pField ) + SetPointer( aURLPtr ); + else + SetPointer( pEditView->GetPointer() ); + +// aPos -= pEditView->GetOutputArea().TopLeft(); +// aPos += pEditView->GetVisArea().TopLeft(); +// if ( pEditView->GetEditEngine()->IsTextPos( aPos, PixelToLogic( Size( 5, 0 ) ).Width() ) ) +// SetPointer( pEditView->GetPointer() ); +// else +// SetPointer( Pointer( POINTER_REFHAND ) ); + + } + else + SetPointer( aStdPtr ); + +// static long x = 0; +// x++; +// DBG_ASSERT( x < 1000, String( RTL_CONSTASCII_USTRINGPARAM( "?" ) ) ); + pEditView->MouseMove( rMEvt ); +} + +void __EXPORT EditViewWindow::MouseButtonDown( const MouseEvent& rMEvt ) +{ + GrabFocus(); + pEditView->MouseButtonDown( rMEvt ); +} + +void __EXPORT EditViewWindow::MouseButtonUp( const MouseEvent& rMEvt ) +{ + pEditView->MouseButtonUp( rMEvt ); + ((EditMainWindow*)GetParent())->UpdateToolBox(); +} + +void __EXPORT EditViewWindow::Command( const CommandEvent& rCEvt ) +{ + if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) + { + if( pEditView->IsWrongSpelledWordAtPos( rCEvt.GetMousePosPixel() ) ) + pEditView->ExecuteSpellPopup( rCEvt.GetMousePosPixel() ); + } + else + pEditView->Command(rCEvt); + +} + +BOOL __EXPORT EditViewWindow::Drop( const DropEvent& rEvt ) +{ + return pEditView->Drop( rEvt ); +} + +BOOL __EXPORT EditViewWindow::QueryDrop( DropEvent& rEvt ) +{ + return pEditView->QueryDrop( rEvt ); +} + +// --- aEditApp ------------------------------------------------------ + +void __EXPORT EditApp::Main() +{ +#ifdef WNT + SvFactory::Init(); +#endif + + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xSMgr = createApplicationServiceManager(); + ::comphelper::setProcessServiceFactory( xSMgr ); + + EditDLL aEditDll; + SvxGlobalItemData aItemData; + SvxFieldItem::GetClassManager().SV_CLASS_REGISTER( SvxDateField ); + SvxFieldItem::GetClassManager().SV_CLASS_REGISTER( SvxURLField ); + + Help::EnableQuickHelp(); + + EditMainWindow aWindow; + Execute(); +} + +EditApp aEditApp; diff --git a/svx/workben/msview/makefile.mk b/svx/workben/msview/makefile.mk index 2ce9d573de..2ce9d573de 100644..100755 --- a/svx/workben/msview/makefile.mk +++ b/svx/workben/msview/makefile.mk diff --git a/svx/workben/msview/msview.cxx b/svx/workben/msview/msview.cxx index bd08ee1188..bd08ee1188 100644..100755 --- a/svx/workben/msview/msview.cxx +++ b/svx/workben/msview/msview.cxx diff --git a/svx/workben/msview/msview.xml b/svx/workben/msview/msview.xml index 6daffa62be..6daffa62be 100644..100755 --- a/svx/workben/msview/msview.xml +++ b/svx/workben/msview/msview.xml diff --git a/svx/workben/msview/xmlconfig.cxx b/svx/workben/msview/xmlconfig.cxx index 6c134d0cd5..6c134d0cd5 100644..100755 --- a/svx/workben/msview/xmlconfig.cxx +++ b/svx/workben/msview/xmlconfig.cxx diff --git a/svx/workben/msview/xmlconfig.hxx b/svx/workben/msview/xmlconfig.hxx index abea4351d7..abea4351d7 100644..100755 --- a/svx/workben/msview/xmlconfig.hxx +++ b/svx/workben/msview/xmlconfig.hxx diff --git a/svx/xml/AccessibleControlShape.xml b/svx/xml/AccessibleControlShape.xml index cc88998836..cc88998836 100644..100755 --- a/svx/xml/AccessibleControlShape.xml +++ b/svx/xml/AccessibleControlShape.xml diff --git a/svx/xml/AccessibleEditableTextPara.xml b/svx/xml/AccessibleEditableTextPara.xml index affb15f4dd..affb15f4dd 100644..100755 --- a/svx/xml/AccessibleEditableTextPara.xml +++ b/svx/xml/AccessibleEditableTextPara.xml diff --git a/svx/xml/AccessibleGraphicShape.xml b/svx/xml/AccessibleGraphicShape.xml index 74e41df3a7..74e41df3a7 100644..100755 --- a/svx/xml/AccessibleGraphicShape.xml +++ b/svx/xml/AccessibleGraphicShape.xml diff --git a/svx/xml/AccessibleImageBullet.xml b/svx/xml/AccessibleImageBullet.xml index c6a2afdba9..c6a2afdba9 100644..100755 --- a/svx/xml/AccessibleImageBullet.xml +++ b/svx/xml/AccessibleImageBullet.xml diff --git a/svx/xml/AccessibleOLEShape.xml b/svx/xml/AccessibleOLEShape.xml index 27a9cafd46..27a9cafd46 100644..100755 --- a/svx/xml/AccessibleOLEShape.xml +++ b/svx/xml/AccessibleOLEShape.xml diff --git a/svx/xml/AccessibleShape.xml b/svx/xml/AccessibleShape.xml index 6469448e54..6469448e54 100644..100755 --- a/svx/xml/AccessibleShape.xml +++ b/svx/xml/AccessibleShape.xml diff --git a/svx/xml/SvxDrawPage.xml b/svx/xml/SvxDrawPage.xml index 29ea110a00..29ea110a00 100644..100755 --- a/svx/xml/SvxDrawPage.xml +++ b/svx/xml/SvxDrawPage.xml diff --git a/svx/xml/SvxGraphCtrlAccessibleContext.xml b/svx/xml/SvxGraphCtrlAccessibleContext.xml index ad436f5dc2..ad436f5dc2 100644..100755 --- a/svx/xml/SvxGraphCtrlAccessibleContext.xml +++ b/svx/xml/SvxGraphCtrlAccessibleContext.xml diff --git a/svx/xml/SvxGraphicExporter.xml b/svx/xml/SvxGraphicExporter.xml index 6a4d9fef2f..6a4d9fef2f 100644..100755 --- a/svx/xml/SvxGraphicExporter.xml +++ b/svx/xml/SvxGraphicExporter.xml diff --git a/svx/xml/SvxGraphicObject.xml b/svx/xml/SvxGraphicObject.xml index 7c756ad3e0..7c756ad3e0 100644..100755 --- a/svx/xml/SvxGraphicObject.xml +++ b/svx/xml/SvxGraphicObject.xml diff --git a/svx/xml/SvxShape.xml b/svx/xml/SvxShape.xml index 6cf5e00a1a..6cf5e00a1a 100644..100755 --- a/svx/xml/SvxShape.xml +++ b/svx/xml/SvxShape.xml diff --git a/svx/xml/SvxShapeCircle.xml b/svx/xml/SvxShapeCircle.xml index fc37a09e93..fc37a09e93 100644..100755 --- a/svx/xml/SvxShapeCircle.xml +++ b/svx/xml/SvxShapeCircle.xml diff --git a/svx/xml/SvxShapeCollection.xml b/svx/xml/SvxShapeCollection.xml index ad9781dfd3..ad9781dfd3 100644..100755 --- a/svx/xml/SvxShapeCollection.xml +++ b/svx/xml/SvxShapeCollection.xml diff --git a/svx/xml/SvxShapeConnector.xml b/svx/xml/SvxShapeConnector.xml index e80596b91d..e80596b91d 100644..100755 --- a/svx/xml/SvxShapeConnector.xml +++ b/svx/xml/SvxShapeConnector.xml diff --git a/svx/xml/SvxShapeControl.xml b/svx/xml/SvxShapeControl.xml index c2c95e1abe..c2c95e1abe 100644..100755 --- a/svx/xml/SvxShapeControl.xml +++ b/svx/xml/SvxShapeControl.xml diff --git a/svx/xml/SvxShapeDimensioning.xml b/svx/xml/SvxShapeDimensioning.xml index 4a30960107..4a30960107 100644..100755 --- a/svx/xml/SvxShapeDimensioning.xml +++ b/svx/xml/SvxShapeDimensioning.xml diff --git a/svx/xml/SvxShapeGroup.xml b/svx/xml/SvxShapeGroup.xml index e24fa8c703..e24fa8c703 100644..100755 --- a/svx/xml/SvxShapeGroup.xml +++ b/svx/xml/SvxShapeGroup.xml diff --git a/svx/xml/SvxShapePolyPolygon.xml b/svx/xml/SvxShapePolyPolygon.xml index 203bc1df98..203bc1df98 100644..100755 --- a/svx/xml/SvxShapePolyPolygon.xml +++ b/svx/xml/SvxShapePolyPolygon.xml diff --git a/svx/xml/SvxShapePolyPolygonBezier.xml b/svx/xml/SvxShapePolyPolygonBezier.xml index aadabb6df6..aadabb6df6 100644..100755 --- a/svx/xml/SvxShapePolyPolygonBezier.xml +++ b/svx/xml/SvxShapePolyPolygonBezier.xml diff --git a/svx/xml/SvxUnoNumberingRules.xml b/svx/xml/SvxUnoNumberingRules.xml index fe5b13ed49..fe5b13ed49 100644..100755 --- a/svx/xml/SvxUnoNumberingRules.xml +++ b/svx/xml/SvxUnoNumberingRules.xml diff --git a/svx/xml/SvxUnoText.xml b/svx/xml/SvxUnoText.xml index c3b26aa743..c3b26aa743 100644..100755 --- a/svx/xml/SvxUnoText.xml +++ b/svx/xml/SvxUnoText.xml diff --git a/svx/xml/SvxUnoTextContent.xml b/svx/xml/SvxUnoTextContent.xml index 2732d480b5..2732d480b5 100644..100755 --- a/svx/xml/SvxUnoTextContent.xml +++ b/svx/xml/SvxUnoTextContent.xml diff --git a/svx/xml/SvxUnoTextContentEnum.xml b/svx/xml/SvxUnoTextContentEnum.xml index ecbc78b5d3..ecbc78b5d3 100644..100755 --- a/svx/xml/SvxUnoTextContentEnum.xml +++ b/svx/xml/SvxUnoTextContentEnum.xml diff --git a/svx/xml/SvxUnoTextCursor.xml b/svx/xml/SvxUnoTextCursor.xml index fbebd7cf17..fbebd7cf17 100644..100755 --- a/svx/xml/SvxUnoTextCursor.xml +++ b/svx/xml/SvxUnoTextCursor.xml diff --git a/svx/xml/SvxUnoTextField.xml b/svx/xml/SvxUnoTextField.xml index fa64d6b123..fa64d6b123 100644..100755 --- a/svx/xml/SvxUnoTextField.xml +++ b/svx/xml/SvxUnoTextField.xml diff --git a/svx/xml/SvxUnoTextRange.xml b/svx/xml/SvxUnoTextRange.xml index 04b4610fb5..04b4610fb5 100644..100755 --- a/svx/xml/SvxUnoTextRange.xml +++ b/svx/xml/SvxUnoTextRange.xml diff --git a/svx/xml/SvxUnoTextRangeEnumeration.xml b/svx/xml/SvxUnoTextRangeEnumeration.xml index c8fc25adf5..c8fc25adf5 100644..100755 --- a/svx/xml/SvxUnoTextRangeEnumeration.xml +++ b/svx/xml/SvxUnoTextRangeEnumeration.xml |
