summaryrefslogtreecommitdiff
path: root/editeng/source/items
diff options
context:
space:
mode:
authorThorsten Behrens <tbehrens@novell.com>2011-03-12 02:42:58 +0100
committerThorsten Behrens <tbehrens@novell.com>2011-03-12 02:42:58 +0100
commite65c0fe553a9d1b85dcacfff7af9df8231427876 (patch)
tree250636f82248275ef5c1d491e58e4e3cf136cdff /editeng/source/items
parent35fbb45086c389f91c0d6ff410d814f7567c1ceb (diff)
parent4fba42e5f98fcc0fa9addf41a793c1d7f11602c8 (diff)
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Conflicts: avmedia/inc/avmedia/mediaitem.hxx avmedia/prj/build.lst avmedia/source/framework/mediaitem.cxx avmedia/source/gstreamer/gstcommon.hxx avmedia/source/gstreamer/gstframegrabber.cxx avmedia/source/gstreamer/gstframegrabber.hxx avmedia/source/gstreamer/gstmanager.cxx avmedia/source/gstreamer/gstmanager.hxx avmedia/source/gstreamer/gstplayer.cxx avmedia/source/gstreamer/gstplayer.hxx avmedia/source/gstreamer/gstuno.cxx avmedia/source/gstreamer/gstwindow.cxx avmedia/source/gstreamer/gstwindow.hxx avmedia/source/gstreamer/makefile.mk avmedia/source/quicktime/quicktimeuno.cxx avmedia/source/viewer/mediawindow.cxx avmedia/source/viewer/mediawindow_impl.cxx avmedia/source/viewer/mediawindow_impl.hxx avmedia/source/viewer/mediawindowbase_impl.cxx avmedia/source/win/winuno.cxx basic/inc/basic/basmgr.hxx basic/inc/basic/mybasic.hxx basic/inc/basic/process.hxx basic/inc/basic/sbmeth.hxx basic/inc/basic/sbmod.hxx basic/inc/basic/sbxdef.hxx basic/inc/basic/sbxvar.hxx basic/source/app/app.cxx basic/source/app/app.hxx basic/source/app/appbased.cxx basic/source/app/appedit.cxx basic/source/app/appwin.cxx basic/source/app/appwin.hxx basic/source/app/brkpnts.cxx basic/source/app/brkpnts.hxx basic/source/app/dialogs.cxx basic/source/app/dialogs.hxx basic/source/app/msgedit.cxx basic/source/app/mybasic.cxx basic/source/app/process.cxx basic/source/app/processw.hxx basic/source/app/textedit.cxx basic/source/basmgr/basicmanagerrepository.cxx basic/source/basmgr/basmgr.cxx basic/source/classes/disas.cxx basic/source/classes/eventatt.cxx basic/source/classes/image.cxx basic/source/classes/sb.cxx basic/source/classes/sbunoobj.cxx basic/source/classes/sbxmod.cxx basic/source/comp/codegen.cxx basic/source/comp/dim.cxx basic/source/comp/exprgen.cxx basic/source/comp/exprnode.cxx basic/source/comp/exprtree.cxx basic/source/comp/sbcomp.cxx basic/source/inc/expr.hxx basic/source/inc/object.hxx basic/source/inc/sbunoobj.hxx basic/source/runtime/dllmgr-x86.cxx basic/source/runtime/iosys.cxx basic/source/runtime/makefile.mk basic/source/runtime/methods.cxx basic/source/runtime/methods1.cxx basic/source/runtime/runtime.cxx basic/source/runtime/stdobj.cxx basic/source/runtime/step0.cxx basic/source/runtime/step1.cxx basic/source/runtime/step2.cxx basic/source/sbx/sbxarray.cxx basic/source/sbx/sbxbase.cxx basic/source/sbx/sbxbool.cxx basic/source/sbx/sbxbyte.cxx basic/source/sbx/sbxcoll.cxx basic/source/sbx/sbxconv.hxx basic/source/sbx/sbxcurr.cxx basic/source/sbx/sbxexec.cxx basic/source/sbx/sbxint.cxx basic/source/sbx/sbxobj.cxx basic/source/sbx/sbxscan.cxx basic/source/sbx/sbxstr.cxx basic/source/sbx/sbxvals.cxx basic/source/sbx/sbxvalue.cxx basic/source/sbx/sbxvar.cxx basic/workben/mgrtest.cxx configmgr/prj/build.lst configmgr/source/access.cxx configmgr/source/configurationprovider.cxx configmgr/source/defaultprovider.cxx configmgr/source/pad.cxx configmgr/source/services.cxx configmgr/source/update.cxx configmgr/source/xmlreader.cxx configmgr/source/xmlreader.hxx connectivity/prj/build.lst connectivity/qa/complex/connectivity/TestCase.java connectivity/source/cpool/Zregistration.cxx connectivity/source/drivers/adabas/Bservices.cxx connectivity/source/drivers/ado/Aservices.cxx connectivity/source/drivers/calc/Cservices.cxx connectivity/source/drivers/calc/makefile.mk connectivity/source/drivers/dbase/DIndex.cxx connectivity/source/drivers/dbase/DIndexIter.cxx connectivity/source/drivers/dbase/DNoException.cxx connectivity/source/drivers/dbase/DTable.cxx connectivity/source/drivers/dbase/Dservices.cxx connectivity/source/drivers/dbase/dindexnode.cxx connectivity/source/drivers/evoab/LNoException.cxx connectivity/source/drivers/evoab/LServices.cxx connectivity/source/drivers/evoab2/NServices.cxx connectivity/source/drivers/file/FNoException.cxx connectivity/source/drivers/file/FPreparedStatement.cxx connectivity/source/drivers/file/FResultSet.cxx connectivity/source/drivers/file/FStatement.cxx connectivity/source/drivers/file/quotedstring.cxx connectivity/source/drivers/flat/ETable.cxx connectivity/source/drivers/flat/Eservices.cxx connectivity/source/drivers/hsqldb/Hservices.cxx connectivity/source/drivers/jdbc/jservices.cxx connectivity/source/drivers/kab/KServices.cxx connectivity/source/drivers/macab/MacabServices.cxx connectivity/source/drivers/mozab/MResultSet.cxx connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx connectivity/source/drivers/mysql/Yservices.cxx connectivity/source/drivers/odbc/OFunctions.cxx connectivity/source/drivers/odbc/oservices.cxx connectivity/source/inc/dbase/DIndexPage.hxx connectivity/source/inc/file/FTable.hxx connectivity/source/manager/mregistration.cxx connectivity/source/parse/PColumn.cxx desktop/prj/build.lst desktop/qa/deployment_misc/test_dp_version.cxx desktop/source/app/app.cxx desktop/source/app/appfirststart.cxx desktop/source/app/cmdlineargs.cxx desktop/source/app/cmdlineargs.hxx desktop/source/app/sofficemain.cxx desktop/source/deployment/gui/dp_gui.hrc desktop/source/deployment/gui/dp_gui_dialog2.cxx desktop/source/deployment/gui/dp_gui_dialog2.hxx desktop/source/deployment/gui/dp_gui_updatedialog.cxx desktop/source/deployment/gui/dp_gui_updatedialog.hxx desktop/source/deployment/manager/dp_extensionmanager.cxx desktop/source/deployment/manager/dp_extensionmanager.hxx desktop/source/deployment/misc/dp_misc.src desktop/source/deployment/registry/component/dp_component.cxx desktop/source/deployment/registry/configuration/dp_configuration.cxx desktop/source/deployment/registry/dp_backend.cxx desktop/source/deployment/registry/help/dp_help.cxx desktop/source/deployment/registry/script/dp_script.cxx desktop/source/migration/pages.cxx desktop/source/migration/pages.hxx desktop/source/migration/wizard.cxx desktop/source/migration/wizard.hrc desktop/source/migration/wizard.hxx desktop/source/migration/wizard.src desktop/source/pkgchk/unopkg/unopkg_shared.h desktop/source/so_comp/services.cxx desktop/source/splash/makefile.mk desktop/source/splash/services_spl.cxx desktop/source/splash/splash.cxx drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx editeng/inc/editeng/adjitem.hxx editeng/inc/editeng/bolnitem.hxx editeng/inc/editeng/borderline.hxx editeng/inc/editeng/boxitem.hxx editeng/inc/editeng/brkitem.hxx editeng/inc/editeng/brshitem.hxx editeng/inc/editeng/bulitem.hxx editeng/inc/editeng/charreliefitem.hxx editeng/inc/editeng/charrotateitem.hxx editeng/inc/editeng/charscaleitem.hxx editeng/inc/editeng/cmapitem.hxx editeng/inc/editeng/colritem.hxx editeng/inc/editeng/crsditem.hxx editeng/inc/editeng/editdata.hxx editeng/inc/editeng/editeng.hxx editeng/inc/editeng/editobj.hxx editeng/inc/editeng/editstat.hxx editeng/inc/editeng/editview.hxx editeng/inc/editeng/emphitem.hxx editeng/inc/editeng/escpitem.hxx editeng/inc/editeng/fhgtitem.hxx editeng/inc/editeng/flstitem.hxx editeng/inc/editeng/fontitem.hxx editeng/inc/editeng/frmdiritem.hxx editeng/inc/editeng/fwdtitem.hxx editeng/inc/editeng/hyznitem.hxx editeng/inc/editeng/kernitem.hxx editeng/inc/editeng/langitem.hxx editeng/inc/editeng/lrspitem.hxx editeng/inc/editeng/lspcitem.hxx editeng/inc/editeng/numitem.hxx editeng/inc/editeng/outliner.hxx editeng/inc/editeng/paravertalignitem.hxx editeng/inc/editeng/pmdlitem.hxx editeng/inc/editeng/postitem.hxx editeng/inc/editeng/protitem.hxx editeng/inc/editeng/shaditem.hxx editeng/inc/editeng/sizeitem.hxx editeng/inc/editeng/svxacorr.hxx editeng/inc/editeng/svxfont.hxx editeng/inc/editeng/svxrtf.hxx editeng/inc/editeng/swafopt.hxx editeng/inc/editeng/tstpitem.hxx editeng/inc/editeng/twolinesitem.hxx editeng/inc/editeng/txtrange.hxx editeng/inc/editeng/udlnitem.hxx editeng/inc/editeng/ulspitem.hxx editeng/inc/editeng/wghtitem.hxx editeng/inc/editeng/writingmodeitem.hxx editeng/inc/editeng/xmlcnitm.hxx editeng/inc/helpid.hrc editeng/inc/pch/precompiled_editeng.hxx editeng/source/editeng/editdbg.cxx editeng/source/editeng/editdoc.cxx editeng/source/editeng/editdoc.hxx editeng/source/editeng/editdoc2.cxx editeng/source/editeng/editeng.cxx editeng/source/editeng/editobj.cxx editeng/source/editeng/editobj2.hxx editeng/source/editeng/editsel.cxx editeng/source/editeng/editundo.cxx editeng/source/editeng/editundo.hxx editeng/source/editeng/editview.cxx editeng/source/editeng/edtspell.hxx editeng/source/editeng/eehtml.cxx editeng/source/editeng/eehtml.hxx editeng/source/editeng/eeobj.cxx editeng/source/editeng/eerdll.cxx editeng/source/editeng/eertfpar.cxx editeng/source/editeng/impedit.cxx editeng/source/editeng/impedit.hxx editeng/source/editeng/impedit2.cxx editeng/source/editeng/impedit3.cxx editeng/source/editeng/impedit4.cxx editeng/source/editeng/impedit5.cxx editeng/source/editeng/makefile.mk editeng/source/items/bulitem.cxx editeng/source/items/charhiddenitem.cxx editeng/source/items/flditem.cxx editeng/source/items/frmitems.cxx editeng/source/items/makefile.mk editeng/source/items/numitem.cxx editeng/source/items/paraitem.cxx editeng/source/items/svxfont.cxx editeng/source/items/textitem.cxx editeng/source/items/writingmodeitem.cxx editeng/source/items/xmlcnitm.cxx editeng/source/misc/SvXMLAutoCorrectImport.cxx editeng/source/misc/svxacorr.cxx editeng/source/misc/txtrange.cxx editeng/source/misc/unolingu.cxx editeng/source/outliner/outleeng.cxx editeng/source/outliner/outliner.cxx editeng/source/outliner/outlundo.hxx editeng/source/outliner/outlvw.cxx editeng/source/outliner/paralist.cxx editeng/source/outliner/paralist.hxx editeng/source/rtf/rtfgrf.cxx editeng/source/rtf/rtfitem.cxx editeng/source/rtf/svxrtf.cxx editeng/source/uno/unoipset.cxx editeng/util/makefile.mk embeddedobj/prj/build.lst embeddedobj/source/commonembedding/miscobj.cxx eventattacher/prj/build.lst fileaccess/source/FileAccess.cxx formula/inc/formula/FormulaCompiler.hxx formula/inc/formula/token.hxx formula/inc/formula/tokenarray.hxx formula/source/core/api/FormulaCompiler.cxx formula/source/core/api/token.cxx formula/source/ui/dlg/FormulaHelper.cxx formula/source/ui/dlg/formula.cxx formula/source/ui/dlg/parawin.cxx formula/source/ui/dlg/structpg.cxx fpicker/prj/d.lst fpicker/source/aqua/FPentry.cxx fpicker/source/office/OfficeControlAccess.cxx fpicker/source/office/iodlg.cxx fpicker/source/office/iodlg.hxx fpicker/source/office/iodlg.src fpicker/source/office/iodlgimp.cxx fpicker/source/unx/gnome/FPentry.cxx fpicker/source/unx/gnome/SalGtkFilePicker.cxx fpicker/source/unx/gnome/SalGtkPicker.cxx fpicker/source/unx/kde4/KDE4FPEntry.cxx fpicker/source/win32/filepicker/FPentry.cxx framework/AllLangResTarget_fwe.mk framework/inc/dispatch/interaction.hxx framework/inc/framework/addonmenu.hxx framework/inc/framework/addonsoptions.hxx framework/inc/framework/bmkmenu.hxx framework/inc/framework/imageproducer.hxx framework/inc/framework/sfxhelperfunctions.hxx framework/inc/framework/statusbarconfiguration.hxx framework/inc/framework/titlehelper.hxx framework/inc/framework/toolboxconfiguration.hxx framework/inc/threadhelp/lockhelper.hxx framework/inc/xml/eventsdocumenthandler.hxx framework/inc/xml/statusbardocumenthandler.hxx framework/inc/xml/toolboxconfiguration.hxx framework/inc/xml/toolboxconfigurationdefines.hxx framework/inc/xml/toolboxdocumenthandler.hxx framework/prj/build.lst framework/qa/complex/ModuleManager/makefile.mk framework/qa/complex/accelerators/makefile.mk framework/qa/complex/framework/recovery/makefile.mk framework/qa/complex/imageManager/_XInitialization.java framework/source/classes/menumanager.cxx framework/source/dispatch/interaction.cxx framework/source/fwe/classes/bmkmenu.cxx framework/source/fwe/helper/actiontriggerhelper.cxx framework/source/fwe/helper/imageproducer.cxx framework/source/fwe/xml/menuconfiguration.cxx framework/source/fwe/xml/toolboxdocumenthandler.cxx framework/source/helper/uiconfigelementwrapperbase.cxx framework/source/helper/uielementwrapperbase.cxx framework/source/inc/pattern/window.hxx framework/source/jobs/jobdata.cxx framework/source/layoutmanager/layoutmanager.cxx framework/source/layoutmanager/panel.hxx framework/source/loadenv/loadenv.cxx framework/source/register/registerservices.cxx framework/source/services/menudocumenthandler.cxx framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx framework/source/uiconfiguration/uiconfigurationmanager.cxx framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx framework/source/uielement/addonstoolbarmanager.cxx framework/source/uielement/controlmenucontroller.cxx framework/source/uielement/fontsizemenucontroller.cxx framework/source/uielement/imagebuttontoolbarcontroller.cxx framework/source/uielement/macrosmenucontroller.cxx framework/source/uielement/menubarmanager.cxx framework/source/uielement/newmenucontroller.cxx framework/source/uielement/togglebuttontoolbarcontroller.cxx framework/source/uielement/toolbarmanager.cxx framework/source/uielement/toolbarsmenucontroller.cxx framework/test/makefile.mk framework/test/threadtest/makefile.mk framework/test/typecfg/makefile.mk framework/util/guiapps/makefile.mk framework/util/makefile.mk idl/inc/bastype.hxx idl/inc/hash.hxx idl/inc/lex.hxx idl/inc/module.hxx idl/inc/object.hxx idl/inc/slot.hxx idl/inc/types.hxx idl/source/cmptools/hash.cxx idl/source/cmptools/lex.cxx idl/source/objects/basobj.cxx idl/source/objects/bastype.cxx idl/source/objects/module.cxx idl/source/objects/object.cxx idl/source/objects/slot.cxx idl/source/objects/types.cxx idl/source/prj/command.cxx idl/source/prj/database.cxx idl/source/prj/globals.cxx idl/source/prj/svidl.cxx linguistic/inc/linguistic/misc.hxx linguistic/prj/build.lst linguistic/source/convdic.cxx linguistic/source/convdiclist.cxx linguistic/source/dicimp.cxx linguistic/source/dlistimp.cxx linguistic/source/gciterator.cxx linguistic/source/iprcache.cxx linguistic/source/lngopt.cxx linguistic/source/lngprophelp.cxx linguistic/source/lngsvcmgr.cxx linguistic/source/lngsvcmgr.hxx linguistic/source/misc2.cxx linguistic/workben/sprophelp.cxx officecfg/registry/data/org/openoffice/VCL.xcu officecfg/util/makefile.mk oovbaapi/ooo/vba/XApplicationBase.idl oovbaapi/ooo/vba/XVBAAppService.idl oovbaapi/ooo/vba/XVBADocService.idl oovbaapi/ooo/vba/excel/XApplication.idl oovbaapi/ooo/vba/excel/XRange.idl oovbaapi/ooo/vba/excel/XWorkbook.idl oovbaapi/ooo/vba/excel/XWorksheet.idl oovbaapi/ooo/vba/word/XApplication.idl oovbaapi/ooo/vba/word/XGlobals.idl oovbaapi/ooo/vba/word/XTableOfContents.idl readlicense_oo/prj/build.lst scripting/prj/build.lst scripting/prj/d.lst scripting/source/basprov/basprov.cxx scripting/source/basprov/basscript.cxx scripting/source/basprov/basscript.hxx scripting/source/dlgprov/dlgprov.cxx scripting/source/inc/util/util.hxx scripting/source/protocolhandler/scripthandler.cxx scripting/source/provider/ProviderCache.cxx scripting/source/pyprov/makefile.mk scripting/source/runtimemgr/ScriptNameResolverImpl.cxx scripting/source/runtimemgr/ScriptRuntimeManager.cxx scripting/source/runtimemgr/StorageBridge.cxx scripting/source/storage/ScriptMetadataImporter.cxx scripting/source/storage/ScriptSecurityManager.cxx scripting/source/storage/ScriptStorage.cxx scripting/source/storage/ScriptStorageManager.cxx sfx2/inc/about.hxx sfx2/inc/brokenpackageint.hxx sfx2/inc/docvor.hxx sfx2/inc/pch/precompiled_sfx2.hxx sfx2/inc/sfx2/app.hxx sfx2/inc/sfx2/basmgr.hxx sfx2/inc/sfx2/bindings.hxx sfx2/inc/sfx2/childwin.hxx sfx2/inc/sfx2/ctrlitem.hxx sfx2/inc/sfx2/dinfdlg.hxx sfx2/inc/sfx2/dispatch.hxx sfx2/inc/sfx2/docfilt.hxx sfx2/inc/sfx2/evntconf.hxx sfx2/inc/sfx2/fcontnr.hxx sfx2/inc/sfx2/frame.hxx sfx2/inc/sfx2/imagemgr.hxx sfx2/inc/sfx2/imgmgr.hxx sfx2/inc/sfx2/linksrc.hxx sfx2/inc/sfx2/macrconf.hxx sfx2/inc/sfx2/macropg.hxx sfx2/inc/sfx2/mnuitem.hxx sfx2/inc/sfx2/mnumgr.hxx sfx2/inc/sfx2/module.hxx sfx2/inc/sfx2/msg.hxx sfx2/inc/sfx2/objsh.hxx sfx2/inc/sfx2/passwd.hxx sfx2/inc/sfx2/prnmon.hxx sfx2/inc/sfx2/request.hxx sfx2/inc/sfx2/sfx.hrc sfx2/inc/sfx2/sfxbasemodel.hxx sfx2/inc/sfx2/sfxhtml.hxx sfx2/inc/sfx2/sfxresid.hxx sfx2/inc/sfx2/sfxsids.hrc sfx2/inc/sfx2/sfxuno.hxx sfx2/inc/sfx2/shell.hxx sfx2/inc/sfx2/stbitem.hxx sfx2/inc/sfx2/styfitem.hxx sfx2/inc/sfx2/tabdlg.hxx sfx2/inc/sfx2/tbxctrl.hxx sfx2/inc/sfx2/tplpitem.hxx sfx2/inc/sfx2/viewfrm.hxx sfx2/inc/sfx2/viewsh.hxx sfx2/inc/sfxbasic.hxx sfx2/inc/sorgitm.hxx sfx2/prj/build.lst sfx2/qa/complex/docinfo/makefile.mk sfx2/qa/cppunit/makefile.mk sfx2/sdi/makefile.mk sfx2/source/appl/app.cxx sfx2/source/appl/app.hrc sfx2/source/appl/app.src sfx2/source/appl/appbas.cxx sfx2/source/appl/appcfg.cxx sfx2/source/appl/appchild.cxx sfx2/source/appl/appmain.cxx sfx2/source/appl/appmisc.cxx sfx2/source/appl/appopen.cxx sfx2/source/appl/appquit.cxx sfx2/source/appl/appserv.cxx sfx2/source/appl/appuno.cxx sfx2/source/appl/childwin.cxx sfx2/source/appl/fileobj.cxx sfx2/source/appl/helpinterceptor.cxx sfx2/source/appl/imagemgr.cxx sfx2/source/appl/impldde.cxx sfx2/source/appl/impldde.hxx sfx2/source/appl/linkmgr2.cxx sfx2/source/appl/lnkbase2.cxx sfx2/source/appl/makefile.mk sfx2/source/appl/module.cxx sfx2/source/appl/newhelp.cxx sfx2/source/appl/opengrf.cxx sfx2/source/appl/sfxdll.cxx sfx2/source/appl/sfxhelp.cxx sfx2/source/appl/shutdownicon.cxx sfx2/source/appl/shutdowniconunx.cxx sfx2/source/appl/workwin.cxx sfx2/source/bastyp/fltfnc.cxx sfx2/source/bastyp/frmhtml.cxx sfx2/source/bastyp/frmhtmlw.cxx sfx2/source/bastyp/helper.cxx sfx2/source/bastyp/minarray.cxx sfx2/source/bastyp/progress.cxx sfx2/source/bastyp/sfxhtml.cxx sfx2/source/config/evntconf.cxx sfx2/source/control/bindings.cxx sfx2/source/control/ctrlitem.cxx sfx2/source/control/dispatch.cxx sfx2/source/control/macrconf.cxx sfx2/source/control/macro.cxx sfx2/source/control/makefile.mk sfx2/source/control/minfitem.cxx sfx2/source/control/msg.cxx sfx2/source/control/msgpool.cxx sfx2/source/control/objface.cxx sfx2/source/control/request.cxx sfx2/source/control/shell.cxx sfx2/source/control/sorgitm.cxx sfx2/source/dialog/about.cxx sfx2/source/dialog/basedlgs.cxx sfx2/source/dialog/dinfdlg.cxx sfx2/source/dialog/dinfedt.cxx sfx2/source/dialog/dockwin.cxx sfx2/source/dialog/filedlghelper.cxx sfx2/source/dialog/mailmodel.cxx sfx2/source/dialog/mailmodelapi.cxx sfx2/source/dialog/makefile.mk sfx2/source/dialog/mgetempl.cxx sfx2/source/dialog/passwd.cxx sfx2/source/dialog/passwd.hrc sfx2/source/dialog/printopt.cxx sfx2/source/dialog/securitypage.cxx sfx2/source/dialog/splitwin.cxx sfx2/source/dialog/styfitem.cxx sfx2/source/dialog/tabdlg.cxx sfx2/source/dialog/taskpane.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/dialog/tplpitem.cxx sfx2/source/dialog/versdlg.cxx sfx2/source/doc/QuerySaveDocument.cxx sfx2/source/doc/SfxDocumentMetaData.cxx sfx2/source/doc/applet.cxx sfx2/source/doc/doc.hrc sfx2/source/doc/doc.src sfx2/source/doc/docfile.cxx sfx2/source/doc/docinf.cxx sfx2/source/doc/doctempl.cxx sfx2/source/doc/doctemplates.cxx sfx2/source/doc/docvor.cxx sfx2/source/doc/guisaveas.cxx sfx2/source/doc/makefile.mk sfx2/source/doc/objcont.cxx sfx2/source/doc/objitem.cxx sfx2/source/doc/objmisc.cxx sfx2/source/doc/objserv.cxx sfx2/source/doc/printhelper.cxx sfx2/source/doc/sfxacldetect.cxx sfx2/source/doc/sfxbasemodel.cxx sfx2/source/inc/applet.hxx sfx2/source/inc/fltoptint.hxx sfx2/source/inc/sfxlocal.hrc sfx2/source/inc/virtmenu.hxx sfx2/source/inc/workwin.hxx sfx2/source/menu/mnuitem.cxx sfx2/source/menu/objmnctl.cxx sfx2/source/menu/virtmenu.cxx sfx2/source/notify/eventsupplier.cxx sfx2/source/notify/makefile.mk sfx2/source/toolbox/imgmgr.cxx sfx2/source/toolbox/tbxitem.cxx sfx2/source/view/frame.cxx sfx2/source/view/orgmgr.cxx sfx2/source/view/printer.cxx sfx2/source/view/prnmon.cxx sfx2/source/view/viewfrm.cxx sfx2/source/view/viewprn.cxx sfx2/source/view/viewsh.cxx sfx2/util/makefile.mk sfx2/workben/custompanel/makefile.mk shell/source/backends/desktopbe/desktopbackend.cxx shell/source/backends/gconfbe/gconfbackend.cxx shell/source/backends/kde4be/kde4backend.cxx shell/source/backends/kdebe/kdebackend.cxx shell/source/win32/SysShentry.cxx shell/source/win32/shlxthandler/propsheets/propsheets.cxx shell/source/win32/simplemail/smplmailentry.cxx svx/inc/float3d.hrc svx/inc/fmhelp.hrc svx/inc/globlmn_tmpl.hrc svx/inc/helpid.hrc svx/inc/pch/precompiled_svx.hxx svx/inc/sjctrl.hxx svx/inc/srchitem.hxx svx/inc/svdibrow.hxx svx/inc/svx/SmartTagItem.hxx svx/inc/svx/algitem.hxx svx/inc/svx/camera3d.hxx svx/inc/svx/chrtitem.hxx svx/inc/svx/clipfmtitem.hxx svx/inc/svx/ctredlin.hxx svx/inc/svx/dbtoolsclient.hxx svx/inc/svx/deflt3d.hxx svx/inc/svx/dialogs.hrc svx/inc/svx/drawitem.hxx svx/inc/svx/e3ditem.hxx svx/inc/svx/extrud3d.hxx svx/inc/svx/flagsdef.hxx svx/inc/svx/float3d.hxx svx/inc/svx/frmsel.hxx svx/inc/svx/gallery.hxx svx/inc/svx/gallery1.hxx svx/inc/svx/galtheme.hxx svx/inc/svx/grfcrop.hxx svx/inc/svx/hdft.hxx svx/inc/svx/hlnkitem.hxx svx/inc/svx/hyprlink.hxx svx/inc/svx/itemwin.hxx svx/inc/svx/lathe3d.hxx svx/inc/svx/linkwarn.hxx svx/inc/svx/modctrl.hxx svx/inc/svx/msdffdef.hxx svx/inc/svx/obj3d.hxx svx/inc/svx/optgenrl.hxx svx/inc/svx/optgrid.hxx svx/inc/svx/pageitem.hxx svx/inc/svx/paraprev.hxx svx/inc/svx/postattr.hxx svx/inc/svx/rotmodit.hxx svx/inc/svx/ruler.hxx svx/inc/svx/rulritem.hxx svx/inc/svx/scene3d.hxx svx/inc/svx/sdasaitm.hxx svx/inc/svx/sdasitm.hxx svx/inc/svx/sdggaitm.hxx svx/inc/svx/sdmetitm.hxx svx/inc/svx/sdtaaitm.hxx svx/inc/svx/sdtaditm.hxx svx/inc/svx/sdtaitm.hxx svx/inc/svx/sdtakitm.hxx svx/inc/svx/sdtfchim.hxx svx/inc/svx/sdtfsitm.hxx svx/inc/svx/srchdlg.hxx svx/inc/svx/svddrag.hxx svx/inc/svx/svdetc.hxx svx/inc/svx/svdglue.hxx svx/inc/svx/svdhlpln.hxx svx/inc/svx/svdlayer.hxx svx/inc/svx/svdmark.hxx svx/inc/svx/svdmodel.hxx svx/inc/svx/svdoashp.hxx svx/inc/svx/svdobj.hxx svx/inc/svx/svdocirc.hxx svx/inc/svx/svdoedge.hxx svx/inc/svx/svdogrp.hxx svx/inc/svx/svdomeas.hxx svx/inc/svx/svdoole2.hxx svx/inc/svx/svdorect.hxx svx/inc/svx/svdotable.hxx svx/inc/svx/svdotext.hxx svx/inc/svx/svdovirt.hxx svx/inc/svx/svdpage.hxx svx/inc/svx/svdsnpv.hxx svx/inc/svx/svdtrans.hxx svx/inc/svx/svdundo.hxx svx/inc/svx/svimbase.hxx svx/inc/svx/svx3ditems.hxx svx/inc/svx/svxdlg.hxx svx/inc/svx/sxcikitm.hxx svx/inc/svx/sxekitm.hxx svx/inc/svx/sxelditm.hxx svx/inc/svx/sxenditm.hxx svx/inc/svx/sxmkitm.hxx svx/inc/svx/sxmtpitm.hxx svx/inc/svx/sxmuitm.hxx svx/inc/svx/tabarea.hxx svx/inc/svx/tabline.hxx svx/inc/svx/unoprov.hxx svx/inc/svx/viewlayoutitem.hxx svx/inc/svx/xbitmap.hxx svx/inc/svx/xbtmpit.hxx svx/inc/svx/xcolit.hxx svx/inc/svx/xfillit0.hxx svx/inc/svx/xflclit.hxx svx/inc/svx/xflftrit.hxx svx/inc/svx/xflgrit.hxx svx/inc/svx/xflhtit.hxx svx/inc/svx/xftadit.hxx svx/inc/svx/xftsfit.hxx svx/inc/svx/xftshit.hxx svx/inc/svx/xlineit0.hxx svx/inc/svx/xlinjoit.hxx svx/inc/svx/xlnclit.hxx svx/inc/svx/xlndsit.hxx svx/inc/svx/xlnedcit.hxx svx/inc/svx/xlnedit.hxx svx/inc/svx/xlnedwit.hxx svx/inc/svx/xlnstcit.hxx svx/inc/svx/xlnstit.hxx svx/inc/svx/xlnstwit.hxx svx/inc/svx/xlnwtit.hxx svx/inc/svx/xtextit0.hxx svx/inc/svx/zoomitem.hxx svx/inc/svx/zoomslideritem.hxx svx/inc/xpolyimp.hxx svx/inc/zoom_def.hxx svx/prj/d.lst svx/source/accessibility/AccessibleShape.cxx svx/source/accessibility/DescriptionGenerator.cxx svx/source/customshapes/EnhancedCustomShapeEngine.cxx svx/source/customshapes/EnhancedCustomShapeFontWork.cxx svx/source/dialog/_bmpmask.cxx svx/source/dialog/_contdlg.cxx svx/source/dialog/connctrl.cxx svx/source/dialog/contwnd.cxx svx/source/dialog/ctredlin.cxx svx/source/dialog/ctredlin.hrc svx/source/dialog/ctredlin.src svx/source/dialog/dialcontrol.cxx svx/source/dialog/dlgctrl.cxx svx/source/dialog/docrecovery.cxx svx/source/dialog/fntctrl.cxx svx/source/dialog/fontwork.cxx svx/source/dialog/frmsel.cxx svx/source/dialog/graphctl.cxx svx/source/dialog/grfflt.cxx svx/source/dialog/hdft.cxx svx/source/dialog/hyperdlg.cxx svx/source/dialog/hyprdlg.hxx svx/source/dialog/hyprlink.cxx svx/source/dialog/hyprlink.hxx svx/source/dialog/hyprlink.src svx/source/dialog/imapdlg.cxx svx/source/dialog/imapwnd.cxx svx/source/dialog/linkwarn.hrc svx/source/dialog/makefile.mk svx/source/dialog/optgrid.cxx svx/source/dialog/orienthelper.cxx svx/source/dialog/pagectrl.cxx svx/source/dialog/prtqry.cxx svx/source/dialog/rlrcitem.cxx svx/source/dialog/rubydialog.cxx svx/source/dialog/rulritem.cxx svx/source/dialog/simptabl.cxx svx/source/dialog/srchdlg.cxx svx/source/dialog/svxbmpnumvalueset.cxx svx/source/dialog/svxruler.cxx svx/source/dialog/swframeexample.cxx svx/source/engine3d/float3d.cxx svx/source/engine3d/float3d.src svx/source/engine3d/svx3ditems.cxx svx/source/fmcomp/gridctrl.cxx svx/source/fmcomp/trace.cxx svx/source/form/ParseContext.cxx svx/source/form/datanavi.cxx svx/source/form/filtnav.cxx svx/source/form/fmexch.cxx svx/source/form/fmexpl.cxx svx/source/form/fmobjfac.cxx svx/source/form/fmpage.cxx svx/source/form/fmshell.cxx svx/source/form/fmshimp.cxx svx/source/form/fmsrcimp.cxx svx/source/form/fmvwimp.cxx svx/source/form/makefile.mk svx/source/form/tabwin.cxx svx/source/form/tbxform.cxx svx/source/form/typemap.cxx svx/source/gallery2/galbrws1.cxx svx/source/gallery2/galbrws2.cxx svx/source/gallery2/galexpl.cxx svx/source/gallery2/gallery1.cxx svx/source/gallery2/galtheme.cxx svx/source/gallery2/makefile.mk svx/source/gengal/gengal.cxx svx/source/gengal/makefile.mk svx/source/inc/fmgroup.hxx svx/source/intro/about_ooo.hrc svx/source/intro/iso.src svx/source/intro/ooo.src svx/source/items/SmartTagItem.cxx svx/source/items/algitem.cxx svx/source/items/chrtitem.cxx svx/source/items/clipfmtitem.cxx svx/source/items/customshapeitem.cxx svx/source/items/drawitem.cxx svx/source/items/e3ditem.cxx svx/source/items/grfitem.cxx svx/source/items/hlnkitem.cxx svx/source/items/makefile.mk svx/source/items/pageitem.cxx svx/source/items/rotmodit.cxx svx/source/items/viewlayoutitem.cxx svx/source/items/zoomitem.cxx svx/source/items/zoomslideritem.cxx svx/source/src/app.hrc svx/source/stbctrls/makefile.mk svx/source/stbctrls/modctrl.cxx svx/source/stbctrls/xmlsecctrl.cxx svx/source/stbctrls/zoomctrl.cxx svx/source/svdraw/clonelist.cxx svx/source/svdraw/svdattr.cxx svx/source/svdraw/svdcrtv.cxx svx/source/svdraw/svdedtv1.cxx svx/source/svdraw/svdedtv2.cxx svx/source/svdraw/svdedxv.cxx svx/source/svdraw/svdetc.cxx svx/source/svdraw/svdfmtf.cxx svx/source/svdraw/svdfmtf.hxx svx/source/svdraw/svdglue.cxx svx/source/svdraw/svdhdl.cxx svx/source/svdraw/svdhlpln.cxx svx/source/svdraw/svdibrow.cxx svx/source/svdraw/svdlayer.cxx svx/source/svdraw/svdmodel.cxx svx/source/svdraw/svdoashp.cxx svx/source/svdraw/svdobj.cxx svx/source/svdraw/svdocapt.cxx svx/source/svdraw/svdocirc.cxx svx/source/svdraw/svdoedge.cxx svx/source/svdraw/svdograf.cxx svx/source/svdraw/svdogrp.cxx svx/source/svdraw/svdomeas.cxx svx/source/svdraw/svdomedia.cxx svx/source/svdraw/svdopath.cxx svx/source/svdraw/svdotext.cxx svx/source/svdraw/svdotxdr.cxx svx/source/svdraw/svdotxed.cxx svx/source/svdraw/svdotxfl.cxx svx/source/svdraw/svdotxln.cxx svx/source/svdraw/svdotxtr.cxx svx/source/svdraw/svdoutl.cxx svx/source/svdraw/svdpage.cxx svx/source/svdraw/svdpagv.cxx svx/source/svdraw/svdpntv.cxx svx/source/svdraw/svdpoev.cxx svx/source/svdraw/svdsnpv.cxx svx/source/svdraw/svdstr.src svx/source/svdraw/svdtrans.cxx svx/source/svdraw/svdundo.cxx svx/source/svdraw/svdview.cxx svx/source/svdraw/svdxcgv.cxx svx/source/table/svdotable.cxx svx/source/tbxctrls/colorwindow.hxx svx/source/tbxctrls/extrusioncontrols.cxx svx/source/tbxctrls/fillctrl.cxx svx/source/tbxctrls/grafctrl.cxx svx/source/tbxctrls/itemwin.cxx svx/source/tbxctrls/layctrl.cxx svx/source/tbxctrls/lboxctrl.cxx svx/source/tbxctrls/linectrl.cxx svx/source/tbxctrls/tbcontrl.cxx svx/source/tbxctrls/verttexttbxctrl.cxx svx/source/unodraw/unomod.cxx svx/source/unodraw/unopage.cxx svx/source/unodraw/unoprov.cxx svx/source/unodraw/unoshape.cxx svx/source/unodraw/unoshtxt.cxx svx/source/xml/xmlxtexp.cxx svx/source/xoutdev/_xpoly.cxx svx/source/xoutdev/xattr.cxx svx/source/xoutdev/xattr2.cxx svx/source/xoutdev/xattrbmp.cxx svx/source/xoutdev/xtabcolr.cxx svx/util/makefile.mk svx/workben/edittest.cxx sysui/desktop/productversion.mk ucb/prj/build.lst ucb/source/cacher/cacheserv.cxx ucb/source/core/ucb1.component ucb/source/core/ucbserv.cxx ucb/source/core/ucbstore.cxx ucb/source/core/ucbstore.hxx ucb/source/sorter/sortmain.cxx ucb/source/ucp/file/prov.cxx ucb/source/ucp/file/shell.cxx ucb/source/ucp/ftp/ftpservices.cxx ucb/source/ucp/gio/gio_provider.cxx ucb/source/ucp/gvfs/gvfs_provider.cxx ucb/source/ucp/hierarchy/hierarchyservices.cxx ucb/source/ucp/odma/odma_lib.cxx ucb/source/ucp/odma/odma_services.cxx ucb/source/ucp/package/pkgservices.cxx ucb/source/ucp/tdoc/tdoc_services.cxx ucb/source/ucp/webdav/ContentProperties.cxx ucb/source/ucp/webdav/NeonHeadRequest.cxx ucb/source/ucp/webdav/webdavcontent.cxx ucb/source/ucp/webdav/webdavservices.cxx uui/source/iahndl.cxx uui/source/iahndl.hxx uui/source/loginerr.hxx uui/source/nameclashdlg.hxx uui/source/passcrtdlg.cxx uui/source/passworddlg.cxx uui/source/passworddlg.hxx uui/source/services.cxx vbahelper/inc/vbahelper/vbahelper.hxx vbahelper/prj/build.lst vbahelper/prj/d.lst vbahelper/source/msforms/makefile.mk vbahelper/source/msforms/vbauserform.cxx vbahelper/source/vbahelper/makefile.mk vbahelper/source/vbahelper/vbaapplicationbase.cxx vbahelper/source/vbahelper/vbacommandbarcontrol.cxx vbahelper/source/vbahelper/vbadocumentbase.cxx vbahelper/source/vbahelper/vbadocumentsbase.cxx vbahelper/source/vbahelper/vbahelper.cxx vbahelper/util/makefile.mk xmlhelp/source/cxxhelp/provider/databases.cxx xmlhelp/source/cxxhelp/provider/services.cxx xmlhelp/source/treeview/tvfactory.cxx xmloff/JunitTest_xmloff_unoapi.mk xmloff/inc/functional.hxx xmloff/inc/xmloff/formlayerexport.hxx xmloff/inc/xmloff/formlayerimport.hxx xmloff/inc/xmloff/functional.hxx xmloff/inc/xmloff/shapeimport.hxx xmloff/inc/xmloff/xmlcnitm.hxx xmloff/inc/xmloff/xmlnumfi.hxx xmloff/prj/build.lst xmloff/source/chart/SchXMLChartContext.cxx xmloff/source/chart/SchXMLExport.cxx xmloff/source/chart/SchXMLImport.cxx xmloff/source/chart/SchXMLLegendContext.hxx xmloff/source/chart/SchXMLPlotAreaContext.cxx xmloff/source/core/xmluconv.cxx xmloff/source/draw/sdxmlexp.cxx xmloff/source/draw/shapeexport4.cxx xmloff/source/draw/ximp3dobject.cxx xmloff/source/draw/ximp3dscene.cxx xmloff/source/forms/formlayerexport.cxx xmloff/source/forms/formlayerimport.cxx xmloff/source/forms/handler/vcl_time_handler.hxx xmloff/source/forms/layerimport.cxx xmloff/source/forms/layerimport.hxx xmloff/source/forms/property_meta_data.hxx xmloff/source/style/PageHeaderFooterContext.cxx xmloff/source/style/PageMasterStyleMap.cxx xmloff/source/style/prstylei.cxx xmloff/source/style/xmlimppr.cxx xmloff/source/style/xmlnumfi.cxx xmloff/source/style/xmlstyle.cxx xmloff/source/table/tabledesignsimporter.cxx xmloff/source/text/XMLTextNumRuleInfo.cxx xmloff/source/text/XMLTextShapeStyleContext.cxx xmloff/source/text/txtstyle.cxx xmloff/source/transform/ChartOOoTContext.cxx xmloff/source/transform/EventOOoTContext.cxx xmloff/source/transform/TransformerBase.cxx xmloff/util/makefile.mk xmlscript/util/xcr.component
Diffstat (limited to 'editeng/source/items')
-rw-r--r--editeng/source/items/bulitem.cxx60
-rw-r--r--editeng/source/items/charhiddenitem.cxx4
-rw-r--r--editeng/source/items/flditem.cxx163
-rw-r--r--editeng/source/items/frmitems.cxx99
-rwxr-xr-x[-rw-r--r--]editeng/source/items/itemtype.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/items/justifyitem.cxx12
-rw-r--r--editeng/source/items/numitem.cxx155
-rwxr-xr-x[-rw-r--r--]editeng/source/items/optitems.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/items/page.src148
-rwxr-xr-x[-rw-r--r--]editeng/source/items/paperinf.cxx50
-rw-r--r--editeng/source/items/paraitem.cxx64
-rwxr-xr-x[-rw-r--r--]editeng/source/items/svdfield.cxx4
-rw-r--r--editeng/source/items/svxfont.cxx68
-rwxr-xr-x[-rw-r--r--]editeng/source/items/svxitems.src0
-rw-r--r--editeng/source/items/textitem.cxx516
-rw-r--r--editeng/source/items/writingmodeitem.cxx12
-rw-r--r--editeng/source/items/xmlcnitm.cxx42
17 files changed, 578 insertions, 819 deletions
diff --git a/editeng/source/items/bulitem.cxx b/editeng/source/items/bulitem.cxx
index 5b792d4bb7f0..abfc77c2792d 100644
--- a/editeng/source/items/bulitem.cxx
+++ b/editeng/source/items/bulitem.cxx
@@ -40,7 +40,7 @@
#include <tools/tenccvt.hxx>
-#define BULITEM_VERSION ((USHORT)2)
+#define BULITEM_VERSION ((sal_uInt16)2)
// -----------------------------------------------------------------------
@@ -50,20 +50,20 @@ TYPEINIT1(SvxBulletItem,SfxPoolItem);
void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
{
- USHORT nTemp;
+ sal_uInt16 nTemp;
rStream << rFont.GetColor();
- nTemp = (USHORT)rFont.GetFamily(); rStream << nTemp;
+ nTemp = (sal_uInt16)rFont.GetFamily(); rStream << nTemp;
- nTemp = (USHORT)GetSOStoreTextEncoding((rtl_TextEncoding)rFont.GetCharSet(), (sal_uInt16)rStream.GetVersion());
+ nTemp = (sal_uInt16)GetSOStoreTextEncoding((rtl_TextEncoding)rFont.GetCharSet(), (sal_uInt16)rStream.GetVersion());
rStream << nTemp;
- nTemp = (USHORT)rFont.GetPitch(); rStream << nTemp;
- nTemp = (USHORT)rFont.GetAlign(); rStream << nTemp;
- nTemp = (USHORT)rFont.GetWeight(); rStream << nTemp;
- nTemp = (USHORT)rFont.GetUnderline(); rStream << nTemp;
- nTemp = (USHORT)rFont.GetStrikeout(); rStream << nTemp;
- nTemp = (USHORT)rFont.GetItalic(); rStream << nTemp;
+ nTemp = (sal_uInt16)rFont.GetPitch(); rStream << nTemp;
+ nTemp = (sal_uInt16)rFont.GetAlign(); rStream << nTemp;
+ nTemp = (sal_uInt16)rFont.GetWeight(); rStream << nTemp;
+ nTemp = (sal_uInt16)rFont.GetUnderline(); rStream << nTemp;
+ nTemp = (sal_uInt16)rFont.GetStrikeout(); rStream << nTemp;
+ nTemp = (sal_uInt16)rFont.GetItalic(); rStream << nTemp;
// UNICODE: rStream << rFont.GetName();
rStream.WriteByteString(rFont.GetName());
@@ -75,12 +75,12 @@ void SvxBulletItem::StoreFont( SvStream& rStream, const Font& rFont )
// -----------------------------------------------------------------------
-Font SvxBulletItem::CreateFont( SvStream& rStream, USHORT nVer )
+Font SvxBulletItem::CreateFont( SvStream& rStream, sal_uInt16 nVer )
{
Font aFont;
Color aColor;
rStream >> aColor; aFont.SetColor( aColor );
- USHORT nTemp;
+ sal_uInt16 nTemp;
rStream >> nTemp; aFont.SetFamily((FontFamily)nTemp);
rStream >> nTemp;
@@ -106,7 +106,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, USHORT nVer )
aFont.SetSize( aSize );
}
- BOOL bTemp;
+ sal_Bool bTemp;
rStream >> bTemp; aFont.SetOutline( bTemp );
rStream >> bTemp; aFont.SetShadow( bTemp );
rStream >> bTemp; aFont.SetTransparent( bTemp );
@@ -116,7 +116,7 @@ Font SvxBulletItem::CreateFont( SvStream& rStream, USHORT nVer )
// -----------------------------------------------------------------------
-SvxBulletItem::SvxBulletItem( USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
{
SetDefaultFont_Impl();
SetDefaults_Impl();
@@ -125,7 +125,7 @@ SvxBulletItem::SvxBulletItem( USHORT _nWhich ) : SfxPoolItem( _nWhich )
// -----------------------------------------------------------------------
-SvxBulletItem::SvxBulletItem( BYTE nNewStyle, const Font& rFont, USHORT /*nStart*/, USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( sal_uInt8 nNewStyle, const Font& rFont, sal_uInt16 /*nStart*/, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
{
SetDefaults_Impl();
nStyle = nNewStyle;
@@ -135,7 +135,7 @@ SvxBulletItem::SvxBulletItem( BYTE nNewStyle, const Font& rFont, USHORT /*nStart
// -----------------------------------------------------------------------
-SvxBulletItem::SvxBulletItem( const Font& rFont, xub_Unicode cSymb, USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( const Font& rFont, xub_Unicode cSymb, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
{
SetDefaults_Impl();
aFont = rFont;
@@ -146,7 +146,7 @@ SvxBulletItem::SvxBulletItem( const Font& rFont, xub_Unicode cSymb, USHORT _nWhi
// -----------------------------------------------------------------------
-SvxBulletItem::SvxBulletItem( const Bitmap& rBmp, USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( const Bitmap& rBmp, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
{
SetDefaults_Impl();
@@ -161,7 +161,7 @@ SvxBulletItem::SvxBulletItem( const Bitmap& rBmp, USHORT _nWhich ) : SfxPoolItem
// -----------------------------------------------------------------------
-SvxBulletItem::SvxBulletItem( const GraphicObject& rGraphicObject, USHORT _nWhich ) : SfxPoolItem( _nWhich )
+SvxBulletItem::SvxBulletItem( const GraphicObject& rGraphicObject, sal_uInt16 _nWhich ) : SfxPoolItem( _nWhich )
{
SetDefaults_Impl();
@@ -176,7 +176,7 @@ SvxBulletItem::SvxBulletItem( const GraphicObject& rGraphicObject, USHORT _nWhic
// -----------------------------------------------------------------------
-SvxBulletItem::SvxBulletItem( SvStream& rStrm, USHORT _nWhich ) :
+SvxBulletItem::SvxBulletItem( SvStream& rStrm, sal_uInt16 _nWhich ) :
SfxPoolItem( _nWhich ),
pGraphicObject( NULL )
{
@@ -188,10 +188,10 @@ SvxBulletItem::SvxBulletItem( SvStream& rStrm, USHORT _nWhich ) :
{
// Safe Load with Test on empty Bitmap
Bitmap aBmp;
- const UINT32 nOldPos = rStrm.Tell();
+ const sal_uInt32 nOldPos = rStrm.Tell();
// Ignore Errorcode when reading Bitmap,
// see comment in SvxBulletItem::Store()
- BOOL bOldError = rStrm.GetError() ? TRUE : FALSE;
+ sal_Bool bOldError = rStrm.GetError() ? sal_True : sal_False;
rStrm >> aBmp;
if ( !bOldError && rStrm.GetError() )
{
@@ -260,7 +260,7 @@ SfxPoolItem* SvxBulletItem::Clone( SfxItemPool * /*pPool*/ ) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, USHORT /*nVersion*/ ) const
+SfxPoolItem* SvxBulletItem::Create( SvStream& rStrm, sal_uInt16 /*nVersion*/ ) const
{
return new SvxBulletItem( rStrm, Which() );
}
@@ -271,7 +271,7 @@ void SvxBulletItem::SetDefaultFont_Impl()
{
aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_FIXED, LANGUAGE_SYSTEM, 0 );
aFont.SetAlign( ALIGN_BOTTOM);
- aFont.SetTransparent( TRUE );
+ aFont.SetTransparent( sal_True );
}
// -----------------------------------------------------------------------
@@ -289,7 +289,7 @@ void SvxBulletItem::SetDefaults_Impl()
// -----------------------------------------------------------------------
-USHORT SvxBulletItem::GetVersion( USHORT /*nVersion*/ ) const
+sal_uInt16 SvxBulletItem::GetVersion( sal_uInt16 /*nVersion*/ ) const
{
return BULITEM_VERSION;
}
@@ -367,7 +367,7 @@ int SvxBulletItem::operator==( const SfxPoolItem& rItem ) const
// -----------------------------------------------------------------------
-SvStream& SvxBulletItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const
+SvStream& SvxBulletItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
{
// Correction for empty bitmap
if( ( nStyle == BS_BMP ) &&
@@ -388,16 +388,16 @@ SvStream& SvxBulletItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const
StoreFont( rStrm, aFont );
else
{
- ULONG _nStart = rStrm.Tell();
+ sal_uLong _nStart = rStrm.Tell();
// Small preliminary estimate of the size ...
- USHORT nFac = ( rStrm.GetCompressMode() != COMPRESSMODE_NONE ) ? 3 : 1;
+ sal_uInt16 nFac = ( rStrm.GetCompressMode() != COMPRESSMODE_NONE ) ? 3 : 1;
const Bitmap aBmp( pGraphicObject->GetGraphic().GetBitmap() );
- ULONG nBytes = aBmp.GetSizeBytes();
- if ( nBytes < ULONG(0xFF00*nFac) )
+ sal_uLong nBytes = aBmp.GetSizeBytes();
+ if ( nBytes < sal_uLong(0xFF00*nFac) )
rStrm << aBmp;
- ULONG nEnd = rStrm.Tell();
+ sal_uLong nEnd = rStrm.Tell();
// Item can not write with an overhead more than 64K or SfxMultiRecord
// will crash. Then prefer to forego on the bitmap, it is only
// important for the outliner and only for <= 5.0.
diff --git a/editeng/source/items/charhiddenitem.cxx b/editeng/source/items/charhiddenitem.cxx
index 2c4d4586585e..3f21e4562f3b 100644
--- a/editeng/source/items/charhiddenitem.cxx
+++ b/editeng/source/items/charhiddenitem.cxx
@@ -36,7 +36,7 @@
TYPEINIT1_FACTORY(SvxCharHiddenItem, SfxBoolItem, new SvxCharHiddenItem(sal_False, 0));
-SvxCharHiddenItem::SvxCharHiddenItem( const sal_Bool bHidden, const USHORT nId ) :
+SvxCharHiddenItem::SvxCharHiddenItem( const sal_Bool bHidden, const sal_uInt16 nId ) :
SfxBoolItem( nId, bHidden )
{
}
@@ -62,7 +62,7 @@ SfxItemPresentation SvxCharHiddenItem::GetPresentation
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- USHORT nId = RID_SVXITEMS_CHARHIDDEN_FALSE;
+ sal_uInt16 nId = RID_SVXITEMS_CHARHIDDEN_FALSE;
if ( GetValue() )
nId = RID_SVXITEMS_CHARHIDDEN_TRUE;
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index edfe7921f88a..4a3621f7f584 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -75,7 +75,7 @@ int SvxFieldData::operator==( const SvxFieldData& rFld ) const
{
DBG_ASSERT( Type() == rFld.Type(), "==: Different Types" );
(void)rFld;
- return TRUE; // Basic class is always the same.
+ return sal_True; // Basic class is always the same.
}
// -----------------------------------------------------------------------
@@ -103,7 +103,7 @@ MetaAction* SvxFieldData::createEndComment() const
// -----------------------------------------------------------------------
-SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const USHORT nId ) :
+SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const sal_uInt16 nId ) :
SfxPoolItem( nId )
{
pField = pFld; // belongs directly to the item
@@ -111,7 +111,7 @@ SvxFieldItem::SvxFieldItem( SvxFieldData* pFld, const USHORT nId ) :
// -----------------------------------------------------------------------
-SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const USHORT nId ) :
+SvxFieldItem::SvxFieldItem( const SvxFieldData& rField, const sal_uInt16 nId ) :
SfxPoolItem( nId )
{
pField = rField.Clone();
@@ -141,7 +141,7 @@ SfxPoolItem* SvxFieldItem::Clone( SfxItemPool* ) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
SvxFieldData* pData = 0;
SvPersistStream aPStrm( GetClassManager(), &rStrm );
@@ -158,7 +158,7 @@ SfxPoolItem* SvxFieldItem::Create( SvStream& rStrm, USHORT ) const
// -----------------------------------------------------------------------
-SvStream& SvxFieldItem::Store( SvStream& rStrm, USHORT /*nItemVersion*/ ) const
+SvStream& SvxFieldItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
{
DBG_ASSERT( pField, "SvxFieldItem::Store: Field?!" );
SvPersistStream aPStrm( GetClassManager(), &rStrm );
@@ -185,10 +185,10 @@ int SvxFieldItem::operator==( const SfxPoolItem& rItem ) const
const SvxFieldData* pOtherFld = ((const SvxFieldItem&)rItem).GetField();
if ( !pField && !pOtherFld )
- return TRUE;
+ return sal_True;
if ( ( !pField && pOtherFld ) || ( pField && !pOtherFld ) )
- return FALSE;
+ return sal_False;
return ( ( pField->Type() == pOtherFld->Type() )
&& ( *pField == *pOtherFld ) );
@@ -230,7 +230,7 @@ SvxFieldData* SvxDateField::Clone() const
int SvxDateField::operator==( const SvxFieldData& rOther ) const
{
if ( rOther.Type() != Type() )
- return FALSE;
+ return sal_False;
const SvxDateField& rOtherFld = (const SvxDateField&) rOther;
return ( ( nFixDate == rOtherFld.nFixDate ) &&
@@ -242,7 +242,7 @@ int SvxDateField::operator==( const SvxFieldData& rOther ) const
void SvxDateField::Load( SvPersistStream & rStm )
{
- USHORT nType, nFormat;
+ sal_uInt16 nType, nFormat;
rStm >> nFixDate;
rStm >> nType;
@@ -257,8 +257,8 @@ void SvxDateField::Load( SvPersistStream & rStm )
void SvxDateField::Save( SvPersistStream & rStm )
{
rStm << nFixDate;
- rStm << (USHORT)eType;
- rStm << (USHORT)eFormat;
+ rStm << (sal_uInt16)eType;
+ rStm << (sal_uInt16)eFormat;
}
// -----------------------------------------------------------------------
@@ -285,7 +285,7 @@ String SvxDateField::GetFormatted( Date& aDate, SvxDateFormat eFormat, SvNumberF
eFormat = SVXDATEFORMAT_STDSMALL;
}
- ULONG nFormatKey;
+ sal_uLong nFormatKey;
switch( eFormat )
{
@@ -366,7 +366,7 @@ SvxFieldData* SvxURLField::Clone() const
int SvxURLField::operator==( const SvxFieldData& rOther ) const
{
if ( rOther.Type() != Type() )
- return FALSE;
+ return sal_False;
const SvxURLField& rOtherFld = (const SvxURLField&) rOther;
return ( ( eFormat == rOtherFld.eFormat ) &&
@@ -377,83 +377,46 @@ int SvxURLField::operator==( const SvxFieldData& rOther ) const
// -----------------------------------------------------------------------
-void SvxURLField::Load( SvPersistStream & rStm )
+static void write_unicode( SvPersistStream & rStm, const String& rString )
{
- USHORT nFormat;
- sal_uInt32 nFrameMarker, nCharSetMarker;
- long nUlongSize = (long)sizeof(sal_uInt32);
- String aTmpURL;
-
- rStm >> nFormat;
-
- // UNICODE: rStm >> aTmpURL;
- rStm.ReadByteString(aTmpURL);
-
- // UNICODE: rStm >> aRepresentation;
- // read to a temp string first, read text encoding and
- // convert later to stay compatible to fileformat
- ByteString aTempString;
- rtl_TextEncoding aTempEncoding = RTL_TEXTENCODING_MS_1252; // Init for old documents
- rStm.ReadByteString(aTempString);
+ sal_uInt16 nL = rString.Len();
+ rStm << nL;
+ rStm.Write( rString.GetBuffer(), nL*sizeof(sal_Unicode) );
+}
- rStm >> nFrameMarker;
- if ( nFrameMarker == FRAME_MARKER )
+static void read_unicode( SvPersistStream & rStm, String& rString )
+{
+ sal_uInt16 nL = 0;
+ rStm >> nL;
+ if ( nL )
{
- // UNICODE: rStm >> aTargetFrame;
- rStm.ReadByteString(aTargetFrame);
-
- rStm >> nCharSetMarker;
- if ( nCharSetMarker == CHARSET_MARKER )
- {
- USHORT nCharSet;
- rStm >> nCharSet;
-
- // remember encoding
- aTempEncoding = (rtl_TextEncoding)nCharSet;
- }
- else
- rStm.SeekRel( -nUlongSize );
+ rString.AllocBuffer( nL );
+ rStm.Read( rString.GetBufferAccess(), nL*sizeof(sal_Unicode) );
+ rString.ReleaseBufferAccess( nL );
}
- else
- rStm.SeekRel( -nUlongSize );
+}
- // now build representation string due to known encoding
- aRepresentation = String(aTempString, aTempEncoding);
+void SvxURLField::Load( SvPersistStream & rStm )
+{
+ sal_uInt16 nFormat = 0;
+ rStm >> nFormat;
eFormat= (SvxURLFormat)nFormat;
- // Relative save => make it absolute for loading
- OSL_FAIL("No BaseURL!");
- // TODO/MBA: no BaseURL
- aURL = INetURLObject::GetAbsURL( String(), aTmpURL );
+ read_unicode( rStm, aURL );
+ read_unicode( rStm, aRepresentation );
+ read_unicode( rStm, aTargetFrame );
}
// -----------------------------------------------------------------------
void SvxURLField::Save( SvPersistStream & rStm )
{
- // Relative save of the URL
- OSL_FAIL("No BaseURL!");
- // TODO/MBA: no BaseURL
- String aTmpURL = INetURLObject::GetRelURL( String(), aURL );
-
- rStm << (USHORT)eFormat;
-
- // UNICODE: rStm << aTmpURL;
- rStm.WriteByteString(aTmpURL);
-
- // UNICODE: rStm << aRepresentation;
- rStm.WriteByteString(aRepresentation);
-
- rStm << FRAME_MARKER;
+ rStm << (sal_uInt16)eFormat;
- // UNICODE: rStm << aTargetFrame;
- rStm.WriteByteString(aTargetFrame);
-
- rStm << CHARSET_MARKER;
-
- // #90477# rStm << (USHORT)GetStoreCharSet(gsl_getSystemTextEncoding(), rStm.GetVersion());
- rStm << (USHORT)GetSOStoreTextEncoding(gsl_getSystemTextEncoding(), (sal_uInt16)rStm.GetVersion());
+ write_unicode( rStm, aURL );
+ write_unicode( rStm, aRepresentation );
+ write_unicode( rStm, aTargetFrame );
}
MetaAction* SvxURLField::createBeginComment() const
@@ -461,7 +424,7 @@ MetaAction* SvxURLField::createBeginComment() const
// #i46618# Adding target URL to metafile comment
return new MetaCommentAction( "FIELD_SEQ_BEGIN",
0,
- reinterpret_cast<const BYTE*>(aURL.GetBuffer()),
+ reinterpret_cast<const sal_uInt8*>(aURL.GetBuffer()),
2*aURL.Len() );
}
@@ -616,7 +579,7 @@ SvxFieldData* SvxExtTimeField::Clone() const
int SvxExtTimeField::operator==( const SvxFieldData& rOther ) const
{
if ( rOther.Type() != Type() )
- return FALSE;
+ return sal_False;
const SvxExtTimeField& rOtherFld = (const SvxExtTimeField&) rOther;
return ( ( nFixTime == rOtherFld.nFixTime ) &&
@@ -628,7 +591,7 @@ int SvxExtTimeField::operator==( const SvxFieldData& rOther ) const
void SvxExtTimeField::Load( SvPersistStream & rStm )
{
- USHORT nType, nFormat;
+ sal_uInt16 nType, nFormat;
rStm >> nFixTime;
rStm >> nType;
@@ -643,8 +606,8 @@ void SvxExtTimeField::Load( SvPersistStream & rStm )
void SvxExtTimeField::Save( SvPersistStream & rStm )
{
rStm << nFixTime;
- rStm << (USHORT) eType;
- rStm << (USHORT) eFormat;
+ rStm << (sal_uInt16) eType;
+ rStm << (sal_uInt16) eFormat;
}
//----------------------------------------------------------------------------
@@ -684,7 +647,7 @@ String SvxExtTimeField::GetFormatted( Time& aTime, SvxTimeFormat eFormat, SvNumb
String aFormatCode( RTL_CONSTASCII_USTRINGPARAM( "HH:MM:SS.00 AM/PM" ) );
xub_StrLen nCheckPos;
short nType;
- /*BOOL bInserted = */rFormatter.PutandConvertEntry( aFormatCode,
+ /*sal_Bool bInserted = */rFormatter.PutandConvertEntry( aFormatCode,
nCheckPos, nType, nFormatKey, LANGUAGE_ENGLISH_US, eLang );
DBG_ASSERT( nCheckPos == 0, "SVXTIMEFORMAT_12_HMSH: could not insert format code" );
if ( nCheckPos )
@@ -755,7 +718,7 @@ SvxFieldData* SvxExtFileField::Clone() const
int SvxExtFileField::operator==( const SvxFieldData& rOther ) const
{
if ( rOther.Type() != Type() )
- return FALSE;
+ return sal_False;
const SvxExtFileField& rOtherFld = (const SvxExtFileField&) rOther;
return ( ( aFile == rOtherFld.aFile ) &&
@@ -767,7 +730,7 @@ int SvxExtFileField::operator==( const SvxFieldData& rOther ) const
void SvxExtFileField::Load( SvPersistStream & rStm )
{
- USHORT nType, nFormat;
+ sal_uInt16 nType, nFormat;
// UNICODE: rStm >> aFile;
rStm.ReadByteString(aFile);
@@ -786,8 +749,8 @@ void SvxExtFileField::Save( SvPersistStream & rStm )
// UNICODE: rStm << aFile;
rStm.WriteByteString(aFile);
- rStm << (USHORT) eType;
- rStm << (USHORT) eFormat;
+ rStm << (sal_uInt16) eType;
+ rStm << (sal_uInt16) eFormat;
}
//----------------------------------------------------------------------------
@@ -907,7 +870,7 @@ SvxFieldData* SvxAuthorField::Clone() const
int SvxAuthorField::operator==( const SvxFieldData& rOther ) const
{
if ( rOther.Type() != Type() )
- return FALSE;
+ return sal_False;
const SvxAuthorField& rOtherFld = (const SvxAuthorField&) rOther;
return ( ( aName == rOtherFld.aName ) &&
@@ -921,16 +884,11 @@ int SvxAuthorField::operator==( const SvxFieldData& rOther ) const
void SvxAuthorField::Load( SvPersistStream & rStm )
{
- USHORT nType, nFormat;
-
- // UNICODE: rStm >> aName;
- rStm.ReadByteString(aName);
+ sal_uInt16 nType = 0, nFormat = 0;
- // UNICODE: rStm >> aFirstName;
- rStm.ReadByteString(aFirstName);
-
- // UNICODE: rStm >> aShortName;
- rStm.ReadByteString(aShortName);
+ read_unicode( rStm, aName );
+ read_unicode( rStm, aFirstName );
+ read_unicode( rStm, aShortName );
rStm >> nType;
rStm >> nFormat;
@@ -943,17 +901,12 @@ void SvxAuthorField::Load( SvPersistStream & rStm )
void SvxAuthorField::Save( SvPersistStream & rStm )
{
- // UNICODE: rStm << aName;
- rStm.WriteByteString(aName);
-
- // UNICODE: rStm << aFirstName;
- rStm.WriteByteString(aFirstName);
-
- // UNICODE: rStm << aShortName;
- rStm.WriteByteString(aShortName);
+ write_unicode( rStm, aName );
+ write_unicode( rStm, aFirstName );
+ write_unicode( rStm, aShortName );
- rStm << (USHORT) eType;
- rStm << (USHORT) eFormat;
+ rStm << (sal_uInt16) eType;
+ rStm << (sal_uInt16) eFormat;
}
//----------------------------------------------------------------------------
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 45fd0b5759d7..286ed8c556ad 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -189,7 +189,7 @@ SfxItemPresentation SvxPaperBinItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- BYTE nValue = GetValue();
+ sal_uInt8 nValue = GetValue();
if ( PAPERBIN_PRINTER_SETTINGS == nValue )
rText = EE_RESSTR(RID_SVXSTR_PAPERBIN_SETTINGS);
@@ -219,7 +219,7 @@ SvxSizeItem::SvxSizeItem( const sal_uInt16 nId, const Size& rSize ) :
}
// -----------------------------------------------------------------------
-bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxSizeItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -242,7 +242,7 @@ bool SvxSizeItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
// -----------------------------------------------------------------------
-bool SvxSizeItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxSizeItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -431,7 +431,7 @@ SvxLRSpaceItem::SvxLRSpaceItem( const long nLeft, const long nRight,
}
// -----------------------------------------------------------------------
-bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
bool bRet = true;
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -476,7 +476,7 @@ bool SvxLRSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
}
// -----------------------------------------------------------------------
-bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -506,9 +506,9 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
if((rVal >>= nRel) && nRel >= 0 && nRel < USHRT_MAX)
{
if(MID_L_REL_MARGIN== nMemberId)
- nPropLeftMargin = (USHORT)nRel;
+ nPropLeftMargin = (sal_uInt16)nRel;
else
- nPropRightMargin = (USHORT)nRel;
+ nPropRightMargin = (sal_uInt16)nRel;
}
else
return false;
@@ -519,7 +519,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
break;
case MID_FIRST_LINE_REL_INDENT:
- SetPropTxtFirstLineOfst ( (USHORT)nVal );
+ SetPropTxtFirstLineOfst ( (sal_uInt16)nVal );
break;
case MID_FIRST_AUTO:
@@ -824,7 +824,7 @@ SvxULSpaceItem::SvxULSpaceItem( const sal_uInt16 nUp, const sal_uInt16 nLow,
}
// -----------------------------------------------------------------------
-bool SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxULSpaceItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -850,7 +850,7 @@ bool SvxULSpaceItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
}
// -----------------------------------------------------------------------
-bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxULSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -875,12 +875,12 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
case MID_UP_MARGIN :
if(!(rVal >>= nVal) || nVal < 0)
return false;
- SetUpper((USHORT)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
+ SetUpper((sal_uInt16)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
break;
case MID_LO_MARGIN :
if(!(rVal >>= nVal) || nVal < 0)
return false;
- SetLower((USHORT)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
+ SetLower((sal_uInt16)(bConvert ? MM100_TO_TWIP(nVal) : nVal));
break;
case MID_UP_REL_MARGIN:
case MID_LO_REL_MARGIN:
@@ -889,9 +889,9 @@ bool SvxULSpaceItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
if((rVal >>= nRel) && nRel > 1 )
{
if(MID_UP_REL_MARGIN == nMemberId)
- nPropUpper = (USHORT)nRel;
+ nPropUpper = (sal_uInt16)nRel;
else
- nPropLower = (USHORT)nRel;
+ nPropLower = (sal_uInt16)nRel;
}
else
return false;
@@ -1165,7 +1165,7 @@ int SvxProtectItem::operator==( const SfxPoolItem& rAttr ) const
bPos == ( (SvxProtectItem&)rAttr ).bPos );
}
-bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxProtectItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
sal_Bool bValue;
@@ -1183,7 +1183,7 @@ bool SvxProtectItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
-bool SvxProtectItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxProtectItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
sal_Bool bVal( Any2Bool(rVal) );
@@ -1278,8 +1278,8 @@ SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const
// class SvxShadowItem ---------------------------------------------------
-SvxShadowItem::SvxShadowItem( const USHORT nId,
- const Color *pColor, const USHORT nW,
+SvxShadowItem::SvxShadowItem( const sal_uInt16 nId,
+ const Color *pColor, const sal_uInt16 nW,
const SvxShadowLocation eLoc ) :
SfxEnumItemInterface( nId ),
aShadowColor(COL_GRAY),
@@ -1291,7 +1291,7 @@ SvxShadowItem::SvxShadowItem( const USHORT nId,
}
// -----------------------------------------------------------------------
-bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxShadowItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1324,7 +1324,7 @@ bool SvxShadowItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
// -----------------------------------------------------------------------
-bool SvxShadowItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxShadowItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1705,8 +1705,8 @@ XubString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
bool SvxBorderLine::HasPriority( const SvxBorderLine& rOtherLine ) const
{
- const USHORT nThisSize = GetOutWidth() + GetDistance() + GetInWidth();
- const USHORT nOtherSize = rOtherLine.GetOutWidth() + rOtherLine.GetDistance() + rOtherLine.GetInWidth();
+ const sal_uInt16 nThisSize = GetOutWidth() + GetDistance() + GetInWidth();
+ const sal_uInt16 nOtherSize = rOtherLine.GetOutWidth() + rOtherLine.GetDistance() + rOtherLine.GetInWidth();
if (nThisSize > nOtherSize)
{
@@ -1841,7 +1841,7 @@ table::BorderLine2 SvxBoxItem::SvxLineToLine(const SvxBorderLine* pLine, sal_Boo
return aLine;
}
// -----------------------------------------------------------------------
-bool SvxBoxItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxBoxItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
table::BorderLine2 aRetLine;
@@ -1935,8 +1935,7 @@ sal_Bool SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine& rL
return lcl_lineToSvxLine(rLine, rSvxLine, bConvert);
}
-sal_Bool
-SvxBoxItem::LineToSvxLine(const ::com::sun::star::table::BorderLine2& rLine, SvxBorderLine& rSvxLine, sal_Bool bConvert)
+bool SvxBoxItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
const bool bRet(lcl_lineToSvxLine(rLine, rSvxLine, bConvert));
@@ -2776,7 +2775,7 @@ void SvxBoxInfoItem::ResetFlags()
nValidFlags = 0x7F; // all valid except Disable
}
-bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
table::BorderLine2 aRetLine;
@@ -2841,7 +2840,7 @@ bool SvxBoxInfoItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
// -----------------------------------------------------------------------
-bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -2870,14 +2869,14 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
else
return sal_False;
if ( aSeq[3] >>= nFlags )
- nValidFlags = (BYTE)nFlags;
+ nValidFlags = (sal_uInt8)nFlags;
else
return sal_False;
if (( aSeq[4] >>= nVal ) && ( nVal >= 0 ))
{
if( bConvert )
nVal = MM100_TO_TWIP(nVal);
- SetDefDist( (USHORT)nVal );
+ SetDefDist( (sal_uInt16)nVal );
}
}
return sal_True;
@@ -2962,7 +2961,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
sal_Int16 nFlags = sal_Int16();
bRet = (rVal >>= nFlags);
if ( bRet )
- nValidFlags = (BYTE)nFlags;
+ nValidFlags = (sal_uInt8)nFlags;
break;
}
case MID_DISTANCE:
@@ -2973,7 +2972,7 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
{
if( bConvert )
nVal = MM100_TO_TWIP(nVal);
- SetDefDist( (USHORT)nVal );
+ SetDefDist( (sal_uInt16)nVal );
}
break;
}
@@ -3029,7 +3028,7 @@ XubString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
}
// -----------------------------------------------------------------------
-bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
style::BreakType eBreak = style::BreakType_NONE;
switch ( (SvxBreak)GetValue() )
@@ -3046,7 +3045,7 @@ bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
return true;
}
// -----------------------------------------------------------------------
-bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
style::BreakType nBreak;
@@ -3231,7 +3230,7 @@ SfxPoolItem* SvxLineItem::Clone( SfxItemPool* ) const
return new SvxLineItem( *this );
}
-bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
+bool SvxLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemId ) const
{
sal_Bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
nMemId &= ~CONVERT_TWIPS;
@@ -3259,7 +3258,7 @@ bool SvxLineItem::QueryValue( uno::Any& rVal, BYTE nMemId ) const
// -----------------------------------------------------------------------
-bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
+bool SvxLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemId )
{
sal_Bool bConvert = 0!=(nMemId&CONVERT_TWIPS);
nMemId &= ~CONVERT_TWIPS;
@@ -3285,9 +3284,9 @@ bool SvxLineItem::PutValue( const uno::Any& rVal, BYTE nMemId )
switch ( nMemId )
{
case MID_FG_COLOR: pLine->SetColor( Color(nVal) ); break;
- case MID_OUTER_WIDTH: pLine->SetOutWidth((USHORT)nVal); break;
- case MID_INNER_WIDTH: pLine->SetInWidth((USHORT)nVal); break;
- case MID_DISTANCE: pLine->SetDistance((USHORT)nVal); break;
+ case MID_OUTER_WIDTH: pLine->SetOutWidth((sal_uInt16)nVal); break;
+ case MID_INNER_WIDTH: pLine->SetInWidth((sal_uInt16)nVal); break;
+ case MID_DISTANCE: pLine->SetDistance((sal_uInt16)nVal); break;
case MID_LINE_STYLE: pLine->SetStyle((SvxBorderStyle)nVal); break;
default:
OSL_FAIL( "Wrong MemberId" );
@@ -3667,7 +3666,7 @@ inline sal_Int8 lcl_TransparencyToPercent(sal_Int32 nTrans)
return (sal_Int8)((nTrans * 100 + 127) / 254);
}
-bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxBrushItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId)
@@ -3728,7 +3727,7 @@ bool SvxBrushItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
// -----------------------------------------------------------------------
-bool SvxBrushItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxBrushItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId)
@@ -4235,7 +4234,7 @@ CntWallpaperItem* SvxBrushItem::CreateCntWallpaperItem() const
{
CntWallpaperItem* pItem = new CntWallpaperItem( 0 );
pItem->SetColor( aColor.GetColor() );
- pItem->SetStyle( (USHORT)GraphicPos2WallpaperStyle( GetGraphicPos() ) );
+ pItem->SetStyle( (sal_uInt16)GraphicPos2WallpaperStyle( GetGraphicPos() ) );
sal_Bool bLink = (pStrLink != 0);
if( bLink )
{
@@ -4267,14 +4266,14 @@ void SvxBrushItem::ApplyGraphicTransparency_Impl()
}
// class SvxFrameDirectionItem ----------------------------------------------
-SvxFrameDirectionItem::SvxFrameDirectionItem( USHORT _nWhich )
- : SfxUInt16Item( _nWhich, (UINT16)FRMDIR_HORI_LEFT_TOP )
+SvxFrameDirectionItem::SvxFrameDirectionItem( sal_uInt16 _nWhich )
+ : SfxUInt16Item( _nWhich, (sal_uInt16)FRMDIR_HORI_LEFT_TOP )
{
}
SvxFrameDirectionItem::SvxFrameDirectionItem( SvxFrameDirection nValue ,
- USHORT _nWhich )
- : SfxUInt16Item( _nWhich, (UINT16)nValue )
+ sal_uInt16 _nWhich )
+ : SfxUInt16Item( _nWhich, (sal_uInt16)nValue )
{
}
@@ -4294,21 +4293,21 @@ SfxPoolItem* SvxFrameDirectionItem::Clone( SfxItemPool * ) const
return new SvxFrameDirectionItem( *this );
}
-SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, USHORT /*nVer*/ ) const
+SfxPoolItem* SvxFrameDirectionItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*/ ) const
{
sal_uInt16 nValue;
rStrm >> nValue;
return new SvxFrameDirectionItem( (SvxFrameDirection)nValue, Which() );
}
-SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, USHORT /*nIVer*/ ) const
+SvStream& SvxFrameDirectionItem::Store( SvStream & rStrm, sal_uInt16 /*nIVer*/ ) const
{
sal_uInt16 nValue = GetValue();
rStrm << nValue;
return rStrm;
}
-USHORT SvxFrameDirectionItem::GetVersion( USHORT nFVer ) const
+sal_uInt16 SvxFrameDirectionItem::GetVersion( sal_uInt16 nFVer ) const
{
return SOFFICE_FILEFORMAT_50 > nFVer ? USHRT_MAX : 0;
}
@@ -4338,7 +4337,7 @@ SfxItemPresentation SvxFrameDirectionItem::GetPresentation(
}
bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
- BYTE )
+ sal_uInt8 )
{
sal_Int16 nVal = sal_Int16();
sal_Bool bRet = ( rVal >>= nVal );
@@ -4372,7 +4371,7 @@ bool SvxFrameDirectionItem::PutValue( const com::sun::star::uno::Any& rVal,
}
bool SvxFrameDirectionItem::QueryValue( com::sun::star::uno::Any& rVal,
- BYTE ) const
+ sal_uInt8 ) const
{
// translate SvxFrameDirection into WritingDirection2
sal_Int16 nVal;
diff --git a/editeng/source/items/itemtype.cxx b/editeng/source/items/itemtype.cxx
index 0d169e4b0b00..0d169e4b0b00 100644..100755
--- a/editeng/source/items/itemtype.cxx
+++ b/editeng/source/items/itemtype.cxx
diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx
index abe83500c106..d1e31d250e2f 100644..100755
--- a/editeng/source/items/justifyitem.cxx
+++ b/editeng/source/items/justifyitem.cxx
@@ -86,7 +86,7 @@ SfxItemPresentation SvxHorJustifyItem::GetPresentation
}
-bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -129,7 +129,7 @@ bool SvxHorJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
-bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -244,7 +244,7 @@ SfxItemPresentation SvxVerJustifyItem::GetPresentation
}
-bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -281,7 +281,7 @@ bool SvxVerJustifyItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
-bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
switch ( nMemberId )
@@ -391,7 +391,7 @@ SfxItemPresentation SvxJustifyMethodItem::GetPresentation
}
-bool SvxJustifyMethodItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxJustifyMethodItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
sal_Int32 nUno = table::CellJustifyMethod::AUTO;
switch (static_cast<SvxCellJustifyMethod>(GetValue()))
@@ -404,7 +404,7 @@ bool SvxJustifyMethodItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) cons
return true;
}
-bool SvxJustifyMethodItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxJustifyMethodItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
sal_Int32 nVal = table::CellJustifyMethod::AUTO;
if (!(rVal >>= nVal))
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index 812b8e02d5ae..23a3ce8f3c80 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -110,14 +110,14 @@ SvxNumberType::~SvxNumberType()
xFormatter = 0;
}
-String SvxNumberType::GetNumStr( ULONG nNo ) const
+String SvxNumberType::GetNumStr( sal_uLong nNo ) const
{
LanguageType eLang = Application::GetSettings().GetLanguage();
Locale aLocale = SvxCreateLocale(eLang);
return GetNumStr( nNo, aLocale );
}
-String SvxNumberType::GetNumStr( ULONG nNo, const Locale& rLocale ) const
+String SvxNumberType::GetNumStr( sal_uLong nNo, const Locale& rLocale ) const
{
lcl_getFormatter(xFormatter);
String aTmpStr;
@@ -206,16 +206,16 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
mnIndentAt( 0 )
{
- USHORT nVersion;
+ sal_uInt16 nVersion;
rStream >> nVersion;
- USHORT nUSHORT;
+ sal_uInt16 nUSHORT;
rStream >> nUSHORT;
SetNumberingType((sal_Int16)nUSHORT);
rStream >> nUSHORT;
eNumAdjust = (SvxAdjust)nUSHORT;
rStream >> nUSHORT;
- nInclUpperLevels = (BYTE)nUSHORT;
+ nInclUpperLevels = (sal_uInt8)nUSHORT;
rStream >> nUSHORT;
nStart = nUSHORT;
rStream >> nUSHORT;
@@ -263,7 +263,7 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
rStream >> nUSHORT;
nBulletRelSize = nUSHORT;
rStream >> nUSHORT;
- SetShowSymbol((BOOL)nUSHORT);
+ SetShowSymbol((sal_Bool)nUSHORT);
if( nVersion < NUMITEM_VERSION_03 )
cBullet = ByteString::ConvertToUnicode( (sal_Char)cBullet,
@@ -271,7 +271,7 @@ SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
: RTL_TEXTENCODING_SYMBOL );
if(pBulletFont)
{
- BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
+ sal_Bool bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
if(bConvertBulletFont)
{
@@ -313,13 +313,13 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
pBulletFont->SetName(sFontName);
}
- rStream << (USHORT)NUMITEM_VERSION_04;
+ rStream << (sal_uInt16)NUMITEM_VERSION_04;
- rStream << (USHORT)GetNumberingType();
- rStream << (USHORT)eNumAdjust;
- rStream << (USHORT)nInclUpperLevels;
+ rStream << (sal_uInt16)GetNumberingType();
+ rStream << (sal_uInt16)eNumAdjust;
+ rStream << (sal_uInt16)nInclUpperLevels;
rStream << nStart;
- rStream << (USHORT)cBullet;
+ rStream << (sal_uInt16)cBullet;
rStream << nFirstLineOffset;
rStream << nAbsLSpace;
@@ -332,7 +332,7 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
rStream.WriteByteString(sCharStyleName, eEnc);
if(pGraphicBrush)
{
- rStream << (USHORT)1;
+ rStream << (sal_uInt16)1;
// in SD or SI force bullet itself to be stored,
// for that purpose throw away link when link and graphic
@@ -346,16 +346,16 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION);
}
else
- rStream << (USHORT)0;
+ rStream << (sal_uInt16)0;
- rStream << (USHORT)eVertOrient;
+ rStream << (sal_uInt16)eVertOrient;
if(pBulletFont)
{
- rStream << (USHORT)1;
+ rStream << (sal_uInt16)1;
rStream << *pBulletFont;
}
else
- rStream << (USHORT)0;
+ rStream << (sal_uInt16)0;
rStream << aGraphicSize;
Color nTempColor = nBulletColor;
@@ -363,10 +363,10 @@ SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pC
nTempColor = COL_BLACK;
rStream << nTempColor;
rStream << nBulletRelSize;
- rStream << (USHORT)IsShowSymbol();
+ rStream << (sal_uInt16)IsShowSymbol();
- rStream << ( USHORT ) mePositionAndSpaceMode;
- rStream << ( USHORT ) meLabelFollowedBy;
+ rStream << ( sal_uInt16 ) mePositionAndSpaceMode;
+ rStream << ( sal_uInt16 ) meLabelFollowedBy;
rStream << ( long ) mnListtabPos;
rStream << ( long ) mnFirstLineIndent;
rStream << ( long ) mnIndentAt;
@@ -410,7 +410,7 @@ SvxNumberFormat& SvxNumberFormat::operator=( const SvxNumberFormat& rFormat )
return *this;
}
-BOOL SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
+sal_Bool SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
{
if( GetNumberingType() != rFormat.GetNumberingType() ||
eNumAdjust != rFormat.eNumAdjust ||
@@ -435,14 +435,14 @@ BOOL SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
IsShowSymbol() != rFormat.IsShowSymbol() ||
sCharStyleName != rFormat.sCharStyleName
)
- return FALSE;
+ return sal_False;
if (
(pGraphicBrush && !rFormat.pGraphicBrush) ||
(!pGraphicBrush && rFormat.pGraphicBrush) ||
(pGraphicBrush && *pGraphicBrush != *rFormat.pGraphicBrush)
)
{
- return FALSE;
+ return sal_False;
}
if (
(pBulletFont && !rFormat.pBulletFont) ||
@@ -450,9 +450,9 @@ BOOL SvxNumberFormat::operator==( const SvxNumberFormat& rFormat) const
(pBulletFont && *pBulletFont != *rFormat.pBulletFont)
)
{
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
void SvxNumberFormat::SetGraphicBrush( const SvxBrushItem* pBrushItem,
@@ -612,7 +612,7 @@ Size SvxNumberFormat::GetGraphicSizeMM100(const Graphic* pGraphic)
return aRetSize;
}
-String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper )
+String SvxNumberFormat::CreateRomanString( sal_uLong nNo, sal_Bool bUpper )
{
nNo %= 4000; // more can not be displayed
// i, ii, iii, iv, v, vi, vii, vii, viii, ix
@@ -622,11 +622,11 @@ String SvxNumberFormat::CreateRomanString( ULONG nNo, BOOL bUpper )
: "mdclxvi--"; // +2 Dummy entries!
String sRet;
- USHORT nMask = 1000;
+ sal_uInt16 nMask = 1000;
while( nMask )
{
- BYTE nZahl = BYTE(nNo / nMask);
- BYTE nDiff = 1;
+ sal_uInt8 nZahl = sal_uInt8(nNo / nMask);
+ sal_uInt8 nDiff = 1;
nNo %= nMask;
if( 5 < nZahl )
@@ -666,9 +666,9 @@ const String& SvxNumberFormat::GetCharFmtName()const
sal_Int32 SvxNumRule::nRefCount = 0;
static SvxNumberFormat* pStdNumFmt = 0;
static SvxNumberFormat* pStdOutlineNumFmt = 0;
-SvxNumRule::SvxNumRule( ULONG nFeatures,
- USHORT nLevels,
- BOOL bCont,
+SvxNumRule::SvxNumRule( sal_uLong nFeatures,
+ sal_uInt16 nLevels,
+ sal_Bool bCont,
SvxNumRuleType eType,
SvxNumberFormat::SvxNumPositionAndSpaceMode
eDefaultNumberFormatPositionAndSpaceMode )
@@ -680,7 +680,7 @@ SvxNumRule::SvxNumRule( ULONG nFeatures,
++nRefCount;
LanguageType eLang = Application::GetSettings().GetLanguage();
aLocale = SvxCreateLocale(eLang);
- for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+ for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
{
if(i < nLevels)
{
@@ -719,7 +719,7 @@ SvxNumRule::SvxNumRule( ULONG nFeatures,
}
else
aFmts[i] = 0;
- aFmtsSet[i] = FALSE;
+ aFmtsSet[i] = sal_False;
}
}
@@ -732,7 +732,7 @@ SvxNumRule::SvxNumRule(const SvxNumRule& rCopy)
bContinuousNumbering = rCopy.bContinuousNumbering;
eNumberingType = rCopy.eNumberingType;
memset( aFmts, 0, sizeof( aFmts ));
- for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+ for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
{
if(rCopy.aFmts[i])
aFmts[i] = new SvxNumberFormat(*rCopy.aFmts[i]);
@@ -747,31 +747,31 @@ SvxNumRule::SvxNumRule(SvStream &rStream)
++nRefCount;
LanguageType eLang = Application::GetSettings().GetLanguage();
aLocale = SvxCreateLocale(eLang);
- USHORT nVersion;
- USHORT nTemp;
+ sal_uInt16 nVersion;
+ sal_uInt16 nTemp;
rStream >> nVersion;
rStream >> nLevelCount;
rStream >> nTemp;
nFeatureFlags = nTemp;
rStream >> nTemp;
- bContinuousNumbering = (BOOL)nTemp;
+ bContinuousNumbering = (sal_Bool)nTemp;
rStream >> nTemp;
eNumberingType = (SvxNumRuleType)nTemp;
memset( aFmts, 0, sizeof( aFmts ));
- for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+ for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
{
- USHORT nSet;
+ sal_uInt16 nSet;
rStream >> nSet;
if(nSet)
aFmts[i] = new SvxNumberFormat(rStream);
else
aFmts[i] = 0;
- aFmtsSet[i] = aFmts[i] ? TRUE : FALSE;
+ aFmtsSet[i] = aFmts[i] ? sal_True : sal_False;
}
if(NUMITEM_VERSION_02 <= nVersion)
{
- USHORT nShort;
+ sal_uInt16 nShort;
rStream >> nShort;
nFeatureFlags = nShort;
}
@@ -779,20 +779,20 @@ SvxNumRule::SvxNumRule(SvStream &rStream)
SvStream& SvxNumRule::Store(SvStream &rStream)
{
- rStream<<(USHORT)NUMITEM_VERSION_03;
+ rStream<<(sal_uInt16)NUMITEM_VERSION_03;
rStream<<nLevelCount;
//first save of nFeatureFlags for old versions
- rStream<<(USHORT)nFeatureFlags;
- rStream<<(USHORT)bContinuousNumbering;
- rStream<<(USHORT)eNumberingType;
+ rStream<<(sal_uInt16)nFeatureFlags;
+ rStream<<(sal_uInt16)bContinuousNumbering;
+ rStream<<(sal_uInt16)eNumberingType;
FontToSubsFontConverter pConverter = 0;
- BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
- for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+ sal_Bool bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
+ for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
{
if(aFmts[i])
{
- rStream << USHORT(1);
+ rStream << sal_uInt16(1);
if(bConvertBulletFont && aFmts[i]->GetBulletFont())
{
if(!pConverter)
@@ -803,10 +803,10 @@ SvStream& SvxNumRule::Store(SvStream &rStream)
aFmts[i]->Store(rStream, pConverter);
}
else
- rStream << USHORT(0);
+ rStream << sal_uInt16(0);
}
//second save of nFeatureFlags for new versions
- rStream<<(USHORT)nFeatureFlags;
+ rStream<<(sal_uInt16)nFeatureFlags;
if(pConverter)
DestroyFontToSubsFontConverter(pConverter);
@@ -815,7 +815,7 @@ SvStream& SvxNumRule::Store(SvStream &rStream)
SvxNumRule::~SvxNumRule()
{
- for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+ for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
delete aFmts[i];
if(!--nRefCount)
{
@@ -830,7 +830,7 @@ SvxNumRule& SvxNumRule::operator=( const SvxNumRule& rCopy )
nFeatureFlags = rCopy.nFeatureFlags;
bContinuousNumbering = rCopy.bContinuousNumbering;
eNumberingType = rCopy.eNumberingType;
- for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+ for(sal_uInt16 i = 0; i < SVX_MAX_NUM; i++)
{
delete aFmts[i];
if(rCopy.aFmts[i])
@@ -848,8 +848,8 @@ int SvxNumRule::operator==( const SvxNumRule& rCopy) const
nFeatureFlags != rCopy.nFeatureFlags ||
bContinuousNumbering != rCopy.bContinuousNumbering ||
eNumberingType != rCopy.eNumberingType)
- return FALSE;
- for(USHORT i = 0; i < nLevelCount; i++)
+ return sal_False;
+ for(sal_uInt16 i = 0; i < nLevelCount; i++)
{
if (
(aFmtsSet[i] != rCopy.aFmtsSet[i]) ||
@@ -858,13 +858,13 @@ int SvxNumRule::operator==( const SvxNumRule& rCopy) const
(aFmts[i] && *aFmts[i] != *rCopy.aFmts[i])
)
{
- return FALSE;
+ return sal_False;
}
}
- return TRUE;
+ return sal_True;
}
-const SvxNumberFormat* SvxNumRule::Get(USHORT nLevel)const
+const SvxNumberFormat* SvxNumRule::Get(sal_uInt16 nLevel)const
{
DBG_ASSERT(nLevel < SVX_MAX_NUM, "Wrong Level" );
if( nLevel < SVX_MAX_NUM )
@@ -873,7 +873,7 @@ const SvxNumberFormat* SvxNumRule::Get(USHORT nLevel)const
return 0;
}
-const SvxNumberFormat& SvxNumRule::GetLevel(USHORT nLevel)const
+const SvxNumberFormat& SvxNumRule::GetLevel(sal_uInt16 nLevel)const
{
if(!pStdNumFmt)
{
@@ -888,8 +888,7 @@ const SvxNumberFormat& SvxNumRule::GetLevel(USHORT nLevel)const
*pStdNumFmt : *pStdOutlineNumFmt;
}
-
-void SvxNumRule::SetLevel( USHORT i, const SvxNumberFormat& rNumFmt, BOOL bIsValid )
+void SvxNumRule::SetLevel( sal_uInt16 i, const SvxNumberFormat& rNumFmt, sal_Bool bIsValid )
{
DBG_ASSERT(i < SVX_MAX_NUM, "Wrong Level" );
@@ -901,7 +900,7 @@ void SvxNumRule::SetLevel( USHORT i, const SvxNumberFormat& rNumFmt, BOOL bIsVal
}
}
-void SvxNumRule::SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt)
+void SvxNumRule::SetLevel(sal_uInt16 nLevel, const SvxNumberFormat* pFmt)
{
DBG_ASSERT(nLevel < SVX_MAX_NUM, "Wrong Level" );
@@ -918,7 +917,7 @@ void SvxNumRule::SetLevel(USHORT nLevel, const SvxNumberFormat* pFmt)
}
}
-String SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) const
+String SvxNumRule::MakeNumString( const SvxNodeNum& rNum, sal_Bool bInclStrings ) const
{
String aStr;
if( SVX_NO_NUM > rNum.GetLevel() && !( SVX_NO_NUMLEVEL & rNum.GetLevel() ) )
@@ -926,12 +925,12 @@ String SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) c
const SvxNumberFormat& rMyNFmt = GetLevel( rNum.GetLevel() );
if( SVX_NUM_NUMBER_NONE != rMyNFmt.GetNumberingType() )
{
- BYTE i = rNum.GetLevel();
+ sal_uInt8 i = rNum.GetLevel();
if( !IsContinuousNumbering() &&
1 < rMyNFmt.GetIncludeUpperLevels() ) // only on own level?
{
- BYTE n = rMyNFmt.GetIncludeUpperLevels();
+ sal_uInt8 n = rMyNFmt.GetIncludeUpperLevels();
if( 1 < n )
{
if( i+1 >= n )
@@ -974,10 +973,10 @@ String SvxNumRule::MakeNumString( const SvxNodeNum& rNum, BOOL bInclStrings ) c
}
// changes linked to embedded bitmaps
-BOOL SvxNumRule::UnLinkGraphics()
+sal_Bool SvxNumRule::UnLinkGraphics()
{
- BOOL bRet = FALSE;
- for(USHORT i = 0; i < GetLevelCount(); i++)
+ sal_Bool bRet = sal_False;
+ for(sal_uInt16 i = 0; i < GetLevelCount(); i++)
{
SvxNumberFormat aFmt(GetLevel(i));
const SvxBrushItem* pBrush = aFmt.GetBrush();
@@ -995,7 +994,7 @@ BOOL SvxNumRule::UnLinkGraphics()
aTempItem.SetGraphic(*pGraphic);
sal_Int16 eOrient = aFmt.GetVertOrient();
aFmt.SetGraphicBrush( &aTempItem, &aFmt.GetGraphicSize(), &eOrient );
- bRet = TRUE;
+ bRet = sal_True;
}
}
else if((SVX_NUM_BITMAP|LINK_TOKEN) == aFmt.GetNumberingType())
@@ -1011,13 +1010,13 @@ SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule) :
{
}
-SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule, USHORT _nWhich ) :
+SvxNumBulletItem::SvxNumBulletItem(SvxNumRule& rRule, sal_uInt16 _nWhich ) :
SfxPoolItem(_nWhich),
pNumRule(new SvxNumRule(rRule))
{
}
-SfxPoolItem* SvxNumBulletItem::Create(SvStream &s, USHORT n) const
+SfxPoolItem* SvxNumBulletItem::Create(SvStream &s, sal_uInt16 n) const
{
return SfxPoolItem::Create(s, n );
}
@@ -1043,24 +1042,24 @@ SfxPoolItem* SvxNumBulletItem::Clone( SfxItemPool * ) const
return new SvxNumBulletItem(*this);
}
-USHORT SvxNumBulletItem::GetVersion( USHORT /*nFileVersion*/ ) const
+sal_uInt16 SvxNumBulletItem::GetVersion( sal_uInt16 /*nFileVersion*/ ) const
{
return NUMITEM_VERSION_03;
}
-SvStream& SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )const
+SvStream& SvxNumBulletItem::Store(SvStream &rStream, sal_uInt16 /*nItemVersion*/ )const
{
pNumRule->Store(rStream);
return rStream;
}
-bool SvxNumBulletItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxNumBulletItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
rVal <<= SvxCreateNumRule( pNumRule );
return true;
}
-bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
uno::Reference< container::XIndexReplace > xRule;
if( rVal >>= xRule )
@@ -1086,12 +1085,12 @@ bool SvxNumBulletItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nM
return false;
}
-SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, USHORT nLevels, SvxNumRuleType eType )
+SvxNumRule* SvxConvertNumRule( const SvxNumRule* pRule, sal_uInt16 nLevels, SvxNumRuleType eType )
{
- const USHORT nSrcLevels = pRule->GetLevelCount();
+ const sal_uInt16 nSrcLevels = pRule->GetLevelCount();
SvxNumRule* pNewRule = new SvxNumRule( pRule->GetFeatureFlags(), nLevels, pRule->IsContinuousNumbering(), eType );
- for( USHORT nLevel = 0; (nLevel < nLevels) && (nLevel < nSrcLevels); nLevel++ )
+ for( sal_uInt16 nLevel = 0; (nLevel < nLevels) && (nLevel < nSrcLevels); nLevel++ )
pNewRule->SetLevel( nLevel, pRule->GetLevel( nLevel ) );
return pNewRule;
diff --git a/editeng/source/items/optitems.cxx b/editeng/source/items/optitems.cxx
index 260191080088..260191080088 100644..100755
--- a/editeng/source/items/optitems.cxx
+++ b/editeng/source/items/optitems.cxx
diff --git a/editeng/source/items/page.src b/editeng/source/items/page.src
index 9fe7f3013ce6..c528dc8b0bd0 100644..100755
--- a/editeng/source/items/page.src
+++ b/editeng/source/items/page.src
@@ -29,154 +29,6 @@
#include <editeng/editrids.hrc>
-String RID_SVXSTR_PAPER_A0
-{
- Text = "A0" ;
-};
-String RID_SVXSTR_PAPER_A1
-{
- Text = "A1" ;
-};
-String RID_SVXSTR_PAPER_A2
-{
- Text = "A2" ;
-};
-String RID_SVXSTR_PAPER_A3
-{
- Text = "A3" ;
-};
-String RID_SVXSTR_PAPER_A4
-{
- Text = "A4" ;
-};
-String RID_SVXSTR_PAPER_A5
-{
- Text = "A5" ;
-};
-String RID_SVXSTR_PAPER_B4_ISO
-{
- Text = "B4 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_B5_ISO
-{
- Text = "B5 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_LETTER
-{
- Text = "Letter" ;
-};
-String RID_SVXSTR_PAPER_LEGAL
-{
- Text = "Legal" ;
-};
-String RID_SVXSTR_PAPER_TABLOID
-{
- Text = "Tabloid" ;
-};
-String RID_SVXSTR_PAPER_USER
-{
- Text [ en-US ] = "User Defined" ;
-};
-String RID_SVXSTR_PAPER_B6_ISO
-{
- Text = "B6 (ISO)" ;
-};
-String RID_SVXSTR_PAPER_C4
-{
- Text = "C4 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C5
-{
- Text = "C5 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C6
-{
- Text = "C6 Envelope" ;
-};
-String RID_SVXSTR_PAPER_C65
-{
- Text = "C6/5 Envelope" ;
-};
-String RID_SVXSTR_PAPER_DL
-{
- Text = "DL Envelope" ;
-};
-String RID_SVXSTR_PAPER_DIA
-{
- Text = "Dia Slide" ;
-};
-String RID_SVXSTR_PAPER_SCREEN
-{
- Text [ en-US ] = "Screen" ;
-};
-String RID_SVXSTR_PAPER_C
-{
- Text = "C" ;
-};
-String RID_SVXSTR_PAPER_D
-{
- Text = "D" ;
-};
-String RID_SVXSTR_PAPER_E
-{
- Text = "E" ;
-};
-String RID_SVXSTR_PAPER_EXECUTIVE
-{
- Text = "Executive" ;
-};
-String RID_SVXSTR_PAPER_LEGAL2
-{
- Text = "Long Bond" ;
-};
-String RID_SVXSTR_PAPER_MONARCH
-{
- Text = "#8 (Monarch) Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM675
-{
- Text = "#6 3/4 (Personal) Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM9
-{
- Text = "#9 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM10
-{
- Text = "#10 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM11
-{
- Text = "#11 Envelope" ;
-};
-String RID_SVXSTR_PAPER_COM12
-{
- Text = "#12 Envelope" ;
-};
-String RID_SVXSTR_PAPER_KAI16
-{
- Text = "16 Kai" ;
-};
-String RID_SVXSTR_PAPER_KAI32
-{
- Text = "32 Kai" ;
-};
-String RID_SVXSTR_PAPER_KAI32BIG
-{
- Text = "Big 32 Kai" ;
-};
-String RID_SVXSTR_PAPER_B4_JIS
-{
- Text = "B4 (JIS)" ;
-};
-String RID_SVXSTR_PAPER_B5_JIS
-{
- Text = "B5 (JIS)" ;
-};
-String RID_SVXSTR_PAPER_B6_JIS
-{
- Text = "B6 (JIS)" ;
-};
String RID_SVXSTR_PAPERBIN
{
Text [ en-US ] = "Paper tray" ;
diff --git a/editeng/source/items/paperinf.cxx b/editeng/source/items/paperinf.cxx
index 7881c069c797..9d48831776b0 100644..100755
--- a/editeng/source/items/paperinf.cxx
+++ b/editeng/source/items/paperinf.cxx
@@ -43,9 +43,9 @@
Description: Is the printer valid
--------------------------------------------------------------------*/
-inline BOOL IsValidPrinter( const Printer* pPtr )
+inline sal_Bool IsValidPrinter( const Printer* pPtr )
{
- return pPtr->GetName().Len() ? TRUE : FALSE;
+ return pPtr->GetName().Len() ? sal_True : sal_False;
}
//------------------------------------------------------------------------
@@ -134,51 +134,7 @@ Size SvxPaperInfo::GetDefaultPaperSize( MapUnit eUnit )
String SvxPaperInfo::GetName( Paper ePaper )
{
- USHORT nResId = 0;
-
- switch ( ePaper )
- {
- case PAPER_A0: nResId = RID_SVXSTR_PAPER_A0; break;
- case PAPER_A1: nResId = RID_SVXSTR_PAPER_A1; break;
- case PAPER_A2: nResId = RID_SVXSTR_PAPER_A2; break;
- case PAPER_A3: nResId = RID_SVXSTR_PAPER_A3; break;
- case PAPER_A4: nResId = RID_SVXSTR_PAPER_A4; break;
- case PAPER_A5: nResId = RID_SVXSTR_PAPER_A5; break;
- case PAPER_B4_ISO: nResId = RID_SVXSTR_PAPER_B4_ISO; break;
- case PAPER_B5_ISO: nResId = RID_SVXSTR_PAPER_B5_ISO; break;
- case PAPER_LETTER: nResId = RID_SVXSTR_PAPER_LETTER; break;
- case PAPER_LEGAL: nResId = RID_SVXSTR_PAPER_LEGAL; break;
- case PAPER_TABLOID: nResId = RID_SVXSTR_PAPER_TABLOID; break;
- case PAPER_USER: nResId = RID_SVXSTR_PAPER_USER; break;
- case PAPER_B6_ISO: nResId = RID_SVXSTR_PAPER_B6_ISO; break;
- case PAPER_ENV_C4: nResId = RID_SVXSTR_PAPER_C4; break;
- case PAPER_ENV_C5: nResId = RID_SVXSTR_PAPER_C5; break;
- case PAPER_ENV_C6: nResId = RID_SVXSTR_PAPER_C6; break;
- case PAPER_ENV_C65: nResId = RID_SVXSTR_PAPER_C65; break;
- case PAPER_ENV_DL: nResId = RID_SVXSTR_PAPER_DL; break;
- case PAPER_SLIDE_DIA: nResId = RID_SVXSTR_PAPER_DIA; break;
- case PAPER_SCREEN: nResId = RID_SVXSTR_PAPER_SCREEN; break;
- case PAPER_C: nResId = RID_SVXSTR_PAPER_C; break;
- case PAPER_D: nResId = RID_SVXSTR_PAPER_D; break;
- case PAPER_E: nResId = RID_SVXSTR_PAPER_E; break;
- case PAPER_EXECUTIVE: nResId = RID_SVXSTR_PAPER_EXECUTIVE;break;
- case PAPER_FANFOLD_LEGAL_DE: nResId = RID_SVXSTR_PAPER_LEGAL2; break;
- case PAPER_ENV_MONARCH: nResId = RID_SVXSTR_PAPER_MONARCH; break;
- case PAPER_ENV_PERSONAL: nResId = RID_SVXSTR_PAPER_COM675; break;
- case PAPER_ENV_9: nResId = RID_SVXSTR_PAPER_COM9; break;
- case PAPER_ENV_10: nResId = RID_SVXSTR_PAPER_COM10; break;
- case PAPER_ENV_11: nResId = RID_SVXSTR_PAPER_COM11; break;
- case PAPER_ENV_12: nResId = RID_SVXSTR_PAPER_COM12; break;
- case PAPER_KAI16: nResId = RID_SVXSTR_PAPER_KAI16; break;
- case PAPER_KAI32: nResId = RID_SVXSTR_PAPER_KAI32; break;
- case PAPER_KAI32BIG: nResId = RID_SVXSTR_PAPER_KAI32BIG; break;
- case PAPER_B4_JIS: nResId = RID_SVXSTR_PAPER_B4_JIS; break;
- case PAPER_B5_JIS: nResId = RID_SVXSTR_PAPER_B5_JIS; break;
- case PAPER_B6_JIS: nResId = RID_SVXSTR_PAPER_B6_JIS; break;
- default: DBG_ERRORFILE( "unknown papersize" );
- }
-
- return ( nResId > 0 ) ? String( EditResId( nResId ) ) : String();
+ return String( Printer::GetPaperName( ePaper ) );
}
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index d8807301872b..7e1bfa4843fb 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -145,7 +145,7 @@ int SvxLineSpacingItem::operator==( const SfxPoolItem& rAttr ) const
- ein sal_uInt16 for the mode
- ein sal_uInt32 for all values (distance, height, rel. detail)
*/
-bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -190,7 +190,7 @@ bool SvxLineSpacingItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
-bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -241,7 +241,7 @@ bool SvxLineSpacingItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
eLineSpace = aLSp.Mode == style::LineSpacingMode::FIX ? SVX_LINE_SPACE_FIX : SVX_LINE_SPACE_MIN;
nLineHeight = aLSp.Height;
if(bConvert)
- nLineHeight = (USHORT)MM100_TO_TWIP_UNSIGNED(nLineHeight);
+ nLineHeight = (sal_uInt16)MM100_TO_TWIP_UNSIGNED(nLineHeight);
}
break;
}
@@ -382,7 +382,7 @@ int SvxAdjustItem::operator==( const SfxPoolItem& rAttr ) const
? 1 : 0 );
}
-bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxAdjustItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId )
@@ -400,7 +400,7 @@ bool SvxAdjustItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
-bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxAdjustItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId )
@@ -420,7 +420,7 @@ bool SvxAdjustItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
eVal != SVX_ADJUST_LEFT &&
eVal != SVX_ADJUST_BLOCK &&
eVal != SVX_ADJUST_CENTER)
- return FALSE;
+ return sal_False;
if(eVal < (sal_uInt16)SVX_ADJUST_END)
nMemberId == MID_PARA_ADJUST ?
SetAdjust((SvxAdjust)eVal) :
@@ -542,7 +542,7 @@ SvStream& SvxAdjustItem::Store( SvStream& rStrm, sal_uInt16 nItemVersion ) const
// class SvxWidowsItem ---------------------------------------------------
-SvxWidowsItem::SvxWidowsItem(const BYTE nL, const USHORT nId ) :
+SvxWidowsItem::SvxWidowsItem(const sal_uInt8 nL, const sal_uInt16 nId ) :
SfxByteItem( nId, nL )
{
}
@@ -614,7 +614,7 @@ SfxItemPresentation SvxWidowsItem::GetPresentation
// class SvxOrphansItem --------------------------------------------------
-SvxOrphansItem::SvxOrphansItem(const BYTE nL, const USHORT nId ) :
+SvxOrphansItem::SvxOrphansItem(const sal_uInt8 nL, const sal_uInt16 nId ) :
SfxByteItem( nId, nL )
{
}
@@ -696,7 +696,7 @@ SvxHyphenZoneItem::SvxHyphenZoneItem( const sal_Bool bHyph, const sal_uInt16 nId
}
// -----------------------------------------------------------------------
-bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch(nMemberId)
@@ -717,7 +717,7 @@ bool SvxHyphenZoneItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
// -----------------------------------------------------------------------
-bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
sal_Int16 nNewVal = 0;
@@ -732,13 +732,13 @@ bool SvxHyphenZoneItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
bHyphen = Any2Bool(rVal);
break;
case MID_HYPHEN_MIN_LEAD:
- nMinLead = (BYTE)nNewVal;
+ nMinLead = (sal_uInt8)nNewVal;
break;
case MID_HYPHEN_MIN_TRAIL:
- nMinTrail = (BYTE)nNewVal;
+ nMinTrail = (sal_uInt8)nNewVal;
break;
case MID_HYPHEN_MAX_HYPHENS:
- nMaxHyphens = (BYTE)nNewVal;
+ nMaxHyphens = (sal_uInt8)nNewVal;
break;
}
return true;
@@ -976,7 +976,7 @@ SvxTabStopItem& SvxTabStopItem::operator=( const SvxTabStopItem& rTSI )
return *this;
}
-bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxTabStopItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1017,7 +1017,7 @@ bool SvxTabStopItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return sal_True;
}
-bool SvxTabStopItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxTabStopItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1339,7 +1339,7 @@ SfxPoolItem* SvxPageModelItem::Clone( SfxItemPool* ) const
//------------------------------------------------------------------------
-bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
@@ -1353,7 +1353,7 @@ bool SvxPageModelItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberI
return sal_True;
}
-bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+bool SvxPageModelItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
sal_Bool bRet;
@@ -1413,14 +1413,14 @@ SfxPoolItem* SvxScriptSpaceItem::Clone( SfxItemPool * ) const
return new SvxScriptSpaceItem( GetValue(), Which() );
}
-SfxPoolItem* SvxScriptSpaceItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxScriptSpaceItem::Create(SvStream & rStrm, sal_uInt16) const
{
sal_Bool bFlag;
rStrm >> bFlag;
return new SvxScriptSpaceItem( bFlag, Which() );
}
-USHORT SvxScriptSpaceItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxScriptSpaceItem::GetVersion( sal_uInt16 nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -1466,14 +1466,14 @@ SfxPoolItem* SvxHangingPunctuationItem::Clone( SfxItemPool * ) const
return new SvxHangingPunctuationItem( GetValue(), Which() );
}
-SfxPoolItem* SvxHangingPunctuationItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxHangingPunctuationItem::Create(SvStream & rStrm, sal_uInt16) const
{
sal_Bool nValue;
rStrm >> nValue;
return new SvxHangingPunctuationItem( nValue, Which() );
}
-USHORT SvxHangingPunctuationItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxHangingPunctuationItem::GetVersion( sal_uInt16 nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -1519,14 +1519,14 @@ SfxPoolItem* SvxForbiddenRuleItem::Clone( SfxItemPool * ) const
return new SvxForbiddenRuleItem( GetValue(), Which() );
}
-SfxPoolItem* SvxForbiddenRuleItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxForbiddenRuleItem::Create(SvStream & rStrm, sal_uInt16) const
{
sal_Bool nValue;
rStrm >> nValue;
return new SvxForbiddenRuleItem( nValue, Which() );
}
-USHORT SvxForbiddenRuleItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxForbiddenRuleItem::GetVersion( sal_uInt16 nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -1575,20 +1575,20 @@ SfxPoolItem* SvxParaVertAlignItem::Clone( SfxItemPool* ) const
return new SvxParaVertAlignItem( GetValue(), Which() );
}
-SfxPoolItem* SvxParaVertAlignItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxParaVertAlignItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_uInt16 nVal;
rStrm >> nVal;
return new SvxParaVertAlignItem( nVal, Which() );
}
-SvStream& SvxParaVertAlignItem::Store( SvStream & rStrm, USHORT ) const
+SvStream& SvxParaVertAlignItem::Store( SvStream & rStrm, sal_uInt16 ) const
{
rStrm << GetValue();
return rStrm;
}
-USHORT SvxParaVertAlignItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxParaVertAlignItem::GetVersion( sal_uInt16 nFFVer ) const
{
return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
}
@@ -1606,7 +1606,7 @@ SfxItemPresentation SvxParaVertAlignItem::GetPresentation(
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- USHORT nTmp;
+ sal_uInt16 nTmp;
switch( GetValue() )
{
case AUTOMATIC: nTmp = RID_SVXITEMS_PARAVERTALIGN_AUTO; break;
@@ -1625,19 +1625,19 @@ SfxItemPresentation SvxParaVertAlignItem::GetPresentation(
}
bool SvxParaVertAlignItem::QueryValue( com::sun::star::uno::Any& rVal,
- BYTE /*nMemberId*/ ) const
+ sal_uInt8 /*nMemberId*/ ) const
{
rVal <<= (sal_Int16)GetValue();
return sal_True;
}
bool SvxParaVertAlignItem::PutValue( const com::sun::star::uno::Any& rVal,
- BYTE /*nMemberId*/ )
+ sal_uInt8 /*nMemberId*/ )
{
sal_Int16 nVal = sal_Int16();
if((rVal >>= nVal) && nVal >=0 && nVal <= BOTTOM )
{
- SetValue( (USHORT)nVal );
+ SetValue( (sal_uInt16)nVal );
return sal_True;
}
else
@@ -1661,14 +1661,14 @@ SfxPoolItem* SvxParaGridItem::Clone( SfxItemPool * ) const
return new SvxParaGridItem( GetValue(), Which() );
}
-SfxPoolItem* SvxParaGridItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxParaGridItem::Create(SvStream & rStrm, sal_uInt16) const
{
sal_Bool bFlag;
rStrm >> bFlag;
return new SvxParaGridItem( bFlag, Which() );
}
-USHORT SvxParaGridItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxParaGridItem::GetVersion( sal_uInt16 nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
diff --git a/editeng/source/items/svdfield.cxx b/editeng/source/items/svdfield.cxx
index d530406956e9..41f0bc8faae1 100644..100755
--- a/editeng/source/items/svdfield.cxx
+++ b/editeng/source/items/svdfield.cxx
@@ -49,14 +49,14 @@ int SdrMeasureField::operator==(const SvxFieldData& rSrc) const
void SdrMeasureField::Load(SvPersistStream& rIn)
{
- UINT16 nFieldKind;
+ sal_uInt16 nFieldKind;
rIn>>nFieldKind;
eMeasureFieldKind=(SdrMeasureFieldKind)nFieldKind;
}
void SdrMeasureField::Save(SvPersistStream& rOut)
{
- rOut<<(UINT16)eMeasureFieldKind;
+ rOut<<(sal_uInt16)eMeasureFieldKind;
}
//////////////////////////////////////////////////////////////////////////////
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index 62227cc40676..e7062bfbf5dc 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -81,7 +81,7 @@ SvxFont::SvxFont( const SvxFont &rFont )
void SvxFont::DrawArrow( OutputDevice &rOut, const Rectangle& rRect,
- const Size& rSize, const Color& rCol, BOOL bLeft )
+ const Size& rSize, const Color& rCol, sal_Bool bLeft )
{
long nLeft = ( rRect.Left() + rRect.Right() - rSize.Width() )/ 2;
long nRight = nLeft + rSize.Width();
@@ -146,12 +146,12 @@ XubString SvxFont::CalcCaseMap( const XubString &rTxt ) const
// Every beginning of a word is capitalized, the rest of the word
// is taken over as is.
// Bug: if the attribute starts in the middle of the word.
- BOOL bBlank = TRUE;
+ sal_Bool bBlank = sal_True;
- for( USHORT i = 0; i < aTxt.Len(); ++i )
+ for( sal_uInt16 i = 0; i < aTxt.Len(); ++i )
{
if( sal_Unicode(' ') == aTxt.GetChar(i) || sal_Unicode('\t') == aTxt.GetChar(i) )
- bBlank = TRUE;
+ bBlank = sal_True;
else
{
if( bBlank )
@@ -160,7 +160,7 @@ XubString SvxFont::CalcCaseMap( const XubString &rTxt ) const
aCharClass.toUpper( aTemp );
aTxt.Replace( i, 1, aTemp );
}
- bBlank = FALSE;
+ bBlank = sal_False;
}
}
break;
@@ -201,11 +201,11 @@ public:
: pOut(_pOut), rTxt(_rTxt), nIdx(_nIdx), nLen(_nLen)
{ }
- virtual void DoSpace( const BOOL bDraw );
+ virtual void DoSpace( const sal_Bool bDraw );
virtual void SetSpace();
virtual void Do( const XubString &rTxt,
const xub_StrLen nIdx, const xub_StrLen nLen,
- const BOOL bUpper ) = 0;
+ const sal_Bool bUpper ) = 0;
inline OutputDevice *GetOut() { return pOut; }
inline const XubString &GetTxt() const { return rTxt; }
@@ -213,12 +213,12 @@ public:
xub_StrLen GetLen() const { return nLen; }
};
-void SvxDoCapitals::DoSpace( const BOOL /*bDraw*/ ) { }
+void SvxDoCapitals::DoSpace( const sal_Bool /*bDraw*/ ) { }
void SvxDoCapitals::SetSpace() { }
void SvxDoCapitals::Do( const XubString &/*_rTxt*/, const xub_StrLen /*_nIdx*/,
- const xub_StrLen /*_nLen*/, const BOOL /*bUpper*/ ) { }
+ const xub_StrLen /*_nLen*/, const sal_Bool /*bUpper*/ ) { }
/*************************************************************************
* SvxFont::DoOnCapitals() const
@@ -233,9 +233,9 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
const xub_StrLen nLen = STRING_LEN == nPartLen ? rDo.GetLen() : nPartLen;
const XubString aTxt( CalcCaseMap( rTxt ) );
- const USHORT nTxtLen = Min( rTxt.Len(), nLen );
- USHORT nPos = 0;
- USHORT nOldPos = nPos;
+ const sal_uInt16 nTxtLen = Min( rTxt.Len(), nLen );
+ sal_uInt16 nPos = 0;
+ sal_uInt16 nOldPos = nPos;
// #108210#
// Test if string length differ between original and CaseMapped
@@ -275,11 +275,11 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
const XubString aSnippet(rTxt, nIdx + nOldPos, nPos-nOldPos);
XubString aNewText = CalcCaseMap(aSnippet);
- rDo.Do( aNewText, 0, aNewText.Len(), TRUE );
+ rDo.Do( aNewText, 0, aNewText.Len(), sal_True );
}
else
{
- rDo.Do( aTxt, nIdx + nOldPos, nPos-nOldPos, TRUE );
+ rDo.Do( aTxt, nIdx + nOldPos, nPos-nOldPos, sal_True );
}
nOldPos = nPos;
@@ -305,11 +305,11 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
const XubString aSnippet(rTxt, nIdx + nOldPos, nPos - nOldPos);
XubString aNewText = CalcCaseMap(aSnippet);
- rDo.Do( aNewText, 0, aNewText.Len(), FALSE );
+ rDo.Do( aNewText, 0, aNewText.Len(), sal_False );
}
else
{
- rDo.Do( aTxt, nIdx + nOldPos, nPos-nOldPos, FALSE );
+ rDo.Do( aTxt, nIdx + nOldPos, nPos-nOldPos, sal_False );
}
nOldPos = nPos;
@@ -320,7 +320,7 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
if( nOldPos != nPos )
{
- rDo.DoSpace( FALSE );
+ rDo.DoSpace( sal_False );
if(bCaseMapLengthDiffers)
{
@@ -330,18 +330,18 @@ void SvxFont::DoOnCapitals(SvxDoCapitals &rDo, const xub_StrLen nPartLen) const
const XubString aSnippet(rTxt, nIdx + nOldPos, nPos - nOldPos);
XubString aNewText = CalcCaseMap(aSnippet);
- rDo.Do( aNewText, 0, aNewText.Len(), FALSE );
+ rDo.Do( aNewText, 0, aNewText.Len(), sal_False );
}
else
{
- rDo.Do( aTxt, nIdx + nOldPos, nPos - nOldPos, FALSE );
+ rDo.Do( aTxt, nIdx + nOldPos, nPos - nOldPos, sal_False );
}
nOldPos = nPos;
rDo.SetSpace();
}
}
- rDo.DoSpace( TRUE );
+ rDo.DoSpace( sal_True );
}
@@ -432,7 +432,7 @@ Size SvxFont::GetPhysTxtSize( const OutputDevice *pOut, const XubString &rTxt )
}
Size SvxFont::QuickGetTextSize( const OutputDevice *pOut, const XubString &rTxt,
- const USHORT nIdx, const USHORT nLen, sal_Int32* pDXArray ) const
+ const sal_uInt16 nIdx, const sal_uInt16 nLen, sal_Int32* pDXArray ) const
{
if ( !IsCaseMap() && !IsKern() )
return Size( pOut->GetTextArray( rTxt, pDXArray, nIdx, nLen ),
@@ -657,18 +657,18 @@ public:
{ }
virtual void Do( const XubString &rTxt, const xub_StrLen nIdx,
- const xub_StrLen nLen, const BOOL bUpper );
+ const xub_StrLen nLen, const sal_Bool bUpper );
inline const Size &GetSize() const { return aTxtSize; };
};
void SvxDoGetCapitalSize::Do( const XubString &_rTxt, const xub_StrLen _nIdx,
- const xub_StrLen _nLen, const BOOL bUpper )
+ const xub_StrLen _nLen, const sal_Bool bUpper )
{
Size aPartSize;
if ( !bUpper )
{
- BYTE nProp = pFont->GetPropr();
+ sal_uInt8 nProp = pFont->GetPropr();
pFont->SetProprRel( SMALL_CAPS_PERCENTAGE );
pFont->SetPhysFont( pOut );
aPartSize.setWidth( pOut->GetTextWidth( _rTxt, _nIdx, _nLen ) );
@@ -720,23 +720,23 @@ public:
aSpacePos( rPos ),
nKern( nKrn )
{ }
- virtual void DoSpace( const BOOL bDraw );
+ virtual void DoSpace( const sal_Bool bDraw );
virtual void SetSpace();
virtual void Do( const XubString &rTxt, const xub_StrLen nIdx,
- const xub_StrLen nLen, const BOOL bUpper );
+ const xub_StrLen nLen, const sal_Bool bUpper );
};
-void SvxDoDrawCapital::DoSpace( const BOOL bDraw )
+void SvxDoDrawCapital::DoSpace( const sal_Bool bDraw )
{
if ( bDraw || pFont->IsWordLineMode() )
{
- USHORT nDiff = (USHORT)(aPos.X() - aSpacePos.X());
+ sal_uInt16 nDiff = (sal_uInt16)(aPos.X() - aSpacePos.X());
if ( nDiff )
{
- BOOL bWordWise = pFont->IsWordLineMode();
- BOOL bTrans = pFont->IsTransparent();
- pFont->SetWordLineMode( FALSE );
- pFont->SetTransparent( TRUE );
+ sal_Bool bWordWise = pFont->IsWordLineMode();
+ sal_Bool bTrans = pFont->IsTransparent();
+ pFont->SetWordLineMode( sal_False );
+ pFont->SetTransparent( sal_True );
pFont->SetPhysFont( pOut );
pOut->DrawStretchText( aSpacePos, nDiff, XubString( sDoubleSpace,
RTL_TEXTENCODING_MS_1252 ), 0, 2 );
@@ -754,9 +754,9 @@ void SvxDoDrawCapital::SetSpace()
}
void SvxDoDrawCapital::Do( const XubString &_rTxt, const xub_StrLen _nIdx,
- const xub_StrLen _nLen, const BOOL bUpper)
+ const xub_StrLen _nLen, const sal_Bool bUpper)
{
- BYTE nProp = 0;
+ sal_uInt8 nProp = 0;
Size aPartSize;
// Set the desired font
diff --git a/editeng/source/items/svxitems.src b/editeng/source/items/svxitems.src
index 5b9d01660286..5b9d01660286 100644..100755
--- a/editeng/source/items/svxitems.src
+++ b/editeng/source/items/svxitems.src
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 0d172cf481bf..bfac7ca12c7b 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -124,7 +124,7 @@ using namespace ::com::sun::star::text;
#define TWIP_TO_MM100_UNSIGNED(TWIP) ((((TWIP)*127L+36L)/72L))
#define MM100_TO_TWIP_UNSIGNED(MM100) ((((MM100)*72L+63L)/127L))
-BOOL SvxFontItem::bEnableStoreUnicodeNames = FALSE;
+sal_Bool SvxFontItem::bEnableStoreUnicodeNames = sal_False;
// STATIC DATA -----------------------------------------------------------
@@ -169,7 +169,7 @@ TYPEINIT1(SvxScriptSetItem, SfxSetItem );
// class SvxFontListItem -------------------------------------------------
SvxFontListItem::SvxFontListItem( const FontList* pFontLst,
- const USHORT nId ) :
+ const sal_uInt16 nId ) :
SfxPoolItem( nId ),
pFontList( pFontLst )
{
@@ -178,7 +178,7 @@ SvxFontListItem::SvxFontListItem( const FontList* pFontLst,
sal_Int32 nCount = pFontList->GetFontNameCount();
aFontNameSeq.realloc( nCount );
- for ( USHORT i = 0; i < nCount; i++ )
+ for ( sal_uInt16 i = 0; i < nCount; i++ )
aFontNameSeq[i] = pFontList->GetFontName(i).GetName();
}
}
@@ -209,7 +209,7 @@ int SvxFontListItem::operator==( const SfxPoolItem& rAttr ) const
return( pFontList == ((SvxFontListItem&)rAttr).pFontList );
}
-bool SvxFontListItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxFontListItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
rVal <<= aFontNameSeq;
return true;
@@ -231,7 +231,7 @@ SfxItemPresentation SvxFontListItem::GetPresentation
// class SvxFontItem -----------------------------------------------------
-SvxFontItem::SvxFontItem( const USHORT nId ) :
+SvxFontItem::SvxFontItem( const sal_uInt16 nId ) :
SfxPoolItem( nId )
{
eFamily = FAMILY_SWISS;
@@ -243,7 +243,7 @@ SvxFontItem::SvxFontItem( const USHORT nId ) :
SvxFontItem::SvxFontItem( const FontFamily eFam, const XubString& aName,
const XubString& aStName, const FontPitch eFontPitch,
- const rtl_TextEncoding eFontTextEncoding, const USHORT nId ) :
+ const rtl_TextEncoding eFontTextEncoding, const sal_uInt16 nId ) :
SfxPoolItem( nId ),
@@ -257,7 +257,7 @@ SvxFontItem::SvxFontItem( const FontFamily eFam, const XubString& aName,
// -----------------------------------------------------------------------
-bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxFontItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch(nMemberId)
@@ -286,7 +286,7 @@ bool SvxFontItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
// -----------------------------------------------------------------------
-bool SvxFontItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
+bool SvxFontItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
{
nMemberId &= ~CONVERT_TWIPS;
switch(nMemberId)
@@ -380,14 +380,14 @@ SfxPoolItem* SvxFontItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxFontItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxFontItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- BOOL bToBats =
+ sal_Bool bToBats =
GetFamilyName().EqualsAscii( "StarSymbol", 0, sizeof("StarSymbol")-1 ) ||
GetFamilyName().EqualsAscii( "OpenSymbol", 0, sizeof("OpenSymbol")-1 );
- rStrm << (BYTE) GetFamily() << (BYTE) GetPitch()
- << (BYTE)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion()));
+ rStrm << (sal_uInt8) GetFamily() << (sal_uInt8) GetPitch()
+ << (sal_uInt8)(bToBats ? RTL_TEXTENCODING_SYMBOL : GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion()));
String aStoreFamilyName( GetFamilyName() );
if( bToBats )
@@ -409,9 +409,9 @@ SvStream& SvxFontItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, sal_uInt16) const
{
- BYTE _eFamily, eFontPitch, eFontTextEncoding;
+ sal_uInt8 _eFamily, eFontPitch, eFontTextEncoding;
String aName, aStyle;
rStrm >> _eFamily;
rStrm >> eFontPitch;
@@ -424,7 +424,7 @@ SfxPoolItem* SvxFontItem::Create(SvStream& rStrm, USHORT) const
rStrm.ReadByteString(aStyle);
// Set the "correct" textencoding
- eFontTextEncoding = (BYTE)GetSOLoadTextEncoding( eFontTextEncoding, (USHORT)rStrm.GetVersion() );
+ eFontTextEncoding = (sal_uInt8)GetSOLoadTextEncoding( eFontTextEncoding, (sal_uInt16)rStrm.GetVersion() );
// at some point, the StarBats changes from ANSI font to SYMBOL font
if ( RTL_TEXTENCODING_SYMBOL != eFontTextEncoding && aName.EqualsAscii("StarBats") )
@@ -476,15 +476,15 @@ SfxItemPresentation SvxFontItem::GetPresentation
//------------------------------------------------------------------------
-void SvxFontItem::EnableStoreUnicodeNames( BOOL bEnable )
+void SvxFontItem::EnableStoreUnicodeNames( sal_Bool bEnable )
{
bEnableStoreUnicodeNames = bEnable;
}
// class SvxPostureItem --------------------------------------------------
-SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)ePosture )
+SvxPostureItem::SvxPostureItem( const FontItalic ePosture, const sal_uInt16 nId ) :
+ SfxEnumItem( nId, (sal_uInt16)ePosture )
{
}
@@ -497,24 +497,24 @@ SfxPoolItem* SvxPostureItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-USHORT SvxPostureItem::GetValueCount() const
+sal_uInt16 SvxPostureItem::GetValueCount() const
{
return ITALIC_NORMAL + 1; // ITALIC_NONE also belongs here
}
// -----------------------------------------------------------------------
-SvStream& SvxPostureItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxPostureItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (BYTE)GetValue();
+ rStrm << (sal_uInt8)GetValue();
return rStrm;
}
// -----------------------------------------------------------------------
-SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxPostureItem::Create(SvStream& rStrm, sal_uInt16) const
{
- BYTE nPosture;
+ sal_uInt8 nPosture;
rStrm >> nPosture;
return new SvxPostureItem( (const FontItalic)nPosture, Which() );
}
@@ -545,13 +545,13 @@ SfxItemPresentation SvxPostureItem::GetPresentation
// -----------------------------------------------------------------------
-XubString SvxPostureItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxPostureItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
- DBG_ASSERT( nPos <= (USHORT)ITALIC_NORMAL, "enum overflow!" );
+ DBG_ASSERT( nPos <= (sal_uInt16)ITALIC_NORMAL, "enum overflow!" );
XubString sTxt;
FontItalic eItalic = (FontItalic)nPos;
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
switch ( eItalic )
{
@@ -566,7 +566,7 @@ XubString SvxPostureItem::GetValueTextByPos( USHORT nPos ) const
return sTxt;
}
-bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxPostureItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId )
@@ -581,7 +581,7 @@ bool SvxPostureItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
-bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxPostureItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId )
@@ -600,7 +600,7 @@ bool SvxPostureItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
eSlant = (awt::FontSlant)nValue;
}
- SetValue((USHORT)eSlant);
+ SetValue((sal_uInt16)eSlant);
}
}
return true;
@@ -623,13 +623,13 @@ BOOL SvxPostureItem::GetBoolValue() const
void SvxPostureItem::SetBoolValue( sal_Bool bVal )
{
- SetValue( (USHORT)(bVal ? ITALIC_NORMAL : ITALIC_NONE) );
+ SetValue( (sal_uInt16)(bVal ? ITALIC_NORMAL : ITALIC_NONE) );
}
// class SvxWeightItem ---------------------------------------------------
-SvxWeightItem::SvxWeightItem( const FontWeight eWght, const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)eWght )
+SvxWeightItem::SvxWeightItem( const FontWeight eWght, const sal_uInt16 nId ) :
+ SfxEnumItem( nId, (sal_uInt16)eWght )
{
}
@@ -653,12 +653,12 @@ sal_Bool SvxWeightItem::GetBoolValue() const
void SvxWeightItem::SetBoolValue( sal_Bool bVal )
{
- SetValue( (USHORT)(bVal ? WEIGHT_BOLD : WEIGHT_NORMAL) );
+ SetValue( (sal_uInt16)(bVal ? WEIGHT_BOLD : WEIGHT_NORMAL) );
}
// -----------------------------------------------------------------------
-USHORT SvxWeightItem::GetValueCount() const
+sal_uInt16 SvxWeightItem::GetValueCount() const
{
return WEIGHT_BLACK; // WEIGHT_DONTKNOW does not belong
}
@@ -672,17 +672,17 @@ SfxPoolItem* SvxWeightItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxWeightItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxWeightItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (BYTE)GetValue();
+ rStrm << (sal_uInt8)GetValue();
return rStrm;
}
// -----------------------------------------------------------------------
-SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxWeightItem::Create(SvStream& rStrm, sal_uInt16) const
{
- BYTE nWeight;
+ sal_uInt8 nWeight;
rStrm >> nWeight;
return new SvxWeightItem( (FontWeight)nWeight, Which() );
}
@@ -713,13 +713,13 @@ SfxItemPresentation SvxWeightItem::GetPresentation
// -----------------------------------------------------------------------
-XubString SvxWeightItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxWeightItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
- DBG_ASSERT( nPos <= (USHORT)WEIGHT_BLACK, "enum overflow!" );
+ DBG_ASSERT( nPos <= (sal_uInt16)WEIGHT_BLACK, "enum overflow!" );
return EE_RESSTR( RID_SVXITEMS_WEIGHT_BEGIN + nPos );
}
-bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxWeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId )
@@ -736,7 +736,7 @@ bool SvxWeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
-bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxWeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId )
@@ -754,7 +754,7 @@ bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
return sal_False;
fValue = (float)nValue;
}
- SetValue( (USHORT)VCLUnoHelper::ConvertFontWeight((float)fValue) );
+ SetValue( (sal_uInt16)VCLUnoHelper::ConvertFontWeight((float)fValue) );
}
break;
}
@@ -763,9 +763,9 @@ bool SvxWeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
// class SvxFontHeightItem -----------------------------------------------
-SvxFontHeightItem::SvxFontHeightItem( const ULONG nSz,
- const USHORT nPrp,
- const USHORT nId ) :
+SvxFontHeightItem::SvxFontHeightItem( const sal_uLong nSz,
+ const sal_uInt16 nPrp,
+ const sal_uInt16 nId ) :
SfxPoolItem( nId )
{
SetHeight( nSz,nPrp ); // calculate in percentage
@@ -780,17 +780,17 @@ SfxPoolItem* SvxFontHeightItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxFontHeightItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+SvStream& SvxFontHeightItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
{
- rStrm << (USHORT)GetHeight();
+ rStrm << (sal_uInt16)GetHeight();
if( FONTHEIGHT_UNIT_VERSION <= nItemVersion )
- rStrm << GetProp() << (USHORT)GetPropUnit();
+ rStrm << GetProp() << (sal_uInt16)GetPropUnit();
else
{
// When exporting to the old versions the relative information is lost
// when there is no percentage
- USHORT _nProp = GetProp();
+ sal_uInt16 _nProp = GetProp();
if( SFX_MAPUNIT_RELATIVE != GetPropUnit() )
_nProp = 100;
rStrm << _nProp;
@@ -801,9 +801,9 @@ SvStream& SvxFontHeightItem::Store( SvStream& rStrm , USHORT nItemVersion ) cons
// -----------------------------------------------------------------------
SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
- USHORT nVersion ) const
+ sal_uInt16 nVersion ) const
{
- USHORT nsize, nprop = 0, nPropUnit = SFX_MAPUNIT_RELATIVE;
+ sal_uInt16 nsize, nprop = 0, nPropUnit = SFX_MAPUNIT_RELATIVE;
rStrm >> nsize;
@@ -811,9 +811,9 @@ SfxPoolItem* SvxFontHeightItem::Create( SvStream& rStrm,
rStrm >> nprop;
else
{
- BYTE nP;
+ sal_uInt8 nP;
rStrm >> nP;
- nprop = (USHORT)nP;
+ nprop = (sal_uInt16)nP;
}
if( FONTHEIGHT_UNIT_VERSION <= nVersion )
@@ -834,7 +834,7 @@ int SvxFontHeightItem::operator==( const SfxPoolItem& rItem ) const
GetPropUnit() == ((SvxFontHeightItem&)rItem).GetPropUnit();
}
-bool SvxFontHeightItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxFontHeightItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// In StarOne is the uno::Any always 1/100mm. Through the MemberId it is
// controlled if the value in the Item should be 1/100mm or Twips.
@@ -968,7 +968,7 @@ sal_uInt32 lcl_GetRealHeight_Impl(sal_uInt32 nHeight, sal_uInt16 nProp, SfxMapUn
return nRet;
}
-bool SvxFontHeightItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxFontHeightItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1095,7 +1095,7 @@ SfxItemPresentation SvxFontHeightItem::GetPresentation
// -----------------------------------------------------------------------
-USHORT SvxFontHeightItem::GetVersion(USHORT nFileVersion) const
+sal_uInt16 SvxFontHeightItem::GetVersion(sal_uInt16 nFileVersion) const
{
return (nFileVersion <= SOFFICE_FILEFORMAT_40)
? FONTHEIGHT_16_VERSION
@@ -1117,7 +1117,7 @@ bool SvxFontHeightItem::HasMetrics() const
return true;
}
-void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const USHORT nNewProp,
+void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewProp,
SfxMapUnit eUnit )
{
DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
@@ -1137,7 +1137,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, const USHORT nNewProp,
ePropUnit = eUnit;
}
-void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, USHORT nNewProp,
+void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, sal_uInt16 nNewProp,
SfxMapUnit eMetric, SfxMapUnit eCoreMetric )
{
DBG_ASSERT( GetRefCount() == 0, "SetValue() with pooled item" );
@@ -1161,7 +1161,7 @@ void SvxFontHeightItem::SetHeight( sal_uInt32 nNewHeight, USHORT nNewProp,
// class SvxFontWidthItem -----------------------------------------------
-SvxFontWidthItem::SvxFontWidthItem( const USHORT nSz, const USHORT nPrp, const USHORT nId ) :
+SvxFontWidthItem::SvxFontWidthItem( const sal_uInt16 nSz, const sal_uInt16 nPrp, const sal_uInt16 nId ) :
SfxPoolItem( nId )
{
nWidth = nSz;
@@ -1177,7 +1177,7 @@ SfxPoolItem* SvxFontWidthItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxFontWidthItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxFontWidthItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
rStrm << GetWidth() << GetProp();
return rStrm;
@@ -1187,7 +1187,7 @@ SvStream& SvxFontWidthItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) c
bool SvxFontWidthItem::ScaleMetrics( long nMult, long nDiv )
{
- nWidth = (USHORT)Scale( nWidth, nMult, nDiv );
+ nWidth = (sal_uInt16)Scale( nWidth, nMult, nDiv );
return true;
}
@@ -1201,10 +1201,10 @@ bool SvxFontWidthItem::HasMetrics() const
// -----------------------------------------------------------------------
SfxPoolItem* SvxFontWidthItem::Create( SvStream& rStrm,
- USHORT /*nVersion*/ ) const
+ sal_uInt16 /*nVersion*/ ) const
{
- USHORT nS;
- USHORT nP;
+ sal_uInt16 nS;
+ sal_uInt16 nP;
rStrm >> nS;
rStrm >> nP;
@@ -1222,7 +1222,7 @@ int SvxFontWidthItem::operator==( const SfxPoolItem& rItem ) const
GetProp() == ((SvxFontWidthItem&)rItem).GetProp();
}
-bool SvxFontWidthItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxFontWidthItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1238,7 +1238,7 @@ bool SvxFontWidthItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
-bool SvxFontWidthItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxFontWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
// sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
@@ -1295,8 +1295,8 @@ SfxItemPresentation SvxFontWidthItem::GetPresentation
// class SvxTextLineItem ------------------------------------------------
-SvxTextLineItem::SvxTextLineItem( const FontUnderline eSt, const USHORT nId )
- : SfxEnumItem( nId, (USHORT)eSt ), mColor( COL_TRANSPARENT )
+SvxTextLineItem::SvxTextLineItem( const FontUnderline eSt, const sal_uInt16 nId )
+ : SfxEnumItem( nId, (sal_uInt16)eSt ), mColor( COL_TRANSPARENT )
{
}
@@ -1318,7 +1318,7 @@ sal_Bool SvxTextLineItem::GetBoolValue() const
void SvxTextLineItem::SetBoolValue( sal_Bool bVal )
{
- SetValue( (USHORT)(bVal ? UNDERLINE_SINGLE : UNDERLINE_NONE) );
+ SetValue( (sal_uInt16)(bVal ? UNDERLINE_SINGLE : UNDERLINE_NONE) );
}
// -----------------------------------------------------------------------
@@ -1332,24 +1332,24 @@ SfxPoolItem* SvxTextLineItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-USHORT SvxTextLineItem::GetValueCount() const
+sal_uInt16 SvxTextLineItem::GetValueCount() const
{
return UNDERLINE_DOTTED + 1; // UNDERLINE_NONE also belongs here
}
// -----------------------------------------------------------------------
-SvStream& SvxTextLineItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxTextLineItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (BYTE)GetValue();
+ rStrm << (sal_uInt8)GetValue();
return rStrm;
}
// -----------------------------------------------------------------------
-SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxTextLineItem::Create(SvStream& rStrm, sal_uInt16) const
{
- BYTE nState;
+ sal_uInt8 nState;
rStrm >> nState;
return new SvxTextLineItem( (FontUnderline)nState, Which() );
}
@@ -1384,13 +1384,13 @@ SfxItemPresentation SvxTextLineItem::GetPresentation
// -----------------------------------------------------------------------
-XubString SvxTextLineItem::GetValueTextByPos( USHORT /*nPos*/ ) const
+XubString SvxTextLineItem::GetValueTextByPos( sal_uInt16 /*nPos*/ ) const
{
OSL_FAIL("SvxTextLineItem::GetValueTextByPos: Pure virtual method");
return XubString();
}
-bool SvxTextLineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxTextLineItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch(nMemberId)
@@ -1412,7 +1412,7 @@ bool SvxTextLineItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
}
-bool SvxTextLineItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxTextLineItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
sal_Bool bRet = sal_True;
@@ -1461,7 +1461,7 @@ int SvxTextLineItem::operator==( const SfxPoolItem& rItem ) const
// class SvxUnderlineItem ------------------------------------------------
-SvxUnderlineItem::SvxUnderlineItem( const FontUnderline eSt, const USHORT nId )
+SvxUnderlineItem::SvxUnderlineItem( const FontUnderline eSt, const sal_uInt16 nId )
: SvxTextLineItem( eSt, nId )
{
}
@@ -1477,24 +1477,24 @@ SfxPoolItem* SvxUnderlineItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxUnderlineItem::Create(SvStream& rStrm, sal_uInt16) const
{
- BYTE nState;
+ sal_uInt8 nState;
rStrm >> nState;
return new SvxUnderlineItem( (FontUnderline)nState, Which() );
}
// -----------------------------------------------------------------------
-XubString SvxUnderlineItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxUnderlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
- DBG_ASSERT( nPos <= (USHORT)UNDERLINE_BOLDWAVE, "enum overflow!" );
+ DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
return EE_RESSTR( RID_SVXITEMS_UL_BEGIN + nPos );
}
// class SvxOverlineItem ------------------------------------------------
-SvxOverlineItem::SvxOverlineItem( const FontUnderline eSt, const USHORT nId )
+SvxOverlineItem::SvxOverlineItem( const FontUnderline eSt, const sal_uInt16 nId )
: SvxTextLineItem( eSt, nId )
{
}
@@ -1510,25 +1510,25 @@ SfxPoolItem* SvxOverlineItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxOverlineItem::Create(SvStream& rStrm, sal_uInt16) const
{
- BYTE nState;
+ sal_uInt8 nState;
rStrm >> nState;
return new SvxOverlineItem( (FontUnderline)nState, Which() );
}
// -----------------------------------------------------------------------
-XubString SvxOverlineItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxOverlineItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
- DBG_ASSERT( nPos <= (USHORT)UNDERLINE_BOLDWAVE, "enum overflow!" );
+ DBG_ASSERT( nPos <= (sal_uInt16)UNDERLINE_BOLDWAVE, "enum overflow!" );
return EE_RESSTR( RID_SVXITEMS_OL_BEGIN + nPos );
}
// class SvxCrossedOutItem -----------------------------------------------
-SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const USHORT nId )
- : SfxEnumItem( nId, (USHORT)eSt )
+SvxCrossedOutItem::SvxCrossedOutItem( const FontStrikeout eSt, const sal_uInt16 nId )
+ : SfxEnumItem( nId, (sal_uInt16)eSt )
{
}
@@ -1550,12 +1550,12 @@ sal_Bool SvxCrossedOutItem::GetBoolValue() const
void SvxCrossedOutItem::SetBoolValue( sal_Bool bVal )
{
- SetValue( (USHORT)(bVal ? STRIKEOUT_SINGLE : STRIKEOUT_NONE) );
+ SetValue( (sal_uInt16)(bVal ? STRIKEOUT_SINGLE : STRIKEOUT_NONE) );
}
// -----------------------------------------------------------------------
-USHORT SvxCrossedOutItem::GetValueCount() const
+sal_uInt16 SvxCrossedOutItem::GetValueCount() const
{
return STRIKEOUT_DOUBLE + 1; // STRIKEOUT_NONE belongs also here
}
@@ -1569,17 +1569,17 @@ SfxPoolItem* SvxCrossedOutItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxCrossedOutItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (BYTE)GetValue();
+ rStrm << (sal_uInt8)GetValue();
return rStrm;
}
// -----------------------------------------------------------------------
-SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxCrossedOutItem::Create(SvStream& rStrm, sal_uInt16) const
{
- BYTE eCross;
+ sal_uInt8 eCross;
rStrm >> eCross;
return new SvxCrossedOutItem( (FontStrikeout)eCross, Which() );
}
@@ -1610,13 +1610,13 @@ SfxItemPresentation SvxCrossedOutItem::GetPresentation
// -----------------------------------------------------------------------
-XubString SvxCrossedOutItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxCrossedOutItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
- DBG_ASSERT( nPos <= (USHORT)STRIKEOUT_X, "enum overflow!" );
+ DBG_ASSERT( nPos <= (sal_uInt16)STRIKEOUT_X, "enum overflow!" );
return EE_RESSTR( RID_SVXITEMS_STRIKEOUT_BEGIN + nPos );
}
-bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch(nMemberId)
@@ -1631,7 +1631,7 @@ bool SvxCrossedOutItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
-bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
switch(nMemberId)
@@ -1652,7 +1652,7 @@ bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
}
// class SvxShadowedItem -------------------------------------------------
-SvxShadowedItem::SvxShadowedItem( const sal_Bool bShadowed, const USHORT nId ) :
+SvxShadowedItem::SvxShadowedItem( const sal_Bool bShadowed, const sal_uInt16 nId ) :
SfxBoolItem( nId, bShadowed )
{
}
@@ -1666,17 +1666,17 @@ SfxPoolItem* SvxShadowedItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxShadowedItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxShadowedItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (BYTE) GetValue();
+ rStrm << (sal_uInt8) GetValue();
return rStrm;
}
// -----------------------------------------------------------------------
-SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxShadowedItem::Create(SvStream& rStrm, sal_uInt16) const
{
- BYTE nState;
+ sal_uInt8 nState;
rStrm >> nState;
return new SvxShadowedItem( nState, Which() );
}
@@ -1699,7 +1699,7 @@ SfxItemPresentation SvxShadowedItem::GetPresentation
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- USHORT nId = RID_SVXITEMS_SHADOWED_FALSE;
+ sal_uInt16 nId = RID_SVXITEMS_SHADOWED_FALSE;
if ( GetValue() )
nId = RID_SVXITEMS_SHADOWED_TRUE;
@@ -1713,7 +1713,7 @@ SfxItemPresentation SvxShadowedItem::GetPresentation
// class SvxAutoKernItem -------------------------------------------------
-SvxAutoKernItem::SvxAutoKernItem( const sal_Bool bAutoKern, const USHORT nId ) :
+SvxAutoKernItem::SvxAutoKernItem( const sal_Bool bAutoKern, const sal_uInt16 nId ) :
SfxBoolItem( nId, bAutoKern )
{
}
@@ -1727,17 +1727,17 @@ SfxPoolItem* SvxAutoKernItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxAutoKernItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxAutoKernItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (BYTE) GetValue();
+ rStrm << (sal_uInt8) GetValue();
return rStrm;
}
// -----------------------------------------------------------------------
-SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxAutoKernItem::Create(SvStream& rStrm, sal_uInt16) const
{
- BYTE nState;
+ sal_uInt8 nState;
rStrm >> nState;
return new SvxAutoKernItem( nState, Which() );
}
@@ -1760,7 +1760,7 @@ SfxItemPresentation SvxAutoKernItem::GetPresentation
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- USHORT nId = RID_SVXITEMS_AUTOKERN_FALSE;
+ sal_uInt16 nId = RID_SVXITEMS_AUTOKERN_FALSE;
if ( GetValue() )
nId = RID_SVXITEMS_AUTOKERN_TRUE;
@@ -1775,7 +1775,7 @@ SfxItemPresentation SvxAutoKernItem::GetPresentation
// class SvxWordLineModeItem ---------------------------------------------
SvxWordLineModeItem::SvxWordLineModeItem( const sal_Bool bWordLineMode,
- const USHORT nId ) :
+ const sal_uInt16 nId ) :
SfxBoolItem( nId, bWordLineMode )
{
}
@@ -1789,7 +1789,7 @@ SfxPoolItem* SvxWordLineModeItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
rStrm << (sal_Bool) GetValue();
return rStrm;
@@ -1797,7 +1797,7 @@ SvStream& SvxWordLineModeItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/
// -----------------------------------------------------------------------
-SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxWordLineModeItem::Create(SvStream& rStrm, sal_uInt16) const
{
sal_Bool bValue;
rStrm >> bValue;
@@ -1822,7 +1822,7 @@ SfxItemPresentation SvxWordLineModeItem::GetPresentation
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- USHORT nId = RID_SVXITEMS_WORDLINE_FALSE;
+ sal_uInt16 nId = RID_SVXITEMS_WORDLINE_FALSE;
if ( GetValue() )
nId = RID_SVXITEMS_WORDLINE_TRUE;
@@ -1836,7 +1836,7 @@ SfxItemPresentation SvxWordLineModeItem::GetPresentation
// class SvxContourItem --------------------------------------------------
-SvxContourItem::SvxContourItem( const sal_Bool bContoured, const USHORT nId ) :
+SvxContourItem::SvxContourItem( const sal_Bool bContoured, const sal_uInt16 nId ) :
SfxBoolItem( nId, bContoured )
{
}
@@ -1850,7 +1850,7 @@ SfxPoolItem* SvxContourItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxContourItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxContourItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
rStrm << (sal_Bool) GetValue();
return rStrm;
@@ -1858,7 +1858,7 @@ SvStream& SvxContourItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) con
// -----------------------------------------------------------------------
-SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxContourItem::Create(SvStream& rStrm, sal_uInt16) const
{
sal_Bool bValue;
rStrm >> bValue;
@@ -1883,7 +1883,7 @@ SfxItemPresentation SvxContourItem::GetPresentation
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- USHORT nId = RID_SVXITEMS_CONTOUR_FALSE;
+ sal_uInt16 nId = RID_SVXITEMS_CONTOUR_FALSE;
if ( GetValue() )
nId = RID_SVXITEMS_CONTOUR_TRUE;
@@ -1897,7 +1897,7 @@ SfxItemPresentation SvxContourItem::GetPresentation
// class SvxPropSizeItem -------------------------------------------------
-SvxPropSizeItem::SvxPropSizeItem( const USHORT nPercent, const USHORT nId ) :
+SvxPropSizeItem::SvxPropSizeItem( const sal_uInt16 nPercent, const sal_uInt16 nId ) :
SfxUInt16Item( nId, nPercent )
{
}
@@ -1911,17 +1911,17 @@ SfxPoolItem* SvxPropSizeItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxPropSizeItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxPropSizeItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (USHORT) GetValue();
+ rStrm << (sal_uInt16) GetValue();
return rStrm;
}
// -----------------------------------------------------------------------
-SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxPropSizeItem::Create(SvStream& rStrm, sal_uInt16) const
{
- USHORT nSize;
+ sal_uInt16 nSize;
rStrm >> nSize;
return new SvxPropSizeItem( nSize, Which() );
}
@@ -1942,7 +1942,7 @@ SfxItemPresentation SvxPropSizeItem::GetPresentation
// class SvxColorItem ----------------------------------------------------
-SvxColorItem::SvxColorItem( const USHORT nId ) :
+SvxColorItem::SvxColorItem( const sal_uInt16 nId ) :
SfxPoolItem( nId ),
mColor( COL_BLACK )
{
@@ -1950,7 +1950,7 @@ SvxColorItem::SvxColorItem( const USHORT nId ) :
// -----------------------------------------------------------------------
-SvxColorItem::SvxColorItem( const Color& rCol, const USHORT nId ) :
+SvxColorItem::SvxColorItem( const Color& rCol, const sal_uInt16 nId ) :
SfxPoolItem( nId ),
mColor( rCol )
{
@@ -1958,7 +1958,7 @@ SvxColorItem::SvxColorItem( const Color& rCol, const USHORT nId ) :
// -----------------------------------------------------------------------
-SvxColorItem::SvxColorItem( SvStream &rStrm, const USHORT nId ) :
+SvxColorItem::SvxColorItem( SvStream &rStrm, const sal_uInt16 nId ) :
SfxPoolItem( nId )
{
Color aColor;
@@ -1981,7 +1981,7 @@ SvxColorItem::~SvxColorItem()
}
// -----------------------------------------------------------------------
-USHORT SvxColorItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxColorItem::GetVersion( sal_uInt16 nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -2001,7 +2001,7 @@ int SvxColorItem::operator==( const SfxPoolItem& rAttr ) const
// -----------------------------------------------------------------------
-bool SvxColorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxColorItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
rVal <<= (sal_Int32)(mColor.GetColor());
return true;
@@ -2009,7 +2009,7 @@ bool SvxColorItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
// -----------------------------------------------------------------------
-bool SvxColorItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxColorItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
sal_Int32 nColor = 0;
if(!(rVal >>= nColor))
@@ -2028,7 +2028,7 @@ SfxPoolItem* SvxColorItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxColorItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
+SvStream& SvxColorItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
{
if( VERSION_USEAUTOCOLOR == nItemVersion &&
COL_AUTO == mColor.GetColor() )
@@ -2040,7 +2040,7 @@ SvStream& SvxColorItem::Store( SvStream& rStrm , USHORT nItemVersion ) const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, USHORT /*nVer*/ ) const
+SfxPoolItem* SvxColorItem::Create(SvStream& rStrm, sal_uInt16 /*nVer*/ ) const
{
return new SvxColorItem( rStrm, Which() );
}
@@ -2080,7 +2080,7 @@ void SvxColorItem::SetValue( const Color& rNewCol )
// class SvxCharSetColorItem ---------------------------------------------
-SvxCharSetColorItem::SvxCharSetColorItem( const USHORT nId ) :
+SvxCharSetColorItem::SvxCharSetColorItem( const sal_uInt16 nId ) :
SvxColorItem( nId ),
eFrom( RTL_TEXTENCODING_DONTKNOW )
@@ -2091,7 +2091,7 @@ SvxCharSetColorItem::SvxCharSetColorItem( const USHORT nId ) :
SvxCharSetColorItem::SvxCharSetColorItem( const Color& rCol,
const rtl_TextEncoding _eFrom,
- const USHORT nId ) :
+ const sal_uInt16 nId ) :
SvxColorItem( rCol, nId ),
eFrom( _eFrom )
@@ -2108,18 +2108,18 @@ SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxCharSetColorItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (BYTE)GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion())
+ rStrm << (sal_uInt8)GetSOStoreTextEncoding(GetCharSet(), (sal_uInt16)rStrm.GetVersion())
<< GetValue();
return rStrm;
}
// -----------------------------------------------------------------------
-SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxCharSetColorItem::Create(SvStream& rStrm, sal_uInt16) const
{
- BYTE cSet;
+ sal_uInt8 cSet;
Color aColor;
rStrm >> cSet >> aColor;
return new SvxCharSetColorItem( aColor, (rtl_TextEncoding)cSet, Which() );
@@ -2141,7 +2141,7 @@ SfxItemPresentation SvxCharSetColorItem::GetPresentation
// class SvxKerningItem --------------------------------------------------
-SvxKerningItem::SvxKerningItem( const short nKern, const USHORT nId ) :
+SvxKerningItem::SvxKerningItem( const short nKern, const sal_uInt16 nId ) :
SfxInt16Item( nId, nKern )
{
}
@@ -2155,7 +2155,7 @@ SfxPoolItem* SvxKerningItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxKerningItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxKerningItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
rStrm << (short) GetValue();
return rStrm;
@@ -2178,7 +2178,7 @@ bool SvxKerningItem::HasMetrics() const
// -----------------------------------------------------------------------
-SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxKerningItem::Create(SvStream& rStrm, sal_uInt16) const
{
short nValue;
rStrm >> nValue;
@@ -2208,7 +2208,7 @@ SfxItemPresentation SvxKerningItem::GetPresentation
case SFX_ITEM_PRESENTATION_COMPLETE:
{
rText = EE_RESSTR(RID_SVXITEMS_KERNING_COMPLETE);
- USHORT nId = 0;
+ sal_uInt16 nId = 0;
if ( GetValue() > 0 )
nId = RID_SVXITEMS_KERNING_EXPANDED;
@@ -2227,7 +2227,7 @@ SfxItemPresentation SvxKerningItem::GetPresentation
return SFX_ITEM_PRESENTATION_NONE;
}
-bool SvxKerningItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxKerningItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Int16 nVal = GetValue();
if(nMemberId & CONVERT_TWIPS)
@@ -2236,7 +2236,7 @@ bool SvxKerningItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
// -----------------------------------------------------------------------
-bool SvxKerningItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
+bool SvxKerningItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId)
{
sal_Int16 nVal = sal_Int16();
if(!(rVal >>= nVal))
@@ -2249,14 +2249,14 @@ bool SvxKerningItem::PutValue( const uno::Any& rVal, BYTE nMemberId)
// class SvxCaseMapItem --------------------------------------------------
-SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const USHORT nId ) :
- SfxEnumItem( nId, (USHORT)eMap )
+SvxCaseMapItem::SvxCaseMapItem( const SvxCaseMap eMap, const sal_uInt16 nId ) :
+ SfxEnumItem( nId, (sal_uInt16)eMap )
{
}
// -----------------------------------------------------------------------
-USHORT SvxCaseMapItem::GetValueCount() const
+sal_uInt16 SvxCaseMapItem::GetValueCount() const
{
return SVX_CASEMAP_END; // SVX_CASEMAP_KAPITAELCHEN + 1
}
@@ -2270,17 +2270,17 @@ SfxPoolItem* SvxCaseMapItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxCaseMapItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxCaseMapItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (BYTE) GetValue();
+ rStrm << (sal_uInt8) GetValue();
return rStrm;
}
// -----------------------------------------------------------------------
-SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxCaseMapItem::Create(SvStream& rStrm, sal_uInt16) const
{
- BYTE cMap;
+ sal_uInt8 cMap;
rStrm >> cMap;
return new SvxCaseMapItem( (const SvxCaseMap)cMap, Which() );
}
@@ -2311,13 +2311,13 @@ SfxItemPresentation SvxCaseMapItem::GetPresentation
// -----------------------------------------------------------------------
-XubString SvxCaseMapItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxCaseMapItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
- DBG_ASSERT( nPos < (USHORT)SVX_CASEMAP_END, "enum overflow!" );
+ DBG_ASSERT( nPos < (sal_uInt16)SVX_CASEMAP_END, "enum overflow!" );
return EE_RESSTR( RID_SVXITEMS_CASEMAP_BEGIN + nPos );
}
-bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxCaseMapItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
sal_Int16 nRet = style::CaseMap::NONE;
switch( GetValue() )
@@ -2331,7 +2331,7 @@ bool SvxCaseMapItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
return true;
}
-bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxCaseMapItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
sal_uInt16 nVal = sal_uInt16();
if(!(rVal >>= nVal))
@@ -2351,7 +2351,7 @@ bool SvxCaseMapItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
// class SvxEscapementItem -----------------------------------------------
-SvxEscapementItem::SvxEscapementItem( const USHORT nId ) :
+SvxEscapementItem::SvxEscapementItem( const sal_uInt16 nId ) :
SfxEnumItemInterface( nId ),
nEsc ( 0 ),
@@ -2362,7 +2362,7 @@ SvxEscapementItem::SvxEscapementItem( const USHORT nId ) :
// -----------------------------------------------------------------------
SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape,
- const USHORT nId ) :
+ const sal_uInt16 nId ) :
SfxEnumItemInterface( nId ),
nProp( 100 )
{
@@ -2374,8 +2374,8 @@ SvxEscapementItem::SvxEscapementItem( const SvxEscapement eEscape,
// -----------------------------------------------------------------------
SvxEscapementItem::SvxEscapementItem( const short _nEsc,
- const BYTE _nProp,
- const USHORT nId ) :
+ const sal_uInt8 _nProp,
+ const sal_uInt16 nId ) :
SfxEnumItemInterface( nId ),
nEsc ( _nEsc ),
nProp ( _nProp )
@@ -2401,7 +2401,7 @@ SfxPoolItem* SvxEscapementItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxEscapementItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxEscapementItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
short _nEsc = GetEsc();
if( SOFFICE_FILEFORMAT_31 == rStrm.GetVersion() )
@@ -2411,16 +2411,16 @@ SvStream& SvxEscapementItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ )
else if( DFLT_ESC_AUTO_SUB == _nEsc )
_nEsc = DFLT_ESC_SUB;
}
- rStrm << (BYTE) GetProp()
+ rStrm << (sal_uInt8) GetProp()
<< (short) _nEsc;
return rStrm;
}
// -----------------------------------------------------------------------
-SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, sal_uInt16) const
{
- BYTE _nProp;
+ sal_uInt8 _nProp;
short _nEsc;
rStrm >> _nProp >> _nEsc;
return new SvxEscapementItem( _nEsc, _nProp, Which() );
@@ -2428,7 +2428,7 @@ SfxPoolItem* SvxEscapementItem::Create(SvStream& rStrm, USHORT) const
// -----------------------------------------------------------------------
-USHORT SvxEscapementItem::GetValueCount() const
+sal_uInt16 SvxEscapementItem::GetValueCount() const
{
return SVX_ESCAPEMENT_END; // SVX_ESCAPEMENT_SUBSCRIPT + 1
}
@@ -2469,15 +2469,15 @@ SfxItemPresentation SvxEscapementItem::GetPresentation
// -----------------------------------------------------------------------
-XubString SvxEscapementItem::GetValueTextByPos( USHORT nPos ) const
+XubString SvxEscapementItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
- DBG_ASSERT( nPos < (USHORT)SVX_ESCAPEMENT_END, "enum overflow!" );
+ DBG_ASSERT( nPos < (sal_uInt16)SVX_ESCAPEMENT_END, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_ESCAPEMENT_BEGIN + nPos);
}
// -----------------------------------------------------------------------
-USHORT SvxEscapementItem::GetEnumValue() const
+sal_uInt16 SvxEscapementItem::GetEnumValue() const
{
if ( nEsc < 0 )
return SVX_ESCAPEMENT_SUBSCRIPT;
@@ -2488,12 +2488,12 @@ USHORT SvxEscapementItem::GetEnumValue() const
// -----------------------------------------------------------------------
-void SvxEscapementItem::SetEnumValue( USHORT nVal )
+void SvxEscapementItem::SetEnumValue( sal_uInt16 nVal )
{
SetEscapement( (const SvxEscapement)nVal );
}
-bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxEscapementItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch(nMemberId)
@@ -2511,7 +2511,7 @@ bool SvxEscapementItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
-bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxEscapementItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
switch(nMemberId)
@@ -2536,7 +2536,7 @@ bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
break;
case MID_AUTO_ESC:
{
- BOOL bVal = Any2Bool(rVal);
+ sal_Bool bVal = Any2Bool(rVal);
if(bVal)
{
if(nEsc < 0)
@@ -2557,14 +2557,14 @@ bool SvxEscapementItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
// class SvxLanguageItem -------------------------------------------------
-SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const USHORT nId )
+SvxLanguageItem::SvxLanguageItem( const LanguageType eLang, const sal_uInt16 nId )
: SfxEnumItem( nId , eLang )
{
}
// -----------------------------------------------------------------------
-USHORT SvxLanguageItem::GetValueCount() const
+sal_uInt16 SvxLanguageItem::GetValueCount() const
{
// #i50205# got rid of class International
DBG_ERRORFILE("SvxLanguageItem::GetValueCount: supposed to return a count of what?");
@@ -2583,17 +2583,17 @@ SfxPoolItem* SvxLanguageItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxLanguageItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxLanguageItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (USHORT) GetValue();
+ rStrm << (sal_uInt16) GetValue();
return rStrm;
}
// -----------------------------------------------------------------------
-SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxLanguageItem::Create(SvStream& rStrm, sal_uInt16) const
{
- USHORT nValue;
+ sal_uInt16 nValue;
rStrm >> nValue;
return new SvxLanguageItem( (LanguageType)nValue, Which() );
}
@@ -2627,7 +2627,7 @@ SfxItemPresentation SvxLanguageItem::GetPresentation
return SFX_ITEM_PRESENTATION_NONE;
}
-bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxLanguageItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch(nMemberId)
@@ -2643,7 +2643,7 @@ bool SvxLanguageItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
-bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxLanguageItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
switch(nMemberId)
@@ -2674,7 +2674,7 @@ bool SvxLanguageItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
}
// class SvxNoLinebreakItem ----------------------------------------------
-SvxNoLinebreakItem::SvxNoLinebreakItem( const BOOL bBreak, const USHORT nId ) :
+SvxNoLinebreakItem::SvxNoLinebreakItem( const sal_Bool bBreak, const sal_uInt16 nId ) :
SfxBoolItem( nId, bBreak )
{
}
@@ -2688,7 +2688,7 @@ SfxPoolItem* SvxNoLinebreakItem::Clone( SfxItemPool* ) const
// -----------------------------------------------------------------------
-SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
rStrm << (sal_Bool)GetValue();
return rStrm;
@@ -2696,7 +2696,7 @@ SvStream& SvxNoLinebreakItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ )
// -----------------------------------------------------------------------
-SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxNoLinebreakItem::Create(SvStream& rStrm, sal_uInt16) const
{
sal_Bool bValue;
rStrm >> bValue;
@@ -2719,7 +2719,7 @@ SfxItemPresentation SvxNoLinebreakItem::GetPresentation
// class SvxNoHyphenItem -------------------------------------------------
-SvxNoHyphenItem::SvxNoHyphenItem( const sal_Bool bHyphen, const USHORT nId ) :
+SvxNoHyphenItem::SvxNoHyphenItem( const sal_Bool bHyphen, const sal_uInt16 nId ) :
SfxBoolItem( nId , bHyphen )
{
}
@@ -2733,7 +2733,7 @@ SfxPoolItem* SvxNoHyphenItem::Clone( SfxItemPool* ) const
// -----------------------------------------------------------------------
-SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
rStrm << (sal_Bool) GetValue();
return rStrm;
@@ -2741,7 +2741,7 @@ SvStream& SvxNoHyphenItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) co
// -----------------------------------------------------------------------
-SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxNoHyphenItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_Bool bValue;
rStrm >> bValue;
@@ -2771,21 +2771,21 @@ SfxItemPresentation SvxNoHyphenItem::GetPresentation
// class SvxLineColorItem (== SvxColorItem)
// -----------------------------------------------------------------------
-SvxLineColorItem::SvxLineColorItem( const USHORT nId ) :
+SvxLineColorItem::SvxLineColorItem( const sal_uInt16 nId ) :
SvxColorItem( nId )
{
}
// -----------------------------------------------------------------------
-SvxLineColorItem::SvxLineColorItem( const Color& rCol, const USHORT nId ) :
+SvxLineColorItem::SvxLineColorItem( const Color& rCol, const sal_uInt16 nId ) :
SvxColorItem( rCol, nId )
{
}
// -----------------------------------------------------------------------
-SvxLineColorItem::SvxLineColorItem( SvStream &rStrm, const USHORT nId ) :
+SvxLineColorItem::SvxLineColorItem( SvStream &rStrm, const sal_uInt16 nId ) :
SvxColorItem( rStrm, nId )
{
}
@@ -2821,7 +2821,7 @@ SfxItemPresentation SvxLineColorItem::GetPresentation
// class SvxBlinkItem -------------------------------------------------
-SvxBlinkItem::SvxBlinkItem( const sal_Bool bBlink, const USHORT nId ) :
+SvxBlinkItem::SvxBlinkItem( const sal_Bool bBlink, const sal_uInt16 nId ) :
SfxBoolItem( nId, bBlink )
{
}
@@ -2835,17 +2835,17 @@ SfxPoolItem* SvxBlinkItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
-SvStream& SvxBlinkItem::Store( SvStream& rStrm , USHORT /*nItemVersion*/ ) const
+SvStream& SvxBlinkItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
- rStrm << (BYTE) GetValue();
+ rStrm << (sal_uInt8) GetValue();
return rStrm;
}
// -----------------------------------------------------------------------
-SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, USHORT) const
+SfxPoolItem* SvxBlinkItem::Create(SvStream& rStrm, sal_uInt16) const
{
- BYTE nState;
+ sal_uInt8 nState;
rStrm >> nState;
return new SvxBlinkItem( nState, Which() );
}
@@ -2868,7 +2868,7 @@ SfxItemPresentation SvxBlinkItem::GetPresentation
case SFX_ITEM_PRESENTATION_NAMELESS:
case SFX_ITEM_PRESENTATION_COMPLETE:
{
- USHORT nId = RID_SVXITEMS_BLINK_FALSE;
+ sal_uInt16 nId = RID_SVXITEMS_BLINK_FALSE;
if ( GetValue() )
nId = RID_SVXITEMS_BLINK_TRUE;
@@ -2883,7 +2883,7 @@ SfxItemPresentation SvxBlinkItem::GetPresentation
// class SvxEmphaisMarkItem ---------------------------------------------------
SvxEmphasisMarkItem::SvxEmphasisMarkItem( const FontEmphasisMark nValue,
- const USHORT nId )
+ const sal_uInt16 nId )
: SfxUInt16Item( nId, nValue )
{
}
@@ -2898,7 +2898,7 @@ SfxPoolItem* SvxEmphasisMarkItem::Clone( SfxItemPool * ) const
// -----------------------------------------------------------------------
SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm,
- USHORT /*nItemVersion*/ ) const
+ sal_uInt16 /*nItemVersion*/ ) const
{
rStrm << (sal_uInt16)GetValue();
return rStrm;
@@ -2906,7 +2906,7 @@ SvStream& SvxEmphasisMarkItem::Store( SvStream& rStrm,
// -----------------------------------------------------------------------
-SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxEmphasisMarkItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_uInt16 nValue;
rStrm >> nValue;
@@ -2935,7 +2935,7 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation
sal_uInt16 nVal = GetValue();
rText = EE_RESSTR( RID_SVXITEMS_EMPHASIS_BEGIN_STYLE +
( EMPHASISMARK_STYLE & nVal ));
- USHORT nId = ( EMPHASISMARK_POS_ABOVE & nVal )
+ sal_uInt16 nId = ( EMPHASISMARK_POS_ABOVE & nVal )
? RID_SVXITEMS_EMPHASIS_ABOVE_POS
: ( EMPHASISMARK_POS_BELOW & nVal )
? RID_SVXITEMS_EMPHASIS_BELOW_POS
@@ -2951,7 +2951,7 @@ SfxItemPresentation SvxEmphasisMarkItem::GetPresentation
// -----------------------------------------------------------------------
-bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
+bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
switch( nMemberId )
@@ -2977,7 +2977,7 @@ bool SvxEmphasisMarkItem::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
return true;
}
-bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
+bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
sal_Bool bRet = true;
@@ -3007,7 +3007,7 @@ bool SvxEmphasisMarkItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
return bRet;
}
-USHORT SvxEmphasisMarkItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxEmphasisMarkItem::GetVersion( sal_uInt16 nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -3055,7 +3055,7 @@ SfxPoolItem* SvxTwoLinesItem::Clone( SfxItemPool* ) const
}
bool SvxTwoLinesItem::QueryValue( com::sun::star::uno::Any& rVal,
- BYTE nMemberId ) const
+ sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
sal_Bool bRet = true;
@@ -3088,7 +3088,7 @@ bool SvxTwoLinesItem::QueryValue( com::sun::star::uno::Any& rVal,
}
bool SvxTwoLinesItem::PutValue( const com::sun::star::uno::Any& rVal,
- BYTE nMemberId )
+ sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
sal_Bool bRet = sal_False;
@@ -3147,7 +3147,7 @@ SfxItemPresentation SvxTwoLinesItem::GetPresentation( SfxItemPresentation ePres,
}
-SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, USHORT /*nVer*/) const
+SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, sal_uInt16 /*nVer*/) const
{
sal_Bool _bOn;
sal_Unicode cStart, cEnd;
@@ -3155,13 +3155,13 @@ SfxPoolItem* SvxTwoLinesItem::Create( SvStream & rStrm, USHORT /*nVer*/) const
return new SvxTwoLinesItem( _bOn, cStart, cEnd, Which() );
}
-SvStream& SvxTwoLinesItem::Store(SvStream & rStrm, USHORT /*nIVer*/) const
+SvStream& SvxTwoLinesItem::Store(SvStream & rStrm, sal_uInt16 /*nIVer*/) const
{
rStrm << GetValue() << GetStartBracket() << GetEndBracket();
return rStrm;
}
-USHORT SvxTwoLinesItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxTwoLinesItem::GetVersion( sal_uInt16 nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
@@ -3188,7 +3188,7 @@ SfxPoolItem* SvxCharRotateItem::Clone( SfxItemPool* ) const
return new SvxCharRotateItem( GetValue(), IsFitToLine(), Which() );
}
-SfxPoolItem* SvxCharRotateItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxCharRotateItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_uInt16 nVal;
sal_Bool b;
@@ -3196,14 +3196,14 @@ SfxPoolItem* SvxCharRotateItem::Create( SvStream& rStrm, USHORT ) const
return new SvxCharRotateItem( nVal, b, Which() );
}
-SvStream& SvxCharRotateItem::Store( SvStream & rStrm, USHORT ) const
+SvStream& SvxCharRotateItem::Store( SvStream & rStrm, sal_uInt16 ) const
{
sal_Bool bFlag = IsFitToLine();
rStrm << GetValue() << bFlag;
return rStrm;
}
-USHORT SvxCharRotateItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxCharRotateItem::GetVersion( sal_uInt16 nFFVer ) const
{
return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
}
@@ -3239,7 +3239,7 @@ SfxItemPresentation SvxCharRotateItem::GetPresentation(
}
bool SvxCharRotateItem::QueryValue( com::sun::star::uno::Any& rVal,
- BYTE nMemberId ) const
+ sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
bool bRet = true;
@@ -3259,7 +3259,7 @@ bool SvxCharRotateItem::QueryValue( com::sun::star::uno::Any& rVal,
}
bool SvxCharRotateItem::PutValue( const com::sun::star::uno::Any& rVal,
- BYTE nMemberId )
+ sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
bool bRet = true;
@@ -3269,7 +3269,7 @@ bool SvxCharRotateItem::PutValue( const com::sun::star::uno::Any& rVal,
{
sal_Int16 nVal = 0;
if((rVal >>= nVal) && (0 == nVal || 900 == nVal || 2700 == nVal))
- SetValue( (USHORT)nVal );
+ SetValue( (sal_uInt16)nVal );
else
bRet = sal_False;
break;
@@ -3307,7 +3307,7 @@ SfxPoolItem* SvxCharScaleWidthItem::Clone( SfxItemPool* ) const
return new SvxCharScaleWidthItem( GetValue(), Which() );
}
-SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, USHORT ) const
+SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_uInt16 nVal;
rStrm >> nVal;
@@ -3319,7 +3319,7 @@ SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, USHORT ) const
// USHORT nFixWidth, USHORT nPropWidth.
// nFixWidth has never been used...
rStrm >> nVal;
- USHORT nTest;
+ sal_uInt16 nTest;
rStrm >> nTest;
if ( nTest == 0x1234 )
pItem->SetValue( nVal );
@@ -3330,23 +3330,23 @@ SfxPoolItem* SvxCharScaleWidthItem::Create( SvStream& rStrm, USHORT ) const
return pItem;
}
-SvStream& SvxCharScaleWidthItem::Store( SvStream& rStream, USHORT nVer ) const
+SvStream& SvxCharScaleWidthItem::Store( SvStream& rStream, sal_uInt16 nVer ) const
{
SvStream& rRet = SfxUInt16Item::Store( rStream, nVer );
if ( Which() == EE_CHAR_FONTWIDTH )
{
// see comment in Create()....
- rRet.SeekRel( -1*(long)sizeof(USHORT) );
- rRet << (USHORT)0;
+ rRet.SeekRel( -1*(long)sizeof(sal_uInt16) );
+ rRet << (sal_uInt16)0;
rRet << GetValue();
// Really ugly, but not a problem for reading the doc in 5.2
- rRet << (USHORT)0x1234;
+ rRet << (sal_uInt16)0x1234;
}
return rRet;
}
-USHORT SvxCharScaleWidthItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxCharScaleWidthItem::GetVersion( sal_uInt16 nFFVer ) const
{
return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
}
@@ -3379,22 +3379,22 @@ SfxItemPresentation SvxCharScaleWidthItem::GetPresentation(
return SFX_ITEM_PRESENTATION_NONE;
}
-bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvxCharScaleWidthItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
// SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
// where we still want this to be a sal_Int16
sal_Int16 nValue = sal_Int16();
if (rVal >>= nValue)
{
- SetValue( (UINT16) nValue );
+ SetValue( (sal_uInt16) nValue );
return true;
}
- OSL_FAIL( "SvxCharScaleWidthItem::PutValue - Wrong type!" );
+ DBG_ERROR( "SvxCharScaleWidthItem::PutValue - Wrong type!" );
return false;
}
-bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
// SfxUInt16Item::QueryValue returns sal_Int32 in Any now... (srx642w)
// where we still want this to be a sal_Int16
@@ -3408,7 +3408,7 @@ bool SvxCharScaleWidthItem::QueryValue( uno::Any& rVal, BYTE /*nMemberId*/ ) con
SvxCharReliefItem::SvxCharReliefItem( FontRelief eValue,
const sal_uInt16 nId )
- : SfxEnumItem( nId, (USHORT)eValue )
+ : SfxEnumItem( nId, (sal_uInt16)eValue )
{
}
@@ -3417,33 +3417,33 @@ SfxPoolItem* SvxCharReliefItem::Clone( SfxItemPool * ) const
return new SvxCharReliefItem( *this );
}
-SfxPoolItem* SvxCharReliefItem::Create(SvStream & rStrm, USHORT) const
+SfxPoolItem* SvxCharReliefItem::Create(SvStream & rStrm, sal_uInt16) const
{
sal_uInt16 nVal;
rStrm >> nVal;
return new SvxCharReliefItem( (FontRelief)nVal, Which() );
}
-SvStream& SvxCharReliefItem::Store(SvStream & rStrm, USHORT /*nIVer*/) const
+SvStream& SvxCharReliefItem::Store(SvStream & rStrm, sal_uInt16 /*nIVer*/) const
{
sal_uInt16 nVal = GetValue();
rStrm << nVal;
return rStrm;
}
-USHORT SvxCharReliefItem::GetVersion( USHORT nFFVer ) const
+sal_uInt16 SvxCharReliefItem::GetVersion( sal_uInt16 nFFVer ) const
{
return SOFFICE_FILEFORMAT_50 > nFFVer ? USHRT_MAX : 0;
}
-String SvxCharReliefItem::GetValueTextByPos( USHORT nPos ) const
+String SvxCharReliefItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE,
"enum overflow" );
return String( EditResId( RID_SVXITEMS_RELIEF_BEGIN + nPos ));
}
-USHORT SvxCharReliefItem::GetValueCount() const
+sal_uInt16 SvxCharReliefItem::GetValueCount() const
{
return RID_SVXITEMS_RELIEF_ENGRAVED - RID_SVXITEMS_RELIEF_NONE;
}
@@ -3475,7 +3475,7 @@ SfxItemPresentation SvxCharReliefItem::GetPresentation
}
bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal,
- BYTE nMemberId )
+ sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
bool bRet = true;
@@ -3486,7 +3486,7 @@ bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal,
sal_Int16 nVal = -1;
rVal >>= nVal;
if(nVal >= 0 && nVal <= RELIEF_ENGRAVED)
- SetValue( (USHORT)nVal );
+ SetValue( (sal_uInt16)nVal );
else
bRet = false;
}
@@ -3499,7 +3499,7 @@ bool SvxCharReliefItem::PutValue( const com::sun::star::uno::Any& rVal,
}
bool SvxCharReliefItem::QueryValue( com::sun::star::uno::Any& rVal,
- BYTE nMemberId ) const
+ sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
bool bRet = true;
@@ -3532,14 +3532,14 @@ SfxPoolItem* SvxScriptTypeItem::Clone( SfxItemPool * ) const
|* class SvxScriptSetItem
*************************************************************************/
-SvxScriptSetItem::SvxScriptSetItem( USHORT nSlotId, SfxItemPool& rPool )
+SvxScriptSetItem::SvxScriptSetItem( sal_uInt16 nSlotId, SfxItemPool& rPool )
: SfxSetItem( nSlotId, new SfxItemSet( rPool,
SID_ATTR_CHAR_FONT, SID_ATTR_CHAR_FONT ))
{
- USHORT nLatin, nAsian, nComplex;
+ sal_uInt16 nLatin, nAsian, nComplex;
GetWhichIds( nLatin, nAsian, nComplex );
- USHORT aIds[ 9 ] = { 0 };
+ sal_uInt16 aIds[ 9 ] = { 0 };
aIds[ 0 ] = aIds[ 1 ] = nLatin;
aIds[ 2 ] = aIds[ 3 ] = nAsian;
aIds[ 4 ] = aIds[ 5 ] = nComplex;
@@ -3552,28 +3552,28 @@ SvxScriptSetItem::SvxScriptSetItem( USHORT nSlotId, SfxItemPool& rPool )
SfxPoolItem* SvxScriptSetItem::Clone( SfxItemPool * ) const
{
SvxScriptSetItem* p = new SvxScriptSetItem( Which(), *GetItemSet().GetPool() );
- p->GetItemSet().Put( GetItemSet(), FALSE );
+ p->GetItemSet().Put( GetItemSet(), sal_False );
return p;
}
-SfxPoolItem* SvxScriptSetItem::Create( SvStream &, USHORT ) const
+SfxPoolItem* SvxScriptSetItem::Create( SvStream &, sal_uInt16 ) const
{
return 0;
}
const SfxPoolItem* SvxScriptSetItem::GetItemOfScriptSet(
- const SfxItemSet& rSet, USHORT nId )
+ const SfxItemSet& rSet, sal_uInt16 nId )
{
const SfxPoolItem* pI;
- SfxItemState eSt = rSet.GetItemState( nId, FALSE, &pI );
+ SfxItemState eSt = rSet.GetItemState( nId, sal_False, &pI );
if( SFX_ITEM_SET != eSt )
pI = SFX_ITEM_DEFAULT == eSt ? &rSet.Get( nId ) : 0;
return pI;
}
-const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( USHORT nSlotId, const SfxItemSet& rSet, USHORT nScript )
+const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( sal_uInt16 nSlotId, const SfxItemSet& rSet, sal_uInt16 nScript )
{
- USHORT nLatin, nAsian, nComplex;
+ sal_uInt16 nLatin, nAsian, nComplex;
GetWhichIds( nSlotId, rSet, nLatin, nAsian, nComplex );
const SfxPoolItem *pRet, *pAsn, *pCmplx;
@@ -3622,15 +3622,15 @@ const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( USHORT nSlotId, const SfxI
return pRet;
}
-const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( USHORT nScript ) const
+const SfxPoolItem* SvxScriptSetItem::GetItemOfScript( sal_uInt16 nScript ) const
{
return GetItemOfScript( Which(), GetItemSet(), nScript );
}
-void SvxScriptSetItem::PutItemForScriptType( USHORT nScriptType,
+void SvxScriptSetItem::PutItemForScriptType( sal_uInt16 nScriptType,
const SfxPoolItem& rItem )
{
- USHORT nLatin, nAsian, nComplex;
+ sal_uInt16 nLatin, nAsian, nComplex;
GetWhichIds( nLatin, nAsian, nComplex );
SfxPoolItem* pCpy = rItem.Clone();
@@ -3652,7 +3652,7 @@ void SvxScriptSetItem::PutItemForScriptType( USHORT nScriptType,
delete pCpy;
}
-void SvxScriptSetItem::GetWhichIds( USHORT nSlotId, const SfxItemSet& rSet, USHORT& rLatin, USHORT& rAsian, USHORT& rComplex )
+void SvxScriptSetItem::GetWhichIds( sal_uInt16 nSlotId, const SfxItemSet& rSet, sal_uInt16& rLatin, sal_uInt16& rAsian, sal_uInt16& rComplex )
{
const SfxItemPool& rPool = *rSet.GetPool();
GetSlotIds( nSlotId, rLatin, rAsian, rComplex );
@@ -3661,19 +3661,19 @@ void SvxScriptSetItem::GetWhichIds( USHORT nSlotId, const SfxItemSet& rSet, USHO
rComplex = rPool.GetWhich( rComplex );
}
-void SvxScriptSetItem::GetWhichIds( USHORT& rLatin, USHORT& rAsian,
- USHORT& rComplex ) const
+void SvxScriptSetItem::GetWhichIds( sal_uInt16& rLatin, sal_uInt16& rAsian,
+ sal_uInt16& rComplex ) const
{
GetWhichIds( Which(), GetItemSet(), rLatin, rAsian, rComplex );
}
-void SvxScriptSetItem::GetSlotIds( USHORT nSlotId, USHORT& rLatin,
- USHORT& rAsian, USHORT& rComplex )
+void SvxScriptSetItem::GetSlotIds( sal_uInt16 nSlotId, sal_uInt16& rLatin,
+ sal_uInt16& rAsian, sal_uInt16& rComplex )
{
switch( nSlotId )
{
default:
- DBG_ASSERT( FALSE, "wrong SlotId for class SvxScriptSetItem" );
+ DBG_ASSERT( sal_False, "wrong SlotId for class SvxScriptSetItem" );
// no break - default to font - Id Range !!
case SID_ATTR_CHAR_FONT:
@@ -3706,12 +3706,12 @@ void SvxScriptSetItem::GetSlotIds( USHORT nSlotId, USHORT& rLatin,
void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rComplex )
{
- const USHORT nItemCnt = 3;
+ const sal_uInt16 nItemCnt = 3;
static struct
{
- USHORT nFontType;
- USHORT nLanguage;
+ sal_uInt16 nFontType;
+ sal_uInt16 nLanguage;
}
aOutTypeArr[ nItemCnt ] =
{
@@ -3722,7 +3722,7 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo
SvxFontItem* aItemArr[ nItemCnt ] = { &rLatin, &rAsian, &rComplex };
- for ( USHORT n = 0; n < nItemCnt; ++n )
+ for ( sal_uInt16 n = 0; n < nItemCnt; ++n )
{
Font aFont( OutputDevice::GetDefaultFont( aOutTypeArr[ n ].nFontType,
aOutTypeArr[ n ].nLanguage,
@@ -3737,12 +3737,12 @@ void GetDefaultFonts( SvxFontItem& rLatin, SvxFontItem& rAsian, SvxFontItem& rCo
}
-USHORT GetI18NScriptTypeOfLanguage( USHORT nLang )
+sal_uInt16 GetI18NScriptTypeOfLanguage( sal_uInt16 nLang )
{
return GetI18NScriptType( SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ) );
}
-USHORT GetItemScriptType( short nI18NType )
+sal_uInt16 GetItemScriptType( short nI18NType )
{
switch ( nI18NType )
{
@@ -3753,7 +3753,7 @@ USHORT GetItemScriptType( short nI18NType )
return 0;
}
-short GetI18NScriptType( USHORT nItemType )
+short GetI18NScriptType( sal_uInt16 nItemType )
{
switch ( nItemType )
{
diff --git a/editeng/source/items/writingmodeitem.cxx b/editeng/source/items/writingmodeitem.cxx
index bcf47dd222f7..2d546e1c9ebc 100644
--- a/editeng/source/items/writingmodeitem.cxx
+++ b/editeng/source/items/writingmodeitem.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::text;
TYPEINIT1_FACTORY(SvxWritingModeItem, SfxUInt16Item, new SvxWritingModeItem(com::sun::star::text::WritingMode_LR_TB, 0));
-SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, USHORT _nWhich )
+SvxWritingModeItem::SvxWritingModeItem( WritingMode eValue, sal_uInt16 _nWhich )
: SfxUInt16Item( _nWhich, (sal_uInt16)eValue )
{
}
@@ -63,19 +63,19 @@ SfxPoolItem* SvxWritingModeItem::Clone( SfxItemPool * ) const
return new SvxWritingModeItem( *this );
}
-SfxPoolItem* SvxWritingModeItem::Create( SvStream & , USHORT ) const
+SfxPoolItem* SvxWritingModeItem::Create( SvStream & , sal_uInt16 ) const
{
OSL_FAIL("SvxWritingModeItem should not be streamed!");
return NULL;
}
-SvStream& SvxWritingModeItem::Store( SvStream & rStrm, USHORT ) const
+SvStream& SvxWritingModeItem::Store( SvStream & rStrm, sal_uInt16 ) const
{
OSL_FAIL("SvxWritingModeItem should not be streamed!");
return rStrm;
}
-USHORT SvxWritingModeItem::GetVersion( USHORT /*nFVer*/ ) const
+sal_uInt16 SvxWritingModeItem::GetVersion( sal_uInt16 /*nFVer*/ ) const
{
return USHRT_MAX;
}
@@ -104,7 +104,7 @@ SfxItemPresentation SvxWritingModeItem::GetPresentation( SfxItemPresentation ePr
return eRet;
}
-bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
+bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 )
{
sal_Int32 nVal = 0;
bool bRet = ( rVal >>= nVal );
@@ -140,7 +140,7 @@ bool SvxWritingModeItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
}
bool SvxWritingModeItem::QueryValue( com::sun::star::uno::Any& rVal,
- BYTE ) const
+ sal_uInt8 ) const
{
rVal <<= (WritingMode)GetValue();
return true;
diff --git a/editeng/source/items/xmlcnitm.cxx b/editeng/source/items/xmlcnitm.cxx
index 9c43dd5b2535..f672845ca486 100644
--- a/editeng/source/items/xmlcnitm.cxx
+++ b/editeng/source/items/xmlcnitm.cxx
@@ -42,7 +42,7 @@ using namespace ::com::sun::star::xml;
TYPEINIT1(SvXMLAttrContainerItem, SfxPoolItem);
-SvXMLAttrContainerItem::SvXMLAttrContainerItem( USHORT _nWhich ) :
+SvXMLAttrContainerItem::SvXMLAttrContainerItem( sal_uInt16 _nWhich ) :
SfxPoolItem( _nWhich )
{
pImpl = new SvXMLAttrContainerData;
@@ -84,13 +84,13 @@ SfxItemPresentation SvXMLAttrContainerItem::GetPresentation(
return SFX_ITEM_PRESENTATION_NONE;
}
-USHORT SvXMLAttrContainerItem::GetVersion( USHORT /*nFileFormatVersion*/ ) const
+sal_uInt16 SvXMLAttrContainerItem::GetVersion( sal_uInt16 /*nFileFormatVersion*/ ) const
{
// This item should never be stored
return USHRT_MAX;
}
-bool SvXMLAttrContainerItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ ) const
+bool SvXMLAttrContainerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
Reference<XNameContainer> xContainer =
new SvUnoAttributeContainer( new SvXMLAttrContainerData( *pImpl ) );
@@ -99,7 +99,7 @@ bool SvXMLAttrContainerItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE /
return true;
}
-bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE /*nMemberId*/ )
+bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
Reference<XInterface> xRef;
SvUnoAttributeContainer* pContainer = NULL;
@@ -109,7 +109,7 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
xRef = *(Reference<XInterface>*)rVal.getValue();
Reference<XUnoTunnel> xTunnel(xRef, UNO_QUERY);
if( xTunnel.is() )
- pContainer = (SvUnoAttributeContainer*)(ULONG)xTunnel->getSomething(SvUnoAttributeContainer::getUnoTunnelId());
+ pContainer = (SvUnoAttributeContainer*)(sal_uLong)xTunnel->getSomething(SvUnoAttributeContainer::getUnoTunnelId());
}
if( pContainer )
@@ -125,14 +125,14 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
{
Reference<XNameContainer> xContainer( xRef, UNO_QUERY );
if( !xContainer.is() )
- return FALSE;
+ return sal_False;
const Sequence< ::rtl::OUString > aNameSequence( xContainer->getElementNames() );
const ::rtl::OUString* pNames = aNameSequence.getConstArray();
- const INT32 nCount = aNameSequence.getLength();
+ const sal_Int32 nCount = aNameSequence.getLength();
Any aAny;
AttributeData* pData;
- INT32 nAttr;
+ sal_Int32 nAttr;
for( nAttr = 0; nAttr < nCount; nAttr++ )
{
@@ -140,7 +140,7 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
aAny = xContainer->getByName( aName );
if( aAny.getValue() == NULL || aAny.getValueType() != ::getCppuType((AttributeData*)0) )
- return FALSE;
+ return sal_False;
pData = (AttributeData*)aAny.getValue();
sal_Int32 pos = aName.indexOf( sal_Unicode(':') );
@@ -188,61 +188,61 @@ bool SvXMLAttrContainerItem::PutValue( const com::sun::star::uno::Any& rVal, BYT
}
-BOOL SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rLName,
+sal_Bool SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rLName,
const ::rtl::OUString& rValue )
{
return pImpl->AddAttr( rLName, rValue );
}
-BOOL SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rPrefix,
+sal_Bool SvXMLAttrContainerItem::AddAttr( const ::rtl::OUString& rPrefix,
const ::rtl::OUString& rNamespace, const ::rtl::OUString& rLName,
const ::rtl::OUString& rValue )
{
return pImpl->AddAttr( rPrefix, rNamespace, rLName, rValue );
}
-USHORT SvXMLAttrContainerItem::GetAttrCount() const
+sal_uInt16 SvXMLAttrContainerItem::GetAttrCount() const
{
- return (USHORT)pImpl->GetAttrCount();
+ return (sal_uInt16)pImpl->GetAttrCount();
}
-::rtl::OUString SvXMLAttrContainerItem::GetAttrNamespace( USHORT i ) const
+::rtl::OUString SvXMLAttrContainerItem::GetAttrNamespace( sal_uInt16 i ) const
{
return pImpl->GetAttrNamespace( i );
}
-::rtl::OUString SvXMLAttrContainerItem::GetAttrPrefix( USHORT i ) const
+::rtl::OUString SvXMLAttrContainerItem::GetAttrPrefix( sal_uInt16 i ) const
{
return pImpl->GetAttrPrefix( i );
}
-const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrLName( USHORT i ) const
+const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrLName( sal_uInt16 i ) const
{
return pImpl->GetAttrLName( i );
}
-const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrValue( USHORT i ) const
+const ::rtl::OUString& SvXMLAttrContainerItem::GetAttrValue( sal_uInt16 i ) const
{
return pImpl->GetAttrValue( i );
}
-USHORT SvXMLAttrContainerItem::GetFirstNamespaceIndex() const
+sal_uInt16 SvXMLAttrContainerItem::GetFirstNamespaceIndex() const
{
return pImpl->GetFirstNamespaceIndex();
}
-USHORT SvXMLAttrContainerItem::GetNextNamespaceIndex( USHORT nIdx ) const
+sal_uInt16 SvXMLAttrContainerItem::GetNextNamespaceIndex( sal_uInt16 nIdx ) const
{
return pImpl->GetNextNamespaceIndex( nIdx );
}
-const ::rtl::OUString& SvXMLAttrContainerItem::GetNamespace( USHORT i ) const
+const ::rtl::OUString& SvXMLAttrContainerItem::GetNamespace( sal_uInt16 i ) const
{
return pImpl->GetNamespace( i );
}
-const ::rtl::OUString& SvXMLAttrContainerItem::GetPrefix( USHORT i ) const
+const ::rtl::OUString& SvXMLAttrContainerItem::GetPrefix( sal_uInt16 i ) const
{
return pImpl->GetPrefix( i );
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 15:20:37 +0000